summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
Diffstat (limited to 'modules')
-rw-r--r--modules/commands/bs_assign.cpp8
-rw-r--r--modules/commands/bs_badwords.cpp4
-rw-r--r--modules/commands/bs_bot.cpp8
-rw-r--r--modules/commands/bs_control.cpp6
-rw-r--r--modules/commands/bs_set.cpp2
-rw-r--r--modules/commands/cs_drop.cpp4
-rw-r--r--modules/commands/cs_entrymsg.cpp12
-rw-r--r--modules/commands/cs_flags.cpp10
-rw-r--r--modules/commands/cs_info.cpp14
-rw-r--r--modules/commands/cs_invite.cpp2
-rw-r--r--modules/commands/cs_kick.cpp2
-rw-r--r--modules/commands/cs_seen.cpp2
-rw-r--r--modules/commands/cs_unban.cpp2
-rw-r--r--modules/commands/cs_xop.cpp5
-rw-r--r--modules/commands/hs_del.cpp2
-rw-r--r--modules/commands/hs_list.cpp2
-rw-r--r--modules/commands/hs_request.cpp2
-rw-r--r--modules/commands/ms_check.cpp2
-rw-r--r--modules/commands/ns_cert.cpp10
-rw-r--r--modules/database/db_sql_live.cpp7
-rw-r--r--modules/extra/m_ldap_oper.cpp4
-rw-r--r--modules/protocol/unreal.cpp3
22 files changed, 56 insertions, 57 deletions
diff --git a/modules/commands/bs_assign.cpp b/modules/commands/bs_assign.cpp
index 82572d0eb..99eff4b2f 100644
--- a/modules/commands/bs_assign.cpp
+++ b/modules/commands/bs_assign.cpp
@@ -75,7 +75,7 @@ class CommandBSAssign : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Assigns a bot pointed out by nick to a channel. You\n"
+ source.Reply(_("Assigns the specified bot to a channel. You\n"
"can then configure the bot for the channel so it fits\n"
"your needs."));
return true;
@@ -121,7 +121,7 @@ class CommandBSUnassign : public Command
if (ci->HasExt("PERSIST") && !ModeManager::FindChannelModeByName("PERM"))
{
- source.Reply(_("You can not unassign bots while persist is set on the channel."));
+ source.Reply(_("You cannot unassign bots while persist is set on the channel."));
return;
}
@@ -195,9 +195,9 @@ class CommandBSSetNoBot : public Command
{
this->SendSyntax(source);
source.Reply(_(" \n"
- "This option makes a channel be unassignable. If a bot\n"
+ "This option makes a channel unassignable. If a bot\n"
"is already assigned to the channel, it is unassigned\n"
- "automatically when you enable the option."));
+ "automatically when you enable it."));
return true;
}
};
diff --git a/modules/commands/bs_badwords.cpp b/modules/commands/bs_badwords.cpp
index c4155bbc1..6deaa8924 100644
--- a/modules/commands/bs_badwords.cpp
+++ b/modules/commands/bs_badwords.cpp
@@ -400,7 +400,7 @@ class CommandBSBadwords : public Command
if (Anope::ReadOnly)
{
- source.Reply(_("Sorry, channel bad words list modification is temporarily disabled."));
+ source.Reply(_("Sorry, bad words list modification is temporarily disabled."));
return;
}
@@ -446,7 +446,7 @@ class CommandBSBadwords : public Command
" Lists bad words entries numbered 2 through 5 and\n"
" 7 through 9.\n"
" \n"
- "The \002CLEAR\002 command clears all entries of the\n"
+ "The \002CLEAR\002 command clears all entries from the\n"
"bad words list."));
return true;
}
diff --git a/modules/commands/bs_bot.cpp b/modules/commands/bs_bot.cpp
index 69fa7f8fe..d066a49a8 100644
--- a/modules/commands/bs_bot.cpp
+++ b/modules/commands/bs_bot.cpp
@@ -139,7 +139,7 @@ class CommandBSBot : public Command
*/
if (nick.equals_cs(bi->nick) && (!user.empty() ? user.equals_cs(bi->GetIdent()) : 1) && (!host.empty() ? host.equals_cs(bi->host) : 1) && (!real.empty() ? real.equals_cs(bi->realname) : 1))
{
- source.Reply(_("Old info is equal to the new one."));
+ source.Reply(_("The old information is the same as the new information specified."));
return;
}
@@ -341,13 +341,13 @@ class CommandBSBot : public Command
"hostname and realname. Since no integrity checks are done\n"
"for these settings, be really careful.\n"
" \n"
- "\002BOT CHANGE\002 allows to change the nickname, username, hostname\n"
- "or realname of a bot without actually having to delete it (and\n"
+ "\002BOT CHANGE\002 allows you to change the nickname, username, hostname\n"
+ "or realname of a bot without deleting it (and\n"
"all the data associated with it).\n"
" \n"
"\002BOT DEL\002 removes the given bot from the bot list.\n"
" \n"
- "\002Note\002: you cannot create a bot that has a nick that is\n"
+ "\002Note\002: You cannot create a bot with a nick that is\n"
"currently registered. If an unregistered user is currently\n"
"using the nick, they will be killed."));
return true;
diff --git a/modules/commands/bs_control.cpp b/modules/commands/bs_control.cpp
index 0307c6abf..5111a9551 100644
--- a/modules/commands/bs_control.cpp
+++ b/modules/commands/bs_control.cpp
@@ -16,7 +16,7 @@ class CommandBSSay : public Command
public:
CommandBSSay(Module *creator) : Command(creator, "botserv/say", 2, 2)
{
- this->SetDesc(_("Makes the bot say the given text on the given channel"));
+ this->SetDesc(_("Makes the bot say the specified text on the specified channel"));
this->SetSyntax(_("\037channel\037 \037text\037"));
}
@@ -66,7 +66,7 @@ class CommandBSSay : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Makes the bot say the given text on the given channel."));
+ source.Reply(_("Makes the bot say the specified text on the specified channel."));
return true;
}
};
@@ -125,7 +125,7 @@ class CommandBSAct : public Command
this->SendSyntax(source);
source.Reply(" ");
source.Reply(_("Makes the bot do the equivalent of a \"/me\" command\n"
- "on the given channel using the given text."));
+ "on the specified channel using the specified text."));
return true;
}
};
diff --git a/modules/commands/bs_set.cpp b/modules/commands/bs_set.cpp
index 2d08d9ec6..819ac42b3 100644
--- a/modules/commands/bs_set.cpp
+++ b/modules/commands/bs_set.cpp
@@ -100,7 +100,7 @@ class CommandBSSetBanExpire : public Command
if (Anope::ReadOnly)
{
- source.Reply(_("Sorry, bot option setting is temporarily disabled."));
+ source.Reply(_("Sorry, changing bot options is temporarily disabled."));
return;
}
diff --git a/modules/commands/cs_drop.cpp b/modules/commands/cs_drop.cpp
index 401573ea2..93ce548cc 100644
--- a/modules/commands/cs_drop.cpp
+++ b/modules/commands/cs_drop.cpp
@@ -71,8 +71,8 @@ class CommandCSDrop : public Command
this->SendSyntax(source);
source.Reply(" ");
if (source.IsServicesOper())
- source.Reply(_("Unregisters the named channel. Only \002Services Operators\002\n"
- "can drop a channel of which they are not the founder."));
+ source.Reply(_("Unregisters the specified channel. Only \002Services Operators\002\n"
+ "can drop a channel of which they are not the founder of."));
else
source.Reply(_("Unregisters the named channel. Can only be used by\n"
"the \002channel founder\002."));
diff --git a/modules/commands/cs_entrymsg.cpp b/modules/commands/cs_entrymsg.cpp
index 4eec3e07d..da14456a5 100644
--- a/modules/commands/cs_entrymsg.cpp
+++ b/modules/commands/cs_entrymsg.cpp
@@ -239,19 +239,19 @@ class CommandEntryMessage : public Command
source.Reply(_("Controls what messages will be sent to users when they join the channel."));
source.Reply(" ");
source.Reply(_("The \002ENTRYMSG ADD\002 command adds the given message to\n"
- "the list of messages to be shown to users when they join\n"
+ "the list of messages shown to users when they join\n"
"the channel."));
source.Reply(" ");
- source.Reply(_("The \002ENTRYMSG DEL\002 command removes the given message from\n"
- "the list of messages to be shown to users when they join\n"
- "the channel. You can remove the message by specifying its number\n"
+ source.Reply(_("The \002ENTRYMSG DEL\002 command removes the specified message from\n"
+ "the list of messages shown to users when they join\n"
+ "the channel. You can a message by specifying its number\n"
"which you can get by listing the messages as explained below."));
source.Reply(" ");
source.Reply(_("The \002ENTRYMSG LIST\002 command displays a listing of messages\n"
- "to be shown to users when they join the channel."));
+ "shown to users when they join the channel."));
source.Reply(" ");
source.Reply(_("The \002ENTRYMSG CLEAR\002 command clears all entries from\n"
- "the list of messages to be shown to users when they join\n"
+ "the list of messages shown to users when they join\n"
"the channel, effectively disabling entry messages."));
return true;
}
diff --git a/modules/commands/cs_flags.cpp b/modules/commands/cs_flags.cpp
index e3f3da978..e3613377f 100644
--- a/modules/commands/cs_flags.cpp
+++ b/modules/commands/cs_flags.cpp
@@ -227,7 +227,7 @@ class CommandCSFlags : public Command
override = true;
else
{
- source.Reply(_("You can not set the \002%c\002 flag."), f);
+ source.Reply(_("You cannot set the \002%c\002 flag."), f);
break;
}
}
@@ -417,19 +417,19 @@ class CommandCSFlags : public Command
source.Reply(_("%s is another way to modify the channel access list, similar to\n"
"the XOP and ACCESS methods."), source.command.c_str());
source.Reply(" ");
- source.Reply(_("The \002MODIFY\002 command allows you to modify the access list. If mask is\n"
- "not already on the access list is it added, then the changes are applied.\n"
+ source.Reply(_("The \002MODIFY\002 command allows you to modify the access list. If the mask is\n"
+ "not already on the access list it is added, then the changes are applied.\n"
"If the mask has no more flags, then the mask is removed from the access list.\n"
"Additionally, you may use +* or -* to add or remove all flags, respectively. You are\n"
"only able to modify the access list if you have the proper permission on the channel,\n"
- "and even then you can only give other people access to up what you already have."));
+ "and even then you can only give other people access to the equivalent of what your access is."));
source.Reply(" ");
source.Reply(_("The \002LIST\002 command allows you to list existing entries on the channel access list.\n"
"If a mask is given, the mask is wildcard matched against all existing entries on the\n"
"access list, and only those entries are returned. If a set of flags is given, only those\n"
"on the access list with the specified flags are returned."));
source.Reply(" ");
- source.Reply(_("The \002CLEAR\002 command clears the channel access list, which requires channel founder."));
+ source.Reply(_("The \002CLEAR\002 command clears the channel access list. This requires channel founder access."));
source.Reply(" ");
source.Reply(_("The available flags are:"));
diff --git a/modules/commands/cs_info.cpp b/modules/commands/cs_info.cpp
index af12aba78..f7ef0e72e 100644
--- a/modules/commands/cs_info.cpp
+++ b/modules/commands/cs_info.cpp
@@ -16,7 +16,7 @@ class CommandCSInfo : public Command
public:
CommandCSInfo(Module *creator) : Command(creator, "chanserv/info", 1, 2)
{
- this->SetDesc(_("Lists information about the named registered channel"));
+ this->SetDesc(_("Lists information about the specified registered channel"));
this->SetSyntax(_("\037channel\037"));
this->AllowUnregistered(true);
}
@@ -73,12 +73,12 @@ class CommandCSInfo : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Lists information about the named registered channel,\n"
- "including its founder, time of registration, and last\n"
- "time used. If the user issuing the command has the\n"
- "appropriate access for it, then the description, successor,\n"
- "last topic set, settings and expiration time will also\n"
- "be displayed when applicable."));
+ source.Reply(_("Lists information about the specified registered channel,\n"
+ "including its founder, time of registration, last\n"
+ "time used, and description. If the user issuing the\n"
+ "command has the appropriate access for it, then the"
+ "successor, last topic set, settings and expiration"
+ "time will also be displayed when applicable."));
return true;
}
};
diff --git a/modules/commands/cs_invite.cpp b/modules/commands/cs_invite.cpp
index 1f39eaf7b..e264a54f1 100644
--- a/modules/commands/cs_invite.cpp
+++ b/modules/commands/cs_invite.cpp
@@ -91,7 +91,7 @@ class CommandCSInvite : public Command
source.Reply(_("Tells %s to invite you or an optionally specified\n"
"nick into the given channel.\n"
" \n"
- "By default, limited to AOPs or those with level 5 and above\n"
+ "By default, limited to AOPs or those with level 5 access and above\n"
"on the channel."), source.service->nick.c_str());
return true;
}
diff --git a/modules/commands/cs_kick.cpp b/modules/commands/cs_kick.cpp
index dded149eb..c95445557 100644
--- a/modules/commands/cs_kick.cpp
+++ b/modules/commands/cs_kick.cpp
@@ -115,7 +115,7 @@ class CommandCSKick : public Command
source.Reply(_("Kicks a specified nick from a channel.\n"
" \n"
"By default, limited to AOPs or those with level 5 access\n"
- "and above on the channel. Channel founders may use masks too."));
+ "and above on the channel. Channel founders can also specify masks."));
return true;
}
};
diff --git a/modules/commands/cs_seen.cpp b/modules/commands/cs_seen.cpp
index 923edb361..7cbc23f43 100644
--- a/modules/commands/cs_seen.cpp
+++ b/modules/commands/cs_seen.cpp
@@ -172,7 +172,7 @@ class CommandOSSeen : public Command
source.Reply(" ");
source.Reply(_("The \002STATS\002 command prints out statistics about stored nicks and memory usage."));
source.Reply(_("The \002CLEAR\002 command lets you clean the database by removing all entries from the\n"
- "entries from the database that were added within \037time\037.\n"
+ "database that were added within \037time\037.\n"
" \n"
"Example:\n"
" %s CLEAR 30m\n"
diff --git a/modules/commands/cs_unban.cpp b/modules/commands/cs_unban.cpp
index 9fd6400a8..bbc08d3ac 100644
--- a/modules/commands/cs_unban.cpp
+++ b/modules/commands/cs_unban.cpp
@@ -105,7 +105,7 @@ class CommandCSUnban : public Command
"given, all bans affecting you in channels you have access\n"
"in are removed.\n"
" \n"
- "By default, limited to AOPs or those with level 5 and above\n"
+ "By default, limited to AOPs or those with level 5 access and above\n"
"on the channel."), source.service->nick.c_str());
return true;
}
diff --git a/modules/commands/cs_xop.cpp b/modules/commands/cs_xop.cpp
index 4c48dcc01..340369901 100644
--- a/modules/commands/cs_xop.cpp
+++ b/modules/commands/cs_xop.cpp
@@ -562,11 +562,6 @@ class CommandCSXOP : public Command
"The \002%s CLEAR\002 command clears all entries of the\n"
"%s list."), cmd.c_str(), cmd.c_str(), cmd.c_str(), cmd.c_str(),
cmd.c_str(), cmd.c_str(), cmd.c_str(), cmd.c_str(), cmd.c_str(), cmd.c_str());
- source.Reply(_(" \n"
- "The \002%s\002 commands are limited to founders\n"
- "(unless SECUREOPS is off). However, any user on the\n"
- "VOP list or above may use the \002%s LIST\002 command.\n"
- " \n"), cmd.c_str(), cmd.c_str());
BotInfo *access_bi, *flags_bi;
Anope::string access_cmd, flags_cmd;
Command::FindCommandFromService("chanserv/access", access_bi, access_cmd);
diff --git a/modules/commands/hs_del.cpp b/modules/commands/hs_del.cpp
index 76951de46..c27dc89d0 100644
--- a/modules/commands/hs_del.cpp
+++ b/modules/commands/hs_del.cpp
@@ -56,7 +56,7 @@ class CommandHSDelAll : public Command
public:
CommandHSDelAll(Module *creator) : Command(creator, "hostserv/delall", 1, 1)
{
- this->SetDesc(_("Delete the vhost for all nicks in a group"));
+ this->SetDesc(_("Deletes the vhost for all nicks in a group"));
this->SetSyntax(_("\037nick\037"));
}
diff --git a/modules/commands/hs_list.cpp b/modules/commands/hs_list.cpp
index e372860e2..dfeb23bd2 100644
--- a/modules/commands/hs_list.cpp
+++ b/modules/commands/hs_list.cpp
@@ -134,7 +134,7 @@ class CommandHSList : public Command
this->SendSyntax(source);
source.Reply(" ");
source.Reply(_("This command lists registered vhosts to the operator\n"
- "if a \037key\037 is specified, only entries whos nick or vhost match\n"
+ "If a \037key\037 is specified, only entries whose nick or vhost match\n"
"the pattern given in \037key\037 are displayed e.g. Rob* for all\n"
"entries beginning with \"Rob\"\n"
"If a \037#X-Y\037 style is used, only entries between the range of \002X\002\n"
diff --git a/modules/commands/hs_request.cpp b/modules/commands/hs_request.cpp
index cd1a85c0a..498b51afb 100644
--- a/modules/commands/hs_request.cpp
+++ b/modules/commands/hs_request.cpp
@@ -171,7 +171,7 @@ class CommandHSRequest : public Command
{
this->SendSyntax(source);
source.Reply(" ");
- source.Reply(_("Request the given vHost to be actived for your nick by the\n"
+ source.Reply(_("Request the given vHost to be activated for your nick by the\n"
"network administrators. Please be patient while your request\n"
"is being considered."));
return true;
diff --git a/modules/commands/ms_check.cpp b/modules/commands/ms_check.cpp
index c0deabf65..6fab8919a 100644
--- a/modules/commands/ms_check.cpp
+++ b/modules/commands/ms_check.cpp
@@ -67,7 +67,7 @@ class CommandMSCheck : public Command
this->SendSyntax(source);
source.Reply(" ");
source.Reply(_("Checks whether the _last_ memo you sent to \037nick\037 has been read\n"
- "or not. Note that this does only work with nicks, not with channels."));
+ "or not. Note that this only works with nicks, not with channels."));
return true;
}
};
diff --git a/modules/commands/ns_cert.cpp b/modules/commands/ns_cert.cpp
index 81a782045..aedb816d2 100644
--- a/modules/commands/ns_cert.cpp
+++ b/modules/commands/ns_cert.cpp
@@ -318,19 +318,19 @@ class CommandNSCert : public Command
source.Reply(" ");
source.Reply(_("Modifies or displays the certificate list for your nick.\n"
"If you connect to IRC and provide a client certificate with a\n"
- "matching fingerprint in the cert list, your nick will be\n"
+ "matching fingerprint in the cert list, you will be\n"
"automatically identified to services. Services Operators\n"
"may provide a nick to modify other users' certificate lists.\n"
" \n"));
source.Reply(_("Examples:\n"
" \n"
- " \002CERT ADD <fingerprint>\002\n"
- " Adds this fingerprint to the certificate list and\n"
+ " \002CERT ADD\002\n"
+ " Adds your current fingerprint to the certificate list and\n"
" automatically identifies you when you connect to IRC\n"
- " using this certificate.\n"
+ " using this fingerprint.\n"
" \n"
" \002CERT DEL <fingerprint>\002\n"
- " Reverses the previous command.\n"
+ " Removes the fingerprint <fingerprint> from your certificate list.\n"
" \n"
" \002CERT LIST\002\n"
" Displays the current certificate list."));
diff --git a/modules/database/db_sql_live.cpp b/modules/database/db_sql_live.cpp
index b9b8ef57c..fda68524d 100644
--- a/modules/database/db_sql_live.cpp
+++ b/modules/database/db_sql_live.cpp
@@ -166,7 +166,7 @@ class DBMySQL : public Module, public Pipe
if (!this->CheckInit() || obj->GetTimestamp() == Anope::CurTime)
return;
- Query query("SELECT * FROM `" + this->prefix + obj->GetName() + "` WHERE (`timestamp` > " + this->SQL->FromUnixtime(obj->GetTimestamp()) + " OR `timestamp` IS NULL)");
+ Query query("SELECT * FROM `" + this->prefix + obj->GetName() + "` WHERE (`timestamp` >= " + this->SQL->FromUnixtime(obj->GetTimestamp()) + " OR `timestamp` IS NULL)");
obj->UpdateTimestamp();
@@ -228,7 +228,10 @@ class DBMySQL : public Module, public Pipe
}
else
{
- delete s;
+ if (!s)
+ this->RunQuery("UPDATE `" + prefix + obj->GetName() + "` SET `timestamp` = " + this->SQL->FromUnixtime(obj->GetTimestamp()) + " WHERE `id` = " + stringify(id));
+ else
+ delete s;
}
}
}
diff --git a/modules/extra/m_ldap_oper.cpp b/modules/extra/m_ldap_oper.cpp
index 3e16d75e6..05579da0b 100644
--- a/modules/extra/m_ldap_oper.cpp
+++ b/modules/extra/m_ldap_oper.cpp
@@ -50,7 +50,7 @@ class IdentifyInterface : public LDAPInterface
o = new Oper(u->nick, ot);
my_opers.insert(o);
nc->o = o;
- Log(this->owner) << "m_ldap_oper: Tied " << u->nick << " (" << nc->display << ") to opertype " << ot->GetName();
+ Log(this->owner) << "Tied " << u->nick << " (" << nc->display << ") to opertype " << ot->GetName();
}
}
catch (const LDAPException &ex)
@@ -64,7 +64,7 @@ class IdentifyInterface : public LDAPInterface
}
nc->o = NULL;
- Log() << "Removed services operator from " << u->nick << " (" << nc->display << ")";
+ Log(this->owner) << "Removed services operator from " << u->nick << " (" << nc->display << ")";
}
}
}
diff --git a/modules/protocol/unreal.cpp b/modules/protocol/unreal.cpp
index 4aa340f08..6f744f22f 100644
--- a/modules/protocol/unreal.cpp
+++ b/modules/protocol/unreal.cpp
@@ -345,7 +345,8 @@ class UnrealIRCdProto : public IRCDProto
void SendLogin(User *u, NickAlias *na) anope_override
{
- if (Servers::Capab.count("ESVID") > 0)
+ /* 3.2.10.4+ treats users logged in with accounts as fully registered, even if -r, so we can not set this here. Just use the timestamp. */
+ if (Servers::Capab.count("ESVID") > 0 && !na->nc->HasExt("UNCONFIRMED"))
IRCD->SendMode(Config->GetClient("NickServ"), u, "+d %s", na->nc->display.c_str());
else
IRCD->SendMode(Config->GetClient("NickServ"), u, "+d %d", u->signon);
generated by cgit (git 2.34.1) at 2025-07-05 04:15:10 +0000