ember/fluffychat
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

change the way getTimeline is used, bump matrix sdk version

Browse source
This commit is contained in:
WilsonLe 2024-07-25 11:59:21 -04:00
parent e46b09f836
commit 68ca0e770e
6 changed files with 16 additions and 74 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
lib/pangea/controllers/my_analytics_controller.dart
View file

@ -277,7 +277,11 @@ class MyAnalyticsController {
// get the timelines for each chat
final List<Future<Timeline>> timelineFutures = [];
for (final chat in chats) {
timelineFutures.add(chat.getTimeline());
timelineFutures.add(
chat.timeline == null
? chat.getTimeline()
: Future.value(chat.timeline),
);
}
final List<Timeline> timelines = await Future.wait(timelineFutures);
final Map<String, Timeline> timelineMap =

4
lib/pangea/extensions/client_extension/general_info_extension.dart
View file

@ -3,7 +3,7 @@ part of "client_extension.dart";
extension GeneralInfoClientExtension on Client {
Future<List<String>> get _teacherRoomIds async {
final List<String> adminRoomIds = [];
for (final Room adminSpace in (await _spacesImTeaching)) {
for (final Room adminSpace in (_spacesImTeaching)) {
adminRoomIds.add(adminSpace.id);
final List<String> adminSpaceRooms = adminSpace.allSpaceChildRoomIds;
adminRoomIds.addAll(adminSpaceRooms);
@ -59,7 +59,7 @@ extension GeneralInfoClientExtension on Client {
final Event? originalEvent = await room!.getEventById(edittedEventId);
if (originalEvent == null) return [];
final Timeline timeline = await room.getTimeline();
final Timeline timeline = room.timeline ?? await room.getTimeline();
final List<Event> editEvents = originalEvent
.aggregatedEvents(
timeline,

4
lib/pangea/extensions/pangea_room_extension/events_extension.dart
View file

@ -320,7 +320,7 @@ extension EventsRoomExtension on Room {
"In messageListForChat with room that is not a chat",
);
}
final Timeline timeline = await getTimeline();
final Timeline timeline = this.timeline ?? await getTimeline();
while (timeline.canRequestHistory && numberOfSearches < 50) {
await timeline.requestHistory(historyCount: 100);
@ -433,7 +433,7 @@ extension EventsRoomExtension on Room {
}) async {
try {
int numberOfSearches = 0;
final Timeline timeline = await getTimeline();
final Timeline timeline = this.timeline ?? await getTimeline();
List<Event> relevantEvents() => timeline.events
.where((event) => event.senderId == sender && event.type == type)

2
lib/pangea/pages/analytics/construct_list.dart
View file

@ -166,7 +166,7 @@ class ConstructListViewState extends State<ConstructListView> {
if (_timelinesCache.containsKey(use.chatId)) {
timeline = _timelinesCache[use.chatId];
} else {
timeline = await msgRoom.getTimeline();
timeline = msgRoom.timeline ?? await msgRoom.getTimeline();
_timelinesCache[use.chatId] = timeline;
}

8
lib/pangea/utils/get_chat_list_item_subtitle.dart
View file

@ -36,9 +36,11 @@ class GetChatListItemSubtitle {
eventContextId = null;
}
final Timeline timeline = await event.room.getTimeline(
eventContextId: eventContextId,
);
final Timeline timeline = event.room.timeline != null &&
event.room.timeline!.events
.any((event) => event.eventId == eventContextId)
? event.room.timeline!
: await event.room.getTimeline(eventContextId: eventContextId);
if (moveBackInTimeline(event)) {
event = timeline.events.firstWhereOrNull((e) => !moveBackInTimeline(e));

66
pubspec.lock
View file

@ -105,14 +105,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.4.0"
base58check:
dependency: transitive
description:
name: base58check
sha256: "6c300dfc33e598d2fe26319e13f6243fea81eaf8204cb4c6b69ef20a625319a5"
url: "https://pub.dev"
source: hosted
version: "2.0.0"
blurhash_dart:
dependency: "direct main"
description:
@ -145,14 +137,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.3.3"
canonical_json:
dependency: transitive
description:
name: canonical_json
sha256: d6be1dd66b420c6ac9f42e3693e09edf4ff6edfee26cb4c28c1c019fdb8c0c15
url: "https://pub.dev"
source: hosted
version: "1.1.2"
characters:
dependency: transitive
description:
@ -369,14 +353,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.9.9"
enhanced_enum:
dependency: transitive
description:
name: enhanced_enum
sha256: "074c5a8b9664799ca91e1e8b68003b8694cb19998671cbafd9c7779c13fcdecf"
url: "https://pub.dev"
source: hosted
version: "0.2.4"
equatable:
dependency: transitive
description:
@ -1039,14 +1015,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "0.15.4"
html_unescape:
dependency: transitive
description:
name: html_unescape
sha256: "15362d7a18f19d7b742ef8dcb811f5fd2a2df98db9f80ea393c075189e0b61e3"
url: "https://pub.dev"
source: hosted
version: "2.0.0"
http:
dependency: "direct main"
description:
@ -1434,7 +1402,7 @@ packages:
description:
path: "."
ref: main
resolved-ref: "0e27bd767a7f0faa7c25ea5f68292fb0b4f59a97"
resolved-ref: "40b095825f2cefeac548009e96376110e72c76ff"
url: "https://github.com/pangeachat/matrix-dart-sdk.git"
source: git
version: "0.30.0"
@ -1494,14 +1462,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.0.2"
olm:
dependency: transitive
description:
name: olm
sha256: "37948a6576949256f3ee1d0063d5b408634ff7e452b9a5c2f6410f9d7ced1c20"
url: "https://pub.dev"
source: hosted
version: "2.0.3"
open_file:
dependency: "direct main"
description:
@ -1846,14 +1806,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.2.1"
random_string:
dependency: transitive
description:
name: random_string
sha256: "03b52435aae8cbdd1056cf91bfc5bf845e9706724dd35ae2e99fa14a1ef79d02"
url: "https://pub.dev"
source: hosted
version: "2.3.1"
receive_sharing_intent:
dependency: "direct main"
description:
@ -1974,14 +1926,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "3.0.1"
sdp_transform:
dependency: transitive
description:
name: sdp_transform
sha256: "73e412a5279a5c2de74001535208e20fff88f225c9a4571af0f7146202755e45"
url: "https://pub.dev"
source: hosted
version: "0.3.2"
sentiment_dart:
dependency: transitive
description:
@ -2459,14 +2403,6 @@ packages:
url: "https://pub.dev"
source: hosted
version: "2.2.2"
unorm_dart:
dependency: transitive
description:
name: unorm_dart
sha256: "5b35bff83fce4d76467641438f9e867dc9bcfdb8c1694854f230579d68cd8f4b"
url: "https://pub.dev"
source: hosted
version: "0.2.0"
url_launcher:
dependency: "direct main"
description: