Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Appview v1 generating and ingesting mute ops w/ bsync #2067

Merged
merged 7 commits into from
Jan 22, 2024
Merged

Appview v1 generating and ingesting mute ops w/ bsync #2067

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
07995ef
build bsync protos in appview, standardize per-package proto gen dire…
devinivy Jan 20, 2024
c903abf
configure appview with bsync, allow mute endpoints to use bsync
devinivy Jan 21, 2024
0b615c0
import fixes in bsync
devinivy Jan 21, 2024
e3f3fee
configure appview ingester with bsync, ingest mute ops into db
devinivy Jan 21, 2024
f205f48
test bsync mutes roundtrip w/ appview, setup bsync in dev-env
devinivy Jan 21, 2024
7b600b6
build
devinivy Jan 21, 2024
b1db937
ensure to propagate errors when bsyncOnlyMutes is on
devinivy Jan 22, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
import fixes in bsync
  • Loading branch information
@devinivy
devinivy committed Jan 21, 2024
commit 0b615c06e01bf8c504a1e314761cf0e32b168e44
2 changes: 1 addition & 1 deletion packages/bsync/src/client.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {
ConnectTransportOptions,
createConnectTransport,
} from '@connectrpc/connect-node'
import { Service } from './gen/bsync_connect'
import { Service } from './proto/bsync_connect'

export type BsyncClient = PromiseClient<typeof Service>

Expand Down
2 changes: 1 addition & 1 deletion packages/bsync/src/db/schema/mute_op.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { GeneratedAlways, Selectable } from 'kysely'
import { MuteOperation_Type } from '../../gen/bsync_pb'
import { MuteOperation_Type } from '../../proto/bsync_pb'

export interface MuteOp {
id: GeneratedAlways<number>
Expand Down
4 changes: 2 additions & 2 deletions packages/bsync/src/routes/add-mute-operation.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import {
ensureValidDid,
} from '@atproto/syntax'
import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
import { Service } from '../gen/bsync_connect'
import { AddMuteOperationResponse, MuteOperation_Type } from '../gen/bsync_pb'
import { Service } from '../proto/bsync_connect'
import { AddMuteOperationResponse, MuteOperation_Type } from '../proto/bsync_pb'
import AppContext from '../context'
import { createMuteOpChannel } from '../db/schema/mute_op'
import { authWithApiKey } from './auth'
Expand Down
2 changes: 1 addition & 1 deletion packages/bsync/src/routes/index.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { sql } from 'kysely'
import { ConnectRouter } from '@connectrpc/connect'
import { Service } from '../gen/bsync_connect'
import { Service } from '../proto/bsync_connect'
import AppContext from '../context'
import addMuteOperation from './add-mute-operation'
import scanMuteOperations from './scan-mute-operations'
Expand Down
4 changes: 2 additions & 2 deletions packages/bsync/src/routes/scan-mute-operations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { once } from 'node:events'
import { Code, ConnectError, ServiceImpl } from '@connectrpc/connect'
import { Service } from '../gen/bsync_connect'
import { ScanMuteOperationsResponse } from '../gen/bsync_pb'
import { Service } from '../proto/bsync_connect'
import { ScanMuteOperationsResponse } from '../proto/bsync_pb'
import AppContext from '../context'
import { createMuteOpChannel } from '../db/schema/mute_op'
import { authWithApiKey } from './auth'
Expand Down
2 changes: 1 addition & 1 deletion packages/bsync/tests/mutes.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import {
createClient,
envToCfg,
} from '../src'
import { MuteOperation, MuteOperation_Type } from '../src/gen/bsync_pb'
import { MuteOperation, MuteOperation_Type } from '../src/proto/bsync_pb'

describe('mutes', () => {
let bsync: BsyncService
Expand Down