From 80939aa09228d76267a9efd2893cc5c961890cda Mon Sep 17 00:00:00 2001
From: in1tiate <32779090+in1tiate@users.noreply.github.com>
Date: Tue, 3 Oct 2023 13:51:27 -0500
Subject: [PATCH 1/4] critical fix (#921)

---
 src/courtroom.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index 65c5e1a..ea40628 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -900,7 +900,7 @@ void Courtroom::set_widgets()
       tr("Choose an effect to play on your next spoken message.\n"
          "The effects are defined in your theme/effects/effects.ini. Your "
          "character can define custom effects by\n"
-         "char.ini [Options] category, effects = 'miscname' where it referes "
+         "char.ini [Options] category, effects = 'miscname' where it refers "
          "to misc/<miscname>/effects.ini to read the effects."));
   // Todo: recode this entire fucking system with these dumbass goddamn ini's
   // why is everything so specifically coded for all these purposes is ABSTRACT

From ab4fc177cbe4166e6173405e651503e1db1335fb Mon Sep 17 00:00:00 2001
From: in1tiate <32779090+in1tiate@users.noreply.github.com>
Date: Sun, 5 Nov 2023 05:28:51 -0600
Subject: [PATCH 2/4] fix themes not loading from mounted base folders

---
 src/widgets/aooptionsdialog.cpp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/widgets/aooptionsdialog.cpp b/src/widgets/aooptionsdialog.cpp
index 8b7befe..38db445 100644
--- a/src/widgets/aooptionsdialog.cpp
+++ b/src/widgets/aooptionsdialog.cpp
@@ -176,7 +176,7 @@ void AOOptionsDialog::updateValues()
 
   for (const QString &base : bases) {
     QStringList l_themes =
-        QDir(base + "themes").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
+        QDir(base + "/themes").entryList(QDir::Dirs | QDir::NoDotAndDotDot);
 
     // Resorts list to match numeric sorting found in Windows.
     QCollator l_sorting;

From e690e12ae29a520e869469b52d2b49a78a2a1577 Mon Sep 17 00:00:00 2001
From: in1tiate <32779090+in1tiate@users.noreply.github.com>
Date: Tue, 21 Nov 2023 04:41:15 -0600
Subject: [PATCH 3/4] Fix zooms with no emote modifier defaulting to 1 (show
 desk) (#925)

---
 src/courtroom.cpp | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/src/courtroom.cpp b/src/courtroom.cpp
index ea40628..6786aac 100644
--- a/src/courtroom.cpp
+++ b/src/courtroom.cpp
@@ -1830,6 +1830,8 @@ void Courtroom::on_chat_return_pressed()
 
   QStringList packet_contents;
   QString f_side;
+  // have to fetch this early for a workaround. i hate this system, but i am stuck with it for now
+  int f_emote_mod = ao_app->get_emote_mod(current_char, current_emote);
 
   if (current_side == "")
     f_side = ao_app->get_char_side(current_char);
@@ -1846,14 +1848,15 @@ void Courtroom::on_chat_return_pressed()
       else if (f_desk_mod == DESK_EMOTE_ONLY_EX || f_desk_mod == DESK_EMOTE_ONLY)
         f_desk_mod = DESK_SHOW;
     }
-    if (f_desk_mod == -1)
+    if (f_desk_mod == -1 && (f_emote_mod == 5 || f_emote_mod == 6)) // workaround for inis that broke after deprecating "chat"
+      f_desk_mod = DESK_HIDE;
+    else if (f_desk_mod == -1)
       f_desk_mod = DESK_SHOW;
   }
 
   packet_contents.append(QString::number(f_desk_mod));
 
   QString f_pre = ao_app->get_pre_emote(current_char, current_emote);
-  int f_emote_mod = ao_app->get_emote_mod(current_char, current_emote);
   QString f_sfx = "1";
   int f_sfx_delay = get_char_sfx_delay();
 

From 0729b917b4cb3c0672c80ee9585a1019b2464e89 Mon Sep 17 00:00:00 2001
From: lambdcalculus <64238778+lambdcalculus@users.noreply.github.com>
Date: Thu, 23 Nov 2023 09:42:20 -0300
Subject: [PATCH 4/4] encode URL before streaming (#926)

---
 src/aomusicplayer.cpp | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/aomusicplayer.cpp b/src/aomusicplayer.cpp
index 366335a..1bbcf5a 100644
--- a/src/aomusicplayer.cpp
+++ b/src/aomusicplayer.cpp
@@ -38,7 +38,8 @@ QString AOMusicPlayer::play(QString p_song, int channel, bool loop,
         BASS_ChannelStop(m_stream_list[channel]);
         return QObject::tr("[MISSING] Streaming disabled.");
     }
-    newstream = BASS_StreamCreateURL(f_path.toStdString().c_str(), 0, streaming_flags, nullptr, 0);
+    QUrl l_url = QUrl(f_path);
+    newstream = BASS_StreamCreateURL(l_url.toEncoded().toStdString().c_str(), 0, streaming_flags, nullptr, 0);
   }
   else {
     f_path = ao_app->get_real_path(ao_app->get_music_path(p_song));