diff --git a/include/services.h b/include/services.h index d233da5b8..33c35ab51 100644 --- a/include/services.h +++ b/include/services.h @@ -995,6 +995,11 @@ class CoreExport IRCDProto * @param u The user */ virtual void SetAutoIdentificationToken(User *u) { } + + /** Send a channel creation message to the uplink. + * On most TS6 IRCds this is a SJOIN with no nick + */ + virtual void SendChannel(Channel *c, const Anope::string &modes) { } }; class CoreExport IRCdMessage diff --git a/modules/protocol/bahamut.cpp b/modules/protocol/bahamut.cpp index 28939c7fb..21d351f0c 100644 --- a/modules/protocol/bahamut.cpp +++ b/modules/protocol/bahamut.cpp @@ -280,6 +280,10 @@ class BahamutIRCdProto : public IRCDProto ircdproto->SendMode(NickServ, u, "+d %d", u->timestamp); } + void SendChannel(Channel *c, const Anope::string &modes) + { + send_cmd("", "SJOIN %ld %s %s :", static_cast(c->creation_time), c->name.c_str(), modes.c_str()); + } }; class BahamutIRCdMessage : public IRCdMessage @@ -378,9 +382,6 @@ class BahamutIRCdMessage : public IRCdMessage { c->creation_time = ts; c->Reset(); - - /* Reset mlock */ - check_modes(c); } /* Their TS is newer than ours, our modes > theirs, unset their modes if need be */ else if (ts > c->creation_time) diff --git a/modules/protocol/inspircd-ts6.h b/modules/protocol/inspircd-ts6.h index 4146e27fc..18f046d76 100644 --- a/modules/protocol/inspircd-ts6.h +++ b/modules/protocol/inspircd-ts6.h @@ -230,6 +230,11 @@ class InspIRCdTS6Proto : public IRCDProto send_cmd(Config->Numeric, "METADATA %s accountname :", u->GetUID().c_str()); } + void SendChannel(Channel *c, const Anope::string &modes) + { + send_cmd(Config->Numeric, "FJOIN %s %ld %s :", c->name.c_str(), static_cast(c->creation_time), modes.c_str()); + } + bool IsNickValid(const Anope::string &nick) { /* InspIRCd, like TS6, uses UIDs on collision, so... */ diff --git a/modules/protocol/inspircd11.cpp b/modules/protocol/inspircd11.cpp index 270a3e013..e642d8f50 100644 --- a/modules/protocol/inspircd11.cpp +++ b/modules/protocol/inspircd11.cpp @@ -607,9 +607,6 @@ class InspircdIRCdMessage : public IRCdMessage { c->creation_time = ts; c->Reset(); - - /* Reset mlock */ - check_modes(c); } /* Their TS is newer than ours, our modes > theirs, unset their modes if need be */ else if (ts > c->creation_time) diff --git a/modules/protocol/plexus.cpp b/modules/protocol/plexus.cpp index 8e025f59e..05633ead4 100644 --- a/modules/protocol/plexus.cpp +++ b/modules/protocol/plexus.cpp @@ -247,6 +247,11 @@ class PlexusProto : public IRCDProto { send_cmd(bi->GetUID(), "ENCAP * TOPIC %s %s %lu :%s", c->name.c_str(), c->topic_setter.c_str(), static_cast(c->topic_time + 1), c->topic.c_str()); } + + void SendChannel(Channel *c, const Anope::string &modes) + { + send_cmd(Config->Numeric, "SJOIN %ld %s %s :", static_cast(c->creation_time), c->name.c_str(), modes.c_str()); + } }; class PlexusIRCdMessage : public IRCdMessage @@ -357,9 +362,6 @@ class PlexusIRCdMessage : public IRCdMessage { c->creation_time = ts; c->Reset(); - - /* Reset mlock */ - check_modes(c); } /* Their TS is newer than ours, our modes > theirs, unset their modes if need be */ else if (ts > c->creation_time) diff --git a/modules/protocol/ratbox.cpp b/modules/protocol/ratbox.cpp index 914010b98..43debc78d 100644 --- a/modules/protocol/ratbox.cpp +++ b/modules/protocol/ratbox.cpp @@ -232,6 +232,11 @@ class RatboxProto : public IRCDProto send_cmd(Config->Numeric, "ENCAP * SU %s", u->GetUID().c_str()); } + void SendChannel(Channel *c, const Anope::string &modes) + { + send_cmd("", "SJOIN %ld %s %s :", static_cast(c->creation_time), c->name.c_str(), modes.c_str()); + } + bool IsNickValid(const Anope::string &nick) { /* TS6 Save extension -Certus */ @@ -377,9 +382,6 @@ class RatboxIRCdMessage : public IRCdMessage { c->creation_time = ts; c->Reset(); - - /* Reset mlock */ - check_modes(c); } /* Their TS is newer than ours, our modes > theirs, unset their modes if need be */ else if (ts > c->creation_time) diff --git a/modules/protocol/unreal32.cpp b/modules/protocol/unreal32.cpp index 2993580c7..cc4fc23df 100644 --- a/modules/protocol/unreal32.cpp +++ b/modules/protocol/unreal32.cpp @@ -375,6 +375,24 @@ class UnrealIRCdProto : public IRCDProto { ircdproto->SendMode(NickServ, u, "+d 1"); } + + void SendChannel(Channel *c, const Anope::string &modes) + { + /* Unreal does not support updating a channels TS without actually joining a user, + * so we will join and part us now + */ + BotInfo *bi = whosends(c->ci); + if (c->FindUser(bi) == NULL) + { + bi->Join(c, true); + bi->Part(c); + } + else + { + bi->Part(c); + bi->Join(c, true); + } + } }; class Unreal32IRCdMessage : public IRCdMessage @@ -695,9 +713,6 @@ class Unreal32IRCdMessage : public IRCdMessage { c->creation_time = ts; c->Reset(); - - /* Reset mlock */ - check_modes(c); } /* Their TS is newer than ours, our modes > theirs, unset their modes if need be */ else if (ts > c->creation_time) diff --git a/src/channels.cpp b/src/channels.cpp index 8873931f5..fcd78faed 100644 --- a/src/channels.cpp +++ b/src/channels.cpp @@ -87,6 +87,9 @@ void Channel::Reset() check_modes(this); for (CUserList::const_iterator it = this->users.begin(), it_end = this->users.end(); it != it_end; ++it) chan_set_correct_modes((*it)->user, this, 1); + + if (this->ci) + this->ci->RestoreTopic(); } void Channel::Sync() @@ -117,12 +120,12 @@ void Channel::JoinUser(User *user) uc->Status = Status; this->users.push_back(uc); - bool update_ts = false; if (this->ci && this->ci->HasFlag(CI_PERSIST) && this->creation_time > this->ci->time_registered) { Log(LOG_DEBUG) << "Changing TS of " << this->name << " from " << this->creation_time << " to " << this->ci->time_registered; this->creation_time = this->ci->time_registered; - update_ts = true; + ircdproto->SendChannel(this, ""); + this->Reset(); } if (this->ci && check_access(user, this->ci, CA_MEMO) && this->ci->memos.memos.size() > 0) @@ -142,7 +145,7 @@ void Channel::JoinUser(User *user) * legit users - Rob **/ if (this->users.size() >= Config->BSMinUsers && !this->FindUser(this->ci->bi)) - this->ci->bi->Join(this, update_ts); + this->ci->bi->Join(this, false); /* Only display the greet if the main uplink we're connected * to has synced, or we'll get greet-floods when the net * recovers from a netsplit. -GD @@ -153,17 +156,6 @@ void Channel::JoinUser(User *user) this->ci->bi->lastmsg = Anope::CurTime; } } - - /* Update the TS, unless I'm joining a bot already */ - if (update_ts && user->server != Me) - { - /* Send the updated TS */ - if (!this->FindUser(whosends(this->ci))) - { - whosends(this->ci)->Join(this, update_ts); - whosends(this->ci)->Part(this); - } - } } /** Remove a user internally from the channel diff --git a/src/chanserv.cpp b/src/chanserv.cpp index 35fd8975c..43d4d3b61 100644 --- a/src/chanserv.cpp +++ b/src/chanserv.cpp @@ -273,7 +273,7 @@ void check_modes(Channel *c) } } - else if (cm->Type == MODE_LIST) // XXX we still need better list code... + else if (cm->Type == MODE_LIST) { if (ml.set) c->SetMode(NULL, cm, ml.param); diff --git a/src/regchannel.cpp b/src/regchannel.cpp index 17c141ea7..0b67daf9a 100644 --- a/src/regchannel.cpp +++ b/src/regchannel.cpp @@ -563,10 +563,21 @@ void ChannelInfo::LoadMLock() if (this->HasFlag(CI_PERSIST) && !this->c) { this->c = new Channel(this->name, this->time_registered); - if (!this->bi && ChanServ && ModeManager::FindChannelModeByName(CMODE_PERM) == NULL) - ChanServ->Assign(NULL, this); - else if (this->bi) - this->bi->Join(c); + if (ModeManager::FindChannelModeByName(CMODE_PERM) != NULL) + { + /* At this point, CMODE_PERM *must* be locked on the channel, so this is fine */ + ircdproto->SendChannel(this->c, get_mlock_modes(this, true)); + } + else + { + if (!this->bi) + { + this->bi = whosends(this); + ++this->bi->chancount; + } + this->bi->Join(this->c); + } + check_modes(this->c); this->CheckTopic(); }