From 0a3ddef3151ef4258e529f5850be08810fa146d3 Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Thu, 31 Aug 2023 07:17:56 +0100 Subject: [PATCH 1/4] Replace Twitter with Mastodon in the ns_set_misc example config. Closes #320. --- data/nickserv.example.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf index 4af7b8c69..f835a9327 100644 --- a/data/nickserv.example.conf +++ b/data/nickserv.example.conf @@ -596,10 +596,11 @@ command { service = "NickServ"; name = "SET URL"; command = "nickserv/set/misc"; command { service = "NickServ"; name = "SASET URL"; command = "nickserv/saset/misc"; misc_description = _("Associate a URL with this account"); permission = "nickserv/saset/url"; group = "nickserv/admin"; } #command { service = "NickServ"; name = "SET DISCORD"; command = "nickserv/set/misc"; misc_description = _("Associate a Discord account with your account"); } #command { service = "NickServ"; name = "SASET DISCORD"; command = "nickserv/saset/misc"; misc_description = _("Associate a Discord account with this account"); permission = "nickserv/saset/discord"; group = "nickserv/admin"; } -#command { service = "NickServ"; name = "SET TWITTER"; command = "nickserv/set/misc"; misc_description = _("Associate a Twitter account with your account"); } -#command { service = "NickServ"; name = "SASET TWITTER"; command = "nickserv/saset/misc"; misc_description = _("Associate a Twitter account with this account"); permission = "nickserv/saset/twitter"; group = "nickserv/admin"; } #command { service = "NickServ"; name = "SET FACEBOOK"; command = "nickserv/set/misc"; misc_description = _("Associate a Facebook URL with your account"); } #command { service = "NickServ"; name = "SASET FACEBOOK"; command = "nickserv/saset/misc"; misc_description = _("Associate a Facebook URL with this account"); permission = "nickserv/saset/facebook"; group = "nickserv/admin"; } +#command { service = "NickServ"; name = "SET MASTODON"; command = "nickserv/set/misc"; misc_description = _("Associate a Mastodon account with your account"); } +#command { service = "NickServ"; name = "SASET MASTODON"; command = "nickserv/saset/misc"; misc_description = _("Associate a Mastodon account with this account"); permission = "nickserv/saset/mastodon"; group = "nickserv/admin"; } + /* * ns_status From ca2209aaedc6c646063a58261fef2b57276ce4bb Mon Sep 17 00:00:00 2001 From: Sadie Powell Date: Tue, 5 Sep 2023 00:21:31 +0100 Subject: [PATCH 2/4] Show the SQL service name in the db_sql error message. This should help users diagnose issues easier. --- include/service.h | 4 ++++ modules/database/db_sql.cpp | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/include/service.h b/include/service.h index 34e3c064e..c5c5a5881 100644 --- a/include/service.h +++ b/include/service.h @@ -128,6 +128,10 @@ class ServiceReference : public Reference { } + const Anope::string &GetServiceName() const { return name; } + + const Anope::string &GetServiceType() const { return type; } + inline void operator=(const Anope::string &n) { this->name = n; diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp index adb83d1e0..1094fb9a9 100644 --- a/modules/database/db_sql.cpp +++ b/modules/database/db_sql.cpp @@ -76,7 +76,7 @@ class DBSQL : public Module, public Pipe if (last_warn + 300 < Anope::CurTime) { last_warn = Anope::CurTime; - Log(this) << "db_sql: Unable to execute query, is SQL configured correctly?"; + Log(this) << "db_sql: Unable to execute query, is SQL (" << this->sql.GetServiceName() << ") configured correctly?"; } } else if (!Anope::Quitting) @@ -174,7 +174,7 @@ class DBSQL : public Module, public Pipe { if (!this->sql) { - Log(this) << "Unable to load databases, is SQL configured correctly?"; + Log(this) << "Unable to load databases, is SQL (" << this->sql.GetServiceName() << ") configured correctly?"; return EVENT_CONTINUE; } From 32cf99fdb51f75a5d400028b53d6817af2e6d458 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Sun, 1 Oct 2023 16:14:27 +0000 Subject: [PATCH 3/4] Bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/ci-linux.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 022a930aa..1f069fda6 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -9,7 +9,7 @@ jobs: CXX: ${{ matrix.compiler }} CXXFLAGS: -std=${{ matrix.standard }} steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install dependencies run: | sudo apt-get update --assume-yes From 6119586920efb0fbafbaef73c13fd7afb2aa60e7 Mon Sep 17 00:00:00 2001 From: Dragone2 Date: Wed, 4 Oct 2023 17:15:25 +0200 Subject: [PATCH 4/4] Small fixes and improvements to Italian translation. --- language/anope.it_IT.po | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/language/anope.it_IT.po b/language/anope.it_IT.po index f200ce154..de902b99b 100644 --- a/language/anope.it_IT.po +++ b/language/anope.it_IT.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Anope\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-05-22 14:47+0200\n" -"PO-Revision-Date: 2023-05-23 16:12+0200\n" +"POT-Creation-Date: 2023-10-04 13:57+0200\n" +"PO-Revision-Date: 2023-10-04 14:01+0200\n" "Last-Translator: Dragone2 \n" "Language-Team: Italian\n" "Language: it_IT\n" @@ -813,7 +813,7 @@ msgstr "" msgid "" " \n" -"SQLINE ADD adds the given (nick's) mask to the SQLINE\n" +"SQLINE ADD adds the given (nick/channel) mask to the SQLINE\n" "list for the given reason (which must be given).\n" "expiry is specified as an integer followed by one of d\n" "(days), h (hours), or m (minutes). Combinations (such as\n" @@ -826,7 +826,7 @@ msgid "" "STATS AKILL command." msgstr "" " \n" -"SQLINE ADD aggiunge la maschera (del nick) specificata alla lista\n" +"SQLINE ADD aggiunge la maschera (del nick/canale) specificata alla lista\n" "SQLINE per il motivo dato (che deve essere indicato).\n" "scadenza è specificato come un intero seguito da una lettera,\n" "che può essere d (giorni), h (ore), o m (minuti). Le\n" @@ -6856,7 +6856,7 @@ msgid "" "Syncs all modes set on users on the channel with the modes\n" "they should have based on their access." msgstr "" -"Sincronizza tutte le modalità impostati sugli utenti di un canale con\n" +"Sincronizza tutte le modalità impostate sugli utenti di un canale con\n" "le modalità che dovrebbero avere in base al loro accesso." msgid "Syncs the vhost for all nicks in a group"