From 8382573d3088a0a4f816732571f132913ab31035 Mon Sep 17 00:00:00 2001
From: nekobit <nekobit@noemail.net>
Date: Sun, 5 Jun 2022 21:45:50 +0000
Subject: [PATCH] CSS fixes and notification emojis

FossilOrigin-Name: f9bc1382cd9622de84be83a9fb9e903c7fd82bd1390c6e9b417588ea815a4675
---
 dist/treebird20.css | 18 +++++++++++++-----
 src/status.c        |  7 ++++++-
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/dist/treebird20.css b/dist/treebird20.css
index 76ce478..3ca20fd 100644
--- a/dist/treebird20.css
+++ b/dist/treebird20.css
@@ -509,6 +509,7 @@ input[type=button], input[type=submit]
     padding-left: 2px;
     padding-right: 2px;
     margin-top: 0;
+    vertical-align: middle;
     font-weight: bold;
 }
 
@@ -591,15 +592,18 @@ svg.in-reply-to-icon
 
 .notification-info
 {
-    margin-top: 7px;
+    margin-top: 5px;
+    margin-bottom: 5px;
 }
 
 .notification-info img,
 .notification-info-format img
 {
-    margin-left: 38px;
+    margin-left: 41px;
     width: 24px;
     height: 24px;
+    border-radius: 3px;
+    vertical-align: middle;
     object-fit: cover;
 }
 
@@ -607,10 +611,12 @@ svg.in-reply-to-icon
 .notification-info-format .notification-user
 {
     display: inline;
+}
+
+.notification-text-group-with-icon,
+.notification-text-group
+{
     vertical-align: middle;
-    position: relative;
-    top: -8px;
-    left: 2px;
 }
 
 /***************************
@@ -1225,6 +1231,7 @@ p}
 {
     font-size: 14px;
     padding-bottom: 3px;
+    vertical-align: middle;
 }
 
 /* Emoji */
@@ -1237,6 +1244,7 @@ p}
     width: 32px;
     height: 32px;
     vertical-align: middle;
+    margin: 0;
     object-fit: contain;
     transition: transform .2s;
 }
diff --git a/src/status.c b/src/status.c
index 988edf0..df78fc6 100644
--- a/src/status.c
+++ b/src/status.c
@@ -577,13 +577,18 @@ char* construct_status(struct session* ssn,
         emoji_reactions = construct_emoji_reactions(status->id, status->pleroma.emoji_reactions, status->pleroma.emoji_reactions_len, NULL);
     if (notif && notif->type != MSTDNT_NOTIFICATION_MENTION)
     {
+        char* notif_display_name = emojify(notif->account->display_name,
+                                           notif->account->emojis,
+                                           notif->account->emojis_len);
         struct notification_template tdata = {
             .avatar = notif->account->avatar,
-            .username = notif->account->display_name,
+            .username = notif_display_name,
             .action = (local_status->reblog ? notification_type_compact_str(notif->type) : notification_type_str(notif->type)),
             .action_item = notification_type_svg(notif->type),
         };
         notif_info = tmpl_gen_notification(&tdata, NULL);
+        if (notif_display_name != notif->account->display_name)
+            free(notif_display_name);
     }
 
     if (status->in_reply_to_id && status->in_reply_to_account_id)