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

since we only save the parent mid in notify we must look for thr_parent when dealing with likes

Browse Source
This commit is contained in:
Mario Vavti 2018-02-13 11:01:58 +01:00
parent b221c68e4b
commit d826515ba8
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Zotlabs/Module/Ping.php
View File

@ -268,7 +268,18 @@ class Ping extends \Zotlabs\Web\Controller {
$mid = basename($tt['link']); $mid = basename($tt['link']);
if(in_array($tt['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
// we need the thread parent
$r = q("select thr_parent from item where mid = '%s' and uid = %d limit 1",
dbesc($mid),
intval(local_channel())
);
$b64mid = ((strpos($r[0]['thr_parent'], 'b64.' === 0)) ? $r[0]['thr_parent'] : 'b64.' . base64url_encode($r[0]['thr_parent']));
}
else {
$b64mid = ((strpos($mid, 'b64.' === 0)) ? $mid : 'b64.' . base64url_encode($mid)); $b64mid = ((strpos($mid, 'b64.' === 0)) ? $mid : 'b64.' . base64url_encode($mid));
}
$notifs[] = array( $notifs[] = array(
'notify_link' => z_root() . '/notify/view/' . $tt['id'], 'notify_link' => z_root() . '/notify/view/' . $tt['id'],

2
include/items.php
View File

@ -2402,7 +2402,7 @@ function send_status_notifications($post_id,$item) {
'to_xchan' => $r[0]['channel_hash'], 'to_xchan' => $r[0]['channel_hash'],
'item' => $item, 'item' => $item,
'link' => $link, 'link' => $link,
'verb' => ACTIVITY_POST, 'verb' => $item['verb'],
'otype' => 'item', 'otype' => 'item',
'parent' => $thr_parent_id ? $thr_parent_id : $parent, 'parent' => $thr_parent_id ? $thr_parent_id : $parent,
'parent_mid' => $thr_parent_id ? $item['thr_parent'] : $item['parent_mid'] 'parent_mid' => $thr_parent_id ? $item['thr_parent'] : $item['parent_mid']