From 79867d272596092f876b54bdbd556b18839fcc0c Mon Sep 17 00:00:00 2001 From: Daniel Holmgren Date: Thu, 14 Sep 2023 16:43:04 -0500 Subject: [PATCH] Remove default value for post table invalid attrs (#1601) remove default value for post table attrs --- .../db/migrations/20230906T222220386Z-thread-gating.ts | 8 ++------ packages/bsky/src/db/tables/post.ts | 6 +++--- packages/bsky/src/services/feed/index.ts | 8 +++++++- 3 files changed, 12 insertions(+), 10 deletions(-) diff --git a/packages/bsky/src/db/migrations/20230906T222220386Z-thread-gating.ts b/packages/bsky/src/db/migrations/20230906T222220386Z-thread-gating.ts index 42296aaccf9..4c417278d67 100644 --- a/packages/bsky/src/db/migrations/20230906T222220386Z-thread-gating.ts +++ b/packages/bsky/src/db/migrations/20230906T222220386Z-thread-gating.ts @@ -12,15 +12,11 @@ export async function up(db: Kysely): Promise { .execute() await db.schema .alterTable('post') - .addColumn('invalidReplyRoot', 'boolean', (col) => - col.notNull().defaultTo(false), - ) + .addColumn('invalidReplyRoot', 'boolean') .execute() await db.schema .alterTable('post') - .addColumn('violatesThreadGate', 'boolean', (col) => - col.notNull().defaultTo(false), - ) + .addColumn('violatesThreadGate', 'boolean') .execute() } diff --git a/packages/bsky/src/db/tables/post.ts b/packages/bsky/src/db/tables/post.ts index d70a75912a5..c627efa39e7 100644 --- a/packages/bsky/src/db/tables/post.ts +++ b/packages/bsky/src/db/tables/post.ts @@ -1,4 +1,4 @@ -import { Generated, GeneratedAlways } from 'kysely' +import { GeneratedAlways } from 'kysely' export const tableName = 'post' @@ -12,8 +12,8 @@ export interface Post { replyParent: string | null replyParentCid: string | null langs: string[] | null - invalidReplyRoot: Generated - violatesThreadGate: Generated + invalidReplyRoot: boolean | null + violatesThreadGate: boolean | null createdAt: string indexedAt: string sortAt: GeneratedAlways diff --git a/packages/bsky/src/services/feed/index.ts b/packages/bsky/src/services/feed/index.ts index e5ee2d1c8db..f955979e81e 100644 --- a/packages/bsky/src/services/feed/index.ts +++ b/packages/bsky/src/services/feed/index.ts @@ -166,7 +166,13 @@ export class FeedService { return posts.reduce((acc, cur) => { const { recordJson, ...post } = cur const record = jsonStringToLex(recordJson) as PostRecord - const info: PostInfo = { ...post, record, viewer } + const info: PostInfo = { + ...post, + invalidReplyRoot: post.invalidReplyRoot ?? false, + violatesThreadGate: post.violatesThreadGate ?? false, + record, + viewer, + } return Object.assign(acc, { [post.uri]: info }) }, {} as PostInfoMap) }