pegasus/anope
1
0
Fork 0
mirror of https://github.com/anope/anope.git synced 2026-06-29 17:16:38 +02:00
Code Activity

Made the help command description code more sane

Browse Source
This commit is contained in:
Adam
2011-02-11 03:12:39 -05:00
parent 7bdf592f7e
commit 2529ff6dae
148 changed files with 215 additions and 939 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/command.cpp
+9 -1
View File
@@ -64,7 +64,15 @@ Command::~Command()
this->module->DelCommand(this->service, this);
}
void Command::OnServHelp(CommandSource &source) { }
void Command::SetDesc(const Anope::string &d)
{
this->desc = d;
}
void Command::OnServHelp(CommandSource &source)
{
source.Reply(" %-14s %s", this->name.c_str(), _(this->desc.c_str()));
}
bool Command::OnHelp(CommandSource &source, const Anope::string &subcommand) { return false; }
src/language.cpp
+2 -14
View File
@@ -95,14 +95,7 @@ const char *anope_gettext(const char *string)
setlocale(LC_ALL, "");
#endif
Anope::string translated = translated_string ? translated_string : "";
if (Config->UseStrictPrivMsg)
translated = translated.replace_all_cs("%R", "/");
else
translated = translated.replace_all_cs("%R", "/msg ");
return translated.c_str();
return translated_string != NULL ? translated_string : "";
}
#else
void PushLanguage(const Anope::string &, Anope::string)
@@ -115,12 +108,7 @@ void PopLanguage()
const char *anope_gettext(const char *string)
{
Anope::string translated = string ? string : "";
if (Config->UseStrictPrivMsg)
translated = translated.replace_all_cs("%R", "/");
else
translated = translated.replace_all_cs("%R", "/msg ");
return translated.c_str();
return string != NULL ? string : "";
}
#endif
src/users.cpp
+15 -5
View File
@@ -234,17 +234,27 @@ void User::SendMessage(BotInfo *source, const char *fmt, ...)
}
}
void User::SendMessage(BotInfo *source, const Anope::string &msg)
void User::SendMessage(BotInfo *source, Anope::string msg)
{
if (Config->UseStrictPrivMsg)
msg = msg.replace_all_cs("%R", "/");
else
msg = msg.replace_all_cs("%R", "/msg ");
/* Send privmsg instead of notice if:
* - UsePrivmsg is enabled
* - The user is not registered and NSDefMsg is enabled
* - The user is registered and has set /ns set msg on
*/
if (Config->UsePrivmsg && ((!this->nc && Config->NSDefFlags.HasFlag(NI_MSG)) || (this->nc && this->nc->HasFlag(NI_MSG))))
ircdproto->SendPrivmsg(source, this->nick, "%s", msg.c_str());
else
ircdproto->SendNotice(source, this->nick, "%s", msg.c_str());
sepstream sep(msg, '\n');
Anope::string tok;
while (sep.GetToken(tok))
{
if (Config->UsePrivmsg && ((!this->nc && Config->NSDefFlags.HasFlag(NI_MSG)) || (this->nc && this->nc->HasFlag(NI_MSG))))
ircdproto->SendPrivmsg(source, this->nick, "%s", tok.c_str());
else
ircdproto->SendNotice(source, this->nick, "%s", tok.c_str());
}
}
/** Collides a nick.