From de047f9727f70aee888a633453eb4f23a13c922c Mon Sep 17 00:00:00 2001
From: hannes <h@nnesmannerhe.im>
Date: Tue, 19 Jan 2016 13:41:25 +0000
Subject: [PATCH] correct mentions if parent mention multiple users with same
 nickname (don't use first one for all)

---
 lib/util.php | 28 ++++++++++++++++++----------
 1 file changed, 18 insertions(+), 10 deletions(-)

diff --git a/lib/util.php b/lib/util.php
index 20306635af..91c273714e 100644
--- a/lib/util.php
+++ b/lib/util.php
@@ -725,14 +725,13 @@ function common_find_mentions($text, Profile $sender, Notice $parent=null)
     if (Event::handle('StartFindMentions', array($sender, $text, &$mentions))) {
         // Get the context of the original notice, if any
         $origMentions = array();
-
         // Does it have a parent notice for context?
         if ($parent instanceof Notice) {
             foreach ($parent->getAttentionProfiles() as $repliedTo) {
                 if (!$repliedTo->isPerson()) {
                     continue;
                 }
-                $origMentions[$repliedTo->getNickname()] = $repliedTo;
+                $origMentions[$repliedTo->id] = $repliedTo;
             }
         }
 
@@ -746,15 +745,24 @@ function common_find_mentions($text, Profile $sender, Notice $parent=null)
                 continue;
             }
 
-            // Try to get a profile for this nickname.
-            // Start with conversation context, then go to
-            // sender context.
+			// primarily mention the profiles mentioned in the parent
+            $mention_found_in_origMentions = false;
+            foreach($origMentions as $origMentionsId=>$origMention) {
+                if($origMention->getNickname() == $nickname) {
+                    $mention_found_in_origMentions = $origMention;
+                    // don't mention same twice! the parent might have mentioned 
+                    // two users with same nickname on different instances
+                    unset($origMentions[$origMentionsId]);
+                    break;
+                }
+            }
 
-            if ($parent instanceof Notice && $parent->getProfile()->getNickname() === $nickname) {
+            // Try to get a profile for this nickname.
+            // Start with parents mentions, then go to parents sender context
+            if ($mention_found_in_origMentions) {
+                $mentioned = $mention_found_in_origMentions;            
+            } else if ($parent instanceof Notice && $parent->getProfile()->getNickname() === $nickname) {
                 $mentioned = $parent->getProfile();
-            } else if (!empty($origMentions) &&
-                       array_key_exists($nickname, $origMentions)) {
-                $mentioned = $origMentions[$nickname];
             } else {
                 // sets to null if no match
                 $mentioned = common_relative_profile($sender, $nickname);
@@ -2462,4 +2470,4 @@ function html_sprintf()
 function _ve($var)
 {
     return var_export($var, true);
-}
+}
\ No newline at end of file
-- 
2.39.5