Merge pull request #1897 from element-hq/jonny/timeline-poll-edited
Display edited indicator for polls in the timeline
This commit is contained in:
commit
5d37c66caf
10 changed files with 25 additions and 6 deletions
|
|
@ -49,7 +49,8 @@ data class PollContent(
|
|||
val maxSelections: ULong,
|
||||
val answers: ImmutableList<PollAnswer>,
|
||||
val votes: ImmutableMap<String, ImmutableList<UserId>>,
|
||||
val endTime: ULong?
|
||||
val endTime: ULong?,
|
||||
val isEdited: Boolean,
|
||||
) : EventContent
|
||||
|
||||
data class UnableToDecryptContent(
|
||||
|
|
|
|||
|
|
@ -113,6 +113,7 @@ class TimelineEventContentMapper(private val eventMessageMapper: EventMessageMap
|
|||
vote.value.map { userId -> UserId(userId) }.toImmutableList()
|
||||
}.toImmutableMap(),
|
||||
endTime = kind.endTime,
|
||||
isEdited = kind.hasBeenEdited,
|
||||
)
|
||||
}
|
||||
is TimelineItemContentKind.UnableToDecrypt -> {
|
||||
|
|
|
|||
|
|
@ -191,5 +191,6 @@ fun aPollContent(
|
|||
maxSelections = 1u,
|
||||
answers = answers,
|
||||
votes = persistentMapOf(),
|
||||
endTime = null
|
||||
endTime = null,
|
||||
isEdited = false,
|
||||
)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue