friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-17 05:16:44 +02:00
Code Issues Packages Projects Releases 1 Wiki Activity

Don't use the author-link anymore - just author-id

Browse source
This commit is contained in:
Michael 2018-06-16 15:35:30 +00:00
parent 14cb128264
commit abef0cd46c
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/enotify.php
View file

@ -724,23 +724,24 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
$profiles = $profiles2; $profiles = $profiles2;
$profile_list = ""; $ret = dba::select('contact', ['id'], ['uid' => 0, 'nurl' => $profiles]);
foreach ($profiles AS $profile) { $contacts = [];
if ($profile_list != "")
$profile_list .= "', '";
$profile_list .= dbesc($profile); while ($contact = dba::fetch($ret)) {
$contacts[] = $contact['id'];
} }
$profile_list = "'".$profile_list."'"; $contact_list = implode(',', $contacts);
dba::close($ret);
// Only act if it is a "real" post // Only act if it is a "real" post
// We need the additional check for the "local_profile" because of mixed situations on connector networks // We need the additional check for the "local_profile" because of mixed situations on connector networks
$item = q("SELECT `id`, `mention`, `tag`,`parent`, `title`, `body`, `author-id`, `guid`, $item = q("SELECT `id`, `mention`, `tag`,`parent`, `title`, `body`, `author-id`, `guid`,
`parent-uri`, `uri`, `contact-id`, `network` `parent-uri`, `uri`, `contact-id`, `network`
FROM `item` WHERE `id` = %d AND `verb` IN ('%s', '') AND `type` != 'activity' AND FROM `item` WHERE `id` = %d AND `verb` IN ('%s', '') AND `type` != 'activity' AND
NOT (`author-link` IN ($profile_list)) LIMIT 1", NOT (`author-id` IN ($contact_list)) LIMIT 1",
intval($itemid), dbesc(ACTIVITY_POST)); intval($itemid), dbesc(ACTIVITY_POST));
if (!$item) if (!$item)
return false; return false;
@ -807,7 +808,7 @@ function check_item_notification($itemid, $uid, $defaulttype = "") {
// Is it a post that the user had started or where he interacted? // Is it a post that the user had started or where he interacted?
$parent = q("SELECT `thread`.`iid` FROM `thread` INNER JOIN `item` ON `item`.`parent` = `thread`.`iid` $parent = q("SELECT `thread`.`iid` FROM `thread` INNER JOIN `item` ON `item`.`parent` = `thread`.`iid`
WHERE `thread`.`iid` = %d AND NOT `thread`.`ignored` AND WHERE `thread`.`iid` = %d AND NOT `thread`.`ignored` AND
(`thread`.`mention` OR `item`.`author-link` IN ($profile_list)) (`thread`.`mention` OR `item`.`author-id` IN ($contact_list))
LIMIT 1", LIMIT 1",
intval($item[0]["parent"])); intval($item[0]["parent"]));