@atproto/api 0.12.1 → 0.12.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @atproto/api
 
+## 0.12.2
+
+### Patch Changes
+
+- [#2344](https://github.com/bluesky-social/atproto/pull/2344) [`abc6f82da`](https://github.com/bluesky-social/atproto/commit/abc6f82da38abef2b1bbe8d9e41a0534a5418c9e) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Support muting words that contain apostrophes and other punctuation
+
 ## 0.12.1
 
 ### Patch Changes

package/dist/moderation/mutewords.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"mutewords.d.ts","sourceRoot":"","sources":["../../src/moderation/mutewords.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAuBlE,wBAAgB,YAAY,CAAC,EAC3B,UAAU,EACV,IAAI,EACJ,MAAM,EACN,WAAW,EACX,SAAS,GACV,EAAE;IACD,UAAU,EAAE,gBAAgB,CAAC,SAAS,EAAE,CAAA;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,oBAAoB,CAAC,IAAI,EAAE,CAAA;IACpC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;CACrB,WAuFA"}
+{"version":3,"file":"mutewords.d.ts","sourceRoot":"","sources":["../../src/moderation/mutewords.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,oBAAoB,EAAE,MAAM,WAAW,CAAA;AAuBlE,wBAAgB,YAAY,CAAC,EAC3B,UAAU,EACV,IAAI,EACJ,MAAM,EACN,WAAW,EACX,SAAS,GACV,EAAE;IACD,UAAU,EAAE,gBAAgB,CAAC,SAAS,EAAE,CAAA;IACxC,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,oBAAoB,CAAC,IAAI,EAAE,CAAA;IACpC,WAAW,CAAC,EAAE,MAAM,EAAE,CAAA;IACtB,SAAS,CAAC,EAAE,MAAM,EAAE,CAAA;CACrB,WAiEA"}

package/dist/moderation/mutewords.js

@@ -64,30 +64,16 @@ function hasMutedWord({ mutedWords, text, facets, outlineTags, languages, }) {
                 return true;
             if (mutedWord.length > wordTrimmedPunctuation.length)
                 continue;
-            // handle hyphenated, slash separated words, etc
-            if (REGEX.SEPARATORS.test(wordTrimmedPunctuation)) {
-                // check against full normalized phrase
-                const wordNormalizedSeparators = wordTrimmedPunctuation.replace(REGEX.SEPARATORS, ' ');
-                const mutedWordNormalizedSeparators = mutedWord.replace(REGEX.SEPARATORS, ' ');
-                // hyphenated (or other sep) to spaced words
-                if (wordNormalizedSeparators === mutedWordNormalizedSeparators)
+            if (/\p{P}+/u.test(wordTrimmedPunctuation)) {
+                const spacedWord = wordTrimmedPunctuation.replace(/\p{P}+/gu, ' ');
+                if (spacedWord === mutedWord)
                     return true;
-                /* Disabled for now e.g. `super-cool` to `supercool`
-                const wordNormalizedCompressed = wordNormalizedSeparators.replace(
-                  REGEX.WORD_BOUNDARY,
-                  '',
-                )
-                const mutedWordNormalizedCompressed =
-                  mutedWordNormalizedSeparators.replace(/\s+?/g, '')
-                // hyphenated (or other sep) to non-hyphenated contiguous word
-                if (mutedWordNormalizedCompressed === wordNormalizedCompressed)
-                  return true
-                */
-                // then individual parts of separated phrases/words
-                const wordParts = wordTrimmedPunctuation.split(REGEX.SEPARATORS);
-                for (const wp of wordParts) {
-                    // still retain internal punctuation
-                    if (wp === mutedWord)
+                const contiguousWord = spacedWord.replace(/\s/gu, '');
+                if (contiguousWord === mutedWord)
+                    return true;
+                const wordParts = wordTrimmedPunctuation.split(/\p{P}+/u);
+                for (const wordPart of wordParts) {
+                    if (wordPart === mutedWord)
                         return true;
                 }
             }

package/dist/moderation/mutewords.js.map

@@ -1 +1 @@
-{"version":3,"file":"mutewords.js","sourceRoot":"","sources":["../../src/moderation/mutewords.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mutewords.js","sourceRoot":"","sources":["../../src/moderation/mutewords.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.12.1",
+  "version": "0.12.2",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [

package/src/moderation/mutewords.ts

@@ -82,38 +82,16 @@ export function hasMutedWord({
       if (mutedWord === wordTrimmedPunctuation) return true
       if (mutedWord.length > wordTrimmedPunctuation.length) continue
 
-      // handle hyphenated, slash separated words, etc
-      if (REGEX.SEPARATORS.test(wordTrimmedPunctuation)) {
-        // check against full normalized phrase
-        const wordNormalizedSeparators = wordTrimmedPunctuation.replace(
-          REGEX.SEPARATORS,
-          ' ',
-        )
-        const mutedWordNormalizedSeparators = mutedWord.replace(
-          REGEX.SEPARATORS,
-          ' ',
-        )
-        // hyphenated (or other sep) to spaced words
-        if (wordNormalizedSeparators === mutedWordNormalizedSeparators)
-          return true
+      if (/\p{P}+/u.test(wordTrimmedPunctuation)) {
+        const spacedWord = wordTrimmedPunctuation.replace(/\p{P}+/gu, ' ')
+        if (spacedWord === mutedWord) return true
 
-        /* Disabled for now e.g. `super-cool` to `supercool`
-        const wordNormalizedCompressed = wordNormalizedSeparators.replace(
-          REGEX.WORD_BOUNDARY,
-          '',
-        )
-        const mutedWordNormalizedCompressed =
-          mutedWordNormalizedSeparators.replace(/\s+?/g, '')
-        // hyphenated (or other sep) to non-hyphenated contiguous word
-        if (mutedWordNormalizedCompressed === wordNormalizedCompressed)
-          return true
-        */
+        const contiguousWord = spacedWord.replace(/\s/gu, '')
+        if (contiguousWord === mutedWord) return true
 
-        // then individual parts of separated phrases/words
-        const wordParts = wordTrimmedPunctuation.split(REGEX.SEPARATORS)
-        for (const wp of wordParts) {
-          // still retain internal punctuation
-          if (wp === mutedWord) return true
+        const wordParts = wordTrimmedPunctuation.split(/\p{P}+/u)
+        for (const wordPart of wordParts) {
+          if (wordPart === mutedWord) return true
         }
       }
     }

package/tests/bsky-agent.test.ts

@@ -1582,6 +1582,13 @@ describe('agent', () => {
         expect(end.mutedWords.find((m) => m.value === '##️⃣')).toBeFalsy()
       })
 
+      it(`apostrophe: Bluesky's`, async () => {
+        await agent.upsertMutedWords([{ value: `Bluesky's`, targets: [] }])
+        const { mutedWords } = (await agent.getPreferences()).moderationPrefs
+
+        expect(mutedWords.find((m) => m.value === `Bluesky's`)).toBeTruthy()
+      })
+
       describe(`invalid characters`, () => {
         it('zero width space', async () => {
           const prev = (await agent.getPreferences()).moderationPrefs

package/tests/moderation-mutewords.test.ts

@@ -89,6 +89,22 @@ describe(`hasMutedWord`, () => {
       expect(match).toBe(true)
     })
 
+    it(`match: single char with length > 1 ☠︎`, () => {
+      const rt = new RichText({
+        text: `Idk why ☠︎ but maybe`,
+      })
+      rt.detectFacetsWithoutResolution()
+
+      const match = hasMutedWord({
+        mutedWords: [{ value: '☠︎', targets: ['content'] }],
+        text: rt.text,
+        facets: rt.facets,
+        outlineTags: [],
+      })
+
+      expect(match).toBe(true)
+    })
+
     it(`no match: long muted word, short post`, () => {
       const rt = new RichText({
         text: `hey`,
@@ -248,6 +264,57 @@ describe(`hasMutedWord`, () => {
       })
     })
 
+    describe(`apostrophes: Bluesky's`, () => {
+      const rt = new RichText({
+        text: `Yay, Bluesky's mutewords work`,
+      })
+      rt.detectFacetsWithoutResolution()
+
+      it(`match: Bluesky's`, () => {
+        const match = hasMutedWord({
+          mutedWords: [{ value: `Bluesky's`, targets: ['content'] }],
+          text: rt.text,
+          facets: rt.facets,
+          outlineTags: [],
+        })
+
+        expect(match).toBe(true)
+      })
+
+      it(`match: Bluesky`, () => {
+        const match = hasMutedWord({
+          mutedWords: [{ value: 'Bluesky', targets: ['content'] }],
+          text: rt.text,
+          facets: rt.facets,
+          outlineTags: [],
+        })
+
+        expect(match).toBe(true)
+      })
+
+      it(`match: bluesky`, () => {
+        const match = hasMutedWord({
+          mutedWords: [{ value: 'bluesky', targets: ['content'] }],
+          text: rt.text,
+          facets: rt.facets,
+          outlineTags: [],
+        })
+
+        expect(match).toBe(true)
+      })
+
+      it(`match: blueskys`, () => {
+        const match = hasMutedWord({
+          mutedWords: [{ value: 'blueskys', targets: ['content'] }],
+          text: rt.text,
+          facets: rt.facets,
+          outlineTags: [],
+        })
+
+        expect(match).toBe(true)
+      })
+    })
+
     describe(`Why so S@assy?`, () => {
       const rt = new RichText({
         text: `Why so S@assy?`,
@@ -398,6 +465,17 @@ describe(`hasMutedWord`, () => {
         expect(match).toBe(true)
       })
 
+      it(`match: bad`, () => {
+        const match = hasMutedWord({
+          mutedWords: [{ value: `bad`, targets: ['content'] }],
+          text: rt.text,
+          facets: rt.facets,
+          outlineTags: [],
+        })
+
+        expect(match).toBe(true)
+      })
+
       it(`match: super bad`, () => {
         const match = hasMutedWord({
           mutedWords: [{ value: `super bad`, targets: ['content'] }],
@@ -417,7 +495,7 @@ describe(`hasMutedWord`, () => {
           outlineTags: [],
         })
 
-        expect(match).toBe(false)
+        expect(match).toBe(true)
       })
     })
 
@@ -474,7 +552,7 @@ describe(`hasMutedWord`, () => {
           outlineTags: [],
         })
 
-        expect(match).toBe(false)
+        expect(match).toBe(true)
       })
     })