fix: include @ and # on filter post (#815)

fix: include @ and # on filter search post query
myriadsocial · Mar 20, 2023 · 8a1c21c · 8a1c21c
1 parent 33e01ba
commit 8a1c21c
Showing 1 changed file with 74 additions and 0 deletions.
diff --git a/src/services/filter-builder.service.ts b/src/services/filter-builder.service.ts
@@ -824,6 +824,7 @@ export class FilterBuilderService {
 
     if (q.startsWith('#')) {
       const hashtag = q.replace('#', '').trim().toLowerCase();
+      const hashtagRegexp = new RegExp(`#${hashtag}\\b`, 'i');
 
       filterPost.push(
         {
@@ -862,9 +863,46 @@ export class FilterBuilderService {
             {createdBy: this.currentUser[securityId]},
           ],
         },
+        {
+          and: [
+            {rawText: {regexp: hashtagRegexp}},
+            {visibility: VisibilityType.PUBLIC},
+            {createdBy: {nin: blockedFriendIds}},
+          ],
+        },
+        {
+          and: [
+            {rawText: {regexp: hashtagRegexp}},
+            {visibility: VisibilityType.FRIEND},
+            {createdBy: {inq: approvedFriendIds}},
+          ],
+        },
+        {
+          and: [
+            {rawText: {regexp: hashtagRegexp}},
+            {visibility: VisibilityType.SELECTED},
+            {selectedUserIds: {inq: [this.currentUser[securityId]]}} as Where,
+            {createdBy: {nin: blockedFriendIds}},
+          ],
+        },
+        {
+          and: [
+            {rawText: {regexp: hashtagRegexp}},
+            {visibility: VisibilityType.TIMELINE},
+            {selectedUserIds: {inq: [this.currentUser[securityId]]}} as Where,
+            {createdBy: {nin: blockedFriendIds}},
+          ],
+        },
+        {
+          and: [
+            {rawText: {regexp: hashtagRegexp}},
+            {createdBy: this.currentUser[securityId]},
+          ],
+        },
       );
     } else if (q.startsWith('@')) {
       const mention = q.replace('@', '').trim();
+      const mentionRegexp = new RegExp(`@${mention}\\b`, 'i');
 
       filterPost.push(
         {
@@ -923,6 +961,42 @@ export class FilterBuilderService {
             {createdBy: this.currentUser[securityId]},
           ],
         },
+        {
+          and: [
+            {rawText: {regexp: mentionRegexp}},
+            {visibility: VisibilityType.PUBLIC},
+            {createdBy: {nin: blockedFriendIds}},
+          ],
+        },
+        {
+          and: [
+            {rawText: {regexp: mentionRegexp}},
+            {visibility: VisibilityType.FRIEND},
+            {createdBy: {inq: approvedFriendIds}},
+          ],
+        },
+        {
+          and: [
+            {rawText: {regexp: mentionRegexp}},
+            {visibility: VisibilityType.SELECTED},
+            {selectedUserIds: {inq: [this.currentUser[securityId]]}} as Where,
+            {createdBy: {nin: blockedFriendIds}},
+          ],
+        },
+        {
+          and: [
+            {rawText: {regexp: mentionRegexp}},
+            {visibility: VisibilityType.TIMELINE},
+            {selectedUserIds: {inq: [this.currentUser[securityId]]}} as Where,
+            {createdBy: {nin: blockedFriendIds}},
+          ],
+        },
+        {
+          and: [
+            {rawText: {regexp: mentionRegexp}},
+            {createdBy: this.currentUser[securityId]},
+          ],
+        },
       );
     } else {
       const regexTopic = new RegExp(`\\b${q}\\b`, 'i');