- if (channel->modes[CM_KEY])
- {
- return std::make_pair(true, channel->key);
- }
- else
- {
- return std::make_pair(false, parameter);
- }
-}
-
-bool ModeChannelKey::CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+ if (channel->modes[CM_KEY])
+ {
+ std::string ckey = channel->GetModeParameter('k');
+ return std::make_pair(true, ckey);
+ }
+ else
+ {
+ return std::make_pair(false, parameter);
+ }
+}
+
+void ModeChannelKey::RemoveMode(Channel* channel, irc::modestacker* stack)
+{
+ /** +k needs a parameter when being removed,
+ * so we have a special-case RemoveMode here for it
+ */
+
+ if (channel->IsModeSet(this->GetModeChar()))
+ {
+ if (stack)
+ {
+ stack->Push(this->GetModeChar(), channel->GetModeParameter('k'));
+ }
+ else
+ {
+ std::vector<std::string> parameters; parameters.push_back(channel->name); parameters.push_back("-k"); parameters.push_back(channel->GetModeParameter('k'));
+ ServerInstance->SendMode(parameters, ServerInstance->FakeClient);
+ }
+ }
+}
+
+void ModeChannelKey::RemoveMode(User*, irc::modestacker* stack)
+{
+}
+
+bool ModeChannelKey::CheckTimeStamp(time_t, time_t, const std::string &their_param, const std::string &our_param, Channel*)