GitLab
/
fluffychat
mirror of https://gitlab.com/famedly/fluffychat.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'soru/mentions' into 'main' 

feat: Nicer mentions

Closes #444

See merge request famedly/fluffychat!446
This commit is contained in:
Krille Fear 2021-07-21 06:46:18 +00:00
parent b213ed74ba 99bc8198e9
commit 0b147a2116
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pages/views/chat_view.dart
View File

@ -86,7 +86,7 @@ class ChatView extends StatelessWidget {
outerContext: context, outerContext: context,
onMention: () => controller onMention: () => controller
.sendController.text += .sendController.text +=
'${controller.room.directChatMatrixID} ', '${controller.room.getUserByMXIDSync(controller.room.directChatMatrixID).mention} ',
), ),
) )
: () => VRouter.of(context) : () => VRouter.of(context)
@ -376,7 +376,7 @@ class ChatView extends StatelessWidget {
onMention: () => controller onMention: () => controller
.sendController .sendController
.text += .text +=
'${event.senderId} ', '${event.sender.mention} ',
), ),
), ),
unfold: controller.unfold, unfold: controller.unfold,

3
lib/widgets/input_bar.dart
View File

@ -115,6 +115,7 @@ class InputBar extends StatelessWidget {
ret.add({ ret.add({
'type': 'user', 'type': 'user',
'mxid': user.id, 'mxid': user.id,
'mention': user.mention,
'displayname': user.displayName, 'displayname': user.displayName,
'avatar_url': user.avatarUrl?.toString(), 'avatar_url': user.avatarUrl?.toString(),
}); });
@ -324,7 +325,7 @@ class InputBar extends StatelessWidget {
); );
} }
if (suggestion['type'] == 'user') { if (suggestion['type'] == 'user') {
insertText = suggestion['mxid'] + ' '; insertText = suggestion['mention'] + ' ';
startText = replaceText.replaceAllMapped( startText = replaceText.replaceAllMapped(
RegExp(r'(\s|^)(@[-\w]+)$'), RegExp(r'(\s|^)(@[-\w]+)$'),
(Match m) => '${m[1]}$insertText', (Match m) => '${m[1]}$insertText',