Skip to content

Commit b4b53d8

Browse files
gnpricechrisbobbe
authored andcommitted
api [nfc]: Use TopicName in event types
1 parent cc19447 commit b4b53d8

File tree

5 files changed

+27
-17
lines changed

5 files changed

+27
-17
lines changed

lib/api/model/events.dart

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -645,7 +645,7 @@ class UserTopicEvent extends Event {
645645
String get type => 'user_topic';
646646

647647
final int streamId;
648-
final String topicName;
648+
final TopicName topicName;
649649
final int lastUpdated;
650650
final UserTopicVisibilityPolicy visibilityPolicy;
651651

@@ -725,9 +725,9 @@ class UpdateMessageEvent extends Event {
725725
final PropagateMode? propagateMode;
726726

727727
@JsonKey(name: 'orig_subject')
728-
final String? origTopic;
728+
final TopicName? origTopic;
729729
@JsonKey(name: 'subject')
730-
final String? newTopic;
730+
final TopicName? newTopic;
731731

732732
// final List<TopicLink> topicLinks; // TODO handle
733733

@@ -788,7 +788,7 @@ class DeleteMessageEvent extends Event {
788788
@MessageTypeConverter()
789789
final MessageType messageType;
790790
final int? streamId;
791-
final String? topic;
791+
final TopicName? topic;
792792

793793
DeleteMessageEvent({
794794
required super.id,
@@ -924,7 +924,7 @@ class UpdateMessageFlagsMessageDetail {
924924
final bool? mentioned;
925925
final List<int>? userIds;
926926
final int? streamId;
927-
final String? topic;
927+
final TopicName? topic;
928928

929929
UpdateMessageFlagsMessageDetail({
930930
required this.type,
@@ -1002,7 +1002,7 @@ class TypingEvent extends Event {
10021002
@JsonKey(name: 'recipients', fromJson: _recipientIdsFromJson)
10031003
final List<int>? recipientIds;
10041004
final int? streamId;
1005-
final String? topic;
1005+
final TopicName? topic;
10061006

10071007
TypingEvent({
10081008
required super.id,

lib/api/model/events.g.dart

Lines changed: 16 additions & 6 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lib/model/message.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ class MessageStoreImpl with MessageStore {
221221
}
222222

223223
if (newTopic != null) {
224-
message.topic = TopicName(newTopic);
224+
message.topic = newTopic;
225225
}
226226

227227
if (!wasResolveOrUnresolve

test/api/model/events_checks.dart

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -51,8 +51,8 @@ extension UpdateMessageEventChecks on Subject<UpdateMessageEvent> {
5151
Subject<int?> get origStreamId => has((e) => e.origStreamId, 'origStreamId');
5252
Subject<int?> get newStreamId => has((e) => e.newStreamId, 'newStreamId');
5353
Subject<PropagateMode?> get propagateMode => has((e) => e.propagateMode, 'propagateMode');
54-
Subject<String?> get origTopic => has((e) => e.origTopic, 'origTopic');
55-
Subject<String?> get newTopic => has((e) => e.newTopic, 'newTopic');
54+
Subject<TopicName?> get origTopic => has((e) => e.origTopic, 'origTopic');
55+
Subject<TopicName?> get newTopic => has((e) => e.newTopic, 'newTopic');
5656
Subject<String?> get origContent => has((e) => e.origContent, 'origContent');
5757
Subject<String?> get origRenderedContent => has((e) => e.origRenderedContent, 'origRenderedContent');
5858
Subject<String?> get content => has((e) => e.content, 'content');
@@ -77,7 +77,7 @@ extension TypingEventChecks on Subject<TypingEvent> {
7777
Subject<int> get senderId => has((e) => e.senderId, 'senderId');
7878
Subject<List<int>?> get recipientIds => has((e) => e.recipientIds, 'recipientIds');
7979
Subject<int?> get streamId => has((e) => e.streamId, 'streamId');
80-
Subject<String?> get topic => has((e) => e.topic, 'topic');
80+
Subject<TopicName?> get topic => has((e) => e.topic, 'topic');
8181
}
8282

8383
extension HeartbeatEventChecks on Subject<HeartbeatEvent> {

test/example_data.dart

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -777,7 +777,7 @@ TypingEvent typingEvent(SendableNarrow narrow, TypingOp op, int senderId) {
777777
return TypingEvent(id: 0, op: op, senderId: senderId,
778778
messageType: MessageType.stream,
779779
streamId: narrow.streamId,
780-
topic: narrow.topic,
780+
topic: TopicName(narrow.topic),
781781
recipientIds: null);
782782
case DmNarrow():
783783
return TypingEvent(id: 0, op: op, senderId: senderId,

0 commit comments

Comments
 (0)