public:
PermChannel(InspIRCd* Instance) : ModeHandler(Instance, 'P', 0, 0, false, MODETYPE_CHANNEL, false) { }
- ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool)
+ ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string ¶meter, bool adding, bool sm)
{
if (adding)
{
{
if (channel->IsModeSet('P'))
{
- channel->SetMode('P',false);
+ if (channel->GetUserCounter() == 0 && !sm)
+ {
+ /*
+ * ugh, ugh, UGH!
+ *
+ * We can't delete this channel the way things work at the moment,
+ * because of the following scenario:
+ * s1:#c <-> s2:#c
+ *
+ * s1 has a user in #c, s2 does not. s2 has +P set. s2 has a losing TS.
+ *
+ * On netmerge, s2 loses, so s2 removes all modes (including +P) which
+ * would subsequently delete the channel here causing big fucking problems.
+ *
+ * I don't think there's really a way around this, so just deny -P on a 0 user chan.
+ * -- w00t
+ *
+ * delete channel;
+ */
+ return MODEACTION_DENY;
+ }
- if (channel->GetUserCounter() == 0)
- delete channel;
+ /* for servers, remove +P (to avoid desyncs) but don't bother trying to delete. */
+ channel->SetMode('P',false);
return MODEACTION_ALLOW;
}
}
std::string topic = MyConf.ReadValue("permchannels", "topic", i);
std::string modes = MyConf.ReadValue("permchannels", "modes", i);
- if (channel.empty() || topic.empty())
+ if (channel.empty())
{
- ServerInstance->Logs->Log("blah", DEBUG, "Malformed permchannels tag with empty topic or channel name.");
+ ServerInstance->Logs->Log("blah", DEBUG, "Malformed permchannels tag with empty channel name.");
continue;
}
if (!c)
{
c = new Channel(ServerInstance, channel, ServerInstance->Time());
- c->SetTopic(NULL, topic, true);
+ if (!topic.empty())
+ c->SetTopic(NULL, topic, true);
ServerInstance->Logs->Log("blah", DEBUG, "Added %s with topic %s", channel.c_str(), topic.c_str());
if (modes.empty())
virtual Version GetVersion()
{
- return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
}
virtual int OnChannelPreDelete(Channel *c)