diff options
| author | Mario <mario@mariovavti.com> | 2019-11-22 20:52:22 +0000 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2019-11-22 20:52:22 +0000 |
| commit | 73a0866ac4666e615742884a9eb3464c742f787b (patch) | |
| tree | 49b168f7c270507328f0813fbbcbe673db2f197e | |
| parent | b62eb665c5ad12ec7bde6bace71a0ddbb6aac28d (diff) | |
| download | volse-hubzilla-73a0866ac4666e615742884a9eb3464c742f787b.tar.gz volse-hubzilla-73a0866ac4666e615742884a9eb3464c742f787b.tar.bz2 volse-hubzilla-73a0866ac4666e615742884a9eb3464c742f787b.zip | |
sse: fix a regression where not all appearances of an notification were looped through and fix format_notify() to not look for the parent item anymore
| -rw-r--r-- | Zotlabs/Lib/Enotify.php | 13 | ||||
| -rw-r--r-- | view/js/main.js | 7 |
2 files changed, 5 insertions, 15 deletions
diff --git a/Zotlabs/Lib/Enotify.php b/Zotlabs/Lib/Enotify.php index c1a6c9fdc..bc2710ee1 100644 --- a/Zotlabs/Lib/Enotify.php +++ b/Zotlabs/Lib/Enotify.php @@ -872,19 +872,8 @@ class Enotify { $message = substr($message, strlen($tt['xname']) + 1); $mid = basename($tt['link']); - $mid = ((strpos($mid, 'b64.') === 0) ? @base64url_decode(substr($mid, 4)) : $mid); - 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)); $x = [ 'notify_link' => z_root() . '/notify/view/' . $tt['id'], diff --git a/view/js/main.js b/view/js/main.js index 29a95d9b1..6516d5b0a 100644 --- a/view/js/main.js +++ b/view/js/main.js @@ -854,10 +854,13 @@ function updateConvItems(mode,data) { console.log(nmids); + sse_mids = nmids; + nmids.forEach(function (nmid, index) { - sse_mids.push(nmid); + //sse_mids.push(nmid); if($('.notification[data-b64mid=\'' + nmid + '\']').length) { $('.notification[data-b64mid=\'' + nmid + '\']').each(function() { + console.log(this); var n = this.parentElement.id.split('-'); return sse_updateNotifications(n[1], nmid, true); }); @@ -2146,6 +2149,4 @@ function sse_updateNotifications(type, mid, interactive) { $('#nav-' + type + '-menu .notification[data-b64mid=\'' + mid + '\']').fadeOut(); - return false; - } |