Merge pull request #298 from takenet/feature/802877-reactions

[Feature] #802877 - Reactions Support
takenet · Feb 7, 2025 · 58b83c8 · 58b83c8
2 parents 500fda2 + a39ba5c
commit 58b83c8
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/lib/src/models/ds_reply_content.model.dart b/lib/src/models/ds_reply_content.model.dart
@@ -1,3 +1,4 @@
+import '../utils/ds_message_content_type.util.dart';
 import 'ds_reply_content_in_reply_to.model.dart';
 import 'ds_reply_content_replied.model.dart';
 
@@ -11,11 +12,9 @@ class DSReplyContent {
   });
 
   DSReplyContent.fromJson(Map<String, dynamic> json)
-      : replied = DSReplyContentReplied.fromJson(
-          json['replied'],
-        ),
+      : replied = _getContent(json),
         inReplyTo = DSReplyContentInReplyTo.fromJson(
-          json['inReplyTo'],
+          json['inReplyTo'] ?? json['inReactionTo'],
         );
 
   Map<String, dynamic> toJson() {
@@ -24,4 +23,18 @@ class DSReplyContent {
       'inReplyTo': inReplyTo.toJson(),
     };
   }
+
+  static DSReplyContentReplied _getContent(Map<String, dynamic> json) =>
+      json['replied'] != null
+          ? DSReplyContentReplied.fromJson(
+              json['replied'],
+            )
+          : DSReplyContentReplied(
+              type: DSMessageContentType.textPlain,
+              value: String.fromCharCodes(
+                (json['emoji']['values'] as List).map(
+                  (e) => e as int,
+                ),
+              ),
+            );
 }
diff --git a/lib/src/utils/ds_message_content_type.util.dart b/lib/src/utils/ds_message_content_type.util.dart
@@ -14,4 +14,5 @@ abstract class DSMessageContentType {
   static const String applicationJson = 'application/json';
   static const String reply = 'application/vnd.lime.reply+json';
   static const String callsMedia = 'application/vnd.iris.calls.media+json';
+  static const String reaction = 'application/vnd.lime.reaction+json';
 }
diff --git a/lib/src/widgets/utils/ds_card.widget.dart b/lib/src/widgets/utils/ds_card.widget.dart
@@ -77,10 +77,6 @@ class DSCard extends StatelessWidget {
 
   @override
   Widget build(BuildContext context) {
-    return _resolveWidget();
-  }
-
-  Widget _resolveWidget() {
     switch (type) {
       case DSMessageContentType.textPlain:
       case DSMessageContentType.sensitive:
@@ -94,10 +90,7 @@ class DSCard extends StatelessWidget {
           onTapReply: onTapReply,
         );
 
-      case DSMessageContentType.contact:
-        return _buildContact();
-
-      case DSMessageContentType.reply:
+      case DSMessageContentType.reply || DSMessageContentType.reaction:
         final replyContent = DSReplyContent.fromJson(content);
 
         return DSCard(
@@ -118,6 +111,9 @@ class DSCard extends StatelessWidget {
           onTapReply: onTapReply,
         );
 
+      case DSMessageContentType.contact:
+        return _buildContact();
+
       case DSMessageContentType.mediaLink:
         return _buildMediaLink();
 

diff --git a/sample/pubspec.lock b/sample/pubspec.lock
@@ -31,7 +31,7 @@ packages:
       path: ".."
       relative: true
     source: path
-    version: "0.3.3"
+    version: "0.3.4"
   boolean_selector:
     dependency: transitive
     description: