Removed old moderator logic.

pull/50/head
Mikunj 6 years ago
parent cd6ad75ee6
commit f0fda330de

@ -1236,6 +1236,10 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
return NO; return NO;
} }
- (NSString *)ourHexEncodedPublicKey {
return OWSIdentityManager.sharedManager.identityKeyPair.hexEncodedPublicKey;
}
- (BOOL)userCanDeleteGroupMessage - (BOOL)userCanDeleteGroupMessage
{ {
if (!self.isGroupThread) return false; if (!self.isGroupThread) return false;
@ -1254,10 +1258,8 @@ NSString *NSStringForOWSMessageCellType(OWSMessageCellType cellType)
// Only allow deletion on incoming messages if the user has moderation permission // Only allow deletion on incoming messages if the user has moderation permission
if (interationType == OWSInteractionType_IncomingMessage) { if (interationType == OWSInteractionType_IncomingMessage) {
__block BOOL isModerator; BOOL isModerator = [LKGroupChatAPI isUserModerator:self.ourHexEncodedPublicKey forGroup:LKGroupChatAPI.publicChatServerID onServer: LKGroupChatAPI.publicChatServer];
[[self primaryStorage].dbReadWriteConnection readWithBlock:^(YapDatabaseReadTransaction *transaction) {
isModerator = [[self primaryStorage] isModeratorForGroup:LKGroupChatAPI.publicChatServerID onServer:LKGroupChatAPI.publicChatServer in:transaction];
}];
if (!isModerator) return false; if (!isModerator) return false;
} }

@ -259,6 +259,7 @@ public final class LokiGroupChatAPI : NSObject {
} }
} }
@objc (isUserModerator:forGroup:onServer:)
public static func isUserModerator(user hexEncodedPublicString: String, for group: UInt64, on server: String) -> Bool { public static func isUserModerator(user hexEncodedPublicString: String, for group: UInt64, on server: String) -> Bool {
return self.moderators[server]?[group]?.contains(hexEncodedPublicString) ?? false return self.moderators[server]?[group]?.contains(hexEncodedPublicString) ?? false
} }

@ -99,8 +99,6 @@ NS_ASSUME_NONNULL_BEGIN
- (void)setIDForMessageWithServerID:(NSUInteger)serverID to:(NSString *)messageID in:(YapDatabaseReadWriteTransaction *)transaction; - (void)setIDForMessageWithServerID:(NSUInteger)serverID to:(NSString *)messageID in:(YapDatabaseReadWriteTransaction *)transaction;
- (NSString *_Nullable)getIDForMessageWithServerID:(NSUInteger)serverID in:(YapDatabaseReadTransaction *)transaction; - (NSString *_Nullable)getIDForMessageWithServerID:(NSUInteger)serverID in:(YapDatabaseReadTransaction *)transaction;
- (void)setIsModerator:(BOOL)isModerator forGroup:(NSUInteger)group onServer:(NSString *)server in:(YapDatabaseReadWriteTransaction *)transaction NS_SWIFT_NAME(setIsModerator(_:for:on:in:));
- (BOOL)isModeratorForGroup:(NSUInteger)group onServer:(NSString *)server in:(YapDatabaseReadTransaction *)transaction NS_SWIFT_NAME(isModerator(for:on:in:));
@end @end

@ -176,14 +176,4 @@
return [transaction objectForKey:key inCollection:LKMessageIDCollection]; return [transaction objectForKey:key inCollection:LKMessageIDCollection];
} }
- (void)setIsModerator:(BOOL)isModerator forGroup:(NSUInteger)group onServer:(NSString *)server in:(YapDatabaseReadWriteTransaction *)transaction {
NSString *key = [NSString stringWithFormat:@"%@.%@", server, @(group)];
[transaction setBool:isModerator forKey:key inCollection:LKModerationPermissionCollection];
}
- (BOOL)isModeratorForGroup:(NSUInteger)group onServer:(NSString *)server in:(YapDatabaseReadTransaction *)transaction NS_SWIFT_NAME(isModerator(for:on:in:)) {
NSString *key = [NSString stringWithFormat:@"%@.%@", server, @(group)];
return [transaction boolForKey:key inCollection:LKModerationPermissionCollection defaultValue:false];
}
@end @end

Loading…
Cancel
Save