pleroma-fe

commit: e0add7a44e6d626ddfcb5869cf5cade719ca2061
parent 92377beab12cf55df146fce417ba17276515fa61
Author: Shpuld Shpludson <shp@cock.li>
Date:   Mon, 20 Jul 2020 14:06:16 +0000

Merge branch 'features/favicons' into 'develop'

status.vue: Add support for favicons

See merge request pleroma/pleroma-fe!1076
Diffstat:
M
src/components/status/status.vue
11
+++++++++++
M
src/services/entity_normalizer/entity_normalizer.service.js
1
+

2 files changed, 12 insertions(+), 0 deletions(-)
diff --git a/src/components/status/status.vue b/src/components/status/status.vue
@@ -143,6 +143,11 @@
                 >
                   {{ status.user.screen_name }}
                 </router-link>
+                <img
+                  class="status-favicon"
+                  v-if="!!(status.user && status.user.favicon)"
+                  :src="status.user.favicon"
+                >
               </div>
 
               <span class="heading-right">
@@ -428,6 +433,12 @@ $status-margin: 0.75em;
     }
   }
 
+  .status-favicon {
+    height: 18px;
+    width: 18px;
+    margin-right: 0.4em;
+  }
+
   .media-heading {
     padding: 0;
     vertical-align: bottom;
diff --git a/src/services/entity_normalizer/entity_normalizer.service.js b/src/services/entity_normalizer/entity_normalizer.service.js
@@ -79,6 +79,7 @@ export const parseUser = (data) => {
       const relationship = data.pleroma.relationship
 
       output.background_image = data.pleroma.background_image
+      output.favicon = data.pleroma.favicon
       output.token = data.pleroma.chat_token
 
       if (relationship) {