Working images
This commit is contained in:
parent
0e6b9a8133
commit
099725063f
20 changed files with 388 additions and 375 deletions
|
|
@ -1,17 +0,0 @@
|
|||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||
import "package:matrix/matrix.dart";
|
||||
import "package:nexus/controllers/client_controller.dart";
|
||||
|
||||
class AvatarController extends AsyncNotifier<Uri> {
|
||||
final String mxc;
|
||||
AvatarController(this.mxc);
|
||||
@override
|
||||
Future<Uri> build() async => Uri.parse(mxc).getThumbnailUri(
|
||||
await ref.watch(ClientController.provider.future),
|
||||
width: 24,
|
||||
height: 24,
|
||||
);
|
||||
|
||||
static final provider = AsyncNotifierProvider.family
|
||||
.autoDispose<AvatarController, Uri, String>(AvatarController.new);
|
||||
}
|
||||
|
|
@ -17,6 +17,7 @@ class MembersController extends AsyncNotifier<IList<Event>> {
|
|||
),
|
||||
)
|
||||
.nonNulls
|
||||
.where((member) => member.content["membership"] == "join")
|
||||
.toIList();
|
||||
|
||||
static final provider = AsyncNotifierProvider.family
|
||||
|
|
|
|||
189
lib/controllers/message_controller.dart
Normal file
189
lib/controllers/message_controller.dart
Normal file
|
|
@ -0,0 +1,189 @@
|
|||
import "package:flutter_chat_core/flutter_chat_core.dart";
|
||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||
import "package:nexus/controllers/client_controller.dart";
|
||||
import "package:nexus/controllers/client_state_controller.dart";
|
||||
import "package:nexus/controllers/profile_controller.dart";
|
||||
import "package:nexus/helpers/extensions/mxc_to_https.dart";
|
||||
import "package:nexus/models/message_config.dart";
|
||||
import "package:nexus/models/requests/get_event_request.dart";
|
||||
import "package:nexus/models/requests/get_related_events_request.dart";
|
||||
|
||||
class MessageController extends AsyncNotifier<Message?> {
|
||||
final MessageConfig config;
|
||||
MessageController(this.config);
|
||||
|
||||
@override
|
||||
Future<Message?> build() async {
|
||||
if (config.event.relationType == "m.replace" && !config.includeEdits) {
|
||||
return null;
|
||||
}
|
||||
final client = ref.watch(ClientController.provider.notifier);
|
||||
|
||||
final newEvents = await client.getRelatedEvents(
|
||||
GetRelatedEventsRequest(
|
||||
roomId: config.event.roomId,
|
||||
eventId: config.event.eventId,
|
||||
relationType: "m.replace",
|
||||
),
|
||||
);
|
||||
if (!ref.mounted) return null;
|
||||
final event = newEvents?.lastOrNull ?? config.event;
|
||||
|
||||
final replyId =
|
||||
config.event.content["m.relates_to"]?["m.in_reply_to"]?["event_id"];
|
||||
final replyEvent = replyId == null
|
||||
? null
|
||||
: await client.getEvent(
|
||||
GetEventRequest(roomId: config.event.roomId, eventId: replyId),
|
||||
);
|
||||
|
||||
if (!ref.mounted) return null;
|
||||
|
||||
final author = await ref.read(
|
||||
ProfileController.provider(event.authorId).future,
|
||||
);
|
||||
if (!ref.mounted) return null;
|
||||
|
||||
final content = (event.decrypted ?? event.content);
|
||||
final type = (config.event.decryptedType ?? config.event.type);
|
||||
final newContent = content["m.new_content"] as Map?;
|
||||
final metadata = {
|
||||
"timelineId": event.timelineRowId,
|
||||
"formatted":
|
||||
newContent?["formatted_body"] ??
|
||||
newContent?["body"] ??
|
||||
content["formatted_body"] ??
|
||||
content["body"] ??
|
||||
"",
|
||||
if (replyEvent != null)
|
||||
"reply": await ref.read(
|
||||
MessageController.provider(
|
||||
MessageConfig(event: replyEvent, mustBeText: true),
|
||||
).future,
|
||||
),
|
||||
"body": newContent?["body"] ?? content["body"],
|
||||
"eventType": type,
|
||||
"avatarUrl": author.avatarUrl,
|
||||
"displayName": author.displayName ?? event.authorId,
|
||||
"txnId": config.event.transactionId,
|
||||
};
|
||||
|
||||
if (!ref.mounted) return null;
|
||||
|
||||
final editedAt = event.relationType == "m.replace" ? event.timestamp : null;
|
||||
|
||||
if ((event.redactedBy != null && !config.mustBeText) ||
|
||||
(!config.includeEdits && (config.event.relationType == "m.replace"))) {
|
||||
return null;
|
||||
}
|
||||
|
||||
// TODO: Use server-generated preview if enabled
|
||||
|
||||
// final match = Uri.tryParse(
|
||||
// RegExp(regexLink, caseSensitive: false).firstMatch(body)?.group(0) ?? "",
|
||||
// );
|
||||
|
||||
final asText =
|
||||
Message.text(
|
||||
metadata: metadata,
|
||||
id: config.event.eventId,
|
||||
authorId: event.authorId,
|
||||
text: config.event.redactedBy == null
|
||||
? content["body"] ?? ""
|
||||
: "This message has been deleted...",
|
||||
replyToMessageId: replyId,
|
||||
deliveredAt: config.event.timestamp,
|
||||
editedAt: editedAt,
|
||||
)
|
||||
as TextMessage;
|
||||
|
||||
if (config.mustBeText) return asText;
|
||||
|
||||
final homeserver = ref.read(ClientStateController.provider)?.homeserverUrl;
|
||||
final source = homeserver == null || content["url"] == null
|
||||
? "null"
|
||||
: Uri.parse(content["url"]).mxcToHttps(homeserver).toString();
|
||||
|
||||
return switch (type) {
|
||||
"m.room.encrypted" => asText.copyWith(
|
||||
text: "Unable to decrypt message.",
|
||||
metadata: {...metadata, "formatted": "Unable to decrypt message."},
|
||||
),
|
||||
// "org.matrix.msc3381.poll.start" => Message.custom(
|
||||
// metadata: {
|
||||
// ...metadata,
|
||||
// "poll": event.parsedPollEventContent.pollStartContent,
|
||||
// "responses": event.getPollResponses(timeline),
|
||||
// },
|
||||
// id: eventId,
|
||||
// deliveredAt: originServerTs,
|
||||
// authorId: senderId,
|
||||
// ),
|
||||
("m.sticker" || "m.room.message") => switch (content["msgtype"]) {
|
||||
("m.sticker" || "m.image") => Message.image(
|
||||
id: config.event.eventId,
|
||||
metadata: metadata,
|
||||
authorId: event.authorId,
|
||||
text: event.localContent?.sanitizedHtml,
|
||||
source: source,
|
||||
replyToMessageId: replyId,
|
||||
deliveredAt: config.event.timestamp,
|
||||
blurhash: (content["info"] as Map?)?["xyz.amorgan.blurhash"],
|
||||
),
|
||||
"m.audio" => Message.audio(
|
||||
id: config.event.eventId,
|
||||
metadata: metadata,
|
||||
authorId: event.authorId,
|
||||
text: content["body"],
|
||||
replyToMessageId: replyId,
|
||||
source: source,
|
||||
deliveredAt: config.event.timestamp,
|
||||
// TODO: See if we can figure out duration
|
||||
duration: Duration(hours: 1),
|
||||
),
|
||||
"m.file" => Message.file(
|
||||
name: content["filename"].toString(),
|
||||
metadata: metadata,
|
||||
id: config.event.eventId,
|
||||
authorId: event.authorId,
|
||||
source: source,
|
||||
replyToMessageId: replyId,
|
||||
deliveredAt: config.event.timestamp,
|
||||
),
|
||||
_ => asText,
|
||||
},
|
||||
"m.room.member" => Message.system(
|
||||
metadata: metadata,
|
||||
id: config.event.eventId,
|
||||
authorId: event.authorId,
|
||||
deliveredAt: config.event.timestamp,
|
||||
text:
|
||||
"${content["displayname"] ?? event.stateKey} ${switch (content["membership"]) {
|
||||
"invite" => "was invited to",
|
||||
"join" => "joined",
|
||||
"leave" => "left",
|
||||
"knock" => "asked to join",
|
||||
"ban" => "was banned from",
|
||||
_ => "did something relating to",
|
||||
}} the room.",
|
||||
),
|
||||
"m.room.redaction" => null,
|
||||
_ =>
|
||||
// Turn this on for debugging purposes
|
||||
false
|
||||
// ignore: dead_code
|
||||
? Message.unsupported(
|
||||
metadata: metadata,
|
||||
id: config.event.eventId,
|
||||
authorId: event.authorId,
|
||||
replyToMessageId: replyId,
|
||||
)
|
||||
: null,
|
||||
};
|
||||
}
|
||||
|
||||
static final provider = AsyncNotifierProvider.family
|
||||
.autoDispose<MessageController, Message?, MessageConfig>(
|
||||
MessageController.new,
|
||||
);
|
||||
}
|
||||
25
lib/controllers/messages_controller.dart
Normal file
25
lib/controllers/messages_controller.dart
Normal file
|
|
@ -0,0 +1,25 @@
|
|||
import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
||||
import "package:flutter_chat_core/flutter_chat_core.dart";
|
||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||
import "package:nexus/controllers/message_controller.dart";
|
||||
import "package:nexus/models/event.dart";
|
||||
import "package:nexus/models/message_config.dart";
|
||||
|
||||
class MessagesController extends AsyncNotifier<IList<Message>> {
|
||||
final IList<Event> events;
|
||||
MessagesController(this.events);
|
||||
|
||||
@override
|
||||
Future<IList<Message>> build() async => (await Future.wait(
|
||||
events.map(
|
||||
(event) => ref.watch(
|
||||
MessageController.provider(MessageConfig(event: event)).future,
|
||||
),
|
||||
),
|
||||
)).nonNulls.toIList();
|
||||
|
||||
static final provider = AsyncNotifierProvider.family
|
||||
.autoDispose<MessagesController, IList<Message>, IList<Event>>(
|
||||
MessagesController.new,
|
||||
);
|
||||
}
|
||||
|
|
@ -3,13 +3,14 @@ import "package:fast_immutable_collections/fast_immutable_collections.dart";
|
|||
import "package:flutter_chat_core/flutter_chat_core.dart";
|
||||
import "package:flutter_chat_core/flutter_chat_core.dart" as chat;
|
||||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||
import "package:fluttertagger/fluttertagger.dart" as tagger;
|
||||
import "package:fluttertagger/fluttertagger.dart";
|
||||
import "package:nexus/controllers/client_controller.dart";
|
||||
import "package:nexus/controllers/message_controller.dart";
|
||||
import "package:nexus/controllers/messages_controller.dart";
|
||||
import "package:nexus/controllers/new_events_controller.dart";
|
||||
import "package:nexus/controllers/rooms_controller.dart";
|
||||
import "package:nexus/controllers/selected_room_controller.dart";
|
||||
import "package:nexus/helpers/extensions/event_to_message.dart";
|
||||
import "package:nexus/helpers/extensions/list_to_messages.dart";
|
||||
import "package:nexus/models/message_config.dart";
|
||||
import "package:nexus/models/requests/get_room_state_request.dart";
|
||||
import "package:nexus/models/requests/paginate_request.dart";
|
||||
import "package:nexus/models/requests/redact_event_request.dart";
|
||||
|
|
@ -27,15 +28,19 @@ class RoomChatController extends AsyncNotifier<ChatController> {
|
|||
final room = ref.read(SelectedRoomController.provider);
|
||||
if (room == null) return InMemoryChatController();
|
||||
|
||||
final messages = await room.timeline
|
||||
.map(
|
||||
(timelineRowTuple) => room.events.firstWhereOrNull(
|
||||
(event) => event.rowId == timelineRowTuple.eventRowId,
|
||||
),
|
||||
)
|
||||
.nonNulls
|
||||
.toMessages(ref);
|
||||
final controller = InMemoryChatController(messages: messages);
|
||||
final messages = await ref.watch(
|
||||
MessagesController.provider(
|
||||
room.timeline
|
||||
.map(
|
||||
(timelineRowTuple) => room.events.firstWhereOrNull(
|
||||
(event) => event.rowId == timelineRowTuple.eventRowId,
|
||||
),
|
||||
)
|
||||
.nonNulls
|
||||
.toIList(),
|
||||
).future,
|
||||
);
|
||||
final controller = InMemoryChatController(messages: messages.toList());
|
||||
|
||||
ref.onDispose(
|
||||
ref.listen(NewEventsController.provider(roomId), (_, next) async {
|
||||
|
|
@ -49,7 +54,11 @@ class RoomChatController extends AsyncNotifier<ChatController> {
|
|||
|
||||
await controller.removeMessage(message);
|
||||
} else {
|
||||
final message = await event.toMessage(ref, includeEdits: true);
|
||||
final message = await ref.read(
|
||||
MessageController.provider(
|
||||
MessageConfig(event: event, includeEdits: true),
|
||||
).future,
|
||||
);
|
||||
if (event.relationType == "m.replace") {
|
||||
final controller = await future;
|
||||
final oldMessage = controller.messages.firstWhereOrNull(
|
||||
|
|
@ -180,7 +189,9 @@ class RoomChatController extends AsyncNotifier<ChatController> {
|
|||
const ISet.empty(),
|
||||
);
|
||||
|
||||
final messages = await response.events.reversed.toMessages(ref);
|
||||
final messages = await ref.watch(
|
||||
MessagesController.provider(response.events.reversed).future,
|
||||
);
|
||||
await controller.insertAllMessages(
|
||||
messages
|
||||
.where(
|
||||
|
|
@ -198,7 +209,7 @@ class RoomChatController extends AsyncNotifier<ChatController> {
|
|||
|
||||
Future<void> send(
|
||||
String message, {
|
||||
required Iterable<tagger.Tag> tags,
|
||||
required Iterable<Tag> tags,
|
||||
required RelationType relationType,
|
||||
Message? relation,
|
||||
}) async {
|
||||
|
|
|
|||
|
|
@ -1,22 +0,0 @@
|
|||
import "package:flutter_riverpod/flutter_riverpod.dart";
|
||||
import "package:matrix/matrix.dart";
|
||||
import "package:nexus/controllers/client_controller.dart";
|
||||
import "package:nexus/models/image_data.dart";
|
||||
|
||||
class ThumbnailController extends AsyncNotifier<String?> {
|
||||
ThumbnailController(this.data);
|
||||
final ImageData data;
|
||||
|
||||
@override
|
||||
Future<String?> build({String? from}) async {
|
||||
final client = await ref.watch(ClientController.provider.future);
|
||||
final uri = await Uri.tryParse(data.uri)?.getDownloadUri(client);
|
||||
|
||||
return uri.toString();
|
||||
}
|
||||
|
||||
static final provider = AsyncNotifierProvider.family
|
||||
.autoDispose<ThumbnailController, String?, ImageData>(
|
||||
ThumbnailController.new,
|
||||
);
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue