From e6f07d8554b41345ed98186375714cca3bbcd452 Mon Sep 17 00:00:00 2001 From: Mikael Nordfeldth Date: Wed, 24 Feb 2016 00:19:27 +0100 Subject: [PATCH] Use in_array instead. Now we get third party responses to contextually interesting threads I think this solves much of the "third party conversation" issues, assuming involved parties are using modern GNU social instances. --- plugins/OStatus/actions/usersalmon.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/plugins/OStatus/actions/usersalmon.php b/plugins/OStatus/actions/usersalmon.php index 1c4c64efcc..ea5262aa3b 100644 --- a/plugins/OStatus/actions/usersalmon.php +++ b/plugins/OStatus/actions/usersalmon.php @@ -42,7 +42,7 @@ class UsersalmonAction extends SalmonAction if (!empty($this->activity->context->replyToID)) { try { - $notice = Notice::getKV('uri', $this->activity->context->replyToID); + $notice = Notice::getByUri($this->activity->context->replyToID); } catch (NoResultException $e) { $notice = false; } @@ -50,7 +50,7 @@ class UsersalmonAction extends SalmonAction if ($notice instanceof Notice && ($this->target->sameAs($notice->getProfile()) - || array_key_exists($this->target->getID(), $notice->getAttentionProfileIDs()) + || in_array($this->target->getID(), $notice->getAttentionProfileIDs()) )) { // In reply to a notice either from or mentioning this user. common_debug('User is the owner or was in the attention list of thr:in-reply-to activity.');