Remove PDS lists on account deletion

apps/mobile/app/settings.tsx

···
 import { useTheme } from "@/contexts/theme";
 import { useToast } from "@/contexts/toast";
 
+function getErrorMessage(error: unknown, fallback: string): string {
+	if (error instanceof Error && error.message) {
+		return error.message;
+	}
+
+	if (
+		error &&
+		typeof error === "object" &&
+		"message" in error &&
+		typeof error.message === "string"
+	) {
+		return error.message;
+	}
+
+	return fallback;
+}
+
 export default function SettingsScreen() {
 	const router = useRouter();
 	const { showToast } = useToast();
···
 			await logout();
 			router.replace("/");
 		},
-		onError: () => {
-			showToast("Failed to delete account", "error");
+		onError: (error) => {
+			showToast(getErrorMessage(error, "Failed to delete account"), "error");
 		},
 	});
 

apps/mobile/components/settings/DeleteAccountModal.tsx

···
 
 					<View style={styles.pdsSwitchRow}>
 						<Text style={styles.pdsSwitchLabel}>
-							Also delete my watch history from my PDS
+							Also delete my OpnShelf data from my PDS
 						</Text>
 						<Switch
 							value={deletePDSData}
···
 					{deletePDSData ? (
 						<View style={styles.deleteWarningBox}>
 							<Text style={styles.deleteWarningText}>
-								Your watch history will be permanently deleted from your personal
+								Your OpnShelf data, including watch history, follows, lists,
+								and list items, will be permanently deleted from your personal
 								data server. This cannot be recovered.
 							</Text>
 						</View>
 					) : (
 						<View style={styles.deleteInfoBox}>
 							<Text style={styles.deleteInfoText}>
-								Your watch history will remain on your PDS. You can use another app
-								or re-authorize OpnShelf later to access it.
+								Your OpnShelf data will remain on your PDS. You can use another
+								app or re-authorize OpnShelf later to access it.
 							</Text>
 						</View>
 					)}

apps/web/src/routes/profile.$handle.settings.tsx

···
 	component: SettingsPage,
 });
 
+function getErrorMessage(error: unknown, fallback: string): string {
+	if (error instanceof Error && error.message) {
+		return error.message;
+	}
+
+	if (
+		error &&
+		typeof error === "object" &&
+		"message" in error &&
+		typeof error.message === "string"
+	) {
+		return error.message;
+	}
+
+	return fallback;
+}
+
 function SettingsPage() {
 	const router = useRouter();
 	const queryClient = useQueryClient();
···
 			queryClient.removeQueries({ queryKey: authControllerMeQueryKey() });
 			router.navigate({ to: "/" });
 		},
-		onError: () => {
-			toast.error("Failed to delete account");
+		onError: (error) => {
+			toast.error(getErrorMessage(error, "Failed to delete account"));
 		},
 	});
 
···
 								htmlFor={deletePdsId}
 								className="md-body-medium cursor-pointer text-[var(--md-sys-color-on-surface)]"
 							>
-								Also delete my watch history from my PDS
+								Also delete my OpnShelf data from my PDS
 							</Label>
 						</div>
 
···
 								}}
 							>
 								<p className="md-body-medium text-[var(--md-sys-color-error)]">
-									Your watch history will be permanently deleted from your
-									personal data server. This cannot be recovered.
+									Your OpnShelf data, including watch history, follows, lists,
+									and list items, will be permanently deleted from your personal
+									data server. This cannot be recovered.
 								</p>
 							</div>
 						) : (
···
 								}}
 							>
 								<p className="md-body-medium text-[var(--md-sys-color-on-surface-variant)]">
-									Your watch history will remain on your PDS. You can use
+									Your OpnShelf data will remain on your PDS. You can use
 									another app or re-authorize OpnShelf later to access it.
 								</p>
 							</div>

backend/lexicons.json

···
 			"id": "xyz.opnshelf.listItem",
 			"path": "lexicons/app/opnshelf/listItem.json",
 			"local": true
+		},
+		{
+			"id": "xyz.opnshelf.follow",
+			"path": "lexicons/app/opnshelf/follow.json",
+			"local": true
 		}
 	]
 }

backend/prisma/migrations/20260316103000_add_follow_pds_metadata/migration.sql

···
+-- AlterTable
+ALTER TABLE "Follow"
+ADD COLUMN "rkey" TEXT,
+ADD COLUMN "uri" TEXT,
+ADD COLUMN "cid" TEXT;
+
+-- CreateIndex
+CREATE INDEX "Follow_followerDid_rkey_idx" ON "Follow"("followerDid", "rkey");

backend/prisma/schema.prisma

···
 model Follow {
   followerDid  String
   followingDid String
+  rkey         String?
+  uri          String?
+  cid          String?
   createdAt    DateTime @default(now())
 
   follower     User @relation("UserFollowing", fields: [followerDid], references: [did], onDelete: Cascade)
···
   @@id([followerDid, followingDid])
   @@index([followerDid, createdAt])
   @@index([followingDid, createdAt])
+  @@index([followerDid, rkey])
 }
 
 enum MediaType {

backend/src/auth/auth.service.spec.ts

···
 				client_uri: "http://127.0.0.1:3001",
 				redirect_uris: ["http://127.0.0.1:3001/auth/callback"],
 				scope:
-					"atproto repo:xyz.opnshelf.movie repo:xyz.opnshelf.episode repo:xyz.opnshelf.list repo:xyz.opnshelf.listItem rpc:app.bsky.actor.getProfile?aud=did:web:api.bsky.app%23bsky_appview",
+					"atproto repo:xyz.opnshelf.movie repo:xyz.opnshelf.episode repo:xyz.opnshelf.list repo:xyz.opnshelf.listItem repo:xyz.opnshelf.follow rpc:app.bsky.actor.getProfile?aud=did:web:api.bsky.app%23bsky_appview",
 				grant_types: ["authorization_code", "refresh_token"],
 				response_types: ["code"],
 				application_type: "native",
···
 
 			expect(client.authorize).toHaveBeenCalledWith("user.bsky.social", {
 				scope:
-					"atproto repo:xyz.opnshelf.movie repo:xyz.opnshelf.episode repo:xyz.opnshelf.list repo:xyz.opnshelf.listItem rpc:app.bsky.actor.getProfile?aud=did:web:api.bsky.app%23bsky_appview",
+					"atproto repo:xyz.opnshelf.movie repo:xyz.opnshelf.episode repo:xyz.opnshelf.list repo:xyz.opnshelf.listItem repo:xyz.opnshelf.follow rpc:app.bsky.actor.getProfile?aud=did:web:api.bsky.app%23bsky_appview",
 			});
 			expect(result).toBe(mockUrl.toString());
 		});
···
 			// - repo:xyz.opnshelf.movie: write movie records
 			// - repo:xyz.opnshelf.list: write list records
 			// - repo:xyz.opnshelf.listItem: write list item records
+			// - repo:xyz.opnshelf.follow: write follow records
 			// - rpc:app.bsky.actor.getProfile: fetch user profiles via Bluesky AppView
 			expect(authServiceModule.OAUTH_SCOPE).toBe(
-				"atproto repo:xyz.opnshelf.movie repo:xyz.opnshelf.episode repo:xyz.opnshelf.list repo:xyz.opnshelf.listItem rpc:app.bsky.actor.getProfile?aud=did:web:api.bsky.app%23bsky_appview",
+				"atproto repo:xyz.opnshelf.movie repo:xyz.opnshelf.episode repo:xyz.opnshelf.list repo:xyz.opnshelf.listItem repo:xyz.opnshelf.follow rpc:app.bsky.actor.getProfile?aud=did:web:api.bsky.app%23bsky_appview",
 			);
 		});
 

backend/src/auth/auth.service.ts

···
 const BLUESKY_PUBLIC_API = "https://public.api.bsky.app/xrpc";
 
 export const OAUTH_SCOPE =
-	"atproto repo:xyz.opnshelf.movie repo:xyz.opnshelf.episode repo:xyz.opnshelf.list repo:xyz.opnshelf.listItem rpc:app.bsky.actor.getProfile?aud=did:web:api.bsky.app%23bsky_appview";
+	"atproto repo:xyz.opnshelf.movie repo:xyz.opnshelf.episode repo:xyz.opnshelf.list repo:xyz.opnshelf.listItem repo:xyz.opnshelf.follow rpc:app.bsky.actor.getProfile?aud=did:web:api.bsky.app%23bsky_appview";
 
 export interface OAuthAppState {
 	platform?: "mobile";

backend/src/generated/internal/class.ts

···
   "clientVersion": "7.3.0",
   "engineVersion": "9d6ad21cbbceab97458517b147a6a09ff43aa735",
   "activeProvider": "postgresql",
-  "inlineSchema": "generator client {\n  provider     = \"prisma-client\"\n  output       = \"../src/generated\"\n  moduleFormat = \"cjs\"\n}\n\ndatasource db {\n  provider = \"postgresql\"\n}\n\nmodel User {\n  did                   String    @id\n  handle                String    @unique\n  displayName           String?\n  avatar                String?\n  timezone              String    @default(\"UTC\")\n  timeFormat            String    @default(\"24h\")\n  onboardingCompletedAt DateTime?\n  createdAt             DateTime  @default(now())\n  updatedAt             DateTime  @updatedAt\n\n  trackedMovies   TrackedMovie[]\n  trackedEpisodes TrackedEpisode[]\n  lists           MovieList[]\n  following       Follow[]         @relation(\"UserFollowing\")\n  followers       Follow[]         @relation(\"UserFollowers\")\n\n  @@index([handle])\n}\n\nmodel Follow {\n  followerDid  String\n  followingDid String\n  createdAt    DateTime @default(now())\n\n  follower  User @relation(\"UserFollowing\", fields: [followerDid], references: [did], onDelete: Cascade)\n  following User @relation(\"UserFollowers\", fields: [followingDid], references: [did], onDelete: Cascade)\n\n  @@id([followerDid, followingDid])\n  @@index([followerDid, createdAt])\n  @@index([followingDid, createdAt])\n}\n\nenum MediaType {\n  movie\n  show\n}\n\n// OAuth session storage for @atproto/oauth-client-node sessionStore\n// No FK to User because the OAuth library stores session before we create the User\n// Cookie stores opaque id (not DID) for session lookup\nmodel AuthSession {\n  id          String   @id @default(cuid())\n  userDid     String   @unique\n  sessionData String // JSON-serialized session from the library\n  createdAt   DateTime @default(now())\n  updatedAt   DateTime @updatedAt\n\n  @@index([updatedAt])\n}\n\nmodel AuthState {\n  key       String   @id\n  stateData String\n  expiresAt DateTime\n  createdAt DateTime @default(now())\n\n  @@index([expiresAt])\n}\n\nmodel Movie {\n  movieId      String    @id\n  title        String\n  posterPath   String?\n  backdropPath String?\n  releaseYear  Int?\n  releaseDate  DateTime?\n  overview     String?\n  colors       Json? // { primary, secondary, accent, muted }\n\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  trackedBy TrackedMovie[]\n  listItems ListItem[]\n\n  @@index([title])\n}\n\nmodel Show {\n  showId       String    @id\n  title        String\n  posterPath   String?\n  backdropPath String?\n  firstAirYear Int?\n  firstAirDate DateTime?\n  overview     String?\n  colors       Json?\n\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  trackedBy TrackedEpisode[]\n  listItems ListItem[]\n\n  @@index([title])\n}\n\nmodel TrackedMovie {\n  id   String @id @default(cuid())\n  rkey String @unique\n  uri  String\n  cid  String\n\n  userDid String\n  user    User   @relation(fields: [userDid], references: [did], onDelete: Cascade)\n\n  movieId String\n  movie   Movie  @relation(fields: [movieId], references: [movieId], onDelete: Cascade)\n\n  status      String    @default(\"watched\")\n  watchedDate DateTime?\n\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  @@index([userDid])\n  @@index([movieId])\n  @@index([status])\n  @@index([createdAt])\n  @@index([watchedDate])\n  @@index([uri])\n  @@index([cid])\n}\n\nmodel TrackedEpisode {\n  id   String @id @default(cuid())\n  rkey String @unique\n  uri  String\n  cid  String\n\n  userDid String\n  user    User   @relation(fields: [userDid], references: [did], onDelete: Cascade)\n\n  showId String\n  show   Show   @relation(fields: [showId], references: [showId], onDelete: Cascade)\n\n  seasonNumber  Int\n  episodeNumber Int\n  status        String    @default(\"watched\")\n  watchedDate   DateTime?\n\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  @@index([userDid])\n  @@index([showId])\n  @@index([seasonNumber])\n  @@index([episodeNumber])\n  @@index([status])\n  @@index([createdAt])\n  @@index([watchedDate])\n  @@index([uri])\n  @@index([cid])\n}\n\nmodel MovieList {\n  id   String  @id @default(cuid())\n  rkey String  @unique\n  uri  String\n  cid  String?\n\n  userDid String\n  user    User   @relation(fields: [userDid], references: [did], onDelete: Cascade)\n\n  name        String\n  description String?\n  slug        String\n  isDefault   Boolean @default(false)\n\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  items ListItem[]\n\n  @@unique([userDid, slug])\n  @@index([userDid])\n  @@index([isDefault])\n}\n\nmodel ListItem {\n  id   String  @id @default(cuid())\n  rkey String  @unique\n  uri  String\n  cid  String?\n\n  listId String\n  list   MovieList @relation(fields: [listId], references: [id], onDelete: Cascade)\n\n  mediaType MediaType\n  mediaId   String\n  movieId   String?\n  movie     Movie?    @relation(fields: [movieId], references: [movieId], onDelete: Cascade)\n  showId    String?\n  show      Show?     @relation(fields: [showId], references: [showId], onDelete: Cascade)\n\n  notes    String?\n  position Int     @default(0)\n\n  createdAt DateTime @default(now())\n\n  @@unique([listId, mediaType, mediaId])\n  @@index([listId])\n  @@index([mediaType, mediaId])\n}\n",
+  "inlineSchema": "generator client {\n  provider     = \"prisma-client\"\n  output       = \"../src/generated\"\n  moduleFormat = \"cjs\"\n}\n\ndatasource db {\n  provider = \"postgresql\"\n}\n\nmodel User {\n  did                   String    @id\n  handle                String    @unique\n  displayName           String?\n  avatar                String?\n  timezone              String    @default(\"UTC\")\n  timeFormat            String    @default(\"24h\")\n  onboardingCompletedAt DateTime?\n  createdAt             DateTime  @default(now())\n  updatedAt             DateTime  @updatedAt\n\n  trackedMovies   TrackedMovie[]\n  trackedEpisodes TrackedEpisode[]\n  lists           MovieList[]\n  following       Follow[]         @relation(\"UserFollowing\")\n  followers       Follow[]         @relation(\"UserFollowers\")\n\n  @@index([handle])\n}\n\nmodel Follow {\n  followerDid  String\n  followingDid String\n  rkey         String?\n  uri          String?\n  cid          String?\n  createdAt    DateTime @default(now())\n\n  follower  User @relation(\"UserFollowing\", fields: [followerDid], references: [did], onDelete: Cascade)\n  following User @relation(\"UserFollowers\", fields: [followingDid], references: [did], onDelete: Cascade)\n\n  @@id([followerDid, followingDid])\n  @@index([followerDid, createdAt])\n  @@index([followingDid, createdAt])\n  @@index([followerDid, rkey])\n}\n\nenum MediaType {\n  movie\n  show\n}\n\n// OAuth session storage for @atproto/oauth-client-node sessionStore\n// No FK to User because the OAuth library stores session before we create the User\n// Cookie stores opaque id (not DID) for session lookup\nmodel AuthSession {\n  id          String   @id @default(cuid())\n  userDid     String   @unique\n  sessionData String // JSON-serialized session from the library\n  createdAt   DateTime @default(now())\n  updatedAt   DateTime @updatedAt\n\n  @@index([updatedAt])\n}\n\nmodel AuthState {\n  key       String   @id\n  stateData String\n  expiresAt DateTime\n  createdAt DateTime @default(now())\n\n  @@index([expiresAt])\n}\n\nmodel Movie {\n  movieId      String    @id\n  title        String\n  posterPath   String?\n  backdropPath String?\n  releaseYear  Int?\n  releaseDate  DateTime?\n  overview     String?\n  colors       Json? // { primary, secondary, accent, muted }\n\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  trackedBy TrackedMovie[]\n  listItems ListItem[]\n\n  @@index([title])\n}\n\nmodel Show {\n  showId       String    @id\n  title        String\n  posterPath   String?\n  backdropPath String?\n  firstAirYear Int?\n  firstAirDate DateTime?\n  overview     String?\n  colors       Json?\n\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  trackedBy TrackedEpisode[]\n  listItems ListItem[]\n\n  @@index([title])\n}\n\nmodel TrackedMovie {\n  id   String @id @default(cuid())\n  rkey String @unique\n  uri  String\n  cid  String\n\n  userDid String\n  user    User   @relation(fields: [userDid], references: [did], onDelete: Cascade)\n\n  movieId String\n  movie   Movie  @relation(fields: [movieId], references: [movieId], onDelete: Cascade)\n\n  status      String    @default(\"watched\")\n  watchedDate DateTime?\n\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  @@index([userDid])\n  @@index([movieId])\n  @@index([status])\n  @@index([createdAt])\n  @@index([watchedDate])\n  @@index([uri])\n  @@index([cid])\n}\n\nmodel TrackedEpisode {\n  id   String @id @default(cuid())\n  rkey String @unique\n  uri  String\n  cid  String\n\n  userDid String\n  user    User   @relation(fields: [userDid], references: [did], onDelete: Cascade)\n\n  showId String\n  show   Show   @relation(fields: [showId], references: [showId], onDelete: Cascade)\n\n  seasonNumber  Int\n  episodeNumber Int\n  status        String    @default(\"watched\")\n  watchedDate   DateTime?\n\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  @@index([userDid])\n  @@index([showId])\n  @@index([seasonNumber])\n  @@index([episodeNumber])\n  @@index([status])\n  @@index([createdAt])\n  @@index([watchedDate])\n  @@index([uri])\n  @@index([cid])\n}\n\nmodel MovieList {\n  id   String  @id @default(cuid())\n  rkey String  @unique\n  uri  String\n  cid  String?\n\n  userDid String\n  user    User   @relation(fields: [userDid], references: [did], onDelete: Cascade)\n\n  name        String\n  description String?\n  slug        String\n  isDefault   Boolean @default(false)\n\n  createdAt DateTime @default(now())\n  updatedAt DateTime @updatedAt\n\n  items ListItem[]\n\n  @@unique([userDid, slug])\n  @@index([userDid])\n  @@index([isDefault])\n}\n\nmodel ListItem {\n  id   String  @id @default(cuid())\n  rkey String  @unique\n  uri  String\n  cid  String?\n\n  listId String\n  list   MovieList @relation(fields: [listId], references: [id], onDelete: Cascade)\n\n  mediaType MediaType\n  mediaId   String\n  movieId   String?\n  movie     Movie?    @relation(fields: [movieId], references: [movieId], onDelete: Cascade)\n  showId    String?\n  show      Show?     @relation(fields: [showId], references: [showId], onDelete: Cascade)\n\n  notes    String?\n  position Int     @default(0)\n\n  createdAt DateTime @default(now())\n\n  @@unique([listId, mediaType, mediaId])\n  @@index([listId])\n  @@index([mediaType, mediaId])\n}\n",
   "runtimeDataModel": {
     "models": {},
     "enums": {},
···
   }
 }
 
