Merge pull request #2562 from SpiritCroc/notice_preview

Enable URL-previews for notices
This commit is contained in:
Benoit Marty 2020-12-20 20:26:18 +01:00 committed by GitHub
commit 621c6c8773
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 2 deletions

View File

@ -2,7 +2,7 @@ Changes in Element 1.0.14 (2020-XX-XX)
===================================================
Features ✨:
-
- Enable url previews for notices (#2562)
Improvements 🙌:
-

View File

@ -32,7 +32,9 @@ internal class UrlsExtractor @Inject constructor() {
return event.takeIf { it.getClearType() == EventType.MESSAGE }
?.getClearContent()
?.toModel<MessageContent>()
?.takeIf { it.msgType == MessageType.MSGTYPE_TEXT || it.msgType == MessageType.MSGTYPE_EMOTE }
?.takeIf { it.msgType == MessageType.MSGTYPE_TEXT ||
it.msgType == MessageType.MSGTYPE_NOTICE ||
it.msgType == MessageType.MSGTYPE_EMOTE }
?.body
?.let { urlRegex.findAll(it) }
?.map { it.value }

View File

@ -512,6 +512,9 @@ class MessageItemFactory @Inject constructor(
return MessageTextItem_()
.leftGuideline(avatarSizeProvider.leftGuideline)
.previewUrlRetriever(callback?.getPreviewUrlRetriever())
.imageContentRenderer(imageContentRenderer)
.previewUrlCallback(callback)
.attributes(attributes)
.message(message)
.highlighted(highlight)