diff --git a/lexicons/status.json b/lexicons/status.json --- a/lexicons/status.json +++ b/lexicons/status.json @@ -1,6 +1,6 @@ { "lexicon": 1, - "id": "com.example.status", + "id": "xyz.statusphere.status", "defs": { "main": { "type": "record", diff --git a/src/ingester.ts b/src/ingester.ts --- a/src/ingester.ts +++ b/src/ingester.ts @@ -2,7 +2,7 @@ import pino from 'pino' import { IdResolver } from '@atproto/identity' import { Firehose } from '@atproto/sync' import type { Database } from '#/db' -import * as Status from '#/lexicon/types/com/example/status' +import * as Status from '#/lexicon/types/xyz/statusphere/status' export function createIngester(db: Database, idResolver: IdResolver) { const logger = pino({ name: 'firehose ingestion' }) @@ -15,7 +15,7 @@ const record = evt.record // If the write is a valid status update if ( - evt.collection === 'com.example.status' && + evt.collection === 'xyz.statusphere.status' && Status.isRecord(record) && Status.validateRecord(record).success ) { @@ -39,7 +39,7 @@ .execute() } } else if ( evt.event === 'delete' && - evt.collection === 'com.example.status' + evt.collection === 'xyz.statusphere.status' ) { // Remove the status from our SQLite await db.deleteFrom('status').where({ uri: evt.uri.toString() }) @@ -48,7 +48,7 @@ }, onError: (err) => { logger.error({ err }, 'error on firehose ingestion') }, - filterCollections: ['com.example.status'], + filterCollections: ['xyz.statusphere.status'], excludeIdentity: true, excludeAccount: true, }) diff --git a/src/lexicon/index.ts b/src/lexicon/index.ts --- a/src/lexicon/index.ts +++ b/src/lexicon/index.ts @@ -17,12 +17,12 @@ export class Server { xrpc: XrpcServer app: AppNS - com: ComNS + xyz: XyzNS constructor(options?: XrpcOptions) { this.xrpc = createXrpcServer(schemas, options) this.app = new AppNS(this) - this.com = new ComNS(this) + this.xyz = new XyzNS(this) } } @@ -54,17 +54,17 @@ this._server = server } } -export class ComNS { +export class XyzNS { _server: Server - example: ComExampleNS + statusphere: XyzStatusphereNS constructor(server: Server) { this._server = server - this.example = new ComExampleNS(server) + this.statusphere = new XyzStatusphereNS(server) } } -export class ComExampleNS { +export class XyzStatusphereNS { _server: Server constructor(server: Server) { diff --git a/src/lexicon/lexicons.ts b/src/lexicon/lexicons.ts --- a/src/lexicon/lexicons.ts +++ b/src/lexicon/lexicons.ts @@ -59,13 +59,13 @@ }, }, }, }, - ComExampleStatus: { + XyzStatusphereStatus: { lexicon: 1, - id: 'com.example.status', + id: 'xyz.statusphere.status', defs: { main: { type: 'record', - key: 'literal:self', + key: 'tid', record: { type: 'object', required: ['status', 'createdAt'], @@ -90,5 +90,5 @@ export const schemas: LexiconDoc[] = Object.values(schemaDict) as LexiconDoc[] export const lexicons: Lexicons = new Lexicons(schemas) export const ids = { AppBskyActorProfile: 'app.bsky.actor.profile', - ComExampleStatus: 'com.example.status', + XyzStatusphereStatus: 'xyz.statusphere.status', } diff --git a/src/lexicon/types/com/example/status.ts b/src/lexicon/types/xyz/statusphere/status.ts rename from src/lexicon/types/com/example/status.ts rename to src/lexicon/types/xyz/statusphere/status.ts --- a/src/lexicon/types/com/example/status.ts +++ b/src/lexicon/types/xyz/statusphere/status.ts @@ -16,10 +16,11 @@ export function isRecord(v: unknown): v is Record { return ( isObj(v) && hasProp(v, '$type') && - (v.$type === 'com.example.status#main' || v.$type === 'com.example.status') + (v.$type === 'xyz.statusphere.status#main' || + v.$type === 'xyz.statusphere.status') ) } export function validateRecord(v: unknown): ValidationResult { - return lexicons.validate('com.example.status#main', v) + return lexicons.validate('xyz.statusphere.status#main', v) } diff --git a/src/routes.ts b/src/routes.ts --- a/src/routes.ts +++ b/src/routes.ts @@ -12,7 +12,7 @@ import { home } from '#/pages/home' import { login } from '#/pages/login' import { env } from '#/lib/env' import { page } from '#/lib/view' -import * as Status from '#/lexicon/types/com/example/status' +import * as Status from '#/lexicon/types/xyz/statusphere/status' import * as Profile from '#/lexicon/types/app/bsky/actor/profile' type Session = { did: string } @@ -217,7 +217,7 @@ // Construct & validate their status record const rkey = TID.nextStr() const record = { - $type: 'com.example.status', + $type: 'xyz.statusphere.status', status: req.body?.status, createdAt: new Date().toISOString(), } @@ -233,7 +233,7 @@ try { // Write the status record to the user's repository const res = await agent.com.atproto.repo.putRecord({ repo: agent.assertDid, - collection: 'com.example.status', + collection: 'xyz.statusphere.status', rkey, record, validate: false,