diff options
| author | Adam <Adam@anope.org> | 2013-05-18 23:45:10 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-05-18 23:45:10 -0400 |
| commit | 2a8202c83251f495191c95ba26428d9e545e252e (patch) | |
| tree | ef3531ad944e7af884129918363a61372b81716e | |
| parent | be4a39ceb6f1abb7e558eaeb46168ef5dbbe9809 (diff) | |
Give botserv bots assigned by persist the same botmodes as normal bots, fix some typos, remove unused variable
| -rw-r--r-- | data/example.conf | 2 | ||||
| -rw-r--r-- | docs/LANGUAGE | 2 | ||||
| -rw-r--r-- | modules/commands/cs_set.cpp | 12 | ||||
| -rw-r--r-- | src/bots.cpp | 1 |
4 files changed, 11 insertions, 6 deletions
diff --git a/data/example.conf b/data/example.conf index 1c0737cbd..7b5beebd9 100644 --- a/data/example.conf +++ b/data/example.conf @@ -79,7 +79,7 @@ /* * [OPTIONAL] Defines * - * You can define values to other values, which can be used to easially change + * You can define values to other values, which can be used to easily change * every value in the configuration. For example, use: * * define diff --git a/docs/LANGUAGE b/docs/LANGUAGE index c67787b42..a7ac1d877 100644 --- a/docs/LANGUAGE +++ b/docs/LANGUAGE @@ -31,7 +31,7 @@ Anope Mutli Language Support 3) Using langages with modules - Module authors can easially add the ability to have their modules translated by adding _() around the strings they + Module authors can easily add the ability to have their modules translated by adding _() around the strings they want translated (messages to the user, etc). If you want to translate a module someone has made, first generate a .pot file if there isn't one already using diff --git a/modules/commands/cs_set.cpp b/modules/commands/cs_set.cpp index 4c49c9a21..028ff0069 100644 --- a/modules/commands/cs_set.cpp +++ b/modules/commands/cs_set.cpp @@ -504,11 +504,14 @@ class CommandCSSetPersist : public Command bool created; Channel *c = Channel::FindOrCreate(ci->name, created); if (ci->bi) - ci->bi->Join(c); + { + ChannelStatus status(Config->GetModule("botserv")->Get<const Anope::string>("botmodes")); + ci->bi->Join(c, &status); + } } /* No botserv bot, no channel mode, give them ChanServ. - * Yes, this works fine with no Config->BotServ. + * Yes, this works fine with no BotServ. */ if (!ci->bi && !cm) { @@ -519,7 +522,10 @@ class CommandCSSetPersist : public Command } ChanServ->Assign(NULL, ci); if (!ci->c->FindUser(ChanServ)) - ChanServ->Join(ci->c); + { + ChannelStatus status(Config->GetModule("botserv")->Get<const Anope::string>("botmodes")); + ChanServ->Join(ci->c, &status); + } } /* Set the perm mode */ diff --git a/src/bots.cpp b/src/bots.cpp index 37babbb5f..05dfdbe43 100644 --- a/src/bots.cpp +++ b/src/bots.cpp @@ -146,7 +146,6 @@ void BotInfo::Assign(User *u, ChannelInfo *ci) ci->bi = this; this->channels->insert(ci); - ChannelStatus status; FOREACH_MOD(I_OnBotAssign, OnBotAssign(u, ci, this)); } |