diff options
| -rw-r--r-- | data/anope.example.conf | 2 | ||||
| -rw-r--r-- | data/chanserv.example.conf | 4 | ||||
| -rw-r--r-- | language/anope.en_US.po | 20 | ||||
| -rw-r--r-- | modules/database/db_old.cpp | 2 | ||||
| -rw-r--r-- | modules/fantasy.cpp | 14 | ||||
| -rw-r--r-- | src/regchannel.cpp | 4 |
6 files changed, 25 insertions, 21 deletions
diff --git a/data/anope.example.conf b/data/anope.example.conf index 936c00d18..4d8220d2e 100644 --- a/data/anope.example.conf +++ b/data/anope.example.conf @@ -730,7 +730,7 @@ log * * Available privileges: * botserv/administration - Can view and assign private BotServ bots - * botserv/fantasy - Can use fantasy commands without the FANTASIA privilege + * botserv/fantasy - Can use fantasy commands without the FANTASY privilege * chanserv/administration - Can modify the settings of any channel (including changing of the owner!) * chanserv/access/list - Can view channel access and akick lists, but not modify them * chanserv/access/modify - Can modify channel access and akick lists, and use /chanserv enforce diff --git a/data/chanserv.example.conf b/data/chanserv.example.conf index afe7b45ae..8858453e2 100644 --- a/data/chanserv.example.conf +++ b/data/chanserv.example.conf @@ -391,7 +391,7 @@ privilege } /* - * FANTASIA privilege. + * FANTASY privilege. * * Used by botserv/main and chanserv/xop. * @@ -399,7 +399,7 @@ privilege */ privilege { - name = "FANTASIA" + name = "FANTASY" desc = _("Allowed to use fantasy commands") rank = 30 level = 3 diff --git a/language/anope.en_US.po b/language/anope.en_US.po index 072a2d74f..4206637dc 100644 --- a/language/anope.en_US.po +++ b/language/anope.en_US.po @@ -7,8 +7,8 @@ msgid "" msgstr "" "Project-Id-Version: Anope\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-06-12 17:52+0100\n" -"PO-Revision-Date: 2024-06-12 17:53+0100\n" +"POT-Creation-Date: 2024-06-23 14:15+0100\n" +"PO-Revision-Date: 2024-06-23 14:16+0100\n" "Last-Translator: Sadie Powell <sadie@witchery.services>\n" "Language-Team: English\n" "Language: en_US\n" @@ -866,9 +866,9 @@ msgid "" "fantasy commands on a channel when prefixed\n" "with one of the following fantasy characters: %s\n" " \n" -"Note that users wanting to use fantaisist\n" -"commands MUST have enough access for both\n" -"the FANTASIA and the command they are executing." +"Note that users wanting to use fantasy commands\n" +"MUST have enough access for both the FANTASY\n" +"privilege and the command they are executing." msgstr "" " \n" "Enables or disables fantasy mode on a channel.\n" @@ -876,9 +876,9 @@ msgstr "" "fantasy commands on a channel when prefixed\n" "with one of the following fantasy characters: %s\n" " \n" -"Note that users wanting to use fantaisist\n" -"commands MUST have enough access for both\n" -"the FANTASIA and the command they are executing." +"Note that users wanting to use fantasy commands\n" +"MUST have enough access for both the FANTASY\n" +"privilege and the command they are executing." msgid "" " \n" @@ -3669,8 +3669,8 @@ msgstr "Email for %s is invalid." msgid "Email matched: %s (%s) to %s." msgstr "Email matched: %s (%s) to %s." -msgid "Enable fantaisist commands" -msgstr "Enable fantaisist commands" +msgid "Enable fantasy commands" +msgstr "Enable fantasy commands" msgid "Enable greet messages" msgstr "Enable greet messages" diff --git a/modules/database/db_old.cpp b/modules/database/db_old.cpp index 981d4c04e..68ba2ca07 100644 --- a/modules/database/db_old.cpp +++ b/modules/database/db_old.cpp @@ -252,7 +252,7 @@ static Anope::string GetLevelName(int level) case 15: return "NOKICK"; case 16: - return "FANTASIA"; + return "FANTASY"; case 17: return "SAY"; case 18: diff --git a/modules/fantasy.cpp b/modules/fantasy.cpp index 26c9080a6..0b3e642aa 100644 --- a/modules/fantasy.cpp +++ b/modules/fantasy.cpp @@ -17,7 +17,7 @@ class CommandBSSetFantasy final public: CommandBSSetFantasy(Module *creator, const Anope::string &sname = "botserv/set/fantasy") : Command(creator, sname, 2, 2) { - this->SetDesc(_("Enable fantaisist commands")); + this->SetDesc(_("Enable fantasy commands")); this->SetSyntax(_("\037channel\037 {\037ON|OFF\037}")); } @@ -73,9 +73,9 @@ public: "fantasy commands on a channel when prefixed\n" "with one of the following fantasy characters: \002%s\002\n" " \n" - "Note that users wanting to use fantaisist\n" - "commands MUST have enough access for both\n" - "the FANTASIA and the command they are executing."), + "Note that users wanting to use fantasy commands\n" + "MUST have enough access for both the FANTASY\n" + "privilege and the command they are executing."), Config->GetModule(this->owner)->Get<const Anope::string>("fantasycharacter", "!").c_str()); return true; } @@ -186,10 +186,10 @@ public: source.permission = info.permission; AccessGroup ag = c->ci->AccessFor(u); - bool has_fantasia = ag.HasPriv("FANTASIA") || source.HasPriv("botserv/fantasy"); + bool has_fantasy = ag.HasPriv("FANTASY") || source.HasPriv("botserv/fantasy"); EventReturn MOD_RESULT; - if (has_fantasia) + if (has_fantasy) { FOREACH_RESULT(OnBotFantasy, MOD_RESULT, (source, cmd, c->ci, params)); } @@ -198,7 +198,7 @@ public: FOREACH_RESULT(OnBotNoFantasyAccess, MOD_RESULT, (source, cmd, c->ci, params)); } - if (MOD_RESULT == EVENT_STOP || !has_fantasia) + if (MOD_RESULT == EVENT_STOP || !has_fantasy) return; if (MOD_RESULT != EVENT_ALLOW && !info.permission.empty() && !source.HasCommand(info.permission)) diff --git a/src/regchannel.cpp b/src/regchannel.cpp index 6aaf02901..f01b31f3e 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -239,6 +239,10 @@ Serializable *ChannelInfo::Unserialize(Serializable *obj, Serialize::Data &data) spacesepstream(slevels).GetTokens(v); for (unsigned i = 0; i + 1 < v.size(); i += 2) { + // Begin 2.0 database compatibility. + if (v[i] == "FANTASIA") + v[i] = "FANTASY"; + // End 2.0 database compatibility. if (auto level = Anope::TryConvert<int16_t>(v[i + 1])) ci->levels[v[i]] = level.value(); } |