@atproto/api 0.10.1 → 0.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/api",
-  "version": "0.10.1",
+  "version": "0.10.2",
   "license": "MIT",
   "description": "Client library for atproto and Bluesky",
   "keywords": [
@@ -21,14 +21,14 @@
     "typed-emitter": "^2.1.0",
     "zod": "^3.21.4",
     "@atproto/common-web": "^0.2.3",
-    "@atproto/lexicon": "^0.3.1",
-    "@atproto/syntax": "^0.1.5",
-    "@atproto/xrpc": "^0.4.1"
+    "@atproto/lexicon": "^0.3.2",
+    "@atproto/syntax": "^0.2.0",
+    "@atproto/xrpc": "^0.4.2"
   },
   "devDependencies": {
     "common-tags": "^1.8.2",
-    "@atproto/lex-cli": "^0.3.0",
-    "@atproto/dev-env": "^0.2.33"
+    "@atproto/lex-cli": "^0.3.1",
+    "@atproto/dev-env": "^0.2.34"
   },
   "scripts": {
     "codegen": "pnpm docgen && node ./scripts/generate-code.mjs && lex gen-api ./src/client ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/*",

package/src/bsky-agent.ts

@@ -668,24 +668,24 @@ async function updateMutedWords(
 
     if (mutedWordsPref && AppBskyActorDefs.isMutedWordsPref(mutedWordsPref)) {
       if (action === 'upsert' || action === 'update') {
-        for (const newItem of mutedWords) {
+        for (const word of mutedWords) {
           let foundMatch = false
 
           for (const existingItem of mutedWordsPref.items) {
-            if (existingItem.value === newItem.value) {
+            if (existingItem.value === sanitizeMutedWord(word).value) {
               existingItem.targets =
                 action === 'upsert'
                   ? Array.from(
-                      new Set([...existingItem.targets, ...newItem.targets]),
+                      new Set([...existingItem.targets, ...word.targets]),
                     )
-                  : newItem.targets
+                  : word.targets
               foundMatch = true
               break
             }
           }
 
           if (action === 'upsert' && !foundMatch) {
-            mutedWordsPref.items.push(sanitizeMutedWord(newItem))
+            mutedWordsPref.items.push(sanitizeMutedWord(word))
           }
         }
       } else if (action === 'remove') {

package/src/client/lexicons.ts

@@ -4867,7 +4867,7 @@ export const schemaDict = {
       main: {
         type: 'query',
         description:
-          'Fetch all labels from a labeler created after a certain date. DEPRECATED: use queryLabels or subscribeLabels instead',
+          'DEPRECATED: use queryLabels or subscribeLabels instead -- Fetch all labels from a labeler created after a certain date.',
         parameters: {
           type: 'params',
           properties: {

package/src/rich-text/detection.ts

@@ -70,27 +70,25 @@ export function detectFacets(text: UnicodeString): Facet[] | undefined {
     }
   }
   {
-    const re = /(?:^|\s)(#[^\d\s]\S*)(?=\s)?/g
+    const re = /(^|\s)#((?!\ufe0f)[^\d\s]\S*)(?=\s)?/g
     while ((match = re.exec(text.utf16))) {
-      let [tag] = match
-      const hasLeadingSpace = /^\s/.test(tag)
+      let [, leading, tag] = match
 
       tag = tag.trim().replace(/\p{P}+$/gu, '') // strip ending punctuation
 
-      // inclusive of #, max of 64 chars
-      if (tag.length > 66) continue
+      if (tag.length === 0 || tag.length > 64) continue
 
-      const index = match.index + (hasLeadingSpace ? 1 : 0)
+      const index = match.index + leading.length
 
       facets.push({
         index: {
           byteStart: text.utf16IndexToUtf8Index(index),
-          byteEnd: text.utf16IndexToUtf8Index(index + tag.length), // inclusive of last char
+          byteEnd: text.utf16IndexToUtf8Index(index + 1 + tag.length),
         },
         features: [
           {
             $type: 'app.bsky.richtext.facet#tag',
-            tag: tag.replace(/^#/, ''),
+            tag: tag,
           },
         ],
       })

package/tests/bsky-agent.test.ts

@@ -1199,10 +1199,17 @@ describe('agent', () => {
       })
 
       it('upsertMutedWords with #', async () => {
+        await agent.upsertMutedWords([
+          { value: 'hashtag', targets: ['content'] },
+        ])
         await agent.upsertMutedWords([{ value: '#hashtag', targets: ['tag'] }])
         const { mutedWords } = await agent.getPreferences()
         expect(mutedWords.find((m) => m.value === '#hashtag')).toBeFalsy()
-        expect(mutedWords.find((m) => m.value === 'hashtag')).toBeTruthy()
+        expect(mutedWords.find((m) => m.value === 'hashtag')).toStrictEqual({
+          value: 'hashtag',
+          targets: ['content', 'tag'],
+        })
+        expect(mutedWords.filter((m) => m.value === 'hashtag').length).toBe(1)
       })
 
       it('updateMutedWord', async () => {

package/tests/rich-text-detection.test.ts

@@ -241,15 +241,16 @@ describe('detectFacets', () => {
       ['body #1', [], []],
       ['body #a1', ['a1'], [{ byteStart: 5, byteEnd: 8 }]],
       ['#', [], []],
+      ['#?', [], []],
       ['text #', [], []],
       ['text # text', [], []],
       [
-        'body #thisisa64characterstring_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
-        ['thisisa64characterstring_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'],
-        [{ byteStart: 5, byteEnd: 71 }],
+        'body #thisisa64characterstring_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa',
+        ['thisisa64characterstring_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa'],
+        [{ byteStart: 5, byteEnd: 70 }],
       ],
       [
-        'body #thisisa65characterstring_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab',
+        'body #thisisa65characterstring_aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaab',
         [],
         [],
       ],
@@ -297,6 +298,17 @@ describe('detectFacets', () => {
           { byteStart: 17, byteEnd: 22 },
         ],
       ],
+      ['this #️⃣tag should not be a tag', [], []],
+      [
+        'this ##️⃣tag should be a tag',
+        ['#️⃣tag'],
+        [
+          {
+            byteStart: 5,
+            byteEnd: 16,
+          },
+        ],
+      ],
     ]
 
     for (const [input, tags, indices] of inputs) {