[1/6] api: Audit enums to handle unknown values where appropriate #2339
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -241,7 +241,7 @@ class DmNarrow extends Narrow implements SendableNarrow { | |
| UpdateMessageFlagsMessageDetail detail, { | ||
| required int selfUserId, | ||
| }) { | ||
| assert(detail.type == .direct); | ||
| return DmNarrow.withOtherUsers(detail.userIds!, selfUserId: selfUserId); | ||
| } | ||
|
|
||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -87,7 +87,7 @@ class RecentSenders { | |
| } | ||
|
|
||
| void handleDeleteMessageEvent(DeleteMessageEvent event, Map<int, Message> cachedMessages) { | ||
| if (event.messageType != .stream) return; | ||
|
|
||
| final messagesByUser = <int, List<int>>{}; | ||
| for (final id in event.messageIds) { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -63,9 +63,9 @@ class TypingStatus extends HasRealmStore with ChangeNotifier { | |
|
|
||
| void handleTypingEvent(TypingEvent event) { | ||
| SendableNarrow narrow = switch (event.messageType) { | ||
| .direct => DmNarrow( | ||
| allRecipientIds: event.recipientIds!, selfUserId: selfUserId), | ||
| .stream => TopicNarrow(event.streamId!, event.topic!), | ||
| }; | ||
|
|
||
| bool hasUpdate = false; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -412,13 +412,13 @@ class Unreads extends PerAccountStoreBase with ChangeNotifier { | |
| void handleDeleteMessageEvent(DeleteMessageEvent event) { | ||
| mentions.removeAll(event.messageIds); | ||
| switch (event.messageType) { | ||
| case .stream: | ||
| // All the messages are in [event.streamId] and [event.topic], | ||
| // so we can be more efficient than _removeAllInStreamsAndDms. | ||
| final streamId = event.streamId!; | ||
| final topic = event.topic!; | ||
| _removeAllInStreamTopic(Set.of(event.messageIds), streamId, topic); | ||
| case .direct: | ||
| _removeAllInStreamsAndDms(event.messageIds, expectOnlyDms: true); | ||
| } | ||
| for (final messageId in event.messageIds) { | ||
|
|
@@ -490,13 +490,13 @@ class Unreads extends PerAccountStoreBase with ChangeNotifier { | |
| mentions.add(messageId); | ||
| } | ||
| switch (detail.type) { | ||
| case .stream: | ||
| final UpdateMessageFlagsMessageDetail(:streamId, :topic) = detail; | ||
| locatorMap[messageId] = TopicNarrow(streamId!, topic!); | ||
| final topics = (newlyUnreadInStreams[streamId] ??= makeTopicKeyedMap()); | ||
| final messageIds = (topics[topic] ??= QueueList()); | ||
| messageIds.add(messageId); | ||
| case .direct: | ||
| final narrow = DmNarrow.ofUpdateMessageFlagsMessageDetail(selfUserId: selfUserId, | ||
| detail); | ||
| locatorMap[messageId] = narrow; | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -275,7 +275,7 @@ void main() { | |
| 'type': 'delete_message', | ||
| 'message_ids': [1, 2, 3], | ||
| 'message_type': 'private', | ||
| })).messageType.equals(.direct); | ||
| }); | ||
|
|
||
| group('update_message_flags/remove', () { | ||
|
|
@@ -310,7 +310,7 @@ void main() { | |
| ...messageDetail, | ||
| 'type': 'private', | ||
| }}})).messageDetails.isNotNull() | ||
| .values.single.type.equals(.direct); | ||
| }); | ||
| }); | ||
|
|
||
|
|
@@ -343,7 +343,7 @@ void main() { | |
| check(TypingEvent.fromJson({ | ||
| ...directMessageJson, | ||
| 'message_type': 'private', | ||
| })).messageType.equals(.direct); | ||
| }); | ||
|
|
||
| test('stream type missing streamId/topic', () { | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -1107,7 +1107,7 @@ DeleteMessageEvent deleteMessageEvent(List<StreamMessage> messages) { | |
| return DeleteMessageEvent( | ||
| id: 0, | ||
| messageIds: messages.map((message) => message.id).toList(), | ||
| messageType: .stream, | ||
| streamId: messages[0].streamId, | ||
| topic: messages[0].topic, | ||
| ); | ||
|
|
@@ -1255,14 +1255,14 @@ UpdateMessageFlagsRemoveEvent updateMessageFlagsRemoveEvent( | |
| message.id, | ||
| switch (message) { | ||
| StreamMessage() => UpdateMessageFlagsMessageDetail( | ||
| type: .stream, | ||
| mentioned: mentioned, | ||
| streamId: message.streamId, | ||
| topic: message.topic, | ||
| userIds: null, | ||
| ), | ||
| DmMessage() => UpdateMessageFlagsMessageDetail( | ||
| type: .direct, | ||
| mentioned: mentioned, | ||
| streamId: null, | ||
| topic: null, | ||
|
|
@@ -1293,13 +1293,13 @@ TypingEvent typingEvent(SendableNarrow narrow, TypingOp op, int senderId) { | |
| switch (narrow) { | ||
| case TopicNarrow(): | ||
| return TypingEvent(id: 0, op: op, senderId: senderId, | ||
| messageType: .stream, | ||
| streamId: narrow.channelId, | ||
| topic: narrow.topic, | ||
| recipientIds: null); | ||
| case DmNarrow(): | ||
| return TypingEvent(id: 0, op: op, senderId: senderId, | ||
| messageType: .direct, | ||
| recipientIds: narrow.allRecipientIds, | ||
| streamId: null, | ||
| topic: null); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -179,7 +179,7 @@ void main() { | |
| model.handleDeleteMessageEvent(DeleteMessageEvent( | ||
| id: 0, | ||
| messageIds: [messages[1].id], | ||
| messageType: .stream, | ||
| streamId: stream.streamId, | ||
| topic: eg.t('oThEr'), | ||
| ), {messages[1].id: messages[1]}); | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -855,7 +855,7 @@ void main() { | |
| final event = switch (message) { | ||
| StreamMessage() => DeleteMessageEvent( | ||
| id: 0, | ||
| messageType: .stream, | ||
| messageIds: [message.id], | ||
| streamId: message.streamId, | ||
| topic: () { | ||
|
|
@@ -867,7 +867,7 @@ void main() { | |
| ), | ||
| DmMessage() => DeleteMessageEvent( | ||
| id: 0, | ||
| messageType: .direct, | ||
| messageIds: [message.id], | ||
| streamId: null, | ||
| topic: null, | ||
|
|
@@ -888,7 +888,7 @@ void main() { | |
| model.handleDeleteMessageEvent(DeleteMessageEvent( | ||
| id: 0, | ||
| messageIds: [11, 12], | ||
| messageType: .stream, | ||
| streamId: stream1.streamId, | ||
| topic: eg.t('a'), | ||
| )); | ||
|
|
@@ -897,7 +897,7 @@ void main() { | |
| model.handleDeleteMessageEvent(DeleteMessageEvent( | ||
| id: 0, | ||
| messageIds: [13, 14], | ||
| messageType: .stream, | ||
| streamId: stream2.streamId, | ||
| topic: eg.t('b'), | ||
| )); | ||
|
|
@@ -906,7 +906,7 @@ void main() { | |
| model.handleDeleteMessageEvent(DeleteMessageEvent( | ||
| id: 0, | ||
| messageIds: [1, 2, 3, 4, 5, 6, 7, 8, 9, 10], | ||
| messageType: .direct, | ||
| streamId: null, | ||
| topic: null, | ||
| )); | ||
|
|
@@ -922,7 +922,7 @@ void main() { | |
| model.handleDeleteMessageEvent(DeleteMessageEvent( | ||
| id: 0, | ||
| messageIds: [message.id], | ||
| messageType: .stream, | ||
| streamId: message.streamId, | ||
| topic: message.topic, | ||
| )); | ||
|
|
@@ -941,7 +941,7 @@ void main() { | |
| model.handleDeleteMessageEvent(DeleteMessageEvent( | ||
| id: 0, | ||
| messageIds: [message.id], | ||
| messageType: .direct, | ||
| streamId: null, | ||
| topic: null, | ||
| )); | ||
|
|
@@ -1373,15 +1373,15 @@ void main() { | |
| messages: [message1.id, message2.id, message3.id, message4.id], | ||
| messageDetails: { | ||
| message1.id: UpdateMessageFlagsMessageDetail( | ||
| type: .stream, | ||
| mentioned: false, | ||
| streamId: stream.streamId, | ||
| topic: eg.t(topic), | ||
| userIds: null, | ||
| ), | ||
| // message 2 and 3 have their details missing | ||
| message4.id: UpdateMessageFlagsMessageDetail( | ||
| type: .direct, | ||
| mentioned: false, | ||
| streamId: null, | ||
| topic: null, | ||
|
|
||
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This too is technically out of scope for #1982, but it's fine to have.