mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #6601 from annando/false-notifications

Browse source 
Hopefully final fix for false notifications
This commit is contained in:
Hypolite Petovan 2019-02-07 08:41:56 -05:00 committed by GitHub
commit 7572843083
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/Model/Item.php
View file

@ -1535,17 +1535,10 @@ class Item extends BaseObject
$item['private'] = 0; $item['private'] = 0;
} }
// If its a post from myself then tag the thread as "mention" // If its a post that originated here then tag the thread as "mention"
Logger::log("Checking if parent ".$parent_id." has to be tagged as mention for user ".$item['uid'], Logger::DEBUG); if ($item['origin'] && $item['uid']) {
$user = DBA::selectFirst('user', ['nickname'], ['uid' => $item['uid']]);
if (DBA::isResult($user)) {
$self = Strings::normaliseLink(System::baseUrl() . '/profile/' . $user['nickname']);
$self_id = Contact::getIdForURL($self, 0, true);
Logger::log("'myself' is ".$self_id." for parent ".$parent_id." checking against ".$item['author-id']." and ".$item['owner-id'], Logger::DEBUG);
if (($item['author-id'] == $self_id) || ($item['owner-id'] == $self_id)) {
DBA::update('thread', ['mention' => true], ['iid' => $parent_id]); DBA::update('thread', ['mention' => true], ['iid' => $parent_id]);
Logger::log("tagged thread ".$parent_id." as mention for user ".$self, Logger::DEBUG); Logger::log('tagged thread ' . $parent_id . ' as mention for user ' . $item['uid'], Logger::DEBUG);
}
} }
} else { } else {
/* /*

4
src/Protocol/ActivityPub/Transmitter.php
View file

@ -1298,10 +1298,6 @@ class Transmitter
*/ */
public static function sendFollowObject($object, $target, $uid = 0) public static function sendFollowObject($object, $target, $uid = 0)
{ {
// Currently deactivated, due to notification problems.
// The follow message is reflected back and then causes false notifications.
return true;
$profile = APContact::getByURL($target); $profile = APContact::getByURL($target);
if (empty($uid)) { if (empty($uid)) {