Skip to content

Commit 0e4f455

Browse files
PIG208gnprice
authored andcommitted
api [nfc]: Simplify move data parsing with null-checks
Signed-off-by: Zixuan James Li <[email protected]>
1 parent 6c3ee14 commit 0e4f455

File tree

1 file changed

+8
-16
lines changed

1 file changed

+8
-16
lines changed

lib/api/model/events.dart

Lines changed: 8 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -809,27 +809,19 @@ class UpdateMessageMoveData {
809809
return null;
810810
}
811811

812-
if (origStreamId == null || newStreamId == null) {
812+
return UpdateMessageMoveData(
813813
// The `stream_id` field (aka origStreamId) is documented to be present on moves;
814814
// newStreamId should not be null either because it falls back to origStreamId.
815-
throw FormatException('Malformed UpdateMessageEvent: move but no origStreamId');
816-
}
817-
if (origTopic == null || newTopic == null) {
815+
origStreamId: origStreamId!,
816+
newStreamId: newStreamId!,
817+
818818
// The `orig_subject` field (aka origTopic) is documented to be present on moves;
819819
// newTopic should not be null either because it falls back to origTopic.
820-
throw FormatException('Malformed UpdateMessageEvent: move but no origTopic');
821-
}
822-
if (propagateMode == null) {
823-
// The `propagate_mode` field (aka propagateMode) is documented to be present on moves.
824-
throw FormatException('Malformed UpdateMessageEvent: move but no propagateMode');
825-
}
820+
origTopic: origTopic!,
821+
newTopic: newTopic!,
826822

827-
return UpdateMessageMoveData(
828-
origStreamId: origStreamId,
829-
newStreamId: newStreamId,
830-
origTopic: origTopic,
831-
newTopic: newTopic,
832-
propagateMode: propagateMode,
823+
// The `propagate_mode` field (aka propagateMode) is documented to be present on moves.
824+
propagateMode: propagateMode!,
833825
);
834826
}
835827
}

0 commit comments

Comments
 (0)