3 files changed, 94 insertions, 13 deletions

diff --git a/src/state/models/feed-view.ts b/src/state/models/feed-view.ts
index 68738d725..e5a6d73db 100644
--- a/src/state/models/feed-view.ts
+++ b/src/state/models/feed-view.ts
@@ -33,6 +33,7 @@ export class FeedItemModel {
 
   // data
   post: PostView
+  postRecord?: AppBskyFeedPost.Record
   reply?: FeedViewPost['reply']
   replyParent?: FeedItemModel
   reason?: FeedViewPost['reason']
@@ -44,6 +45,22 @@ export class FeedItemModel {
   ) {
     this._reactKey = reactKey
     this.post = v.post
+    if (AppBskyFeedPost.isRecord(this.post.record)) {
+      const valid = AppBskyFeedPost.validateRecord(this.post.record)
+      if (valid.success) {
+        this.postRecord = this.post.record
+      } else {
+        rootStore.log.warn(
+          'Received an invalid app.bsky.feed.post record',
+          valid.error,
+        )
+      }
+    } else {
+      rootStore.log.warn(
+        'app.bsky.feed.getTimeline or app.bsky.feed.getAuthorFeed served an unexpected record type',
+        this.post.record,
+      )
+    }
     this.reply = v.reply
     if (v.reply?.parent) {
       this.replyParent = new FeedItemModel(rootStore, '', {
diff --git a/src/state/models/notifications-view.ts b/src/state/models/notifications-view.ts
index 44f92dd2f..c169a995c 100644
--- a/src/state/models/notifications-view.ts
+++ b/src/state/models/notifications-view.ts
@@ -2,11 +2,16 @@ import {makeAutoObservable, runInAction} from 'mobx'
 import {
   AppBskyNotificationList as ListNotifications,
   AppBskyActorRef as ActorRef,
+  AppBskyFeedPost,
+  AppBskyFeedRepost,
+  AppBskyFeedTrend,
+  AppBskyFeedVote,
+  AppBskyGraphAssertion,
+  AppBskyGraphFollow,
   APP_BSKY_GRAPH,
 } from '@atproto/api'
 import {RootStoreModel} from './root-store'
 import {PostThreadViewModel} from './post-thread-view'
-import {hasProp} from '../lib/type-guards'
 import {cleanError} from '../../lib/strings'
 
 const UNGROUPABLE_REASONS = ['trend', 'assertion']
@@ -19,7 +24,15 @@ export interface GroupedNotification extends ListNotifications.Notification {
   additional?: ListNotifications.Notification[]
 }
 
-export class NotificationsViewItemModel implements GroupedNotification {
+type SupportedRecord =
+  | AppBskyFeedPost.Record
+  | AppBskyFeedRepost.Record
+  | AppBskyFeedTrend.Record
+  | AppBskyFeedVote.Record
+  | AppBskyGraphAssertion.Record
+  | AppBskyGraphFollow.Record
+
+export class NotificationsViewItemModel {
   // ui state
   _reactKey: string = ''
 
@@ -34,7 +47,7 @@ export class NotificationsViewItemModel implements GroupedNotification {
   }
   reason: string = ''
   reasonSubject?: string
-  record: any = {}
+  record?: SupportedRecord
   isRead: boolean = false
   indexedAt: string = ''
   additional?: NotificationsViewItemModel[]
@@ -58,7 +71,7 @@ export class NotificationsViewItemModel implements GroupedNotification {
     this.author = v.author
     this.reason = v.reason
     this.reasonSubject = v.reasonSubject
-    this.record = v.record
+    this.record = this.toSupportedRecord(v.record)
     this.isRead = v.isRead
     this.indexedAt = v.indexedAt
     if (v.additional?.length) {
@@ -116,23 +129,55 @@ export class NotificationsViewItemModel implements GroupedNotification {
 
   get isInvite() {
     return (
-      this.isAssertion && this.record.assertion === APP_BSKY_GRAPH.AssertMember
+      this.isAssertion &&
+      AppBskyGraphAssertion.isRecord(this.record) &&
+      this.record.assertion === APP_BSKY_GRAPH.AssertMember
     )
   }
 
-  get subjectUri() {
+  get subjectUri(): string {
     if (this.reasonSubject) {
       return this.reasonSubject
     }
+    const record = this.record
     if (
-      hasProp(this.record, 'subject') &&
-      typeof this.record.subject === 'string'
+      AppBskyFeedRepost.isRecord(record) ||
+      AppBskyFeedTrend.isRecord(record) ||
+      AppBskyFeedVote.isRecord(record)
     ) {
-      return this.record.subject
+      return record.subject.uri
     }
     return ''
   }
 
+  toSupportedRecord(v: unknown): SupportedRecord | undefined {
+    for (const ns of [
+      AppBskyFeedPost,
+      AppBskyFeedRepost,
+      AppBskyFeedTrend,
+      AppBskyFeedVote,
+      AppBskyGraphAssertion,
+      AppBskyGraphFollow,
+    ]) {
+      if (ns.isRecord(v)) {
+        const valid = ns.validateRecord(v)
+        if (valid.success) {
+          return v
+        } else {
+          this.rootStore.log.warn('Received an invalid record', {
+            record: v,
+            error: valid.error,
+          })
+          return
+        }
+      }
+    }
+    this.rootStore.log.warn(
+      'app.bsky.notifications.list served an unsupported record type',
+      v,
+    )
+  }
+
   async fetchAdditionalData() {
     if (!this.needsAdditionalData) {
       return
@@ -140,7 +185,7 @@ export class NotificationsViewItemModel implements GroupedNotification {
     let postUri
     if (this.isReply || this.isMention) {
       postUri = this.uri
-    } else if (this.isUpvote || this.isRead || this.isTrend) {
+    } else if (this.isUpvote || this.isRepost || this.isTrend) {
       postUri = this.subjectUri
     }
     if (postUri) {
diff --git a/src/state/models/post-thread-view.ts b/src/state/models/post-thread-view.ts
index b7c33cfbd..f19335539 100644
--- a/src/state/models/post-thread-view.ts
+++ b/src/state/models/post-thread-view.ts
@@ -1,5 +1,8 @@
 import {makeAutoObservable, runInAction} from 'mobx'
-import {AppBskyFeedGetPostThread as GetPostThread} from '@atproto/api'
+import {
+  AppBskyFeedGetPostThread as GetPostThread,
+  AppBskyFeedPost as FeedPost,
+} from '@atproto/api'
 import {AtUri} from '../../third-party/uri'
 import {RootStoreModel} from './root-store'
 import * as apilib from '../lib/api'
@@ -19,7 +22,8 @@ export class PostThreadViewPostModel {
   _hasMore = false
 
   // data
-  post: GetPostThread.ThreadViewPost['post']
+  post: FeedPost.View
+  postRecord?: FeedPost.Record
   parent?: PostThreadViewPostModel | GetPostThread.NotFoundPost
   replies?: (PostThreadViewPostModel | GetPostThread.NotFoundPost)[]
 
@@ -30,6 +34,22 @@ export class PostThreadViewPostModel {
   ) {
     this._reactKey = reactKey
     this.post = v.post
+    if (FeedPost.isRecord(this.post.record)) {
+      const valid = FeedPost.validateRecord(this.post.record)
+      if (valid.success) {
+        this.postRecord = this.post.record
+      } else {
+        rootStore.log.warn(
+          'Received an invalid app.bsky.feed.post record',
+          valid.error,
+        )
+      }
+    } else {
+      rootStore.log.warn(
+        'app.bsky.feed.getPostThread served an unexpected record type',
+        this.post.record,
+      )
+    }
     // replies and parent are handled via assignTreeModels
     makeAutoObservable(this, {rootStore: false})
   }
@@ -278,7 +298,6 @@ export class PostThreadViewModel {
   }
 
   private _replaceAll(res: GetPostThread.Response) {
-    // TODO: validate .record
     // sortThread(res.data.thread) TODO needed?
     const keyGen = reactKeyGenerator()
     const thread = new PostThreadViewPostModel(