Skip to content

Make notifications spoiler aware #4426

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bmarty merged 6 commits into from
Nov 16, 2021
Merged

Make notifications spoiler aware #4426

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
e1de1a2
Make notifications spoiler aware, per MSC3124
OpaqueReptile Nov 7, 2021
97fff27
Make notifications spoiler aware, per MSC3124
OpaqueReptile Nov 7, 2021
babc2e4
Handle spoilers formatted with a spoiler reason
OpaqueReptile Nov 7, 2021
293291c
make the linter happy
OpaqueReptile Nov 8, 2021
e4b1edb
formatting
OpaqueReptile Nov 8, 2021
ddc1824
Merge branch 'feature/bma/markdown_roomlist' into notification-spoilers
bmarty Nov 16, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions changelog.d/3477.feature
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
Make notification text spoiler aware
12 changes: 8 additions & 4 deletions ...k-android/src/main/java/org/matrix/android/sdk/api/session/room/timeline/TimelineEvent.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,10 @@ import org.matrix.android.sdk.api.session.room.model.EventAnnotationsSummary
import org.matrix.android.sdk.api.session.room.model.ReadReceipt
import org.matrix.android.sdk.api.session.room.model.message.MessageContent
import org.matrix.android.sdk.api.session.room.model.message.MessageStickerContent
import org.matrix.android.sdk.api.session.room.model.message.MessageTextContent
import org.matrix.android.sdk.api.session.room.model.relation.RelationDefaultContent
import org.matrix.android.sdk.api.session.room.sender.SenderInfo
import org.matrix.android.sdk.api.util.ContentUtils
import org.matrix.android.sdk.api.util.ContentUtils.extractUsefulTextFromReply

/**
Expand Down Expand Up @@ -138,7 +140,9 @@ fun TimelineEvent.getLastMessageBody(): String? {
val lastMessageContent = getLastMessageContent()

if (lastMessageContent != null) {
return lastMessageContent.newContent?.toModel<MessageContent>()?.body
return lastMessageContent.newContent?.toModel<MessageTextContent>()?.formattedBody?.let { ContentUtils.formatSpoilerTextFromHtml(it) }
?: lastMessageContent.newContent?.toModel<MessageContent>()?.body
?: (lastMessageContent as MessageTextContent).formattedBody?.let { ContentUtils.formatSpoilerTextFromHtml(it) }
?: lastMessageContent.body
}

Expand All @@ -157,10 +161,10 @@ fun TimelineEvent.isEdition(): Boolean {
}

fun TimelineEvent.getTextEditableContent(): String? {
val lastContent = getLastMessageContent()
val lastBody = getLastMessageBody()
return if (isReply()) {
return extractUsefulTextFromReply(lastContent?.body ?: "")
return extractUsefulTextFromReply(lastBody ?: "")
} else {
lastContent?.body ?: ""
lastBody
}
}
11 changes: 11 additions & 0 deletions matrix-sdk-android/src/main/java/org/matrix/android/sdk/api/util/ContentUtils.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
*/
package org.matrix.android.sdk.api.util

import org.matrix.android.sdk.internal.util.unescapeHtml

object ContentUtils {
fun extractUsefulTextFromReply(repliedBody: String): String {
val lines = repliedBody.lines()
Expand Down Expand Up @@ -44,4 +46,13 @@ object ContentUtils {
}
return repliedBody
}

@Suppress("RegExpRedundantEscape")
fun formatSpoilerTextFromHtml(formattedBody: String): String {
// var reason = "",
// can capture the spoiler reason for better formatting? ex. { reason = it.value; ">"}
return formattedBody.replace("(?<=<span data-mx-spoiler)=\\\".+?\\\">".toRegex(), ">")
.replace("(?<=<span data-mx-spoiler>).+?(?=</span>)".toRegex(), { "█".repeat(it.value.length); })
.unescapeHtml()
}
}
15 changes: 14 additions & 1 deletion ...java/im/vector/app/features/home/room/detail/timeline/format/DisplayableEventFormatter.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import org.matrix.android.sdk.api.session.room.model.message.MessageType
import org.matrix.android.sdk.api.session.room.model.message.OPTION_TYPE_BUTTONS
import org.matrix.android.sdk.api.session.room.model.relation.ReactionContent
import org.matrix.android.sdk.api.session.room.timeline.TimelineEvent
import org.matrix.android.sdk.api.session.room.timeline.getLastMessageBody
import org.matrix.android.sdk.api.session.room.timeline.getLastMessageContent
import org.matrix.android.sdk.api.session.room.timeline.getTextEditableContent
import org.matrix.android.sdk.api.session.room.timeline.isReply
Expand Down Expand Up @@ -93,7 +94,19 @@ class DisplayableEventFormatter @Inject constructor(
simpleFormat(senderName, stringProvider.getString(R.string.sent_a_video), appendAuthor)
}
MessageType.MSGTYPE_FILE -> {
simpleFormat(senderName, stringProvider.getString(R.string.sent_a_file), appendAuthor)
return simpleFormat(senderName, stringProvider.getString(R.string.sent_a_file), appendAuthor)
}
MessageType.MSGTYPE_TEXT -> {
todo fix merge issue
return if (timelineEvent.isReply()) {
// Skip reply prefix, and show important
// TODO add a reply image span ?
simpleFormat(senderName, timelineEvent.getTextEditableContent()
?: messageContent.body, appendAuthor)
} else {
simpleFormat(senderName, timelineEvent.getLastMessageBody()
?: messageContent.body, appendAuthor)
}
}
MessageType.MSGTYPE_RESPONSE -> {
// do not show that?
Expand Down