forked from cwtch.im/cwtch-ui
parent
f6710484a2
commit
059d32718b
|
@ -1,5 +1,6 @@
|
||||||
import 'dart:convert';
|
import 'dart:convert';
|
||||||
|
|
||||||
|
import 'package:cwtch/config.dart';
|
||||||
import 'package:cwtch/models/message.dart';
|
import 'package:cwtch/models/message.dart';
|
||||||
import 'package:cwtch/models/messages/malformedmessage.dart';
|
import 'package:cwtch/models/messages/malformedmessage.dart';
|
||||||
import 'package:cwtch/widgets/malformedbubble.dart';
|
import 'package:cwtch/widgets/malformedbubble.dart';
|
||||||
|
@ -8,6 +9,9 @@ import 'package:cwtch/widgets/quotedmessage.dart';
|
||||||
import 'package:flutter/widgets.dart';
|
import 'package:flutter/widgets.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
|
import '../../settings.dart';
|
||||||
|
import '../../third_party/linkify/flutter_linkify.dart';
|
||||||
|
|
||||||
class QuotedMessageStructure {
|
class QuotedMessageStructure {
|
||||||
final String quotedHash;
|
final String quotedHash;
|
||||||
final String body;
|
final String body;
|
||||||
|
@ -34,9 +38,16 @@ class QuotedMessage extends Message {
|
||||||
this.content,
|
this.content,
|
||||||
);
|
);
|
||||||
var content = message["body"];
|
var content = message["body"];
|
||||||
return Text(
|
var formatMessages = Provider.of<Settings>(context).isExperimentEnabled(FormattingExperiment);
|
||||||
content,
|
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.ellipsis),
|
||||||
|
codeStyle: TextStyle(overflow: TextOverflow.ellipsis),
|
||||||
|
textWidthBasis: TextWidthBasis.longestLine);
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
return MalformedBubble();
|
return MalformedBubble();
|
||||||
}
|
}
|
||||||
|
|
|
@ -10,6 +10,9 @@ import 'package:flutter/material.dart';
|
||||||
import 'package:flutter/widgets.dart';
|
import 'package:flutter/widgets.dart';
|
||||||
import 'package:provider/provider.dart';
|
import 'package:provider/provider.dart';
|
||||||
|
|
||||||
|
import '../../settings.dart';
|
||||||
|
import '../../third_party/linkify/flutter_linkify.dart';
|
||||||
|
|
||||||
class TextMessage extends Message {
|
class TextMessage extends Message {
|
||||||
final MessageMetadata metadata;
|
final MessageMetadata metadata;
|
||||||
final String content;
|
final String content;
|
||||||
|
@ -21,9 +24,16 @@ class TextMessage extends Message {
|
||||||
return ChangeNotifierProvider.value(
|
return ChangeNotifierProvider.value(
|
||||||
value: this.metadata,
|
value: this.metadata,
|
||||||
builder: (bcontext, child) {
|
builder: (bcontext, child) {
|
||||||
return Text(
|
var formatMessages = Provider.of<Settings>(bcontext).isExperimentEnabled(FormattingExperiment);
|
||||||
this.content,
|
return SelectableLinkify(
|
||||||
overflow: TextOverflow.ellipsis,
|
text: content + '\u202F',
|
||||||
|
options: LinkifyOptions(messageFormatting: formatMessages, parseLinks: false, looseUrl: true, defaultToHttps: true),
|
||||||
|
linkifiers: [UrlLinkifier()],
|
||||||
|
onOpen: null,
|
||||||
|
textAlign: TextAlign.left,
|
||||||
|
style: TextStyle(overflow: TextOverflow.ellipsis),
|
||||||
|
codeStyle: TextStyle(overflow: TextOverflow.ellipsis),
|
||||||
|
textWidthBasis: TextWidthBasis.longestLine,
|
||||||
);
|
);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
|
@ -83,12 +83,14 @@ class QuotedMessageBubbleState extends State<QuotedMessageBubble> {
|
||||||
// If the sender is not us, then we want to give them a nickname...
|
// If the sender is not us, then we want to give them a nickname...
|
||||||
String qMessageSender;
|
String qMessageSender;
|
||||||
|
|
||||||
// if we are quoted then display our nickname
|
// if we sent the quoted message then display our nickname
|
||||||
if (qMessage.getMetadata().senderHandle == Provider.of<ProfileInfoState>(context).onion) {
|
if (qMessage.getMetadata().senderHandle == Provider.of<ProfileInfoState>(context).onion) {
|
||||||
qMessageSender = Provider.of<ProfileInfoState>(context).nickname;
|
qMessageSender = Provider.of<ProfileInfoState>(context).nickname;
|
||||||
} else {
|
} else {
|
||||||
qMessageSender = Provider.of<MessageMetadata>(context).senderHandle;
|
// default to handle
|
||||||
ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(qMessage.getMetadata().senderHandle);
|
qMessageSender = qMessage.getMetadata().senderHandle;
|
||||||
|
// if we have the handle as a contact then replace with the nickname...
|
||||||
|
ContactInfoState? contact = Provider.of<ProfileInfoState>(context).contactList.findContact(qMessageSender);
|
||||||
if (contact != null) {
|
if (contact != null) {
|
||||||
qMessageSender = contact.nickname;
|
qMessageSender = contact.nickname;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue