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

use distinct in channel item query and minor notification cache improvement

Browse Source
This commit is contained in:
Mario Vavti 2018-02-09 14:06:59 +01:00
parent cb70192f36
commit 5f229d81e9
2 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Zotlabs/Module/Channel.php
View File

@ -249,13 +249,13 @@ class Channel extends \Zotlabs\Web\Controller {
}
}
else {
$r = q("SELECT id AS item_id FROM item
$r = q("SELECT DISTINCT item.parent AS item_id FROM item
left join abook on item.author_xchan = abook.abook_xchan
WHERE uid = %d $item_normal
AND item_wall = 1 and item_thread_top = 1
AND (abook_blocked = 0 or abook.abook_flags is null)
WHERE true and uid = %d $item_normal
AND (abook.abook_blocked = 0 or abook.abook_flags is null)
AND item.item_wall = 1 AND item.item_thread_top AND item.mid = item.parent_mid
$sql_extra $sql_extra2
ORDER BY created DESC, id $pager_sql ",
ORDER BY created DESC $pager_sql ",
intval(\App::$profile['profile_uid'])
);
}

2
view/js/main.js
View File

@ -357,6 +357,7 @@ function closeMenu(theID) {
function markRead(notifType) {
$.get('ping?f=&markRead='+notifType);
$('.' + notifType + '-button').hide();
sessionStorage.removeItem(notifType + '_notifications_cache');
if(timer) clearTimeout(timer);
timer = setTimeout(updateInit,2000);
}
@ -436,6 +437,7 @@ function handleNotifications(data) {
if(item == 0) {
$('.' + index + '-button').fadeOut();
sessionStorage.removeItem(index + '_notifications_cache');
} else {
$('.' + index + '-button').fadeIn();
$('.' + index + '-update').html(item);