diff options
| author | Adam <Adam@anope.org> | 2013-05-08 20:26:45 -0400 |
|---|---|---|
| committer | Adam <Adam@anope.org> | 2013-05-08 20:26:45 -0400 |
| commit | 735e234c2c7a984b01295f86045545ed8d9838ce (patch) | |
| tree | 87d7cce721eaa7a34d71b17c73f317750d87caef /modules/pseudoclients | |
| parent | 735f0ba6cf5602396bc2cabd6ceca0e92a0edd00 (diff) | |
Fixed some issues and desyncs with creating empty permanent channels on startup & dropping empty channels
Diffstat (limited to 'modules/pseudoclients')
| -rw-r--r-- | modules/pseudoclients/botserv.cpp | 4 | ||||
| -rw-r--r-- | modules/pseudoclients/chanserv.cpp | 3 |
2 files changed, 2 insertions, 5 deletions
diff --git a/modules/pseudoclients/botserv.cpp b/modules/pseudoclients/botserv.cpp index 612d36c0e..223a9787c 100644 --- a/modules/pseudoclients/botserv.cpp +++ b/modules/pseudoclients/botserv.cpp @@ -340,10 +340,6 @@ class BotServCore : public Module ci->ExtendMetadata("BS_" + token.upper()); } - void OnPreUserKicked(MessageSource &source, ChanUserContainer *cu, const Anope::string &kickmsg) anope_override - { - } - void OnUserKicked(MessageSource &source, User *target, const Anope::string &channel, ChannelStatus &status, const Anope::string &kickmsg) anope_override { BotInfo *bi = BotInfo::Find(target->nick); diff --git a/modules/pseudoclients/chanserv.cpp b/modules/pseudoclients/chanserv.cpp index 906aab6f3..4b652a51c 100644 --- a/modules/pseudoclients/chanserv.cpp +++ b/modules/pseudoclients/chanserv.cpp @@ -351,7 +351,8 @@ class ChanServCore : public Module void OnChannelSync(Channel *c) anope_override { - if (!c->HasMode("PERM") && (c->users.empty() || (c->users.size() == 1 && c->ci && c->ci->bi && *c->ci->bi == c->users.begin()->second->user))) + bool perm = c->HasMode("PERM") || (c->ci && c->ci->HasExt("PERSIST")); + if (!perm && (c->users.empty() || c->users.begin()->second->user->server == Me)) { chanserv.Hold(c); } |