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

basic (very basic) communication showing up on network page

Browse Source
This commit is contained in:
friendica 2012-11-26 23:52:16 -08:00
parent 941c554031
commit e916d71cc5
3 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/items.php
View File

@ -1167,7 +1167,7 @@ function item_store($arr,$force_parent = false) {
$allow_gid = $arr['allow_gid']; $allow_gid = $arr['allow_gid'];
$deny_cid = $arr['deny_cid']; $deny_cid = $arr['deny_cid'];
$deny_gid = $arr['deny_gid']; $deny_gid = $arr['deny_gid'];
$arr['item_flags'] = $arr['item_flags'] | ITEM_TOP_THREAD; $arr['item_flags'] = $arr['item_flags'] | ITEM_THREAD_TOP;
} }
else { else {

11
mod/channel.php
View File

@ -165,12 +165,14 @@ function channel_content(&$a, $update = 0) {
$r = q("SELECT distinct(parent) AS `item_id` from item $r = q("SELECT distinct(parent) 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
WHERE uid = %d AND item_restrict = 0 WHERE uid = %d AND item_restrict = 0
AND (item_flags & %d) AND (item_flags & %d) AND ( item_flags & %d ) AND ( item_flags & %d )
AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
$sql_extra $sql_extra
ORDER BY created DESC", ORDER BY created DESC",
intval($a->profile['profile_uid']), intval($a->profile['profile_uid']),
intval(ITEM_WALL|ITEM_UNSEEN|ITEM_THREAD_TOP), intval(ITEM_WALL),
intval(ITEM_UNSEEN),
intval(ITEM_THREAD_TOP),
intval(ABOOK_FLAG_BLOCKED) intval(ABOOK_FLAG_BLOCKED)
); );
@ -196,12 +198,13 @@ function channel_content(&$a, $update = 0) {
$r = q("SELECT id AS item_id FROM item $r = q("SELECT 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
WHERE uid = %d AND item_restrict = 0 WHERE uid = %d AND item_restrict = 0
AND (item_flags & %d) AND (item_flags & %d) and (item_flags & %d)
AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null) AND ((abook.abook_flags & %d) = 0 or abook.abook_flags is null)
$sql_extra $sql_extra2 $sql_extra $sql_extra2
ORDER BY created DESC $pager_sql ", ORDER BY created DESC $pager_sql ",
intval($a->profile['profile_uid']), intval($a->profile['profile_uid']),
intval(ITEM_WALL|ITEM_THREAD_TOP), intval(ITEM_WALL),
intval(ITEM_THREAD_TOP),
intval(ABOOK_FLAG_BLOCKED) intval(ABOOK_FLAG_BLOCKED)
); );

4
mod/network.php
View File

@ -666,7 +666,7 @@ function network_content(&$a, $update = 0, $load = false) {
); );
} }
else { else {
dbg(1);
$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
WHERE item.uid = %d AND item.item_restrict = 0 WHERE item.uid = %d AND item.item_restrict = 0
@ -677,7 +677,7 @@ function network_content(&$a, $update = 0, $load = false) {
intval(local_user()), intval(local_user()),
intval(ABOOK_FLAG_BLOCKED) intval(ABOOK_FLAG_BLOCKED)
); );
dbg(0);
} }
// 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