Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
47f6e5a890 | ||
|
|
dd89b87aea | ||
|
|
d47e42401c | ||
|
|
39511a3224 | ||
|
|
1b7bbe4b8a | ||
|
|
00c221a805 |
@@ -384,22 +384,29 @@ class MatrixSyncService : Service() {
|
|||||||
|
|
||||||
val content = event.optJSONObject("content") ?: JSONObject()
|
val content = event.optJSONObject("content") ?: JSONObject()
|
||||||
val encrypted = eventType == "m.room.encrypted"
|
val encrypted = eventType == "m.room.encrypted"
|
||||||
|
val msgtype = content.optString("msgtype")
|
||||||
|
val rawBody = content.optString("body")
|
||||||
val body = when {
|
val body = when {
|
||||||
encrypted -> "Encrypted message"
|
encrypted -> "Encrypted message"
|
||||||
eventType == "m.sticker" -> "Sticker"
|
eventType == "m.sticker" -> "Sticker"
|
||||||
else -> {
|
else -> when (msgtype) {
|
||||||
val msgtype = content.optString("msgtype")
|
"m.image" -> "Photo"
|
||||||
val rawBody = content.optString("body")
|
"m.video" -> rawBody.ifBlank { "Video" }
|
||||||
when (msgtype) {
|
"m.audio" -> rawBody.ifBlank { "Audio" }
|
||||||
"m.image" -> "Photo"
|
"m.file" -> rawBody.ifBlank { "File" }
|
||||||
"m.video" -> rawBody.ifBlank { "Video" }
|
else -> rawBody.takeIf { it.isNotBlank() }
|
||||||
"m.audio" -> rawBody.ifBlank { "Audio" }
|
|
||||||
"m.file" -> rawBody.ifBlank { "File" }
|
|
||||||
else -> rawBody.takeIf { it.isNotBlank() }
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
} ?: continue
|
} ?: continue
|
||||||
|
|
||||||
|
// Fetch an inline preview for image/sticker events. Plaintext only —
|
||||||
|
// encrypted media can't be decrypted inside the raw-sync listener.
|
||||||
|
val inlineImage =
|
||||||
|
if (!encrypted && (msgtype == "m.image" || eventType == "m.sticker")) {
|
||||||
|
resolveInlineImage(content, homeserver, token)
|
||||||
|
} else {
|
||||||
|
null
|
||||||
|
}
|
||||||
|
|
||||||
val profile = try {
|
val profile = try {
|
||||||
resolveProfile(sender, homeserver, token)
|
resolveProfile(sender, homeserver, token)
|
||||||
} catch (e: Exception) {
|
} catch (e: Exception) {
|
||||||
@@ -414,7 +421,7 @@ class MatrixSyncService : Service() {
|
|||||||
profile.displayName,
|
profile.displayName,
|
||||||
body,
|
body,
|
||||||
profile.avatar,
|
profile.avatar,
|
||||||
null,
|
inlineImage,
|
||||||
resolveGroupInfo(roomId, notifyCtx),
|
resolveGroupInfo(roomId, notifyCtx),
|
||||||
)
|
)
|
||||||
notifiedForRoom = true
|
notifiedForRoom = true
|
||||||
@@ -678,6 +685,37 @@ class MatrixSyncService : Service() {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Resolve an inline preview bitmap for an image/sticker event content.
|
||||||
|
* Prefers a small thumbnail (keeps the notification light), falling back to the
|
||||||
|
* full download. Only works for plaintext events — encrypted media can't be
|
||||||
|
* decrypted inside the raw-sync listener.
|
||||||
|
*/
|
||||||
|
private fun resolveInlineImage(
|
||||||
|
content: JSONObject,
|
||||||
|
homeserver: String,
|
||||||
|
token: String,
|
||||||
|
): Bitmap? {
|
||||||
|
val info = content.optJSONObject("info")
|
||||||
|
val thumbnailMxc =
|
||||||
|
info?.optString("thumbnail_url")?.takeIf { it.startsWith("mxc://") }
|
||||||
|
?: info?.optJSONObject("thumbnail_file")?.optString("url")?.takeIf { it.startsWith("mxc://") }
|
||||||
|
if (thumbnailMxc != null) {
|
||||||
|
for (url in mxcToThumbnailUrls(thumbnailMxc, homeserver, 512)) {
|
||||||
|
downloadBitmap(url, token)?.let { return it }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
val fullMxc =
|
||||||
|
content.optString("url").takeIf { it.startsWith("mxc://") }
|
||||||
|
?: content.optJSONObject("file")?.optString("url")?.takeIf { it.startsWith("mxc://") }
|
||||||
|
if (fullMxc != null) {
|
||||||
|
for (url in mxcToDownloadUrls(fullMxc, homeserver)) {
|
||||||
|
downloadBitmap(url, token)?.let { return it }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return null
|
||||||
|
}
|
||||||
|
|
||||||
private data class NotificationGroupInfo(
|
private data class NotificationGroupInfo(
|
||||||
val groupId: String,
|
val groupId: String,
|
||||||
val groupName: String,
|
val groupName: String,
|
||||||
|
|||||||
+1
-1
Submodule cinny updated: 47979718eb...b16263b481
+1
-1
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "paarrot",
|
"name": "paarrot",
|
||||||
"version": "4.11.171",
|
"version": "4.11.174",
|
||||||
"description": "Paarrot - A Matrix client based on Cinny",
|
"description": "Paarrot - A Matrix client based on Cinny",
|
||||||
"engines": {
|
"engines": {
|
||||||
"node": ">=18.0.0"
|
"node": ">=18.0.0"
|
||||||
|
|||||||
Reference in New Issue
Block a user