Merge pull request #3557 from h3poteto/fix/emoji-reaction

[fix] Display emoji reaction notifications in notifications timeline

.eslintrc.js

@@ -33,6 +33,7 @@ module.exports = {
     '@typescript-eslint/no-explicit-any': 'off',
     camelcase: 'off',
     '@typescript-eslint/camelcase': 'off',
-    'space-before-function-paren': 'off'
+    'space-before-function-paren': 'off',
+    'vue/multi-word-component-names': 'off'
   }
 }

src/renderer/components/organisms/Notification.vue

@@ -6,8 +6,8 @@
       :filters="filters"
       :focused="focused"
       :overlaid="overlaid"
-      reactionType="favourite"
+      reaction-type="favourite"
-      @focusRight="$emit('focusRight')"
+      @focus-right="$emit('focusRight')"
       @select="$emit('selectNotification')"
     >
     </StatusReaction>
@@ -16,7 +16,7 @@
       :message="message"
       :focused="focused"
       :overlaid="overlaid"
-      @focusRight="$emit('focusRight')"
+      @focus-right="$emit('focusRight')"
       @select="$emit('selectNotification')"
     >
     </follow>
@@ -25,7 +25,7 @@
       :message="message"
       :focused="focused"
       :overlaid="overlaid"
-      @focusRight="$emit('focusRight')"
+      @focus-right="$emit('focusRight')"
       @select="$emit('selectNotification')"
     >
     </FollowRequest>
@@ -35,9 +35,9 @@
       :filters="filters"
       :focused="focused"
       :overlaid="overlaid"
-      v-on:update="updateToot"
+      @update="updateToot"
-      v-on:delete="deleteToot"
+      @delete="deleteToot"
-      @focusRight="$emit('focusRight')"
+      @focus-right="$emit('focusRight')"
       @select="$emit('selectNotification')"
     >
     </mention>
@@ -47,8 +47,8 @@
       :filters="filters"
       :focused="focused"
       :overlaid="overlaid"
-      reactionType="quote"
+      reaction-type="quote"
-      @focusRight="$emit('focusRight')"
+      @focus-right="$emit('focusRight')"
       @select="$emit('selectNotification')"
     >
     </StatusReaction>
@@ -58,8 +58,8 @@
       :filters="filters"
       :focused="focused"
       :overlaid="overlaid"
-      reactionType="reblog"
+      reaction-type="reblog"
-      @focusRight="$emit('focusRight')"
+      @focus-right="$emit('focusRight')"
       @select="$emit('selectNotification')"
     >
     </StatusReaction>
@@ -69,7 +69,7 @@
       :filters="filters"
       :focused="focused"
       :overlaid="overlaid"
-      @focusRight="$emit('focusRight')"
+      @focus-right="$emit('focusRight')"
       @select="$emit('selectNotification')"
     >
     </status>
@@ -79,8 +79,8 @@
       :filters="filters"
       :focused="focused"
       :overlaid="overlaid"
-      reactionType="poll-vote"
+      reaction-type="poll-vote"
-      @focusRight="$emit('focusRight')"
+      @focus-right="$emit('focusRight')"
       @select="$emit('selectNotification')"
     >
     </StatusReaction>
@@ -90,8 +90,19 @@
       :filters="filters"
       :focused="focused"
       :overlaid="overlaid"
-      reactionType="poll-expired"
+      reaction-type="poll-expired"
-      @focusRight="$emit('focusRight')"
+      @focus-right="$emit('focusRight')"
+      @select="$emit('selectNotification')"
+    >
+    </StatusReaction>
+    <StatusReaction
+      v-else-if="message.type === 'emoji_reaction'"
+      :message="message"
+      :filters="filters"
+      :focused="focused"
+      :overlaid="overlaid"
+      reaction-type="emoji-reaction"
+      @focus-right="$emit('focusRight')"
       @select="$emit('selectNotification')"
     >
     </StatusReaction>
@@ -108,25 +119,7 @@ import Mention from './Notification/Mention.vue'
 import Status from './Notification/Status.vue'
 
 export default defineComponent({
-  name: 'notification',
+  name: 'Notification',
-  props: {
-    message: {
-      type: Object as PropType<Entity.Notification>,
-      default: {}
-    },
-    filters: {
-      type: Array as PropType<Array<Entity.Filter>>,
-      default: []
-    },
-    focused: {
-      type: Boolean,
-      defalt: false
-    },
-    overlaid: {
-      type: Boolean,
-      default: false
-    }
-  },
   components: {
     StatusReaction,
     Follow,
@@ -134,6 +127,25 @@ export default defineComponent({
     Mention,
     Status
   },
+  props: {
+    message: {
+      type: Object as PropType<Entity.Notification>,
+      default: () => ({})
+    },
+    filters: {
+      type: Array as PropType<Array<Entity.Filter>>,
+      default: () => []
+    },
+    focused: {
+      type: Boolean,
+      defalt: () => false
+    },
+    overlaid: {
+      type: Boolean,
+      default: () => false
+    }
+  },
+  emits: ['focusRight', 'selectNotification', 'update', 'delete'],
   setup(_props, ctx) {
     const updateToot = (message: Entity.Status) => {
       return ctx.emit('update', message)

src/renderer/components/organisms/Notification/StatusReaction.vue

@@ -183,7 +183,7 @@ export default defineComponent({
           return 'notification.poll_vote.body'
         case 'quote':
           return 'notification.quote.body'
-        case 'reaction':
+        case 'emoji-reaction':
           return 'notification.reaction.body'
         case 'reblog':
           return 'notification.reblog.body'