@atproto/bsky 0.0.242 → 0.0.243

package/src/data-plane/server/indexing/plugins/post.ts

@@ -505,10 +505,11 @@ const updateAggregates = async (db: DatabaseSchema, postIdx: IndexedPost) => {
           replyCount: db
             .selectFrom('post')
             .where('post.replyParent', '=', postIdx.post.replyParent)
-            .where((qb) =>
-              qb
-                .where('post.violatesThreadGate', 'is', null)
-                .orWhere('post.violatesThreadGate', '=', false),
+            .where((eb) =>
+              eb.or([
+                eb('post.violatesThreadGate', 'is', null),
+                eb('post.violatesThreadGate', '=', false),
+              ]),
             )
             .select(countAll.as('count')),
         })

package/src/data-plane/server/routes/blocks.ts

@@ -8,15 +8,17 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const { actorDid, targetDid } = req
     const res = await db.db
       .selectFrom('actor_block')
-      .where((qb) =>
-        qb
-          .where('actor_block.creator', '=', actorDid)
-          .where('actor_block.subjectDid', '=', targetDid),
-      )
-      .orWhere((qb) =>
-        qb
-          .where('actor_block.creator', '=', targetDid)
-          .where('actor_block.subjectDid', '=', actorDid),
+      .where((eb) =>
+        eb.or([
+          eb.and([
+            eb('actor_block.creator', '=', actorDid),
+            eb('actor_block.subjectDid', '=', targetDid),
+          ]),
+          eb.and([
+            eb('actor_block.creator', '=', targetDid),
+            eb('actor_block.subjectDid', '=', actorDid),
+          ]),
+        ]),
       )
       .limit(1)
       .selectAll()
@@ -58,15 +60,17 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const res = await db.db
       .selectFrom('list_block')
       .innerJoin('list_item', 'list_item.listUri', 'list_block.subjectUri')
-      .where((qb) =>
-        qb
-          .where('list_block.creator', '=', actorDid)
-          .where('list_item.subjectDid', '=', targetDid),
-      )
-      .orWhere((qb) =>
-        qb
-          .where('list_block.creator', '=', targetDid)
-          .where('list_item.subjectDid', '=', actorDid),
+      .where((eb) =>
+        eb.or([
+          eb.and([
+            eb('list_block.creator', '=', actorDid),
+            eb('list_item.subjectDid', '=', targetDid),
+          ]),
+          eb.and([
+            eb('list_block.creator', '=', targetDid),
+            eb('list_item.subjectDid', '=', actorDid),
+          ]),
+        ]),
       )
       .limit(1)
       .selectAll('list_block')
@@ -96,12 +100,14 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const { ref } = db.db.dynamic
     let builder = db.db
       .selectFrom('list')
-      .whereExists(
-        db.db
-          .selectFrom('list_block')
-          .where('list_block.creator', '=', actorDid)
-          .whereRef('list_block.subjectUri', '=', ref('list.uri'))
-          .selectAll(),
+      .where(({ exists }) =>
+        exists(
+          db.db
+            .selectFrom('list_block')
+            .where('list_block.creator', '=', actorDid)
+            .whereRef('list_block.subjectUri', '=', ref('list.uri'))
+            .selectAll(),
+        ),
       )
       .selectAll('list')
 

package/src/data-plane/server/routes/feed-gens.ts

@@ -34,7 +34,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const feeds = await db.db
       .selectFrom('suggested_feed')
       .orderBy('suggested_feed.order', 'asc')
-      .if(!!req.cursor, (q) => q.where('order', '>', parseInt(req.cursor, 10)))
+      .$if(!!req.cursor, (q) => q.where('order', '>', parseInt(req.cursor, 10)))
       .limit(req.limit || 50)
       .selectAll()
       .execute()
@@ -74,7 +74,7 @@ const searchFeedGeneratorsImpl = async (
   const trimmed = query.trim()
   let builder = db.db
     .selectFrom('feed_generator')
-    .if(!!trimmed, (q) => q.where('displayName', 'ilike', `%${trimmed}%`))
+    .$if(!!trimmed, (q) => q.where('displayName', 'ilike', `%${trimmed}%`))
     .selectAll()
   const keyset = new TimeCidKeyset(
     ref('feed_generator.createdAt'),

package/src/data-plane/server/routes/feeds.ts

@@ -21,16 +21,16 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
         // only your own posts
         .where('type', '=', 'post')
         // only posts with media
-        .where((qb) =>
-          qb
-            .whereExists((iqb) =>
-              iqb
+        .where((eb) =>
+          eb.or([
+            eb.exists(
+              eb
                 .selectFrom('post_embed_image')
                 .select('post_embed_image.postUri')
                 .whereRef('post_embed_image.postUri', '=', 'feed_item.postUri'),
-            )
-            .orWhereExists((iqb) =>
-              iqb
+            ),
+            eb.exists(
+              eb
                 .selectFrom('post_embed_gallery_image')
                 .select('post_embed_gallery_image.postUri')
                 .whereRef(
@@ -39,28 +39,32 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
                   'feed_item.postUri',
                 ),
             ),
+          ]),
         )
     } else if (feedType === FeedType.POSTS_WITH_VIDEO) {
       builder = builder
         // only your own posts
         .where('type', '=', 'post')
         // only posts with video
-        .whereExists((qb) =>
-          qb
-            .selectFrom('post_embed_video')
-            .select('post_embed_video.postUri')
-            .whereRef('post_embed_video.postUri', '=', 'feed_item.postUri'),
+        .where(({ eb, exists }) =>
+          exists(
+            eb
+              .selectFrom('post_embed_video')
+              .select('post_embed_video.postUri')
+              .whereRef('post_embed_video.postUri', '=', 'feed_item.postUri'),
+          ),
         )
     } else if (feedType === FeedType.POSTS_NO_REPLIES) {
-      builder = builder.where((qb) =>
-        qb.where('post.replyParent', 'is', null).orWhere('type', '=', 'repost'),
+      builder = builder.where((eb) =>
+        eb.or([eb('post.replyParent', 'is', null), eb('type', '=', 'repost')]),
       )
     } else if (feedType === FeedType.POSTS_AND_AUTHOR_THREADS) {
-      builder = builder.where((qb) =>
-        qb
-          .where('type', '=', 'repost')
-          .orWhere('post.replyParent', 'is', null)
-          .orWhere('post.replyRoot', 'like', `at://${actorDid}/%`),
+      builder = builder.where((eb) =>
+        eb.or([
+          eb('type', '=', 'repost'),
+          eb('post.replyParent', 'is', null),
+          eb('post.replyRoot', 'like', `at://${actorDid}/%`),
+        ]),
       )
     }
 

package/src/data-plane/server/routes/labels.ts

@@ -19,8 +19,8 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       .selectFrom('label')
       .where('uri', 'in', subjects)
       .where('src', 'in', issuers)
-      .where((qb) =>
-        qb.where('exp', 'is', null).orWhere(sql`exp::timestamp > now()`),
+      .where((eb) =>
+        eb.or([eb('exp', 'is', null), sql<boolean>`exp::timestamp > now()`]),
       )
       .selectAll()
       .execute()

package/src/data-plane/server/routes/mutes.ts

@@ -88,12 +88,14 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const { ref } = db.db.dynamic
     let builder = db.db
       .selectFrom('list')
-      .whereExists(
-        db.db
-          .selectFrom('list_mute')
-          .where('list_mute.mutedByDid', '=', actorDid)
-          .whereRef('list_mute.listUri', '=', ref('list.uri'))
-          .selectAll(),
+      .where(({ exists }) =>
+        exists(
+          db.db
+            .selectFrom('list_mute')
+            .where('list_mute.mutedByDid', '=', actorDid)
+            .whereRef('list_mute.listUri', '=', ref('list.uri'))
+            .selectAll(),
+        ),
       )
       .selectAll('list')
 

package/src/data-plane/server/routes/notifs.ts

@@ -32,17 +32,18 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     let builder = db.db
       .selectFrom('notification as notif')
       .where('notif.did', '=', actorDid)
-      .where((clause) =>
-        clause
-          .where('reasonSubject', 'is', null)
-          .orWhereExists(
+      .where((eb) =>
+        eb.or([
+          eb('reasonSubject', 'is', null),
+          eb.exists(
             db.db
               .selectFrom('record as subject')
               .selectAll()
               .whereRef('subject.uri', '=', ref('notif.reasonSubject')),
           ),
+        ]),
       )
-      .if(priority, (qb) => qb.whereExists(priorityFollowQb))
+      .$if(priority, (qb) => qb.where(({ exists }) => exists(priorityFollowQb)))
       .select([
         'notif.author as authorDid',
         'notif.recordUri as uri',
@@ -117,13 +118,15 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
       // Ensure to hit notification_did_sortat_idx, handling case where lastSeenNotifs is null.
       .where('notification.did', '=', actorDid)
       .where('notification.sortAt', '>', lastSeen ?? '')
-      .if(priority, (qb) =>
-        qb.whereExists(
-          db.db
-            .selectFrom('follow')
-            .select(sql<boolean>`${true}`.as('val'))
-            .where('creator', '=', actorDid)
-            .whereRef('subjectDid', '=', ref('notification.author')),
+      .$if(priority, (qb) =>
+        qb.where(({ exists }) =>
+          exists(
+            db.db
+              .selectFrom('follow')
+              .select(sql<boolean>`${true}`.as('val'))
+              .where('creator', '=', actorDid)
+              .whereRef('subjectDid', '=', ref('notification.author')),
+          ),
         ),
       )
       .executeTakeFirst()

package/src/data-plane/server/routes/relationships.ts

@@ -95,9 +95,11 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const { ref } = db.db.dynamic
     const sourceRef = ref('pair.source')
     const targetRef = ref('pair.target')
-    const values = valuesList(pairs.map((p) => sql`${p.a}, ${p.b}`))
+    const values = valuesList<{ source: string; target: string }>(
+      pairs.map((p) => sql`${p.a}, ${p.b}`),
+    )
     const res = await db.db
-      .selectFrom(values.as(sql`pair (source, target)`))
+      .selectFrom(values.as<'pair'>(sql`pair (source, target)`))
       .select([
         sql<string>`${sourceRef}`.as('source'),
         sql<string>`${targetRef}`.as('target'),

package/src/data-plane/server/routes/suggestions.ts

@@ -41,7 +41,7 @@ const getFollowSuggestionsGlobal = async (
   const suggestions = await db.db
     .selectFrom('suggested_follow')
     .innerJoin('actor', 'actor.did', 'suggested_follow.did')
-    .if(alreadyIncluded.length > 0, (qb) =>
+    .$if(alreadyIncluded.length > 0, (qb) =>
       qb.where('suggested_follow.order', 'not in', alreadyIncluded),
     )
     .selectAll()
@@ -116,7 +116,7 @@ const getFollowSuggestionsRelativeTo = async (
       .where('follow.creator', '=', input.actorDid)
       .where('follow.subjectDid', '!=', input.relativeToDid)
       .where('follow.subjectDid', 'not in', actorsViewerFollows)
-      .if(resultDids.length > 0, (qb) =>
+      .$if(resultDids.length > 0, (qb) =>
         qb.where(
           'subjectDid',
           'not in',

package/tests/data-plane/subscription.test.ts

@@ -118,8 +118,8 @@ async function dumpTable<T extends keyof DatabaseSchemaType>(
   tableName: T,
   pkeys: (keyof DatabaseSchemaType[T] & string)[],
 ) {
-  const { ref } = db.db.dynamic
-  let builder = db.db.selectFrom(tableName).selectAll()
+  const { ref, table } = db.db.dynamic
+  let builder = db.db.selectFrom(table(tableName).as('t')).selectAll()
   pkeys.forEach((key) => {
     builder = builder.orderBy(ref(key))
   })