wamo/Qvitter
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #180 from mmn/mention_fixing

Browse Source 
Mention fixing
This commit is contained in:
Hannes Mannerheim 2015-06-02 15:16:26 +02:00
commit 60e6345c13
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
QvitterPlugin.php
View File

@ -663,6 +663,7 @@ class QvitterPlugin extends Plugin {
* @return boolean hook flag * @return boolean hook flag
*/ */
function onStartNoticeDistribute($notice) { function onStartNoticeDistribute($notice) {
assert($notice->id > 0); // since we removed tests below
// don't add notifications for activity type notices // don't add notifications for activity type notices
if($notice->object_type == 'activity') { if($notice->object_type == 'activity') {
@ -697,13 +698,17 @@ class QvitterPlugin extends Plugin {
$reply_notification_to = false; $reply_notification_to = false;
// check for reply to insert in notifications // check for reply to insert in notifications
if($notice->reply_to) { if($notice->reply_to) {
$replyparent = $notice->getParent(); try {
$replyauthor = $replyparent->getProfile(); $replyauthor = $notice->getParent()->getProfile();
if ($replyauthor instanceof Profile && !empty($notice->id)) {
$reply_notification_to = $replyauthor->id; $reply_notification_to = $replyauthor->id;
$this->insertNotification($replyauthor->id, $notice->profile_id, 'reply', $notice->id); $this->insertNotification($replyauthor->id, $notice->profile_id, 'reply', $notice->id);
} //} catch (NoParentNoticeException $e) { // TODO: catch this when everyone runs latest GNU social!
// This is not a reply to something (has no parent)
} catch (NoResultException $e) {
// Parent author's profile not found! Complain louder?
common_log(LOG_ERR, "Parent notice's author not found: ".$e->getMessage());
} }
}
// check for mentions to insert in notifications // check for mentions to insert in notifications
$mentions = common_find_mentions($notice->content, $notice); $mentions = common_find_mentions($notice->content, $notice);
@ -719,7 +724,7 @@ class QvitterPlugin extends Plugin {
$all_mentioned_user_ids[] = $mentioned->id; $all_mentioned_user_ids[] = $mentioned->id;
// only notify if mentioned user is not already notified for reply // only notify if mentioned user is not already notified for reply
if($reply_notification_to != $mentioned->id && !empty($notice->id)) { if($reply_notification_to != $mentioned->id) {
$this->insertNotification($mentioned->id, $notice->profile_id, 'mention', $notice->id); $this->insertNotification($mentioned->id, $notice->profile_id, 'mention', $notice->id);
} }
} }