From 2641c4c01750693d9c7b68b76f3479936e19b7f5 Mon Sep 17 00:00:00 2001
From: juliawuu <32719200+juliawuu@users.noreply.github.com>
Date: Fri, 19 Jan 2018 02:30:54 -0500
Subject: [PATCH 1/4] Added previous commenters to list of suggested users to
 tag in chats.

---
 extension/views.py | 20 ++++++++++++++++++++
 1 file changed, 20 insertions(+)

diff --git a/extension/views.py b/extension/views.py
index 854e217..37a38c6 100644
--- a/extension/views.py
+++ b/extension/views.py
@@ -224,6 +224,26 @@ def get_friends(request):
                          'type': 'contact'})
             if len(data) > 5:
                 break
+            
+    url = request.GET.get('url', '')
+    
+    messages = ChatMessage.objects.filter(url=url).order_by('-date').select_related()
+    
+    id_list = []
+    for suggested_user in data:
+        id_list.append(suggested_user['id'])
+        
+    for message in messages:
+        commenter = message.author
+        if not query or query in commenter.username.lower():
+            if commenter.userprofile.id not in id_list:
+                id_list.append(commenter.userprofile.id)
+                data.append({'id': commenter.userprofile.id,
+                             'name': '@%s' % (commenter.username),
+                             'avatar': gravatar_for_user(commenter),
+                             'type': 'contact'})
+        if len(data) > 10:
+            break
     
     return {'res': data}
 

From f82f773c4b40fc3aea9fac1cb2082c85e1c73f6f Mon Sep 17 00:00:00 2001
From: juliawuu <32719200+juliawuu@users.noreply.github.com>
Date: Fri, 19 Jan 2018 12:52:19 -0500
Subject: [PATCH 2/4] Changed placement of id_list and added >= 10.

---
 extension/views.py | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/extension/views.py b/extension/views.py
index 37a38c6..f6d31fe 100644
--- a/extension/views.py
+++ b/extension/views.py
@@ -215,9 +215,11 @@ def get_friends(request):
     friends = user_prof.follows.all()
     
     data = []
+    id_list = []
     
     for friend in friends:
         if not query or query in friend.user.username.lower():
+            id_list.append(friend.id)
             data.append({'id': friend.id,
                          'name': '@%s' % (friend.user.username),
                          'avatar': gravatar_for_user(friend.user),
@@ -229,7 +231,6 @@ def get_friends(request):
     
     messages = ChatMessage.objects.filter(url=url).order_by('-date').select_related()
     
-    id_list = []
     for suggested_user in data:
         id_list.append(suggested_user['id'])
         
@@ -242,7 +243,7 @@ def get_friends(request):
                              'name': '@%s' % (commenter.username),
                              'avatar': gravatar_for_user(commenter),
                              'type': 'contact'})
-        if len(data) > 10:
+        if len(data) >= 10:
             break
     
     return {'res': data}

From fe3c34a67a9590abd3155692a6553d3b632374e7 Mon Sep 17 00:00:00 2001
From: juliawuu <32719200+juliawuu@users.noreply.github.com>
Date: Fri, 19 Jan 2018 13:00:17 -0500
Subject: [PATCH 3/4] Minor changes

---
 extension/views.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/extension/views.py b/extension/views.py
index f6d31fe..54c2d40 100644
--- a/extension/views.py
+++ b/extension/views.py
@@ -219,7 +219,7 @@ def get_friends(request):
     
     for friend in friends:
         if not query or query in friend.user.username.lower():
-            id_list.append(friend.id)
+            
             data.append({'id': friend.id,
                          'name': '@%s' % (friend.user.username),
                          'avatar': gravatar_for_user(friend.user),
@@ -231,9 +231,6 @@ def get_friends(request):
     
     messages = ChatMessage.objects.filter(url=url).order_by('-date').select_related()
     
-    for suggested_user in data:
-        id_list.append(suggested_user['id'])
-        
     for message in messages:
         commenter = message.author
         if not query or query in commenter.username.lower():

From 2fde17b909e35784ba7417dcefafcf6c926c95e5 Mon Sep 17 00:00:00 2001
From: juliawuu <32719200+juliawuu@users.noreply.github.com>
Date: Fri, 19 Jan 2018 13:03:35 -0500
Subject: [PATCH 4/4] Minor changes

---
 extension/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/extension/views.py b/extension/views.py
index 54c2d40..33b8196 100644
--- a/extension/views.py
+++ b/extension/views.py
@@ -219,7 +219,7 @@ def get_friends(request):
     
     for friend in friends:
         if not query or query in friend.user.username.lower():
-            
+            id_list.append(friend.id)
             data.append({'id': friend.id,
                          'name': '@%s' % (friend.user.username),
                          'avatar': gravatar_for_user(friend.user),