Remove "with_relations" stable field since the msc is in an unstable state

This commit is contained in:
Florian Renaud 2023-01-24 17:42:59 +01:00
parent dd9fba0626
commit 0870cec118
4 changed files with 3 additions and 8 deletions

View File

@ -56,7 +56,6 @@ internal class DefaultRedactEventTask @Inject constructor(
body = EventRedactBody(
reason = params.reason,
withRelations = withRelations,
withRelationsUnstable = withRelations,
)
)
}

View File

@ -802,7 +802,6 @@ internal class LocalEchoEventFactory @Inject constructor(
EventRedactBody(
reason = reason,
withRelations = withRelations,
withRelationsUnstable = withRelations,
).toContent().plus(additionalContent.orEmpty())
} else {
additionalContent

View File

@ -1,5 +1,5 @@
/*
* Copyright 2021 The Matrix.org Foundation C.I.C.
* Copyright (c) 2023 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@ -24,9 +24,6 @@ internal data class EventRedactBody(
@Json(name = "reason")
val reason: String? = null,
@Json(name = "with_relations")
val withRelations: List<String>? = null,
@Json(name = "org.matrix.msc3912.with_relations")
val withRelationsUnstable: List<String>? = null,
val withRelations: List<String>? = null,
)

View File

@ -118,7 +118,7 @@ internal class QueueMemento @Inject constructor(
eventId = it.redacts,
roomId = it.roomId,
reason = body?.reason,
withRelations = body?.withRelations ?: body?.withRelationsUnstable
withRelations = body?.withRelations,
)
)
}