get some tests passing!

packages/bsky/src/data-plane/server/routes/index.ts

@@ -13,6 +13,8 @@ import mutes from './mutes'
 import notifs from './notifs'
 import posts from './posts'
 import profile from './profile'
+import records from './records'
+import relationships from './relationships'
 import reposts from './reposts'
 import search from './search'
 import suggestions from './suggestions'
@@ -34,6 +36,8 @@ export default (db: Database) => (router: ConnectRouter) =>
     ...notifs(db),
     ...posts(db),
     ...profile(db),
+    ...records(db),
+    ...relationships(db),
     ...reposts(db),
     ...search(db),
     ...suggestions(db),

packages/bsky/src/data-plane/server/routes/labels.ts

@@ -5,13 +5,13 @@ import * as ui8 from 'uint8arrays'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getLabels(req) {
-    const { subjects, issuers } = req
-    if (subjects.length === 0 || issuers.length === 0) {
+    // @TODO add in issues param
+    const { subjects } = req
+    if (subjects.length === 0) {
       return { records: [] }
     }
     const res = await db.db
       .selectFrom('label')
-      .where('src', 'in', issuers)
       .where('uri', 'in', subjects)
       .selectAll()
       .execute()

packages/bsky/src/data-plane/server/routes/notifs.ts

@@ -4,6 +4,7 @@ import { Database } from '../../../db'
 import { countAll, excluded } from '../../../db/util'
 import { sql } from 'kysely'
 import { TimeCidKeyset, paginate } from '../../../db/pagination'
+import { Timestamp } from '@bufbuild/protobuf'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   async getNotifications(req) {
@@ -46,9 +47,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const notifications = notifsRes.map((notif) => ({
       uri: notif.uri,
       reason: notif.reason,
-      timestamp: {
-        nanos: new Date(notif.sortAt).getTime() * 1000,
-      },
+      timestamp: Timestamp.fromDate(new Date(notif.sortAt)),
     }))
     return {
       notifications,
@@ -65,11 +64,8 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     if (!res) {
       return {}
     }
-    const nanos = new Date(res.lastSeenNotifs).getTime() * 1000
     return {
-      timestamp: {
-        nanos,
-      },
+      timestamp: Timestamp.fromDate(new Date(res.lastSeenNotifs)),
     }
   },
 
@@ -101,9 +97,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     if (!timestamp) {
       return
     }
-    const lastSeenNotifs = new Date(
-      Math.floor(timestamp.nanos / 1000),
-    ).toISOString()
+    const lastSeenNotifs = timestamp.toDate().toISOString()
     await db.db
       .insertInto('actor_state')
       .values({ did: actorDid, lastSeenNotifs })

packages/bsky/src/data-plane/server/routes/profile.ts

@@ -21,7 +21,7 @@ export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
     const actors = dids.map((did, i) => {
       return {
         handle: byDid[did]?.handle ?? undefined,
-        profile: profiles[i],
+        profile: profiles.records[i],
       }
     })
     return { actors }

packages/bsky/src/data-plane/server/routes/records.ts

@@ -4,6 +4,7 @@ import * as ui8 from 'uint8arrays'
 import { Database } from '../../../db'
 import { keyBy } from '@atproto/common'
 import { Record } from '../../gen/bsky_pb'
+import { Timestamp } from '@bufbuild/protobuf'
 
 export default (db: Database): Partial<ServiceImpl<typeof Service>> => ({
   getBlockRecords: getRecords(db),
@@ -38,9 +39,7 @@ export const getRecords =
       return new Record({
         record: recordBytes,
         cid: row.cid,
-        indexedAt: {
-          nanos: new Date(row.indexedAt).getTime() * 1000,
-        },
+        indexedAt: Timestamp.fromDate(new Date(row.indexedAt)),
       })
     })
     return { records }

packages/bsky/src/hydration/actor.ts

@@ -1,13 +1,7 @@
 import { CID } from 'multiformats/cid'
 import { DataPlaneClient } from '../data-plane/client'
 import { Record as ProfileRecord } from '../lexicon/types/app/bsky/actor/profile'
-import {
-  HydrationMap,
-  parseCid,
-  parseRecordBytes,
-  parseString,
-  parseTimestamp,
-} from './util'
+import { HydrationMap, parseCid, parseRecordBytes, parseString } from './util'
 
 export type Actor = {
   did: string
@@ -69,7 +63,7 @@ export class ActorHydrator {
         handle: parseString(actor.handle),
         profile: parseRecordBytes<ProfileRecord>(actor.profile?.record),
         profileCid: parseCid(actor.profile?.cid),
-        indexedAt: parseTimestamp(actor.profile?.indexedAt),
+        indexedAt: actor.profile?.indexedAt?.toDate(),
       })
     }, new HydrationMap<Actor>())
   }

