Fix relative emote urls

RblSb · Jul 29, 2024 · e0fddd8 · e0fddd8
1 parent 63b0384
commit e0fddd8
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/lib/main.dart b/lib/main.dart
@@ -192,7 +192,9 @@ class _ServerListPageState extends State<ServerListPage> {
     if (!link.contains('://')) link = 'http://$link';
     final uri = Uri.parse(link);
     final protocol = uri.scheme == 'https' ? 'wss' : 'ws';
-    final port = uri.port == 80 ? '' : ':${uri.port}';
+    var port = uri.port == 0 ? '' : ':${uri.port}';
+    if (uri.scheme == 'http' && uri.port == 80) port = '';
+    if (uri.scheme == 'https' && uri.port == 443) port = '';
     final url = '$protocol://${uri.host}$port${uri.path}';
     Navigator.of(context).popUntil((route) => route.isFirst);
     Navigator.push(

diff --git a/lib/models/app.dart b/lib/models/app.dart
@@ -155,7 +155,7 @@ class AppModel extends ChangeNotifier {
         );
         playlist.setPlaylistLock(type.isPlaylistOpen);
         player.loadVideo(playlist.pos);
-        chat.setEmotes(type.config.emotes);
+        chat.setEmotes(type.config.emotes, getChannelLink());
         chatPanel.notifyListeners();
         if (chat.isUnknownClient) tryAutologin();
         break;

diff --git a/lib/models/chat.dart b/lib/models/chat.dart
@@ -53,7 +53,12 @@ class ChatModel extends ChangeNotifier {
     notifyListeners();
   }
 
-  void setEmotes(List<Emotes> emotes) {
+  void setEmotes(List<Emotes> emotes, String relativeHost) {
+    for (final emote in emotes) {
+      if (emote.image.startsWith('/')) {
+        emote.image = '$relativeHost${emote.image}';
+      }
+    }
     _emotes = emotes;
     emotesPattern = RegExp('(' +
         escapeRegExp(