-config.runtimeDataModel = JSON.parse("{\"models\":{\"User\":{\"fields\":[{\"name\":\"did\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"handle\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"displayName\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"avatar\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"timezone\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"timeFormat\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"onboardingCompletedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"trackedMovies\",\"kind\":\"object\",\"type\":\"TrackedMovie\",\"relationName\":\"TrackedMovieToUser\"},{\"name\":\"trackedEpisodes\",\"kind\":\"object\",\"type\":\"TrackedEpisode\",\"relationName\":\"TrackedEpisodeToUser\"},{\"name\":\"lists\",\"kind\":\"object\",\"type\":\"MovieList\",\"relationName\":\"MovieListToUser\"},{\"name\":\"following\",\"kind\":\"object\",\"type\":\"Follow\",\"relationName\":\"UserFollowing\"},{\"name\":\"followers\",\"kind\":\"object\",\"type\":\"Follow\",\"relationName\":\"UserFollowers\"}],\"dbName\":null},\"Follow\":{\"fields\":[{\"name\":\"followerDid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"followingDid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"follower\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"UserFollowing\"},{\"name\":\"following\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"UserFollowers\"}],\"dbName\":null},\"AuthSession\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"userDid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"sessionData\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"}],\"dbName\":null},\"AuthState\":{\"fields\":[{\"name\":\"key\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"stateData\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"expiresAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"}],\"dbName\":null},\"Movie\":{\"fields\":[{\"name\":\"movieId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"title\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"posterPath\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"backdropPath\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"releaseYear\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"releaseDate\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"overview\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"colors\",\"kind\":\"scalar\",\"type\":\"Json\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"trackedBy\",\"kind\":\"object\",\"type\":\"TrackedMovie\",\"relationName\":\"MovieToTrackedMovie\"},{\"name\":\"listItems\",\"kind\":\"object\",\"type\":\"ListItem\",\"relationName\":\"ListItemToMovie\"}],\"dbName\":null},\"Show\":{\"fields\":[{\"name\":\"showId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"title\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"posterPath\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"backdropPath\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"firstAirYear\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"firstAirDate\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"overview\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"colors\",\"kind\":\"scalar\",\"type\":\"Json\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"trackedBy\",\"kind\":\"object\",\"type\":\"TrackedEpisode\",\"relationName\":\"ShowToTrackedEpisode\"},{\"name\":\"listItems\",\"kind\":\"object\",\"type\":\"ListItem\",\"relationName\":\"ListItemToShow\"}],\"dbName\":null},\"TrackedMovie\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"rkey\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"uri\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"cid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"userDid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"TrackedMovieToUser\"},{\"name\":\"movieId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"movie\",\"kind\":\"object\",\"type\":\"Movie\",\"relationName\":\"MovieToTrackedMovie\"},{\"name\":\"status\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"watchedDate\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"}],\"dbName\":null},\"TrackedEpisode\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"rkey\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"uri\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"cid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"userDid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"TrackedEpisodeToUser\"},{\"name\":\"showId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"show\",\"kind\":\"object\",\"type\":\"Show\",\"relationName\":\"ShowToTrackedEpisode\"},{\"name\":\"seasonNumber\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"episodeNumber\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"status\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"watchedDate\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"}],\"dbName\":null},\"MovieList\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"rkey\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"uri\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"cid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"userDid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"MovieListToUser\"},{\"name\":\"name\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"description\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"slug\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"isDefault\",\"kind\":\"scalar\",\"type\":\"Boolean\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"items\",\"kind\":\"object\",\"type\":\"ListItem\",\"relationName\":\"ListItemToMovieList\"}],\"dbName\":null},\"ListItem\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"rkey\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"uri\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"cid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"listId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"list\",\"kind\":\"object\",\"type\":\"MovieList\",\"relationName\":\"ListItemToMovieList\"},{\"name\":\"mediaType\",\"kind\":\"enum\",\"type\":\"MediaType\"},{\"name\":\"mediaId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"movieId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"movie\",\"kind\":\"object\",\"type\":\"Movie\",\"relationName\":\"ListItemToMovie\"},{\"name\":\"showId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"show\",\"kind\":\"object\",\"type\":\"Show\",\"relationName\":\"ListItemToShow\"},{\"name\":\"notes\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"position\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"}],\"dbName\":null}},\"enums\":{},\"types\":{}}")
+config.runtimeDataModel = JSON.parse("{\"models\":{\"User\":{\"fields\":[{\"name\":\"did\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"handle\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"displayName\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"avatar\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"timezone\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"timeFormat\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"onboardingCompletedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"trackedMovies\",\"kind\":\"object\",\"type\":\"TrackedMovie\",\"relationName\":\"TrackedMovieToUser\"},{\"name\":\"trackedEpisodes\",\"kind\":\"object\",\"type\":\"TrackedEpisode\",\"relationName\":\"TrackedEpisodeToUser\"},{\"name\":\"lists\",\"kind\":\"object\",\"type\":\"MovieList\",\"relationName\":\"MovieListToUser\"},{\"name\":\"following\",\"kind\":\"object\",\"type\":\"Follow\",\"relationName\":\"UserFollowing\"},{\"name\":\"followers\",\"kind\":\"object\",\"type\":\"Follow\",\"relationName\":\"UserFollowers\"}],\"dbName\":null},\"Follow\":{\"fields\":[{\"name\":\"followerDid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"followingDid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"rkey\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"uri\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"cid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"follower\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"UserFollowing\"},{\"name\":\"following\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"UserFollowers\"}],\"dbName\":null},\"AuthSession\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"userDid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"sessionData\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"}],\"dbName\":null},\"AuthState\":{\"fields\":[{\"name\":\"key\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"stateData\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"expiresAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"}],\"dbName\":null},\"Movie\":{\"fields\":[{\"name\":\"movieId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"title\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"posterPath\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"backdropPath\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"releaseYear\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"releaseDate\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"overview\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"colors\",\"kind\":\"scalar\",\"type\":\"Json\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"trackedBy\",\"kind\":\"object\",\"type\":\"TrackedMovie\",\"relationName\":\"MovieToTrackedMovie\"},{\"name\":\"listItems\",\"kind\":\"object\",\"type\":\"ListItem\",\"relationName\":\"ListItemToMovie\"}],\"dbName\":null},\"Show\":{\"fields\":[{\"name\":\"showId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"title\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"posterPath\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"backdropPath\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"firstAirYear\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"firstAirDate\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"overview\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"colors\",\"kind\":\"scalar\",\"type\":\"Json\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"trackedBy\",\"kind\":\"object\",\"type\":\"TrackedEpisode\",\"relationName\":\"ShowToTrackedEpisode\"},{\"name\":\"listItems\",\"kind\":\"object\",\"type\":\"ListItem\",\"relationName\":\"ListItemToShow\"}],\"dbName\":null},\"TrackedMovie\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"rkey\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"uri\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"cid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"userDid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"TrackedMovieToUser\"},{\"name\":\"movieId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"movie\",\"kind\":\"object\",\"type\":\"Movie\",\"relationName\":\"MovieToTrackedMovie\"},{\"name\":\"status\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"watchedDate\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"}],\"dbName\":null},\"TrackedEpisode\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"rkey\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"uri\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"cid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"userDid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"TrackedEpisodeToUser\"},{\"name\":\"showId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"show\",\"kind\":\"object\",\"type\":\"Show\",\"relationName\":\"ShowToTrackedEpisode\"},{\"name\":\"seasonNumber\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"episodeNumber\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"status\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"watchedDate\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"}],\"dbName\":null},\"MovieList\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"rkey\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"uri\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"cid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"userDid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"user\",\"kind\":\"object\",\"type\":\"User\",\"relationName\":\"MovieListToUser\"},{\"name\":\"name\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"description\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"slug\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"isDefault\",\"kind\":\"scalar\",\"type\":\"Boolean\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"updatedAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"},{\"name\":\"items\",\"kind\":\"object\",\"type\":\"ListItem\",\"relationName\":\"ListItemToMovieList\"}],\"dbName\":null},\"ListItem\":{\"fields\":[{\"name\":\"id\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"rkey\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"uri\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"cid\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"listId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"list\",\"kind\":\"object\",\"type\":\"MovieList\",\"relationName\":\"ListItemToMovieList\"},{\"name\":\"mediaType\",\"kind\":\"enum\",\"type\":\"MediaType\"},{\"name\":\"mediaId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"movieId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"movie\",\"kind\":\"object\",\"type\":\"Movie\",\"relationName\":\"ListItemToMovie\"},{\"name\":\"showId\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"show\",\"kind\":\"object\",\"type\":\"Show\",\"relationName\":\"ListItemToShow\"},{\"name\":\"notes\",\"kind\":\"scalar\",\"type\":\"String\"},{\"name\":\"position\",\"kind\":\"scalar\",\"type\":\"Int\"},{\"name\":\"createdAt\",\"kind\":\"scalar\",\"type\":\"DateTime\"}],\"dbName\":null}},\"enums\":{},\"types\":{}}")
 
 async function decodeBase64AsWasm(wasmBase64: string): Promise<WebAssembly.Module> {
   const { Buffer } = await import('node:buffer')

backend/src/generated/internal/prismaNamespace.ts

···
 export const FollowScalarFieldEnum = {
   followerDid: 'followerDid',
   followingDid: 'followingDid',
+  rkey: 'rkey',
+  uri: 'uri',
+  cid: 'cid',
   createdAt: 'createdAt'
 } as const
 

backend/src/generated/internal/prismaNamespaceBrowser.ts

···
 export const FollowScalarFieldEnum = {
   followerDid: 'followerDid',
   followingDid: 'followingDid',
+  rkey: 'rkey',
+  uri: 'uri',
+  cid: 'cid',
   createdAt: 'createdAt'
 } as const
 

backend/src/generated/models/Follow.ts

···
 export type FollowMinAggregateOutputType = {
   followerDid: string | null
   followingDid: string | null
+  rkey: string | null
+  uri: string | null
+  cid: string | null
   createdAt: Date | null
 }
 
 export type FollowMaxAggregateOutputType = {
   followerDid: string | null
   followingDid: string | null
+  rkey: string | null
+  uri: string | null
+  cid: string | null
   createdAt: Date | null
 }
 
 export type FollowCountAggregateOutputType = {
   followerDid: number
   followingDid: number
+  rkey: number
+  uri: number
+  cid: number
   createdAt: number
   _all: number
 }
···
 export type FollowMinAggregateInputType = {
   followerDid?: true
   followingDid?: true
+  rkey?: true
+  uri?: true
+  cid?: true
   createdAt?: true
 }
 
 export type FollowMaxAggregateInputType = {
   followerDid?: true
   followingDid?: true
+  rkey?: true
+  uri?: true
+  cid?: true
   createdAt?: true
 }
 
 export type FollowCountAggregateInputType = {
   followerDid?: true
   followingDid?: true
+  rkey?: true
+  uri?: true
+  cid?: true
   createdAt?: true
   _all?: true
 }
···
 export type FollowGroupByOutputType = {
   followerDid: string
   followingDid: string
+  rkey: string | null
+  uri: string | null
+  cid: string | null
   createdAt: Date
   _count: FollowCountAggregateOutputType | null
   _min: FollowMinAggregateOutputType | null
···
   NOT?: Prisma.FollowWhereInput | Prisma.FollowWhereInput[]
   followerDid?: Prisma.StringFilter<"Follow"> | string
   followingDid?: Prisma.StringFilter<"Follow"> | string
+  rkey?: Prisma.StringNullableFilter<"Follow"> | string | null
+  uri?: Prisma.StringNullableFilter<"Follow"> | string | null
+  cid?: Prisma.StringNullableFilter<"Follow"> | string | null
   createdAt?: Prisma.DateTimeFilter<"Follow"> | Date | string
   follower?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
   following?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
···
 export type FollowOrderByWithRelationInput = {
   followerDid?: Prisma.SortOrder
   followingDid?: Prisma.SortOrder
+  rkey?: Prisma.SortOrderInput | Prisma.SortOrder
+  uri?: Prisma.SortOrderInput | Prisma.SortOrder
+  cid?: Prisma.SortOrderInput | Prisma.SortOrder
   createdAt?: Prisma.SortOrder
   follower?: Prisma.UserOrderByWithRelationInput
   following?: Prisma.UserOrderByWithRelationInput
···
   NOT?: Prisma.FollowWhereInput | Prisma.FollowWhereInput[]
   followerDid?: Prisma.StringFilter<"Follow"> | string
   followingDid?: Prisma.StringFilter<"Follow"> | string
+  rkey?: Prisma.StringNullableFilter<"Follow"> | string | null
+  uri?: Prisma.StringNullableFilter<"Follow"> | string | null
+  cid?: Prisma.StringNullableFilter<"Follow"> | string | null
   createdAt?: Prisma.DateTimeFilter<"Follow"> | Date | string
   follower?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
   following?: Prisma.XOR<Prisma.UserScalarRelationFilter, Prisma.UserWhereInput>
···
 export type FollowOrderByWithAggregationInput = {
   followerDid?: Prisma.SortOrder
   followingDid?: Prisma.SortOrder
+  rkey?: Prisma.SortOrderInput | Prisma.SortOrder
+  uri?: Prisma.SortOrderInput | Prisma.SortOrder
+  cid?: Prisma.SortOrderInput | Prisma.SortOrder
   createdAt?: Prisma.SortOrder
   _count?: Prisma.FollowCountOrderByAggregateInput
   _max?: Prisma.FollowMaxOrderByAggregateInput
···
   NOT?: Prisma.FollowScalarWhereWithAggregatesInput | Prisma.FollowScalarWhereWithAggregatesInput[]
   followerDid?: Prisma.StringWithAggregatesFilter<"Follow"> | string
   followingDid?: Prisma.StringWithAggregatesFilter<"Follow"> | string
+  rkey?: Prisma.StringNullableWithAggregatesFilter<"Follow"> | string | null
+  uri?: Prisma.StringNullableWithAggregatesFilter<"Follow"> | string | null
+  cid?: Prisma.StringNullableWithAggregatesFilter<"Follow"> | string | null
   createdAt?: Prisma.DateTimeWithAggregatesFilter<"Follow"> | Date | string
 }
 
 export type FollowCreateInput = {
+  rkey?: string | null
+  uri?: string | null
+  cid?: string | null
   createdAt?: Date | string
   follower: Prisma.UserCreateNestedOneWithoutFollowingInput
   following: Prisma.UserCreateNestedOneWithoutFollowersInput
···
 export type FollowUncheckedCreateInput = {
   followerDid: string
   followingDid: string
+  rkey?: string | null
+  uri?: string | null
+  cid?: string | null
   createdAt?: Date | string
 }
 
 export type FollowUpdateInput = {
+  rkey?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  uri?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  cid?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   follower?: Prisma.UserUpdateOneRequiredWithoutFollowingNestedInput
   following?: Prisma.UserUpdateOneRequiredWithoutFollowersNestedInput
···
 export type FollowUncheckedUpdateInput = {
   followerDid?: Prisma.StringFieldUpdateOperationsInput | string
   followingDid?: Prisma.StringFieldUpdateOperationsInput | string
+  rkey?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  uri?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  cid?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
 }
 
 export type FollowCreateManyInput = {
   followerDid: string
   followingDid: string
+  rkey?: string | null
+  uri?: string | null
+  cid?: string | null
   createdAt?: Date | string
 }
 
 export type FollowUpdateManyMutationInput = {
+  rkey?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  uri?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  cid?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
 }
 
 export type FollowUncheckedUpdateManyInput = {
   followerDid?: Prisma.StringFieldUpdateOperationsInput | string
   followingDid?: Prisma.StringFieldUpdateOperationsInput | string
+  rkey?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  uri?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  cid?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
 }
 
···
 export type FollowCountOrderByAggregateInput = {
   followerDid?: Prisma.SortOrder
   followingDid?: Prisma.SortOrder
+  rkey?: Prisma.SortOrder
+  uri?: Prisma.SortOrder
+  cid?: Prisma.SortOrder
   createdAt?: Prisma.SortOrder
 }
 
 export type FollowMaxOrderByAggregateInput = {
   followerDid?: Prisma.SortOrder
   followingDid?: Prisma.SortOrder
+  rkey?: Prisma.SortOrder
+  uri?: Prisma.SortOrder
+  cid?: Prisma.SortOrder
   createdAt?: Prisma.SortOrder
 }
 
 export type FollowMinOrderByAggregateInput = {
   followerDid?: Prisma.SortOrder
   followingDid?: Prisma.SortOrder
+  rkey?: Prisma.SortOrder
+  uri?: Prisma.SortOrder
+  cid?: Prisma.SortOrder
   createdAt?: Prisma.SortOrder
 }
 
···
 }
 
 export type FollowCreateWithoutFollowerInput = {
+  rkey?: string | null
+  uri?: string | null
+  cid?: string | null
   createdAt?: Date | string
   following: Prisma.UserCreateNestedOneWithoutFollowersInput
 }
 
 export type FollowUncheckedCreateWithoutFollowerInput = {
   followingDid: string
+  rkey?: string | null
+  uri?: string | null
+  cid?: string | null
   createdAt?: Date | string
 }
 
···
 }
 
 export type FollowCreateWithoutFollowingInput = {
+  rkey?: string | null
+  uri?: string | null
+  cid?: string | null
   createdAt?: Date | string
   follower: Prisma.UserCreateNestedOneWithoutFollowingInput
 }
 
 export type FollowUncheckedCreateWithoutFollowingInput = {
   followerDid: string
+  rkey?: string | null
+  uri?: string | null
+  cid?: string | null
   createdAt?: Date | string
 }
 
···
   NOT?: Prisma.FollowScalarWhereInput | Prisma.FollowScalarWhereInput[]
   followerDid?: Prisma.StringFilter<"Follow"> | string
   followingDid?: Prisma.StringFilter<"Follow"> | string
+  rkey?: Prisma.StringNullableFilter<"Follow"> | string | null
+  uri?: Prisma.StringNullableFilter<"Follow"> | string | null
+  cid?: Prisma.StringNullableFilter<"Follow"> | string | null
   createdAt?: Prisma.DateTimeFilter<"Follow"> | Date | string
 }
 
···
 
 export type FollowCreateManyFollowerInput = {
   followingDid: string
+  rkey?: string | null
+  uri?: string | null
+  cid?: string | null
   createdAt?: Date | string
 }
 
 export type FollowCreateManyFollowingInput = {
   followerDid: string
+  rkey?: string | null
+  uri?: string | null
+  cid?: string | null
   createdAt?: Date | string
 }
 
 export type FollowUpdateWithoutFollowerInput = {
+  rkey?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  uri?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  cid?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   following?: Prisma.UserUpdateOneRequiredWithoutFollowersNestedInput
 }
 
 export type FollowUncheckedUpdateWithoutFollowerInput = {
   followingDid?: Prisma.StringFieldUpdateOperationsInput | string
+  rkey?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  uri?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  cid?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
 }
 
 export type FollowUncheckedUpdateManyWithoutFollowerInput = {
   followingDid?: Prisma.StringFieldUpdateOperationsInput | string
+  rkey?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  uri?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  cid?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
 }
 
 export type FollowUpdateWithoutFollowingInput = {
+  rkey?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  uri?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  cid?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
   follower?: Prisma.UserUpdateOneRequiredWithoutFollowingNestedInput
 }
 
 export type FollowUncheckedUpdateWithoutFollowingInput = {
   followerDid?: Prisma.StringFieldUpdateOperationsInput | string
+  rkey?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  uri?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  cid?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
 }
 
 export type FollowUncheckedUpdateManyWithoutFollowingInput = {
   followerDid?: Prisma.StringFieldUpdateOperationsInput | string
+  rkey?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  uri?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
+  cid?: Prisma.NullableStringFieldUpdateOperationsInput | string | null
   createdAt?: Prisma.DateTimeFieldUpdateOperationsInput | Date | string
 }
 
···
 export type FollowSelect<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
   followerDid?: boolean
   followingDid?: boolean
+  rkey?: boolean
+  uri?: boolean
+  cid?: boolean
   createdAt?: boolean
   follower?: boolean | Prisma.UserDefaultArgs<ExtArgs>
   following?: boolean | Prisma.UserDefaultArgs<ExtArgs>
···
 export type FollowSelectCreateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
   followerDid?: boolean
   followingDid?: boolean
+  rkey?: boolean
+  uri?: boolean
+  cid?: boolean
   createdAt?: boolean
   follower?: boolean | Prisma.UserDefaultArgs<ExtArgs>
   following?: boolean | Prisma.UserDefaultArgs<ExtArgs>
···
 export type FollowSelectUpdateManyAndReturn<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetSelect<{
   followerDid?: boolean
   followingDid?: boolean
+  rkey?: boolean
+  uri?: boolean
+  cid?: boolean
   createdAt?: boolean
   follower?: boolean | Prisma.UserDefaultArgs<ExtArgs>
   following?: boolean | Prisma.UserDefaultArgs<ExtArgs>
···
 export type FollowSelectScalar = {
   followerDid?: boolean
   followingDid?: boolean
+  rkey?: boolean
+  uri?: boolean
+  cid?: boolean
   createdAt?: boolean
 }
 
-export type FollowOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"followerDid" | "followingDid" | "createdAt", ExtArgs["result"]["follow"]>
+export type FollowOmit<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = runtime.Types.Extensions.GetOmit<"followerDid" | "followingDid" | "rkey" | "uri" | "cid" | "createdAt", ExtArgs["result"]["follow"]>
 export type FollowInclude<ExtArgs extends runtime.Types.Extensions.InternalArgs = runtime.Types.Extensions.DefaultArgs> = {
   follower?: boolean | Prisma.UserDefaultArgs<ExtArgs>
   following?: boolean | Prisma.UserDefaultArgs<ExtArgs>
···
   scalars: runtime.Types.Extensions.GetPayloadResult<{
     followerDid: string
     followingDid: string
+    rkey: string | null
+    uri: string | null
+    cid: string | null
     createdAt: Date
   }, ExtArgs["result"]["follow"]>
   composites: {}
···
 export interface FollowFieldRefs {
   readonly followerDid: Prisma.FieldRef<"Follow", 'String'>
   readonly followingDid: Prisma.FieldRef<"Follow", 'String'>
+  readonly rkey: Prisma.FieldRef<"Follow", 'String'>
+  readonly uri: Prisma.FieldRef<"Follow", 'String'>
+  readonly cid: Prisma.FieldRef<"Follow", 'String'>
   readonly createdAt: Prisma.FieldRef<"Follow", 'DateTime'>
 }
     

backend/src/ingester/ingester.module.ts

···
 import { ListsModule } from "../lists/lists.module";
 import { MoviesModule } from "../movies/movies.module";
 import { PrismaModule } from "../prisma/prisma.module";
+import { SocialModule } from "../social/social.module";
 import { ShowsModule } from "../shows/shows.module";
 import { IngesterService } from "./ingester.service";
 
···
 		forwardRef(() => MoviesModule),
 		forwardRef(() => ShowsModule),
 		forwardRef(() => ListsModule),
+		forwardRef(() => SocialModule),
 	],
 	providers: [IngesterService],
 	exports: [IngesterService],

backend/src/ingester/ingester.service.spec.ts

···
 import { ListsService } from "../lists/lists.service";
 import { MoviesService } from "../movies/movies.service";
 import { PrismaService } from "../prisma/prisma.service";
+import { SocialService } from "../social/social.service";
 import { ShowsService } from "../shows/shows.service";
 import { IngesterService } from "./ingester.service";
 
···
 		deleteListRecord: jest.Mock;
 		indexListItemRecord: jest.Mock;
 		deleteListItemRecord: jest.Mock;
+	};
+	let mockSocialService: {
+		indexFollowRecord: jest.Mock;
+		deleteFollowRecordIndex: jest.Mock;
 	};
 
 	const mockConfigService = {
···
 			deleteListItemRecord: jest.fn(),
 		};
 
+		mockSocialService = {
+			indexFollowRecord: jest.fn(),
+			deleteFollowRecordIndex: jest.fn(),
+		};
+
 		const module: TestingModule = await Test.createTestingModule({
 			providers: [
 				IngesterService,
···
 				{ provide: MoviesService, useValue: mockMoviesService },
 				{ provide: ShowsService, useValue: mockShowsService },
 				{ provide: ListsService, useValue: mockListsService },
+				{ provide: SocialService, useValue: mockSocialService },
 			],
 		}).compile();
 
···
 			}
 			return recordHandler;
 		};
