diff options
author | Mario Vavti <mario@mariovavti.com> | 2019-08-13 09:46:01 +0200 |
---|---|---|
committer | Mario Vavti <mario@mariovavti.com> | 2019-08-13 09:46:01 +0200 |
commit | e8f3b7f8530c69045dcabffecab2f158d0b35214 (patch) | |
tree | e02872bbb9a7226f30f78a1784fae113431eceaa /Zotlabs/Lib/Enotify.php | |
parent | 892e9cd835612c8155bf3c15436137f94abbb667 (diff) | |
parent | e28341ca4beb1b746a5c17590f62c02cc8df49ba (diff) | |
download | volse-hubzilla-e8f3b7f8530c69045dcabffecab2f158d0b35214.tar.gz volse-hubzilla-e8f3b7f8530c69045dcabffecab2f158d0b35214.tar.bz2 volse-hubzilla-e8f3b7f8530c69045dcabffecab2f158d0b35214.zip |
Merge branch '4.4RC'4.4
Diffstat (limited to 'Zotlabs/Lib/Enotify.php')
-rw-r--r-- | Zotlabs/Lib/Enotify.php | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index a7082f45a..92a488f67 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -807,6 +807,11 @@ class Enotify { $itemem_text = (($item['item_thread_top']) ? t('created a new post') : sprintf( t('commented on %s\'s post'), $item['owner']['xchan_name'])); + + if($item['verb'] === ACTIVITY_SHARE) { + $itemem_text = sprintf( t('repeated %s\'s post'), $item['author']['xchan_name']); + } + } $edit = false; @@ -825,12 +830,14 @@ class Enotify { // convert this logic into a json array just like the system notifications + $who = (($item['verb'] === ACTIVITY_SHARE) ? 'owner' : 'author'); + $x = array( 'notify_link' => $item['llink'], - 'name' => $item['author']['xchan_name'], - 'addr' => (($item['author']['xchan_addr']) ? $item['author']['xchan_addr'] : $item['author']['xchan_url']), - 'url' => $item['author']['xchan_url'], - 'photo' => $item['author']['xchan_photo_s'], + 'name' => $item[$who]['xchan_name'], + 'addr' => (($item[$who]['xchan_addr']) ? $item[$who]['xchan_addr'] : $item[$who]['xchan_url']), + 'url' => $item[$who]['xchan_url'], + 'photo' => $item[$who]['xchan_photo_s'], 'when' => relative_date(($edit)? $item['edited'] : $item['created']), 'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'), 'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? 'b64.' . base64url_encode($item['thr_parent']) : 'b64.' . base64url_encode($item['mid'])), @@ -838,7 +845,7 @@ class Enotify { 'thread_top' => (($item['item_thread_top']) ? true : false), 'message' => strip_tags(bbcode($itemem_text)), // these are for the superblock addon - 'hash' => $item['author']['xchan_hash'], + 'hash' => $item[$who]['xchan_hash'], 'uid' => local_channel(), 'display' => true ); |