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

This should sort out hubzilla issue #826 but requires a bit more testing. It may also sort out some reported issues with commenting and liking items in the public stream.

Browse Source
This commit is contained in:
zotlabs 2017-11-15 11:26:14 -08:00
parent 8e53491867
commit 67b6d41d57
3 changed files with 23 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Zotlabs/Module/Like.php
View File

@ -12,7 +12,10 @@ class Like extends \Zotlabs\Web\Controller {
function get() { function get() {
$o = ''; $o = '';
$sys_channel = get_sys_channel();
$sys_channel_id = (($sys_channel) ? $sys_channel['channel_id'] : 0);
$observer = \App::get_observer(); $observer = \App::get_observer();
$interactive = $_REQUEST['interactive']; $interactive = $_REQUEST['interactive'];
if($interactive) { if($interactive) {
@ -253,20 +256,22 @@ class Like extends \Zotlabs\Web\Controller {
logger('like: verb ' . $verb . ' item ' . $item_id, LOGGER_DEBUG); logger('like: verb ' . $verb . ' item ' . $item_id, LOGGER_DEBUG);
// get the item. Allow linked photos (which are normally hidden) to be liked // get the item. Allow linked photos (which are normally hidden) to be liked
$r = q("SELECT * FROM item WHERE id = %d $r = q("SELECT * FROM item WHERE id = %d
and (item_type = 0 or item_type = 6) and item_deleted = 0 and item_unpublished = 0 and (item_type = 0 or item_type = 6) and item_deleted = 0 and item_unpublished = 0
and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1", and item_delayed = 0 and item_pending_remove = 0 and item_blocked = 0 LIMIT 1",
intval($item_id) intval($item_id)
); );
if(! $item_id || (! $r)) { if(! $item_id || (! $r)) {
logger('like: no item ' . $item_id); logger('like: no item ' . $item_id);
killme(); killme();
} }
// Use the $effective_uid option of xchan_query to sort out comment permission
// for public stream items
xchan_query($r,true,(($r[0]['uid'] == local_channel()) ? 0 : local_channel())); xchan_query($r,true,(($r[0]['uid'] == $sys_channel_id) ? local_channel() : 0));
$item = $r[0]; $item = $r[0];
@ -464,6 +469,8 @@ class Like extends \Zotlabs\Web\Controller {
$arr['mid'] = $mid; $arr['mid'] = $mid;
$arr['aid'] = (($extended_like) ? $ch[0]['channel_account_id'] : $owner_aid); $arr['aid'] = (($extended_like) ? $ch[0]['channel_account_id'] : $owner_aid);
$arr['uid'] = $owner_uid; $arr['uid'] = $owner_uid;
$arr['item_flags'] = $item_flags; $arr['item_flags'] = $item_flags;
$arr['item_wall'] = $item_wall; $arr['item_wall'] = $item_wall;
$arr['parent_mid'] = (($extended_like) ? $mid : $item['mid']); $arr['parent_mid'] = (($extended_like) ? $mid : $item['mid']);

5
Zotlabs/Module/Pubstream.php
View File

@ -240,7 +240,10 @@ class Pubstream extends \Zotlabs\Web\Controller {
dbesc($parents_str) dbesc($parents_str)
); );
xchan_query($items,true,(-1)); // use effective_uid param of xchan_query to help sort out comment permission
// for sys_channel owned items.
xchan_query($items,true,(($sys) ? local_channel() : 0));
$items = fetch_post_tags($items,true); $items = fetch_post_tags($items,true);
$items = conv_sort($items,$ordering); $items = conv_sort($items,$ordering);
} }

16
include/channel.php
View File

@ -101,14 +101,14 @@ function create_sys_channel() {
set_config('system', 'prvkey', $hostkey['prvkey']); set_config('system', 'prvkey', $hostkey['prvkey']);
} }
create_identity(array( create_identity([
'account_id' => 'xxx', // This will create an identity with an (integer) account_id of 0, but account_id is required 'account_id' => 'xxx', // Typecast trickery: account_id is required. This will create an identity with an (integer) account_id of 0
'nickname' => 'sys', 'nickname' => 'sys',
'name' => 'System', 'name' => 'System',
'pageflags' => 0, 'pageflags' => 0,
'publish' => 0, 'publish' => 0,
'system' => 1 'system' => 1
)); ]);
} }