+
+		it("should index follows for xyz.opnshelf.follow create", async () => {
+			const recordHandler = setupRecordHandler();
+			mockPrismaService.user.findUnique.mockResolvedValue({
+				did: "did:plc:abc123",
+			});
+
+			await recordHandler({
+				id: 4,
+				type: "record",
+				action: "create",
+				did: "did:plc:abc123",
+				rev: "rev-follow-1",
+				collection: "xyz.opnshelf.follow",
+				rkey: "follow-rkey-1",
+				record: {
+					$type: "xyz.opnshelf.follow",
+					subjectDid: "did:plc:friend-1",
+					createdAt: "2026-03-16T10:00:00.000Z",
+				},
+				cid: "cid-follow-1",
+				live: true,
+			});
+
+			expect(mockSocialService.indexFollowRecord).toHaveBeenCalledWith(
+				"did:plc:abc123",
+				"follow-rkey-1",
+				"cid-follow-1",
+				expect.objectContaining({
+					subjectDid: "did:plc:friend-1",
+				}),
+				"at://did:plc:abc123/xyz.opnshelf.follow/follow-rkey-1",
+			);
+		});
+
+		it("should delete follows for xyz.opnshelf.follow delete", async () => {
+			const recordHandler = setupRecordHandler();
+
+			await recordHandler({
+				id: 5,
+				type: "record",
+				action: "delete",
+				did: "did:plc:abc123",
+				rev: "rev-follow-2",
+				collection: "xyz.opnshelf.follow",
+				rkey: "follow-rkey-1",
+				cid: "cid-follow-1",
+				live: true,
+			});
+
+			expect(mockSocialService.deleteFollowRecordIndex).toHaveBeenCalledWith(
+				"did:plc:abc123",
+				"follow-rkey-1",
+			);
+		});
 
 		it("should upsert tracked movie for xyz.opnshelf.movie create", async () => {
 			const recordHandler = setupRecordHandler();

backend/src/ingester/ingester.service.ts

···
 } from "@nestjs/common";
 import { ConfigService } from "@nestjs/config";
 import {
+	$nsid as FOLLOW_COLLECTION,
+	main as followSchema,
+} from "../lexicons/xyz/opnshelf/follow";
+import type { Main as FollowRecord } from "../lexicons/xyz/opnshelf/follow.defs";
+import {
 	$nsid as LIST_COLLECTION,
 	main as listSchema,
 } from "../lexicons/xyz/opnshelf/list";
···
 import { ListsService } from "../lists/lists.service";
 import { MoviesService } from "../movies/movies.service";
 import { PrismaService } from "../prisma/prisma.service";
+import { SocialService } from "../social/social.service";
 import { ShowsService } from "../shows/shows.service";
 
 @Injectable()
···
 		private readonly moviesService: MoviesService,
 		private readonly showsService: ShowsService,
 		private readonly listsService: ListsService,
+		private readonly socialService: SocialService,
 	) {
 		this.tapUrl = this.config.get<string>("TAP_URL") ?? "http://localhost:2480";
 		this.tapAdminPassword = this.config.get<string>("TAP_ADMIN_PASSWORD");
···
 			await this.handleMovieEvent(evt, uri);
 		} else if (evt.collection === EPISODE_COLLECTION) {
 			await this.handleEpisodeEvent(evt, uri);
+		} else if (evt.collection === FOLLOW_COLLECTION) {
+			await this.handleFollowEvent(evt, uri);
 		} else if (evt.collection === LIST_COLLECTION) {
 			await this.handleListEvent(evt, uri);
 		} else if (evt.collection === LIST_ITEM_COLLECTION) {
 			await this.handleListItemEvent(evt, uri);
 		} else {
 			this.logger.debug(`Skipping event for collection ${evt.collection}`);
+		}
+	}
+
+	private async handleFollowEvent(evt: RecordEvent, uri: string) {
+		if (evt.action === "create" || evt.action === "update") {
+			if (!evt.record) {
+				this.logger.warn(`Record event missing record data: ${uri}`);
+				return;
+			}
+
+			let followRecord: FollowRecord;
+			try {
+				followRecord = followSchema.parse(evt.record);
+			} catch {
+				this.logger.debug("Received invalid follow record, skipping");
+				return;
+			}
+
+			const user = await this.prisma.user.findUnique({
+				where: { did: evt.did },
+			});
+
+			if (!user) {
+				this.logger.debug(`User ${evt.did} not in database, skipping record`);
+				return;
+			}
+
+			await this.socialService.indexFollowRecord(
+				evt.did,
+				evt.rkey,
+				evt.cid,
+				followRecord,
+				uri,
+			);
+		} else if (evt.action === "delete") {
+			await this.socialService.deleteFollowRecordIndex(evt.did, evt.rkey);
 		}
 	}
 

backend/src/lexicons/xyz/opnshelf.ts

···
  */
 
 export * as episode from './opnshelf/episode.js'
+export * as follow from './opnshelf/follow.js'
 export * as list from './opnshelf/list.js'
 export * as listItem from './opnshelf/listItem.js'
 export * as movie from './opnshelf/movie.js'

backend/src/lexicons/xyz/opnshelf/follow.defs.ts

···
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+import { l } from '@atproto/lex'
+
+const $nsid = 'xyz.opnshelf.follow'
+
+export { $nsid }
+
+/** An OpnShelf follow relationship stored on a user's PDS */
+type Main = {
+  $type: 'xyz.opnshelf.follow'
+
+  /**
+   * The DID of the OpnShelf user being followed
+   */
+  subjectDid: string
+
+  /**
+   * When the follow record was created
+   */
+  createdAt: l.DatetimeString
+}
+
+export type { Main }
+
+/** An OpnShelf follow relationship stored on a user's PDS */
+const main = l.record<'tid', Main>(
+  'tid',
+  $nsid,
+  l.object({
+    subjectDid: l.string(),
+    createdAt: l.string({ format: 'datetime' }),
+  }),
+)
+
+export { main }
+
+export const $isTypeOf = /*#__PURE__*/ main.isTypeOf.bind(main),
+  $build = /*#__PURE__*/ main.build.bind(main),
+  $type = /*#__PURE__*/ main.$type
+export const $assert = /*#__PURE__*/ main.assert.bind(main),
+  $check = /*#__PURE__*/ main.check.bind(main),
+  $cast = /*#__PURE__*/ main.cast.bind(main),
+  $ifMatches = /*#__PURE__*/ main.ifMatches.bind(main),
+  $matches = /*#__PURE__*/ main.matches.bind(main),
+  $parse = /*#__PURE__*/ main.parse.bind(main),
+  $safeParse = /*#__PURE__*/ main.safeParse.bind(main),
+  $validate = /*#__PURE__*/ main.validate.bind(main),
+  $safeValidate = /*#__PURE__*/ main.safeValidate.bind(main)

backend/src/lexicons/xyz/opnshelf/follow.ts

···
+/*
+ * THIS FILE WAS GENERATED BY "@atproto/lex". DO NOT EDIT.
+ */
+
+export * from './follow.defs.js'
+export * as $defs from './follow.defs.js'

backend/src/lists/lists.service.spec.ts

···
 
 const mockPutRecord = jest.fn();
 const mockDeleteRecord = jest.fn();
+const mockListRecords = jest.fn();
 jest.mock("@atproto/api", () => ({
 	Agent: jest.fn().mockImplementation(() => ({
 		com: {
···
 				repo: {
 					putRecord: mockPutRecord,
 					deleteRecord: mockDeleteRecord,
+					listRecords: mockListRecords,
 				},
 			},
 		},
···
 			$type: "xyz.opnshelf.list",
 			...data,
 		})),
+		parse: jest.fn((data: Record<string, unknown>) => data),
 	},
 	$nsid: "xyz.opnshelf.list",
 }));
···
 		jest.clearAllMocks();
 		mockPutRecord.mockReset();
 		mockDeleteRecord.mockReset();
