Take into account creators when checking power levels #44
4 changed files with 73 additions and 24 deletions
Creator power level gets taken into account
commit
a5944b00b5
|
|
@ -1,10 +1,10 @@
|
||||||
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
||||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||||
import "package:nexus/controllers/members_by_status_controller.dart";
|
import "package:nexus/controllers/members_by_status_controller.dart";
|
||||||
|
import "package:nexus/controllers/room_creators_controller.dart";
|
||||||
import "package:nexus/controllers/rooms_controller.dart";
|
import "package:nexus/controllers/rooms_controller.dart";
|
||||||
import "package:nexus/models/configs/members_by_status_config.dart";
|
import "package:nexus/models/configs/members_by_status_config.dart";
|
||||||
import "package:nexus/models/content/content.dart";
|
import "package:nexus/models/content/content.dart";
|
||||||
import "package:nexus/models/content/create.dart";
|
|
||||||
import "package:nexus/models/content/power_levels.dart";
|
import "package:nexus/models/content/power_levels.dart";
|
||||||
import "package:nexus/models/event.dart";
|
import "package:nexus/models/event.dart";
|
||||||
|
|
||||||
|
|
@ -19,15 +19,9 @@ class MembersGroupedController
|
||||||
RoomsController.provider.select((value) => value[config.roomId]),
|
RoomsController.provider.select((value) => value[config.roomId]),
|
||||||
);
|
);
|
||||||
|
|
||||||
final createRowId = room?.state[EventType.create.type]?[""];
|
final roomCreators = room == null
|
||||||
final createEvent = createRowId == null ? null : room?.events[createRowId];
|
? null
|
||||||
final createEventContent = switch (createEvent?.content) {
|
: ref.watch((RoomCreatorsController.provider(room)));
|
||||||
CreateContent content => content,
|
|
||||||
_ => null,
|
|
||||||
};
|
|
||||||
final creators = createEventContent?.additionalCreatorIds.add(
|
|
||||||
createEvent!.sender,
|
|
||||||
);
|
|
||||||
|
|
||||||
final powerLevelsRowId = room?.state[EventType.powerLevels.type]?[""];
|
final powerLevelsRowId = room?.state[EventType.powerLevels.type]?[""];
|
||||||
final powerLevelsEvent = powerLevelsRowId == null
|
final powerLevelsEvent = powerLevelsRowId == null
|
||||||
|
|
@ -45,7 +39,7 @@ class MembersGroupedController
|
||||||
|
|
||||||
return members
|
return members
|
||||||
.fold<IMap<int?, ISet<Event>>>(.new(), (result, event) {
|
.fold<IMap<int?, ISet<Event>>>(.new(), (result, event) {
|
||||||
final groupKey = creators?.contains(event.stateKey!) == true
|
final groupKey = roomCreators?.contains(event.stateKey!) == true
|
||||||
? null
|
? null
|
||||||
: content.users[event.stateKey!] ?? content.usersDefault;
|
: content.users[event.stateKey!] ?? content.usersDefault;
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -1,5 +1,6 @@
|
||||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||||
import "package:nexus/controllers/client_state_controller.dart";
|
import "package:nexus/controllers/client_state_controller.dart";
|
||||||
|
import "package:nexus/controllers/room_creators_controller.dart";
|
||||||
import "package:nexus/controllers/rooms_controller.dart";
|
import "package:nexus/controllers/rooms_controller.dart";
|
||||||
import "package:nexus/models/configs/power_level_config.dart";
|
import "package:nexus/models/configs/power_level_config.dart";
|
||||||
import "package:nexus/models/content/content.dart";
|
import "package:nexus/models/content/content.dart";
|
||||||
|
|
@ -22,6 +23,10 @@ class PowerLevelController extends Notifier<bool> {
|
||||||
RoomsController.provider.select((value) => value[config.roomId]),
|
RoomsController.provider.select((value) => value[config.roomId]),
|
||||||
);
|
);
|
||||||
|
|
||||||
|
final roomCreators = room == null
|
||||||
|
? null
|
||||||
|
: ref.watch(RoomCreatorsController.provider(room));
|
||||||
|
|
||||||
final eventRowId = room?.state[EventType.powerLevels.type]?[""];
|
final eventRowId = room?.state[EventType.powerLevels.type]?[""];
|
||||||
|
|
||||||
final event = eventRowId == null ? null : room?.events[eventRowId];
|
final event = eventRowId == null ? null : room?.events[eventRowId];
|
||||||
|
|
@ -37,34 +42,51 @@ class PowerLevelController extends Notifier<bool> {
|
||||||
int powerLevelOf(String userId) =>
|
int powerLevelOf(String userId) =>
|
||||||
content.users[userId] ?? content.usersDefault;
|
content.users[userId] ?? content.usersDefault;
|
||||||
|
|
||||||
final userLevel = powerLevelOf(user);
|
//Creators get power level infinite, here marked with null
|
||||||
|
final userLevel = roomCreators?.contains(user) == true
|
||||||
|
? null
|
||||||
|
: powerLevelOf(user);
|
||||||
|
|
||||||
return switch (config) {
|
return switch (config) {
|
||||||
EventPowerLevelConfig(:final eventType) =>
|
EventPowerLevelConfig(:final eventType) =>
|
||||||
userLevel >= (content.events[eventType.type] ?? content.eventsDefault),
|
userLevel == null
|
||||||
|
? true
|
||||||
|
: (userLevel >=
|
||||||
|
(content.events[eventType.type] ?? content.eventsDefault)),
|
||||||
|
|
||||||
MembershipActionPowerLevelConfig(:final action, :final targetUser) =>
|
MembershipActionPowerLevelConfig(:final action, :final targetUser) =>
|
||||||
switch (action) {
|
switch (action) {
|
||||||
.invite => userLevel >= content.invite,
|
.invite => userLevel == null ? true : (userLevel >= content.invite),
|
||||||
|
|
||||||
.kick =>
|
.kick =>
|
||||||
userLevel >= content.kick && userLevel > powerLevelOf(targetUser),
|
userLevel == null
|
||||||
|
? true
|
||||||
|
: (userLevel >= content.kick &&
|
||||||
|
userLevel > powerLevelOf(targetUser)),
|
||||||
|
|
||||||
.ban =>
|
.ban =>
|
||||||
userLevel >= content.ban && userLevel > powerLevelOf(targetUser),
|
userLevel == null
|
||||||
|
? true
|
||||||
|
: (userLevel >= content.ban &&
|
||||||
|
userLevel > powerLevelOf(targetUser)),
|
||||||
|
|
||||||
.unban => userLevel >= content.ban,
|
.unban => userLevel == null ? true : (userLevel >= content.ban),
|
||||||
},
|
},
|
||||||
|
|
||||||
StatePowerLevelConfig(:final eventType) =>
|
StatePowerLevelConfig(:final eventType) =>
|
||||||
userLevel >= (content.events[eventType.type] ?? content.stateDefault),
|
userLevel == null
|
||||||
|
? true
|
||||||
|
: (userLevel >=
|
||||||
|
(content.events[eventType.type] ?? content.stateDefault)),
|
||||||
|
|
||||||
RedactionPowerLevelConfig(:final targetUser) =>
|
RedactionPowerLevelConfig(:final targetUser) =>
|
||||||
userLevel >=
|
userLevel == null
|
||||||
(targetUser == user
|
? true
|
||||||
? (content.events[EventType.redaction.type] ??
|
: (userLevel >=
|
||||||
content.eventsDefault)
|
(targetUser == user
|
||||||
: content.redact),
|
? (content.events[EventType.redaction.type] ??
|
||||||
|
content.eventsDefault)
|
||||||
|
: content.redact)),
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
33
lib/controllers/room_creators_controller.dart
Normal file
33
lib/controllers/room_creators_controller.dart
Normal file
|
|
@ -0,0 +1,33 @@
|
||||||
|
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
||||||
|
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||||
|
import "package:nexus/models/content/content.dart";
|
||||||
|
import "package:nexus/models/content/create.dart";
|
||||||
|
import "package:nexus/models/room.dart";
|
||||||
|
|
||||||
|
class RoomCreatorsController extends Notifier<IList<String>?> {
|
||||||
|
final Room room;
|
||||||
|
RoomCreatorsController(this.room);
|
||||||
|
|
||||||
|
@override
|
||||||
|
IList<String>? build() {
|
||||||
|
final createRowId = room.state[EventType.create.type]?[""];
|
||||||
|
final createEvent = createRowId == null ? null : room.events[createRowId];
|
||||||
|
|
||||||
|
if (createEvent == null) return null;
|
||||||
|
|
||||||
|
final createEventContent = switch (createEvent.content) {
|
||||||
|
CreateContent content => content,
|
||||||
|
_ => null,
|
||||||
|
};
|
||||||
|
|
||||||
|
return switch (createEventContent?.additionalCreatorIds) {
|
||||||
|
IList<String> creators => creators.add(createEvent.sender),
|
||||||
|
_ => [createEvent.sender].toIList(),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
static final provider =
|
||||||
|
NotifierProvider.family<RoomCreatorsController, IList<String>?, Room>(
|
||||||
|
RoomCreatorsController.new,
|
||||||
|
);
|
||||||
|
}
|
||||||
|
|
@ -96,4 +96,4 @@ class LoginPage extends HookConsumerWidget {
|
||||||
),
|
),
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|||||||
Loading…
Add table
Add a link
Reference in a new issue
Not sure what this change is about...
Yeah no idea what that is. This looks like a bug in the diff tool to me. Or maybe some white space is different?