From a8d571f2a330a28af39117be81ff0b6d7aeff194 Mon Sep 17 00:00:00 2001
From: Thomas Sileo <t@a4.io>
Date: Sat, 24 Aug 2019 11:11:36 +0200
Subject: [PATCH] More bugfixes

---
 app.py              | 4 +---
 blueprints/admin.py | 4 +++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/app.py b/app.py
index a3938a7..bc16091 100644
--- a/app.py
+++ b/app.py
@@ -508,9 +508,7 @@ def outbox():
 @app.route("/emoji/<name>")
 def ap_emoji(name):
     if name in EMOJIS:
-        return activitypubify(
-            **{**EMOJIS[name].to_dict(), "@context": config.DEFAULT_CTX}
-        )
+        return activitypubify(**{**EMOJIS[name], "@context": config.DEFAULT_CTX})
     abort(404)
 
 
diff --git a/blueprints/admin.py b/blueprints/admin.py
index 3bae40e..79993df 100644
--- a/blueprints/admin.py
+++ b/blueprints/admin.py
@@ -265,7 +265,9 @@ def admin_new() -> _Response:
             thread=thread,
             visibility=ap.Visibility,
             emojis=config.EMOJIS.split(" "),
-            custom_emojis=EMOJIS_BY_NAME,
+            custom_emojis={
+                name: ap.Emoji(**dat) for name, dat in EMOJIS_BY_NAME.items()
+            },
         )
     )