aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-11-13 20:37:52 -0800
committerzotlabs <mike@macgirvin.com>2018-11-13 20:37:52 -0800
commitcfc43f6dea22c4c23ed485a7b321de76515f584d (patch)
tree11bc8dd44a4c33c390996f9190aabd135712add2 /Zotlabs/Lib
parentee85784be18c14905568fb259411f490c8d6bd91 (diff)
parent1260887fa743a4e5522dea366f0a584430b0a9a0 (diff)
downloadvolse-hubzilla-cfc43f6dea22c4c23ed485a7b321de76515f584d.tar.gz
volse-hubzilla-cfc43f6dea22c4c23ed485a7b321de76515f584d.tar.bz2
volse-hubzilla-cfc43f6dea22c4c23ed485a7b321de76515f584d.zip
Merge branch 'master' into zvi
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/Enotify.php14
1 files changed, 12 insertions, 2 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php
index cfb0bd344..25c96d9cc 100644
--- a/Zotlabs/Lib/Enotify.php
+++ b/Zotlabs/Lib/Enotify.php
@@ -825,7 +825,7 @@ class Enotify {
// convert this logic into a json array just like the system notifications
- return array(
+ $x = array(
'notify_link' => $item['llink'],
'name' => $item['author']['xchan_name'],
'url' => $item['author']['xchan_url'],
@@ -835,9 +835,19 @@ class Enotify {
'b64mid' => ((in_array($item['verb'], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) ? 'b64.' . base64url_encode($item['thr_parent']) : 'b64.' . base64url_encode($item['mid'])),
'notify_id' => 'undefined',
'thread_top' => (($item['item_thread_top']) ? true : false),
- 'message' => strip_tags(bbcode($itemem_text))
+ 'message' => strip_tags(bbcode($itemem_text)),
+ // these are for the superblock addon
+ 'hash' => $item['author']['xchan_hash'],
+ 'uid' => local_channel(),
+ 'display' => true
);
+ call_hooks('enotify_format',$x);
+ if(! $x['display']) {
+ return [];
+ }
+
+ return $x;
}
}