update lexicon references and types

src/lib/components/activity.svelte

@@ -1,13 +1,13 @@
 <script lang="ts">
 	import type {
-		MeWoachContentAnilist,
+		MySpoorContentExternal,
-		MeWoachFeedActivity,
+		MySpoorLogActivity,
-		MeWoachFeedSession
+		MySpoorLogSession
 	} from '@atcute/client/lexicons';
 	export let activity: {
-		session: MeWoachFeedSession.Record;
+		session: MySpoorLogSession.Record;
-		activity: MeWoachFeedActivity.Record;
+		activity: MySpoorLogActivity.Record;
-		content: MeWoachContentAnilist.Main;
+		content: MySpoorContentExternal.Record;
 	}[];
 </script>
 
@@ -17,16 +17,14 @@
 		{#each activity as activityItem}
 			<li class="mx-auto mb-2 rounded-sm bg-gray-500 p-4">
 				<div>
-					<p>{activityItem.content.id}</p>
+					<p>{activityItem.content.titles}</p>
 					<p>
 						Watched episode {activityItem.activity.progress} at {activityItem.activity.performedAt}
 					</p>
-					{#if activityItem.session.participants?.length}
+					{#if activityItem.session.otherParticipants?.length}
 						<p>With:</p>
-						{#each activityItem.session.participants ?? [] as participant}
+						{#each activityItem.session.otherParticipants ?? [] as participant}
-							<a href={'/user/' + participant.uri.split('at://')[1]}
+							<a href={'/user/' + participant.split('at://')[1]}>{participant.split('at://')[1]}</a>
-								>{participant.uri.split('at://')[1]}</a
-							>
 						{/each}
 					{/if}
 				</div>

src/lib/components/list.svelte

@@ -1,9 +1,9 @@
 <script lang="ts">
 	import { addActivity } from '$lib/util';
 	import type { XRPC } from '@atcute/client';
-	import type { At, MeWoachFeedSession } from '@atcute/client/lexicons';
+	import type { At, MySpoorLogSession } from '@atcute/client/lexicons';
 	export let sessions: {
-		record: MeWoachFeedSession.Record;
+		record: MySpoorLogSession.Record;
 		uri: string;
 		cid: string;
 		progress: number;

src/lib/util.ts

@@ -9,7 +9,7 @@ import {
 
 import { configureOAuth } from '@atcute/oauth-browser-client';
 
-import type { At, MeWoachFeedActivity } from '@atcute/client/lexicons';
+import type { At, MySpoorLogActivity } from '@atcute/client/lexicons';
 
 const didDocumentResolver = new CompositeDidDocumentResolver({
 	methods: {
@@ -62,7 +62,7 @@ export async function getSessions(rpc: XRPC, did: string) {
 	} = await rpc.get('com.atproto.repo.listRecords', {
 		params: {
 			repo: did,
-			collection: 'me.woach.feed.session'
+			collection: 'my.spoor.log.session'
 		}
 	});
 	return records;
@@ -74,7 +74,7 @@ export async function getActivity(rpc: XRPC, did: string) {
 	} = await rpc.get('com.atproto.repo.listRecords', {
 		params: {
 			repo: did,
-			collection: 'me.woach.feed.activity'
+			collection: 'my.spoor.log.activity'
 		}
 	});
 	return records;
@@ -89,7 +89,7 @@ export async function resolveSession(rpc: XRPC, uri: At.Uri) {
 		params: {
 			repo,
 			rkey,
-			collection: 'me.woach.feed.session'
+			collection: 'my.spoor.log.session'
 		}
 	});
 	return value;
@@ -104,7 +104,7 @@ export async function resolveMedia(rpc: XRPC, uri: At.Uri) {
 		params: {
 			repo,
 			rkey,
-			collection: 'me.woach.content.anilist'
+			collection: 'my.spoor.content.external'
 		}
 	});
 	return value;
@@ -118,10 +118,10 @@ export async function addActivity(
 	count: number = 1,
 	performedAt: string = new Date().toISOString()
 ) {
-	const activityRecord: MeWoachFeedActivity.Record = {
+	const activityRecord: MySpoorLogActivity.Record = {
-		$type: 'me.woach.feed.activity',
+		$type: 'my.spoor.log.activity',
 		createdAt: new Date().toISOString(),
-		progress: count,
+		progress: { $type: 'my.spoor.log.activity#progressIndex', index: count },
 		session: { cid, uri },
 		performedAt
 	};
@@ -129,7 +129,7 @@ export async function addActivity(
 	const result = await rpc.call('com.atproto.repo.createRecord', {
 		data: {
 			repo: did,
-			collection: 'me.woach.feed.activity',
+			collection: 'my.spoor.log.activity',
 			record: activityRecord
 		}
 	});
@@ -141,18 +141,18 @@ export async function getProgress(rpc: XRPC, did: string, uri: At.Uri) {
 	const currentProgress = await rpc.get('com.atproto.repo.listRecords', {
 		params: {
 			repo: did,
-			collection: 'me.woach.feed.activity'
+			collection: 'my.spoor.log.activity'
 		}
 	});
 
 	const filteredRecords = currentProgress.data.records.filter((a) => {
-		const record = a.value as MeWoachFeedActivity.Record;
+		const record = a.value as MySpoorLogActivity.Record;
 		return record.session.uri === uri;
 	});
 
 	let lastProgress = 0;
 	if (filteredRecords.length > 0) {
-		const lastUpdate = filteredRecords[0]?.value as MeWoachFeedActivity.Record;
+		const lastUpdate = filteredRecords[0]?.value as MySpoorLogActivity.Record;
 		lastProgress = Number(lastUpdate.progress);
 
 		return lastProgress;

src/routes/+layout.svelte

@@ -39,12 +39,12 @@
 		console.log('logout');
 		config();
 		try {
-			const session = await getSession(`did:${userState.did}`, { allowStale: true });
+			const session = await getSession(`did:${userState.did}:default`, { allowStale: true });
 			const agent = new OAuthUserAgent(session);
 
 			await agent.signOut();
 		} catch (err) {
-			deleteStoredSession(`did:${userState.did}`);
+			deleteStoredSession(`did:${userState.did}:default`);
 		}
 		userState.rpc = undefined;
 		userState.agent = undefined;

src/routes/user/[handle]/+page.ts

@@ -9,9 +9,9 @@ import {
 } from '$lib/util';
 import type {
 	ComAtprotoRepoListRecords,
-	MeWoachContentAnilist,
+	MySpoorContentExternal,
-	MeWoachFeedActivity,
+	MySpoorLogActivity,
-	MeWoachFeedSession
+	MySpoorLogSession
 } from '@atcute/client/lexicons';
 import type { PageLoad } from './$types';
 
@@ -20,13 +20,13 @@ export const load: PageLoad = async ({ params }) => {
 	const rpc = await createRPC(did);
 
 	const sessions: {
-		record: MeWoachFeedSession.Record;
+		record: MySpoorLogSession.Record;
 		uri: string;
 		cid: string;
 		progress: number;
 	}[] = await Promise.all(
 		(await getSessions(rpc, did)).map(async (record: ComAtprotoRepoListRecords.Record) => ({
-			record: record.value as MeWoachFeedSession.Record,
+			record: record.value as MySpoorLogSession.Record,
 			uri: record.uri,
 			cid: record.cid,
 			progress: await getProgress(rpc, did, record.uri)
@@ -34,21 +34,24 @@ export const load: PageLoad = async ({ params }) => {
 	);
 
 	const activity: {
-		session: MeWoachFeedSession.Record;
+		session: MySpoorLogSession.Record;
-		activity: MeWoachFeedActivity.Record;
+		activity: MySpoorLogActivity.Record;
-		content: MeWoachContentAnilist.Main;
+		content: MySpoorContentExternal.Record;
 	}[] = await Promise.all(
 		(await getActivity(rpc, did)).map(async (activityRecord: ComAtprotoRepoListRecords.Record) => {
 			const session = (await resolveSession(
 				rpc,
-				(activityRecord.value as MeWoachFeedActivity.Record).session.uri
+				(activityRecord.value as MySpoorLogActivity.Record).session.uri
-			)) as MeWoachFeedSession.Record;
+			)) as MySpoorLogSession.Record;
 
-			const content = (await resolveMedia(rpc, session.content.uri)) as MeWoachContentAnilist.Main;
+			const content = (await resolveMedia(
+				rpc,
+				session.content.uri
+			)) as MySpoorContentExternal.Record;
 
 			return {
 				session,
-				activity: activityRecord.value as MeWoachFeedActivity.Record,
+				activity: activityRecord.value as MySpoorLogActivity.Record,
 				content
 			};
 		})