Merge pull request #519 from sethoscope/emoji-reation-report
Add emoji reaction report for channel chat, fix reaction deduping bug
This commit is contained in:
29 files changed
+244
-62
No files matched your search
@@ -454,6 +454,13 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
);
|
||||
}
|
||||
|
||||
Contact? getContactByPubKeyHex(String contactPubKeyHex) {
|
||||
return _contacts.cast<Contact?>().firstWhere(
|
||||
(c) => c?.publicKeyHex == contactPubKeyHex,
|
||||
orElse: () => null,
|
||||
);
|
||||
}
|
||||
|
||||
List<Contact> get allContacts => List.unmodifiable([
|
||||
..._contacts,
|
||||
..._discoveredContacts.where(
|
||||
@@ -3150,9 +3157,15 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
// Check if this is a reaction - apply locally with pending status and route through retry service
|
||||
final reactionInfo = ReactionHelper.parseReaction(text);
|
||||
if (reactionInfo != null) {
|
||||
appLogger.info('Sending reaction: ${reactionInfo.identifier()}');
|
||||
_conversations.putIfAbsent(contact.publicKeyHex, () => []);
|
||||
final messages = _conversations[contact.publicKeyHex]!;
|
||||
|
||||
// No check for duplicates. If you want to do it again to resend, you can.
|
||||
final String reactionID = reactionInfo.identifier();
|
||||
_processedContactReactions.putIfAbsent(contact.publicKeyHex, () => {});
|
||||
_processedContactReactions[contact.publicKeyHex]!.add(reactionID);
|
||||
|
||||
// Apply reaction locally with pending status
|
||||
_processOutgoingContactReaction(messages, reactionInfo, contact);
|
||||
_setReactionStatus(
|
||||
@@ -3194,7 +3207,7 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
translatedLanguageCode: translatedLanguageCode,
|
||||
translationModelId: translationModelId,
|
||||
);
|
||||
_addMessage(contact.publicKeyHex, message);
|
||||
_addMessage(contact.publicKeyHex, message); // recipient as "sender"
|
||||
notifyListeners();
|
||||
final outboundText = prepareContactOutboundText(contact, text);
|
||||
await sendFrame(buildSendTextMsgFrame(contact.publicKey, outboundText));
|
||||
@@ -3531,11 +3544,12 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
// Check if this is a reaction - if so, process it immediately instead of adding as a message
|
||||
final reactionInfo = ReactionHelper.parseReaction(text);
|
||||
if (reactionInfo != null) {
|
||||
reactionInfo.senderName = selfName;
|
||||
// Check if we've already processed this reaction
|
||||
_processedChannelReactions.putIfAbsent(channel.index, () => {});
|
||||
final reactionIdentifier =
|
||||
'${reactionInfo.targetHash}_${reactionInfo.emoji}';
|
||||
final reactionIdentifier = reactionInfo.identifier();
|
||||
|
||||
// Maybe we should allow resending. Recipients can drop duplicates.
|
||||
if (_processedChannelReactions[channel.index]!.contains(
|
||||
reactionIdentifier,
|
||||
)) {
|
||||
@@ -3548,6 +3562,7 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
final messages = _channelMessages[channel.index]!;
|
||||
|
||||
// Process reaction locally to update the UI immediately
|
||||
appLogger.info('Adding sent channel reaction, id: $reactionIdentifier');
|
||||
_processReaction(messages, reactionInfo);
|
||||
await _channelMessageStore.saveChannelMessages(channel.index, messages);
|
||||
|
||||
@@ -6207,15 +6222,23 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
if (reactionInfo != null) {
|
||||
// Check if we've already processed this exact reaction
|
||||
_processedContactReactions.putIfAbsent(pubKeyHex, () => {});
|
||||
final reactionIdentifier =
|
||||
'${reactionInfo.targetHash}_${reactionInfo.emoji}';
|
||||
|
||||
reactionInfo.senderName = _resolveContactSenderName(message, null, false);
|
||||
final reactionIdentifier = reactionInfo.identifier();
|
||||
final isDuplicate = _processedContactReactions[pubKeyHex]!.contains(
|
||||
reactionIdentifier,
|
||||
);
|
||||
|
||||
if (!isDuplicate) {
|
||||
// New reaction - process it
|
||||
appLogger.info('Adding reaction, id: $reactionIdentifier');
|
||||
// For hashing and dup checking, we use null for sender names in
|
||||
// normal 1:1 chats. This way if we and they have different ideas
|
||||
// about what their name is, reactions still work. But for reaction
|
||||
// reports, we want to know who sent what, rather than infer it later,
|
||||
// so we'll add it to the reactionInfo before storing it.
|
||||
reactionInfo.senderName ??= message.isOutgoing
|
||||
? selfName
|
||||
: getContactByPubKeyHex(pubKeyHex)?.name ?? '???';
|
||||
_processContactReaction(messages, reactionInfo, pubKeyHex);
|
||||
_messageStore.saveMessages(pubKeyHex, messages);
|
||||
|
||||
@@ -6240,10 +6263,7 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
ReactionInfo reactionInfo,
|
||||
String contactPubKeyHex,
|
||||
) {
|
||||
final contact = _contacts.cast<Contact?>().firstWhere(
|
||||
(c) => c?.publicKeyHex == contactPubKeyHex,
|
||||
orElse: () => null,
|
||||
);
|
||||
final contact = getContactByPubKeyHex(contactPubKeyHex);
|
||||
final isRoomServer = contact?.type == advTypeRoom;
|
||||
|
||||
ReactionHelper.applyReaction<Message>(
|
||||
@@ -6292,10 +6312,7 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
) {
|
||||
final messages = _conversations[pubKeyHex];
|
||||
if (messages == null) return;
|
||||
final contact = _contacts.cast<Contact?>().firstWhere(
|
||||
(c) => c?.publicKeyHex == pubKeyHex,
|
||||
orElse: () => null,
|
||||
);
|
||||
final contact = getContactByPubKeyHex(pubKeyHex);
|
||||
final isRoomServer = contact?.type == advTypeRoom;
|
||||
for (int i = messages.length - 1; i >= 0; i--) {
|
||||
final msg = messages[i];
|
||||
@@ -6454,12 +6471,11 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
final messages = _channelMessages[channelIndex]!;
|
||||
|
||||
// Parse reaction info
|
||||
final reactionInfo = ChannelMessage.parseReaction(message.text);
|
||||
final reactionInfo = message.parseReaction();
|
||||
if (reactionInfo != null) {
|
||||
// Check if we've already processed this exact reaction
|
||||
_processedChannelReactions.putIfAbsent(channelIndex, () => {});
|
||||
final reactionIdentifier =
|
||||
'${reactionInfo.targetHash}_${reactionInfo.emoji}';
|
||||
final reactionIdentifier = reactionInfo.identifier();
|
||||
|
||||
final isDuplicate = _processedChannelReactions[channelIndex]!.contains(
|
||||
reactionIdentifier,
|
||||
@@ -6467,6 +6483,7 @@ class MeshCoreConnector extends ChangeNotifier {
|
||||
|
||||
if (!isDuplicate) {
|
||||
// New reaction - process it
|
||||
appLogger.info('Adding channel reaction, id: $reactionIdentifier');
|
||||
_processReaction(messages, reactionInfo);
|
||||
// Save updated messages
|
||||
_channelMessageStore.saveChannelMessages(channelIndex, messages);
|
||||
|
||||
@@ -3,8 +3,17 @@ import '../widgets/emoji_picker.dart';
|
||||
class ReactionInfo {
|
||||
final String targetHash;
|
||||
final String emoji;
|
||||
String? senderName;
|
||||
|
||||
ReactionInfo({required this.targetHash, required this.emoji});
|
||||
ReactionInfo({
|
||||
required this.targetHash,
|
||||
required this.emoji,
|
||||
this.senderName,
|
||||
});
|
||||
|
||||
String identifier() {
|
||||
return '$targetHash:$emoji:${senderName ?? ""}';
|
||||
}
|
||||
}
|
||||
|
||||
class ReactionHelper {
|
||||
@@ -26,9 +35,8 @@ class ReactionHelper {
|
||||
required int Function(T) getTimestampSecs,
|
||||
required String? Function(T) getSenderName,
|
||||
required String Function(T) getMessageText,
|
||||
required Map<String, int> Function(T) getReactions,
|
||||
required Map<String, List<String?>> Function(T) getReactions,
|
||||
required bool Function(T) shouldSkip,
|
||||
required void Function(int index, Map<String, int> newReactions)
|
||||
updateMessage,
|
||||
}) {
|
||||
final targetHash = reactionInfo.targetHash;
|
||||
@@ -42,9 +50,12 @@ class ReactionHelper {
|
||||
getMessageText(msg),
|
||||
);
|
||||
if (msgHash == targetHash) {
|
||||
final currentReactions = Map<String, int>.from(getReactions(msg));
|
||||
currentReactions[reactionInfo.emoji] =
|
||||
(currentReactions[reactionInfo.emoji] ?? 0) + 1;
|
||||
final currentReactions = Map<String, List<String?>>.from(
|
||||
getReactions(msg),
|
||||
);
|
||||
(currentReactions[reactionInfo.emoji] ??= []).add(
|
||||
reactionInfo.senderName,
|
||||
);
|
||||
updateMessage(i, currentReactions);
|
||||
return true;
|
||||
}
|
||||
|
||||
@@ -750,6 +750,7 @@
|
||||
"chat_reply": "Reply",
|
||||
"chat_addReaction": "Add Reaction",
|
||||
"chat_me": "Me",
|
||||
"reaction_report": "Emoji Reactions",
|
||||
"emojiCategorySmileys": "Smileys",
|
||||
"emojiCategoryGestures": "Gestures",
|
||||
"emojiCategoryHearts": "Hearts",
|
||||
|
||||
@@ -2770,6 +2770,12 @@ abstract class AppLocalizations {
|
||||
/// **'Me'**
|
||||
String get chat_me;
|
||||
|
||||
/// No description provided for @reaction_report.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
/// **'Emoji Reactions'**
|
||||
String get reaction_report;
|
||||
|
||||
/// No description provided for @emojiCategorySmileys.
|
||||
///
|
||||
/// In en, this message translates to:
|
||||
|
||||
@@ -1510,6 +1510,9 @@ class AppLocalizationsBg extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Аз';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Емотикони';
|
||||
|
||||
|
||||
@@ -1509,6 +1509,9 @@ class AppLocalizationsDe extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Ich';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Emoticons';
|
||||
|
||||
|
||||
@@ -1477,6 +1477,9 @@ class AppLocalizationsEn extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Me';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Smileys';
|
||||
|
||||
|
||||
@@ -1505,6 +1505,9 @@ class AppLocalizationsEs extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Yo';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Emoticones';
|
||||
|
||||
|
||||
@@ -1508,6 +1508,9 @@ class AppLocalizationsFr extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Moi';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Émojis';
|
||||
|
||||
|
||||
@@ -1500,6 +1500,9 @@ class AppLocalizationsHu extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Nekem';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Hangulatjelek';
|
||||
|
||||
|
||||
@@ -1509,6 +1509,9 @@ class AppLocalizationsIt extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Io';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Emoji';
|
||||
|
||||
|
||||
@@ -1433,6 +1433,9 @@ class AppLocalizationsJa extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => '私';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => '顔文字';
|
||||
|
||||
|
||||
@@ -1436,6 +1436,9 @@ class AppLocalizationsKo extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => '나';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => '이모티콘';
|
||||
|
||||
|
||||
@@ -1495,6 +1495,9 @@ class AppLocalizationsNl extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Mijn';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Emoji\'s';
|
||||
|
||||
|
||||
@@ -1518,6 +1518,9 @@ class AppLocalizationsPl extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Ja';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Emoji';
|
||||
|
||||
|
||||
@@ -1504,6 +1504,9 @@ class AppLocalizationsPt extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Eu';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Emojis';
|
||||
|
||||
|
||||
@@ -1508,6 +1508,9 @@ class AppLocalizationsRu extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Я';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Смайлы';
|
||||
|
||||
|
||||
@@ -1493,6 +1493,9 @@ class AppLocalizationsSk extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Mne';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Emoji';
|
||||
|
||||
|
||||
@@ -1493,6 +1493,9 @@ class AppLocalizationsSl extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'jaz';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Emoji';
|
||||
|
||||
|
||||
@@ -1485,6 +1485,9 @@ class AppLocalizationsSv extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Mig';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Emojis';
|
||||
|
||||
|
||||
@@ -1499,6 +1499,9 @@ class AppLocalizationsUk extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => 'Я';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => 'Емодзі';
|
||||
|
||||
|
||||
@@ -1419,6 +1419,9 @@ class AppLocalizationsZh extends AppLocalizations {
|
||||
@override
|
||||
String get chat_me => '我';
|
||||
|
||||
@override
|
||||
String get reaction_report => 'Emoji Reactions';
|
||||
|
||||
@override
|
||||
String get emojiCategorySmileys => '表情';
|
||||
|
||||
|
||||
@@ -50,7 +50,7 @@ class ChannelMessage {
|
||||
final String? replyToMessageId;
|
||||
final String? replyToSenderName;
|
||||
final String? replyToText;
|
||||
final Map<String, int> reactions;
|
||||
final Map<String, List<String?>> reactions;
|
||||
|
||||
ChannelMessage({
|
||||
this.senderKey,
|
||||
@@ -76,7 +76,7 @@ class ChannelMessage {
|
||||
this.replyToMessageId,
|
||||
this.replyToSenderName,
|
||||
this.replyToText,
|
||||
Map<String, int>? reactions,
|
||||
Map<String, List<String?>>? reactions,
|
||||
}) : messageId =
|
||||
messageId ??
|
||||
'${timestamp.millisecondsSinceEpoch}_${senderName.hashCode}_${text.hashCode}',
|
||||
@@ -107,7 +107,7 @@ class ChannelMessage {
|
||||
Object? translatedLanguageCode = _unset,
|
||||
MessageTranslationStatus? translationStatus,
|
||||
Object? translationModelId = _unset,
|
||||
Map<String, int>? reactions,
|
||||
Map<String, List<String?>>? reactions,
|
||||
}) {
|
||||
return ChannelMessage(
|
||||
senderKey: senderKey,
|
||||
@@ -297,8 +297,32 @@ class ChannelMessage {
|
||||
);
|
||||
}
|
||||
|
||||
static ReactionInfo? parseReaction(String text) {
|
||||
return ReactionHelper.parseReaction(text);
|
||||
ReactionInfo? parseReaction() {
|
||||
final reactionInfo = ReactionHelper.parseReaction(text);
|
||||
reactionInfo?.senderName = senderName;
|
||||
return reactionInfo;
|
||||
}
|
||||
|
||||
String computeReactionHash() {
|
||||
return ReactionHelper.computeReactionHash(
|
||||
timestamp.millisecondsSinceEpoch ~/ 1000,
|
||||
senderName,
|
||||
text,
|
||||
);
|
||||
}
|
||||
|
||||
List<ReactionInfo> reactionList() {
|
||||
final String hash = computeReactionHash();
|
||||
List<ReactionInfo> reactionList = [];
|
||||
for (final entry in reactions.entries) {
|
||||
final emoji = entry.key;
|
||||
for (final senderName in entry.value) {
|
||||
reactionList.add(
|
||||
ReactionInfo(targetHash: hash, emoji: emoji, senderName: senderName),
|
||||
);
|
||||
}
|
||||
}
|
||||
return reactionList;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -8,7 +8,7 @@ enum MessageStatus { pending, sent, delivered, failed }
|
||||
class Message {
|
||||
static const Object _unset = Object();
|
||||
|
||||
final Uint8List senderKey;
|
||||
final Uint8List senderKey; // For outgoing msgs, gets used as recipientKey
|
||||
final String text;
|
||||
final DateTime timestamp;
|
||||
final bool isOutgoing;
|
||||
@@ -30,7 +30,7 @@ class Message {
|
||||
final int? tripTimeMs;
|
||||
final int? pathLength;
|
||||
final Uint8List pathBytes;
|
||||
final Map<String, int> reactions;
|
||||
final Map<String, List<String?>> reactions;
|
||||
final Map<String, MessageStatus> reactionStatuses;
|
||||
final Uint8List fourByteRoomContactKey;
|
||||
|
||||
@@ -56,7 +56,7 @@ class Message {
|
||||
this.pathLength,
|
||||
Uint8List? pathBytes,
|
||||
Uint8List? fourByteRoomContactKey,
|
||||
Map<String, int>? reactions,
|
||||
Map<String, List<String?>>? reactions,
|
||||
Map<String, MessageStatus>? reactionStatuses,
|
||||
}) : messageId =
|
||||
messageId ??
|
||||
@@ -84,7 +84,7 @@ class Message {
|
||||
Object? translatedLanguageCode = _unset,
|
||||
MessageTranslationStatus? translationStatus,
|
||||
Object? translationModelId = _unset,
|
||||
Map<String, int>? reactions,
|
||||
Map<String, List<String?>>? reactions,
|
||||
Map<String, MessageStatus>? reactionStatuses,
|
||||
Uint8List? fourByteRoomContactKey,
|
||||
}) {
|
||||
|
||||
@@ -961,7 +961,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
||||
runSpacing: 6,
|
||||
children: message.reactions.entries.map((entry) {
|
||||
final emoji = entry.key;
|
||||
final count = entry.value;
|
||||
final int count = entry.value.length;
|
||||
|
||||
return Container(
|
||||
padding: const EdgeInsets.symmetric(horizontal: 8, vertical: 4),
|
||||
@@ -970,35 +970,97 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
||||
borderRadius: BorderRadius.circular(MeshRadii.pill),
|
||||
border: Border.all(color: scheme.outlineVariant, width: 1),
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
emoji,
|
||||
style: MeshTheme.emoji(fontSize: 16),
|
||||
textHeightBehavior: const TextHeightBehavior(
|
||||
applyHeightToFirstAscent: false,
|
||||
applyHeightToLastDescent: false,
|
||||
),
|
||||
),
|
||||
if (count > 1) ...[
|
||||
const SizedBox(width: 4),
|
||||
child: InkWell(
|
||||
onTap: () => _showReactionsReport(message),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
'$count',
|
||||
style: MeshTheme.mono(
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: scheme.onSurface,
|
||||
emoji,
|
||||
style: MeshTheme.emoji(fontSize: 16),
|
||||
textHeightBehavior: const TextHeightBehavior(
|
||||
applyHeightToFirstAscent: false,
|
||||
applyHeightToLastDescent: false,
|
||||
),
|
||||
),
|
||||
if (count > 1) ...[
|
||||
const SizedBox(width: 4),
|
||||
Text(
|
||||
'$count',
|
||||
style: MeshTheme.mono(
|
||||
fontSize: 11,
|
||||
fontWeight: FontWeight.w700,
|
||||
color: scheme.onSurface,
|
||||
),
|
||||
),
|
||||
],
|
||||
],
|
||||
],
|
||||
),
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
);
|
||||
}
|
||||
|
||||
void _showReactionsReport(ChannelMessage message) {
|
||||
final scheme = Theme.of(context).colorScheme;
|
||||
showDialog(
|
||||
context: context,
|
||||
builder: (context) => AlertDialog(
|
||||
title: Text(context.l10n.reaction_report),
|
||||
content: SizedBox(
|
||||
width: double.maxFinite,
|
||||
child: Scrollbar(
|
||||
child: ListView(
|
||||
shrinkWrap: true,
|
||||
padding: const EdgeInsets.symmetric(vertical: 4),
|
||||
children: message.reactionList().map((reaction) {
|
||||
return Container(
|
||||
padding: const EdgeInsetsDirectional.symmetric(vertical: 4),
|
||||
child: Container(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 4,
|
||||
),
|
||||
decoration: BoxDecoration(
|
||||
color: scheme.surfaceContainerHigh,
|
||||
borderRadius: BorderRadius.circular(MeshRadii.pill),
|
||||
border: Border.all(
|
||||
color: scheme.outlineVariant,
|
||||
width: 1,
|
||||
),
|
||||
),
|
||||
child: Padding(
|
||||
padding: const EdgeInsets.symmetric(
|
||||
horizontal: 8,
|
||||
vertical: 4,
|
||||
),
|
||||
child: Row(
|
||||
mainAxisSize: MainAxisSize.min,
|
||||
children: [
|
||||
Text(
|
||||
reaction.emoji,
|
||||
style: MeshTheme.emoji(fontSize: 16),
|
||||
textHeightBehavior: const TextHeightBehavior(
|
||||
applyHeightToFirstAscent: false,
|
||||
applyHeightToLastDescent: false,
|
||||
),
|
||||
),
|
||||
const SizedBox(width: 12),
|
||||
Expanded(child: Text(reaction.senderName ?? '???')),
|
||||
],
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}).toList(),
|
||||
),
|
||||
),
|
||||
),
|
||||
),
|
||||
);
|
||||
}
|
||||
|
||||
Widget _buildPoiMessage(
|
||||
BuildContext context,
|
||||
MarkerPayload poi,
|
||||
@@ -2036,12 +2098,7 @@ class _ChannelChatScreenState extends State<ChannelChatScreen> {
|
||||
final connector = context.read<MeshCoreConnector>();
|
||||
final emojiIndex = ReactionHelper.emojiToIndex(emoji);
|
||||
if (emojiIndex == null) return; // Unknown emoji, skip
|
||||
final timestampSecs = message.timestamp.millisecondsSinceEpoch ~/ 1000;
|
||||
final hash = ReactionHelper.computeReactionHash(
|
||||
timestampSecs,
|
||||
message.senderName,
|
||||
message.text,
|
||||
);
|
||||
final hash = message.computeReactionHash();
|
||||
final reactionText = ReactionHelper.encodeReaction(hash, emojiIndex);
|
||||
connector.sendChannelMessage(widget.channel, reactionText);
|
||||
}
|
||||
|
||||
@@ -7,6 +7,7 @@ import 'package:flutter/scheduler.dart';
|
||||
import 'package:flutter/services.dart';
|
||||
import 'package:provider/provider.dart';
|
||||
|
||||
import '../utils/app_logger.dart';
|
||||
import '../utils/platform_info.dart';
|
||||
|
||||
import '../connector/meshcore_connector.dart';
|
||||
@@ -1281,6 +1282,7 @@ class _ChatScreenState extends State<ChatScreen> {
|
||||
final senderName = liveContact.type == advTypeRoom
|
||||
? senderContact.name
|
||||
: null;
|
||||
appLogger.info('Sending reaction using senderName: $senderName');
|
||||
final hash = ReactionHelper.computeReactionHash(
|
||||
timestampSecs,
|
||||
senderName,
|
||||
@@ -1654,7 +1656,7 @@ class _MessageBubble extends StatelessWidget {
|
||||
runSpacing: 6,
|
||||
children: message.reactions.entries.map((entry) {
|
||||
final emoji = entry.key;
|
||||
final count = entry.value;
|
||||
final count = entry.value.length;
|
||||
final status = message.reactionStatuses[emoji];
|
||||
final isPending =
|
||||
status == MessageStatus.pending || status == MessageStatus.sent;
|
||||
|
||||
@@ -195,7 +195,12 @@ class ChannelMessageStore {
|
||||
replyToText: json['replyToText'] as String?,
|
||||
reactions:
|
||||
(json['reactions'] as Map<String, dynamic>?)?.map(
|
||||
(key, value) => MapEntry(key, value as int),
|
||||
(key, value) => MapEntry(
|
||||
key,
|
||||
(value is int)
|
||||
? List<String?>.filled(value, null)
|
||||
: List<String?>.from(value),
|
||||
),
|
||||
) ??
|
||||
{},
|
||||
);
|
||||
|
||||
@@ -171,7 +171,12 @@ class MessageStore {
|
||||
pathBytes: decodedPathBytes,
|
||||
reactions:
|
||||
(json['reactions'] as Map<String, dynamic>?)?.map(
|
||||
(key, value) => MapEntry(key, value as int),
|
||||
(key, value) => MapEntry(
|
||||
key,
|
||||
(value is int)
|
||||
? List<String?>.filled(value, null)
|
||||
: List<String?>.from(value),
|
||||
),
|
||||
) ??
|
||||
{},
|
||||
reactionStatuses:
|
||||
|
||||
+1
-1
@@ -1 +1 @@
|
||||
{}
|
||||
{}
|
||||
Reference in new issue
Block a user