mirror/ditto
mirror/ditto
1
0
Fork 0
mirror of https://gitlab.com/soapbox-pub/ditto.git synced 2025-12-06 11:29:46 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "fix(updateCredentialsController): stop overwriting kind 0 unnecessarily"

Browse source 
This reverts commit 342ba7d4b1.
This commit is contained in:
P. Reis 2024-12-03 14:23:00 -03:00
parent 342ba7d4b1
commit b45fcdde69
1 changed files with 44 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

107
src/controllers/api/accounts.ts
View file

@ -1,4 +1,4 @@
import { NostrEvent, NostrFilter, NSchema as n } from '@nostrify/nostrify'; import { NostrFilter, NSchema as n } from '@nostrify/nostrify';
import { nip19 } from 'nostr-tools'; import { nip19 } from 'nostr-tools';
import { z } from 'zod'; import { z } from 'zod';
@ -288,78 +288,59 @@ const updateCredentialsController: AppController = async (c) => {
const pubkey = await signer.getPublicKey(); const pubkey = await signer.getPublicKey();
const body = await parseBody(c.req.raw); const body = await parseBody(c.req.raw);
const result = updateCredentialsSchema.safeParse(body); const result = updateCredentialsSchema.safeParse(body);
const store = await Storages.db();
if (!result.success) { if (!result.success) {
return c.json(result.error, 422); return c.json(result.error, 422);
} }
const kind0fields = { const event = await updateEvent(
avatar: result.data.avatar, { kinds: [0], authors: [pubkey], limit: 1 },
header: result.data.header, async (prev) => {
display_name: result.data.display_name, const meta = n.json().pipe(metadataSchema).catch({}).parse(prev.content);
fields_attributes: result.data.fields_attributes, const {
note: result.data.note, avatar: avatarFile,
nip05: result.data.nip05, header: headerFile,
lud16: result.data.lud16, display_name,
website: result.data.website, fields_attributes,
bot: result.data.bot, note,
}; nip05,
const values = Object.values(kind0fields).filter((value) => value !== undefined); lud16,
let event: NostrEvent; website,
bot,
} = result.data;
if (values.length) { const [avatar, header] = await Promise.all([
event = await updateEvent( avatarFile ? uploadFile(c, avatarFile, { pubkey }) : undefined,
{ kinds: [0], authors: [pubkey], limit: 1 }, headerFile ? uploadFile(c, headerFile, { pubkey }) : undefined,
async (prev) => { ]);
const meta = n.json().pipe(metadataSchema).catch({}).parse(prev.content);
const {
avatar: avatarFile,
header: headerFile,
display_name,
fields_attributes,
note,
nip05,
lud16,
website,
bot,
} = kind0fields;
const [avatar, header] = await Promise.all([ meta.name = display_name ?? meta.name;
avatarFile ? uploadFile(c, avatarFile, { pubkey }) : undefined, meta.about = note ?? meta.about;
headerFile ? uploadFile(c, headerFile, { pubkey }) : undefined, meta.picture = avatar?.url ?? meta.picture;
]); meta.banner = header?.url ?? meta.banner;
meta.nip05 = nip05 ?? meta.nip05;
meta.lud16 = lud16 ?? meta.lud16;
meta.website = website ?? meta.website;
meta.bot = bot ?? meta.bot;
meta.name = display_name ?? meta.name; if (avatarFile === '') delete meta.picture;
meta.about = note ?? meta.about; if (headerFile === '') delete meta.banner;
meta.picture = avatar?.url ?? meta.picture; if (nip05 === '') delete meta.nip05;
meta.banner = header?.url ?? meta.banner; if (lud16 === '') delete meta.lud16;
meta.nip05 = nip05 ?? meta.nip05; if (website === '') delete meta.website;
meta.lud16 = lud16 ?? meta.lud16;
meta.website = website ?? meta.website;
meta.bot = bot ?? meta.bot;
if (avatarFile === '') delete meta.picture; if (fields_attributes) {
if (headerFile === '') delete meta.banner; meta.fields = fields_attributes.map(({ name, value }) => [name, value]);
if (nip05 === '') delete meta.nip05; }
if (lud16 === '') delete meta.lud16;
if (website === '') delete meta.website;
if (fields_attributes) { return {
meta.fields = fields_attributes.map(({ name, value }) => [name, value]); kind: 0,
} content: JSON.stringify(meta),
tags: [],
return { };
kind: 0, },
content: JSON.stringify(meta), c,
tags: [], );
};
},
c,
);
} else {
[event] = await store.query([{ kinds: [0], authors: [pubkey] }]);
}
const settingsStore = result.data.pleroma_settings_store; const settingsStore = result.data.pleroma_settings_store;
const account = await renderAccount(event, { withSource: true, settingsStore }); const account = await renderAccount(event, { withSource: true, settingsStore });