Skip to content

Commit ee3f6b5

Browse files
authored
more admin delete checks
1 parent ac5f17d commit ee3f6b5

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

SignalServiceKit/Messages/Interactions/AdminDelete/AdminDeleteManager.swift

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -52,14 +52,6 @@ public class AdminDeleteManager {
5252
deleteAuthor: Aci,
5353
tx: DBWriteTransaction,
5454
) throws(TSMessage.RemoteDeleteError) {
55-
guard
56-
let groupModel = groupThread.groupModel as? TSGroupModelV2,
57-
groupModel.membership.isFullMemberAndAdministrator(deleteAuthor)
58-
else {
59-
logger.error("Failed to process admin delete for non-admin")
60-
throw .invalidDelete
61-
}
62-
6355
guard
6456
let deleteAuthorId = recipientDatabaseTable.fetchRecipient(
6557
serviceId: deleteAuthor,
@@ -93,6 +85,14 @@ public class AdminDeleteManager {
9385
throw .invalidDelete
9486
}
9587

88+
guard
89+
let groupModel = groupThread.groupModel as? TSGroupModelV2,
90+
groupModel.membership.isFullMemberAndAdministrator(deleteAuthorAci)
91+
else {
92+
logger.error("Failed to process admin delete for non-admin")
93+
throw .invalidDelete
94+
}
95+
9696
if
9797
let threadUniqueId, let messageToDelete = InteractionFinder.findMessage(
9898
withTimestamp: sentAtTimestamp,

0 commit comments

Comments
 (0)