harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix the contorted update logic on the network page

Browse Source
This commit is contained in:
friendica 2013-01-04 19:24:17 -08:00
parent e208e07e35
commit 70b6f989dd
2 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
include/zot.php
View File

@ -347,9 +347,12 @@ function zot_gethub($arr) {
dbesc($arr['url']), dbesc($arr['url']),
dbesc($arr['url_sig']) dbesc($arr['url_sig'])
); );
if($r && count($r)) if($r && count($r)) {
logger('zot_gethub: found', LOGGER_DEBUG);
return $r[0]; return $r[0];
}
} }
logger('zot_gethub: not found', LOGGER_DEBUG);
return null; return null;
} }

40
mod/network.php
View File

@ -611,29 +611,18 @@ function network_content(&$a, $update = 0, $load = false) {
$items = fetch_post_tags($items); $items = fetch_post_tags($items);
} }
elseif($load) { elseif($update) {
// Normal conversation view // Normal conversation view
if($order === 'post') if($order === 'post')
$ordering = "`created`"; $ordering = "`created`";
else else
$ordering = "`commented`"; $ordering = "`commented`";
// Fetch a page full of parent items for this page if($load) {
if($update && (! $load)) { // Fetch a page full of parent items for this page
$r = q("SELECT item.parent AS item_id FROM item
left join abook on item.author_xchan = abook.abook_xchan
WHERE item.uid = %d AND item.item_restrict = 0
and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
$sql_extra3 $sql_extra $sql_nets ",
intval(local_user()),
intval(ABOOK_FLAG_BLOCKED)
);
}
else {
$r = q("SELECT item.id AS item_id FROM item $r = q("SELECT item.id AS item_id FROM item
left join abook on item.author_xchan = abook.abook_xchan left join abook on item.author_xchan = abook.abook_xchan
@ -645,12 +634,23 @@ function network_content(&$a, $update = 0, $load = false) {
intval(local_user()), intval(local_user()),
intval(ABOOK_FLAG_BLOCKED) intval(ABOOK_FLAG_BLOCKED)
); );
} }
else {
// update
$r = q("SELECT item.parent AS item_id FROM item
left join abook on item.author_xchan = abook.abook_xchan
WHERE item.uid = %d AND item.item_restrict = 0 $simple_update
and ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
$sql_extra3 $sql_extra $sql_nets ",
intval(local_user()),
intval(ABOOK_FLAG_BLOCKED)
);
}
else {
// Then fetch all the children of the parents that are on this page // Then fetch all the children of the parents that are on this page
if($r && count($r)) { if($r) {
$parents_str = ids_to_querystr($r,'item_id'); $parents_str = ids_to_querystr($r,'item_id');
@ -662,21 +662,21 @@ function network_content(&$a, $update = 0, $load = false) {
dbesc($parents_str) dbesc($parents_str)
); );
xchan_query($items); xchan_query($items);
$items = fetch_post_tags($items); $items = fetch_post_tags($items);
$items = conv_sort($items,$ordering); $items = conv_sort($items,$ordering);
//logger('items: ' . print_r($items,true)); //logger('items: ' . print_r($items,true));
} else { }
else {
$items = array(); $items = array();
} }
} }
// logger('items: ' . count($items)); // logger('items: ' . count($items));
// We aren't going to try and figure out at the item, group, and page // We aren't going to try and figure out at the item, group, and page
// level which items you've seen and which you haven't. If you're looking // level which items you've seen and which you haven't. If you're looking