From 220f8e35e633f7271f266fefdc3c43e014848454 Mon Sep 17 00:00:00 2001
From: Janne Koschinski <janne@kuschku.de>
Date: Sat, 31 Mar 2018 23:17:04 +0200
Subject: [PATCH] Undo attempt at fixing IRCCloud avatar rendering
---
.../de/kuschku/quasseldroid/ui/chat/messages/DisplayMessage.kt | 2 +-
.../java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/DisplayMessage.kt b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/DisplayMessage.kt
index 978800331..8a3f6fb43 100644
--- a/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/DisplayMessage.kt
+++ b/app/src/main/java/de/kuschku/quasseldroid/ui/chat/messages/DisplayMessage.kt
@@ -20,7 +20,7 @@ data class DisplayMessage(
val tag = Tag(content.messageId, content.followUp, isSelected, isExpanded, isMarkerLine)
val avatarUrl = content.sender.let {
- Regex("~?[us]id(\\d+)").matchEntire(HostmaskHelper.user(it))?.groupValues?.lastOrNull()?.let {
+ Regex("[us]id(\\d+)").matchEntire(HostmaskHelper.user(it))?.groupValues?.lastOrNull()?.let {
"https://www.irccloud.com/avatar-redirect/$it"
}
}
diff --git a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
index d8da0de01..03af6d933 100644
--- a/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
+++ b/viewmodel/src/main/java/de/kuschku/quasseldroid/viewmodel/QuasselViewModel.kt
@@ -182,7 +182,7 @@ class QuasselViewModel : ViewModel() {
user.realName(),
user.isAway(),
network.support("CASEMAPPING"),
- Regex("~?[us]id(\\d+)").matchEntire(user.user())?.groupValues?.lastOrNull()?.let {
+ Regex("[us]id(\\d+)").matchEntire(user.user())?.groupValues?.lastOrNull()?.let {
"https://www.irccloud.com/avatar-redirect/$it"
}
)
--
GitLab