Fix filtering hashtag

src/components/Timeline/Default.tsx

@@ -45,10 +45,6 @@ const TimelineDefault: React.FC<Props> = ({
   disableDetails = false,
   disableOnPress = false
 }) => {
-  if (highlighted) {
-    disableOnPress = true
-  }
-
   const { colors } = useTheme()
   const instanceAccount = useSelector(getInstanceAccount, () => true)
   const navigation = useNavigation<StackNavigationProp<TabLocalStackParamList>>()

src/components/Timeline/Shared/Filtered.tsx

@@ -49,29 +49,44 @@ export const shouldFilter = ({
   const ownAccount = getInstanceAccount(store.getState())?.id === status.account?.id
 
   let shouldFilter: string | null = null
+
   if (!ownAccount) {
+    let rawContent = ''
     const parser = new htmlparser2.Parser({
       ontext: (text: string) => {
         if (!copiableContent.current.complete) {
           copiableContent.current.content = copiableContent.current.content + text
         }
 
+        rawContent = rawContent + text
+      }
+    })
+    if (status.spoiler_text) {
+      parser.write(status.spoiler_text)
+      rawContent = rawContent + `\n\n`
+    }
+    parser.write(status.content)
+    parser.end()
+
     const checkFilter = (filter: Mastodon.Filter) => {
       const escapedPhrase = filter.phrase.replace(/[.*+?^${}()|[\]\\]/g, '\\$&') // $& means the whole matched string
       switch (filter.whole_word) {
         case true:
-              if (new RegExp('\\b' + escapedPhrase + '\\b').test(text)) {
+          if (new RegExp(`\\B${escapedPhrase}\\b`).test(rawContent)) {
             shouldFilter = filter.phrase
           }
           break
         case false:
-              if (new RegExp(escapedPhrase).test(text)) {
+          if (new RegExp(escapedPhrase).test(rawContent)) {
             shouldFilter = filter.phrase
           }
           break
       }
     }
     instance?.filters?.forEach(filter => {
+      if (shouldFilter) {
+        return
+      }
       if (filter.expires_at) {
         if (new Date().getTime() > new Date(filter.expires_at).getTime()) {
           return
@@ -103,11 +118,7 @@ export const shouldFilter = ({
           }
       }
     })
-      }
-    })
-    status.spoiler_text && parser.write(status.spoiler_text)
-    parser.write(status.content)
-    parser.end()
+
     copiableContent.current.complete = true
   }