Merge branch 'develop' into feature/null-safety

This commit is contained in:
Salvatore Giordano
2021-05-03 10:43:26 +02:00
14 changed files with 283 additions and 30 deletions
@@ -6,7 +6,6 @@ import 'package:stream_chat_persistence/src/db/moor_chat_database.dart';
import 'package:stream_chat_persistence/src/entity/channel_queries.dart';
import 'package:stream_chat_persistence/src/entity/channels.dart';
import 'package:stream_chat_persistence/src/entity/users.dart';
import 'package:stream_chat_persistence/src/mapper/mapper.dart';
part 'channel_query_dao.g.dart';
@@ -91,17 +90,6 @@ class ChannelQueryDao extends DatabaseAccessor<MoorChatDatabase>
return channelEntity.toChannelModel(createdBy: createdByEntity?.toUser());
})).get();
final possibleSortingFields = cachedChannels.fold<List<String>>(
ChannelModel.topLevelFields, (previousValue, element) {
final extraData = element.extraData ?? {};
return {...previousValue, ...extraData.keys}.toList();
});
// ignore: parameter_assignments
sort = sort
?.where((s) => possibleSortingFields.contains(s.field))
.toList(growable: false);
var chainedComparator = (ChannelModel a, ChannelModel b) {
final dateA = a.lastMessageAt ?? a.createdAt;
final dateB = b.lastMessageAt ?? b.createdAt;