diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/commands/cs_register.cpp | 14 | ||||
| -rw-r--r-- | modules/protocol/inspircd12.cpp | 2 |
2 files changed, 6 insertions, 10 deletions
diff --git a/modules/commands/cs_register.cpp b/modules/commands/cs_register.cpp index d1ada3c19..92c5ec6f9 100644 --- a/modules/commands/cs_register.cpp +++ b/modules/commands/cs_register.cpp @@ -54,16 +54,12 @@ class CommandCSRegister : public Command { ci = new ChannelInfo(chan); ci->SetFounder(nc); - if (!chdesc.empty()) - ci->desc = chdesc; + ci->desc = chdesc; - for (ChannelInfo::ModeList::iterator it = ModeManager::DefaultModeLocks.begin(), it_end = ModeManager::DefaultModeLocks.end(); it != it_end; ++it) - { - ModeLock *ml = new ModeLock(*it->second); - ml->setter = source.GetNick(); - ml->ci = ci; - ci->mode_locks->insert(std::make_pair(it->first, ml)); - } + for (std::list<std::pair<ChannelModeName, Anope::string> >::const_iterator it = ModeManager::ModeLockOn.begin(), it_end = ModeManager::ModeLockOn.end(); it != it_end; ++it) + ci->SetMLock(ModeManager::FindChannelModeByName(it->first), true, it->second, source.GetNick()); + for (std::list<ChannelModeName>::const_iterator it = ModeManager::ModeLockOff.begin(), it_end = ModeManager::ModeLockOff.end(); it != it_end; ++it) + ci->SetMLock(ModeManager::FindChannelModeByName(*it), false, "", source.GetNick()); if (c && !c->topic.empty()) { diff --git a/modules/protocol/inspircd12.cpp b/modules/protocol/inspircd12.cpp index 53ca4ec62..89540b6f4 100644 --- a/modules/protocol/inspircd12.cpp +++ b/modules/protocol/inspircd12.cpp @@ -847,7 +847,7 @@ struct IRCDMessageFJoin : IRCDMessage } time_t ts = Anope::string(params[1]).is_pos_number_only() ? convertTo<time_t>(params[1]) : Anope::CurTime; - Message::Join::SJoin(source, params[0], ts, "", users); + Message::Join::SJoin(source, params[0], ts, modes, users); } }; |