diff options
| -rw-r--r-- | .github/workflows/ci-linux.yml | 2 | ||||
| -rw-r--r-- | data/nickserv.example.conf | 5 | ||||
| -rw-r--r-- | include/service.h | 4 | ||||
| -rw-r--r-- | language/anope.it_IT.po | 10 | ||||
| -rw-r--r-- | modules/database/db_sql.cpp | 4 |
5 files changed, 15 insertions, 10 deletions
diff --git a/.github/workflows/ci-linux.yml b/.github/workflows/ci-linux.yml index 2a38dc4f3..1794ededf 100644 --- a/.github/workflows/ci-linux.yml +++ b/.github/workflows/ci-linux.yml @@ -9,7 +9,7 @@ jobs: CXX: ${{ matrix.compiler }} CXXFLAGS: -Werror steps: - - uses: actions/checkout@v3 + - uses: actions/checkout@v4 - name: Install dependencies run: | sudo apt-get update --assume-yes diff --git a/data/nickserv.example.conf b/data/nickserv.example.conf index 7c6bfb06c..69f2fa07e 100644 --- a/data/nickserv.example.conf +++ b/data/nickserv.example.conf @@ -592,10 +592,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 diff --git a/include/service.h b/include/service.h index 55ebe62bd..fd4163675 100644 --- a/include/service.h +++ b/include/service.h @@ -127,6 +127,10 @@ class ServiceReference : public Reference<T> { } + 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/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 <dragone2@risposteinformatiche.it>\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" diff --git a/modules/database/db_sql.cpp b/modules/database/db_sql.cpp index 0f89de06d..f508c1615 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) @@ -172,7 +172,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; } |