Take into account creators when checking power levels #44

Merged
Henry-Hiles merged 2 commits from istalri/nexus:creator-power-level-infinite into main 2026-06-17 23:16:52 -04:00
4 changed files with 73 additions and 24 deletions
Showing only changes of commit a5944b00b5 - Show all commits

Creator power level gets taken into account

istalri 2026-06-15 21:27:26 +02:00

View file

@ -1,10 +1,10 @@
import "package:fast_immutable_collections/fast_immutable_collections.dart";
import "package:flutter_riverpod/flutter_riverpod.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/models/configs/members_by_status_config.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/event.dart";
@ -19,15 +19,9 @@ class MembersGroupedController
RoomsController.provider.select((value) => value[config.roomId]),
);
final createRowId = room?.state[EventType.create.type]?[""];
final createEvent = createRowId == null ? null : room?.events[createRowId];
final createEventContent = switch (createEvent?.content) {
CreateContent content => content,
_ => null,
};
final creators = createEventContent?.additionalCreatorIds.add(
createEvent!.sender,
);
final roomCreators = room == null
? null
: ref.watch((RoomCreatorsController.provider(room)));
final powerLevelsRowId = room?.state[EventType.powerLevels.type]?[""];
final powerLevelsEvent = powerLevelsRowId == null
@ -45,7 +39,7 @@ class MembersGroupedController
return members
.fold<IMap<int?, ISet<Event>>>(.new(), (result, event) {
final groupKey = creators?.contains(event.stateKey!) == true
final groupKey = roomCreators?.contains(event.stateKey!) == true
? null
: content.users[event.stateKey!] ?? content.usersDefault;

View file

@ -1,5 +1,6 @@
import "package:flutter_riverpod/flutter_riverpod.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/models/configs/power_level_config.dart";
import "package:nexus/models/content/content.dart";
@ -22,6 +23,10 @@ class PowerLevelController extends Notifier<bool> {
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 event = eventRowId == null ? null : room?.events[eventRowId];
@ -37,34 +42,51 @@ class PowerLevelController extends Notifier<bool> {
int powerLevelOf(String userId) =>
content.users[userId] ?? content.usersDefault;
final userLevel = powerLevelOf(user);
//Creators get power level infinite, here marked with null
istalri marked this conversation as resolved Outdated

Also when you leave comments please put a space between // and the first word :)

Also when you leave comments please put a space between `//` and the first word :)
final userLevel = roomCreators?.contains(user) == true
? null
istalri marked this conversation as resolved Outdated

Better to set this to double.infinity. Then you shouldn't need to touch the logic below.

Better to set this to `double.infinity`. Then you shouldn't need to touch the logic below.
: powerLevelOf(user);
return switch (config) {
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) =>
switch (action) {
.invite => userLevel >= content.invite,
.invite => userLevel == null ? true : (userLevel >= content.invite),
.kick =>
userLevel >= content.kick && userLevel > powerLevelOf(targetUser),
userLevel == null
? true
: (userLevel >= content.kick &&
userLevel > powerLevelOf(targetUser)),
.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) =>
userLevel >= (content.events[eventType.type] ?? content.stateDefault),
userLevel == null
? true
: (userLevel >=
(content.events[eventType.type] ?? content.stateDefault)),
RedactionPowerLevelConfig(:final targetUser) =>
userLevel >=
(targetUser == user
? (content.events[EventType.redaction.type] ??
content.eventsDefault)
: content.redact),
userLevel == null
? true
: (userLevel >=
(targetUser == user
? (content.events[EventType.redaction.type] ??
content.eventsDefault)
: content.redact)),
};
}

View 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;
istalri marked this conversation as resolved Outdated

I think it's best to make this function/controller/provider return IList<String>, and return a .new() instead of null.

I think it's best to make this function/controller/provider return `IList<String>`, and return a `.new()` instead of null.
final createEventContent = switch (createEvent.content) {
CreateContent content => content,
_ => null,
};
return switch (createEventContent?.additionalCreatorIds) {
IList<String> creators => creators.add(createEvent.sender),
_ => [createEvent.sender].toIList(),
istalri marked this conversation as resolved Outdated

A little cleaner:

- [createEvent.sender].toIList()
+ .new([createEvent.sender])
A little cleaner: ```diff - [createEvent.sender].toIList() + .new([createEvent.sender]) ```
};
}
static final provider =
NotifierProvider.family<RoomCreatorsController, IList<String>?, Room>(
RoomCreatorsController.new,
);
}

View file

@ -96,4 +96,4 @@ class LoginPage extends HookConsumerWidget {
),
);
}
}
}

Not sure what this change is about...

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?

Yeah no idea what that is. This looks like a bug in the diff tool to me. Or maybe some white space is different?