return false;
}
+ fputs("# Permchannels DB\n# This file is autogenerated; any changes will be overwritten!\n<config format=\"compat\">\n", f);
// Now, let's write.
for (chan_hash::const_iterator i = ServerInstance->chanlist->begin(); i != ServerInstance->chanlist->end(); i++)
{
if (!channel->IsModeSet('P'))
{
channel->SetMode('P',true);
-
- // Save permchannels db if needed.
- WriteDatabase();
return MODEACTION_ALLOW;
}
}
{
if (channel->IsModeSet('P'))
{
- if (channel->GetUserCounter() == 0 && !IS_SERVER(source))
+ channel->SetMode(this,false);
+ if (channel->GetUserCounter() == 0)
{
- /*
- * 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;
+ channel->DelUser(ServerInstance->FakeClient);
}
-
- /* for servers, remove +P (to avoid desyncs) but don't bother trying to delete. */
- channel->SetMode('P',false);
-
- // Save permchannels db if needed.
- WriteDatabase();
return MODEACTION_ALLOW;
}
}
class ModulePermanentChannels : public Module
{
PermChannel p;
+ bool dirty;
public:
- ModulePermanentChannels() : p(this)
+ ModulePermanentChannels() : p(this), dirty(false)
+ {
+ }
+
+ void init()
{
- if (!ServerInstance->Modes->AddMode(&p))
- throw ModuleException("Could not add new modes!");
- Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode, I_OnRehash };
- ServerInstance->Modules->Attach(eventlist, this, 4);
+ ServerInstance->Modules->AddService(p);
+ Implementation eventlist[] = { I_OnChannelPreDelete, I_OnPostTopicChange, I_OnRawMode, I_OnRehash, I_OnBackgroundTimer };
+ ServerInstance->Modules->Attach(eventlist, this, 5);
OnRehash(NULL);
}
virtual ModResult OnRawMode(User* user, Channel* chan, const char mode, const std::string ¶m, bool adding, int pcnt)
{
- if (chan && chan->IsModeSet('P'))
- WriteDatabase();
+ if (chan && (chan->IsModeSet('P') || mode == 'P'))
+ dirty = true;
return MOD_RES_PASSTHRU;
}
virtual void OnPostTopicChange(User*, Channel *c, const std::string&)
{
if (c->IsModeSet('P'))
+ dirty = true;
+ }
+
+ void OnBackgroundTimer(time_t)
+ {
+ if (dirty)
WriteDatabase();
+ dirty = false;
}
virtual Version GetVersion()