Better Member List #36
3 changed files with 36 additions and 19 deletions
add support for v12 creators
commit
035cd920f6
|
|
@ -4,33 +4,48 @@ import "package:nexus/controllers/members_by_status_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";
|
||||||
|
|
||||||
class MembersGroupedController extends AsyncNotifier<IMap<int, ISet<Event>>> {
|
class MembersGroupedController extends AsyncNotifier<IMap<int?, ISet<Event>>> {
|
||||||
final MembersByStatusConfig config;
|
final MembersByStatusConfig config;
|
||||||
MembersGroupedController(this.config);
|
MembersGroupedController(this.config);
|
||||||
|
|
||||||
@override
|
@override
|
||||||
Future<IMap<int, ISet<Event>>> build() async {
|
Future<IMap<int?, ISet<Event>>> build() async {
|
||||||
final event = ref.watch(
|
final room = ref.watch(
|
||||||
RoomsController.provider.select((value) {
|
RoomsController.provider.select((value) => value[config.roomId]),
|
||||||
final room = value[config.roomId];
|
|
||||||
final eventRowId = room?.state[EventType.powerLevels.type]?[""];
|
|
||||||
return eventRowId == null ? null : room?.events[eventRowId];
|
|
||||||
}),
|
|
||||||
);
|
);
|
||||||
|
|
||||||
final content = event?.content is PowerLevelsContent
|
final createRowId = room?.state[EventType.create.type]?[""];
|
||||||
? event!.content as PowerLevelsContent
|
final createEvent = createRowId == null ? null : room?.events[createRowId];
|
||||||
: PowerLevelsContent();
|
final createEventContent = switch (createEvent?.content) {
|
||||||
|
CreateContent content => content,
|
||||||
|
_ => null,
|
||||||
|
};
|
||||||
|
final creators = createEventContent?.additionalCreatorIds.add(
|
||||||
|
createEvent!.sender,
|
||||||
|
);
|
||||||
|
|
||||||
|
final powerLevelsRowId = room?.state[EventType.powerLevels.type]?[""];
|
||||||
|
final powerLevelsEvent = powerLevelsRowId == null
|
||||||
|
? null
|
||||||
|
: room?.events[powerLevelsRowId];
|
||||||
|
|
||||||
|
final content = switch (powerLevelsEvent?.content) {
|
||||||
|
PowerLevelsContent content => content,
|
||||||
|
_ => PowerLevelsContent(),
|
||||||
|
};
|
||||||
|
|
||||||
final members = await ref.watch(
|
final members = await ref.watch(
|
||||||
MembersByStatusController.provider(config).future,
|
MembersByStatusController.provider(config).future,
|
||||||
);
|
);
|
||||||
|
|
||||||
return members.fold<IMap<int, ISet<Event>>>(.new(), (result, event) {
|
return members.fold<IMap<int?, ISet<Event>>>(.new(), (result, event) {
|
||||||
final groupKey = content.users[event.stateKey!] ?? content.usersDefault;
|
final groupKey = creators?.contains(event.stateKey!) == true
|
||||||
|
? null
|
||||||
|
: content.users[event.stateKey!] ?? content.usersDefault;
|
||||||
|
|
||||||
return result.update(
|
return result.update(
|
||||||
groupKey,
|
groupKey,
|
||||||
|
|
@ -43,7 +58,7 @@ class MembersGroupedController extends AsyncNotifier<IMap<int, ISet<Event>>> {
|
||||||
static final provider =
|
static final provider =
|
||||||
AsyncNotifierProvider.family<
|
AsyncNotifierProvider.family<
|
||||||
MembersGroupedController,
|
MembersGroupedController,
|
||||||
IMap<int, ISet<Event>>,
|
IMap<int?, ISet<Event>>,
|
||||||
MembersByStatusConfig
|
MembersByStatusConfig
|
||||||
>(MembersGroupedController.new);
|
>(MembersGroupedController.new);
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -8,8 +8,6 @@ part "create.g.dart";
|
||||||
abstract class CreateContent extends Content with _$CreateContent {
|
abstract class CreateContent extends Content with _$CreateContent {
|
||||||
CreateContent._();
|
CreateContent._();
|
||||||
factory CreateContent({
|
factory CreateContent({
|
||||||
@JsonKey(name: "creator") String? creatorId,
|
|
||||||
|
|
||||||
@JsonKey(name: "additional_creators")
|
@JsonKey(name: "additional_creators")
|
||||||
@Default(IList.empty())
|
@Default(IList.empty())
|
||||||
IList<String> additionalCreatorIds,
|
IList<String> additionalCreatorIds,
|
||||||
|
|
|
||||||
|
|
@ -75,10 +75,14 @@ class MemberList extends HookConsumerWidget {
|
||||||
children: [
|
children: [
|
||||||
for (final MapEntry(key: powerLevel, value: members)
|
for (final MapEntry(key: powerLevel, value: members)
|
||||||
in value.toEntryIList(
|
in value.toEntryIList(
|
||||||
compare: (a, b) => (b?.key ?? double.negativeInfinity)
|
compare: (a, b) => (b?.key ?? double.infinity)
|
||||||
.compareTo(a?.key ?? double.negativeInfinity),
|
.compareTo(a?.key ?? double.infinity),
|
||||||
)) ...[
|
)) ...[
|
||||||
DividerText("Power Level $powerLevel"),
|
DividerText(
|
||||||
|
powerLevel == null
|
||||||
|
? "Creators"
|
||||||
|
: "Power Level $powerLevel",
|
||||||
|
),
|
||||||
SegmentedListSection(
|
SegmentedListSection(
|
||||||
children: members
|
children: members
|
||||||
.map(
|
.map(
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue