namespace
{
ChanModeReference ban(NULL, "ban");
- ChanModeReference inviteonlymode(NULL, "inviteonly");
- ChanModeReference keymode(NULL, "key");
- ChanModeReference limitmode(NULL, "limit");
}
Channel::Channel(const std::string &cname, time_t ts)
{
unsigned int opermaxchans = ConvToInt(user->oper->getConfig("maxchans"));
// If not set, use 2.0's <channels:opers>, if that's not set either, use limit from CC
- if (!opermaxchans)
+ if (!opermaxchans && user->HasPrivPermission("channels/high-join-limit"))
opermaxchans = ServerInstance->Config->OperMaxChans;
if (opermaxchans)
maxchans = opermaxchans;
return NULL;
// If no module returned MOD_RES_DENY or MOD_RES_ALLOW (which is the case
- // most of the time) then proceed to check channel modes +k, +i, +l and bans,
- // in this order.
+ // most of the time) then proceed to check channel bans.
+ //
// If a module explicitly allowed the join (by returning MOD_RES_ALLOW),
// then this entire section is skipped
if (MOD_RESULT == MOD_RES_PASSTHRU)
{
- std::string ckey = chan->GetModeParameter(keymode);
- if (!ckey.empty())
- {
- FIRST_MOD_RESULT(OnCheckKey, MOD_RESULT, (user, chan, key));
- if (!MOD_RESULT.check(InspIRCd::TimingSafeCompare(ckey, key)))
- {
- // If no key provided, or key is not the right one, and can't bypass +k (not invited or option not enabled)
- user->WriteNumeric(ERR_BADCHANNELKEY, chan->name, "Cannot join channel (Incorrect channel key)");
- return NULL;
- }
- }
-
- if (chan->IsModeSet(inviteonlymode))
- {
- FIRST_MOD_RESULT(OnCheckInvite, MOD_RESULT, (user, chan));
- if (MOD_RESULT != MOD_RES_ALLOW)
- {
- user->WriteNumeric(ERR_INVITEONLYCHAN, chan->name, "Cannot join channel (Invite only)");
- return NULL;
- }
- }
-
- std::string limit = chan->GetModeParameter(limitmode);
- if (!limit.empty())
- {
- FIRST_MOD_RESULT(OnCheckLimit, MOD_RESULT, (user, chan));
- if (!MOD_RESULT.check((chan->GetUserCounter() < atol(limit.c_str()))))
- {
- user->WriteNumeric(ERR_CHANNELISFULL, chan->name, "Cannot join channel (Channel is full)");
- return NULL;
- }
- }
-
if (chan->IsBanned(user))
{
user->WriteNumeric(ERR_BANNEDFROMCHAN, chan->name, "Cannot join channel (You're banned)");
return (result == MOD_RES_DENY);
ListModeBase* banlm = static_cast<ListModeBase*>(*ban);
+ if (!banlm)
+ return false;
+
const ListModeBase::ModeList* bans = banlm->GetList(this);
if (bans)
{
if (InspIRCd::Match(nickIdent, prefix, NULL))
{
std::string suffix(mask, at + 1);
- if (InspIRCd::Match(user->host, suffix, NULL) ||
- InspIRCd::Match(user->dhost, suffix, NULL) ||
+ if (InspIRCd::Match(user->GetRealHost(), suffix, NULL) ||
+ InspIRCd::Match(user->GetDisplayedHost(), suffix, NULL) ||
InspIRCd::MatchCIDR(user->GetIPString(), suffix, NULL))
return true;
}
return rv;
ListModeBase* banlm = static_cast<ListModeBase*>(*ban);
+ if (!banlm)
+ return MOD_RES_PASSTHRU;
+
const ListModeBase::ModeList* bans = banlm->GetList(this);
if (bans)
{
for (ListModeBase::ModeList::const_iterator it = bans->begin(); it != bans->end(); ++it)
{
- if (CheckBan(user, it->mask))
+ if (it->mask.length() <= 2 || it->mask[0] != type || it->mask[1] != ':')
+ continue;
+
+ if (CheckBan(user, it->mask.substr(2)))
return MOD_RES_DENY;
}
}
modes.push_back(prefix);
return adding;
}
+
+
+void Membership::WriteNotice(const std::string& text) const
+{
+ std::string rawmsg = "NOTICE ";
+ rawmsg.append(chan->name).append(" :").append(text);
+ user->WriteServ(rawmsg);
+}