Merge branch 'sss-objects' into 'develop'

Object/Map support for server-side storage + synchronized mutes

See merge request pleroma/pleroma-fe!2104

src/services/notification_utils/notification_utils.js

@@ -1,4 +1,4 @@
-import { muteWordHits } from '../status_parser/status_parser.js'
+import { muteFilterHits } from '../status_parser/status_parser.js'
 import { showDesktopNotification } from '../desktop_notification_utils/desktop_notification_utils.js'
 import { useI18nStore } from 'src/stores/i18n.js'
 import { useAnnouncementsStore } from 'src/stores/announcements'
@@ -58,10 +58,10 @@ const sortById = (a, b) => {
   }
 }
 
-const isMutedNotification = (store, notification) => {
-  if (!notification.status) return
-  const rootGetters = store.rootGetters || store.getters
-  return notification.status.muted || muteWordHits(notification.status, rootGetters.mergedConfig.muteWords).length > 0
+const isMutedNotification = (notification) => {
+  if (!notification.status) return false
+  if (notification.status.muted) return true
+  return muteFilterHits(notification.status).length > 0
 }
 
 export const maybeShowNotification = (store, notification) => {
@@ -69,7 +69,7 @@ export const maybeShowNotification = (store, notification) => {
 
   if (notification.seen) return
   if (!visibleTypes(store).includes(notification.type)) return
-  if (notification.type === 'mention' && isMutedNotification(store, notification)) return
+  if (notification.type === 'mention' && isMutedNotification(notification)) return
 
   const notificationObject = prepareNotificationObject(notification, useI18nStore().i18n)
   showDesktopNotification(rootState, notificationObject)

src/services/status_parser/status_parser.js

@@ -1,11 +1,59 @@
-import { filter } from 'lodash'
-
-export const muteWordHits = (status, muteWords) => {
+export const muteFilterHits = (muteFilters, status) => {
   const statusText = status.text.toLowerCase()
   const statusSummary = status.summary.toLowerCase()
-  const hits = filter(muteWords, (muteWord) => {
-    return statusText.includes(muteWord.toLowerCase()) || statusSummary.includes(muteWord.toLowerCase())
-  })
+  const replyToUser = status.in_reply_to_screen_name?.toLowerCase()
+  const poster = status.user.screen_name.toLowerCase()
+  const mentions = (status.attentions || []).map(att => att.screen_name.toLowerCase())
 
-  return hits
+
+  return muteFilters.toSorted((a,b) => b.order - a.order).map(filter => {
+    const { hide, expires, name, value, type, enabled} = filter
+    if (!enabled) return false
+    if (value === '') return false
+    if (expires !== null && expires < Date.now()) return false
+    switch (type) {
+      case 'word': {
+        if (statusText.includes(value) || statusSummary.includes(value)) {
+          return { hide, name }
+        }
+        break
+      }
+      case 'regexp': {
+        try {
+          const re = new RegExp(value, 'i')
+          if (re.test(statusText) || re.test(statusSummary)) {
+            return { hide, name }
+          }
+          return false
+        } catch {
+          return false
+        }
+      }
+      case 'user': {
+        if (
+          poster.includes(value) ||
+            replyToUser.includes(value) ||
+            mentions.some(mention => mention.includes(value))
+        ) {
+          return { hide, name }
+        }
+        break
+      }
+      case 'user_regexp': {
+        try {
+          const re = new RegExp(value, 'i')
+          if (
+            re.test(poster) ||
+              re.test(replyToUser) ||
+              mentions.some(mention => re.test(mention))
+          ) {
+            return { hide, name }
+          }
+          return false
+        } catch {
+          return false
+        }
+      }
+    }
+  }).filter(_ => _)
 }