diff --git a/web/src/lib/api/descriptors.ts b/web/src/lib/api/descriptors.ts index 3ab60397c..ceebd9fa7 100644 --- a/web/src/lib/api/descriptors.ts +++ b/web/src/lib/api/descriptors.ts @@ -50,46 +50,46 @@ export const STRING_COUNT: CountDescriptor = { type: TYPE_COUNT }; export const VOUCH_COUNT: CountDescriptor = { - source: "sh.tangled.graph.vouch:subject", + source: "org.tangled.graph.vouch:subject", type: TYPE_COUNT }; export const STAR_COUNT: CountDescriptor = { - source: "sh.tangled.feed.star:subject", + source: "org.tangled.feed.star:subject", type: TYPE_COUNT }; export const STAR_VIEWER: ViewerDescriptor = { - source: "sh.tangled.feed.star:subject", + source: "org.tangled.feed.star:subject", type: TYPE_VIEWER }; export const STAR_SUBJECT_DOCS: DocDescriptor = { - source: "sh.tangled.feed.star:subject", + source: "org.tangled.feed.star:subject", type: TYPE_MINIDOC }; export const STARRED_COUNT: CountDescriptor = { - source: "sh.tangled.feed.star:.repo", + source: "org.tangled.feed.star:.repo", type: TYPE_COUNT }; // a follow's author is the follower and its subject is who they follow, so // these look swapped export const FOLLOWER_COUNT: CountDescriptor = { - source: "sh.tangled.graph.follow:subject", + source: "org.tangled.graph.follow:subject", type: TYPE_COUNT }; export const FOLLOWING_COUNT: CountDescriptor = { - source: "sh.tangled.graph.follow:.repo", + source: "org.tangled.graph.follow:.repo", type: TYPE_COUNT }; export const FOLLOW_VIEWER: ViewerDescriptor = { - source: "sh.tangled.graph.follow:subject", + source: "org.tangled.graph.follow:subject", type: TYPE_VIEWER }; export const FOLLOWER_DOCS: DocDescriptor = { - source: "sh.tangled.graph.follow:.repo", + source: "org.tangled.graph.follow:.repo", type: TYPE_MINIDOC }; export const FOLLOWING_DOCS: DocDescriptor = { - source: "sh.tangled.graph.follow:subject", + source: "org.tangled.graph.follow:subject", type: TYPE_MINIDOC }; diff --git a/web/src/lib/api/githubImport.test.ts b/web/src/lib/api/githubImport.test.ts index b3cbbdfd6..9781f6c03 100644 --- a/web/src/lib/api/githubImport.test.ts +++ b/web/src/lib/api/githubImport.test.ts @@ -441,8 +441,7 @@ describe("importGitHubProfile", () => { ); const existingProfile: ProfileRecord = { - $type: "sh.tangled.actor.profile", - bluesky: true, + $type: "org.tangled.actor.profile", description: "Existing Tangled Bio", location: "San Francisco", links: ["https://example.com"] @@ -451,7 +450,7 @@ describe("importGitHubProfile", () => { mockReadRecord.mockResolvedValue({ value: existingProfile, written: { - uri: "at://did:plc:alice/sh.tangled.actor.profile/self", + uri: "at://did:plc:alice/org.tangled.actor.profile/self", cid: "bafk-existing-cid" } }); @@ -477,11 +476,10 @@ describe("importGitHubProfile", () => { expect(mockUploadProfileAvatar).toHaveBeenCalled(); expect(mockPutRecord).toHaveBeenCalledWith( testAgent, - "sh.tangled.actor.profile", + "org.tangled.actor.profile", "self", { - $type: "sh.tangled.actor.profile", - bluesky: true, + $type: "org.tangled.actor.profile", description: "Existing Tangled Bio", location: "San Francisco", links: ["https://example.com"], @@ -562,10 +560,9 @@ describe("importGitHubProfile", () => { expect(mockPutRecord).not.toHaveBeenCalled(); expect(mockCreateRecord).toHaveBeenCalledWith( testAgent, - "sh.tangled.actor.profile", + "org.tangled.actor.profile", { - $type: "sh.tangled.actor.profile", - bluesky: false, + $type: "org.tangled.actor.profile", avatar: { $type: "blob", ref: { $link: "fresh-blob-cid" }, diff --git a/web/src/lib/api/githubImport.ts b/web/src/lib/api/githubImport.ts index 01880eb60..06ec0d763 100644 --- a/web/src/lib/api/githubImport.ts +++ b/web/src/lib/api/githubImport.ts @@ -35,7 +35,7 @@ export const fetchGitHubAccount = async ( export const invalidateGitHubAccount = (fetcher: typeof fetch = fetch) => accountCache.delete(fetcher); -const PROFILE_COLLECTION = "sh.tangled.actor.profile" as Nsid; +const PROFILE_COLLECTION = "org.tangled.actor.profile" as Nsid; const PUBLIC_KEY_COLLECTION = "sh.tangled.publicKey" as Nsid; const GITHUB_REPO_GRAMMAR = /^[a-zA-Z0-9._-]+\/[a-zA-Z0-9._-]+$/; @@ -351,8 +351,7 @@ export const importGitHubProfile = async ( const existingCid = existing?.written?.cid; const record: ProfileRecord = { - $type: "sh.tangled.actor.profile", - bluesky: false, + $type: "org.tangled.actor.profile", ...(existingProfile ?? {}), avatar: avatarBlob }; diff --git a/web/src/lib/api/orgCreate.test.ts b/web/src/lib/api/orgCreate.test.ts index 6f78dc7f1..dceb528e7 100644 --- a/web/src/lib/api/orgCreate.test.ts +++ b/web/src/lib/api/orgCreate.test.ts @@ -9,7 +9,7 @@ import { ensureProfile } from "$lib/api/profile"; vi.mock("$lib/api/delegation", () => ({ provisionDelegate: vi.fn() })); vi.mock("$lib/api/actAs", () => ({ getOrCreateDelegatedSession: vi.fn() })); vi.mock("$lib/api/profile", () => ({ - PROFILE_COLLECTION: "sh.tangled.actor.profile", + PROFILE_COLLECTION: "org.tangled.actor.profile", ensureProfile: vi.fn() })); @@ -67,8 +67,7 @@ describe("createOrg", () => { expect(getOrCreateDelegatedSession).toHaveBeenCalledWith(controller, orgDid); expect(ensureProfile).toHaveBeenCalledWith(orgAgent, ORG_PROFILE_MARKER); expect(ORG_PROFILE_MARKER).toEqual({ - $type: "sh.tangled.actor.profile", - bluesky: false, + $type: "org.tangled.actor.profile", isOrganization: true }); expect(org).toEqual({ did: orgDid, handle: fullHandle, warnings: [] }); diff --git a/web/src/lib/api/orgCreate.ts b/web/src/lib/api/orgCreate.ts index 2541a33b3..f08b87205 100644 --- a/web/src/lib/api/orgCreate.ts +++ b/web/src/lib/api/orgCreate.ts @@ -8,7 +8,6 @@ import { isValidSubdomain, SUBDOMAIN_MAX_LENGTH, SUBDOMAIN_MIN_LENGTH } from "$l export const ORG_PROFILE_MARKER: ProfileRecord = { $type: PROFILE_COLLECTION, - bluesky: false, isOrganization: true }; diff --git a/web/src/lib/api/orgProfile.test.ts b/web/src/lib/api/orgProfile.test.ts index 924ceaac3..8d6972668 100644 --- a/web/src/lib/api/orgProfile.test.ts +++ b/web/src/lib/api/orgProfile.test.ts @@ -9,7 +9,7 @@ import { putProfile, uploadProfileAvatar } from "$lib/api/profile"; vi.mock("$lib/api/actAs", () => ({ getOrCreateDelegatedSession: vi.fn() })); vi.mock("$lib/api/profile", () => ({ - PROFILE_COLLECTION: "sh.tangled.actor.profile", + PROFILE_COLLECTION: "org.tangled.actor.profile", putProfile: vi.fn(), uploadProfileAvatar: vi.fn() })); @@ -19,7 +19,7 @@ const orgDid = "did:plc:org" as Did; const controller = { sub: "did:plc:controller" } as unknown as OAuthUserAgent; const orgAgent = { sub: orgDid } as unknown as OAuthUserAgent; const bobbin = createBobbinClient({ serviceUrl: "https://bobbin.test" }); -const written = { uri: `at://${orgDid}/sh.tangled.actor.profile/self`, cid: "bafynew" }; +const written = { uri: `at://${orgDid}/org.tangled.actor.profile/self`, cid: "bafynew" }; beforeEach(() => { vi.resetAllMocks(); @@ -30,15 +30,13 @@ beforeEach(() => { describe("saveOrganizationProfile", () => { it("writes through a delegated session and keeps the organization flag", async () => { const result = await saveOrganizationProfile(bobbin, controller, orgDid, { - $type: "sh.tangled.actor.profile", - bluesky: false, + $type: "org.tangled.actor.profile", description: "Updated." }); expect(getOrCreateDelegatedSession).toHaveBeenCalledWith(controller, orgDid); expect(putProfile).toHaveBeenCalledWith(orgAgent, { - $type: "sh.tangled.actor.profile", - bluesky: false, + $type: "org.tangled.actor.profile", description: "Updated.", isOrganization: true }); @@ -62,8 +60,7 @@ describe("saveOrganizationAvatar", () => { expect(uploadProfileAvatar).toHaveBeenCalledWith(orgAgent, image); expect(putProfile).toHaveBeenCalledWith(orgAgent, { - $type: "sh.tangled.actor.profile", - bluesky: false, + $type: "org.tangled.actor.profile", isOrganization: true, avatar }); diff --git a/web/src/lib/api/orgProfile.ts b/web/src/lib/api/orgProfile.ts index 4dae07ab7..b528987cc 100644 --- a/web/src/lib/api/orgProfile.ts +++ b/web/src/lib/api/orgProfile.ts @@ -27,7 +27,6 @@ export const saveOrganizationAvatar = async ( const orgAgent = await getOrCreateDelegatedSession(controllerAgent, orgDid); return saveAvatar(ctx, orgAgent, image, { $type: PROFILE_COLLECTION, - bluesky: false, ...current, isOrganization: true }); diff --git a/web/src/lib/api/organizations.test.ts b/web/src/lib/api/organizations.test.ts index 44d695b80..5249da8ec 100644 --- a/web/src/lib/api/organizations.test.ts +++ b/web/src/lib/api/organizations.test.ts @@ -18,7 +18,10 @@ vi.mock("$lib/api/actAs", () => ({ getOrCreateDelegatedSession: vi.fn() })); vi.mock("$lib/api/delegation", () => ({ listDelegatedAccounts: vi.fn() })); vi.mock("$lib/api/tranquil", () => ({ removeController: vi.fn() })); vi.mock("$lib/auth/accounts", () => ({ forgetOrgDid: vi.fn() })); -vi.mock("$lib/api/records", () => ({ getProfiles: vi.fn() })); +vi.mock("$lib/api/records", async (importOriginal) => ({ + ...(await importOriginal()), + getProfiles: vi.fn() +})); vi.mock("$lib/api/cache", () => ({ cached: vi.fn((_key: string, _ttl: number, fn: () => Promise) => fn()), invalidate: vi.fn() @@ -35,7 +38,7 @@ const tranquilDid = "did:web:tranquil.example"; const tangledDid = "did:plc:tangled" as Did; const microcosmDid = "did:plc:microcosm" as Did; -const profileUri = (did: Did) => `at://${did}/sh.tangled.actor.profile/self`; +const profileUri = (did: Did) => `at://${did}/org.tangled.actor.profile/self`; beforeEach(() => { vi.resetAllMocks(); @@ -57,11 +60,11 @@ beforeEach(() => { items: [ { uri: profileUri(tangledDid), - value: { $type: "sh.tangled.actor.profile", bluesky: false, isOrganization: true } + value: { $type: "org.tangled.actor.profile", isOrganization: true } }, { uri: profileUri(microcosmDid), - value: { $type: "sh.tangled.actor.profile", bluesky: false, isOrganization: true } + value: { $type: "org.tangled.actor.profile", isOrganization: true } } ] } as never); @@ -99,8 +102,7 @@ describe("listUserOrganizations", () => { { uri: profileUri(microcosmDid), value: { - $type: "sh.tangled.actor.profile", - bluesky: false, + $type: "org.tangled.actor.profile", isOrganization: false } } diff --git a/web/src/lib/api/profile.test.ts b/web/src/lib/api/profile.test.ts index cd77977c4..b6a516d93 100644 --- a/web/src/lib/api/profile.test.ts +++ b/web/src/lib/api/profile.test.ts @@ -47,9 +47,9 @@ describe("profile existence", () => { }) as unknown as OAuthUserAgent; const found = () => Response.json({ - uri: "at://did:plc:org/sh.tangled.actor.profile/self", + uri: "at://did:plc:org/org.tangled.actor.profile/self", cid, - value: { $type: "sh.tangled.actor.profile", bluesky: false } + value: { $type: "org.tangled.actor.profile" } }); const missing = () => Response.json( @@ -65,7 +65,7 @@ describe("profile existence", () => { const url = new URL(path, pds); expect(url.pathname).toBe("/xrpc/com.atproto.repo.getRecord"); expect(url.searchParams.get("repo")).toBe("did:plc:org"); - expect(url.searchParams.get("collection")).toBe("sh.tangled.actor.profile"); + expect(url.searchParams.get("collection")).toBe("org.tangled.actor.profile"); expect(url.searchParams.get("rkey")).toBe("self"); }); @@ -84,15 +84,14 @@ describe("profile existence", () => { it("writes the record only when it is missing", async () => { const record = { - $type: "sh.tangled.actor.profile", - bluesky: false, + $type: "org.tangled.actor.profile", isOrganization: true } as const; const written = vi .fn() .mockResolvedValueOnce(missing()) .mockResolvedValueOnce( - Response.json({ uri: "at://did:plc:org/sh.tangled.actor.profile/self", cid }) + Response.json({ uri: "at://did:plc:org/org.tangled.actor.profile/self", cid }) ); await ensureProfile(agent(written), record); expect(written).toHaveBeenCalledTimes(2); diff --git a/web/src/lib/api/profile.ts b/web/src/lib/api/profile.ts index 49ee6e6ae..a842686e1 100644 --- a/web/src/lib/api/profile.ts +++ b/web/src/lib/api/profile.ts @@ -11,7 +11,7 @@ import { putRecord, type WrittenRecord } from "$lib/api/write"; import type * as ShTangledActorGetTrending from "$lib/api/lexicons/types/sh/tangled/actor/getTrending"; import type { ProfileRecord } from "$lib/api/records"; -export const PROFILE_COLLECTION = "sh.tangled.actor.profile"; +export const PROFILE_COLLECTION = "org.tangled.actor.profile"; const AVATAR_TYPES: Record = { "image/png": true, "image/jpeg": true }; const MAX_AVATAR_BYTES = 1_000_000; diff --git a/web/src/lib/api/profileSettings.test.ts b/web/src/lib/api/profileSettings.test.ts index 238d1d632..fad2b7730 100644 --- a/web/src/lib/api/profileSettings.test.ts +++ b/web/src/lib/api/profileSettings.test.ts @@ -13,7 +13,7 @@ import { import type { ProfileRecord } from "$lib/api/records"; vi.mock("$lib/api/profile", () => ({ - PROFILE_COLLECTION: "sh.tangled.actor.profile", + PROFILE_COLLECTION: "org.tangled.actor.profile", putProfile: vi.fn(), uploadProfileAvatar: vi.fn() })); @@ -21,7 +21,7 @@ vi.mock("$lib/api/awaitRecord", () => ({ awaitIndexedOrSaved: vi.fn() })); const agent = { sub: "did:plc:me" } as unknown as OAuthUserAgent; const bobbin = createBobbinClient({ serviceUrl: "https://bobbin.test" }); -const written = { uri: "at://did:plc:me/sh.tangled.actor.profile/self", cid: "bafynew" }; +const written = { uri: "at://did:plc:me/org.tangled.actor.profile/self", cid: "bafynew" }; const cid = "bafyreidfayvfuwqa7qlnopdjiqrxzs6blmoeu4rujcjtnci5beludirz2a"; const avatar: NonNullable = { $type: "blob", @@ -31,8 +31,7 @@ const avatar: NonNullable = { }; const stored: ProfileRecord = { - $type: "sh.tangled.actor.profile", - bluesky: true, + $type: "org.tangled.actor.profile", isOrganization: true, description: "Social coding.", pronouns: "they/them", @@ -54,7 +53,7 @@ describe("loadProfile", () => { it("returns the record bobbin has", async () => { const fetch = vi.fn(async () => Response.json({ - uri: "at://did:plc:me/sh.tangled.actor.profile/self", + uri: "at://did:plc:me/org.tangled.actor.profile/self", cid, value: stored }) @@ -62,7 +61,9 @@ describe("loadProfile", () => { await expect(loadProfile(ctx(fetch), "did:plc:me")).resolves.toEqual(stored); const url = new URL(String(fetch.mock.calls[0][0])); expect(url.pathname).toBe("/xrpc/sh.tangled.actor.getProfile"); - expect(url.searchParams.get("actor")).toBe("at://did:plc:me/sh.tangled.actor.profile/self"); + expect(url.searchParams.get("actor")).toBe( + "at://did:plc:me/org.tangled.actor.profile/self" + ); }); it("treats a missing record as empty and anything else as an error", async () => { @@ -90,7 +91,6 @@ describe("formFromProfile", () => { pronouns: "they/them", location: "Helsinki", links: ["https://tangled.org/", "", ""], - bluesky: true, isOrganization: true }); }); @@ -101,7 +101,6 @@ describe("formFromProfile", () => { pronouns: "", location: "", links: ["", "", ""], - bluesky: false, isOrganization: false }); }); @@ -115,15 +114,13 @@ describe("profileFromForm", () => { pronouns: "", location: " ", links: ["tangled.org", "", " "], - bluesky: false, isOrganization: true }, stored ); expect(record).toEqual({ - $type: "sh.tangled.actor.profile", - bluesky: false, + $type: "org.tangled.actor.profile", isOrganization: true, description: "Updated.", links: ["https://tangled.org/"], @@ -134,12 +131,10 @@ describe("profileFromForm", () => { it("only writes the organization flag when it is set", () => { expect(profileFromForm(formFromProfile(null), null)).toEqual({ - $type: "sh.tangled.actor.profile", - bluesky: false + $type: "org.tangled.actor.profile" }); expect(profileFromForm({ ...formFromProfile(null), isOrganization: true }, null)).toEqual({ - $type: "sh.tangled.actor.profile", - bluesky: false, + $type: "org.tangled.actor.profile", isOrganization: true }); }); diff --git a/web/src/lib/api/profileSettings.ts b/web/src/lib/api/profileSettings.ts index bcebf5323..80d2a1541 100644 --- a/web/src/lib/api/profileSettings.ts +++ b/web/src/lib/api/profileSettings.ts @@ -28,7 +28,6 @@ export interface ProfileForm { pronouns: string; location: string; links: string[]; - bluesky: boolean; isOrganization: boolean; } @@ -50,7 +49,6 @@ export const formFromProfile = (profile: ProfileRecord | null): ProfileForm => { pronouns: profile?.pronouns ?? "", location: profile?.location ?? "", links, - bluesky: profile?.bluesky ?? false, isOrganization: profile?.isOrganization ?? false }; }; @@ -74,7 +72,6 @@ export const profileFromForm = ( return { ...rest, $type: PROFILE_COLLECTION, - bluesky: form.bluesky, ...(form.isOrganization ? { isOrganization: true } : {}), ...(description ? { description } : {}), ...(pronouns ? { pronouns } : {}), @@ -104,7 +101,6 @@ export const saveAvatar = async ( const record: ProfileRecord = { ...rest, $type: PROFILE_COLLECTION, - bluesky: current?.bluesky ?? false, ...(avatar ? { avatar } : {}) }; return writeProfile(ctx, agent, record); diff --git a/web/src/lib/api/records.ts b/web/src/lib/api/records.ts index 884600212..f734840e3 100644 --- a/web/src/lib/api/records.ts +++ b/web/src/lib/api/records.ts @@ -1,7 +1,7 @@ import type { BobbinContext, XrpcRequestInit } from "$lib/api/client"; import { jsonGet } from "$lib/api/_request"; import type * as ShTangledActorGetProfileActivity from "$lib/api/lexicons/types/sh/tangled/actor/getProfileActivity"; -import type * as ShTangledActorProfile from "$lib/api/lexicons/types/sh/tangled/actor/profile"; +import type * as OrgTangledActorProfile from "$lib/api/lexicons/types/org/tangled/actor/profile"; import type * as ShTangledFeedStar from "$lib/api/lexicons/types/sh/tangled/feed/star"; import type * as ShTangledGraphVouch from "$lib/api/lexicons/types/sh/tangled/graph/vouch"; import type * as OrgTangledRepoManifest from "$lib/api/lexicons/types/org/tangled/repo/manifest"; @@ -24,7 +24,7 @@ export interface RecordList { export type RepoRecord = OrgTangledRepoManifest.Main; export type LegacyRepoRecord = ShTangledRepo.Main; -export type ProfileRecord = ShTangledActorProfile.Main; +export type ProfileRecord = OrgTangledActorProfile.Main; export type PullRecord = ShTangledRepoPull.Main; export type TicketRecord = OrgTangledTrackTicket.Main; export type TicketState = OrgTangledTrackTicket.Main["state"]; @@ -67,7 +67,7 @@ export const getProfile = (ctx: BobbinContext, did: string, init?: XrpcRequestIn jsonGet>( ctx, "sh.tangled.actor.getProfile", - { actor: `at://${did}/sh.tangled.actor.profile/self` }, + { actor: `at://${did}/org.tangled.actor.profile/self` }, init ); diff --git a/web/src/lib/components/profile/ProfileChrome.stories.svelte b/web/src/lib/components/profile/ProfileChrome.stories.svelte index f54f69702..a54e9334b 100644 --- a/web/src/lib/components/profile/ProfileChrome.stories.svelte +++ b/web/src/lib/components/profile/ProfileChrome.stories.svelte @@ -14,12 +14,11 @@ const identity = { did: "did:plc:dawn", handle: "dawn.tngl.sh" }; const profile = { - $type: "sh.tangled.actor.profile", + $type: "org.tangled.actor.profile", description: "building distributed systems, rust backends, and strange social software.", pronouns: "she/her", location: "the internet", - links: ["https://tangled.org"], - bluesky: true + links: ["https://tangled.org"] } as ProfileRecord; const counts: ProfileCounts = { repos: 30, diff --git a/web/src/lib/components/profile/ProfileEditForm.svelte b/web/src/lib/components/profile/ProfileEditForm.svelte index d6f42e75b..860d56051 100644 --- a/web/src/lib/components/profile/ProfileEditForm.svelte +++ b/web/src/lib/components/profile/ProfileEditForm.svelte @@ -5,7 +5,6 @@ import MapPin from "$icon/map-pin"; import X from "$icon/x"; import Button from "$lib/components/ui/Button.svelte"; - import Checkbox from "$lib/components/ui/Checkbox.svelte"; import Field from "$lib/components/ui/Field.svelte"; import Input from "$lib/components/ui/Input.svelte"; import Textarea from "$lib/components/ui/Textarea.svelte"; @@ -31,7 +30,6 @@ let description = $state(seed?.description ?? ""); let pronouns = $state(seed?.pronouns ?? ""); let location = $state(seed?.location ?? ""); - let bluesky = $state(seed?.bluesky ?? false); let links = $state( Array.from({ length: 5 }, (_, index) => ({ value: (seed?.links?.[index] as string | undefined) ?? "" @@ -44,8 +42,7 @@ const cleanLinks = links.map((link) => link.value.trim()).filter(Boolean); const record: ProfileRecord = { ...profile, - $type: "sh.tangled.actor.profile", - bluesky, + $type: "org.tangled.actor.profile", description: description.trim() || undefined, pronouns: pronouns.trim() || undefined, location: location.trim() || undefined, @@ -79,7 +76,6 @@
Social links - Link to Bluesky account {#each links as link, index (index)} - {#if profile.bluesky} - - - {/if} - {#each links as profileLink (profileLink)} didFromUri(item.uri)) - : enriched.output.items.map( - (item) => (item.value as ShTangledGraphFollow.Main).subject - ); + : enriched.output.items.map((item) => rkeyFromUri(item.uri)); // the enrich minidocs give handles but not bio/pronouns, so pull the profile // records for this page's dids and merge them in. getProfiles takes the profile // record at-uris, not bare dids const uniqueDids = [...new Set(dids)]; - const profileUris = uniqueDids.map((d) => `at://${d}/sh.tangled.actor.profile/self`); + const profileUris = uniqueDids.map((d) => `at://${d}/org.tangled.actor.profile/self`); const profiles = profileUris.length > 0 ? await getProfiles(ctx, profileUris) diff --git a/web/src/lib/components/settings/ProfileSettingsForm.svelte b/web/src/lib/components/settings/ProfileSettingsForm.svelte index f3d19e3ee..2737f9506 100644 --- a/web/src/lib/components/settings/ProfileSettingsForm.svelte +++ b/web/src/lib/components/settings/ProfileSettingsForm.svelte @@ -104,9 +104,6 @@ class="w-full sm:w-80" /> - - -
{#each form.links.keys() as i (i)} diff --git a/web/src/lib/oauth-client-metadata.ts b/web/src/lib/oauth-client-metadata.ts index 231c66892..028e730c9 100644 --- a/web/src/lib/oauth-client-metadata.ts +++ b/web/src/lib/oauth-client-metadata.ts @@ -3,7 +3,7 @@ const scopes = [ "blob:*/*", "repo:org.tangled.feed.subscription", "repo:org.tangled.snippet.string", - "repo:sh.tangled.actor.profile", + "repo:org.tangled.actor.profile", "repo:sh.tangled.feed.comment", "repo:sh.tangled.feed.reaction", "repo:sh.tangled.feed.star", diff --git a/web/src/routes/[handle]/settings/OrganizationProfileTab.stories.svelte b/web/src/routes/[handle]/settings/OrganizationProfileTab.stories.svelte index 3134839af..8093fb1e1 100644 --- a/web/src/routes/[handle]/settings/OrganizationProfileTab.stories.svelte +++ b/web/src/routes/[handle]/settings/OrganizationProfileTab.stories.svelte @@ -7,8 +7,7 @@ const identity = { did: "did:plc:organization-tangled", handle: "tangled.org" }; const pds = "https://tranquil.example"; const record: ProfileRecord = { - $type: "sh.tangled.actor.profile", - bluesky: true, + $type: "org.tangled.actor.profile", isOrganization: true, description: "Social coding.", location: "Helsinki", diff --git a/web/src/routes/[handle]/settings/members/InviteMembers.stories.svelte b/web/src/routes/[handle]/settings/members/InviteMembers.stories.svelte index 004459fb6..3773cb6c9 100644 --- a/web/src/routes/[handle]/settings/members/InviteMembers.stories.svelte +++ b/web/src/routes/[handle]/settings/members/InviteMembers.stories.svelte @@ -20,7 +20,7 @@ .filter((actor) => actor.handle.includes(q)) .map((actor) => ({ ...actor, - uri: `at://${actor.did}/sh.tangled.actor.profile/self` + uri: `at://${actor.did}/org.tangled.actor.profile/self` })) }); } diff --git a/web/src/routes/welcome/+page.svelte b/web/src/routes/welcome/+page.svelte index 342081aba..033059516 100644 --- a/web/src/routes/welcome/+page.svelte +++ b/web/src/routes/welcome/+page.svelte @@ -113,7 +113,7 @@ try { let record: ProfileRecord; if (!saveDraft) { - record = { $type: "sh.tangled.actor.profile", bluesky: false }; + record = { $type: "org.tangled.actor.profile" }; } else { const website = draft.website.trim(); let firstLink: string | undefined; @@ -134,8 +134,7 @@ : loadedProfile?.avatar; record = { ...loadedProfile, - $type: "sh.tangled.actor.profile", - bluesky: loadedProfile?.bluesky ?? false, + $type: "org.tangled.actor.profile", avatar, description: draft.description.trim() || undefined, pronouns: draft.pronouns.trim() || undefined,