Merge branch 'hj/2.7.1-fixes' into shigusegubu-themes3

src/components/status/status.vue

@@ -3,8 +3,7 @@
     v-if="!hideStatus"
     ref="root"
     class="Status"
-    :class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }, userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]"
-    :style="[ userStyle ]"
+    :class="[{ '-focused': isFocused }, { '-conversation': inlineExpanded }]"
   >
     <div
       v-if="error"
@@ -121,6 +120,8 @@
 
       <div
         v-if="!deleted"
+        :class="[userClass, { highlighted: userStyle, '-repeat': retweet && !inConversation }]"
+        :style="[ userStyle ]"
         class="status-container"
         :data-tags="tags"
       >

src/modules/instance.js

@@ -250,21 +250,15 @@ const instance = {
         }, {})
     },
     standardEmojiList (state) {
-      if (!state.standardEmojiList) {
-        state.standardEmojiList = SORTED_EMOJI_GROUP_IDS
-          .map(groupId => (state.emoji[groupId] || []).map(k => injectAnnotations(k, state.unicodeEmojiAnnotations)))
-          .reduce((a, b) => a.concat(b), [])
-      }
-      return state.standardEmojiList
+      return SORTED_EMOJI_GROUP_IDS
+        .map(groupId => (state.emoji[groupId] || []).map(k => injectAnnotations(k, state.unicodeEmojiAnnotations)))
+        .reduce((a, b) => a.concat(b), [])
     },
     standardEmojiGroupList (state) {
-      if (!state.standardEmojiGroupList) {
-        state.standardEmojiGroupList = SORTED_EMOJI_GROUP_IDS.map(groupId => ({
-          id: groupId,
-          emojis: (state.emoji[groupId] || []).map(k => injectAnnotations(k, state.unicodeEmojiAnnotations))
-        }))
-      }
-      return state.standardEmojiGroupList
+      return SORTED_EMOJI_GROUP_IDS.map(groupId => ({
+        id: groupId,
+        emojis: (state.emoji[groupId] || []).map(k => injectAnnotations(k, state.unicodeEmojiAnnotations))
+      }))
     },
     instanceDomain (state) {
       return new URL(state.server).hostname