+		mockListRecords.mockReset();
 
 		const module: TestingModule = await Test.createTestingModule({
 			providers: [
···
 		}).compile();
 
 		service = module.get<ListsService>(ListsService);
+	});
+
+	describe("ensureDefaultLists", () => {
+		it("indexes repo-backed default lists before creating missing defaults", async () => {
+			mockPrismaService.movieList.findMany
+				.mockResolvedValueOnce([])
+				.mockResolvedValueOnce([
+					{
+						id: "list-watchlist",
+						rkey: "watchlist-rkey",
+						uri: "at://did:plc:abc123/xyz.opnshelf.list/watchlist-rkey",
+						cid: "cid-watchlist",
+						userDid: "did:plc:abc123",
+						name: "Watchlist",
+						description: "Items you want to watch",
+						slug: "watchlist",
+						isDefault: true,
+						createdAt: new Date("2024-01-01"),
+						updatedAt: new Date("2024-01-01"),
+					},
+					{
+						id: "list-favorites",
+						rkey: "favorites-rkey",
+						uri: "at://did:plc:abc123/xyz.opnshelf.list/favorites-rkey",
+						cid: "cid-favorites",
+						userDid: "did:plc:abc123",
+						name: "Favorites",
+						description: "Your favorite items",
+						slug: "favorites",
+						isDefault: true,
+						createdAt: new Date("2024-01-02"),
+						updatedAt: new Date("2024-01-02"),
+					},
+				]);
+			mockListRecords.mockResolvedValue({
+				data: {
+					records: [
+						{
+							uri: "at://did:plc:abc123/xyz.opnshelf.list/favorites-rkey",
+							cid: "cid-favorites",
+							value: {
+								name: "Favorites",
+								description: "Your favorite items",
+								slug: "favorites",
+								isDefault: true,
+								createdAt: "2024-01-02T00:00:00.000Z",
+							},
+						},
+					],
+				},
+			});
+			mockPrismaService.movieList.upsert.mockResolvedValue({
+				id: "list-favorites",
+				rkey: "favorites-rkey",
+				uri: "at://did:plc:abc123/xyz.opnshelf.list/favorites-rkey",
+				cid: "cid-favorites",
+				userDid: "did:plc:abc123",
+				name: "Favorites",
+				description: "Your favorite items",
+				slug: "favorites",
+				isDefault: true,
+				createdAt: new Date("2024-01-02"),
+				updatedAt: new Date("2024-01-02"),
+			});
+			mockPutRecord.mockResolvedValue({
+				data: {
+					uri: "at://did:plc:abc123/xyz.opnshelf.list/watchlist-rkey",
+					cid: "cid-watchlist",
+				},
+			});
+			mockPrismaService.movieList.create.mockResolvedValue({
+				id: "list-watchlist",
+				rkey: "watchlist-rkey",
+				uri: "at://did:plc:abc123/xyz.opnshelf.list/watchlist-rkey",
+				cid: "cid-watchlist",
+				userDid: "did:plc:abc123",
+				name: "Watchlist",
+				description: "Items you want to watch",
+				slug: "watchlist",
+				isDefault: true,
+				createdAt: new Date("2024-01-01"),
+				updatedAt: new Date("2024-01-01"),
+			});
+
+			const result = await service.ensureDefaultLists("did:plc:abc123", {
+				did: "did:plc:abc123",
+			});
+
+			expect(mockListRecords).toHaveBeenCalledWith({
+				repo: "did:plc:abc123",
+				collection: "xyz.opnshelf.list",
+				limit: 100,
+				cursor: undefined,
+			});
+			expect(mockPrismaService.movieList.upsert).toHaveBeenCalledWith({
+				where: { rkey: "favorites-rkey" },
+				create: {
+					rkey: "favorites-rkey",
+					uri: "at://did:plc:abc123/xyz.opnshelf.list/favorites-rkey",
+					cid: "cid-favorites",
+					userDid: "did:plc:abc123",
+					name: "Favorites",
+					description: "Your favorite items",
+					slug: "favorites",
+					isDefault: true,
+				},
+				update: {
+					uri: "at://did:plc:abc123/xyz.opnshelf.list/favorites-rkey",
+					cid: "cid-favorites",
+					name: "Favorites",
+					description: "Your favorite items",
+					slug: "favorites",
+					isDefault: true,
+				},
+			});
+			expect(mockPutRecord).toHaveBeenCalledTimes(1);
+			expect(mockPutRecord).toHaveBeenCalledWith(
+				expect.objectContaining({
+					collection: "xyz.opnshelf.list",
+					record: expect.objectContaining({
+						slug: "watchlist",
+					}),
+				}),
+			);
+			expect(result.map((list) => list.slug)).toEqual([
+				"watchlist",
+				"favorites",
+			]);
+		});
+
+		it("does not create duplicates when both default lists already exist locally", async () => {
+			mockPrismaService.movieList.findMany.mockResolvedValue([
+				{
+					id: "list-watchlist",
+					rkey: "watchlist-rkey",
+					uri: "at://did:plc:abc123/xyz.opnshelf.list/watchlist-rkey",
+					cid: "cid-watchlist",
+					userDid: "did:plc:abc123",
+					name: "Watchlist",
+					description: "Items you want to watch",
+					slug: "watchlist",
+					isDefault: true,
+					createdAt: new Date("2024-01-01"),
+					updatedAt: new Date("2024-01-01"),
+				},
+				{
+					id: "list-favorites",
+					rkey: "favorites-rkey",
+					uri: "at://did:plc:abc123/xyz.opnshelf.list/favorites-rkey",
+					cid: "cid-favorites",
+					userDid: "did:plc:abc123",
+					name: "Favorites",
+					description: "Your favorite items",
+					slug: "favorites",
+					isDefault: true,
+					createdAt: new Date("2024-01-02"),
+					updatedAt: new Date("2024-01-02"),
+				},
+			]);
+
+			const result = await service.ensureDefaultLists("did:plc:abc123", {
+				did: "did:plc:abc123",
+			});
+
+			expect(mockListRecords).not.toHaveBeenCalled();
+			expect(mockPutRecord).not.toHaveBeenCalled();
+			expect(result.map((list) => list.slug)).toEqual([
+				"watchlist",
+				"favorites",
+			]);
+		});
 	});
 
 	describe("getUserLists", () => {

backend/src/lists/lists.service.ts

···
 		description: "Your favorite items",
 	},
 ];
+const DEFAULT_LIST_SLUGS = new Set(DEFAULT_LISTS.map((list) => list.slug));
+const LIST_RECORDS_PAGE_SIZE = 100;
 
 @Injectable()
 export class ListsService {
···
 		const existingLists = await this.prisma.movieList.findMany({
 			where: { userDid, isDefault: true },
 		});
+		const hydratedLists = [...existingLists];
 
 		const existingSlugs = new Set(existingLists.map((l) => l.slug));
+
+		if (existingSlugs.size < DEFAULT_LISTS.length) {
+			const repoDefaults = await this.listRepoDefaultLists(userDid, session);
+
+			for (const repoDefault of repoDefaults) {
+				if (existingSlugs.has(repoDefault.slug)) {
+					continue;
+				}
+
+				const indexedDefault = await this.prisma.movieList.upsert({
+					where: { rkey: repoDefault.rkey },
+					create: {
+						rkey: repoDefault.rkey,
+						uri: repoDefault.uri,
+						cid: repoDefault.cid,
+						userDid,
+						name: repoDefault.name,
+						description: repoDefault.description,
+						slug: repoDefault.slug,
+						isDefault: true,
+					},
+					update: {
+						uri: repoDefault.uri,
+						cid: repoDefault.cid,
+						name: repoDefault.name,
+						description: repoDefault.description,
+						slug: repoDefault.slug,
+						isDefault: true,
+					},
+				});
+
+				hydratedLists.push(indexedDefault);
+				existingSlugs.add(repoDefault.slug);
+			}
+		}
+
 		const listsToCreate = DEFAULT_LISTS.filter(
 			(dl) => !existingSlugs.has(dl.slug),
 		);
 
 		for (const defaultList of listsToCreate) {
-			await this.createDefaultList(userDid, session, defaultList);
+			const createdDefault = await this.createDefaultList(
+				userDid,
+				session,
+				defaultList,
+			);
+			hydratedLists.push({
+				id: createdDefault.id,
+				rkey: createdDefault.rkey,
+				uri: createdDefault.uri,
+				cid: null,
+				userDid: createdDefault.userDid,
+				name: createdDefault.name,
+				description: createdDefault.description ?? null,
+				slug: createdDefault.slug,
+				isDefault: createdDefault.isDefault,
+				createdAt: new Date(createdDefault.createdAt),
+				updatedAt: new Date(createdDefault.updatedAt),
+			});
+			existingSlugs.add(defaultList.slug);
 		}
 
-		const allLists = await this.prisma.movieList.findMany({
-			where: { userDid, isDefault: true },
-			orderBy: { createdAt: "asc" },
-		});
+		const allLists =
+			listsToCreate.length > 0 || hydratedLists.length !== existingLists.length
+				? await this.prisma.movieList.findMany({
+						where: { userDid, isDefault: true },
+						orderBy: { createdAt: "asc" },
+					})
+				: hydratedLists.sort(
+						(a, b) => a.createdAt.getTime() - b.createdAt.getTime(),
+					);
 
 		return allLists.map((list) => ({
 			id: list.id,
···
 		const uniqueSuffix = userDid.slice(-6);
 
 		return `${baseSlug}-${uniqueSuffix}`;
+	}
+
+	private async listRepoDefaultLists(
+		userDid: string,
+		session: ATSession,
+	): Promise<
+		Array<{
+			rkey: string;
+			uri: string;
+			cid: string;
+			name: string;
+			description?: string;
+			slug: string;
+		}>
+	> {
+		const agent = new Agent(
+			session as unknown as ConstructorParameters<typeof Agent>[0],
+		);
+		const repoDefaults: Array<{
+			rkey: string;
+			uri: string;
+			cid: string;
+			name: string;
+			description?: string;
+			slug: string;
+		}> = [];
+		let cursor: string | undefined;
+
+		do {
+			const response = await agent.com.atproto.repo.listRecords({
+				repo: session.did,
+				collection: LIST_COLLECTION,
+				limit: LIST_RECORDS_PAGE_SIZE,
+				cursor,
+			});
+
+			for (const record of response.data.records) {
+				let parsedRecord: ListRecord;
+				try {
+					parsedRecord = listSchema.parse(record.value);
+				} catch {
+					this.logger.debug(`Skipping invalid repo list record: ${record.uri}`);
+					continue;
+				}
+
+				if (
+					!parsedRecord.isDefault ||
+					!DEFAULT_LIST_SLUGS.has(parsedRecord.slug)
+				) {
+					continue;
+				}
+
+				repoDefaults.push({
+					rkey: this.extractRkeyFromUri(record.uri, session.did),
+					uri: record.uri,
+					cid: record.cid,
+					name: parsedRecord.name,
+					description: parsedRecord.description,
+					slug: parsedRecord.slug,
+				});
+			}
+
+			cursor = response.data.cursor;
+		} while (cursor);
+
+		this.logger.debug(
+			`Found ${repoDefaults.length} default list records on repo for user ${userDid}`,
+		);
+
+		return repoDefaults;
+	}
+
+	private extractRkeyFromUri(uri: string, userDid: string): string {
+		const prefix = `at://${userDid}/${LIST_COLLECTION}/`;
+
+		if (!uri.startsWith(prefix)) {
+			throw new Error(`Unexpected list URI returned from repo: ${uri}`);
+		}
+
+		return uri.slice(prefix.length);
 	}
 }

backend/src/social/social.controller.ts

···
 	SocialSearchQueryDto,
 	UserRelationshipDto,
 } from "./dto/social.dto";
-import { SocialService } from "./social.service";
+import { type ATSession, SocialService } from "./social.service";
 
 @ApiTags("social")
 @UseGuards(AuthGuard)
···
 		@Req() req: AuthenticatedRequest,
 		@Param("targetDid") targetDid: string,
 	): Promise<UserRelationshipDto> {
-		return this.socialService.follow(getViewerDid(req), targetDid);
+		return this.socialService.follow(
+			getViewerDid(req),
+			req.user.session as ATSession,
+			targetDid,
+		);
 	}
 
 	@Delete("follows/:targetDid")
···
 		@Req() req: AuthenticatedRequest,
 		@Param("targetDid") targetDid: string,
 	): Promise<void> {
-		await this.socialService.unfollow(getViewerDid(req), targetDid);
+		await this.socialService.unfollow(
+			getViewerDid(req),
+			req.user.session as ATSession,
+			targetDid,
+		);
 	}
 
 	@Get("relationship/:targetDid")

backend/src/social/social.service.spec.ts

···
 import type { PrismaService } from "../prisma/prisma.service";
 import { SocialService } from "./social.service";
 
+const mockPutRecord = jest.fn();
+const mockDeleteRecord = jest.fn();
+
+jest.mock("@atproto/api", () => ({
+	Agent: jest.fn().mockImplementation(() => ({
+		com: {
+			atproto: {
+				repo: {
+					putRecord: mockPutRecord,
+					deleteRecord: mockDeleteRecord,
+				},
+			},
+		},
+	})),
+}));
+
+jest.mock("@atproto/common", () => ({
+	TID: {
+		nextStr: jest.fn(() => "follow-rkey-123"),
+	},
+}));
+
+jest.mock("../lexicons/xyz/opnshelf/follow", () => ({
+	main: {
+		build: jest.fn((data: Record<string, unknown>) => ({
+			$type: "xyz.opnshelf.follow",
+			...data,
+		})),
+	},
+	$nsid: "xyz.opnshelf.follow",
+}));
+
 describe("SocialService", () => {
 	let service: SocialService;
 
···
 		},
 		follow: {
 			count: jest.fn(),
-			createMany: jest.fn(),
+			create: jest.fn(),
 			deleteMany: jest.fn(),
 			findMany: jest.fn(),
+			findFirst: jest.fn(),
+			update: jest.fn(),
 		},
 		trackedMovie: {
 			count: jest.fn(),
···
 		},
 		$queryRaw: jest.fn(),
 	} as unknown as PrismaService;
+	const session = { did: "did:plc:self" };
 
 	beforeEach(() => {
 		jest.clearAllMocks();
+		mockPutRecord.mockReset();
+		mockDeleteRecord.mockReset();
 		service = new SocialService(prisma);
 	});
 
···
 		prisma.user.findUnique = jest
 			.fn()
 			.mockResolvedValue({ did: "did:plc:target" });
-		prisma.follow.createMany = jest.fn().mockResolvedValue({ count: 1 });
+		prisma.follow.findFirst = jest
+			.fn()
+			.mockResolvedValueOnce(null)
+			.mockResolvedValueOnce({ rkey: "follow-rkey-123" });
+		prisma.follow.create = jest.fn().mockResolvedValue({
+			followerDid: "did:plc:self",
+			followingDid: "did:plc:target",
+			rkey: "follow-rkey-123",
+		});
 		prisma.follow.count = jest
 			.fn()
 			.mockResolvedValueOnce(1)
 			.mockResolvedValueOnce(0)
 			.mockResolvedValueOnce(1)
 			.mockResolvedValueOnce(0);
+		mockPutRecord.mockResolvedValue({
+			data: {
+				uri: "at://did:plc:self/xyz.opnshelf.follow/follow-rkey-123",
+				cid: "cid-follow-123",
+			},
+		});
 
 		await expect(
-			service.follow("did:plc:self", "did:plc:target"),
+			service.follow("did:plc:self", session, "did:plc:target"),
 		).resolves.toEqual({
 			targetDid: "did:plc:target",
 			isFollowing: true,
···
 		});
 
 		await expect(
-			service.follow("did:plc:self", "did:plc:target"),
+			service.follow("did:plc:self", session, "did:plc:target"),
 		).resolves.toEqual({
 			targetDid: "did:plc:target",
 			isFollowing: true,
···
 			canFollow: true,
 		});
 
-		expect(prisma.follow.createMany).toHaveBeenCalledTimes(2);
-		expect(prisma.follow.createMany).toHaveBeenCalledWith({
-			data: [
-				{
-					followerDid: "did:plc:self",
-					followingDid: "did:plc:target",
-				},
-			],
-			skipDuplicates: true,
+		expect(mockPutRecord).toHaveBeenCalledTimes(1);
+		expect(mockPutRecord).toHaveBeenCalledWith({
+			repo: "did:plc:self",
+			collection: "xyz.opnshelf.follow",
+			rkey: "follow-rkey-123",
+			record: expect.objectContaining({
+				$type: "xyz.opnshelf.follow",
+				subjectDid: "did:plc:target",
+			}),
+			validate: false,
+		});
+		expect(prisma.follow.create).toHaveBeenCalledTimes(1);
+		expect(prisma.follow.create).toHaveBeenCalledWith({
+			data: expect.objectContaining({
+				followerDid: "did:plc:self",
+				followingDid: "did:plc:target",
+				rkey: "follow-rkey-123",
+				uri: "at://did:plc:self/xyz.opnshelf.follow/follow-rkey-123",
+				cid: "cid-follow-123",
+			}),
 		});
 	});
 
···
 		prisma.user.findUnique = jest
 			.fn()
 			.mockResolvedValue({ did: "did:plc:target" });
