From fb90a39e339e7c63ebf905755651afa6e12f8f25 Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Sat, 13 Jul 2024 23:47:18 +0200 Subject: [PATCH 1/3] Fix migrations as `pc_platforms` changed. --- conf/sql/v1.10.5.sql | 2 -- conf/sql/v1.11.0.sql | 4 ---- conf/sql/v1.5.2.sql | 16 +++------------- conf/sql/v1.6.1.sql | 2 -- conf/sql/v1.7.3.sql | 3 --- conf/sql/v1.8.0.sql | 2 -- scripts/upgrade | 18 ------------------ 7 files changed, 3 insertions(+), 44 deletions(-) delete mode 100644 conf/sql/v1.10.5.sql delete mode 100644 conf/sql/v1.11.0.sql delete mode 100644 conf/sql/v1.6.1.sql delete mode 100644 conf/sql/v1.7.3.sql delete mode 100644 conf/sql/v1.8.0.sql diff --git a/conf/sql/v1.10.5.sql b/conf/sql/v1.10.5.sql deleted file mode 100644 index 135c435..0000000 --- a/conf/sql/v1.10.5.sql +++ /dev/null @@ -1,2 +0,0 @@ -INSERT INTO `cp_platforms` (`slug`, `type`, `label`, `home_url`, `submit_url`) VALUES -('bluesky', 'social', 'Bluesky', 'https://bsky.app/', 'https://bsky.app/'); diff --git a/conf/sql/v1.11.0.sql b/conf/sql/v1.11.0.sql deleted file mode 100644 index 2248ad6..0000000 --- a/conf/sql/v1.11.0.sql +++ /dev/null @@ -1,4 +0,0 @@ -INSERT INTO `cp_platforms` (`slug`, `type`, `label`, `home_url`, `submit_url`) VALUES -('telegram', 'social', 'Telegram', 'https://www.telegram.org/', ''), -('episodes-fm', 'podcasting', 'Episodes.fm', 'https://episodes.fm/', 'https://podcastindex.org/add'), -('truefans', 'podcasting', 'Truefans', 'https://truefans.fm/', 'https://podcastindex.org/add'); diff --git a/conf/sql/v1.5.2.sql b/conf/sql/v1.5.2.sql index 024cab9..1e0b465 100644 --- a/conf/sql/v1.5.2.sql +++ b/conf/sql/v1.5.2.sql @@ -1,14 +1,4 @@ -- change Twitter to X -INSERT IGNORE INTO `cp_platforms` (`slug`, `type`, `label`, `home_url`, `submit_url`) VALUES -('x', 'social', 'X', 'https://x.com/', 'https://x.com/i/flow/signup'); - -UPDATE `cp_podcasts_platforms` -SET `platform_slug` = 'x' -WHERE `platform_slug` = 'twitter'; - -DELETE FROM `cp_platforms` WHERE `slug` = 'twitter'; - --- add buymeacoffee and kofi as funding platforms -INSERT IGNORE INTO `cp_platforms` (`slug`, `type`, `label`, `home_url`, `submit_url`) VALUES -('buymeacoffee', 'funding', 'Buy Me a Coffee', 'https://www.buymeacoffee.com/', 'https://www.buymeacoffee.com/signup'), -('kofi', 'funding', 'Ko-fi', 'https://ko-fi.com/', 'https://ko-fi.com/account/register'); +UPDATE `cp_platforms` +SET `slug` = 'x' +WHERE `slug` = 'twitter'; diff --git a/conf/sql/v1.6.1.sql b/conf/sql/v1.6.1.sql deleted file mode 100644 index 49d797e..0000000 --- a/conf/sql/v1.6.1.sql +++ /dev/null @@ -1,2 +0,0 @@ -INSERT IGNORE INTO `cp_platforms` (`slug`, `type`, `label`, `home_url`, `submit_url`) VALUES -('tiktok', 'social', 'Tiktok', 'https://www.tiktok.com/', 'https://www.tiktok.com/signup'); diff --git a/conf/sql/v1.7.3.sql b/conf/sql/v1.7.3.sql deleted file mode 100644 index 1f9caba..0000000 --- a/conf/sql/v1.7.3.sql +++ /dev/null @@ -1,3 +0,0 @@ -INSERT INTO `cp_platforms` (`slug`, `type`, `label`, `home_url`, `submit_url`) VALUES -('threads', 'social', 'Threads', 'https://www.threads.net/', 'https://www.threads.net/login'), -('youtube-music', 'podcasting', 'YouTube Music', 'https://www.youtube.com/creators/podcasts/', 'https://studio.youtube.com/channel/content/podcasts'); diff --git a/conf/sql/v1.8.0.sql b/conf/sql/v1.8.0.sql deleted file mode 100644 index 1c3a404..0000000 --- a/conf/sql/v1.8.0.sql +++ /dev/null @@ -1,2 +0,0 @@ -INSERT INTO `cp_platforms` (`slug`, `type`, `label`, `home_url`, `submit_url`) VALUES -('matrix', 'social', 'Matrix', 'https://matrix.org/', 'https://matrix.org/try-matrix/'); diff --git a/scripts/upgrade b/scripts/upgrade index 15f10d3..81a6356 100755 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -121,24 +121,6 @@ popd if ynh_compare_current_package_version --comparison le --version "1.6.5~ynh1"; then # cf https://code.castopod.org/adaures/castopod/-/releases/v1.5.2 ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/sql/v1.5.2.sql" - # cf https://code.castopod.org/adaures/castopod/-/releases/v1.6.1 - ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/sql/v1.6.1.sql" -fi -if ynh_compare_current_package_version --comparison lt --version "1.7.3~ynh1"; then - # cf https://code.castopod.org/adaures/castopod/-/releases/v1.7.3 - ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/sql/v1.7.3.sql" -fi -if ynh_compare_current_package_version --comparison lt --version "1.8.2~ynh1"; then - # cf https://code.castopod.org/adaures/castopod/-/releases/v1.8.2 - ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/sql/v1.8.0.sql" -fi -if ynh_compare_current_package_version --comparison lt --version "1.10.5~ynh1"; then - # cf https://code.castopod.org/adaures/castopod/-/releases/v1.10.5 - ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/sql/v1.10.5.sql" -fi -if ynh_compare_current_package_version --comparison lt --version "1.11.0~ynh1"; then - # cf https://code.castopod.org/adaures/castopod/-/releases/v1.11.0 - ynh_mysql_connect_as --user=$db_user --password=$db_pwd --database=$db_name < "../conf/sql/v1.11.0.sql" fi #================================================= From ccddb2f4924f37d00293d06300d3c56033b21ed6 Mon Sep 17 00:00:00 2001 From: Mateusz <2871798+orhtej2@users.noreply.github.com> Date: Sat, 13 Jul 2024 23:47:40 +0200 Subject: [PATCH 2/3] Update version. --- manifest.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/manifest.toml b/manifest.toml index 52a77dd..94ac81e 100644 --- a/manifest.toml +++ b/manifest.toml @@ -5,7 +5,7 @@ name = "Castopod" description.en = "Hosting platform made for podcasters" description.fr = "Plateforme d'hébergement conçue pour les podcasteurs" -version = "1.12.3~ynh1" +version = "1.12.3~ynh2" maintainers = ["orhtej2"] From 138d6b89d4cc9d0b84e6cb5c4721c03f0ea6f4ff Mon Sep 17 00:00:00 2001 From: yunohost-bot Date: Sat, 13 Jul 2024 21:47:00 +0000 Subject: [PATCH 3/3] Auto-update READMEs --- README.md | 2 +- README_es.md | 2 +- README_eu.md | 2 +- README_fr.md | 2 +- README_gl.md | 2 +- README_zh_Hans.md | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index f8b987d..abae0ce 100755 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ Castopod is easy to install and was built on top of CodeIgniter4, a powerful PHP - Multi-tenant: host as many podcasts as you want - Multi-user: add contributors and set roles -**Shipped version:** 1.12.3~ynh1 +**Shipped version:** 1.12.3~ynh2 **Demo:** diff --git a/README_es.md b/README_es.md index 27a732a..beb23b4 100644 --- a/README_es.md +++ b/README_es.md @@ -32,7 +32,7 @@ Castopod is easy to install and was built on top of CodeIgniter4, a powerful PHP - Multi-tenant: host as many podcasts as you want - Multi-user: add contributors and set roles -**Versión actual:** 1.12.3~ynh1 +**Versión actual:** 1.12.3~ynh2 **Demo:** diff --git a/README_eu.md b/README_eu.md index 0059306..7f4aad3 100644 --- a/README_eu.md +++ b/README_eu.md @@ -32,7 +32,7 @@ Castopod is easy to install and was built on top of CodeIgniter4, a powerful PHP - Multi-tenant: host as many podcasts as you want - Multi-user: add contributors and set roles -**Paketatutako bertsioa:** 1.12.3~ynh1 +**Paketatutako bertsioa:** 1.12.3~ynh2 **Demoa:** diff --git a/README_fr.md b/README_fr.md index 3cc91f1..8e457ea 100755 --- a/README_fr.md +++ b/README_fr.md @@ -31,7 +31,7 @@ Castopod est une plate-forme d'hébergement gratuite et open source conçue pour - Multi-locataire : hébergez autant de podcasts que vous le souhaitez - Multi-utilisateur : ajouter des contributeurs et définir des rôles -**Version incluse :** 1.12.3~ynh1 +**Version incluse :** 1.12.3~ynh2 **Démo :** diff --git a/README_gl.md b/README_gl.md index a8ee888..a16e3b1 100644 --- a/README_gl.md +++ b/README_gl.md @@ -32,7 +32,7 @@ Castopod is easy to install and was built on top of CodeIgniter4, a powerful PHP - Multi-tenant: host as many podcasts as you want - Multi-user: add contributors and set roles -**Versión proporcionada:** 1.12.3~ynh1 +**Versión proporcionada:** 1.12.3~ynh2 **Demo:** diff --git a/README_zh_Hans.md b/README_zh_Hans.md index 0dbc2c1..1748013 100644 --- a/README_zh_Hans.md +++ b/README_zh_Hans.md @@ -32,7 +32,7 @@ Castopod is easy to install and was built on top of CodeIgniter4, a powerful PHP - Multi-tenant: host as many podcasts as you want - Multi-user: add contributors and set roles -**分发版本：** 1.12.3~ynh1 +**分发版本：** 1.12.3~ynh2 **演示：**