felixfoertsch/bundesmessenger-ios
1
0
Fork 0
mirror of https://gitlab.opencode.de/bwi/bundesmessenger/clients/bundesmessenger-ios.git synced 2026-04-17 15:09:31 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feature/fix_huddle_power_levels' into 'develop'

Browse Source 
Feature/fix huddle power levels

See merge request bwmessenger/bundesmessenger/bundesmessenger-ios!189
This commit is contained in:
Arnfried Griesert
2023-08-28 08:43:51 +00:00
parent 13da2420cd 80e971f220
commit 480fdca46a
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Podfile
View File

@@ -43,7 +43,7 @@ when String # specific MatrixSDK released version
$matrixSDKVersionSpec = $matrixSDKVersion
end
$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.9.0_rc1' }
$matrixSDKVersionSpec = { :git => 'https://dl-gitlab.example.com/bwmessenger/bundesmessenger/bundesmessenger-ios-sdk', :tag => 'v2.9.0_rc3' }
# Method to import the MatrixSDK
def import_MatrixSDK

15
bwi/RollsAndRights/MXRoom+sendRoomPowerLevels.m
View File

@@ -40,9 +40,18 @@
NSMutableDictionary *eventContent = [NSMutableDictionary dictionaryWithDictionary:roomState.powerLevels.JSONDictionary];
NSMutableDictionary *eventPowerLevels = [NSMutableDictionary dictionaryWithDictionary:eventContent[@"events"]];
// Element defined event power levels
eventPowerLevels[@"m.room.name"] = [NSNumber numberWithInteger:powerLevelGeneral];
eventPowerLevels[@"m.room.topic"] = [NSNumber numberWithInteger:powerLevelGeneral];
eventPowerLevels[@"m.room.avatar"] = [NSNumber numberWithInteger:powerLevelGeneral];
// bwi: 5035 - huddle power levels should stay at power level 0 (all users)
eventPowerLevels[@"m.call"] = [NSNumber numberWithInteger:0];
eventPowerLevels[@"m.call.member"] = [NSNumber numberWithInteger:0];
eventPowerLevels[@"org.matrix.msc3401.call"] = [NSNumber numberWithInteger:0];
eventPowerLevels[@"org.matrix.msc3401.call.member"] = [NSNumber numberWithInteger:0];
eventContent[@"events"] = eventPowerLevels;
eventContent[@"invite"] = [NSNumber numberWithInteger:powerLevelInvite];
@@ -51,12 +60,6 @@
eventContent[@"redact"] = [NSNumber numberWithInteger:powerLevelRedact];
eventContent[@"events_default"] = [NSNumber numberWithInteger:powerLevelSend];
// bwi: 5035 - huddle power levels should stay at power level 0 (all users)
eventContent[@"m.call"] = [NSNumber numberWithInteger:0];
eventContent[@"m.call.member"] = [NSNumber numberWithInteger:0];
eventContent[@"org.matrix.msc3401.call"] = [NSNumber numberWithInteger:0];
eventContent[@"org.matrix.msc3401.call.member"] = [NSNumber numberWithInteger:0];
// Make the request to the HS
MXHTTPOperation *_operation = [self sendStateEventOfType:kMXEventTypeStringRoomPowerLevels content:eventContent stateKey:nil success:^(NSString *eventId) {
success();