Take into account creators when checking power levels (#44)
Fixes #40. Reviewed-on: #44 Reviewed-by: Henry Hiles <henry@henryhiles.com>
This commit is contained in:
parent
2d0f41000e
commit
ab40600746
4 changed files with 48 additions and 13 deletions
|
|
@ -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,7 +42,10 @@ 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);
|
// room creators get power level infinite
|
||||||
|
final userLevel = roomCreators?.contains(user) == true
|
||||||
|
? double.infinity
|
||||||
|
: powerLevelOf(user);
|
||||||
|
|
||||||
return switch (config) {
|
return switch (config) {
|
||||||
EventPowerLevelConfig(:final eventType) =>
|
EventPowerLevelConfig(:final eventType) =>
|
||||||
|
|
|
||||||
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 .new();
|
||||||
|
|
||||||
|
final createEventContent = switch (createEvent.content) {
|
||||||
|
CreateContent content => content,
|
||||||
|
_ => null,
|
||||||
|
};
|
||||||
|
|
||||||
|
return switch (createEventContent?.additionalCreatorIds) {
|
||||||
|
IList<String> creators => creators.add(createEvent.sender),
|
||||||
|
_ => .new([createEvent.sender]),
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
static final provider =
|
||||||
|
NotifierProvider.family<RoomCreatorsController, IList<String>, Room>(
|
||||||
|
RoomCreatorsController.new,
|
||||||
|
);
|
||||||
|
}
|
||||||
Loading…
Add table
Add a link
Reference in a new issue