packages/bsky/src/hydration/util.ts

@@ -22,7 +22,7 @@ export type RecordInfo<T> = {
 export const parseRecord = <T>(entry: Record): RecordInfo<T> | undefined => {
   const record = parseRecordBytes<T>(entry.record)
   const cid = parseCid(entry.cid)
-  const indexedAt = parseTimestamp(entry.indexedAt)
+  const indexedAt = entry.indexedAt?.toDate()
   if (!record || !cid) return
   return { record, cid, indexedAt }
 }
@@ -54,9 +54,3 @@ export const parseCid = (cidStr: string | undefined): CID | undefined => {
     return
   }
 }
-
-export const parseTimestamp = (ts: Timestamp | undefined): Date | undefined => {
-  if (!ts) return undefined
-  const ms = Math.floor(ts.nanos / 1000)
-  return new Date(ms)
-}

packages/bsky/src/views/index.ts

@@ -1,4 +1,4 @@
-import { AtUri, INVALID_HANDLE } from '@atproto/syntax'
+import { AtUri, INVALID_HANDLE, normalizeDatetimeAlways } from '@atproto/syntax'
 import { ImageUriBuilder } from '../image/uri'
 import { HydrationState } from '../hydration/hydrator'
 import { ids } from '../lexicon/lexicons'
@@ -16,6 +16,7 @@ import { ListView, ListViewBasic } from '../lexicon/types/app/bsky/graph/defs'
 import { compositeTime, creatorFromUri } from './util'
 import { mapDefined } from '@atproto/common'
 import { isListRule } from '../lexicon/types/app/bsky/feed/threadgate'
+import { isSelfLabels } from '../lexicon/types/com/atproto/label/defs'
 import {
   Embed,
   EmbedBlocked,
@@ -35,6 +36,7 @@ import {
   isRecordEmbed,
   isRecordWithMedia,
 } from './types'
+import { Label } from '../hydration/label'
 
 export class Views {
   constructor(public imgUriBuilder: ImageUriBuilder) {}
@@ -93,6 +95,11 @@ export class Views {
     const labels = [
       ...(state.labels?.get(did) ?? []),
       ...(state.labels?.get(profileUri) ?? []),
+      ...this.selfLabels({
+        uri: profileUri,
+        cid: actor.profileCid?.toString(),
+        record: actor.profile,
+      }),
     ]
     return {
       did,
@@ -181,6 +188,27 @@ export class Views {
     }
   }
 
+  // Labels
+  // ------------
+
+  selfLabels(details: {
+    uri?: string
+    cid?: string
+    record?: Record<string, unknown>
+  }): Label[] {
+    const { uri, cid, record } = details
+    if (!uri || !cid || !record) return []
+    if (!isSelfLabels(record.labels)) return []
+    const src = new AtUri(uri).host // record creator
+    const cts =
+      typeof record.createdAt === 'string'
+        ? normalizeDatetimeAlways(record.createdAt)
+        : new Date(0).toISOString()
+    return record.labels.values.map(({ val }) => {
+      return { src, uri, cid, val, cts, neg: false }
+    })
+  }
+
   // Feed
   // ------------