File tree Expand file tree Collapse file tree 3 files changed +12
-25
lines changed
Expand file tree Collapse file tree 3 files changed +12
-25
lines changed Original file line number Diff line number Diff line change @@ -656,7 +656,18 @@ - (NSInteger)powerLevelOfUserWithUserID:(NSString *)userId
656656 return maxPowerLevel ? maxPowerLevel + 1 : NSIntegerMax;
657657 }
658658 }
659- return [powerLevels powerLevelOfUserWithUserID: userId];
659+
660+ // By default, use usersDefault
661+ NSInteger userPowerLevel = powerLevels.usersDefault ;
662+
663+ NSNumber *powerLevel;
664+ MXJSONModelSetNumber (powerLevel, powerLevels.users [userId]);
665+ if (powerLevel)
666+ {
667+ userPowerLevel = [powerLevel integerValue ];
668+ }
669+
670+ return userPowerLevel;
660671}
661672
662673- (BOOL )isMSC4289Supported {
Original file line number Diff line number Diff line change @@ -46,15 +46,6 @@ extern NSInteger const kMXRoomPowerLevelNotificationsRoomDefault;
4646 */
4747@property (nonatomic ) NSInteger usersDefault;
4848
49- /* *
50- Helper to get the power level of a member of the room.
51- NOTE: Should not be used directly anymore prefer the MXRoomState implementation over this!
52-
53- @param userId the id of the user.
54- @return his power level.
55- */
56- - (NSInteger )powerLevelOfUserWithUserID : (NSString *)userId __attribute__((deprecated(" Use the method in MXRoomState instead" )));
57-
5849#pragma mark - Setup
5950
6051/* *
Original file line number Diff line number Diff line change @@ -117,21 +117,6 @@ - (instancetype)initWithDefaultSpecValues
117117 return self;
118118}
119119
120- - (NSInteger )powerLevelOfUserWithUserID : (NSString *)userId
121- {
122- // By default, use usersDefault
123- NSInteger userPowerLevel = _usersDefault;
124-
125- NSNumber *powerLevel;
126- MXJSONModelSetNumber (powerLevel, _users[userId]);
127- if (powerLevel)
128- {
129- userPowerLevel = [powerLevel integerValue ];
130- }
131-
132- return userPowerLevel;
133- }
134-
135120- (NSInteger )minimumPowerLevelForSendingEventAsMessage : (MXEventTypeString)eventTypeString
136121{
137122 NSInteger minimumPowerLevel;
You can’t perform that action at this time.
0 commit comments