bitPickups/friendica_2021.01_tupambae_shared_hosting
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Don't create notifications for own posts

Browse source
This commit is contained in:
Michael 2020-01-05 09:48:31 +00:00
parent a4268a973f
commit 4b44aca507
1 changed files with 15 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

27
src/Model/UserItem.php
View file

@ -31,8 +31,7 @@ class UserItem
*/ */
public static function setNotification(int $iid) public static function setNotification(int $iid)
{ {
$fields = ['id', 'uid', 'body', 'parent', 'gravity', 'tag', 'contact-id', $fields = ['id', 'uid', 'body', 'parent', 'gravity', 'tag', 'contact-id', 'thr-parent', 'author-id'];
'thr-parent', 'parent-uri', 'mention'];
$item = Item::selectFirst($fields, ['id' => $iid, 'origin' => false]); $item = Item::selectFirst($fields, ['id' => $iid, 'origin' => false]);
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
return; return;
@ -56,8 +55,7 @@ class UserItem
*/ */
private static function setNotificationForUser(array $item, int $uid) private static function setNotificationForUser(array $item, int $uid)
{ {
$fields = ['ignored', 'mention']; $thread = Item::selectFirstThreadForUser($uid, ['ignored'], ['iid' => $item['parent'], 'deleted' => false]);
$thread = Item::selectFirstThreadForUser($uid, $fields, ['iid' => $item['parent'], 'deleted' => false]);
if ($thread['ignored']) { if ($thread['ignored']) {
return; return;
} }
@ -70,14 +68,6 @@ class UserItem
$profiles = self::getProfileForUser($uid); $profiles = self::getProfileForUser($uid);
if (self::checkImplicitMention($item, $uid, $profiles)) {
$notification_type = $notification_type | self::NOTIF_IMPLICIT_TAGGED;
}
if (self::checkExplicitMention($item, $uid, $profiles)) {
$notification_type = $notification_type | self::NOTIF_EXPLICIT_TAGGED;
}
// Fetch all contacts for the given profiles // Fetch all contacts for the given profiles
$contacts = []; $contacts = [];
$ret = DBA::select('contact', ['id'], ['uid' => 0, 'nurl' => $profiles]); $ret = DBA::select('contact', ['id'], ['uid' => 0, 'nurl' => $profiles]);
@ -86,6 +76,19 @@ class UserItem
} }
DBA::close($ret); DBA::close($ret);
// Don't create notifications for user's posts
if (in_array($item['author-id'], $contacts)) {
return;
}
if (self::checkImplicitMention($item, $uid, $profiles)) {
$notification_type = $notification_type | self::NOTIF_IMPLICIT_TAGGED;
}
if (self::checkExplicitMention($item, $uid, $profiles)) {
$notification_type = $notification_type | self::NOTIF_EXPLICIT_TAGGED;
}
if (self::checkCommentedThread($item, $uid, $contacts)) { if (self::checkCommentedThread($item, $uid, $contacts)) {
$notification_type = $notification_type | self::NOTIF_THREAD_COMMENT; $notification_type = $notification_type | self::NOTIF_THREAD_COMMENT;
} }