Merge pull request 'iceshrimp' (#2) from mirror/notfire-akkoma-fe:iceshrimp into iceshrimp

Reviewed-on: synth.download/akkoma-fe#2

README.md

@@ -32,6 +32,7 @@
     - all emojis go by their unicode names instead of the shortened ones, eg :100: is now :hundred_points:
         - this wasn't intentional, but keeping the old names would require way more work
     - script to get new emojis is included for future unicode versions
+- add toggle for showing post edit notifications
 
 ---
 

src/components/notification/notification.vue

@@ -118,6 +118,14 @@
               {{ ' ' }}
               <small>{{ $t('notifications.bit_note') }}</small>
             </span>
+            <span v-if="notification.type === 'update'">
+              <FAIcon
+                class="type-icon"
+                icon="pen"
+              />
+              {{ ' ' }}
+              <small>{{ $t('notifications.edited') }}</small>
+            </span>
             <span v-if="notification.type === 'move'">
               <FAIcon
                 class="type-icon"

src/components/notifications/notification_filters.vue

@@ -79,6 +79,15 @@
             :class="{ 'menu-checkbox-checked': filters.bites }"
           />{{ $t('settings.notification_visibility_bites') }}
         </button>
+        <button
+          class="button-default dropdown-item"
+          @click="toggleNotificationFilter('edits')"
+        >
+          <span
+            class="menu-checkbox"
+            :class="{ 'menu-checkbox-checked': filters.edits }"
+          />{{ $t('settings.notification_visibility_edits') }}
+        </button>
       </div>
     </template>
     <template #trigger>

src/components/settings_modal/tabs/notifications_tab.vue

@@ -51,6 +51,11 @@
                 {{ $t('settings.notification_visibility_bites') }}
               </BooleanSetting>
             </li>
+            <li>
+              <BooleanSetting path="notificationVisibility.edits">
+                {{ $t('settings.notification_visibility_edits') }}
+              </BooleanSetting>
+            </li>
           </ul>
         </li>
       </ul>

src/components/user_profile/user_profile.js

@@ -149,7 +149,7 @@ const UserProfile = {
       } else {
         this.$store.dispatch('fetchUser', userNameOrId)
           .then(({ id, relationship, background_image }) => {
-            this.note = relationship.note
+            this.note = relationship?.note
             this.$store.dispatch('setDisplayBackground', background_image)
             return loadById(id)
           })

src/i18n/en.json

@@ -329,6 +329,7 @@
         "bit": "bit you!",
         "bit_note": "bit your note!",
         "broken_favorite": "Unknown post, searching for it…",
+        "edited": "edited a post",
         "error": "Error fetching notifications: {0}",
         "favorited_you": "favorited your post",
         "follow_request": "wants to follow you",
@@ -692,6 +693,7 @@
         "notification_setting_sounds": "Sounds",
         "notification_visibility": "Types of notifications to show",
         "notification_visibility_bites": "Bites",
+        "notification_visibility_edits": "Post edits",
         "notification_visibility_emoji_reactions": "Reactions",
         "notification_visibility_follows": "Follows",
         "notification_visibility_likes": "Favorites",

src/services/notification_utils/notification_utils.js

@@ -17,11 +17,12 @@ export const visibleTypes = store => {
     rootState.config.notificationVisibility.emojiReactions && 'pleroma:emoji_reaction',
     rootState.config.notificationVisibility.polls && 'poll',
     rootState.config.notificationVisibility.bites && 'bite',
-    rootState.config.notificationVisibility.bites && 'bite_note'
+    rootState.config.notificationVisibility.bites && 'bite_note',
+    rootState.config.notificationVisibility.edits && 'update'
   ].filter(_ => _))
 }
 
-const statusNotifications = ['like', 'mention', 'repeat', 'pleroma:emoji_reaction', 'poll', 'bite_note']
+const statusNotifications = ['like', 'mention', 'repeat', 'pleroma:emoji_reaction', 'poll', 'bite_note', 'update']
 
 export const isStatusNotification = (type) => includes(statusNotifications, type)
 
@@ -110,6 +111,9 @@ export const prepareNotificationObject = (notification, i18n, store) => {
     case 'bite_note':
       i18nString = 'bit_note'
       break
+    case 'update':
+      i18nString = 'edited'
+      break
   }
 
   if (notification.type === 'pleroma:emoji_reaction') {