From f35bb5c8ac29f9c8165a7769757baa6c24107a6a Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Thu, 5 Dec 2024 19:46:47 +0100
Subject: [PATCH 01/10] Fix #618: Fix custom emojis vs upper/lower case.

---
 CHANGELOG.md                   | 6 ++++++
 conversejs/build-conversejs.sh | 6 ++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 692437e7..7fd962f9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## 12.0.1
+
+### Minor changes and fixes
+
+* Fix custom emojis vs upper/lower case.
+
 ## 12.0.0
 
 ### Importante Notes
diff --git a/conversejs/build-conversejs.sh b/conversejs/build-conversejs.sh
index 9bdd36e3..cffac2bd 100644
--- a/conversejs/build-conversejs.sh
+++ b/conversejs/build-conversejs.sh
@@ -31,8 +31,10 @@ CONVERSE_COMMIT="8f32df723e3aa392db02326dc6a3279c9497b6fb"
 
 # 2024-09-03: include badges short label and quick fix for sendMessage button
 CONVERSE_REPO="https://github.com/JohnXLivingston/converse.js"
-CONVERSE_VERSION="livechat-12.0.0"
-# CONVERSE_COMMIT=""
+CONVERSE_VERSION="livechat-12.0.1"
+CONVERSE_COMMIT=""
+# 2024-12-05: fix emojis (don't want some upstream feature, but want this fix)
+# CONVERSE_COMMIT="366a718f16e96c88c6d768722f1525801a2f0c4d"
 
 rootdir="$(pwd)"
 src_dir="$rootdir/conversejs"

