diff --git a/lib/controllers/chat_events_controller.dart b/lib/controllers/chat_events_controller.dart new file mode 100644 index 0000000..709f55b --- /dev/null +++ b/lib/controllers/chat_events_controller.dart @@ -0,0 +1,129 @@ +import 'package:get/get.dart'; +import 'package:solian/models/channel.dart'; +import 'package:solian/models/event.dart'; +import 'package:solian/platform.dart'; +import 'package:solian/providers/message/helper.dart'; +import 'package:solian/providers/message/events.dart'; + +class ChatEventController { + late final MessageHistoryDb database; + + final RxList currentEvents = RxList.empty(growable: true); + final RxInt totalEvents = 0.obs; + + final RxBool isLoading = false.obs; + + Channel? channel; + String? scope; + + initialize() async { + database = await createHistoryDb(); + currentEvents.clear(); + } + + Future getEvent(int id) async { + if(channel == null || scope == null) return null; + + return await database.getEvent(id, channel!, scope: scope!); + } + + Future getEvents(Channel channel, String scope) async { + this.channel = channel; + this.scope = scope; + + syncLocal(channel); + + isLoading.value = true; + final result = await database.syncEvents( + channel, + scope: scope, + ); + totalEvents.value = result?.$2 ?? 0; + if (!await syncLocal(channel) && result != null) { + currentEvents.addAll(result.$1.map( + (x) => LocalEvent( + x.id, + x, + x.channelId, + x.createdAt, + ), + )); + } + isLoading.value = false; + } + + Future loadEvents(Channel channel, String scope) async { + isLoading.value = true; + final result = await database.syncEvents( + channel, + depth: 3, + scope: scope, + offset: currentEvents.length, + ); + totalEvents.value = result?.$2 ?? 0; + if (!await syncLocal(channel) && result != null) { + currentEvents.addAll(result.$1.map( + (x) => LocalEvent( + x.id, + x, + x.channelId, + x.createdAt, + ), + )); + } + isLoading.value = false; + } + + Future syncLocal(Channel channel) async { + if (PlatformInfo.isWeb) return false; + currentEvents.replaceRange( + 0, + currentEvents.length, + await database.localEvents.findAllByChannel(channel.id), + ); + return true; + } + + receiveEvent(Event remote) async { + final entry = await database.receiveEvent(remote); + + if (remote.channelId != channel?.id) return; + + final idx = currentEvents.indexWhere((x) => x.data.uuid == remote.uuid); + if (idx != -1) { + currentEvents[idx] = entry; + } else { + currentEvents.insert(0, entry); + } + + switch (remote.type) { + case 'messages.edit': + final body = EventMessageBody.fromJson(remote.body); + if (body.relatedEvent != null) { + final idx = + currentEvents.indexWhere((x) => x.data.id == body.relatedEvent); + if (idx != -1) { + currentEvents[idx].data.body = remote.body; + currentEvents[idx].data.updatedAt = remote.updatedAt; + } + } + case 'messages.delete': + final body = EventMessageBody.fromJson(remote.body); + if (body.relatedEvent != null) { + currentEvents.removeWhere((x) => x.id == body.relatedEvent); + } + } + } + + addPendingEvent(Event info) async { + currentEvents.insert( + 0, + LocalEvent( + info.id, + info, + info.channelId, + DateTime.now(), + ), + ); + } +} diff --git a/lib/controllers/chat_history_controller.dart b/lib/controllers/chat_history_controller.dart deleted file mode 100644 index 94b671e..0000000 --- a/lib/controllers/chat_history_controller.dart +++ /dev/null @@ -1,83 +0,0 @@ -import 'package:get/get.dart'; -import 'package:solian/models/channel.dart'; -import 'package:solian/models/message.dart'; -import 'package:solian/providers/message/helper.dart'; -import 'package:solian/providers/message/history.dart'; - -class ChatHistoryController { - late final MessageHistoryDb database; - - final RxList currentHistory = RxList.empty(growable: true); - final RxInt totalHistoryCount = 0.obs; - - final RxBool isLoading = false.obs; - - initialize() async { - database = await createHistoryDb(); - currentHistory.clear(); - } - - Future getMessages(Channel channel, String scope) async { - syncHistory(channel); - - isLoading.value = true; - totalHistoryCount.value = await database.syncMessages( - channel, - scope: scope, - ); - await syncHistory(channel); - isLoading.value = false; - } - - Future getMoreMessages(Channel channel, String scope) async { - isLoading.value = true; - totalHistoryCount.value = await database.syncMessages( - channel, - breath: 3, - scope: scope, - offset: currentHistory.length, - ); - await syncHistory(channel); - isLoading.value = false; - } - - Future syncHistory(Channel channel) async { - currentHistory.replaceRange(0, currentHistory.length, - await database.localMessages.findAllByChannel(channel.id)); - } - - receiveMessage(Message remote) async { - final entry = await database.receiveMessage(remote); - final idx = currentHistory.indexWhere((x) => x.data.uuid == remote.uuid); - if (idx != -1) { - currentHistory[idx] = entry; - } else { - currentHistory.insert(0, entry); - } - } - - addTemporaryMessage(Message info) async { - currentHistory.insert( - 0, - LocalMessage( - info.id, - info, - info.channelId, - ), - ); - } - - void replaceMessage(Message remote) async { - final entry = await database.replaceMessage(remote); - currentHistory.replaceRange( - 0, - currentHistory.length, - currentHistory.map((x) => x.id == entry.id ? entry : x), - ); - } - - void burnMessage(int id) async { - await database.burnMessage(id); - currentHistory.removeWhere((x) => x.id == id); - } -} diff --git a/lib/models/message.dart b/lib/models/event.dart similarity index 67% rename from lib/models/message.dart rename to lib/models/event.dart index 18b736c..f4cd331 100644 --- a/lib/models/message.dart +++ b/lib/models/event.dart @@ -1,59 +1,46 @@ import 'package:solian/models/account.dart'; import 'package:solian/models/channel.dart'; -class Message { +class Event { int id; String uuid; DateTime createdAt; DateTime updatedAt; DateTime? deletedAt; - Map content; + Map body; String type; - List? attachments; Channel? channel; Sender sender; - int? replyId; - Message? replyTo; int channelId; int senderId; - bool isSending = false; + bool isPending = false; - Message({ + Event({ required this.id, required this.uuid, required this.createdAt, required this.updatedAt, this.deletedAt, - required this.content, + required this.body, required this.type, - this.attachments, this.channel, required this.sender, - required this.replyId, - required this.replyTo, required this.channelId, required this.senderId, }); - factory Message.fromJson(Map json) => Message( + factory Event.fromJson(Map json) => Event( id: json['id'], uuid: json['uuid'], createdAt: DateTime.parse(json['created_at']), updatedAt: DateTime.parse(json['updated_at']), deletedAt: json['deleted_at'], - content: json['content'], + body: json['body'], type: json['type'], - attachments: json['attachments'] != null - ? List.from(json['attachments']) - : null, channel: json['channel'] != null ? Channel.fromJson(json['channel']) : null, sender: Sender.fromJson(json['sender']), - replyId: json['reply_id'], - replyTo: json['reply_to'] != null - ? Message.fromJson(json['reply_to']) - : null, channelId: json['channel_id'], senderId: json['sender_id'], ); @@ -64,18 +51,56 @@ class Message { 'created_at': createdAt.toIso8601String(), 'updated_at': updatedAt.toIso8601String(), 'deleted_at': deletedAt, - 'content': content, + 'body': body, 'type': type, - 'attachments': attachments, 'channel': channel?.toJson(), 'sender': sender.toJson(), - 'reply_id': replyId, - 'reply_to': replyTo?.toJson(), 'channel_id': channelId, 'sender_id': senderId, }; } +class EventMessageBody { + String text; + String algorithm; + List? attachments; + int? quoteEvent; + int? relatedEvent; + List? relatedUsers; + + EventMessageBody({ + required this.text, + required this.algorithm, + required this.attachments, + required this.quoteEvent, + required this.relatedEvent, + required this.relatedUsers, + }); + + factory EventMessageBody.fromJson(Map json) => + EventMessageBody( + text: json['text'], + algorithm: json['algorithm'], + attachments: json['attachments'] != null + ? List.from(json['attachments'].map((x) => x)) + : null, + quoteEvent: json['quote_event'], + relatedEvent: json['related_event'], + relatedUsers: json['related_users'] != null + ? List.from(json['related_users'].map((x) => x)) + : null, + ); + + Map toJson() => { + 'text': text, + 'algorithm': algorithm, + 'attachments': attachments?.cast(), + 'quote_event': quoteEvent, + 'related_event': relatedEvent, + 'related_users': relatedUsers?.cast(), + }; +} + class Sender { int id; DateTime createdAt; diff --git a/lib/providers/auth.dart b/lib/providers/auth.dart index e7989fc..d72712c 100644 --- a/lib/providers/auth.dart +++ b/lib/providers/auth.dart @@ -6,7 +6,7 @@ import 'package:flutter/material.dart'; import 'package:flutter_secure_storage/flutter_secure_storage.dart'; import 'package:get/get.dart'; import 'package:get/get_connect/http/src/request/request.dart'; -import 'package:solian/controllers/chat_history_controller.dart'; +import 'package:solian/controllers/chat_events_controller.dart'; import 'package:solian/providers/account.dart'; import 'package:solian/providers/chat.dart'; import 'package:solian/services.dart'; @@ -136,9 +136,9 @@ class AuthProvider extends GetConnect { Get.find().notifications.clear(); Get.find().notificationUnread.value = 0; - final chatHistory = ChatHistoryController(); + final chatHistory = ChatEventController(); chatHistory.initialize().then((_) async { - await chatHistory.database.localMessages.wipeLocalMessages(); + await chatHistory.database.localEvents.wipeLocalEvents(); }); storage.deleteAll(); diff --git a/lib/providers/message/events.dart b/lib/providers/message/events.dart new file mode 100644 index 0000000..fb7928e --- /dev/null +++ b/lib/providers/message/events.dart @@ -0,0 +1,83 @@ +import 'dart:async'; +import 'dart:convert'; +import 'package:floor/floor.dart'; +import 'package:solian/models/event.dart'; +import 'package:sqflite/sqflite.dart' as sqflite; + +part 'events.g.dart'; + +@entity +class LocalEvent { + @primaryKey + final int id; + + final Event data; + final int channelId; + + final DateTime createdAt; + + LocalEvent(this.id, this.data, this.channelId, this.createdAt); +} + +class DateTimeConverter extends TypeConverter { + @override + DateTime decode(int databaseValue) { + return DateTime.fromMillisecondsSinceEpoch(databaseValue); + } + + @override + int encode(DateTime value) { + return value.millisecondsSinceEpoch; + } +} + +class RemoteEventConverter extends TypeConverter { + @override + Event decode(String databaseValue) { + return Event.fromJson(jsonDecode(databaseValue)); + } + + @override + String encode(Event value) { + return jsonEncode(value.toJson()); + } +} + +@dao +abstract class LocalEventDao { + @Query('SELECT COUNT(id) FROM LocalEvent WHERE channelId = :channelId') + Future countByChannel(int channelId); + + @Query('SELECT * FROM LocalEvent WHERE id = :id') + Future findById(int id); + + @Query('SELECT * FROM LocalEvent WHERE channelId = :channelId ORDER BY createdAt DESC') + Future> findAllByChannel(int channelId); + + @Query('SELECT * FROM LocalEvent WHERE channelId = :channelId ORDER BY createdAt DESC LIMIT 1') + Future findLastByChannel(int channelId); + + @Insert(onConflict: OnConflictStrategy.replace) + Future insert(LocalEvent m); + + @Insert(onConflict: OnConflictStrategy.replace) + Future insertBulk(List m); + + @Update(onConflict: OnConflictStrategy.replace) + Future update(LocalEvent m); + + @Query('DELETE FROM LocalEvent WHERE id = :id') + Future delete(int id); + + @Query('DELETE FROM LocalEvent WHERE channelId = :channelId') + Future> deleteByChannel(int channelId); + + @Query('DELETE FROM LocalEvent') + Future wipeLocalEvents(); +} + +@TypeConverters([DateTimeConverter, RemoteEventConverter]) +@Database(version: 2, entities: [LocalEvent]) +abstract class MessageHistoryDb extends FloorDatabase { + LocalEventDao get localEvents; +} diff --git a/lib/providers/message/history.g.dart b/lib/providers/message/events.g.dart similarity index 56% rename from lib/providers/message/history.g.dart rename to lib/providers/message/events.g.dart index d5e04d4..09b2b9d 100644 --- a/lib/providers/message/history.g.dart +++ b/lib/providers/message/events.g.dart @@ -1,6 +1,6 @@ // GENERATED CODE - DO NOT MODIFY BY HAND -part of 'history.dart'; +part of 'events.dart'; // ************************************************************************** // FloorGenerator @@ -72,7 +72,7 @@ class _$MessageHistoryDb extends MessageHistoryDb { changeListener = listener ?? StreamController.broadcast(); } - LocalMessageDao? _localMessagesInstance; + LocalEventDao? _localEventsInstance; Future open( String path, @@ -80,7 +80,7 @@ class _$MessageHistoryDb extends MessageHistoryDb { Callback? callback, ]) async { final databaseOptions = sqflite.OpenDatabaseOptions( - version: 1, + version: 2, onConfigure: (database) async { await database.execute('PRAGMA foreign_keys = ON'); await callback?.onConfigure?.call(database); @@ -96,7 +96,7 @@ class _$MessageHistoryDb extends MessageHistoryDb { }, onCreate: (database, version) async { await database.execute( - 'CREATE TABLE IF NOT EXISTS `LocalMessage` (`id` INTEGER NOT NULL, `data` TEXT NOT NULL, `channelId` INTEGER NOT NULL, PRIMARY KEY (`id`))'); + 'CREATE TABLE IF NOT EXISTS `LocalEvent` (`id` INTEGER NOT NULL, `data` TEXT NOT NULL, `channelId` INTEGER NOT NULL, `createdAt` INTEGER NOT NULL, PRIMARY KEY (`id`))'); await callback?.onCreate?.call(database, version); }, @@ -105,33 +105,34 @@ class _$MessageHistoryDb extends MessageHistoryDb { } @override - LocalMessageDao get localMessages { - return _localMessagesInstance ??= - _$LocalMessageDao(database, changeListener); + LocalEventDao get localEvents { + return _localEventsInstance ??= _$LocalEventDao(database, changeListener); } } -class _$LocalMessageDao extends LocalMessageDao { - _$LocalMessageDao( +class _$LocalEventDao extends LocalEventDao { + _$LocalEventDao( this.database, this.changeListener, ) : _queryAdapter = QueryAdapter(database), - _localMessageInsertionAdapter = InsertionAdapter( + _localEventInsertionAdapter = InsertionAdapter( database, - 'LocalMessage', - (LocalMessage item) => { + 'LocalEvent', + (LocalEvent item) => { 'id': item.id, - 'data': _remoteMessageConverter.encode(item.data), - 'channelId': item.channelId + 'data': _remoteEventConverter.encode(item.data), + 'channelId': item.channelId, + 'createdAt': _dateTimeConverter.encode(item.createdAt) }), - _localMessageUpdateAdapter = UpdateAdapter( + _localEventUpdateAdapter = UpdateAdapter( database, - 'LocalMessage', + 'LocalEvent', ['id'], - (LocalMessage item) => { + (LocalEvent item) => { 'id': item.id, - 'data': _remoteMessageConverter.encode(item.data), - 'channelId': item.channelId + 'data': _remoteEventConverter.encode(item.data), + 'channelId': item.channelId, + 'createdAt': _dateTimeConverter.encode(item.createdAt) }); final sqflite.DatabaseExecutor database; @@ -140,75 +141,88 @@ class _$LocalMessageDao extends LocalMessageDao { final QueryAdapter _queryAdapter; - final InsertionAdapter _localMessageInsertionAdapter; + final InsertionAdapter _localEventInsertionAdapter; - final UpdateAdapter _localMessageUpdateAdapter; + final UpdateAdapter _localEventUpdateAdapter; @override Future countByChannel(int channelId) async { return _queryAdapter.query( - 'SELECT COUNT(id) FROM LocalMessage WHERE channelId = ?1', + 'SELECT COUNT(id) FROM LocalEvent WHERE channelId = ?1', mapper: (Map row) => row.values.first as int, arguments: [channelId]); } @override - Future> findAllByChannel(int channelId) async { - return _queryAdapter.queryList( - 'SELECT * FROM LocalMessage WHERE channelId = ?1 ORDER BY id DESC', - mapper: (Map row) => LocalMessage( + Future findById(int id) async { + return _queryAdapter.query('SELECT * FROM LocalEvent WHERE id = ?1', + mapper: (Map row) => LocalEvent( row['id'] as int, - _remoteMessageConverter.decode(row['data'] as String), - row['channelId'] as int), + _remoteEventConverter.decode(row['data'] as String), + row['channelId'] as int, + _dateTimeConverter.decode(row['createdAt'] as int)), + arguments: [id]); + } + + @override + Future> findAllByChannel(int channelId) async { + return _queryAdapter.queryList( + 'SELECT * FROM LocalEvent WHERE channelId = ?1 ORDER BY createdAt DESC', + mapper: (Map row) => LocalEvent( + row['id'] as int, + _remoteEventConverter.decode(row['data'] as String), + row['channelId'] as int, + _dateTimeConverter.decode(row['createdAt'] as int)), arguments: [channelId]); } @override - Future findLastByChannel(int channelId) async { + Future findLastByChannel(int channelId) async { return _queryAdapter.query( - 'SELECT * FROM LocalMessage WHERE channelId = ?1 ORDER BY id DESC LIMIT 1', - mapper: (Map row) => LocalMessage(row['id'] as int, _remoteMessageConverter.decode(row['data'] as String), row['channelId'] as int), + 'SELECT * FROM LocalEvent WHERE channelId = ?1 ORDER BY createdAt DESC LIMIT 1', + mapper: (Map row) => LocalEvent(row['id'] as int, _remoteEventConverter.decode(row['data'] as String), row['channelId'] as int, _dateTimeConverter.decode(row['createdAt'] as int)), arguments: [channelId]); } @override Future delete(int id) async { - await _queryAdapter.queryNoReturn('DELETE FROM LocalMessage WHERE id = ?1', - arguments: [id]); + await _queryAdapter + .queryNoReturn('DELETE FROM LocalEvent WHERE id = ?1', arguments: [id]); } @override - Future> deleteByChannel(int channelId) async { + Future> deleteByChannel(int channelId) async { return _queryAdapter.queryList( - 'DELETE FROM LocalMessage WHERE channelId = ?1', - mapper: (Map row) => LocalMessage( + 'DELETE FROM LocalEvent WHERE channelId = ?1', + mapper: (Map row) => LocalEvent( row['id'] as int, - _remoteMessageConverter.decode(row['data'] as String), - row['channelId'] as int), + _remoteEventConverter.decode(row['data'] as String), + row['channelId'] as int, + _dateTimeConverter.decode(row['createdAt'] as int)), arguments: [channelId]); } @override - Future wipeLocalMessages() async { - await _queryAdapter.queryNoReturn('DELETE FROM LocalMessage'); + Future wipeLocalEvents() async { + await _queryAdapter.queryNoReturn('DELETE FROM LocalEvent'); } @override - Future insert(LocalMessage m) async { - await _localMessageInsertionAdapter.insert(m, OnConflictStrategy.replace); + Future insert(LocalEvent m) async { + await _localEventInsertionAdapter.insert(m, OnConflictStrategy.replace); } @override - Future insertBulk(List m) async { - await _localMessageInsertionAdapter.insertList( - m, OnConflictStrategy.replace); + Future insertBulk(List m) async { + await _localEventInsertionAdapter.insertList(m, OnConflictStrategy.replace); } @override - Future update(LocalMessage person) async { - await _localMessageUpdateAdapter.update(person, OnConflictStrategy.replace); + Future update(LocalEvent m) async { + await _localEventUpdateAdapter.update(m, OnConflictStrategy.replace); } } // ignore_for_file: unused_element -final _remoteMessageConverter = RemoteMessageConverter(); +final _dateTimeConverter = DateTimeConverter(); +final _remoteEventConverter = RemoteEventConverter(); diff --git a/lib/providers/message/helper.dart b/lib/providers/message/helper.dart index 4404f79..af97d9b 100644 --- a/lib/providers/message/helper.dart +++ b/lib/providers/message/helper.dart @@ -1,71 +1,114 @@ +import 'package:floor/floor.dart'; import 'package:get/get.dart'; import 'package:solian/models/channel.dart'; -import 'package:solian/models/message.dart'; +import 'package:solian/models/event.dart'; import 'package:solian/models/pagination.dart'; +import 'package:solian/platform.dart'; import 'package:solian/providers/auth.dart'; -import 'package:solian/providers/message/history.dart'; +import 'package:solian/providers/message/events.dart'; Future createHistoryDb() async { + final migration1to2 = Migration(1, 2, (database) async { + await database.execute('DROP TABLE IF EXISTS LocalMessage'); + }); + return await $FloorMessageHistoryDb .databaseBuilder('messaging_data.dart') - .build(); + .addMigrations([migration1to2]).build(); } extension MessageHistoryHelper on MessageHistoryDb { - receiveMessage(Message remote) async { - final entry = LocalMessage( + Future receiveEvent(Event remote) async { + final entry = LocalEvent( remote.id, remote, remote.channelId, + remote.createdAt, ); - await localMessages.insert(entry); + await localEvents.insert(entry); + switch (remote.type) { + case 'messages.edit': + final body = EventMessageBody.fromJson(remote.body); + if (body.relatedEvent != null) { + final target = await localEvents.findById(body.relatedEvent!); + if (target != null) { + target.data.body = remote.body; + target.data.updatedAt = remote.updatedAt; + await localEvents.update(target); + } + } + case 'messages.delete': + final body = EventMessageBody.fromJson(remote.body); + if (body.relatedEvent != null) { + await localEvents.delete(body.relatedEvent!); + } + } return entry; } - replaceMessage(Message remote) async { - final entry = LocalMessage( - remote.id, - remote, - remote.channelId, - ); - await localMessages.update(entry); - return entry; + Future getEvent(int id, Channel channel, + {String scope = 'global'}) async { + final localRecord = await localEvents.findById(id); + if (localRecord != null) return localRecord; + + final remoteRecord = await _getRemoteEvent(id, channel, scope); + if (remoteRecord == null) return null; + + return await receiveEvent(remoteRecord); } - burnMessage(int id) async { - await localMessages.delete(id); - } + Future<(List, int)?> syncEvents(Channel channel, + {String scope = 'global', depth = 10, offset = 0}) async { + final lastOne = await localEvents.findLastByChannel(channel.id); - syncMessages(Channel channel, {String scope = 'global', breath = 10, offset = 0}) async { - final lastOne = await localMessages.findLastByChannel(channel.id); - - final data = await _getRemoteMessages( + final data = await _getRemoteEvents( channel, scope, - remainBreath: breath, + remainDepth: depth, offset: offset, onBrake: (items) { return items.any((x) => x.id == lastOne?.id); }, ); - if (data != null) { - await localMessages.insertBulk( - data.$1.map((x) => LocalMessage(x.id, x, x.channelId)).toList(), + if (data != null && !PlatformInfo.isWeb) { + await localEvents.insertBulk( + data.$1 + .map((x) => LocalEvent(x.id, x, x.channelId, x.createdAt)) + .toList(), ); } - return data?.$2 ?? 0; + return data; } - Future<(List, int)?> _getRemoteMessages( + Future _getRemoteEvent(int id, Channel channel, String scope) async { + final AuthProvider auth = Get.find(); + if (!await auth.isAuthorized) return null; + + final client = auth.configureClient('messaging'); + + final resp = await client.get( + '/api/channels/$scope/${channel.alias}/events/$id', + ); + + if (resp.statusCode == 404) { + return null; + } else if (resp.statusCode != 200) { + throw Exception(resp.bodyString); + } + + return Event.fromJson(resp.body); + } + + Future<(List, int)?> _getRemoteEvents( Channel channel, String scope, { - required int remainBreath, - bool Function(List items)? onBrake, + required int remainDepth, + bool Function(List items)? onBrake, take = 10, offset = 0, }) async { - if (remainBreath <= 0) { + if (remainDepth <= 0) { return null; } @@ -75,7 +118,8 @@ extension MessageHistoryHelper on MessageHistoryDb { final client = auth.configureClient('messaging'); final resp = await client.get( - '/api/channels/$scope/${channel.alias}/messages?take=$take&offset=$offset'); + '/api/channels/$scope/${channel.alias}/events?take=$take&offset=$offset', + ); if (resp.statusCode != 200) { throw Exception(resp.bodyString); @@ -83,16 +127,16 @@ extension MessageHistoryHelper on MessageHistoryDb { final PaginationResult response = PaginationResult.fromJson(resp.body); final result = - response.data?.map((e) => Message.fromJson(e)).toList() ?? List.empty(); + response.data?.map((e) => Event.fromJson(e)).toList() ?? List.empty(); if (onBrake != null && onBrake(result)) { return (result, response.count); } - final expandResult = (await _getRemoteMessages( + final expandResult = (await _getRemoteEvents( channel, scope, - remainBreath: remainBreath - 1, + remainDepth: remainDepth - 1, take: take, offset: offset + result.length, )) @@ -102,7 +146,7 @@ extension MessageHistoryHelper on MessageHistoryDb { return ([...result, ...expandResult], response.count); } - Future> listMessages(Channel channel) async { - return await localMessages.findAllByChannel(channel.id); + Future> listMessages(Channel channel) async { + return await localEvents.findAllByChannel(channel.id); } } diff --git a/lib/providers/message/history.dart b/lib/providers/message/history.dart deleted file mode 100644 index c28ebaa..0000000 --- a/lib/providers/message/history.dart +++ /dev/null @@ -1,66 +0,0 @@ -import 'dart:async'; -import 'dart:convert'; -import 'package:floor/floor.dart'; -import 'package:solian/models/message.dart'; -import 'package:sqflite/sqflite.dart' as sqflite; - -part 'history.g.dart'; - -@entity -class LocalMessage { - @primaryKey - final int id; - - final Message data; - final int channelId; - - LocalMessage(this.id, this.data, this.channelId); -} - -class RemoteMessageConverter extends TypeConverter { - @override - Message decode(String databaseValue) { - return Message.fromJson(jsonDecode(databaseValue)); - } - - @override - String encode(Message value) { - return jsonEncode(value.toJson()); - } -} - -@dao -abstract class LocalMessageDao { - @Query('SELECT COUNT(id) FROM LocalMessage WHERE channelId = :channelId') - Future countByChannel(int channelId); - - @Query('SELECT * FROM LocalMessage WHERE channelId = :channelId ORDER BY id DESC') - Future> findAllByChannel(int channelId); - - @Query('SELECT * FROM LocalMessage WHERE channelId = :channelId ORDER BY id DESC LIMIT 1') - Future findLastByChannel(int channelId); - - @Insert(onConflict: OnConflictStrategy.replace) - Future insert(LocalMessage m); - - @Insert(onConflict: OnConflictStrategy.replace) - Future insertBulk(List m); - - @Update(onConflict: OnConflictStrategy.replace) - Future update(LocalMessage person); - - @Query('DELETE FROM LocalMessage WHERE id = :id') - Future delete(int id); - - @Query('DELETE FROM LocalMessage WHERE channelId = :channelId') - Future> deleteByChannel(int channelId); - - @Query('DELETE FROM LocalMessage') - Future wipeLocalMessages(); -} - -@TypeConverters([RemoteMessageConverter]) -@Database(version: 1, entities: [LocalMessage]) -abstract class MessageHistoryDb extends FloorDatabase { - LocalMessageDao get localMessages; -} diff --git a/lib/screens/channel/channel_chat.dart b/lib/screens/channel/channel_chat.dart index d756a79..9be61ed 100644 --- a/lib/screens/channel/channel_chat.dart +++ b/lib/screens/channel/channel_chat.dart @@ -4,11 +4,11 @@ import 'dart:ui'; import 'package:flutter/material.dart'; import 'package:flutter_animate/flutter_animate.dart'; import 'package:get/get.dart'; -import 'package:solian/controllers/chat_history_controller.dart'; +import 'package:solian/controllers/chat_events_controller.dart'; import 'package:solian/exts.dart'; import 'package:solian/models/call.dart'; import 'package:solian/models/channel.dart'; -import 'package:solian/models/message.dart'; +import 'package:solian/models/event.dart'; import 'package:solian/models/packet.dart'; import 'package:solian/providers/auth.dart'; import 'package:solian/providers/chat.dart'; @@ -20,8 +20,8 @@ import 'package:solian/theme.dart'; import 'package:solian/widgets/app_bar_title.dart'; import 'package:solian/widgets/chat/call/call_prejoin.dart'; import 'package:solian/widgets/chat/call/chat_call_action.dart'; -import 'package:solian/widgets/chat/chat_message.dart'; -import 'package:solian/widgets/chat/chat_message_action.dart'; +import 'package:solian/widgets/chat/chat_event.dart'; +import 'package:solian/widgets/chat/chat_event_action.dart'; import 'package:solian/widgets/chat/chat_message_input.dart'; import 'package:solian/widgets/current_state_action.dart'; @@ -50,7 +50,7 @@ class _ChannelChatScreenState extends State { ChannelMember? _channelProfile; StreamSubscription? _subscription; - late final ChatHistoryController _chatController; + late final ChatEventController _chatController; getProfile() async { final AuthProvider auth = Get.find(); @@ -109,37 +109,22 @@ class _ChannelChatScreenState extends State { final ChatProvider provider = Get.find(); _subscription = provider.stream.stream.listen((event) { switch (event.method) { - case 'messages.new': - final payload = Message.fromJson(event.payload!); - if (payload.channelId == _channel?.id) { - _chatController.receiveMessage(payload); - } - break; - case 'messages.update': - final payload = Message.fromJson(event.payload!); - if (payload.channelId == _channel?.id) { - _chatController.replaceMessage(payload); - } - break; - case 'messages.burnt': - final payload = Message.fromJson(event.payload!); - if (payload.channelId == _channel?.id) { - _chatController.burnMessage(payload.id); - } + case 'events.new': + final payload = Event.fromJson(event.payload!); + _chatController.receiveEvent(payload); break; case 'calls.new': final payload = Call.fromJson(event.payload!); - _ongoingCall = payload; + setState(() => _ongoingCall = payload); break; case 'calls.end': - _ongoingCall = null; + setState(() => _ongoingCall = null); break; } }); } - bool checkMessageMergeable(Message? a, Message? b) { - if (a?.replyTo != null) return false; + bool checkMessageMergeable(Event? a, Event? b) { if (a == null || b == null) return false; if (a.sender.account.id != b.sender.account.id) return false; return a.createdAt.difference(b.createdAt).inMinutes <= 3; @@ -156,31 +141,15 @@ class _ChannelChatScreenState extends State { ); } - Message? _messageToReplying; - Message? _messageToEditing; + Event? _messageToReplying; + Event? _messageToEditing; - Widget buildHistoryBody(Message item, {bool isMerged = false}) { - if (item.replyTo != null) { - return Column( - children: [ - ChatMessage( - key: Key('m${item.replyTo!.uuid}'), - item: item.replyTo!, - isReply: true, - ).paddingOnly(left: 24, right: 4, bottom: 2), - ChatMessage( - key: Key('m${item.uuid}'), - item: item, - isMerged: isMerged, - ), - ], - ); - } - - return ChatMessage( + Widget buildHistoryBody(Event item, {bool isMerged = false}) { + return ChatEvent( key: Key('m${item.uuid}'), item: item, isMerged: isMerged, + chatController: _chatController, ); } @@ -188,18 +157,18 @@ class _ChannelChatScreenState extends State { bool isMerged = false, hasMerged = false; if (index > 0) { hasMerged = checkMessageMergeable( - _chatController.currentHistory[index - 1].data, - _chatController.currentHistory[index].data, + _chatController.currentEvents[index - 1].data, + _chatController.currentEvents[index].data, ); } - if (index + 1 < _chatController.currentHistory.length) { + if (index + 1 < _chatController.currentEvents.length) { isMerged = checkMessageMergeable( - _chatController.currentHistory[index].data, - _chatController.currentHistory[index + 1].data, + _chatController.currentEvents[index].data, + _chatController.currentEvents[index + 1].data, ); } - final item = _chatController.currentHistory[index].data; + final item = _chatController.currentEvents[index].data; return InkWell( child: Container( @@ -212,7 +181,7 @@ class _ChannelChatScreenState extends State { showModalBottomSheet( useRootNavigator: true, context: context, - builder: (context) => ChatMessageAction( + builder: (context) => ChatEventAction( channel: _channel!, realm: _channel!.realm, item: item, @@ -230,18 +199,18 @@ class _ChannelChatScreenState extends State { @override void initState() { - _chatController = ChatHistoryController(); + _chatController = ChatEventController(); _chatController.initialize(); getChannel().then((_) { - _chatController.getMessages(_channel!, widget.realm); + _chatController.getEvents(_channel!, widget.realm); + + listenMessages(); }); getProfile(); getOngoingCall(); - listenMessages(); - super.initState(); } @@ -325,13 +294,13 @@ class _ChannelChatScreenState extends State { Obx(() { return SliverList.builder( key: Key('chat-history#${_channel!.id}'), - itemCount: _chatController.currentHistory.length, + itemCount: _chatController.currentEvents.length, itemBuilder: buildHistory, ); }), Obx(() { - final amount = _chatController.totalHistoryCount - - _chatController.currentHistory.length; + final amount = _chatController.totalEvents - + _chatController.currentEvents.length; if (amount.value <= 0 || _chatController.isLoading.isTrue) { @@ -348,7 +317,7 @@ class _ChannelChatScreenState extends State { 'count': amount.string, })), onTap: () { - _chatController.getMoreMessages( + _chatController.loadEvents( _channel!, widget.realm, ); @@ -378,9 +347,9 @@ class _ChannelChatScreenState extends State { realm: widget.realm, placeholder: placeholder, channel: _channel!, - onSent: (Message item) { + onSent: (Event item) { setState(() { - _chatController.addTemporaryMessage(item); + _chatController.addPendingEvent(item); }); }, onReset: () { diff --git a/lib/services.dart b/lib/services.dart index 97b49da..73351b5 100644 --- a/lib/services.dart +++ b/lib/services.dart @@ -1,7 +1,7 @@ import 'package:get/get.dart'; abstract class ServiceFinder { - static const bool devFlag = false; + static const bool devFlag = true; static Map services = { 'paperclip': diff --git a/lib/translations.dart b/lib/translations.dart index 52717fc..d7f313b 100644 --- a/lib/translations.dart +++ b/lib/translations.dart @@ -166,8 +166,11 @@ class SolianMessages extends Translations { 'channelNotifyLevelApplied': 'Your notification settings has been applied.', 'messageUnsync': 'Messages Un-synced', 'messageUnsyncCaption': '@count message(s) still in un-synced.', - 'messageDecoding': 'Decoding...', - 'messageDecodeFailed': 'Unable to decode: @message', + 'messageEditDesc': 'Edited message @id', + 'messageDeleteDesc': 'Deleted message @id', + 'messageCallStartDesc': '@user starts a call', + 'messageCallEndDesc': 'Call last for @duration', + 'messageTypeUnsupported': 'Unsupported Message: @type', 'messageInputPlaceholder': 'Message @channel', 'messageActionList': 'Actions of Message', 'messageDeletionConfirm': 'Confirm message deletion', @@ -382,8 +385,11 @@ class SolianMessages extends Translations { 'messageUnsync': '消息未同步', 'messageUnsyncCaption': '还有 @count 条消息未同步', 'messageDecoding': '解码信息中…', - 'messageDecodeFailed': '解码信息失败：@message', - 'messageInputPlaceholder': '在 @channel 发信息', + 'messageEditDesc': '修改了消息 @id', + 'messageDeleteDesc': '删除了消息 @id', + 'messageCallStartDesc': '@user 发起了一次童话', + 'messageCallEndDesc': '通话持续了 @duration', + 'messageTypeUnsupported': '不支持的消息类型 @type', 'messageActionList': '消息的操作', 'messageDeletionConfirm': '确认删除消息', 'messageDeletionConfirmCaption': '你确定要删除消息 @id 吗？该操作不可撤销。', diff --git a/lib/widgets/chat/chat_event.dart b/lib/widgets/chat/chat_event.dart new file mode 100644 index 0000000..d3ddbba --- /dev/null +++ b/lib/widgets/chat/chat_event.dart @@ -0,0 +1,221 @@ +import 'package:flutter/material.dart'; +import 'package:font_awesome_flutter/font_awesome_flutter.dart'; +import 'package:get/get.dart'; +import 'package:solian/controllers/chat_events_controller.dart'; +import 'package:solian/models/event.dart'; +import 'package:solian/widgets/account/account_avatar.dart'; +import 'package:solian/widgets/account/account_profile_popup.dart'; +import 'package:solian/widgets/chat/chat_event_action_log.dart'; +import 'package:solian/widgets/chat/chat_event_message.dart'; +import 'package:timeago/timeago.dart' show format; + +class ChatEvent extends StatelessWidget { + final Event item; + final bool isContentPreviewing; + final bool isQuote; + final bool isMerged; + final bool isHasMerged; + + final ChatEventController? chatController; + + const ChatEvent({ + super.key, + required this.item, + this.isContentPreviewing = false, + this.isMerged = false, + this.isHasMerged = false, + this.isQuote = false, + this.chatController, + }); + + String _formatDuration(Duration duration) { + String negativeSign = duration.isNegative ? '-' : ''; + String twoDigits(int n) => n.toString().padLeft(2, '0'); + String twoDigitMinutes = twoDigits(duration.inMinutes.remainder(60).abs()); + String twoDigitSeconds = twoDigits(duration.inSeconds.remainder(60).abs()); + return '$negativeSign${twoDigits(duration.inHours)}:$twoDigitMinutes:$twoDigitSeconds'; + } + + Widget buildQuote() { + return FutureBuilder( + future: chatController!.getEvent( + item.body['quote_event'], + ), + builder: (context, snapshot) { + if (!snapshot.hasData || snapshot.data == null) { + return const SizedBox(); + } + + return ChatEvent( + item: snapshot.data!.data, + isMerged: false, + isQuote: true, + ).paddingOnly(left: isMerged ? 52 : 0); + }, + ); + } + + Widget buildContent() { + switch (item.type) { + case 'messages.new': + return ChatEventMessage( + item: item, + isContentPreviewing: isContentPreviewing, + isMerged: isMerged, + isHasMerged: isHasMerged, + isQuote: isQuote, + ); + case 'messages.edit': + return ChatEventMessageActionLog( + icon: const Icon(Icons.edit_note, size: 16), + text: 'messageEditDesc'.trParams({'id': '#${item.id}'}), + isMerged: isMerged, + isHasMerged: isHasMerged, + isQuote: isQuote, + ); + case 'messages.delete': + return ChatEventMessageActionLog( + icon: const Icon(Icons.cancel_schedule_send, size: 16), + text: 'messageDeleteDesc'.trParams({'id': '#${item.id}'}), + isMerged: isMerged, + isHasMerged: isHasMerged, + isQuote: isQuote, + ); + case 'calls.start': + return ChatEventMessageActionLog( + icon: const Icon(Icons.call_made, size: 16), + text: 'messageCallStartDesc' + .trParams({'user': '@${item.sender.account.name}'}), + isMerged: isMerged, + isHasMerged: isHasMerged, + isQuote: isQuote, + ); + case 'calls.end': + return ChatEventMessageActionLog( + icon: const Icon(Icons.call_received, size: 16), + text: 'messageCallEndDesc'.trParams({ + 'duration': _formatDuration( + Duration(milliseconds: item.body['last']), + ), + }), + isMerged: isMerged, + isHasMerged: isHasMerged, + isQuote: isQuote, + ); + case 'system.changes': + return ChatEventMessageActionLog( + icon: const Icon(Icons.manage_history, size: 16), + text: item.body['text'], + isMerged: isMerged, + isHasMerged: isHasMerged, + isQuote: isQuote, + ); + default: + return ChatEventMessageActionLog( + icon: const Icon(Icons.error, size: 16), + text: 'messageTypeUnsupported'.trParams({'type': item.type}), + isMerged: isMerged, + isHasMerged: isHasMerged, + isQuote: isQuote, + ); + } + } + + Widget buildBody(BuildContext context) { + if (isContentPreviewing || (isMerged && !isQuote)) { + return Column( + children: [ + if (item.body['quote_event'] != null && chatController != null) + buildQuote(), + buildContent(), + ], + ); + } else if (isQuote) { + return Card( + child: Row( + crossAxisAlignment: CrossAxisAlignment.end, + children: [ + const Opacity( + opacity: 0.75, + child: FaIcon(FontAwesomeIcons.quoteLeft, size: 14), + ).paddingOnly(bottom: 2.75), + const SizedBox(width: 4), + Expanded( + child: Column( + mainAxisAlignment: MainAxisAlignment.start, + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + AccountAvatar( + content: item.sender.account.avatar, radius: 9), + const SizedBox(width: 5), + Text( + item.sender.account.nick, + style: const TextStyle(fontWeight: FontWeight.bold), + ), + const SizedBox(width: 4), + Text(format(item.createdAt, locale: 'en_short')), + ], + ), + buildContent().paddingOnly(left: 0.5), + ], + ), + ), + ], + ).paddingOnly(left: 12, right: 12, top: 8, bottom: 4), + ).paddingOnly(left: isMerged ? 52 : 0, right: 4); + } else { + return Column( + key: Key('m${item.uuid}'), + children: [ + Row( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + GestureDetector( + child: AccountAvatar(content: item.sender.account.avatar), + onTap: () { + showModalBottomSheet( + useRootNavigator: true, + isScrollControlled: true, + backgroundColor: Theme.of(context).colorScheme.surface, + context: context, + builder: (context) => AccountProfilePopup( + account: item.sender.account, + ), + ); + }, + ), + Expanded( + child: Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + Row( + children: [ + Text( + item.sender.account.nick, + style: const TextStyle(fontWeight: FontWeight.bold), + ), + const SizedBox(width: 4), + Text(format(item.createdAt, locale: 'en_short')) + ], + ).paddingSymmetric(horizontal: 12), + if (item.body['quote_event'] != null && + chatController != null) + buildQuote(), + buildContent(), + ], + ), + ), + ], + ).paddingSymmetric(horizontal: 12), + ], + ); + } + } + + @override + Widget build(BuildContext context) { + return buildBody(context); + } +} diff --git a/lib/widgets/chat/chat_message_action.dart b/lib/widgets/chat/chat_event_action.dart similarity index 89% rename from lib/widgets/chat/chat_message_action.dart rename to lib/widgets/chat/chat_event_action.dart index 31678b3..e095106 100644 --- a/lib/widgets/chat/chat_message_action.dart +++ b/lib/widgets/chat/chat_event_action.dart @@ -3,19 +3,19 @@ import 'package:flutter_animate/flutter_animate.dart'; import 'package:font_awesome_flutter/font_awesome_flutter.dart'; import 'package:get/get.dart'; import 'package:solian/models/channel.dart'; -import 'package:solian/models/message.dart'; +import 'package:solian/models/event.dart'; import 'package:solian/models/realm.dart'; import 'package:solian/providers/auth.dart'; -import 'package:solian/widgets/chat/chat_message_deletion.dart'; +import 'package:solian/widgets/chat/chat_event_deletion.dart'; -class ChatMessageAction extends StatefulWidget { +class ChatEventAction extends StatefulWidget { final Channel channel; final Realm? realm; - final Message item; + final Event item; final Function? onEdit; final Function? onReply; - const ChatMessageAction({ + const ChatEventAction({ super.key, required this.channel, required this.realm, @@ -25,14 +25,16 @@ class ChatMessageAction extends StatefulWidget { }); @override - State createState() => _ChatMessageActionState(); + State createState() => _ChatEventActionState(); } -class _ChatMessageActionState extends State { +class _ChatEventActionState extends State { bool _isBusy = false; bool _canModifyContent = false; void checkAbleToModifyContent() async { + if (!['messages.new'].contains(widget.item.type)) return; + final AuthProvider provider = Get.find(); if (!await provider.isAuthorized) return; @@ -106,7 +108,7 @@ class _ChatMessageActionState extends State { onTap: () async { final value = await showDialog( context: context, - builder: (context) => ChatMessageDeletionDialog( + builder: (context) => ChatEventDeletionDialog( channel: widget.channel, realm: widget.realm, item: widget.item, diff --git a/lib/widgets/chat/chat_event_action_log.dart b/lib/widgets/chat/chat_event_action_log.dart new file mode 100644 index 0000000..913a132 --- /dev/null +++ b/lib/widgets/chat/chat_event_action_log.dart @@ -0,0 +1,38 @@ +import 'package:flutter/material.dart'; +import 'package:get/get.dart'; + +class ChatEventMessageActionLog extends StatelessWidget { + final Widget icon; + final String text; + final bool isQuote; + final bool isMerged; + final bool isHasMerged; + + const ChatEventMessageActionLog({ + super.key, + required this.icon, + required this.text, + this.isMerged = false, + this.isHasMerged = false, + this.isQuote = false, + }); + + @override + Widget build(BuildContext context) { + return Opacity( + opacity: 0.75, + child: Row( + crossAxisAlignment: CrossAxisAlignment.center, + children: [ + icon, + const SizedBox(width: 4), + Text(text), + ], + ).paddingOnly( + left: isQuote ? 0 : (isMerged ? 64 : 12), + top: 2, + bottom: isHasMerged ? 2 : 0, + ), + ); + } +} diff --git a/lib/widgets/chat/chat_message_deletion.dart b/lib/widgets/chat/chat_event_deletion.dart similarity index 82% rename from lib/widgets/chat/chat_message_deletion.dart rename to lib/widgets/chat/chat_event_deletion.dart index 9179918..a17641d 100644 --- a/lib/widgets/chat/chat_message_deletion.dart +++ b/lib/widgets/chat/chat_event_deletion.dart @@ -2,16 +2,16 @@ import 'package:flutter/material.dart'; import 'package:get/get.dart'; import 'package:solian/exts.dart'; import 'package:solian/models/channel.dart'; -import 'package:solian/models/message.dart'; +import 'package:solian/models/event.dart'; import 'package:solian/models/realm.dart'; import 'package:solian/providers/auth.dart'; -class ChatMessageDeletionDialog extends StatefulWidget { +class ChatEventDeletionDialog extends StatefulWidget { final Channel channel; final Realm? realm; - final Message item; + final Event item; - const ChatMessageDeletionDialog({ + const ChatEventDeletionDialog({ super.key, required this.channel, required this.realm, @@ -19,11 +19,11 @@ class ChatMessageDeletionDialog extends StatefulWidget { }); @override - State createState() => - _ChatMessageDeletionDialogState(); + State createState() => + _ChatEventDeletionDialogState(); } -class _ChatMessageDeletionDialogState extends State { +class _ChatEventDeletionDialogState extends State { bool _isBusy = false; void performAction() async { diff --git a/lib/widgets/chat/chat_event_message.dart b/lib/widgets/chat/chat_event_message.dart new file mode 100644 index 0000000..4b43762 --- /dev/null +++ b/lib/widgets/chat/chat_event_message.dart @@ -0,0 +1,96 @@ +import 'dart:math'; + +import 'package:flutter/material.dart'; +import 'package:flutter_markdown/flutter_markdown.dart'; +import 'package:get/get.dart'; +import 'package:solian/models/event.dart'; +import 'package:solian/widgets/attachments/attachment_list.dart'; +import 'package:url_launcher/url_launcher_string.dart'; + +class ChatEventMessage extends StatelessWidget { + final Event item; + final bool isContentPreviewing; + final bool isQuote; + final bool isMerged; + final bool isHasMerged; + + const ChatEventMessage({ + super.key, + required this.item, + this.isContentPreviewing = false, + this.isMerged = false, + this.isHasMerged = false, + this.isQuote = false, + }); + + Widget buildAttachment(BuildContext context) { + final body = EventMessageBody.fromJson(item.body); + + return SizedBox( + width: min(MediaQuery.of(context).size.width, 640), + child: AttachmentList( + key: Key('m${item.uuid}attachments'), + parentId: item.uuid, + attachmentsId: body.attachments ?? List.empty(), + divided: true, + viewport: 1, + ), + ); + } + + Widget buildContent() { + final body = EventMessageBody.fromJson(item.body); + final hasAttachment = body.attachments?.isNotEmpty ?? false; + + return Markdown( + shrinkWrap: true, + physics: const NeverScrollableScrollPhysics(), + data: body.text, + selectable: true, + padding: const EdgeInsets.all(0), + onTapLink: (text, href, title) async { + if (href == null) return; + await launchUrlString( + href, + mode: LaunchMode.externalApplication, + ); + }, + ).paddingOnly( + left: isQuote ? 0 : 12, + right: isQuote ? 0 : 12, + top: body.quoteEvent == null ? 2 : 0, + bottom: hasAttachment ? 4 : (isHasMerged ? 2 : 0), + ); + } + + Widget buildBody(BuildContext context) { + final body = EventMessageBody.fromJson(item.body); + + if (isContentPreviewing) { + return buildContent(); + } else if (isMerged) { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + buildContent().paddingOnly(left: 52), + if (body.attachments?.isNotEmpty ?? false) + buildAttachment(context).paddingOnly(left: 52, bottom: 4), + ], + ); + } else { + return Column( + crossAxisAlignment: CrossAxisAlignment.start, + children: [ + buildContent(), + if (body.attachments?.isNotEmpty ?? false) + buildAttachment(context).paddingOnly(bottom: 4), + ], + ); + } + } + + @override + Widget build(BuildContext context) { + return buildBody(context); + } +} diff --git a/lib/widgets/chat/chat_message.dart b/lib/widgets/chat/chat_message.dart deleted file mode 100644 index 57b6fd5..0000000 --- a/lib/widgets/chat/chat_message.dart +++ /dev/null @@ -1,198 +0,0 @@ -import 'dart:math'; - -import 'package:flutter/material.dart'; -import 'package:flutter_animate/flutter_animate.dart'; -import 'package:flutter_markdown/flutter_markdown.dart'; -import 'package:font_awesome_flutter/font_awesome_flutter.dart'; -import 'package:get/get.dart'; -import 'package:solian/models/message.dart'; -import 'package:solian/widgets/account/account_avatar.dart'; -import 'package:solian/widgets/account/account_profile_popup.dart'; -import 'package:solian/widgets/attachments/attachment_list.dart'; -import 'package:timeago/timeago.dart' show format; -import 'package:url_launcher/url_launcher_string.dart'; - -class ChatMessage extends StatelessWidget { - final Message item; - final bool isContentPreviewing; - final bool isReply; - final bool isMerged; - final bool isHasMerged; - - const ChatMessage({ - super.key, - required this.item, - this.isContentPreviewing = false, - this.isMerged = false, - this.isHasMerged = false, - this.isReply = false, - }); - - Future decodeContent(Map content) async { - String? text; - if (item.type == 'm.text') { - switch (content['algorithm']) { - case 'plain': - text = content['value']; - default: - throw Exception('Unsupported algorithm'); - } - } - - return text; - } - - Widget buildContent() { - final hasAttachment = item.attachments?.isNotEmpty ?? false; - - return FutureBuilder( - future: decodeContent(item.content), - builder: (context, snapshot) { - if (!snapshot.hasData) { - return Opacity( - opacity: 0.8, - child: Row( - children: [ - const Icon(Icons.more_horiz), - const SizedBox(width: 4), - Text('messageDecoding'.tr) - ], - ), - ).animate(onPlay: (c) => c.repeat()).fade(begin: 0, end: 1); - } else if (snapshot.hasError) { - return Opacity( - opacity: 0.9, - child: Row( - children: [ - const Icon(Icons.close), - const SizedBox(width: 4), - Text( - 'messageDecodeFailed' - .trParams({'message': snapshot.error.toString()}), - ) - ], - ), - ); - } - - if (snapshot.data?.isNotEmpty ?? false) { - return Markdown( - shrinkWrap: true, - physics: const NeverScrollableScrollPhysics(), - data: snapshot.data ?? '', - padding: const EdgeInsets.all(0), - onTapLink: (text, href, title) async { - if (href == null) return; - await launchUrlString( - href, - mode: LaunchMode.externalApplication, - ); - }, - ).paddingOnly( - left: 12, - right: 12, - top: 2, - bottom: hasAttachment ? 4 : 0, - ); - } else { - return const SizedBox(); - } - }, - ); - } - - Widget buildBody(BuildContext context) { - if (isContentPreviewing) { - return buildContent(); - } else if (isMerged) { - return Column( - children: [ - buildContent().paddingOnly(left: 52), - if (item.attachments?.isNotEmpty ?? false) - AttachmentList( - key: Key('m${item.uuid}attachments'), - parentId: item.uuid, - attachmentsId: item.attachments ?? List.empty(), - ).paddingSymmetric(vertical: 4), - ], - ); - } else if (isReply) { - return Row( - mainAxisAlignment: MainAxisAlignment.center, - children: [ - Transform.scale( - scaleX: -1, - child: const FaIcon(FontAwesomeIcons.reply, size: 14), - ), - const SizedBox(width: 12), - AccountAvatar(content: item.sender.account.avatar, radius: 8), - const SizedBox(width: 4), - Text( - item.sender.account.nick, - style: const TextStyle(fontWeight: FontWeight.bold), - ), - Expanded(child: buildContent()), - ], - ); - } else { - return Column( - key: Key('m${item.uuid}'), - children: [ - Row( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - GestureDetector( - child: AccountAvatar(content: item.sender.account.avatar), - onTap: () { - showModalBottomSheet( - useRootNavigator: true, - isScrollControlled: true, - backgroundColor: Theme.of(context).colorScheme.surface, - context: context, - builder: (context) => AccountProfilePopup( - account: item.sender.account, - ), - ); - }, - ), - Expanded( - child: Column( - crossAxisAlignment: CrossAxisAlignment.start, - children: [ - Row( - children: [ - Text( - item.sender.account.nick, - style: const TextStyle(fontWeight: FontWeight.bold), - ), - const SizedBox(width: 4), - Text(format(item.createdAt, locale: 'en_short')) - ], - ).paddingSymmetric(horizontal: 12), - buildContent(), - if (item.attachments?.isNotEmpty ?? false) - SizedBox( - width: min(MediaQuery.of(context).size.width, 640), - child: AttachmentList( - key: Key('m${item.uuid}attachments'), - parentId: item.uuid, - attachmentsId: item.attachments ?? List.empty(), - divided: true, - viewport: 1, - ), - ), - ], - ), - ), - ], - ).paddingSymmetric(horizontal: 12), - ], - ); - } - } - - @override - Widget build(BuildContext context) { - return buildBody(context); - } -} diff --git a/lib/widgets/chat/chat_message_input.dart b/lib/widgets/chat/chat_message_input.dart index 4522efb..8093df0 100644 --- a/lib/widgets/chat/chat_message_input.dart +++ b/lib/widgets/chat/chat_message_input.dart @@ -4,19 +4,19 @@ import 'package:get/get.dart'; import 'package:solian/exts.dart'; import 'package:solian/models/account.dart'; import 'package:solian/models/channel.dart'; -import 'package:solian/models/message.dart'; +import 'package:solian/models/event.dart'; import 'package:solian/providers/auth.dart'; import 'package:solian/widgets/attachments/attachment_publish.dart'; -import 'package:solian/widgets/chat/chat_message.dart'; +import 'package:solian/widgets/chat/chat_event.dart'; import 'package:uuid/uuid.dart'; class ChatMessageInput extends StatefulWidget { - final Message? edit; - final Message? reply; + final Event? edit; + final Event? reply; final String? placeholder; final Channel channel; final String realm; - final Function(Message) onSent; + final Function(Event) onSent; final Function()? onReset; const ChatMessageInput({ @@ -40,8 +40,8 @@ class _ChatMessageInputState extends State { List _attachments = List.empty(growable: true); - Message? _editTo; - Message? _replyTo; + Event? _editTo; + Event? _replyTo; void showAttachments() { showModalBottomSheet( @@ -54,14 +54,6 @@ class _ChatMessageInputState extends State { ); } - Map encodeMessage(String content) { - return { - 'value': content.trim(), - 'keypair_id': null, - 'algorithm': 'plain', - }; - } - Future sendMessage() async { _focusNode.requestFocus(); @@ -71,15 +63,25 @@ class _ChatMessageInputState extends State { final client = auth.configureClient('messaging'); + // TODO Deal with the @ ping (query uid with username), and then add into related_user and replace the @ with internal link in body + + const uuid = Uuid(); final payload = { - 'uuid': const Uuid().v4(), - 'type': 'm.text', - 'content': encodeMessage(_textController.value.text), - 'attachments': List.from(_attachments), - 'reply_to': _replyTo?.id, + 'uuid': uuid.v4(), + 'type': _editTo == null ? 'messages.new' : 'messages.edit', + 'body': { + 'text': _textController.value.text, + 'algorithm': 'plain', + 'attachments': List.from(_attachments), + 'related_users': [ + if (_replyTo != null) _replyTo!.sender.accountId, + ], + if (_replyTo != null) 'quote_event': _replyTo!.id, + if (_editTo != null) 'related_event': _editTo!.id, + } }; - // The mock data + // The local mock data final sender = Sender( id: 0, createdAt: DateTime.now(), @@ -89,23 +91,20 @@ class _ChatMessageInputState extends State { accountId: prof.body['id'], notify: 0, ); - final message = Message( + final message = Event( id: 0, uuid: payload['uuid'] as String, createdAt: DateTime.now(), updatedAt: DateTime.now(), - content: payload['content'] as Map, + body: payload['body'] as Map, type: payload['type'] as String, - attachments: _attachments, sender: sender, - replyId: _replyTo?.id, - replyTo: _replyTo, channelId: widget.channel.id, senderId: sender.id, ); if (_editTo == null) { - message.isSending = true; + message.isPending = true; widget.onSent(message); } @@ -139,9 +138,10 @@ class _ChatMessageInputState extends State { } void syncWidget() { - if (widget.edit != null) { + if (widget.edit != null && widget.edit!.type.startsWith('messages')) { + final body = EventMessageBody.fromJson(widget.edit!.body); _editTo = widget.edit!; - _textController.text = widget.edit!.content['value']; + _textController.text = body.text; } if (widget.reply != null) { _replyTo = widget.reply!; @@ -177,7 +177,7 @@ class _ChatMessageInputState extends State { .colorScheme .surfaceContainerHighest .withOpacity(0.5), - content: ChatMessage( + content: ChatEvent( item: _replyTo!, isContentPreviewing: true, ), @@ -192,7 +192,7 @@ class _ChatMessageInputState extends State { .colorScheme .surfaceContainerHighest .withOpacity(0.5), - content: ChatMessage( + content: ChatEvent( item: _editTo!, isContentPreviewing: true, ),