@atproto/api 0.10.2 → 0.10.4

package/CHANGELOG.md

@@ -1,5 +1,27 @@
 # @atproto/api
 
+## 0.10.4
+
+### Patch Changes
+
+- [#2260](https://github.com/bluesky-social/atproto/pull/2260) [`6ec885992`](https://github.com/bluesky-social/atproto/commit/6ec8859929a16f9725319cc398b716acf913b01f) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Export regex from rich text detection
+
+- [#2260](https://github.com/bluesky-social/atproto/pull/2260) [`6ec885992`](https://github.com/bluesky-social/atproto/commit/6ec8859929a16f9725319cc398b716acf913b01f) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Disallow rare unicode whitespace characters from tags
+
+- [#2260](https://github.com/bluesky-social/atproto/pull/2260) [`6ec885992`](https://github.com/bluesky-social/atproto/commit/6ec8859929a16f9725319cc398b716acf913b01f) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Allow tags to lead with numbers
+
+## 0.10.3
+
+### Patch Changes
+
+- [#2247](https://github.com/bluesky-social/atproto/pull/2247) [`2a0ceb818`](https://github.com/bluesky-social/atproto/commit/2a0ceb8180faa17de8061d4fa6c361b57a2005ed) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Fix double sanitization bug when editing muted words.
+
+- [#2247](https://github.com/bluesky-social/atproto/pull/2247) [`2a0ceb818`](https://github.com/bluesky-social/atproto/commit/2a0ceb8180faa17de8061d4fa6c361b57a2005ed) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - More sanitization of muted words, including newlines and leading/trailing whitespace
+
+- [#2247](https://github.com/bluesky-social/atproto/pull/2247) [`2a0ceb818`](https://github.com/bluesky-social/atproto/commit/2a0ceb8180faa17de8061d4fa6c361b57a2005ed) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Add `sanitizeMutedWordValue` util
+
+- [#2247](https://github.com/bluesky-social/atproto/pull/2247) [`2a0ceb818`](https://github.com/bluesky-social/atproto/commit/2a0ceb8180faa17de8061d4fa6c361b57a2005ed) Thanks [@estrattonbailey](https://github.com/estrattonbailey)! - Handle hash emoji in mute words
+
 ## 0.10.2
 
 ### Patch Changes

package/dist/bsky-agent.d.ts

@@ -85,7 +85,7 @@ export declare class BskyAgent extends AtpAgent {
     setFeedViewPrefs(feed: string, pref: Partial<BskyFeedViewPreference>): Promise<void>;
     setThreadViewPrefs(pref: Partial<BskyThreadViewPreference>): Promise<void>;
     setInterestsPref(pref: Partial<BskyInterestsPreference>): Promise<void>;
-    upsertMutedWords(mutedWords: AppBskyActorDefs.MutedWord[]): Promise<void>;
+    upsertMutedWords(newMutedWords: AppBskyActorDefs.MutedWord[]): Promise<void>;
     updateMutedWord(mutedWord: AppBskyActorDefs.MutedWord): Promise<void>;
     removeMutedWord(mutedWord: AppBskyActorDefs.MutedWord): Promise<void>;
     hidePost(postUri: string): Promise<void>;

package/dist/index.d.ts

@@ -2,11 +2,13 @@ export { AtUri } from '@atproto/syntax';
 export { BlobRef, lexToJson, stringifyLex, jsonToLex, jsonStringToLex, } from '@atproto/lexicon';
 export { parseLanguage } from '@atproto/common-web';
 export * from './types';
+export * from './util';
 export * from './client';
 export * from './agent';
 export * from './rich-text/rich-text';
 export * from './rich-text/sanitization';
 export * from './rich-text/unicode';
+export * from './rich-text/util';
 export * from './moderation';
 export * from './moderation/types';
 export { LABELS } from './moderation/const/labels';

package/dist/index.js

@@ -9059,13 +9059,17 @@ __export(src_exports2, {
   ListRecord: () => ListRecord,
   ListblockRecord: () => ListblockRecord,
   ListitemRecord: () => ListitemRecord,
+  MENTION_REGEX: () => MENTION_REGEX,
   ModerationDecision: () => ModerationDecision,
   PostRecord: () => PostRecord,
   ProfileRecord: () => ProfileRecord,
   RepostRecord: () => RepostRecord,
   RichText: () => RichText,
   RichTextSegment: () => RichTextSegment,
+  TAG_REGEX: () => TAG_REGEX,
+  TRAILING_PUNCTUATION_REGEX: () => TRAILING_PUNCTUATION_REGEX,
   ThreadgateRecord: () => ThreadgateRecord,
+  URL_REGEX: () => URL_REGEX,
   UnicodeString: () => UnicodeString,
   default: () => AtpAgent,
   jsonStringToLex: () => jsonStringToLex,
@@ -9076,6 +9080,7 @@ __export(src_exports2, {
   moderateProfile: () => moderateProfile,
   moderateUserList: () => moderateUserList,
   parseLanguage: () => parseLanguage,
+  sanitizeMutedWordValue: () => sanitizeMutedWordValue,
   sanitizeRichText: () => sanitizeRichText,
   stringifyLex: () => stringifyLex
 });
@@ -15383,6 +15388,11 @@ var jsonStringToLex = (val) => {
   return jsonToLex(JSON.parse(val));
 };
 
+// src/util.ts
+function sanitizeMutedWordValue(value) {
+  return value.trim().replace(/^#(?!\ufe0f)/, "").replace(/[\r\n\u00AD\u2060\u200D\u200C\u200B]+/, "");
+}
+
 // ../xrpc/src/types.ts
 var errorResponseBody = z.object({
   error: z.string().optional(),
@@ -30131,12 +30141,18 @@ var tlds_default = [
   "\uD55C\uAD6D"
 ];
 
+// src/rich-text/util.ts
+var MENTION_REGEX = /(^|\s|\()(@)([a-zA-Z0-9.-]+)(\b)/g;
+var URL_REGEX = /(^|\s|\()((https?:\/\/[\S]+)|((?<domain>[a-z][a-z0-9]*(\.[a-z0-9]+)+)[\S]*))/gim;
+var TRAILING_PUNCTUATION_REGEX = /\p{P}+$/gu;
+var TAG_REGEX = /(^|\s)[#＃]((?!\ufe0f)[^\s\u00AD\u2060\u200A\u200B\u200C\u200D\u20e2]*[^\d\s\p{P}\u00AD\u2060\u200A\u200B\u200C\u200D\u20e2]+[^\s\u00AD\u2060\u200A\u200B\u200C\u200D\u20e2]*)?/gu;
+
 // src/rich-text/detection.ts
 function detectFacets(text) {
   let match;
   const facets = [];
   {
-    const re = /(^|\s|\()(@)([a-zA-Z0-9.-]+)(\b)/g;
+    const re = MENTION_REGEX;
     while (match = re.exec(text.utf16)) {
       if (!isValidDomain(match[3]) && !match[3].endsWith(".test")) {
         continue;
@@ -30158,7 +30174,7 @@ function detectFacets(text) {
     }
   }
   {
-    const re = /(^|\s|\()((https?:\/\/[\S]+)|((?<domain>[a-z][a-z0-9]*(\.[a-z0-9]+)+)[\S]*))/gim;
+    const re = URL_REGEX;
     while (match = re.exec(text.utf16)) {
       let uri2 = match[2];
       if (!uri2.startsWith("http")) {
@@ -30193,10 +30209,12 @@ function detectFacets(text) {
     }
   }
   {
-    const re = /(^|\s)#((?!\ufe0f)[^\d\s]\S*)(?=\s)?/g;
+    const re = TAG_REGEX;
     while (match = re.exec(text.utf16)) {
       let [, leading, tag] = match;
-      tag = tag.trim().replace(/\p{P}+$/gu, "");
+      if (!tag)
+        continue;
+      tag = tag.trim().replace(TRAILING_PUNCTUATION_REGEX, "");
       if (tag.length === 0 || tag.length > 64)
         continue;
       const index = match.index + leading.length;
@@ -32227,14 +32245,74 @@ var BskyAgent = class extends AtpAgent {
       return prefs.filter((p) => !defs_exports5.isInterestsPref(p)).concat([{ ...pref, $type: "app.bsky.actor.defs#interestsPref" }]);
     });
   }
-  async upsertMutedWords(mutedWords) {
-    await updateMutedWords(this, mutedWords, "upsert");
+  async upsertMutedWords(newMutedWords) {
+    await updatePreferences(this, (prefs) => {
+      let mutedWordsPref = prefs.findLast((pref) => defs_exports5.isMutedWordsPref(pref) && defs_exports5.validateMutedWordsPref(pref).success);
+      if (mutedWordsPref && defs_exports5.isMutedWordsPref(mutedWordsPref)) {
+        for (const updatedWord of newMutedWords) {
+          let foundMatch = false;
+          const sanitizedUpdatedValue = sanitizeMutedWordValue(updatedWord.value);
+          if (!sanitizedUpdatedValue)
+            continue;
+          for (const existingItem of mutedWordsPref.items) {
+            if (existingItem.value === sanitizedUpdatedValue) {
+              existingItem.targets = Array.from(/* @__PURE__ */ new Set([...existingItem.targets, ...updatedWord.targets]));
+              foundMatch = true;
+              break;
+            }
+          }
+          if (!foundMatch) {
+            mutedWordsPref.items.push({
+              ...updatedWord,
+              value: sanitizedUpdatedValue
+            });
+          }
+        }
+      } else {
+        mutedWordsPref = {
+          items: newMutedWords.map((w) => ({
+            ...w,
+            value: sanitizeMutedWordValue(w.value)
+          }))
+        };
+      }
+      return prefs.filter((p) => !defs_exports5.isMutedWordsPref(p)).concat([
+        { ...mutedWordsPref, $type: "app.bsky.actor.defs#mutedWordsPref" }
+      ]);
+    });
   }
   async updateMutedWord(mutedWord) {
-    await updateMutedWords(this, [mutedWord], "update");
+    await updatePreferences(this, (prefs) => {
+      let mutedWordsPref = prefs.findLast((pref) => defs_exports5.isMutedWordsPref(pref) && defs_exports5.validateMutedWordsPref(pref).success);
+      if (mutedWordsPref && defs_exports5.isMutedWordsPref(mutedWordsPref)) {
+        for (const existingItem of mutedWordsPref.items) {
+          if (existingItem.value === mutedWord.value) {
+            existingItem.targets = mutedWord.targets;
+            break;
+          }
+        }
+      }
+      return prefs.filter((p) => !defs_exports5.isMutedWordsPref(p)).concat([
+        { ...mutedWordsPref, $type: "app.bsky.actor.defs#mutedWordsPref" }
+      ]);
+    });
   }
   async removeMutedWord(mutedWord) {
-    await updateMutedWords(this, [mutedWord], "remove");
+    await updatePreferences(this, (prefs) => {
+      let mutedWordsPref = prefs.findLast((pref) => defs_exports5.isMutedWordsPref(pref) && defs_exports5.validateMutedWordsPref(pref).success);
+      if (mutedWordsPref && defs_exports5.isMutedWordsPref(mutedWordsPref)) {
+        for (let i = 0; i < mutedWordsPref.items.length; i++) {
+          const existing = mutedWordsPref.items[i];
+          if (existing.value === mutedWord.value) {
+            mutedWordsPref.items.splice(i, 1);
+            break;
+          }
+        }
+      }
+      return prefs.filter((p) => !defs_exports5.isMutedWordsPref(p)).concat([
+        { ...mutedWordsPref, $type: "app.bsky.actor.defs#mutedWordsPref" }
+      ]);
+    });
   }
   async hidePost(postUri) {
     await updateHiddenPost(this, postUri, "hide");
@@ -32273,51 +32351,6 @@ async function updateFeedPreferences(agent, cb) {
   });
   return res;
 }
-async function updateMutedWords(agent, mutedWords, action) {
-  const sanitizeMutedWord = (word) => ({
-    value: word.value.replace(/^#/, ""),
-    targets: word.targets
-  });
-  await updatePreferences(agent, (prefs) => {
-    let mutedWordsPref = prefs.findLast((pref) => defs_exports5.isMutedWordsPref(pref) && defs_exports5.validateMutedWordsPref(pref).success);
-    if (mutedWordsPref && defs_exports5.isMutedWordsPref(mutedWordsPref)) {
-      if (action === "upsert" || action === "update") {
-        for (const word of mutedWords) {
-          let foundMatch = false;
-          for (const existingItem of mutedWordsPref.items) {
-            if (existingItem.value === sanitizeMutedWord(word).value) {
-              existingItem.targets = action === "upsert" ? Array.from(/* @__PURE__ */ new Set([...existingItem.targets, ...word.targets])) : word.targets;
-              foundMatch = true;
-              break;
-            }
-          }
-          if (action === "upsert" && !foundMatch) {
-            mutedWordsPref.items.push(sanitizeMutedWord(word));
-          }
-        }
-      } else if (action === "remove") {
-        for (const word of mutedWords) {
-          for (let i = 0; i < mutedWordsPref.items.length; i++) {
-            const existing = mutedWordsPref.items[i];
-            if (existing.value === sanitizeMutedWord(word).value) {
-              mutedWordsPref.items.splice(i, 1);
-              break;
-            }
-          }
-        }
-      }
-    } else {
-      if (action === "upsert") {
-        mutedWordsPref = {
-          items: mutedWords.map(sanitizeMutedWord)
-        };
-      }
-    }
-    return prefs.filter((p) => !defs_exports5.isMutedWordsPref(p)).concat([
-      { ...mutedWordsPref, $type: "app.bsky.actor.defs#mutedWordsPref" }
-    ]);
-  });
-}
 async function updateHiddenPost(agent, postUri, action) {
   await updatePreferences(agent, (prefs) => {
     let pref = prefs.findLast((pref2) => defs_exports5.isHiddenPostsPref(pref2) && defs_exports5.validateHiddenPostsPref(pref2).success);