From 67a99c903a76376a35bc0225e2f9421b071f3b6a Mon Sep 17 00:00:00 2001
From: Sarah Jamie Lewis <sarah@openprivacy.ca>
Date: Thu, 18 May 2023 11:24:09 -0700
Subject: [PATCH] Fix Up Quotes

---
 lib/models/messages/quotedmessage.dart | 11 ++---------
 lib/models/messages/textmessage.dart   | 16 ++--------------
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/lib/models/messages/quotedmessage.dart b/lib/models/messages/quotedmessage.dart
index fc00b20f..81e4ef0c 100644
--- a/lib/models/messages/quotedmessage.dart
+++ b/lib/models/messages/quotedmessage.dart
@@ -4,6 +4,7 @@ import 'package:cwtch/config.dart';
 import 'package:cwtch/models/message.dart';
 import 'package:cwtch/models/messages/malformedmessage.dart';
 import 'package:cwtch/widgets/malformedbubble.dart';
+import 'package:cwtch/widgets/messageBubbleWidgetHelpers.dart';
 import 'package:cwtch/widgets/messagerow.dart';
 import 'package:cwtch/widgets/quotedmessage.dart';
 import 'package:flutter/widgets.dart';
@@ -39,15 +40,7 @@ class QuotedMessage extends Message {
             );
             var content = message["body"];
             var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
-            return SelectableLinkify(
-                text: content + '\u202F',
-                options: LinkifyOptions(messageFormatting: formatMessages, parseLinks: false, looseUrl: true, defaultToHttps: true),
-                linkifiers: [UrlLinkifier()],
-                onOpen: null,
-                textAlign: TextAlign.left,
-                style: TextStyle(fontSize: 12.0 * Provider.of<Settings>(context).fontScaling, fontWeight: FontWeight.normal, fontFamily: "Inter", overflow: TextOverflow.ellipsis),
-                codeStyle: TextStyle(fontSize: 12.0 * Provider.of<Settings>(context).fontScaling, fontWeight: FontWeight.normal, fontFamily: "Inter", overflow: TextOverflow.ellipsis),
-                textWidthBasis: TextWidthBasis.longestLine);
+            return compileMessageContentWidget(context, false, content, FocusNode(), formatMessages, false);
           } catch (e) {
             return MalformedBubble();
           }
diff --git a/lib/models/messages/textmessage.dart b/lib/models/messages/textmessage.dart
index 1833dfff..c15555a6 100644
--- a/lib/models/messages/textmessage.dart
+++ b/lib/models/messages/textmessage.dart
@@ -12,6 +12,7 @@ import 'package:provider/provider.dart';
 
 import '../../settings.dart';
 import '../../third_party/linkify/flutter_linkify.dart';
+import '../../widgets/messageBubbleWidgetHelpers.dart';
 
 class TextMessage extends Message {
   final MessageMetadata metadata;
@@ -25,20 +26,7 @@ class TextMessage extends Message {
         value: this.metadata,
         builder: (bcontext, child) {
           var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
-          return SelectableLinkify(
-            text: content + '\u202F',
-            options: LinkifyOptions(messageFormatting: formatMessages, parseLinks: false, looseUrl: true, defaultToHttps: true),
-            linkifiers: [UrlLinkifier()],
-            onOpen: null,
-            textAlign: TextAlign.left,
-            style: TextStyle(overflow: TextOverflow.fade, fontFamily: "Inter", fontSize: 12.0 * Provider.of<Settings>(context).fontScaling),
-            linkStyle: TextStyle(overflow: TextOverflow.fade, fontFamily: "Inter", fontSize: 12.0 * Provider.of<Settings>(context).fontScaling),
-            codeStyle: TextStyle(
-              overflow: TextOverflow.ellipsis,
-              fontFamily: "RobotoMono",
-            ),
-            textWidthBasis: TextWidthBasis.parent,
-          );
+          return compileMessageContentWidget(context, false, content, FocusNode(), formatMessages, false);;
         });
   }