D14176.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D14176.diff
View Options

	diff --git a/keyserver/src/deleters/account-deleters.js b/keyserver/src/deleters/account-deleters.js
	--- a/keyserver/src/deleters/account-deleters.js
	+++ b/keyserver/src/deleters/account-deleters.js
	@@ -62,7 +62,11 @@
	(user: UserInfo): boolean => user.id !== deletedUserID,
	);

	- ignorePromiseRejections(deleteUploadsForUser(deletedUserID));
	+ if (viewer.isScriptViewer) {
	+ await deleteUploadsForUser(deletedUserID);
	+ } else {
	+ ignorePromiseRejections(deleteUploadsForUser(deletedUserID));
	+ }

	// TODO: if this results in any orphaned orgs, convert them to chats
	const deletionQuery = SQL`
	@@ -124,14 +128,17 @@
	};
	const message = JSON.stringify(reservedUsernameMessage);

	- ignorePromiseRejections(
	- (async () => {
	- const rustAPI = await getRustAPI();
	- const accountInfo = await fetchOlmAccount('content');
	- const signature = accountInfo.account.sign(message);
	- await rustAPI.removeReservedUsername(message, signature);
	- })(),
	- );
	+ const removeReservedUsernamePromise = (async () => {
	+ const rustAPI = await getRustAPI();
	+ const accountInfo = await fetchOlmAccount('content');
	+ const signature = accountInfo.account.sign(message);
	+ await rustAPI.removeReservedUsername(message, signature);
	+ })();
	+ if (viewer.isScriptViewer) {
	+ await removeReservedUsernamePromise;
	+ } else {
	+ ignorePromiseRejections(removeReservedUsernamePromise);
	+ }
	}

	if (anonymousViewerData) {