matty/peertube-plugin-livechat
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'main' of https://github.com/JohnXLivingston/peertube-plugin-livechat

Browse Source
This commit is contained in:
matty 2024-12-11 10:32:09 -05:00
commit 8f722f5560
15 changed files with 46 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitlab-ci.yml
View File

@ -19,7 +19,7 @@ builddoctranslations:
pages: pages:
stage: deploy stage: deploy
image: registry.gitlab.com/pages/hugo/hugo_extended:latest image: registry.gitlab.com/pages/hugo/hugo_extended:0.132.2
variables: variables:
GIT_SUBMODULE_STRATEGY: recursive GIT_SUBMODULE_STRATEGY: recursive
GIT_SUBMODULE_PATHS: support/documentation/themes/hugo-theme-relearn GIT_SUBMODULE_PATHS: support/documentation/themes/hugo-theme-relearn

19
CHANGELOG.md
View File

@ -1,5 +1,24 @@
# Changelog # 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
* Fix task list label styling.
* Translations updates.
## 12.0.1
### Minor changes and fixes
* Fix custom emojis vs upper/lower case.
## 12.0.0 ## 12.0.0
### Importante Notes ### Importante Notes

6
conversejs/build-conversejs.sh
View File

@ -31,8 +31,10 @@ CONVERSE_COMMIT="8f32df723e3aa392db02326dc6a3279c9497b6fb"
# 2024-09-03: include badges short label and quick fix for sendMessage button # 2024-09-03: include badges short label and quick fix for sendMessage button
CONVERSE_REPO="https://github.com/JohnXLivingston/converse.js" CONVERSE_REPO="https://github.com/JohnXLivingston/converse.js"
CONVERSE_VERSION="livechat-12.0.0" CONVERSE_VERSION="livechat-12.0.1"
# CONVERSE_COMMIT="" CONVERSE_COMMIT=""
# 2024-12-05: fix emojis (don't want some upstream feature, but want this fix)
# CONVERSE_COMMIT="366a718f16e96c88c6d768722f1525801a2f0c4d"
rootdir="$(pwd)" rootdir="$(pwd)"
src_dir="$rootdir/conversejs" src_dir="$rootdir/conversejs"

5
conversejs/custom/plugins/tasks/styles/muc-task-lists.scss
View File

