Skip to content

Commit

Permalink
fix: testservice self deletion message timer was broken
Browse files Browse the repository at this point in the history
  • Loading branch information
@mythsunwind
mythsunwind committed Jul 10, 2023
1 parent ba6ab8e commit a255542
Show file tree
Hide file tree
Showing 2 changed files with 41 additions and 18 deletions.
7 changes: 5 additions & 2 deletions testservice/src/main/kotlin/com/wire/kalium/testservice/api/v1/ConversationResources.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -227,6 +227,7 @@ class ConversationResources(private val instanceService: InstanceService) {
data,
fileName,
type,
messageTimer,
invalidHash,
otherAlgorithm,
otherHash
Expand All @@ -249,7 +250,8 @@ class ConversationResources(private val instanceService: InstanceService) {
data,
type,
height,
width
width,
messageTimer
)
}
}
Expand Down Expand Up @@ -363,7 +365,8 @@ class ConversationResources(private val instanceService: InstanceService) {
ConversationId(conversationId, conversationDomain),
text,
mentions,
firstMessageId
firstMessageId,
messageTimer
)
}
}
Expand Down
52 changes: 36 additions & 16 deletions testservice/src/main/kotlin/com/wire/kalium/testservice/managed/ConversationRepository.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import com.wire.kalium.logic.data.message.mention.MessageMention
import com.wire.kalium.logic.data.message.receipt.ReceiptType
import com.wire.kalium.logic.feature.asset.ScheduleNewAssetMessageResult
import com.wire.kalium.logic.feature.conversation.ClearConversationContentUseCase
import com.wire.kalium.logic.feature.conversation.GetConversationsUseCase
import com.wire.kalium.logic.feature.debug.BrokenState
import com.wire.kalium.logic.feature.debug.SendBrokenAssetMessageResult
import com.wire.kalium.logic.feature.selfDeletingMessages.SelfDeletionTimer
import com.wire.kalium.logic.feature.session.CurrentSessionResult
import com.wire.kalium.logic.functional.fold
import com.wire.kalium.logic.functional.onFailure
Expand Down Expand Up @@ -158,8 +158,15 @@ sealed class ConversationRepository {
is CurrentSessionResult.Success -> {
instance.coreLogic.sessionScope(session.accountInfo.userId) {
if (text != null) {
val newSelfDeletionTimer = if (messageTimer != 0 && messageTimer != null) {
log.info("Instance ${instance.instanceId}: Enable self deletion timer")
SelfDeletionTimer.Enabled(messageTimer.toDuration(DurationUnit.MILLISECONDS))
} else {
log.info("Instance ${instance.instanceId}: Disable self deletion timer")
SelfDeletionTimer.Disabled
}
persistNewSelfDeletionStatus.invoke(conversationId, newSelfDeletionTimer)
log.info("Instance ${instance.instanceId}: Send text message '$text'")
val expireAfter = messageTimer?.toDuration(DurationUnit.MILLISECONDS)
messages.sendTextMessage(
conversationId, text, mentions, quotedMessageId
).fold({
Expand All @@ -186,12 +193,21 @@ sealed class ConversationRepository {
conversationId: ConversationId,
text: String?,
mentions: List<MessageMention>,
firstMessageId: String
firstMessageId: String,
messageTimer: Int?
): Response = instance.coreLogic.globalScope {
return when (val session = session.currentSession()) {
is CurrentSessionResult.Success -> {
instance.coreLogic.sessionScope(session.accountInfo.userId) {
if (text != null) {
val newSelfDeletionTimer = if (messageTimer != 0 && messageTimer != null) {
log.info("Instance ${instance.instanceId}: Enable self deletion timer")
SelfDeletionTimer.Enabled(messageTimer.toDuration(DurationUnit.MILLISECONDS))
} else {
log.info("Instance ${instance.instanceId}: Disable self deletion timer")
SelfDeletionTimer.Disabled
}
persistNewSelfDeletionStatus.invoke(conversationId, newSelfDeletionTimer)
log.info("Instance ${instance.instanceId}: Send text message '$text'")
messages.sendEditTextMessage(
conversationId, firstMessageId, text, mentions
Expand Down Expand Up @@ -260,6 +276,7 @@ sealed class ConversationRepository {
data: String,
fileName: String,
type: String,
messageTimer: Int?,
invalidHash: Boolean,
otherAlgorithm: Boolean,
otherHash: Boolean
Expand All @@ -280,13 +297,14 @@ sealed class ConversationRepository {
syncManager.waitUntilLiveOrFailure().onFailure {
log.info("Instance ${instance.instanceId}: Sync failed with $it")
}
log.info("Instance ${instance.instanceId}: List conversations:")
val convos = conversations.getConversations()
if (convos is GetConversationsUseCase.Result.Success) {
for (convo in convos.convFlow.first()) {
log.info("${convo.name} (${convo.id})")
}
val newSelfDeletionTimer = if (messageTimer != 0 && messageTimer != null) {
log.info("Instance ${instance.instanceId}: Enable self deletion timer")
SelfDeletionTimer.Enabled(messageTimer.toDuration(DurationUnit.MILLISECONDS))
} else {
log.info("Instance ${instance.instanceId}: Disable self deletion timer")
SelfDeletionTimer.Disabled
}
persistNewSelfDeletionStatus.invoke(conversationId, newSelfDeletionTimer)
val sendResult = if (invalidHash || otherAlgorithm || otherHash) {
val brokenState = BrokenState(invalidHash, otherHash, otherAlgorithm)
@Suppress("IMPLICIT_CAST_TO_ANY")
Expand Down Expand Up @@ -354,7 +372,8 @@ sealed class ConversationRepository {
data: String,
type: String,
width: Int,
height: Int
height: Int,
messageTimer: Int?
): Response {
val temp: File = Files.createTempFile("asset", ".data").toFile()
val byteArray = Base64.getDecoder().decode(data)
Expand All @@ -372,13 +391,14 @@ sealed class ConversationRepository {
syncManager.waitUntilLiveOrFailure().onFailure {
log.info("Instance ${instance.instanceId}: Sync failed with $it")
}
log.info("Instance ${instance.instanceId}: List conversations:")
val convos = conversations.getConversations()
if (convos is GetConversationsUseCase.Result.Success) {
for (convo in convos.convFlow.first()) {
log.info("${convo.name} (${convo.id})")
}
val newSelfDeletionTimer = if (messageTimer != 0 && messageTimer != null) {
log.info("Instance ${instance.instanceId}: Enable self deletion timer")
SelfDeletionTimer.Enabled(messageTimer.toDuration(DurationUnit.MILLISECONDS))
} else {
log.info("Instance ${instance.instanceId}: Disable self deletion timer")
SelfDeletionTimer.Disabled
}
persistNewSelfDeletionStatus.invoke(conversationId, newSelfDeletionTimer)
val sendResult = messages.sendAssetMessage(
conversationId,
temp.toOkioPath(),
Expand Down

0 comments on commit a255542

Please sign in to comment.