Henry-Hiles/nexus
2
2
Fork 2
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

Gomuks SDK Rewrite #2

Closed
Henry-Hiles wants to merge 34 commits from go into main
pull from: go
merge into: Henry-Hiles:main
Conversation 1 Commits 34 Files changed 86 +112 -115
2 changed files with 112 additions and 115 deletions
Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 36c6d6958a - Show all commits

wip mention overlay

Prev Next
Henry Hiles 2026-01-30 09:21:41 +01:00
commit 36c6d6958a
No known key found for this signature in database

20
lib/widgets/chat_page/chat_box.dart
View file

@ -8,6 +8,7 @@ import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:nexus/controllers/room_chat_controller.dart"; import "package:nexus/controllers/room_chat_controller.dart";
import "package:nexus/models/relation_type.dart"; import "package:nexus/models/relation_type.dart";
import "package:nexus/models/room.dart"; import "package:nexus/models/room.dart";
import "package:nexus/widgets/chat_page/mention_overlay.dart";
import "package:nexus/widgets/chat_page/relation_preview.dart"; import "package:nexus/widgets/chat_page/relation_preview.dart";
class ChatBox extends HookConsumerWidget { class ChatBox extends HookConsumerWidget {
@ -108,16 +109,15 @@ class ChatBox extends HookConsumerWidget {
Expanded( Expanded(
child: FlutterTagger( child: FlutterTagger(
triggerStrategy: TriggerStrategy.eager, triggerStrategy: TriggerStrategy.eager,
overlay: SizedBox.shrink(), overlay: MentionOverlay(
// MentionOverlay( TODO: Fix room,
// room, query: query.value,
// query: query.value, triggerCharacter: triggerCharacter.value,
// triggerCharacter: triggerCharacter.value, addTag: ({required id, required name}) {
// addTag: ({required id, required name}) { controller.value.addTag(id: id, name: name);
// controller.value.addTag(id: id, name: name); node.requestFocus();
// node.requestFocus(); },
// }, ),
// ),
controller: controller.value, controller: controller.value,
onSearch: (newQuery, newTriggerCharacter) { onSearch: (newQuery, newTriggerCharacter) {
triggerCharacter.value = newTriggerCharacter; triggerCharacter.value = newTriggerCharacter;

95
lib/widgets/chat_page/mention_overlay.dart
View file

@ -1,12 +1,9 @@
import "package:flutter/material.dart"; import "package:flutter/material.dart";
import "package:hooks_riverpod/hooks_riverpod.dart"; import "package:hooks_riverpod/hooks_riverpod.dart";
import "package:matrix/matrix.dart";
import "package:nexus/controllers/avatar_controller.dart";
import "package:nexus/controllers/members_controller.dart"; import "package:nexus/controllers/members_controller.dart";
import "package:nexus/controllers/rooms_controller.dart"; import "package:nexus/controllers/rooms_controller.dart";
import "package:nexus/helpers/extensions/better_when.dart"; import "package:nexus/helpers/extensions/better_when.dart";
import "package:nexus/helpers/extensions/get_headers.dart"; import "package:nexus/models/room.dart";
import "package:nexus/widgets/avatar_or_hash.dart";
import "package:nexus/widgets/loading.dart"; import "package:nexus/widgets/loading.dart";
class MentionOverlay extends ConsumerWidget { class MentionOverlay extends ConsumerWidget {
@ -23,7 +20,10 @@ class MentionOverlay extends ConsumerWidget {
}); });
@override @override
Widget build(BuildContext context, WidgetRef ref) => Padding( Widget build(BuildContext context, WidgetRef ref) {
final rooms = ref.watch(RoomsController.provider);
return Padding(
padding: EdgeInsets.all(8), padding: EdgeInsets.all(8),
child: ClipRRect( child: ClipRRect(
borderRadius: BorderRadius.all(Radius.circular(12)), borderRadius: BorderRadius.all(Radius.circular(12)),
@ -41,9 +41,9 @@ class MentionOverlay extends ConsumerWidget {
? members ? members
: members.where( : members.where(
(member) => (member) =>
member.senderId.toLowerCase().contains( member.authorId
query.toLowerCase(), .toLowerCase()
) || .contains(query.toLowerCase()) ||
(member.content["displayname"] (member.content["displayname"]
as String?) as String?)
?.toLowerCase() ?.toLowerCase()
@ -54,25 +54,25 @@ class MentionOverlay extends ConsumerWidget {
)) ))
.map( .map(
(member) => ListTile( (member) => ListTile(
leading: AvatarOrHash( // leading: AvatarOrHash( TODO: Images
ref // ref
.watch( // .watch(
AvatarController.provider( // AvatarController.provider(
member.content["avatar_url"] // member.content["avatar_url"]
.toString(), // .toString(),
), // ),
) // )
.whenOrNull(data: (data) => data), // .whenOrNull(data: (data) => data),
member.content["displayname"].toString(), // member.content["displayname"].toString(),
headers: room.client.headers, // headers: room.client.headers,
), // ),
title: Text( title: Text(
member.content["displayname"] as String? ?? member.content["displayname"] as String? ??
member.senderId, member.authorId,
), ),
onTap: () => addTag( onTap: () => addTag(
id: member.senderId, id: member.authorId,
name: member.senderId name: member.authorId
.substring(1) .substring(1)
.split(":") .split(":")
.first, .first,
@ -82,49 +82,46 @@ class MentionOverlay extends ConsumerWidget {
.toList(), .toList(),
), ),
), ),
"#" => "#" => ListView(
ref
.watch(RoomsController.provider)
.betterWhen(
data: (rooms) => ListView(
children: children:
(query.isEmpty (query.isEmpty
? rooms ? rooms.values
: rooms.where( : rooms.values.where(
(room) => room.title.toLowerCase().contains( (room) => (room.metadata?.name ?? "Unnamed Room")
query.toLowerCase(), .toLowerCase()
), .contains(query.toLowerCase()),
)) ))
.map( .map(
(room) => ListTile( (room) => ListTile(
leading: AvatarOrHash( // leading: AvatarOrHash( TODO: Images
room.avatar, // room.avatar,
room.title, // room.title,
fallback: Icon(Icons.numbers), // fallback: Icon(Icons.numbers),
headers: room.roomData.client.headers, // headers: room.roomData.client.headers,
), // ),
title: Text(room.title), title: Text(room.metadata?.name ?? "Unnamed Room"),
subtitle: room.roomData.topic.isEmpty subtitle: room.metadata?.topic == null
? null ? null
: Text(room.roomData.topic, maxLines: 1), : Text(room.metadata!.topic!, maxLines: 1),
onTap: () => addTag( onTap: () => addTag(
id: "[#${room.roomData.getLocalizedDisplayname()}](https://matrix.to/#/${room.roomData.id})", id: "[#${room.metadata?.name ?? "Unnamed Room"}](https://matrix.to/#/${room.metadata?.id})",
name: name:
(room.roomData.canonicalAlias.isEmpty (room.metadata?.canonicalAlias ??
? room.roomData.id room.metadata?.id)
: room.roomData.canonicalAlias) ?.substring(1)
.substring(1)
.split(":") .split(":")
.first, .first ??
"",
), ),
), ),
) )
.toList(), .toList(),
), ),
),
_ => Loading(), _ => Loading(),
}, },
), ),
), ),
); );
}
} }