From 1bea08654f7084f29a6800cdc6ca0c99a2cd7f35 Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Thu, 5 Dec 2024 19:49:47 +0100
Subject: [PATCH 02/10] Bump version 12.0.1

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 8ffed1a3..ebdae7f3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "peertube-plugin-livechat",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "peertube-plugin-livechat",
-      "version": "12.0.0",
+      "version": "12.0.1",
       "license": "AGPL-3.0",
       "dependencies": {
         "@xmpp/jid": "^0.13.1",
diff --git a/package.json b/package.json
index 5d5dba38..4b76801d 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "peertube-plugin-livechat",
   "description": "PeerTube plugin livechat: create chat rooms for your Peertube lives! Comes with many features: federation, moderation tools, chat bot, chat persistence, OBS integration, ...",
-  "version": "12.0.0",
+  "version": "12.0.1",
   "license": "AGPL-3.0",
   "author": {
     "name": "John Livingston",

From d0797ba6313c3bed3f9532d9961c64729c63a6e4 Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Tue, 10 Dec 2024 11:25:33 +0100
Subject: [PATCH 03/10] Fix task list label styling.

---
 CHANGELOG.md                                               | 4 ++++
 conversejs/custom/plugins/tasks/styles/muc-task-lists.scss | 5 +++++
 conversejs/custom/plugins/tasks/templates/muc-task-list.js | 2 +-
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7fd962f9..9b1cc078 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # Changelog
 
+## 12.0.2
+
+* Fix task list label styling.
+
 ## 12.0.1
 
 ### Minor changes and fixes
diff --git a/conversejs/custom/plugins/tasks/styles/muc-task-lists.scss b/conversejs/custom/plugins/tasks/styles/muc-task-lists.scss
index 371cbd11..f0ee6a7b 100644
--- a/conversejs/custom/plugins/tasks/styles/muc-task-lists.scss
+++ b/conversejs/custom/plugins/tasks/styles/muc-task-lists.scss
@@ -34,6 +34,11 @@
       .task-list-name {
         flex-grow: 2;
 
+        label {
+          // Cancelling the Peertube margin-bottom on labels
+          margin: 0;
+        }
+
         form {
           display: flex;
           flex-flow: row nowrap;
diff --git a/conversejs/custom/plugins/tasks/templates/muc-task-list.js b/conversejs/custom/plugins/tasks/templates/muc-task-list.js
index 88c1a950..f05d96b7 100644
--- a/conversejs/custom/plugins/tasks/templates/muc-task-list.js
+++ b/conversejs/custom/plugins/tasks/templates/muc-task-list.js
@@ -39,7 +39,7 @@ export default function tplMucTaskList (el, tasklist) {
       ${!el.edit
         ? html`
           <div class="task-list-name">
-            <a @click=${el.toggleTasks}>${tasklist.get('name')}</a>
+            <a @click=${el.toggleTasks}><label>${tasklist.get('name')}</label></a>
           </div>
           <button type="button" class="task-list-action" title="${i18nCreateTask}" @click=${el.openAddTaskForm}>
             <converse-icon class="fa fa-plus" size="1em"></converse-icon>

From ff8a148dbc079f3c2f6837ff7e2b0b51e4a54b31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ji=C5=99=C3=AD=20Podhoreck=C3=BD?= <j.podhorecky@gmail.com>
Date: Mon, 9 Dec 2024 16:37:56 +0000
Subject: [PATCH 04/10] Translated using Weblate (Czech)

Currently translated at 9.3% (84 of 899 strings)

Translation: PeerTube LiveChat/Peertube Plugin Livechat Documentation
Translate-URL: https://weblate.framasoft.org/projects/peertube-livechat/peertube-plugin-livechat-documentation/cs/
---
 support/documentation/po/livechat.cs.po | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/support/documentation/po/livechat.cs.po b/support/documentation/po/livechat.cs.po
index cfce0d3b..ac75b2fa 100644
--- a/support/documentation/po/livechat.cs.po
+++ b/support/documentation/po/livechat.cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: peertube-plugin-livechat-documentation VERSION\n"
 "POT-Creation-Date: 2024-09-12 12:53+0200\n"
-"PO-Revision-Date: 2024-11-26 23:02+0000\n"
+"PO-Revision-Date: 2024-12-09 19:37+0000\n"
 "Last-Translator: Jiří Podhorecký <j.podhorecky@gmail.com>\n"
 "Language-Team: Czech <https://weblate.framasoft.org/projects/"
 "peertube-livechat/peertube-plugin-livechat-documentation/cs/>\n"
@@ -487,11 +487,14 @@ msgstr ""
 #: support/documentation/content/en/contributing/develop/_index.md
 msgid "When the plugin is already installed on your dev instance, and you haven't changed any dependency, you can quickly install your work by following these steps:"
 msgstr ""
+"Pokud je zásuvný modul již nainstalován v instanci dev a nezměnili jste "
+"žádnou závislost, můžete rychle nainstalovat svou práci podle následujících "
+"kroků:"
 
 #. type: Bullet: '* '
 #: support/documentation/content/en/contributing/develop/_index.md
 msgid "re-build necessary parts of the plugin (client, styles, ...),"
-msgstr ""
+msgstr "znovu sestavit potřebné části zásuvného modulu (klient, styly, ...),"
 
 #. type: Bullet: '* '
 #: support/documentation/content/en/contributing/develop/_index.md

From 2975018f91e5f9d4c6943569f298d8ef2ceaf16b Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Tue, 10 Dec 2024 11:27:37 +0100
Subject: [PATCH 05/10] Changelog

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9b1cc078..4e2069d0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,7 @@
 ## 12.0.2
 
 * Fix task list label styling.
+* Translations updates.
 
 ## 12.0.1
 

From f9938b5f9ddf061bd44d39f2e5efa502cc68f961 Mon Sep 17 00:00:00 2001
From: Eder Etxebarria <eder.etxebarria@ni.eus>
Date: Fri, 6 Dec 2024 13:31:49 +0000
Subject: [PATCH 06/10] Translated using Weblate (Basque)

Currently translated at 9.8% (31 of 316 strings)

Translation: PeerTube LiveChat/Peertube Plugin LiveChat
Translate-URL: https://weblate.framasoft.org/projects/peertube-livechat/peertube-plugin-livechat/eu/
---
 languages/eu.yml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/languages/eu.yml b/languages/eu.yml
index 5d89ad8c..e050c2b8 100644
--- a/languages/eu.yml
+++ b/languages/eu.yml
@@ -8,7 +8,7 @@ read_only: Irakurtzeko soilik
 show_scrollbarr: Erakutsi korritze-barra
 transparent_background: Atzealde gardena (zuzenekoekin integratzeko, OBSrekin kasu)
 tips_for_streamers: "Zuzeneko bideogileentzako aholkuak: txata OBSn gehitzeko, sortu
-  irakurtzeko soilik den esteka bat eta erabili nabigatzaileko iturburu gisa."
+  irakurtzeko soilik den esteka bat\neta erabili nabigatzaileko iturburu gisa.\n"
 copy: Kopiatu
 link_copied: Esteka kopiatu da
 error: Errorea
@@ -32,3 +32,4 @@ important_note_text: "Osagarriaren dokumentazioa aurki dezakezu hemen:\n<a href=
   https://livingston.frama.io/peertube-plugin-livechat/\" target=\"_blank\">\n  Peertube
   Plugin Livechat-en dokumentazioa\n</a>.\n"
 chat: Txata
+copied: Kopiatuta

From 373a3901f55bd2f5ce318f1f2f51e42eee479c51 Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Tue, 10 Dec 2024 11:30:47 +0100
Subject: [PATCH 07/10] Bump version 12.0.2

---
 package-lock.json | 4 ++--
 package.json      | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index ebdae7f3..95b19cd3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "peertube-plugin-livechat",
-  "version": "12.0.1",
+  "version": "12.0.2",
   "lockfileVersion": 2,
   "requires": true,
   "packages": {
     "": {
       "name": "peertube-plugin-livechat",
-      "version": "12.0.1",
+      "version": "12.0.2",
       "license": "AGPL-3.0",
       "dependencies": {
         "@xmpp/jid": "^0.13.1",
diff --git a/package.json b/package.json
index 4b76801d..33ce6aed 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "peertube-plugin-livechat",
   "description": "PeerTube plugin livechat: create chat rooms for your Peertube lives! Comes with many features: federation, moderation tools, chat bot, chat persistence, OBS integration, ...",
-  "version": "12.0.1",
+  "version": "12.0.2",
   "license": "AGPL-3.0",
   "author": {
     "name": "John Livingston",

From 238d62f17d1388a823df589df211c34e446c8d25 Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Tue, 10 Dec 2024 11:33:09 +0100
Subject: [PATCH 08/10] Changelog

---
 CHANGELOG.md | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4e2069d0..f9b71400 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## 12.0.2
 
+### Minor changes and fixes
+
 * Fix task list label styling.
 * Translations updates.
 

From b54c17e497782ca0e78e98ce0d38b0abb9c1acdf Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Tue, 10 Dec 2024 11:41:44 +0100
Subject: [PATCH 09/10] Fix styling for "configure mod_firewall" button +
 Peertube v7.0.0 compatibility

---
 CHANGELOG.md     | 6 ++++++
 languages/cs.yml | 2 +-
 languages/de.yml | 2 +-
 languages/en.yml | 2 +-
 languages/fr.yml | 2 +-
 languages/hr.yml | 2 +-
 languages/ja.yml | 2 +-
 7 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f9b71400..5168289b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,11 @@
 # Changelog
 
+## ??? (Not Released Yet)
+
+### Minor changes and fixes
+
+* Fix styling for "configure mod_firewall" button + Peertube v7.0.0 compatibility
+
 ## 12.0.2
 
 ### Minor changes and fixes
diff --git a/languages/cs.yml b/languages/cs.yml
index 1484cada..573c6568 100644
--- a/languages/cs.yml
+++ b/languages/cs.yml
@@ -484,7 +484,7 @@ search_occupant_message: Vyhledat všechny zprávy
 message_search: Hledání zpráv
 message_search_original_nick: Přezdívka účastníka v době odeslání zprávy
 prosody_firewall_label: Povolit mod_firewall Prosody
-prosody_firewall_configure_button: "<a class=\"peertube-button-link orange-button\"\
+prosody_firewall_configure_button: "<a class=\"peertube-button-link orange-button secondary-button\"\
   \ href=\"/p/livechat/admin/firewall\" target=\"_blank\">Konfigurace mod_firewall</a>\n"
 prosody_firewall_configuration: Konfigurace mod_firewall Prosody
 prosody_firewall_disabled_warning: "Varování: mod_firewall je zakázán v nastavení
diff --git a/languages/de.yml b/languages/de.yml
index 047f2803..b04ff910 100644
--- a/languages/de.yml
+++ b/languages/de.yml
@@ -578,7 +578,7 @@ prosody_firewall_description: "Sie können <a href=\"https://modules.prosody.im/
   \ target=\"_blank\">mod_firewall</a> auf Ihrem Prosody-Server aktivieren.\nWeitere
   Informationen finden Sie unter <a href=\"https://livingston.frama.io/peertube-plugin-livechat/de/documentation/admin/mod_firewall/\"\
   \ target=\"_blank\">in der Dokumentation</a>.\n"
-prosody_firewall_configure_button: "<a class=\"peertube-button-link orange-button\"\
+prosody_firewall_configure_button: "<a class=\"peertube-button-link orange-button secondary-button\"\
   \ href=\"/p/livechat/admin/firewall\" target=\"_blank\">mod_firewall konfigurieren</a>\n"
 prosody_firewall_configuration: Prosody mod_firewall Konfiguration
 prosody_firewall_configuration_help: "Hier können Sie das Modul Prosody <a href=\"\
diff --git a/languages/en.yml b/languages/en.yml
index 81cce586..e6c7469b 100644
--- a/languages/en.yml
+++ b/languages/en.yml
@@ -620,7 +620,7 @@ prosody_firewall_description: |
   You can enable <a href="https://modules.prosody.im/mod_firewall" target="_blank">mod_firewall</a> on your Prosody server.
   For more information, please check <a href="https://livingston.frama.io/peertube-plugin-livechat/documentation/admin/mod_firewall/" target="_blank">the documentation</a>.
 prosody_firewall_configure_button: |
-  <a class="peertube-button-link orange-button" href="/p/livechat/admin/firewall" target="_blank">Configure mod_firewall</a>
+  <a class="peertube-button-link orange-button secondary-button" href="/p/livechat/admin/firewall" target="_blank">Configure mod_firewall</a>
 
 prosody_firewall_configuration: Prosody mod_firewall configuration
 prosody_firewall_configuration_help: |
diff --git a/languages/fr.yml b/languages/fr.yml
index e74e7d34..214bffaf 100644
--- a/languages/fr.yml
+++ b/languages/fr.yml
@@ -596,7 +596,7 @@ message_search: Recherche de messages
 search_occupant_message: Rechercher tous les messages
 message_search_original_nick: Pseudonyme du participant⋅e au moment de l'envoi du
   message
-prosody_firewall_configure_button: "<a class=\"peertube-button-link orange-button\"\
+prosody_firewall_configure_button: "<a class=\"peertube-button-link orange-button secondary-button\"\
   \ href=\"/p/livechat/admin/firewall\" target=\"_blank\">Configurer mod_firewall</a>\n"
 prosody_firewall_configuration: Configuration de mod_firewall pour Prosody
 prosody_firewall_label: Activer mod_firewall pour Prosody
diff --git a/languages/hr.yml b/languages/hr.yml
index 6e849d5f..473b58ba 100644
--- a/languages/hr.yml
+++ b/languages/hr.yml
@@ -410,7 +410,7 @@ prosody_firewall_description: "<a href=\"https://modules.prosody.im/mod_firewall
   \ target=\"_blank\">mod_firewall</a> možeš aktivirati na svom Prosody serveru.\n
   Za više informacija pročitaj <a href=\"https://livingston.frama.io/peertube-plugin-livechat/documentation/admin/mod_firewall/\"\
   \ target=\"_blank\">dokumentaciju</a>.\n"
-prosody_firewall_configure_button: "<a class=\"peertube-button-link orange-button\"\
+prosody_firewall_configure_button: "<a class=\"peertube-button-link orange-button secondary-button\"\
   \ href=\"/p/livechat/admin/firewall\" target=\"_blank\">Kofiguriraj mod_firewall</a>\n"
 prosody_firewall_configuration: Prosody mod_firewall konfiguracija
 prosody_firewall_configuration_help: "Ovdje možeš konfigurirati modul Prosody <a href=\"\
diff --git a/languages/ja.yml b/languages/ja.yml
index c6964122..c4321461 100644
--- a/languages/ja.yml
+++ b/languages/ja.yml
@@ -327,7 +327,7 @@ moderator_notes: モデレーションノート
 moderator_note_search_for_participant: ノートを検索
 message_search_original_nick: メッセージ送信時の参加者のニックネーム
 prosody_firewall_label: Prosody mod_firewallを有効にする
-prosody_firewall_configure_button: "<a class=\"peertube-button-link orange-button\"\
+prosody_firewall_configure_button: "<a class=\"peertube-button-link orange-button secondary-button\"\
   \ href=\"/p/livechat/admin/firewall\" target=\"_blank\">mod_firewallを設定</a>\n"
 prosody_firewall_file_enabled: 有効
 prosody_firewall_name: 名前

From 3f256b1027d76a47d9b8e38414dd2b805cdc9fd0 Mon Sep 17 00:00:00 2001
From: John Livingston <git@john-livingston.fr>
Date: Tue, 10 Dec 2024 11:44:54 +0100
Subject: [PATCH 10/10] Fixing gitlab CI.

---
 .gitlab-ci.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1e3e485f..b836f5b6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -19,7 +19,7 @@ builddoctranslations:
 
 pages:
   stage: deploy
-  image: registry.gitlab.com/pages/hugo/hugo_extended:latest
+  image: registry.gitlab.com/pages/hugo/hugo_extended:0.132.2
   variables:
     GIT_SUBMODULE_STRATEGY: recursive
     GIT_SUBMODULE_PATHS: support/documentation/themes/hugo-theme-relearn