@ -34,6 +34,11 @@
.task-list-name { .task-list-name {
flex-grow: 2; flex-grow: 2;
label {
// Cancelling the Peertube margin-bottom on labels
margin: 0;
}
form { form {
display: flex; display: flex;
flex-flow: row nowrap; flex-flow: row nowrap;

2
conversejs/custom/plugins/tasks/templates/muc-task-list.js
View File

@ -39,7 +39,7 @@ export default function tplMucTaskList (el, tasklist) {
${!el.edit ${!el.edit
? html` ? html`
<div class="task-list-name"> <div class="task-list-name">
<a @click=${el.toggleTasks}>${tasklist.get('name')}</a> <a @click=${el.toggleTasks}><label>${tasklist.get('name')}</label></a>
</div> </div>
<button type="button" class="task-list-action" title="${i18nCreateTask}" @click=${el.openAddTaskForm}> <button type="button" class="task-list-action" title="${i18nCreateTask}" @click=${el.openAddTaskForm}>
<converse-icon class="fa fa-plus" size="1em"></converse-icon> <converse-icon class="fa fa-plus" size="1em"></converse-icon>

2
languages/cs.yml
View File

@ -484,7 +484,7 @@ search_occupant_message: Vyhledat všechny zprávy
message_search: Hledání zpráv message_search: Hledání zpráv
message_search_original_nick: Přezdívka účastníka v době odeslání zprávy message_search_original_nick: Přezdívka účastníka v době odeslání zprávy
prosody_firewall_label: Povolit mod_firewall Prosody 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" \ href=\"/p/livechat/admin/firewall\" target=\"_blank\">Konfigurace mod_firewall</a>\n"
prosody_firewall_configuration: Konfigurace mod_firewall Prosody prosody_firewall_configuration: Konfigurace mod_firewall Prosody
prosody_firewall_disabled_warning: "Varování: mod_firewall je zakázán v nastavení prosody_firewall_disabled_warning: "Varování: mod_firewall je zakázán v nastavení

2
languages/de.yml
View File

@ -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 \ 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/\"\ 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" \ 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" \ href=\"/p/livechat/admin/firewall\" target=\"_blank\">mod_firewall konfigurieren</a>\n"
prosody_firewall_configuration: Prosody mod_firewall Konfiguration prosody_firewall_configuration: Prosody mod_firewall Konfiguration
prosody_firewall_configuration_help: "Hier können Sie das Modul Prosody <a href=\"\ prosody_firewall_configuration_help: "Hier können Sie das Modul Prosody <a href=\"\

2
languages/en.yml
View File

@ -621,7 +621,7 @@ prosody_firewall_description: |
You can enable <a href="https://modules.prosody.im/mod_firewall" target="_blank">mod_firewall</a> on your Prosody server. 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>. 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: | 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: Prosody mod_firewall configuration
prosody_firewall_configuration_help: | prosody_firewall_configuration_help: |

3
languages/eu.yml
View File

@ -8,7 +8,7 @@ read_only: Irakurtzeko soilik
show_scrollbarr: Erakutsi korritze-barra show_scrollbarr: Erakutsi korritze-barra
transparent_background: Atzealde gardena (zuzenekoekin integratzeko, OBSrekin kasu) transparent_background: Atzealde gardena (zuzenekoekin integratzeko, OBSrekin kasu)
tips_for_streamers: "Zuzeneko bideogileentzako aholkuak: txata OBSn gehitzeko, sortu 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 copy: Kopiatu
link_copied: Esteka kopiatu da link_copied: Esteka kopiatu da
error: Errorea 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 https://livingston.frama.io/peertube-plugin-livechat/\" target=\"_blank\">\n Peertube
Plugin Livechat-en dokumentazioa\n</a>.\n" Plugin Livechat-en dokumentazioa\n</a>.\n"
chat: Txata chat: Txata
copied: Kopiatuta

2
languages/fr.yml
View File

@ -596,7 +596,7 @@ message_search: Recherche de messages
search_occupant_message: Rechercher tous les messages search_occupant_message: Rechercher tous les messages
message_search_original_nick: Pseudonyme du participant⋅e au moment de l'envoi du message_search_original_nick: Pseudonyme du participant⋅e au moment de l'envoi du
message 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" \ href=\"/p/livechat/admin/firewall\" target=\"_blank\">Configurer mod_firewall</a>\n"
prosody_firewall_configuration: Configuration de mod_firewall pour Prosody prosody_firewall_configuration: Configuration de mod_firewall pour Prosody
prosody_firewall_label: Activer mod_firewall pour Prosody prosody_firewall_label: Activer mod_firewall pour Prosody

2
languages/hr.yml
View File

@ -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 \ 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/\"\ Za više informacija pročitaj <a href=\"https://livingston.frama.io/peertube-plugin-livechat/documentation/admin/mod_firewall/\"\
\ target=\"_blank\">dokumentaciju</a>.\n" \ 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" \ href=\"/p/livechat/admin/firewall\" target=\"_blank\">Kofiguriraj mod_firewall</a>\n"
prosody_firewall_configuration: Prosody mod_firewall konfiguracija prosody_firewall_configuration: Prosody mod_firewall konfiguracija
prosody_firewall_configuration_help: "Ovdje možeš konfigurirati modul Prosody <a href=\"\ prosody_firewall_configuration_help: "Ovdje možeš konfigurirati modul Prosody <a href=\"\

2
languages/ja.yml
View File

@ -327,7 +327,7 @@ moderator_notes: モデレーションノート
moderator_note_search_for_participant: ノートを検索 moderator_note_search_for_participant: ノートを検索
message_search_original_nick: メッセージ送信時の参加者のニックネーム message_search_original_nick: メッセージ送信時の参加者のニックネーム
prosody_firewall_label: Prosody mod_firewallを有効にする 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" \ href=\"/p/livechat/admin/firewall\" target=\"_blank\">mod_firewallを設定</a>\n"
prosody_firewall_file_enabled: 有効 prosody_firewall_file_enabled: 有効
prosody_firewall_name: 名前 prosody_firewall_name: 名前

4
package-lock.json generated
View File

@ -1,12 +1,12 @@
{ {
"name": "peertube-plugin-livechat", "name": "peertube-plugin-livechat",
"version": "12.0.0", "version": "12.0.2",
"lockfileVersion": 2, "lockfileVersion": 2,
"requires": true, "requires": true,
"packages": { "packages": {
"": { "": {
"name": "peertube-plugin-livechat", "name": "peertube-plugin-livechat",
"version": "12.0.0", "version": "12.0.2",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"dependencies": { "dependencies": {
"@xmpp/jid": "^0.13.1", "@xmpp/jid": "^0.13.1",

2
package.json
View File

@ -1,7 +1,7 @@
{ {
"name": "peertube-plugin-livechat", "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, ...", "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.2",
"license": "AGPL-3.0", "license": "AGPL-3.0",
"author": { "author": {
"name": "John Livingston", "name": "John Livingston",

7
support/documentation/po/livechat.cs.po
View File

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: peertube-plugin-livechat-documentation VERSION\n" "Project-Id-Version: peertube-plugin-livechat-documentation VERSION\n"
"POT-Creation-Date: 2024-09-12 12:53+0200\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" "Last-Translator: Jiří Podhorecký <j.podhorecky@gmail.com>\n"
"Language-Team: Czech <https://weblate.framasoft.org/projects/" "Language-Team: Czech <https://weblate.framasoft.org/projects/"
"peertube-livechat/peertube-plugin-livechat-documentation/cs/>\n" "peertube-livechat/peertube-plugin-livechat-documentation/cs/>\n"
@ -487,11 +487,14 @@ msgstr ""
#: support/documentation/content/en/contributing/develop/_index.md #: 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:" 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 "" 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: '* ' #. type: Bullet: '* '
#: support/documentation/content/en/contributing/develop/_index.md #: support/documentation/content/en/contributing/develop/_index.md
msgid "re-build necessary parts of the plugin (client, styles, ...)," 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: '* ' #. type: Bullet: '* '
#: support/documentation/content/en/contributing/develop/_index.md #: support/documentation/content/en/contributing/develop/_index.md