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

revert back to get the mid from enotify - otherwise we can not distinct between posts and likes

Browse Source
This commit is contained in:
Mario Vavti 2017-11-10 20:30:55 +01:00
parent 5e541ff53b
commit 3a17225546
3 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Zotlabs/Lib/Enotify.php
View File

@ -802,7 +802,8 @@ class Enotify {
'url' => $item['author']['xchan_url'], 'url' => $item['author']['xchan_url'],
'photo' => $item['author']['xchan_photo_s'], 'photo' => $item['author']['xchan_photo_s'],
'when' => relative_date($item['created']), 'when' => relative_date($item['created']),
'class' => (intval($item['item_unseen']) ? 'notify-unseen' : 'notify-seen'), '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'])),
'message' => strip_tags(bbcode($itemem_text)) 'message' => strip_tags(bbcode($itemem_text))
); );

4
view/js/main.js
View File

@ -959,9 +959,9 @@ function notify_popup_loader(notifyType) {
$("." + notifyType + "-update").html(data.notify.length); $("." + notifyType + "-update").html(data.notify.length);
$(data.notify).each(function() { $(data.notify).each(function() {
html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); html = navbar_notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid);
$("#navbar-" + notifyType + "-menu").append(html); $("#navbar-" + notifyType + "-menu").append(html);
html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass); html = notifications_tpl.format(this.notify_link,this.photo,this.name,this.message,this.when,this.hclass,this.b64mid);
$("#nav-" + notifyType + "-menu").append(html); $("#nav-" + notifyType + "-menu").append(html);
}); });

8
view/tpl/notifications_widget.tpl
View File

@ -29,16 +29,16 @@
{{if $module == 'display'}} {{if $module == 'display'}}
<script> <script>
$(document).on('click', '.notification', function(e) { $(document).on('click', '.notification', function(e) {
var mid = $(this)[0].pathname.substr(9); var b64mid = $(this).data('b64mid');
var path = $(this)[0].pathname.substr(1,7); var path = $(this)[0].pathname.substr(1,7);
if(path === 'display' && mid) { if(path === 'display' && b64mid) {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
$('.thread-wrapper').remove(); $('.thread-wrapper').remove();
$(this).fadeOut(); $(this).fadeOut();
bParam_mid = mid; bParam_mid = b64mid;
mode = 'replace'; mode = 'replace';
page_load = true; page_load = true;
liveUpdate(); liveUpdate();
@ -54,7 +54,7 @@
<div id="notifications_wrapper"> <div id="notifications_wrapper">
<div id="notifications" class="navbar-nav" data-children=".nav-item"> <div id="notifications" class="navbar-nav" data-children=".nav-item">
<div id="nav-notifications-template" rel="template"> <div id="nav-notifications-template" rel="template">
<a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}"> <a class="list-group-item clearfix notification {5}" href="{0}" title="{2} {3}" data-b64mid="{6}">
<img class="menu-img-3" data-src="{1}"> <img class="menu-img-3" data-src="{1}">
<span class="contactname">{2}</span> <span class="contactname">{2}</span>
<span class="dropdown-sub-text">{3}<br>{4}</span> <span class="dropdown-sub-text">{3}<br>{4}</span>