Page Menu
Home
Phabricator
Search
Configure Global Search
Log In
Files
F2991843
D13733.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Award Token
Flag For Later
Size
2 KB
Referenced Files
None
Subscribers
None
D13733.diff
View Options
diff --git a/keyserver/src/deleters/link-deleters.js b/keyserver/src/deleters/link-deleters.js
--- a/keyserver/src/deleters/link-deleters.js
+++ b/keyserver/src/deleters/link-deleters.js
@@ -81,4 +81,24 @@
await deleteInviteLinks(inviteLinksToDelete);
}
-export { deleteInviteLink, deleteOrphanedInviteLinks };
+async function deleteInviteLinksForThreadIDs(
+ threadIDs: $ReadOnlyArray<string>,
+): Promise<void> {
+ const [selectResults] = await dbQuery(SQL`
+ SELECT id, name, blob_holder AS blobHolder
+ FROM invite_links
+ WHERE community IN (${threadIDs}) OR thread IN (${threadIDs})
+ `);
+ const inviteLinksToDelete = selectResults.map(({ id, name, blobHolder }) => ({
+ id,
+ name,
+ blobHolder,
+ }));
+ await deleteInviteLinks(inviteLinksToDelete);
+}
+
+export {
+ deleteInviteLink,
+ deleteOrphanedInviteLinks,
+ deleteInviteLinksForThreadIDs,
+};
diff --git a/keyserver/src/deleters/thread-deleters.js b/keyserver/src/deleters/thread-deleters.js
--- a/keyserver/src/deleters/thread-deleters.js
+++ b/keyserver/src/deleters/thread-deleters.js
@@ -9,6 +9,7 @@
import { updateTypes } from 'lib/types/update-types-enum.js';
import { ServerError } from 'lib/utils/errors.js';
+import { deleteInviteLinksForThreadIDs } from './link-deleters.js';
import { createUpdates } from '../creators/update-creator.js';
import { dbQuery, SQL } from '../database/database.js';
import {
@@ -87,7 +88,7 @@
const [{ viewerUpdates }] = await Promise.all([
createUpdates(updateDatas, { viewer, updatesForCurrentSession: 'return' }),
- deleteThreadsFromDB(threadIDs),
+ deleteThreads(threadIDs),
]);
return { updatesResult: { newUpdates: viewerUpdates } };
@@ -106,9 +107,7 @@
await removeBlobHolders(blobHolders);
}
-function deleteThreadsFromDB(
- threadIDs: $ReadOnlyArray<string>,
-): Promise<mixed> {
+async function deleteThreads(threadIDs: $ReadOnlyArray<string>): Promise<void> {
const deletionQuery = SQL`
START TRANSACTION;
DELETE FROM threads WHERE id IN (${threadIDs});
@@ -141,7 +140,10 @@
WHERE n.thread IN (${threadIDs});
COMMIT;
`;
- return dbQuery(deletionQuery, { multipleStatements: true });
+ await Promise.all([
+ dbQuery(deletionQuery, { multipleStatements: true }),
+ deleteInviteLinksForThreadIDs(threadIDs),
+ ]);
}
async function deleteInaccessibleThreads(): Promise<void> {
@@ -163,7 +165,7 @@
}
const containerIDs = [...threadIDs];
await fetchAndDeleteThreadBlobHolders(containerIDs);
- await deleteThreadsFromDB(containerIDs);
+ await deleteThreads(containerIDs);
}
export { deleteThread, deleteInaccessibleThreads };
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Fri, Oct 18, 2:09 AM (3 h, 53 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
2314563
Default Alt Text
D13733.diff (2 KB)
Attached To
Mode
D13733: [keyserver] Delete invite links when deleting threads
Attached
Detach File
Event Timeline
Log In to Comment