Compare commits
No commits in common. "f4b2669f3d03960833976f53306801a51291f78b" and "729f71e529e282b395eba91a1672e5af63f0d69e" have entirely different histories.
f4b2669f3d
...
729f71e529
3 changed files with 24 additions and 86 deletions
|
|
@ -1,54 +0,0 @@
|
|||
import "package:collection/collection.dart";
|
||||
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||
import "package:nexus/controllers/client_state_controller.dart";
|
||||
import "package:nexus/models/room.dart";
|
||||
|
||||
class ViaController extends Notifier<String> {
|
||||
final Room room;
|
||||
ViaController(this.room);
|
||||
|
||||
@override
|
||||
String build() {
|
||||
final servers = <String>{};
|
||||
|
||||
void addUserId(String? userId) {
|
||||
final server = userId?.split(":").lastOrNull;
|
||||
if (server != null) {
|
||||
servers.add(server);
|
||||
}
|
||||
}
|
||||
|
||||
addUserId(ref.watch(ClientStateController.provider)?.userId);
|
||||
|
||||
final powerLevels = room.events.firstWhereOrNull(
|
||||
(event) => event.rowId == room.state["m.room.power_levels"]?[""],
|
||||
);
|
||||
|
||||
for (final userId in IMap(powerLevels?.content["users"]).keys) {
|
||||
addUserId(userId);
|
||||
if (servers.length >= 5) break;
|
||||
}
|
||||
|
||||
final members = room.state["m.room.member"]?.values.toIList();
|
||||
for (var i = 0; servers.length < 5; i++) {
|
||||
final member = room.events.firstWhereOrNull(
|
||||
(event) => event.rowId == members?.getOrNull(i),
|
||||
);
|
||||
|
||||
if (member?.content["membership"] == "join") {
|
||||
addUserId(member?.stateKey);
|
||||
}
|
||||
|
||||
if (members?.getOrNull(i) == null) break;
|
||||
}
|
||||
|
||||
return servers.isEmpty
|
||||
? ""
|
||||
: "?${servers.map((server) => "via=$server").join("&")}";
|
||||
}
|
||||
|
||||
static final provider = NotifierProvider.family<ViaController, String, Room>(
|
||||
ViaController.new,
|
||||
);
|
||||
}
|
||||
|
|
@ -63,7 +63,7 @@ class ChatBox extends HookConsumerWidget {
|
|||
|
||||
final canSendMessages = ref.watch(
|
||||
PowerLevelController.provider(
|
||||
PowerLevelConfig(eventType: "m.room.message"),
|
||||
PowerLevelConfig(eventType: "m.room.redaction"),
|
||||
),
|
||||
);
|
||||
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@ import "package:flutter/material.dart";
|
|||
import "package:hooks_riverpod/hooks_riverpod.dart";
|
||||
import "package:nexus/controllers/members_by_type_controller.dart";
|
||||
import "package:nexus/controllers/rooms_controller.dart";
|
||||
import "package:nexus/controllers/via_controller.dart";
|
||||
import "package:nexus/helpers/extensions/better_when.dart";
|
||||
import "package:nexus/models/membership_status.dart";
|
||||
import "package:nexus/widgets/avatar_or_hash.dart";
|
||||
|
|
@ -63,7 +62,7 @@ class MentionOverlay extends ConsumerWidget {
|
|||
title: Text(member.displayName),
|
||||
subtitle: Text(member.userId),
|
||||
onTap: () => addTag(
|
||||
id: "[@${member.displayName}](matrix:u/${member.userId.substring(1)})",
|
||||
id: "[@${member.displayName}](https://matrix.to/#/${member.userId})",
|
||||
name: member.userId
|
||||
.substring(1)
|
||||
.split(":")
|
||||
|
|
@ -79,43 +78,36 @@ class MentionOverlay extends ConsumerWidget {
|
|||
(query.isEmpty
|
||||
? rooms.values
|
||||
: rooms.values.where(
|
||||
(room) =>
|
||||
(room.metadata?.name ?? room.metadata!.id)
|
||||
.toLowerCase()
|
||||
.contains(query.toLowerCase()),
|
||||
(room) => (room.metadata?.name ?? "Unnamed Room")
|
||||
.toLowerCase()
|
||||
.contains(query.toLowerCase()),
|
||||
))
|
||||
.map((room) {
|
||||
final name =
|
||||
room.metadata?.name ??
|
||||
room.metadata!.canonicalAlias ??
|
||||
room.metadata!.id;
|
||||
return ListTile(
|
||||
.map(
|
||||
(room) => ListTile(
|
||||
leading: AvatarOrHash(
|
||||
room.metadata?.avatar,
|
||||
name,
|
||||
room.metadata?.name ?? "Unnamed Room",
|
||||
fallback: Icon(Icons.numbers),
|
||||
),
|
||||
title: Text(name),
|
||||
title: Text(room.metadata?.name ?? "Unnamed Room"),
|
||||
subtitle: room.metadata?.topic == null
|
||||
? null
|
||||
: Text(room.metadata!.topic!, maxLines: 1),
|
||||
onTap: () {
|
||||
final vias = ref.watch(
|
||||
ViaController.provider(room),
|
||||
);
|
||||
addTag(
|
||||
id: "[#$name](matrix:roomid/${room.metadata?.id.substring(1)}$vias)",
|
||||
name:
|
||||
(room.metadata?.canonicalAlias ??
|
||||
room.metadata?.id)
|
||||
?.substring(1)
|
||||
.split(":")
|
||||
.first ??
|
||||
"",
|
||||
);
|
||||
},
|
||||
);
|
||||
})
|
||||
onTap: () => addTag(
|
||||
// Should add vias to generated link, see following:
|
||||
// https://github.com/gomuks/gomuks/blob/d5deeb5d409181e469eada8b534882576ac78e63/web/src/ui/modal/ShareModal.tsx#L31-L57
|
||||
// https://github.com/gomuks/gomuks/blob/main/web/src/api/statestore/room.ts#L329
|
||||
id: "[#${room.metadata?.name ?? "Unnamed Room"}](https://matrix.to/#/${room.metadata?.canonicalAlias ?? room.metadata?.id})",
|
||||
name:
|
||||
(room.metadata?.canonicalAlias ??
|
||||
room.metadata?.id)
|
||||
?.substring(1)
|
||||
.split(":")
|
||||
.first ??
|
||||
"",
|
||||
),
|
||||
),
|
||||
)
|
||||
.toList(),
|
||||
),
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue