emoji: Add emoji author data in API.

Xuxiaotianonlyone · Dec 27, 2016 · 1238d08 · 1238d08
1 parent ffa724f
commit 1238d08
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 2 deletions.
diff --git a/zerver/models.py b/zerver/models.py
@@ -374,9 +374,17 @@ def __unicode__(self):
 def get_realm_emoji_uncached(realm):
     # type: (Realm) -> Dict[Text, Dict[str, Text]]
     d = {}
-    for row in RealmEmoji.objects.filter(realm=realm):
+    for row in RealmEmoji.objects.filter(realm=realm).select_related('author'):
+        if row.author:
+            author = {
+                'id': row.author.id,
+                'email': row.author.email,
+                'full_name': row.author.full_name}
+        else:
+            author = None
         d[row.name] = dict(source_url=row.img_url,
-                           display_url=get_camo_url(row.img_url))
+                           display_url=get_camo_url(row.img_url),
+                           author=author)
     return d
 
 def flush_realm_emoji(sender, **kwargs):

diff --git a/zerver/tests/test_realm_emoji.py b/zerver/tests/test_realm_emoji.py
@@ -34,6 +34,9 @@ def test_upload(self):
         content = ujson.loads(result.content)
         self.assert_json_success(result)
         self.assertEqual(len(content["emoji"]), 1)
+        self.assertIn('author', content["emoji"]['my_emoji'])
+        self.assertEqual(
+            content["emoji"]['my_emoji']['author']['email'], email)
 
         realm_emoji = RealmEmoji.objects.get(realm=get_realm_by_string_id('zulip'))
         self.assertEqual(