Refactor theTimelineItemIdentifier handling
#3418
Conversation
Generated by 🚫 Danger Swift against d357fd9 |
| @@ -283,9 +284,14 @@ extension FormatType { | |||
| } | |||
|
|
|||
| enum ComposerMode: Equatable { | |||
| enum EditSource { | |||
There was a problem hiding this comment.
Could call this EditActionSource if you think it makes the timeline case clearer.
There was a problem hiding this comment.
I think ComposerMode.EditActionSource is clear enough
|
|
||
| extension RoomTimelineControllerProtocol { | ||
| func sendMessage(_ message: String, | ||
| html: String?, | ||
| intentionalMentions: IntentionalMentions) async { | ||
| await sendMessage(message, | ||
| html: html, | ||
| inReplyTo: nil, | ||
| intentionalMentions: intentionalMentions) | ||
| } | ||
| } |
There was a problem hiding this comment.
Not sure what was wrong with this, seems like a reasonable thing to use when you don't want to reply?
There was a problem hiding this comment.
I found them extra to be honest. On the highest level they're both called from the same place and each variant evetually trickles down into the same timeline one.
|
|
||
| extension TimelineProxyProtocol { | ||
| func sendMessage(_ message: String, | ||
| html: String?, | ||
| intentionalMentions: IntentionalMentions) async -> Result<Void, TimelineProxyError> { | ||
| await sendMessage(message, | ||
| html: html, | ||
| inReplyTo: nil, | ||
| intentionalMentions: intentionalMentions) | ||
| } | ||
| } |
| if case let .event(eventTimelineItem) = item { | ||
| switch eventTimelineItem.id { | ||
| case .event(_, let identifier): | ||
| if identifier == eventOrTransactionID { | ||
| return eventTimelineItem.item | ||
| } | ||
| default: | ||
| break | ||
| } | ||
| } |
There was a problem hiding this comment.
This might be slightly cleaner:
| if case let .event(eventTimelineItem) = item { | |
| switch eventTimelineItem.id { | |
| case .event(_, let identifier): | |
| if identifier == eventOrTransactionID { | |
| return eventTimelineItem.item | |
| } | |
| default: | |
| break | |
| } | |
| } | |
| if case let .event(eventTimelineItem) = item, | |
| case let .event(_, identifier) = eventTimelineItem.id, | |
| identifier == eventOrTransactionID { | |
| return eventTimelineItem.item | |
| } |
There was a problem hiding this comment.
Yup yup, nice, thank you!
| return SeparatorRoomTimelineItem(id: .init(uniqueID: dateString), text: dateString) | ||
| return SeparatorRoomTimelineItem(id: .virtual(uniqueID: uniqueID), text: dateString) |
There was a problem hiding this comment.
Just want to highlight that this changed from dateString to uniqueID.
There was a problem hiding this comment.
It did yes, but I think that's correct as the uniqueID is what rust actually uses for that timeline item, no?
stefanceriu
force-pushed
the
stefan/identifierChanges
branch
2 times, most recently
from
68527d7 to
290db72
Compare
❌ 1 Tests Failed:
View the top 1 failed tests by shortest run time
To view individual test run time comparison to the main branch, go to the Test Analytics Dashboard |
…al `EventOrTransactionId`s and be explicit when setting composer modes from the draft service.
stefanceriu
force-pushed
the
stefan/identifierChanges
branch
from
290db72 to
d357fd9
Compare
|
EventOrTransactionIds and be explicit when setting composer modes from the draft service.