@atproto/bsky 0.0.4 → 0.0.6

package/dist/lexicon/lexicons.d.ts

@@ -3472,6 +3472,50 @@ export declare const schemaDict: {
                     };
                 };
             };
+            feedViewPref: {
+                type: string;
+                required: string[];
+                properties: {
+                    feed: {
+                        type: string;
+                        description: string;
+                    };
+                    hideReplies: {
+                        type: string;
+                        description: string;
+                    };
+                    hideRepliesByUnfollowed: {
+                        type: string;
+                        description: string;
+                    };
+                    hideRepliesByLikeCount: {
+                        type: string;
+                        description: string;
+                    };
+                    hideReposts: {
+                        type: string;
+                        description: string;
+                    };
+                    hideQuotePosts: {
+                        type: string;
+                        description: string;
+                    };
+                };
+            };
+            threadViewPref: {
+                type: string;
+                properties: {
+                    sort: {
+                        type: string;
+                        description: string;
+                        knownValues: string[];
+                    };
+                    prioritizeFollowedUsers: {
+                        type: string;
+                        description: string;
+                    };
+                };
+            };
         };
     };
     AppBskyActorGetPreferences: {
@@ -5342,10 +5386,12 @@ export declare const schemaDict: {
             mentionRule: {
                 type: string;
                 description: string;
+                properties: {};
             };
             followingRule: {
                 type: string;
                 description: string;
+                properties: {};
             };
             listRule: {
                 type: string;

package/dist/lexicon/types/app/bsky/actor/defs.d.ts

@@ -53,7 +53,7 @@ export interface ViewerState {
 }
 export declare function isViewerState(v: unknown): v is ViewerState;
 export declare function validateViewerState(v: unknown): ValidationResult;
-export declare type Preferences = (AdultContentPref | ContentLabelPref | SavedFeedsPref | PersonalDetailsPref | {
+export declare type Preferences = (AdultContentPref | ContentLabelPref | SavedFeedsPref | PersonalDetailsPref | FeedViewPref | ThreadViewPref | {
     $type: string;
     [k: string]: unknown;
 })[];
@@ -83,3 +83,21 @@ export interface PersonalDetailsPref {
 }
 export declare function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref;
 export declare function validatePersonalDetailsPref(v: unknown): ValidationResult;
+export interface FeedViewPref {
+    feed: string;
+    hideReplies?: boolean;
+    hideRepliesByUnfollowed?: boolean;
+    hideRepliesByLikeCount?: number;
+    hideReposts?: boolean;
+    hideQuotePosts?: boolean;
+    [k: string]: unknown;
+}
+export declare function isFeedViewPref(v: unknown): v is FeedViewPref;
+export declare function validateFeedViewPref(v: unknown): ValidationResult;
+export interface ThreadViewPref {
+    sort?: 'oldest' | 'newest' | 'most-likes' | 'random' | (string & {});
+    prioritizeFollowedUsers?: boolean;
+    [k: string]: unknown;
+}
+export declare function isThreadViewPref(v: unknown): v is ThreadViewPref;
+export declare function validateThreadViewPref(v: unknown): ValidationResult;

package/dist/lexicon/types/app/bsky/feed/threadgate.d.ts

@@ -11,10 +11,12 @@ export interface Record {
 export declare function isRecord(v: unknown): v is Record;
 export declare function validateRecord(v: unknown): ValidationResult;
 export interface MentionRule {
+    [k: string]: unknown;
 }
 export declare function isMentionRule(v: unknown): v is MentionRule;
 export declare function validateMentionRule(v: unknown): ValidationResult;
 export interface FollowingRule {
+    [k: string]: unknown;
 }
 export declare function isFollowingRule(v: unknown): v is FollowingRule;
 export declare function validateFollowingRule(v: unknown): ValidationResult;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@atproto/bsky",
-  "version": "0.0.4",
+  "version": "0.0.6",
   "license": "MIT",
   "repository": {
     "type": "git",
@@ -31,14 +31,14 @@
     "sharp": "^0.31.2",
     "typed-emitter": "^2.1.0",
     "uint8arrays": "3.0.0",
-    "@atproto/api": "^0.6.13",
+    "@atproto/api": "^0.6.15",
     "@atproto/common": "^0.3.0",
     "@atproto/crypto": "^0.2.2",
-    "@atproto/syntax": "^0.1.0",
+    "@atproto/syntax": "^0.1.1",
     "@atproto/identity": "^0.2.0",
-    "@atproto/lexicon": "^0.2.0",
-    "@atproto/repo": "^0.3.0",
-    "@atproto/xrpc-server": "^0.3.0"
+    "@atproto/lexicon": "^0.2.1",
+    "@atproto/repo": "^0.3.1",
+    "@atproto/xrpc-server": "^0.3.1"
   },
   "devDependencies": {
     "@did-plc/server": "^0.0.1",
@@ -49,11 +49,11 @@
     "@types/qs": "^6.9.7",
     "@types/sharp": "^0.31.0",
     "axios": "^0.27.2",
-    "@atproto/api": "^0.6.13",
-    "@atproto/dev-env": "^0.2.4",
-    "@atproto/lex-cli": "^0.2.0",
-    "@atproto/pds": "^0.1.13",
-    "@atproto/xrpc": "^0.3.0"
+    "@atproto/api": "^0.6.15",
+    "@atproto/dev-env": "^0.2.6",
+    "@atproto/lex-cli": "^0.2.1",
+    "@atproto/pds": "^0.1.15",
+    "@atproto/xrpc": "^0.3.1"
   },
   "scripts": {
     "codegen": "lex gen-server ./src/lexicon ../../lexicons/com/atproto/*/* ../../lexicons/app/bsky/*/*",

package/src/api/app/bsky/feed/getPostThread.ts

@@ -140,7 +140,9 @@ const composeThread = (
   // b. may not appear anywhere else in the thread.
   const isAnchorPost = state.threadData.post.uri === threadData.post.postUri
   const info = posts[threadData.post.postUri]
-  const badReply = !!info?.invalidReplyRoot || !!info?.violatesThreadGate
+  // @TODO re-enable invalidReplyRoot check
+  // const badReply = !!info?.invalidReplyRoot || !!info?.violatesThreadGate
+  const badReply = !!info?.violatesThreadGate
   const omitBadReply = !isAnchorPost && badReply
 
   if (!post || blocks[post.uri]?.reply || omitBadReply) {
@@ -312,7 +314,9 @@ const checkViewerCanReply = async (
   threadgate: ThreadgateRecord | null,
 ) => {
   if (!viewer) return false
-  if (anchor?.invalidReplyRoot || anchor?.violatesThreadGate) return false
+  // @TODO re-enable invalidReplyRoot check
+  // if (anchor?.invalidReplyRoot || anchor?.violatesThreadGate) return false
+  if (anchor?.violatesThreadGate) return false
   const viewerViolatesThreadGate = await violatesThreadGate(
     db,
     viewer,

package/src/lexicon/lexicons.ts

@@ -3687,6 +3687,8 @@ export const schemaDict = {
             'lex:app.bsky.actor.defs#contentLabelPref',
             'lex:app.bsky.actor.defs#savedFeedsPref',
             'lex:app.bsky.actor.defs#personalDetailsPref',
+            'lex:app.bsky.actor.defs#feedViewPref',
+            'lex:app.bsky.actor.defs#threadViewPref',
           ],
         },
       },
@@ -3743,6 +3745,53 @@ export const schemaDict = {
           },
         },
       },
+      feedViewPref: {
+        type: 'object',
+        required: ['feed'],
+        properties: {
+          feed: {
+            type: 'string',
+            description:
+              'The URI of the feed, or an identifier which describes the feed.',
+          },
+          hideReplies: {
+            type: 'boolean',
+            description: 'Hide replies in the feed.',
+          },
+          hideRepliesByUnfollowed: {
+            type: 'boolean',
+            description:
+              'Hide replies in the feed if they are not by followed users.',
+          },
+          hideRepliesByLikeCount: {
+            type: 'integer',
+            description:
+              'Hide replies in the feed if they do not have this number of likes.',
+          },
+          hideReposts: {
+            type: 'boolean',
+            description: 'Hide reposts in the feed.',
+          },
+          hideQuotePosts: {
+            type: 'boolean',
+            description: 'Hide quote posts in the feed.',
+          },
+        },
+      },
+      threadViewPref: {
+        type: 'object',
+        properties: {
+          sort: {
+            type: 'string',
+            description: 'Sorting mode.',
+            knownValues: ['oldest', 'newest', 'most-likes', 'random'],
+          },
+          prioritizeFollowedUsers: {
+            type: 'boolean',
+            description: 'Show followed users at the top of all replies.',
+          },
+        },
+      },
     },
   },
   AppBskyActorGetPreferences: {
@@ -5693,10 +5742,12 @@ export const schemaDict = {
       mentionRule: {
         type: 'object',
         description: 'Allow replies from actors mentioned in your post.',
+        properties: {},
       },
       followingRule: {
         type: 'object',
         description: 'Allow replies from actors you follow.',
+        properties: {},
       },
       listRule: {
         type: 'object',

package/src/lexicon/types/app/bsky/actor/defs.ts

@@ -109,6 +109,8 @@ export type Preferences = (
   | ContentLabelPref
   | SavedFeedsPref
   | PersonalDetailsPref
+  | FeedViewPref
+  | ThreadViewPref
   | { $type: string; [k: string]: unknown }
 )[]
 
@@ -182,3 +184,51 @@ export function isPersonalDetailsPref(v: unknown): v is PersonalDetailsPref {
 export function validatePersonalDetailsPref(v: unknown): ValidationResult {
   return lexicons.validate('app.bsky.actor.defs#personalDetailsPref', v)
 }
+
+export interface FeedViewPref {
+  /** The URI of the feed, or an identifier which describes the feed. */
+  feed: string
+  /** Hide replies in the feed. */
+  hideReplies?: boolean
+  /** Hide replies in the feed if they are not by followed users. */
+  hideRepliesByUnfollowed?: boolean
+  /** Hide replies in the feed if they do not have this number of likes. */
+  hideRepliesByLikeCount?: number
+  /** Hide reposts in the feed. */
+  hideReposts?: boolean
+  /** Hide quote posts in the feed. */
+  hideQuotePosts?: boolean
+  [k: string]: unknown
+}
+
+export function isFeedViewPref(v: unknown): v is FeedViewPref {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.actor.defs#feedViewPref'
+  )
+}
+
+export function validateFeedViewPref(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.actor.defs#feedViewPref', v)
+}
+
+export interface ThreadViewPref {
+  /** Sorting mode. */
+  sort?: 'oldest' | 'newest' | 'most-likes' | 'random' | (string & {})
+  /** Show followed users at the top of all replies. */
+  prioritizeFollowedUsers?: boolean
+  [k: string]: unknown
+}
+
+export function isThreadViewPref(v: unknown): v is ThreadViewPref {
+  return (
+    isObj(v) &&
+    hasProp(v, '$type') &&
+    v.$type === 'app.bsky.actor.defs#threadViewPref'
+  )
+}
+
+export function validateThreadViewPref(v: unknown): ValidationResult {
+  return lexicons.validate('app.bsky.actor.defs#threadViewPref', v)
+}

package/src/lexicon/types/app/bsky/feed/threadgate.ts

@@ -32,7 +32,9 @@ export function validateRecord(v: unknown): ValidationResult {
 }
 
 /** Allow replies from actors mentioned in your post. */
-export interface MentionRule {}
+export interface MentionRule {
+  [k: string]: unknown
+}
 
 export function isMentionRule(v: unknown): v is MentionRule {
   return (
@@ -47,7 +49,9 @@ export function validateMentionRule(v: unknown): ValidationResult {
 }
 
 /** Allow replies from actors you follow. */
-export interface FollowingRule {}
+export interface FollowingRule {
+  [k: string]: unknown
+}
 
 export function isFollowingRule(v: unknown): v is FollowingRule {
   return (