1
0
mirror of https://github.com/anope/anope.git synced 2026-07-08 14:23:14 +02:00

Fixed /os reload doing weird things to service channels, and allow setting modes by clients on burst

This commit is contained in:
Adam
2011-09-19 18:35:40 -04:00
parent 7dce64e540
commit 43201ead95
11 changed files with 50 additions and 26 deletions
+5 -2
View File
@@ -162,14 +162,17 @@ class BahamutIRCdProto : public IRCDProto
}
/* JOIN - SJOIN */
void SendJoin(User *user, Channel *c, const ChannelStatus *status)
void SendJoin(User *user, Channel *c, ChannelStatus *status)
{
send_cmd(user->nick, "SJOIN %ld %s", static_cast<long>(c->creation_time), c->name.c_str());
if (status)
{
ChannelStatus cs = *status;
status->ClearFlags();
BotInfo *setter = findbot(user->nick);
for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
if (status->HasFlag(ModeManager::ChannelModes[i]->Name))
if (cs.HasFlag(ModeManager::ChannelModes[i]->Name))
c->SetMode(setter, ModeManager::ChannelModes[i], user->nick, false);
}
}
+5 -2
View File
@@ -124,7 +124,7 @@ class InspIRCdTS6Proto : public IRCDProto
}
/* JOIN */
void SendJoin(User *user, Channel *c, const ChannelStatus *status)
void SendJoin(User *user, Channel *c, ChannelStatus *status)
{
send_cmd(Config->Numeric, "FJOIN %s %ld +%s :,%s", c->name.c_str(), static_cast<long>(c->creation_time), c->GetModes(true, true).c_str(), user->GetUID().c_str());
/* Note that we can send this with the FJOIN but choose not to
@@ -133,9 +133,12 @@ class InspIRCdTS6Proto : public IRCDProto
*/
if (status)
{
ChannelStatus cs = *status;
status->ClearFlags();
BotInfo *setter = findbot(user->nick);
for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
if (status->HasFlag(ModeManager::ChannelModes[i]->Name))
if (cs.HasFlag(ModeManager::ChannelModes[i]->Name))
c->SetMode(setter, ModeManager::ChannelModes[i], user->nick, false);
}
}
+5 -2
View File
@@ -157,14 +157,17 @@ class InspIRCdProto : public IRCDProto
}
/* JOIN */
void SendJoin(User *user, Channel *c, const ChannelStatus *status)
void SendJoin(User *user, Channel *c, ChannelStatus *status)
{
send_cmd(user->nick, "JOIN %s %ld", c->name.c_str(), static_cast<long>(c->creation_time));
if (status)
{
ChannelStatus cs = *status;
status->ClearFlags();
BotInfo *setter = findbot(user->nick);
for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
if (status->HasFlag(ModeManager::ChannelModes[i]->Name))
if (cs.HasFlag(ModeManager::ChannelModes[i]->Name))
c->SetMode(setter, ModeManager::ChannelModes[i], user->nick, false);
}
}
+5 -2
View File
@@ -123,14 +123,17 @@ class PlexusProto : public IRCDProto
send_cmd(Config->Numeric, "UNRESV * %s", x->Mask.c_str());
}
void SendJoin(User *user, Channel *c, const ChannelStatus *status)
void SendJoin(User *user, Channel *c, ChannelStatus *status)
{
send_cmd(Config->Numeric, "SJOIN %ld %s +%s :%s", static_cast<long>(c->creation_time), c->name.c_str(), c->GetModes(true, true).c_str(), user->GetUID().c_str());
if (status)
{
ChannelStatus cs = *status;
status->ClearFlags();
BotInfo *setter = findbot(user->nick);
for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
if (status->HasFlag(ModeManager::ChannelModes[i]->Name))
if (cs.HasFlag(ModeManager::ChannelModes[i]->Name))
c->SetMode(setter, ModeManager::ChannelModes[i], user->nick, false);
}
}
+1 -1
View File
@@ -126,7 +126,7 @@ class RatboxProto : public IRCDProto
send_cmd(Config->Numeric, "UNRESV * %s", x->Mask.c_str());
}
void SendJoin(User *user, Channel *c, const ChannelStatus *status)
void SendJoin(User *user, Channel *c, ChannelStatus *status)
{
/* Note that we must send our modes with the SJOIN and
* can not add them to the mode stacker because ratbox
+5 -2
View File
@@ -165,14 +165,17 @@ class UnrealIRCdProto : public IRCDProto
}
/* JOIN */
void SendJoin(User *user, Channel *c, const ChannelStatus *status)
void SendJoin(User *user, Channel *c, ChannelStatus *status)
{
send_cmd(Config->ServerName, "~ %ld %s :%s", static_cast<long>(c->creation_time), c->name.c_str(), user->nick.c_str());
if (status)
{
ChannelStatus cs = *status;
status->ClearFlags();
BotInfo *setter = findbot(user->nick);
for (unsigned i = 0; i < ModeManager::ChannelModes.size(); ++i)
if (status->HasFlag(ModeManager::ChannelModes[i]->Name))
if (cs.HasFlag(ModeManager::ChannelModes[i]->Name))
c->SetMode(setter, ModeManager::ChannelModes[i], user->nick, false);
}
}