Skip to content

Commit

Permalink
refactor: bit of cleanup and todos
Browse files Browse the repository at this point in the history
  • Loading branch information
ereio committed Mar 21, 2021
1 parent 485681f commit 858753c
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 19 deletions.
1 change: 1 addition & 0 deletions lib/store/auth/actions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import 'package:syphon/store/auth/credential/model.dart';
import 'package:syphon/store/auth/homeserver/actions.dart';
import 'package:syphon/store/auth/homeserver/model.dart';
import 'package:syphon/store/crypto/actions.dart';
import 'package:syphon/store/events/messages/actions.dart';
import 'package:syphon/store/index.dart';
import 'package:syphon/store/media/actions.dart';
import 'package:syphon/store/rooms/actions.dart';
Expand Down
4 changes: 3 additions & 1 deletion lib/store/events/messages/actions.dart
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import 'package:syphon/global/algos.dart';

// Project imports:
import 'package:syphon/global/libs/matrix/index.dart';
import 'package:syphon/global/print.dart';
import 'package:syphon/store/alerts/actions.dart';
import 'package:syphon/store/crypto/actions.dart';
import 'package:syphon/store/crypto/events/actions.dart';
Expand Down Expand Up @@ -78,6 +79,7 @@ ThunkAction<AppState> mutateMessagesAll({List<String> messages}) {
));
} catch (error) {
// TODO: Error handling for mutating messages per room
debugPrint(error.toString());
}
}));
};
Expand All @@ -104,7 +106,7 @@ ThunkAction<AppState> mutateMessagesRoom({Room room}) {
'messages': messages,
});

store.dispatch(setMessages(
await store.dispatch(setMessages(
room: Room(id: room.id),
messages: revisedMessages,
));
Expand Down
27 changes: 9 additions & 18 deletions lib/store/events/selectors.dart
Original file line number Diff line number Diff line change
Expand Up @@ -22,23 +22,22 @@ List<Message> filterMessages(
) {
final blocked = state.userStore.blocked;

// TODO: remove the replacement filter here, should be managed by the mutators
return messages
..removeWhere(
(message) => blocked.contains(message.sender),
(message) => blocked.contains(message.sender) || message.replacement,
);
}

List<Message> reviseMessages(
List<Message> messages,
AppState state,
) {
final reactions = selectReactions(state);
final redactions = state.eventStore.redactions;
List<Message> reviseMessagesBackground(Map params) {
List<Message> messages = params['messages'];
Map<String, Redaction> redactions = params['redactions'];
Map<String, List<Reaction>> reactions = params['reactions'];

return reviseMessagesAlt(messages, redactions, reactions);
return reviseMessagesFilter(messages, redactions, reactions);
}

List<Message> reviseMessagesAlt(
List<Message> reviseMessagesFilter(
List<Message> messages,
Map<String, Redaction> redactions,
Map<String, List<Reaction>> reactions,
Expand All @@ -55,14 +54,6 @@ List<Message> reviseMessagesAlt(
return List.from(messagesMap.values);
}

List<Message> reviseMessagesBackground(Map params) {
List<Message> messages = params['messages'];
Map<String, Redaction> redactions = params['redactions'];
Map<String, List<Reaction>> reactions = params['reactions'];

return reviseMessagesAlt(messages, redactions, reactions);
}

Map<String, Message> filterRedactions(
Map<String, Message> messages, {
Map<String, Redaction> redactions,
Expand Down Expand Up @@ -106,7 +97,7 @@ Map<String, Message> appendReactions(
Map<String, Message> replaceEdited(List<Message> messages) {
final replacements = List<Message>();

// create a map of messages for O(1) when replacing (O(N))
// create a map of messages for O(1) when replacing O(N)
final messagesMap = Map<String, Message>.fromIterable(
messages ?? [],
key: (msg) => msg.id,
Expand Down

0 comments on commit 858753c

Please sign in to comment.