+		prisma.follow.findFirst = jest
+			.fn()
+			.mockResolvedValueOnce({ rkey: "follow-rkey-123" })
+			.mockResolvedValueOnce(null);
 		prisma.follow.deleteMany = jest
 			.fn()
 			.mockResolvedValueOnce({ count: 1 })
 			.mockResolvedValueOnce({ count: 0 });
+		mockDeleteRecord.mockResolvedValue({});
 
 		await expect(
-			service.unfollow("did:plc:self", "did:plc:target"),
+			service.unfollow("did:plc:self", session, "did:plc:target"),
 		).resolves.toBeUndefined();
 		await expect(
-			service.unfollow("did:plc:self", "did:plc:target"),
+			service.unfollow("did:plc:self", session, "did:plc:target"),
 		).resolves.toBeUndefined();
 
+		expect(mockDeleteRecord).toHaveBeenCalledTimes(1);
+		expect(mockDeleteRecord).toHaveBeenCalledWith({
+			repo: "did:plc:self",
+			collection: "xyz.opnshelf.follow",
+			rkey: "follow-rkey-123",
+		});
 		expect(prisma.follow.deleteMany).toHaveBeenCalledTimes(2);
 		expect(prisma.follow.deleteMany).toHaveBeenCalledWith({
 			where: {
···
 
 	it("rejects self-follow", async () => {
 		await expect(
-			service.follow("did:plc:self", "did:plc:self"),
+			service.follow("did:plc:self", session, "did:plc:self"),
 		).rejects.toThrow(BadRequestException);
 		expect(prisma.user.findUnique).not.toHaveBeenCalled();
 	});
···
 	});
 
 	it("can reflect public profile counts after follow and unfollow", async () => {
-		const follows = new Set<string>();
+		const follows = new Map<string, { rkey?: string }>();
 		const statefulPrisma = createStatefulPrisma(follows);
 		const statefulService = new SocialService(
 			statefulPrisma as unknown as PrismaService,
 		);
+		mockPutRecord.mockResolvedValue({
+			data: {
+				uri: "at://did:plc:self/xyz.opnshelf.follow/follow-rkey-123",
+				cid: "cid-follow-123",
+			},
+		});
+		mockDeleteRecord.mockResolvedValue({});
 
-		await statefulService.follow("did:plc:self", "did:plc:target");
+		await statefulService.follow("did:plc:self", session, "did:plc:target");
 		const followedProfile = await statefulService.getFollowers(
 			"did:plc:self",
 			"target",
···
 			followingCount: 1,
 		});
 
-		await statefulService.unfollow("did:plc:self", "did:plc:target");
+		await statefulService.unfollow("did:plc:self", session, "did:plc:target");
 		const relationship = await statefulService.getRelationship(
 			"did:plc:self",
 			"did:plc:target",
···
 	};
 }
 
-function createStatefulPrisma(follows: Set<string>) {
+function createStatefulPrisma(follows: Map<string, { rkey?: string }>) {
 	const users = [
 		{ did: "did:plc:self", handle: "self", displayName: "Self", avatar: null },
 		{
···
 								.map((user) => ({
 									...user,
 									_count: {
-										followers: [...follows].filter((entry) =>
+										followers: [...follows.keys()].filter((entry) =>
 											entry.endsWith(`->${user.did}`),
 										).length,
-										following: [...follows].filter((entry) =>
+										following: [...follows.keys()].filter((entry) =>
 											entry.startsWith(`${user.did}->`),
 										).length,
 									},
···
 						where: { followerDid?: string; followingDid?: string };
 					}) => {
 						return Promise.resolve(
-							[...follows].filter((entry) => {
+							[...follows.keys()].filter((entry) => {
 								const [followerDid, followingDid] = entry.split("->");
 								return (
 									(where.followerDid
···
 						);
 					},
 				),
-			createMany: jest
+			create: jest.fn().mockImplementation(
+				({
+					data,
+				}: {
+					data: {
+						followerDid: string;
+						followingDid: string;
+						rkey?: string | null;
+					};
+				}) => {
+					follows.set(`${data.followerDid}->${data.followingDid}`, {
+						rkey: data.rkey ?? undefined,
+					});
+					return Promise.resolve(data);
+				},
+			),
+			findFirst: jest
 				.fn()
 				.mockImplementation(
 					({
-						data,
+						where,
 					}: {
-						data: Array<{ followerDid: string; followingDid: string }>;
+						where: { followerDid: string; followingDid: string };
 					}) => {
-						for (const follow of data) {
-							follows.add(`${follow.followerDid}->${follow.followingDid}`);
-						}
-						return Promise.resolve({ count: data.length });
+						const entry = follows.get(
+							`${where.followerDid}->${where.followingDid}`,
+						);
+						return Promise.resolve(entry ? { rkey: entry.rkey ?? null } : null);
 					},
 				),
+			update: jest.fn().mockImplementation(
+				({
+					where,
+					data,
+				}: {
+					where: {
+						followerDid_followingDid: {
+							followerDid: string;
+							followingDid: string;
+						};
+					};
+					data: { rkey?: string | null };
+				}) => {
+					const key = `${where.followerDid_followingDid.followerDid}->${where.followerDid_followingDid.followingDid}`;
+					follows.set(key, { rkey: data.rkey ?? undefined });
+					return Promise.resolve({});
+				},
+			),
 			deleteMany: jest
 				.fn()
 				.mockImplementation(
···
 			findMany: jest
 				.fn()
 				.mockImplementation(({ where }: { where: Record<string, unknown> }) => {
-					const entries = [...follows]
+					const entries = [...follows.keys()]
 						.map((entry) => {
 							const [followerDid, followingDid] = entry.split("->");
 							return { followerDid, followingDid };

backend/src/social/social.service.ts

···
+import { Agent } from "@atproto/api";
+import { TID } from "@atproto/common";
 import {
 	BadRequestException,
 	Injectable,
+	Logger,
 	NotFoundException,
 } from "@nestjs/common";
+import {
+	$nsid as FOLLOW_COLLECTION,
+	main as followSchema,
+} from "../lexicons/xyz/opnshelf/follow";
+import type { Main as FollowRecord } from "../lexicons/xyz/opnshelf/follow.defs";
 import { Prisma } from "../generated/client";
 import { PrismaService } from "../prisma/prisma.service";
 import type {
···
 	hasPreviousPage: boolean;
 };
 
+export interface ATSession {
+	did: string;
+}
+
 const DEFAULT_SOCIAL_PAGE_SIZE = 20;
 const MAX_SOCIAL_PAGE_SIZE = 50;
 const DEFAULT_FEED_PAGE_SIZE = 10;
···
 
 @Injectable()
 export class SocialService {
+	private readonly logger = new Logger(SocialService.name);
+
 	constructor(private readonly prisma: PrismaService) {}
 
 	async searchPeople(
···
 
 	async follow(
 		viewerDid: string,
+		session: ATSession,
 		targetDid: string,
 	): Promise<UserRelationshipDto> {
 		await this.assertCanFollow(viewerDid, targetDid);
+		const existingFollow = await this.prisma.follow.findFirst({
+			where: {
+				followerDid: viewerDid,
+				followingDid: targetDid,
+			},
+			select: { rkey: true },
+		});
 
-		await this.prisma.follow.createMany({
-			data: [{ followerDid: viewerDid, followingDid: targetDid }],
-			skipDuplicates: true,
-		});
+		if (existingFollow?.rkey) {
+			return this.getRelationship(viewerDid, targetDid);
+		}
+
+		const { rkey, uri, cid, createdAt } = await this.createFollowRecord(
+			session,
+			targetDid,
+		);
+
+		if (existingFollow) {
+			await this.prisma.follow.update({
+				where: {
+					followerDid_followingDid: {
+						followerDid: viewerDid,
+						followingDid: targetDid,
+					},
+				},
+				data: { rkey, uri, cid, createdAt },
+			});
+		} else {
+			await this.prisma.follow.create({
+				data: {
+					followerDid: viewerDid,
+					followingDid: targetDid,
+					rkey,
+					uri,
+					cid,
+					createdAt,
+				},
+			});
+		}
 
 		return this.getRelationship(viewerDid, targetDid);
 	}
 
-	async unfollow(viewerDid: string, targetDid: string): Promise<void> {
+	async unfollow(
+		viewerDid: string,
+		session: ATSession,
+		targetDid: string,
+	): Promise<void> {
 		await this.assertTargetUserExists(targetDid);
 
 		if (viewerDid === targetDid) {
 			return;
+		}
+
+		const existingFollow = await this.prisma.follow.findFirst({
+			where: {
+				followerDid: viewerDid,
+				followingDid: targetDid,
+			},
+			select: { rkey: true },
+		});
+
+		if (existingFollow?.rkey) {
+			await this.deleteFollowRecord(session, existingFollow.rkey);
 		}
 
 		await this.prisma.follow.deleteMany({
···
 		};
 	}
 
+	async indexFollowRecord(
+		followerDid: string,
+		rkey: string,
+		cid: string | undefined,
+		record: FollowRecord,
+		uri?: string,
+	) {
+		await this.assertTargetUserExists(record.subjectDid);
+
+		const existingFollow = await this.prisma.follow.findFirst({
+			where: {
+				followerDid,
+				followingDid: record.subjectDid,
+			},
+			select: {
+				followerDid: true,
+				followingDid: true,
+			},
+		});
+
+		const data = {
+			rkey,
+			cid,
+			uri: uri ?? `at://${followerDid}/${FOLLOW_COLLECTION}/${rkey}`,
+			createdAt: new Date(record.createdAt),
+		};
+
+		if (existingFollow) {
+			return this.prisma.follow.update({
+				where: {
+					followerDid_followingDid: {
+						followerDid,
+						followingDid: record.subjectDid,
+					},
+				},
+				data,
+			});
+		}
+
+		return this.prisma.follow.create({
+			data: {
+				followerDid,
+				followingDid: record.subjectDid,
+				...data,
+			},
+		});
+	}
+
+	async deleteFollowRecordIndex(followerDid: string, rkey: string) {
+		return this.prisma.follow.deleteMany({
+			where: {
+				followerDid,
+				rkey,
+			},
+		});
+	}
+
 	private async assertCanFollow(viewerDid: string, targetDid: string) {
 		if (viewerDid === targetDid) {
 			throw new BadRequestException("Users cannot follow themselves");
···
 		}
 
 		return user;
+	}
+
+	private async createFollowRecord(session: ATSession, targetDid: string) {
+		const rkey = TID.nextStr();
+		const createdAt = new Date();
+		const record: FollowRecord = followSchema.build({
+			subjectDid: targetDid,
+			createdAt: createdAt.toISOString(),
+		});
+
+		const agent = new Agent(
+			session as unknown as ConstructorParameters<typeof Agent>[0],
+		);
+		const response = await agent.com.atproto.repo.putRecord({
+			repo: session.did,
+			collection: FOLLOW_COLLECTION,
+			rkey,
+			record,
+			validate: false,
+		});
+
+		return {
+			rkey,
+			uri: response.data.uri,
+			cid: response.data.cid,
+			createdAt,
+		};
+	}
+
+	private async deleteFollowRecord(session: ATSession, rkey: string) {
+		const agent = new Agent(
+			session as unknown as ConstructorParameters<typeof Agent>[0],
+		);
+
+		try {
+			await agent.com.atproto.repo.deleteRecord({
+				repo: session.did,
+				collection: FOLLOW_COLLECTION,
+				rkey,
+			});
+		} catch (error) {
+			this.logger.warn(
+				`Failed to delete follow record ${rkey} from PDS`,
+				error,
+			);
+		}
 	}
 
 	private async buildSocialUserCards(

backend/src/users/dto/user-settings.dto.ts

···
 export class DeleteUserAccountDto {
 	@ApiProperty({
 		description:
-			"Whether to delete the user's watch history from their PDS. If false, the data remains on their PDS.",
+			"Whether to delete the user's OpnShelf data from their PDS, including watch history, follows, lists, and list items. If false, the data remains on their PDS.",
 		default: false,
 	})
 	@IsBoolean()

backend/src/users/user-deletion.service.spec.ts

···
+import { BadGatewayException, NotFoundException } from "@nestjs/common";
+
+const mockListRecords = jest.fn();
+const mockDeleteRecord = jest.fn();
+
+jest.mock("@atproto/api", () => ({
+	Agent: jest.fn().mockImplementation(() => ({
+		com: {
+			atproto: {
+				repo: {
+					listRecords: mockListRecords,
+					deleteRecord: mockDeleteRecord,
+				},
+			},
+		},
+	})),
+}));
+
+import { PrismaService } from "../prisma/prisma.service";
+import { UserDeletionService } from "./user-deletion.service";
+
+describe("UserDeletionService", () => {
+	let service: UserDeletionService;
+
+	const prisma = {
+		user: {
+			findUnique: jest.fn(),
+			delete: jest.fn(),
+		},
+		trackedMovie: {
+			findMany: jest.fn(),
+		},
+		trackedEpisode: {
+			findMany: jest.fn(),
+		},
+		follow: {
+			findMany: jest.fn(),
+		},
+		listItem: {
+			findMany: jest.fn(),
+		},
+		movieList: {
+			findMany: jest.fn(),
+		},
+	} as unknown as PrismaService;
+
+	beforeEach(() => {
+		jest.clearAllMocks();
+
+		prisma.user.findUnique = jest
+			.fn()
+			.mockResolvedValue({ did: "did:plc:test" });
+		prisma.user.delete = jest.fn().mockResolvedValue(undefined);
+		prisma.trackedMovie.findMany = jest.fn().mockResolvedValue([]);
+		prisma.trackedEpisode.findMany = jest.fn().mockResolvedValue([]);
+		prisma.follow.findMany = jest.fn().mockResolvedValue([]);
+		prisma.listItem.findMany = jest.fn().mockResolvedValue([]);
+		prisma.movieList.findMany = jest.fn().mockResolvedValue([]);
+
+		service = new UserDeletionService(prisma);
+	});
+
+	it("deletes all repo list items and lists, including favorites missing from Prisma", async () => {
+		mockListRecords
+			.mockResolvedValueOnce({
+				data: {
+					records: [
+						{
+							uri: "at://did:plc:test/xyz.opnshelf.listItem/list-item-1",
+							cid: "cid-1",
+							value: {},
+						},
+						{
+							uri: "at://did:plc:test/xyz.opnshelf.listItem/list-item-2",
+							cid: "cid-2",
+							value: {},
+						},
+					],
+					cursor: "cursor-2",
+				},
+			})
+			.mockResolvedValueOnce({
+				data: {
+					records: [
+						{
+							uri: "at://did:plc:test/xyz.opnshelf.listItem/list-item-3",
+							cid: "cid-3",
+							value: {},
+						},
+					],
+				},
+			})
+			.mockResolvedValueOnce({
+				data: {
+					records: [
+						{
+							uri: "at://did:plc:test/xyz.opnshelf.list/favorites",
+							cid: "cid-4",
+							value: {},
+						},
+						{
+							uri: "at://did:plc:test/xyz.opnshelf.list/custom-list",
+							cid: "cid-5",
+							value: {},
+						},
+					],
+				},
+			});
+
+		await service.deleteUser("did:plc:test", { did: "did:plc:test" }, true);
+
+		expect(mockListRecords).toHaveBeenNthCalledWith(1, {
+			repo: "did:plc:test",
+			collection: "xyz.opnshelf.listItem",
+			limit: 100,
+			cursor: undefined,
+		});
+		expect(mockListRecords).toHaveBeenNthCalledWith(2, {
+			repo: "did:plc:test",
+			collection: "xyz.opnshelf.listItem",
+			limit: 100,
+			cursor: "cursor-2",
+		});
+		expect(mockListRecords).toHaveBeenNthCalledWith(3, {
+			repo: "did:plc:test",
+			collection: "xyz.opnshelf.list",
+			limit: 100,
+			cursor: undefined,
+		});
+		expect(mockDeleteRecord.mock.calls).toEqual([
+			[
+				{
+					repo: "did:plc:test",
+					collection: "xyz.opnshelf.listItem",
+					rkey: "list-item-1",
+				},
+			],
+			[
+				{
+					repo: "did:plc:test",
+					collection: "xyz.opnshelf.listItem",
+					rkey: "list-item-2",
+				},
+			],
+			[
+				{
+					repo: "did:plc:test",
+					collection: "xyz.opnshelf.listItem",
+					rkey: "list-item-3",
+				},
+			],
+			[
+				{
+					repo: "did:plc:test",
+					collection: "xyz.opnshelf.list",
+					rkey: "favorites",
+				},
+			],
+			[
+				{
+					repo: "did:plc:test",
+					collection: "xyz.opnshelf.list",
+					rkey: "custom-list",
+				},
+			],
+		]);
+		expect(prisma.listItem.findMany).not.toHaveBeenCalled();
+		expect(prisma.movieList.findMany).not.toHaveBeenCalled();
+		expect(prisma.user.delete).toHaveBeenCalledWith({
+			where: { did: "did:plc:test" },
+		});
+	});
+
+	it("aborts account deletion when listing repo records fails", async () => {
+		mockListRecords.mockRejectedValueOnce(new Error("PDS unavailable"));
+
+		await expect(
+			service.deleteUser("did:plc:test", { did: "did:plc:test" }, true),
+		).rejects.toThrow(BadGatewayException);
+		expect(prisma.user.delete).not.toHaveBeenCalled();
+	});
+
+	it("aborts account deletion when deleting a repo list record fails", async () => {
+		mockListRecords
+			.mockResolvedValueOnce({
+				data: { records: [] },
+			})
+			.mockResolvedValueOnce({
+				data: {
+					records: [
+						{
+							uri: "at://did:plc:test/xyz.opnshelf.list/favorites",
+							cid: "cid-1",
+							value: {},
+						},
+					],
+				},
+			});
+		mockDeleteRecord.mockRejectedValueOnce({
+			status: 500,
+			error: "InternalError",
+		});
+
+		await expect(
+			service.deleteUser("did:plc:test", { did: "did:plc:test" }, true),
+		).rejects.toThrow(BadGatewayException);
+		expect(prisma.user.delete).not.toHaveBeenCalled();
+	});
+
+	it("treats already-missing repo records as deleted", async () => {
+		mockListRecords
+			.mockResolvedValueOnce({
+				data: { records: [] },
+			})
+			.mockResolvedValueOnce({
+				data: {
+					records: [
+						{
+							uri: "at://did:plc:test/xyz.opnshelf.list/favorites",
+							cid: "cid-1",
+							value: {},
+						},
+					],
+				},
+			});
+		mockDeleteRecord.mockRejectedValueOnce({
+			status: 404,
+			error: "RecordNotFound",
+			message: "RecordNotFound",
+		});
+
+		await expect(
+			service.deleteUser("did:plc:test", { did: "did:plc:test" }, true),
+		).resolves.toBeUndefined();
+		expect(prisma.user.delete).toHaveBeenCalledWith({
+			where: { did: "did:plc:test" },
+		});
+	});
+
+	it("throws when deleting a missing user", async () => {
+		prisma.user.findUnique = jest.fn().mockResolvedValue(null);
+
+		await expect(
+			service.deleteUser("did:plc:missing", { did: "did:plc:missing" }, false),
+		).rejects.toThrow(NotFoundException);
+	});
+});

backend/src/users/user-deletion.service.ts

···
 import { Agent } from "@atproto/api";
-import { Injectable, Logger, NotFoundException } from "@nestjs/common";
+import {
+	BadGatewayException,
+	Injectable,
+	Logger,
+	NotFoundException,
+} from "@nestjs/common";
 import { $nsid as EPISODE_COLLECTION } from "../lexicons/xyz/opnshelf/episode";
+import { $nsid as FOLLOW_COLLECTION } from "../lexicons/xyz/opnshelf/follow";
 import { $nsid as LIST_COLLECTION } from "../lexicons/xyz/opnshelf/list";
 import { $nsid as LIST_ITEM_COLLECTION } from "../lexicons/xyz/opnshelf/listItem";
 import { $nsid as MOVIE_COLLECTION } from "../lexicons/xyz/opnshelf/movie";
···
 interface ATSession {
 	did: string;
 }
+
+const PDS_DELETION_FAILURE_MESSAGE =
+	"Failed to delete OpnShelf data from your PDS. Your account was not deleted.";
+const RECORDS_PAGE_SIZE = 100;
 
 @Injectable()
 export class UserDeletionService {
···
 	}
 
 	private async deletePdsRecords(did: string, session: ATSession) {
-		try {
-			const agent = new Agent(
-				session as unknown as ConstructorParameters<typeof Agent>[0],
+		const agent = new Agent(
+			session as unknown as ConstructorParameters<typeof Agent>[0],
+		);
+
+		const trackedMovies = await this.prisma.trackedMovie.findMany({
+			where: { userDid: did },
+		});
+
+		for (const tracked of trackedMovies) {
+			await this.tryDeleteRecord(
+				agent,
+				session.did,
+				MOVIE_COLLECTION,
+				tracked.rkey,
+				`Failed to delete record ${tracked.rkey} from PDS`,
 			);
+		}
 
-			const trackedMovies = await this.prisma.trackedMovie.findMany({
-				where: { userDid: did },
-			});
+		const trackedEpisodes = await this.prisma.trackedEpisode.findMany({
+			where: { userDid: did },
+		});
 
-			for (const tracked of trackedMovies) {
-				await this.tryDeleteRecord(
-					agent,
-					session.did,
-					MOVIE_COLLECTION,
-					tracked.rkey,
-					`Failed to delete record ${tracked.rkey} from PDS`,
-				);
+		for (const tracked of trackedEpisodes) {
+			await this.tryDeleteRecord(
+				agent,
+				session.did,
+				EPISODE_COLLECTION,
+				tracked.rkey,
+				`Failed to delete episode record ${tracked.rkey} from PDS`,
+			);
+		}
+
+		const follows = await this.prisma.follow.findMany({
+			where: { followerDid: did, rkey: { not: null } },
+			select: { rkey: true },
+		});
+
+		for (const follow of follows) {
+			if (!follow.rkey) {
+				continue;
 			}
 
-			const trackedEpisodes = await this.prisma.trackedEpisode.findMany({
-				where: { userDid: did },
+			await this.tryDeleteRecord(
+				agent,
+				session.did,
+				FOLLOW_COLLECTION,
+				follow.rkey,
+				`Failed to delete follow ${follow.rkey} from PDS`,
+			);
+		}
+
+		await this.deleteRepoCollectionRecords(
+			agent,
+			session.did,
+			LIST_ITEM_COLLECTION,
+			did,
+		);
+		await this.deleteRepoCollectionRecords(
+			agent,
+			session.did,
+			LIST_COLLECTION,
+			did,
+		);
+	}
+
+	private async tryDeleteRecord(
+		agent: Agent,
+		repoDid: string,
+		collection: string,
+		rkey: string,
+		warnPrefix: string,
+	) {
+		try {
+			await agent.com.atproto.repo.deleteRecord({
+				repo: repoDid,
+				collection,
+				rkey,
 			});
+		} catch (error) {
+			this.logger.warn(`${warnPrefix}: ${error}`);
+		}
+	}
 
-			for (const tracked of trackedEpisodes) {
-				await this.tryDeleteRecord(
-					agent,
-					session.did,
-					EPISODE_COLLECTION,
-					tracked.rkey,
-					`Failed to delete episode record ${tracked.rkey} from PDS`,
-				);
-			}
+	private async deleteRepoCollectionRecords(
+		agent: Agent,
+		repoDid: string,
+		collection: string,
+		userDid: string,
+	): Promise<void> {
+		const rkeys = await this.listRepoRecordKeys(
+			agent,
+			repoDid,
+			collection,
+			userDid,
+		);
+
+		for (const rkey of rkeys) {
+			await this.deleteRepoRecordOrThrow(
+				agent,
+				repoDid,
+				collection,
+				rkey,
+				userDid,
+			);
+		}
+	}
 
-			const listItems = await this.prisma.listItem.findMany({
-				where: { list: { userDid: did } },
-			});
+	private async listRepoRecordKeys(
+		agent: Agent,
+		repoDid: string,
+		collection: string,
+		userDid: string,
+	): Promise<string[]> {
+		const rkeys: string[] = [];
+		let cursor: string | undefined;
 
-			for (const item of listItems) {
-				await this.tryDeleteRecord(
-					agent,
-					session.did,
-					LIST_ITEM_COLLECTION,
-					item.rkey,
-					`Failed to delete list item ${item.rkey} from PDS`,
-				);
-			}
+		try {
+			do {
+				const response = await agent.com.atproto.repo.listRecords({
+					repo: repoDid,
+					collection,
+					limit: RECORDS_PAGE_SIZE,
+					cursor,
+				});
 
-			const lists = await this.prisma.movieList.findMany({
-				where: { userDid: did },
-			});
+				for (const record of response.data.records) {
+					rkeys.push(this.extractRkeyFromUri(record.uri, repoDid, collection));
+				}
 
-			for (const list of lists) {
-				await this.tryDeleteRecord(
-					agent,
-					session.did,
-					LIST_COLLECTION,
-					list.rkey,
-					`Failed to delete list ${list.rkey} from PDS`,
-				);
-			}
+				cursor = response.data.cursor;
+			} while (cursor);
 		} catch (error) {
-			this.logger.error(`Failed to delete PDS records for user ${did}`, error);
+			this.logger.error(
+				`Failed to list ${collection} records from PDS for user ${userDid}`,
+				error,
+			);
+			throw new BadGatewayException(PDS_DELETION_FAILURE_MESSAGE);
 		}
+
+		return rkeys;
 	}
 
-	private async tryDeleteRecord(
+	private extractRkeyFromUri(
+		uri: string,
+		repoDid: string,
+		collection: string,
+	): string {
+		const prefix = `at://${repoDid}/${collection}/`;
+
+		if (!uri.startsWith(prefix)) {
+			throw new Error(`Unexpected record URI returned from PDS: ${uri}`);
+		}
+
+		return uri.slice(prefix.length);
+	}
+
+	private async deleteRepoRecordOrThrow(
 		agent: Agent,
 		repoDid: string,
 		collection: string,
 		rkey: string,
-		warnPrefix: string,
-	) {
+		userDid: string,
+	): Promise<void> {
 		try {
 			await agent.com.atproto.repo.deleteRecord({
 				repo: repoDid,
···
 				rkey,
 			});
 		} catch (error) {
-			this.logger.warn(`${warnPrefix}: ${error}`);
+			if (this.isRecordMissingError(error)) {
+				return;
+			}
+
+			this.logger.error(
+				`Failed to delete ${collection} record ${rkey} from PDS for user ${userDid}`,
+				error,
+			);
+			throw new BadGatewayException(PDS_DELETION_FAILURE_MESSAGE);
+		}
+	}
+
+	private isRecordMissingError(error: unknown): boolean {
+		if (!error || typeof error !== "object") {
+			return false;
 		}
+
+		const candidate = error as {
+			error?: string;
+			status?: number;
+			message?: string;
+		};
+
+		return (
+			candidate.status === 404 ||
+			candidate.error === "RecordNotFound" ||
+			candidate.message?.includes("RecordNotFound") === true
+		);
 	}
 }

backend/src/users/users.controller.spec.ts

···
-import { BadRequestException } from "@nestjs/common";
+import { BadGatewayException, BadRequestException } from "@nestjs/common";
 import { Test, type TestingModule } from "@nestjs/testing";
 import type { AuthenticatedRequest } from "../auth/types";
 import { UsersController } from "./users.controller";
···
 				req,
 			),
 		).resolves.toMatchObject({ imported: 1, skipped: 0, failed: 0 });
+	});
+
+	it("deletes the current account and forwards the PDS deletion flag", async () => {
+		usersService.deleteUser.mockResolvedValue(undefined);
+
+		const req = {
+			user: { did: "did:plc:abc", session: { did: "did:plc:abc" } },
+		} as AuthenticatedRequest;
+
+		await expect(
+			controller.deleteMyAccount({ deletePDSData: true }, req),
+		).resolves.toBeUndefined();
+		expect(usersService.deleteUser).toHaveBeenCalledWith(
+			"did:plc:abc",
+			{ did: "did:plc:abc" },
+			true,
+		);
+	});
+
+	it("propagates delete-account PDS cleanup failures", async () => {
+		usersService.deleteUser.mockRejectedValue(
+			new BadGatewayException(
+				"Failed to delete OpnShelf data from your PDS. Your account was not deleted.",
+			),
+		);
+
+		const req = {
+			user: { did: "did:plc:abc", session: { did: "did:plc:abc" } },
+		} as AuthenticatedRequest;
+
+		await expect(
+			controller.deleteMyAccount({ deletePDSData: true }, req),
+		).rejects.toThrow(BadGatewayException);
 	});
 
 	it("rejects import when session is missing", async () => {

backend/src/users/users.controller.ts

···
 	@ApiOperation({ summary: "Delete current user's account" })
 	@ApiResponse({ status: 204, description: "Account deleted successfully" })
 	@ApiResponse({ status: 401, description: "Not authenticated" })
+	@ApiResponse({
+		status: 502,
+		description:
+			"Failed to delete OpnShelf data from the user's PDS, so the account was not deleted",
+	})
 	async deleteMyAccount(
 		@Body() dto: DeleteUserAccountDto,
 		@Req() req: AuthenticatedRequest,

backend/src/users/users.service.spec.ts

···
 		});
 	});
 
+	it("delegates account deletion with the PDS deletion flag", async () => {
+		(userDeletionService.deleteUser as jest.Mock).mockResolvedValue(undefined);
+
+		await expect(
+			service.deleteUser("did:plc:123", { did: "did:plc:123" }, true),
+		).resolves.toBeUndefined();
+		expect(userDeletionService.deleteUser).toHaveBeenCalledWith(
+			"did:plc:123",
+			{ did: "did:plc:123" },
+			true,
+		);
+	});
+
+	it("propagates account deletion failures from PDS cleanup", async () => {
+		(userDeletionService.deleteUser as jest.Mock).mockRejectedValue(
+			new BadGatewayException(
+				"Failed to delete OpnShelf data from your PDS. Your account was not deleted.",
+			),
+		);
+
+		await expect(
+			service.deleteUser("did:plc:123", { did: "did:plc:123" }, true),
+		).rejects.toThrow(BadGatewayException);
+	});
+
 	it("imports Bluesky follows with pagination and creates only missing local follows", async () => {
 		prisma.user.findUnique = jest
 			.fn()

lexicons/app/opnshelf/follow.json

···
+{
+	"lexicon": 1,
+	"id": "xyz.opnshelf.follow",
+	"defs": {
+		"main": {
+			"type": "record",
+			"description": "An OpnShelf follow relationship stored on a user's PDS",
+			"key": "tid",
+			"record": {
+				"type": "object",
+				"required": ["subjectDid", "createdAt"],
+				"properties": {
+					"subjectDid": {
+						"type": "string",
+						"description": "The DID of the OpnShelf user being followed"
+					},
+					"createdAt": {
+						"type": "string",
+						"format": "datetime",
+						"description": "When the follow record was created"
+					}
+				}
+			}
+		}
+	}
+}

packages/api/src/generated/@tanstack/react-query.gen.ts

···
     queryKey: listsControllerGetListsForMovieQueryKey(options)
 });
 
+export const socialControllerSearchPeopleQueryKey = (options: Options<SocialControllerSearchPeopleData>) => createQueryKey('socialControllerSearchPeople', options);
+
+/**
+ * Search OpnShelf people by handle or display name
+ */
+export const socialControllerSearchPeopleOptions = (options: Options<SocialControllerSearchPeopleData>) => queryOptions<SocialControllerSearchPeopleResponse, DefaultError, SocialControllerSearchPeopleResponse, ReturnType<typeof socialControllerSearchPeopleQueryKey>>({
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await socialControllerSearchPeople({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
+    queryKey: socialControllerSearchPeopleQueryKey(options)
+});
+
+export const socialControllerSearchPeopleInfiniteQueryKey = (options: Options<SocialControllerSearchPeopleData>): QueryKey<Options<SocialControllerSearchPeopleData>> => createQueryKey('socialControllerSearchPeople', options, true);
+
+/**
+ * Search OpnShelf people by handle or display name
+ */
+export const socialControllerSearchPeopleInfiniteOptions = (options: Options<SocialControllerSearchPeopleData>) => infiniteQueryOptions<SocialControllerSearchPeopleResponse, DefaultError, InfiniteData<SocialControllerSearchPeopleResponse>, QueryKey<Options<SocialControllerSearchPeopleData>>, number | Pick<QueryKey<Options<SocialControllerSearchPeopleData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
+// @ts-ignore
+{
+    queryFn: async ({ pageParam, queryKey, signal }) => {
+        // @ts-ignore
+        const page: Pick<QueryKey<Options<SocialControllerSearchPeopleData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
+            query: {
+                page: pageParam
+            }
+        };
+        const params = createInfiniteParams(queryKey, page);
+        const { data } = await socialControllerSearchPeople({
+            ...options,
+            ...params,
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
+    queryKey: socialControllerSearchPeopleInfiniteQueryKey(options)
+});
+
+/**
+ * Unfollow an OpnShelf user
+ */
+export const socialControllerUnfollowMutation = (options?: Partial<Options<SocialControllerUnfollowData>>): UseMutationOptions<SocialControllerUnfollowResponse, DefaultError, Options<SocialControllerUnfollowData>> => {
+    const mutationOptions: UseMutationOptions<SocialControllerUnfollowResponse, DefaultError, Options<SocialControllerUnfollowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await socialControllerUnfollow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+/**
+ * Follow an OpnShelf user
+ */
+export const socialControllerFollowMutation = (options?: Partial<Options<SocialControllerFollowData>>): UseMutationOptions<SocialControllerFollowResponse, DefaultError, Options<SocialControllerFollowData>> => {
+    const mutationOptions: UseMutationOptions<SocialControllerFollowResponse, DefaultError, Options<SocialControllerFollowData>> = {
+        mutationFn: async (fnOptions) => {
+            const { data } = await socialControllerFollow({
+                ...options,
+                ...fnOptions,
+                throwOnError: true
+            });
+            return data;
+        }
+    };
+    return mutationOptions;
+};
+
+export const socialControllerGetRelationshipQueryKey = (options: Options<SocialControllerGetRelationshipData>) => createQueryKey('socialControllerGetRelationship', options);
+
+/**
+ * Get the viewer's relationship to a user
+ */
+export const socialControllerGetRelationshipOptions = (options: Options<SocialControllerGetRelationshipData>) => queryOptions<SocialControllerGetRelationshipResponse, DefaultError, SocialControllerGetRelationshipResponse, ReturnType<typeof socialControllerGetRelationshipQueryKey>>({
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await socialControllerGetRelationship({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
+    queryKey: socialControllerGetRelationshipQueryKey(options)
+});
+
+export const socialControllerGetFollowersQueryKey = (options: Options<SocialControllerGetFollowersData>) => createQueryKey('socialControllerGetFollowers', options);
+
+/**
+ * Get followers for a public profile
+ */
+export const socialControllerGetFollowersOptions = (options: Options<SocialControllerGetFollowersData>) => queryOptions<SocialControllerGetFollowersResponse, DefaultError, SocialControllerGetFollowersResponse, ReturnType<typeof socialControllerGetFollowersQueryKey>>({
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await socialControllerGetFollowers({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
+    queryKey: socialControllerGetFollowersQueryKey(options)
+});
+
+export const socialControllerGetFollowersInfiniteQueryKey = (options: Options<SocialControllerGetFollowersData>): QueryKey<Options<SocialControllerGetFollowersData>> => createQueryKey('socialControllerGetFollowers', options, true);
+
+/**
+ * Get followers for a public profile
+ */
+export const socialControllerGetFollowersInfiniteOptions = (options: Options<SocialControllerGetFollowersData>) => infiniteQueryOptions<SocialControllerGetFollowersResponse, DefaultError, InfiniteData<SocialControllerGetFollowersResponse>, QueryKey<Options<SocialControllerGetFollowersData>>, number | Pick<QueryKey<Options<SocialControllerGetFollowersData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
+// @ts-ignore
+{
+    queryFn: async ({ pageParam, queryKey, signal }) => {
+        // @ts-ignore
+        const page: Pick<QueryKey<Options<SocialControllerGetFollowersData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
+            query: {
+                page: pageParam
+            }
+        };
+        const params = createInfiniteParams(queryKey, page);
+        const { data } = await socialControllerGetFollowers({
+            ...options,
+            ...params,
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
+    queryKey: socialControllerGetFollowersInfiniteQueryKey(options)
+});
+
+export const socialControllerGetFollowingQueryKey = (options: Options<SocialControllerGetFollowingData>) => createQueryKey('socialControllerGetFollowing', options);
+
+/**
+ * Get following for a public profile
+ */
+export const socialControllerGetFollowingOptions = (options: Options<SocialControllerGetFollowingData>) => queryOptions<SocialControllerGetFollowingResponse, DefaultError, SocialControllerGetFollowingResponse, ReturnType<typeof socialControllerGetFollowingQueryKey>>({
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await socialControllerGetFollowing({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
+    queryKey: socialControllerGetFollowingQueryKey(options)
+});
+
+export const socialControllerGetFollowingInfiniteQueryKey = (options: Options<SocialControllerGetFollowingData>): QueryKey<Options<SocialControllerGetFollowingData>> => createQueryKey('socialControllerGetFollowing', options, true);
+
+/**
+ * Get following for a public profile
+ */
+export const socialControllerGetFollowingInfiniteOptions = (options: Options<SocialControllerGetFollowingData>) => infiniteQueryOptions<SocialControllerGetFollowingResponse, DefaultError, InfiniteData<SocialControllerGetFollowingResponse>, QueryKey<Options<SocialControllerGetFollowingData>>, number | Pick<QueryKey<Options<SocialControllerGetFollowingData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
+// @ts-ignore
+{
+    queryFn: async ({ pageParam, queryKey, signal }) => {
+        // @ts-ignore
+        const page: Pick<QueryKey<Options<SocialControllerGetFollowingData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
+            query: {
+                page: pageParam
+            }
+        };
+        const params = createInfiniteParams(queryKey, page);
+        const { data } = await socialControllerGetFollowing({
+            ...options,
+            ...params,
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
+    queryKey: socialControllerGetFollowingInfiniteQueryKey(options)
+});
+
+export const socialControllerGetFeedQueryKey = (options?: Options<SocialControllerGetFeedData>) => createQueryKey('socialControllerGetFeed', options);
+
+/**
+ * Get recent watched activity from followed users
+ */
+export const socialControllerGetFeedOptions = (options?: Options<SocialControllerGetFeedData>) => queryOptions<SocialControllerGetFeedResponse, DefaultError, SocialControllerGetFeedResponse, ReturnType<typeof socialControllerGetFeedQueryKey>>({
+    queryFn: async ({ queryKey, signal }) => {
+        const { data } = await socialControllerGetFeed({
+            ...options,
+            ...queryKey[0],
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
+    queryKey: socialControllerGetFeedQueryKey(options)
+});
+
+export const socialControllerGetFeedInfiniteQueryKey = (options?: Options<SocialControllerGetFeedData>): QueryKey<Options<SocialControllerGetFeedData>> => createQueryKey('socialControllerGetFeed', options, true);
+
+/**
+ * Get recent watched activity from followed users
+ */
+export const socialControllerGetFeedInfiniteOptions = (options?: Options<SocialControllerGetFeedData>) => infiniteQueryOptions<SocialControllerGetFeedResponse, DefaultError, InfiniteData<SocialControllerGetFeedResponse>, QueryKey<Options<SocialControllerGetFeedData>>, number | Pick<QueryKey<Options<SocialControllerGetFeedData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
+// @ts-ignore
+{
+    queryFn: async ({ pageParam, queryKey, signal }) => {
+        // @ts-ignore
+        const page: Pick<QueryKey<Options<SocialControllerGetFeedData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
+            query: {
+                page: pageParam
+            }
+        };
+        const params = createInfiniteParams(queryKey, page);
+        const { data } = await socialControllerGetFeed({
+            ...options,
+            ...params,
+            signal,
+            throwOnError: true
+        });
+        return data;
+    },
+    queryKey: socialControllerGetFeedInfiniteQueryKey(options)
+});
+
 export const usersControllerGetPublicProfileQueryKey = (options: Options<UsersControllerGetPublicProfileData>) => createQueryKey('usersControllerGetPublicProfile', options);
 
 /**
···
     },
     queryKey: searchControllerDiscoverAllInfiniteQueryKey(options)
 });
-
-export const socialControllerSearchPeopleQueryKey = (options: Options<SocialControllerSearchPeopleData>) => createQueryKey('socialControllerSearchPeople', options);
-
-/**
- * Search OpnShelf people by handle or display name
- */
-export const socialControllerSearchPeopleOptions = (options: Options<SocialControllerSearchPeopleData>) => queryOptions<SocialControllerSearchPeopleResponse, DefaultError, SocialControllerSearchPeopleResponse, ReturnType<typeof socialControllerSearchPeopleQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => {
-        const { data } = await socialControllerSearchPeople({
-            ...options,
-            ...queryKey[0],
-            signal,
-            throwOnError: true
-        });
-        return data;
-    },
-    queryKey: socialControllerSearchPeopleQueryKey(options)
-});
-
-export const socialControllerSearchPeopleInfiniteQueryKey = (options: Options<SocialControllerSearchPeopleData>): QueryKey<Options<SocialControllerSearchPeopleData>> => createQueryKey('socialControllerSearchPeople', options, true);
-
-/**
- * Search OpnShelf people by handle or display name
- */
-export const socialControllerSearchPeopleInfiniteOptions = (options: Options<SocialControllerSearchPeopleData>) => infiniteQueryOptions<SocialControllerSearchPeopleResponse, DefaultError, InfiniteData<SocialControllerSearchPeopleResponse>, QueryKey<Options<SocialControllerSearchPeopleData>>, number | Pick<QueryKey<Options<SocialControllerSearchPeopleData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
-// @ts-ignore
-{
-    queryFn: async ({ pageParam, queryKey, signal }) => {
-        // @ts-ignore
-        const page: Pick<QueryKey<Options<SocialControllerSearchPeopleData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
-            query: {
-                page: pageParam
-            }
-        };
-        const params = createInfiniteParams(queryKey, page);
-        const { data } = await socialControllerSearchPeople({
-            ...options,
-            ...params,
-            signal,
-            throwOnError: true
-        });
-        return data;
-    },
-    queryKey: socialControllerSearchPeopleInfiniteQueryKey(options)
-});
-
-/**
- * Unfollow an OpnShelf user
- */
-export const socialControllerUnfollowMutation = (options?: Partial<Options<SocialControllerUnfollowData>>): UseMutationOptions<SocialControllerUnfollowResponse, DefaultError, Options<SocialControllerUnfollowData>> => {
-    const mutationOptions: UseMutationOptions<SocialControllerUnfollowResponse, DefaultError, Options<SocialControllerUnfollowData>> = {
-        mutationFn: async (fnOptions) => {
-            const { data } = await socialControllerUnfollow({
-                ...options,
-                ...fnOptions,
-                throwOnError: true
-            });
-            return data;
-        }
-    };
-    return mutationOptions;
-};
-
-/**
- * Follow an OpnShelf user
- */
-export const socialControllerFollowMutation = (options?: Partial<Options<SocialControllerFollowData>>): UseMutationOptions<SocialControllerFollowResponse, DefaultError, Options<SocialControllerFollowData>> => {
-    const mutationOptions: UseMutationOptions<SocialControllerFollowResponse, DefaultError, Options<SocialControllerFollowData>> = {
-        mutationFn: async (fnOptions) => {
-            const { data } = await socialControllerFollow({
-                ...options,
-                ...fnOptions,
-                throwOnError: true
-            });
-            return data;
-        }
-    };
-    return mutationOptions;
-};
-
-export const socialControllerGetRelationshipQueryKey = (options: Options<SocialControllerGetRelationshipData>) => createQueryKey('socialControllerGetRelationship', options);
-
-/**
- * Get the viewer's relationship to a user
- */
-export const socialControllerGetRelationshipOptions = (options: Options<SocialControllerGetRelationshipData>) => queryOptions<SocialControllerGetRelationshipResponse, DefaultError, SocialControllerGetRelationshipResponse, ReturnType<typeof socialControllerGetRelationshipQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => {
-        const { data } = await socialControllerGetRelationship({
-            ...options,
-            ...queryKey[0],
-            signal,
-            throwOnError: true
-        });
-        return data;
-    },
-    queryKey: socialControllerGetRelationshipQueryKey(options)
-});
-
-export const socialControllerGetFollowersQueryKey = (options: Options<SocialControllerGetFollowersData>) => createQueryKey('socialControllerGetFollowers', options);
-
-/**
- * Get followers for a public profile
- */
-export const socialControllerGetFollowersOptions = (options: Options<SocialControllerGetFollowersData>) => queryOptions<SocialControllerGetFollowersResponse, DefaultError, SocialControllerGetFollowersResponse, ReturnType<typeof socialControllerGetFollowersQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => {
-        const { data } = await socialControllerGetFollowers({
-            ...options,
-            ...queryKey[0],
-            signal,
-            throwOnError: true
-        });
-        return data;
-    },
-    queryKey: socialControllerGetFollowersQueryKey(options)
-});
-
-export const socialControllerGetFollowersInfiniteQueryKey = (options: Options<SocialControllerGetFollowersData>): QueryKey<Options<SocialControllerGetFollowersData>> => createQueryKey('socialControllerGetFollowers', options, true);
-
-/**
- * Get followers for a public profile
- */
-export const socialControllerGetFollowersInfiniteOptions = (options: Options<SocialControllerGetFollowersData>) => infiniteQueryOptions<SocialControllerGetFollowersResponse, DefaultError, InfiniteData<SocialControllerGetFollowersResponse>, QueryKey<Options<SocialControllerGetFollowersData>>, number | Pick<QueryKey<Options<SocialControllerGetFollowersData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
-// @ts-ignore
-{
-    queryFn: async ({ pageParam, queryKey, signal }) => {
-        // @ts-ignore
-        const page: Pick<QueryKey<Options<SocialControllerGetFollowersData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
-            query: {
-                page: pageParam
-            }
-        };
-        const params = createInfiniteParams(queryKey, page);
-        const { data } = await socialControllerGetFollowers({
-            ...options,
-            ...params,
-            signal,
-            throwOnError: true
-        });
-        return data;
-    },
-    queryKey: socialControllerGetFollowersInfiniteQueryKey(options)
-});
-
-export const socialControllerGetFollowingQueryKey = (options: Options<SocialControllerGetFollowingData>) => createQueryKey('socialControllerGetFollowing', options);
-
-/**
- * Get following for a public profile
- */
-export const socialControllerGetFollowingOptions = (options: Options<SocialControllerGetFollowingData>) => queryOptions<SocialControllerGetFollowingResponse, DefaultError, SocialControllerGetFollowingResponse, ReturnType<typeof socialControllerGetFollowingQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => {
-        const { data } = await socialControllerGetFollowing({
-            ...options,
-            ...queryKey[0],
-            signal,
-            throwOnError: true
-        });
-        return data;
-    },
-    queryKey: socialControllerGetFollowingQueryKey(options)
-});
-
-export const socialControllerGetFollowingInfiniteQueryKey = (options: Options<SocialControllerGetFollowingData>): QueryKey<Options<SocialControllerGetFollowingData>> => createQueryKey('socialControllerGetFollowing', options, true);
-
-/**
- * Get following for a public profile
- */
-export const socialControllerGetFollowingInfiniteOptions = (options: Options<SocialControllerGetFollowingData>) => infiniteQueryOptions<SocialControllerGetFollowingResponse, DefaultError, InfiniteData<SocialControllerGetFollowingResponse>, QueryKey<Options<SocialControllerGetFollowingData>>, number | Pick<QueryKey<Options<SocialControllerGetFollowingData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
-// @ts-ignore
-{
-    queryFn: async ({ pageParam, queryKey, signal }) => {
-        // @ts-ignore
-        const page: Pick<QueryKey<Options<SocialControllerGetFollowingData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
-            query: {
-                page: pageParam
-            }
-        };
-        const params = createInfiniteParams(queryKey, page);
-        const { data } = await socialControllerGetFollowing({
-            ...options,
-            ...params,
-            signal,
-            throwOnError: true
-        });
-        return data;
-    },
-    queryKey: socialControllerGetFollowingInfiniteQueryKey(options)
-});
-
-export const socialControllerGetFeedQueryKey = (options?: Options<SocialControllerGetFeedData>) => createQueryKey('socialControllerGetFeed', options);
-
-/**
- * Get recent watched activity from followed users
- */
-export const socialControllerGetFeedOptions = (options?: Options<SocialControllerGetFeedData>) => queryOptions<SocialControllerGetFeedResponse, DefaultError, SocialControllerGetFeedResponse, ReturnType<typeof socialControllerGetFeedQueryKey>>({
-    queryFn: async ({ queryKey, signal }) => {
-        const { data } = await socialControllerGetFeed({
-            ...options,
-            ...queryKey[0],
-            signal,
-            throwOnError: true
-        });
-        return data;
-    },
-    queryKey: socialControllerGetFeedQueryKey(options)
-});
-
-export const socialControllerGetFeedInfiniteQueryKey = (options?: Options<SocialControllerGetFeedData>): QueryKey<Options<SocialControllerGetFeedData>> => createQueryKey('socialControllerGetFeed', options, true);
-
-/**
- * Get recent watched activity from followed users
- */
-export const socialControllerGetFeedInfiniteOptions = (options?: Options<SocialControllerGetFeedData>) => infiniteQueryOptions<SocialControllerGetFeedResponse, DefaultError, InfiniteData<SocialControllerGetFeedResponse>, QueryKey<Options<SocialControllerGetFeedData>>, number | Pick<QueryKey<Options<SocialControllerGetFeedData>>[0], 'body' | 'headers' | 'path' | 'query'>>(
-// @ts-ignore
-{
-    queryFn: async ({ pageParam, queryKey, signal }) => {
-        // @ts-ignore
-        const page: Pick<QueryKey<Options<SocialControllerGetFeedData>>[0], 'body' | 'headers' | 'path' | 'query'> = typeof pageParam === 'object' ? pageParam : {
-            query: {
-                page: pageParam
-            }
-        };
-        const params = createInfiniteParams(queryKey, page);
-        const { data } = await socialControllerGetFeed({
-            ...options,
-            ...params,
-            signal,
-            throwOnError: true
-        });
-        return data;
-    },
-    queryKey: socialControllerGetFeedInfiniteQueryKey(options)
-});

packages/api/src/generated/sdk.gen.ts

···
 export const listsControllerGetListsForMovie = <ThrowOnError extends boolean = false>(options: Options<ListsControllerGetListsForMovieData, ThrowOnError>) => (options.client ?? client).get<ListsControllerGetListsForMovieResponses, unknown, ThrowOnError>({ url: '/lists/for-movie/{movieId}', ...options });
 
 /**
+ * Search OpnShelf people by handle or display name
+ */
+export const socialControllerSearchPeople = <ThrowOnError extends boolean = false>(options: Options<SocialControllerSearchPeopleData, ThrowOnError>) => (options.client ?? client).get<SocialControllerSearchPeopleResponses, unknown, ThrowOnError>({ url: '/social/search', ...options });
+
+/**
+ * Unfollow an OpnShelf user
+ */
+export const socialControllerUnfollow = <ThrowOnError extends boolean = false>(options: Options<SocialControllerUnfollowData, ThrowOnError>) => (options.client ?? client).delete<SocialControllerUnfollowResponses, unknown, ThrowOnError>({ url: '/social/follows/{targetDid}', ...options });
+
+/**
+ * Follow an OpnShelf user
+ */
+export const socialControllerFollow = <ThrowOnError extends boolean = false>(options: Options<SocialControllerFollowData, ThrowOnError>) => (options.client ?? client).post<SocialControllerFollowResponses, unknown, ThrowOnError>({ url: '/social/follows/{targetDid}', ...options });
+
+/**
+ * Get the viewer's relationship to a user
+ */
+export const socialControllerGetRelationship = <ThrowOnError extends boolean = false>(options: Options<SocialControllerGetRelationshipData, ThrowOnError>) => (options.client ?? client).get<SocialControllerGetRelationshipResponses, unknown, ThrowOnError>({ url: '/social/relationship/{targetDid}', ...options });
+
+/**
+ * Get followers for a public profile
+ */
+export const socialControllerGetFollowers = <ThrowOnError extends boolean = false>(options: Options<SocialControllerGetFollowersData, ThrowOnError>) => (options.client ?? client).get<SocialControllerGetFollowersResponses, unknown, ThrowOnError>({ url: '/social/profiles/{handle}/followers', ...options });
+
+/**
+ * Get following for a public profile
+ */
+export const socialControllerGetFollowing = <ThrowOnError extends boolean = false>(options: Options<SocialControllerGetFollowingData, ThrowOnError>) => (options.client ?? client).get<SocialControllerGetFollowingResponses, unknown, ThrowOnError>({ url: '/social/profiles/{handle}/following', ...options });
+
+/**
+ * Get recent watched activity from followed users
+ */
+export const socialControllerGetFeed = <ThrowOnError extends boolean = false>(options?: Options<SocialControllerGetFeedData, ThrowOnError>) => (options?.client ?? client).get<SocialControllerGetFeedResponses, unknown, ThrowOnError>({ url: '/social/feed', ...options });
+
+/**
  * Get a public user profile by handle
  */
 export const usersControllerGetPublicProfile = <ThrowOnError extends boolean = false>(options: Options<UsersControllerGetPublicProfileData, ThrowOnError>) => (options.client ?? client).get<UsersControllerGetPublicProfileResponses, UsersControllerGetPublicProfileErrors, ThrowOnError>({ url: '/users/{handle}/profile', ...options });
···
  * Discover popular movies and shows from TMDB
  */
 export const searchControllerDiscoverAll = <ThrowOnError extends boolean = false>(options?: Options<SearchControllerDiscoverAllData, ThrowOnError>) => (options?.client ?? client).get<SearchControllerDiscoverAllResponses, unknown, ThrowOnError>({ url: '/search/discover', ...options });
-
-/**
- * Search OpnShelf people by handle or display name
- */
-export const socialControllerSearchPeople = <ThrowOnError extends boolean = false>(options: Options<SocialControllerSearchPeopleData, ThrowOnError>) => (options.client ?? client).get<SocialControllerSearchPeopleResponses, unknown, ThrowOnError>({ url: '/social/search', ...options });
-
-/**
- * Unfollow an OpnShelf user
- */
-export const socialControllerUnfollow = <ThrowOnError extends boolean = false>(options: Options<SocialControllerUnfollowData, ThrowOnError>) => (options.client ?? client).delete<SocialControllerUnfollowResponses, unknown, ThrowOnError>({ url: '/social/follows/{targetDid}', ...options });
-
-/**
- * Follow an OpnShelf user
- */
-export const socialControllerFollow = <ThrowOnError extends boolean = false>(options: Options<SocialControllerFollowData, ThrowOnError>) => (options.client ?? client).post<SocialControllerFollowResponses, unknown, ThrowOnError>({ url: '/social/follows/{targetDid}', ...options });
-
-/**
- * Get the viewer's relationship to a user
- */
-export const socialControllerGetRelationship = <ThrowOnError extends boolean = false>(options: Options<SocialControllerGetRelationshipData, ThrowOnError>) => (options.client ?? client).get<SocialControllerGetRelationshipResponses, unknown, ThrowOnError>({ url: '/social/relationship/{targetDid}', ...options });
-
-/**
- * Get followers for a public profile
- */
-export const socialControllerGetFollowers = <ThrowOnError extends boolean = false>(options: Options<SocialControllerGetFollowersData, ThrowOnError>) => (options.client ?? client).get<SocialControllerGetFollowersResponses, unknown, ThrowOnError>({ url: '/social/profiles/{handle}/followers', ...options });
-
-/**
- * Get following for a public profile
- */
-export const socialControllerGetFollowing = <ThrowOnError extends boolean = false>(options: Options<SocialControllerGetFollowingData, ThrowOnError>) => (options.client ?? client).get<SocialControllerGetFollowingResponses, unknown, ThrowOnError>({ url: '/social/profiles/{handle}/following', ...options });
-
-/**
- * Get recent watched activity from followed users
- */
-export const socialControllerGetFeed = <ThrowOnError extends boolean = false>(options?: Options<SocialControllerGetFeedData, ThrowOnError>) => (options?.client ?? client).get<SocialControllerGetFeedResponses, unknown, ThrowOnError>({ url: '/social/feed', ...options });

packages/api/src/generated/types.gen.ts

···
     isInList: boolean;
 };
 
+export type SocialUserCardDto = {
+    did: string;
+    handle: string;
+    displayName?: {
+        [key: string]: unknown;
+    } | null;
+    avatar?: {
+        [key: string]: unknown;
+    } | null;
+    followersCount: number;
+    followingCount: number;
+    isFollowing: boolean;
+    isFollowedBy: boolean;
+};
+
+export type PaginatedSocialUsersDto = {
+    items: Array<SocialUserCardDto>;
+    page: number;
+    pageSize: number;
+    total: number;
+    totalPages: number;
+    hasNextPage: boolean;
+    hasPreviousPage: boolean;
+};
+
+export type UserRelationshipDto = {
+    targetDid: string;
+    isFollowing: boolean;
+    isFollowedBy: boolean;
+    canFollow: boolean;
+};
+
+export type SocialActorDto = {
+    did: string;
+    handle: string;
+    displayName?: {
+        [key: string]: unknown;
+    } | null;
+    avatar?: {
+        [key: string]: unknown;
+    } | null;
+    followersCount: number;
+    followingCount: number;
+};
+
+export type FollowedActivityItemDto = {
+    actor: SocialActorDto;
+    id: string;
+    type: 'movie' | 'episode';
+    activityAt: string;
+    movieId?: string;
+    title?: string;
+    showId?: string;
+    showTitle?: string;
+    seasonNumber?: number;
+    episodeNumber?: number;
+    posterPath?: string;
+    backdropPath?: string;
+    releaseYear?: number;
+    firstAirYear?: number;
+    overview?: string;
+    colors?: MovieColorsDto;
+    watchedDate?: string;
+    createdAt: string;
+};
+
+export type FollowedActivityFeedDto = {
+    items: Array<FollowedActivityItemDto>;
+    page: number;
+    pageSize: number;
+    total: number;
+    totalPages: number;
+    hasNextPage: boolean;
+    hasPreviousPage: boolean;
+};
+
 export type PublicUserProfileDto = {
     /**
      * Stable DID for the user
···
 
 export type DeleteUserAccountDto = {
     /**
-     * Whether to delete the user's watch history from their PDS. If false, the data remains on their PDS.
+     * Whether to delete the user's OpnShelf data from their PDS, including watch history, follows, lists, and list items. If false, the data remains on their PDS.
      */
     deletePDSData: boolean;
 };
···
     results: Array<UnifiedSearchResultDto>;
     total_results: number;
     page: number;
-};
-
-export type SocialUserCardDto = {
-    did: string;
-    handle: string;
-    displayName?: {
-        [key: string]: unknown;
-    } | null;
-    avatar?: {
-        [key: string]: unknown;
-    } | null;
-    followersCount: number;
-    followingCount: number;
-    isFollowing: boolean;
-    isFollowedBy: boolean;
-};
-
-export type PaginatedSocialUsersDto = {
-    items: Array<SocialUserCardDto>;
-    page: number;
-    pageSize: number;
-    total: number;
-    totalPages: number;
-    hasNextPage: boolean;
-    hasPreviousPage: boolean;
-};
-
-export type UserRelationshipDto = {
-    targetDid: string;
-    isFollowing: boolean;
-    isFollowedBy: boolean;
-    canFollow: boolean;
-};
-
-export type SocialActorDto = {
-    did: string;
-    handle: string;
-    displayName?: {
-        [key: string]: unknown;
-    } | null;
-    avatar?: {
-        [key: string]: unknown;
-    } | null;
-    followersCount: number;
-    followingCount: number;
-};
-
-export type FollowedActivityItemDto = {
-    actor: SocialActorDto;
-    id: string;
-    type: 'movie' | 'episode';
-    activityAt: string;
-    movieId?: string;
-    title?: string;
-    showId?: string;
-    showTitle?: string;
-    seasonNumber?: number;
-    episodeNumber?: number;
-    posterPath?: string;
-    backdropPath?: string;
-    releaseYear?: number;
-    firstAirYear?: number;
-    overview?: string;
-    colors?: MovieColorsDto;
-    watchedDate?: string;
-    createdAt: string;
-};
-
-export type FollowedActivityFeedDto = {
-    items: Array<FollowedActivityItemDto>;
-    page: number;
-    pageSize: number;
-    total: number;
-    totalPages: number;
-    hasNextPage: boolean;
-    hasPreviousPage: boolean;
 };
 
 export type MoviesControllerSearchMoviesData = {
···
     200: unknown;
 };
 
+export type SocialControllerSearchPeopleData = {
+    body?: never;
+    path?: never;
+    query: {
+        /**
+         * Page number to return
+         */
+        page?: number;
+        /**
+         * Number of items to return per page
+         */
+        pageSize?: number;
+        /**
+         * Search term for handle or display name
+         */
+        q: string;
+    };
+    url: '/social/search';
+};
+
+export type SocialControllerSearchPeopleResponses = {
+    200: PaginatedSocialUsersDto;
+};
+
+export type SocialControllerSearchPeopleResponse = SocialControllerSearchPeopleResponses[keyof SocialControllerSearchPeopleResponses];
+
+export type SocialControllerUnfollowData = {
+    body?: never;
+    path: {
+        targetDid: string;
+    };
+    query?: never;
+    url: '/social/follows/{targetDid}';
+};
+
+export type SocialControllerUnfollowResponses = {
+    /**
+     * Relationship removed
+     */
+    204: void;
+};
+
+export type SocialControllerUnfollowResponse = SocialControllerUnfollowResponses[keyof SocialControllerUnfollowResponses];
+
+export type SocialControllerFollowData = {
+    body?: never;
+    path: {
+        targetDid: string;
+    };
+    query?: never;
+    url: '/social/follows/{targetDid}';
+};
+
+export type SocialControllerFollowResponses = {
+    200: UserRelationshipDto;
+};
+
+export type SocialControllerFollowResponse = SocialControllerFollowResponses[keyof SocialControllerFollowResponses];
+
+export type SocialControllerGetRelationshipData = {
+    body?: never;
+    path: {
+        targetDid: string;
+    };
+    query?: never;
+    url: '/social/relationship/{targetDid}';
+};
+
+export type SocialControllerGetRelationshipResponses = {
+    200: UserRelationshipDto;
+};
+
+export type SocialControllerGetRelationshipResponse = SocialControllerGetRelationshipResponses[keyof SocialControllerGetRelationshipResponses];
+
+export type SocialControllerGetFollowersData = {
+    body?: never;
+    path: {
+        handle: string;
+    };
+    query?: {
+        /**
+         * Page number to return
+         */
+        page?: number;
+        /**
+         * Number of items to return per page
+         */
+        pageSize?: number;
+    };
+    url: '/social/profiles/{handle}/followers';
+};
+
+export type SocialControllerGetFollowersResponses = {
+    200: PaginatedSocialUsersDto;
+};
+
+export type SocialControllerGetFollowersResponse = SocialControllerGetFollowersResponses[keyof SocialControllerGetFollowersResponses];
+
+export type SocialControllerGetFollowingData = {
+    body?: never;
+    path: {
+        handle: string;
+    };
+    query?: {
+        /**
+         * Page number to return
+         */
+        page?: number;
+        /**
+         * Number of items to return per page
+         */
+        pageSize?: number;
+    };
+    url: '/social/profiles/{handle}/following';
+};
+
+export type SocialControllerGetFollowingResponses = {
+    200: PaginatedSocialUsersDto;
+};
+
+export type SocialControllerGetFollowingResponse = SocialControllerGetFollowingResponses[keyof SocialControllerGetFollowingResponses];
+
+export type SocialControllerGetFeedData = {
+    body?: never;
+    path?: never;
+    query?: {
+        /**
+         * Page number to return
+         */
+        page?: number;
+        /**
+         * Number of items to return per page
+         */
+        pageSize?: number;
+    };
+    url: '/social/feed';
+};
+
+export type SocialControllerGetFeedResponses = {
+    200: FollowedActivityFeedDto;
+};
+
+export type SocialControllerGetFeedResponse = SocialControllerGetFeedResponses[keyof SocialControllerGetFeedResponses];
+
 export type UsersControllerGetPublicProfileData = {
     body?: never;
     path: {
···
      * Not authenticated
      */
     401: unknown;
+    /**
+     * Failed to delete OpnShelf data from the user's PDS, so the account was not deleted
+     */
+    502: unknown;
 };
 
 export type UsersControllerDeleteMyAccountResponses = {
···
 };
 
 export type SearchControllerDiscoverAllResponse = SearchControllerDiscoverAllResponses[keyof SearchControllerDiscoverAllResponses];
-
-export type SocialControllerSearchPeopleData = {
-    body?: never;
-    path?: never;
-    query: {
-        /**
-         * Page number to return
-         */
-        page?: number;
-        /**
-         * Number of items to return per page
-         */
-        pageSize?: number;
-        /**
-         * Search term for handle or display name
-         */
-        q: string;
-    };
-    url: '/social/search';
-};
-
-export type SocialControllerSearchPeopleResponses = {
-    200: PaginatedSocialUsersDto;
-};
-
-export type SocialControllerSearchPeopleResponse = SocialControllerSearchPeopleResponses[keyof SocialControllerSearchPeopleResponses];
-
-export type SocialControllerUnfollowData = {
-    body?: never;
-    path: {
-        targetDid: string;
-    };
-    query?: never;
-    url: '/social/follows/{targetDid}';
-};
-
-export type SocialControllerUnfollowResponses = {
-    /**
-     * Relationship removed
-     */
-    204: void;
-};
-
-export type SocialControllerUnfollowResponse = SocialControllerUnfollowResponses[keyof SocialControllerUnfollowResponses];
-
-export type SocialControllerFollowData = {
-    body?: never;
-    path: {
-        targetDid: string;
-    };
-    query?: never;
-    url: '/social/follows/{targetDid}';
-};
-
-export type SocialControllerFollowResponses = {
-    200: UserRelationshipDto;
-};
-
-export type SocialControllerFollowResponse = SocialControllerFollowResponses[keyof SocialControllerFollowResponses];
-
-export type SocialControllerGetRelationshipData = {
-    body?: never;
-    path: {
-        targetDid: string;
-    };
-    query?: never;
-    url: '/social/relationship/{targetDid}';
-};
-
-export type SocialControllerGetRelationshipResponses = {
-    200: UserRelationshipDto;
-};
-
-export type SocialControllerGetRelationshipResponse = SocialControllerGetRelationshipResponses[keyof SocialControllerGetRelationshipResponses];
-
-export type SocialControllerGetFollowersData = {
-    body?: never;
-    path: {
-        handle: string;
-    };
-    query?: {
-        /**
-         * Page number to return
-         */
-        page?: number;
-        /**
-         * Number of items to return per page
-         */
-        pageSize?: number;
-    };
-    url: '/social/profiles/{handle}/followers';
-};
-
-export type SocialControllerGetFollowersResponses = {
-    200: PaginatedSocialUsersDto;
-};
-
-export type SocialControllerGetFollowersResponse = SocialControllerGetFollowersResponses[keyof SocialControllerGetFollowersResponses];
-
-export type SocialControllerGetFollowingData = {
-    body?: never;
-    path: {
-        handle: string;
-    };
-    query?: {
-        /**
-         * Page number to return
-         */
-        page?: number;
-        /**
-         * Number of items to return per page
-         */
-        pageSize?: number;
-    };
-    url: '/social/profiles/{handle}/following';
-};
-
-export type SocialControllerGetFollowingResponses = {
-    200: PaginatedSocialUsersDto;
-};
-
-export type SocialControllerGetFollowingResponse = SocialControllerGetFollowingResponses[keyof SocialControllerGetFollowingResponses];
-
-export type SocialControllerGetFeedData = {
-    body?: never;
-    path?: never;
-    query?: {
-        /**
-         * Page number to return
-         */
-        page?: number;
-        /**
-         * Number of items to return per page
-         */
-        pageSize?: number;
-    };
-    url: '/social/feed';
-};
-
-export type SocialControllerGetFeedResponses = {
-    200: FollowedActivityFeedDto;
-};
-
-export type SocialControllerGetFeedResponse = SocialControllerGetFeedResponses[keyof SocialControllerGetFeedResponses];