#include <cstdarg>
#include "mode.h"
-Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance)
+Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts)
{
chan_hash::iterator findchan = ServerInstance->chanlist->find(cname);
if (findchan != Instance->chanlist->end())
int Channel::SetTopic(User *u, std::string &ntopic, bool forceset)
{
- if (u && IS_LOCAL(u))
+ if (u)
{
if(!forceset)
{
ModResult res;
/* 0: check status, 1: don't, -1: disallow change silently */
- FIRST_MOD_RESULT(ServerInstance, OnLocalTopicChange, res, (u,this,ntopic));
+ FIRST_MOD_RESULT(ServerInstance, OnPreTopicChange, res, (u,this,ntopic));
if (res == MOD_RES_DENY)
return CMD_FAILURE;
u->WriteNumeric(442, "%s %s :You're not on that channel!",u->nick.c_str(), this->name.c_str());
return CMD_FAILURE;
}
- if ((this->IsModeSet('t')) && (this->GetStatus(u) < STATUS_HOP))
+ if ((this->IsModeSet('t')) && (this->GetPrefixValue(u) < HALFOP_VALUE))
{
u->WriteNumeric(482, "%s %s :You must be at least a half-operator to change the topic on this channel", u->nick.c_str(), this->name.c_str());
return CMD_FAILURE;
long Channel::GetUserCounter()
{
- return (this->internal_userlist.size());
+ return userlist.size();
}
-void Channel::AddUser(User* user)
+Membership* Channel::AddUser(User* user)
{
- internal_userlist[user] = user->nick;
+ Membership* memb = new Membership(user, this);
+ userlist[user] = memb;
+ return memb;
}
unsigned long Channel::DelUser(User* user)
{
- CUListIter a = internal_userlist.find(user);
+ UserMembIter a = userlist.find(user);
- if (a != internal_userlist.end())
+ if (a != userlist.end())
{
- internal_userlist.erase(a);
- /* And tidy any others... */
- DelOppedUser(user);
- DelHalfoppedUser(user);
- DelVoicedUser(user);
+ delete a->second;
+ userlist.erase(a);
}
- return internal_userlist.size();
+ return userlist.size();
}
bool Channel::HasUser(User* user)
{
- return (internal_userlist.find(user) != internal_userlist.end());
-}
-
-void Channel::AddOppedUser(User* user)
-{
- internal_op_userlist[user] = user->nick;
-}
-
-void Channel::DelOppedUser(User* user)
-{
- CUListIter a = internal_op_userlist.find(user);
- if (a != internal_op_userlist.end())
- {
- internal_op_userlist.erase(a);
- return;
- }
-}
-
-void Channel::AddHalfoppedUser(User* user)
-{
- internal_halfop_userlist[user] = user->nick;
-}
-
-void Channel::DelHalfoppedUser(User* user)
-{
- CUListIter a = internal_halfop_userlist.find(user);
-
- if (a != internal_halfop_userlist.end())
- {
- internal_halfop_userlist.erase(a);
- }
-}
-
-void Channel::AddVoicedUser(User* user)
-{
- internal_voice_userlist[user] = user->nick;
-}
-
-void Channel::DelVoicedUser(User* user)
-{
- CUListIter a = internal_voice_userlist.find(user);
-
- if (a != internal_voice_userlist.end())
- {
- internal_voice_userlist.erase(a);
- }
-}
-
-CUList* Channel::GetUsers()
-{
- return &internal_userlist;
+ return (userlist.find(user) != userlist.end());
}
-CUList* Channel::GetOppedUsers()
+Membership* Channel::GetUser(User* user)
{
- return &internal_op_userlist;
-}
-
-CUList* Channel::GetHalfoppedUsers()
-{
- return &internal_halfop_userlist;
+ UserMembIter i = userlist.find(user);
+ if (i == userlist.end())
+ return NULL;
+ return i->second;
}
-CUList* Channel::GetVoicedUsers()
+const UserMembList* Channel::GetUsers()
{
- return &internal_voice_userlist;
+ return &userlist;
}
void Channel::SetDefaultModes()
}
else
{
- privs = "@";
+ privs = "o";
created_by_local = true;
}
Channel* Channel::ForceChan(InspIRCd* Instance, Channel* Ptr, User* user, const std::string &privs, bool bursting, bool created)
{
std::string nick = user->nick;
- bool silent = false;
-
- Ptr->AddUser(user);
- /* Just in case they have no permissions */
- user->chans[Ptr] = 0;
+ Membership* memb = Ptr->AddUser(user);
+ user->chans.insert(Ptr);
for (std::string::const_iterator x = privs.begin(); x != privs.end(); x++)
{
const char status = *x;
- ModeHandler* mh = Instance->Modes->FindPrefix(status);
+ ModeHandler* mh = Instance->Modes->FindMode(status, MODETYPE_CHANNEL);
if (mh)
{
/* Set, and make sure that the mode handler knows this mode was now set */
- Ptr->SetPrefix(user, status, mh->GetPrefixRank(), true);
+ Ptr->SetPrefix(user, mh->GetModeChar(), true);
mh->OnModeChange(Instance->FakeClient, Instance->FakeClient, Ptr, nick, true);
-
- switch (mh->GetPrefix())
- {
- /* These logic ops are SAFE IN THIS CASE because if the entry doesnt exist,
- * addressing operator[] creates it. If they do exist, it points to it.
- * At all other times where we dont want to create an item if it doesnt exist, we
- * must stick to ::find().
- */
- case '@':
- user->chans[Ptr] |= UCMODE_OP;
- break;
- case '%':
- user->chans[Ptr] |= UCMODE_HOP;
- break;
- case '+':
- user->chans[Ptr] |= UCMODE_VOICE;
- break;
- }
}
}
- FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(user, Ptr, bursting, silent, created));
+ CUList except_list;
+ FOREACH_MOD_I(Instance,I_OnUserJoin,OnUserJoin(memb, bursting, created, except_list));
- if (!silent)
- Ptr->WriteChannel(user,"JOIN :%s",Ptr->name.c_str());
+ Ptr->WriteAllExcept(user, false, 0, except_list, "JOIN :%s", Ptr->name.c_str());
/* Theyre not the first ones in here, make sure everyone else sees the modes we gave the user */
std::string ms = Instance->Modes->ModeString(user, Ptr);
}
Ptr->UserList(user);
}
- FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(user, Ptr));
+ FOREACH_MOD_I(Instance,I_OnPostJoin,OnPostJoin(memb));
return Ptr;
}
*/
long Channel::PartUser(User *user, std::string &reason)
{
- bool silent = false;
-
if (!user)
return this->GetUserCounter();
- UCListIter i = user->chans.find(this);
- if (i != user->chans.end())
+ Membership* memb = GetUser(user);
+
+ if (memb)
{
- FOREACH_MOD(I_OnUserPart,OnUserPart(user, this, reason, silent));
+ CUList except_list;
+ FOREACH_MOD(I_OnUserPart,OnUserPart(memb, reason, except_list));
- if (!silent)
- this->WriteChannel(user, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
+ WriteAllExcept(user, false, 0, except_list, "PART %s%s%s", this->name.c_str(), reason.empty() ? "" : " :", reason.c_str());
- user->chans.erase(i);
+ user->chans.erase(this);
this->RemoveAllPrefixes(user);
}
long Channel::KickUser(User *src, User *user, const char* reason)
{
- bool silent = false;
-
if (!src || !user || !reason)
return this->GetUserCounter();
+ Membership* memb = GetUser(user);
if (IS_LOCAL(src))
{
- if (!this->HasUser(user))
+ if (!memb)
{
src->WriteNumeric(ERR_USERNOTINCHANNEL, "%s %s %s :They are not on that channel",src->nick.c_str(), user->nick.c_str(), this->name.c_str());
return this->GetUserCounter();
ModResult res;
if (ServerInstance->ULine(src->server))
res = MOD_RES_ALLOW;
- if (res == MOD_RES_PASSTHRU)
- FIRST_MOD_RESULT(ServerInstance, OnUserPreKick, res, (src,user,this,reason));
- if (res == MOD_RES_PASSTHRU)
- FIRST_MOD_RESULT(ServerInstance, OnAccessCheck, res, (src,user,this,AC_KICK));
+ else
+ FIRST_MOD_RESULT(ServerInstance, OnUserPreKick, res, (src,memb,reason));
if (res == MOD_RES_DENY)
return this->GetUserCounter();
if (res == MOD_RES_PASSTHRU)
{
- int them = this->GetStatus(src);
- int us = this->GetStatus(user);
- if ((them < STATUS_HOP) || (them < us))
+ int them = this->GetPrefixValue(src);
+ int us = this->GetPrefixValue(user);
+ if ((them < HALFOP_VALUE) || (them < us))
{
- src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",src->nick.c_str(), this->name.c_str(), them == STATUS_HOP ? "" : "half-");
+ src->WriteNumeric(ERR_CHANOPRIVSNEEDED, "%s %s :You must be a channel %soperator",src->nick.c_str(), this->name.c_str(), them >= HALFOP_VALUE ? "" : "half-");
return this->GetUserCounter();
}
}
}
- FOREACH_MOD(I_OnUserKick,OnUserKick(src, user, this, reason, silent));
-
- UCListIter i = user->chans.find(this);
- if (i != user->chans.end())
+ if (memb)
{
- /* zap it from the channel list of the user */
- if (!silent)
- this->WriteChannel(src, "KICK %s %s :%s", this->name.c_str(), user->nick.c_str(), reason);
+ CUList except_list;
+ FOREACH_MOD(I_OnUserKick,OnUserKick(src, memb, reason, except_list));
+
+ WriteAllExcept(src, false, 0, except_list, "KICK %s %s :%s", name.c_str(), user->nick.c_str(), reason);
- user->chans.erase(i);
+ user->chans.erase(this);
this->RemoveAllPrefixes(user);
}
void Channel::WriteChannel(User* user, const std::string &text)
{
- CUList *ulist = this->GetUsers();
char tb[MAXBUF];
if (!user)
snprintf(tb,MAXBUF,":%s %s", user->GetFullHost().c_str(), text.c_str());
std::string out = tb;
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
{
if (IS_LOCAL(i->first))
i->first->Write(out);
void Channel::WriteChannelWithServ(const char* ServName, const std::string &text)
{
- CUList *ulist = this->GetUsers();
char tb[MAXBUF];
snprintf(tb,MAXBUF,":%s %s", ServName ? ServName : ServerInstance->Config->ServerName, text.c_str());
std::string out = tb;
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
{
if (IS_LOCAL(i->first))
i->first->Write(out);
void Channel::RawWriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const std::string &out)
{
- CUList *ulist = this->GetUsers();
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ char statmode = 0;
+ if (status)
+ {
+ ModeHandler* mh = ServerInstance->Modes->FindPrefix(status);
+ if (mh)
+ statmode = mh->GetModeChar();
+ }
+ for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
{
if ((IS_LOCAL(i->first)) && (except_list.find(i->first) == except_list.end()))
{
/* User doesnt have the status we're after */
- if (status && !strchr(this->GetAllPrefixChars(i->first), status))
+ if (statmode && !i->second->hasMode(statmode))
continue;
i->first->Write(out);
void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const std::string& text)
{
CUList except_list;
- except_list[user] = user->nick;
+ except_list.insert(user);
this->WriteAllExcept(user, serversource, status, except_list, std::string(text));
}
int Channel::CountInvisible()
{
int count = 0;
- CUList *ulist= this->GetUsers();
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
{
if (!(i->first->IsModeSet('i')))
count++;
/* compile a userlist of a channel into a string, each nick seperated by
* spaces and op, voice etc status shown as @ and +, and send it to 'user'
*/
-void Channel::UserList(User *user, CUList *ulist)
+void Channel::UserList(User *user)
{
char list[MAXBUF];
size_t dlen, curlen;
if (!IS_LOCAL(user))
return;
- FIRST_MOD_RESULT(ServerInstance, OnUserList, call_modules, (user, this, ulist));
+ FIRST_MOD_RESULT(ServerInstance, OnUserList, call_modules, (user, this));
if (call_modules != MOD_RES_ALLOW)
{
int numusers = 0;
char* ptr = list + dlen;
- if (!ulist)
- ulist = this->GetUsers();
-
/* Improvement by Brain - this doesnt change in value, so why was it inside
* the loop?
*/
bool has_user = this->HasUser(user);
- for (CUList::iterator i = ulist->begin(); i != ulist->end(); i++)
+ for (UserMembIter i = userlist.begin(); i != userlist.end(); i++)
{
if ((!has_user) && (i->first->IsModeSet('i')))
{
if (call_modules != MOD_RES_DENY)
{
- FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->first, this, prefixlist, nick));
+ FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->second, prefixlist, nick));
/* Nick was nuked, a module wants us to skip it */
if (nick.empty())
const char* Channel::GetPrefixChar(User *user)
{
static char pf[2] = {0, 0};
+ *pf = 0;
+ unsigned int bestrank = 0;
- prefixlist::iterator n = prefixes.find(user);
- if (n != prefixes.end())
+ UserMembIter m = userlist.find(user);
+ if (m != userlist.end())
{
- if (n->second.size())
+ for(unsigned int i=0; i < m->second->modes.length(); i++)
{
- /* If the user has any prefixes, their highest prefix
- * will always be at the head of the list, as the list is
- * sorted in rank order highest first (see SetPrefix()
- * for reasons why)
- */
- *pf = n->second.begin()->first;
- return pf;
+ char mchar = m->second->modes[i];
+ ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+ if (mh && mh->GetPrefixRank() > bestrank && mh->GetPrefix())
+ {
+ bestrank = mh->GetPrefixRank();
+ pf[0] = mh->GetPrefix();
+ }
}
}
-
- *pf = 0;
return pf;
}
+unsigned int Membership::getRank()
+{
+ char mchar = modes.c_str()[0];
+ unsigned int rv = 0;
+ if (mchar)
+ {
+ ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+ if (mh)
+ rv = mh->GetPrefixRank();
+ }
+ return rv;
+}
const char* Channel::GetAllPrefixChars(User* user)
{
- static char prefix[MAXBUF];
+ static char prefix[64];
int ctr = 0;
- *prefix = 0;
- prefixlist::iterator n = prefixes.find(user);
- if (n != prefixes.end())
+ UserMembIter m = userlist.find(user);
+ if (m != userlist.end())
{
- for (std::vector<prefixtype>::iterator x = n->second.begin(); x != n->second.end(); x++)
+ for(unsigned int i=0; i < m->second->modes.length(); i++)
{
- prefix[ctr++] = x->first;
+ char mchar = m->second->modes[i];
+ ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+ if (mh && mh->GetPrefix())
+ prefix[ctr++] = mh->GetPrefix();
}
}
-
prefix[ctr] = 0;
return prefix;
unsigned int Channel::GetPrefixValue(User* user)
{
- prefixlist::iterator n = prefixes.find(user);
- if (n != prefixes.end())
- {
- if (n->second.size())
- return n->second.begin()->second;
- }
- return 0;
-}
-
-int Channel::GetStatusFlags(User *user)
-{
- UCListIter i = user->chans.find(this);
- if (i != user->chans.end())
- {
- return i->second;
- }
- return 0;
+ UserMembIter m = userlist.find(user);
+ if (m == userlist.end())
+ return 0;
+ return m->second->getRank();
}
-int Channel::GetStatus(User *user)
+void Channel::SetPrefix(User* user, char prefix, bool adding)
{
- if (ServerInstance->ULine(user->server))
- return STATUS_OP;
-
- UCListIter i = user->chans.find(this);
- if (i != user->chans.end())
+ ModeHandler* delta_mh = ServerInstance->Modes->FindMode(prefix, MODETYPE_CHANNEL);
+ if (!delta_mh)
+ return;
+ UserMembIter m = userlist.find(user);
+ if (m == userlist.end())
+ return;
+ for(unsigned int i=0; i < m->second->modes.length(); i++)
{
- if ((i->second & UCMODE_OP) > 0)
- {
- return STATUS_OP;
- }
- if ((i->second & UCMODE_HOP) > 0)
+ char mchar = m->second->modes[i];
+ ModeHandler* mh = ServerInstance->Modes->FindMode(mchar, MODETYPE_CHANNEL);
+ if (mh && mh->GetPrefixRank() <= delta_mh->GetPrefixRank())
{
- return STATUS_HOP;
- }
- if ((i->second & UCMODE_VOICE) > 0)
- {
- return STATUS_VOICE;
+ m->second->modes =
+ m->second->modes.substr(0,i) +
+ (adding ? std::string(1, prefix) : "") +
+ m->second->modes.substr(mchar == prefix ? i+1 : i);
+ return;
}
- return STATUS_NORMAL;
}
- return STATUS_NORMAL;
-}
-
-void Channel::SetPrefix(User* user, char prefix, unsigned int prefix_value, bool adding)
-{
- prefixlist::iterator n = prefixes.find(user);
- prefixtype pfx = std::make_pair(prefix,prefix_value);
if (adding)
- {
- if (n != prefixes.end())
- {
- if (std::find(n->second.begin(), n->second.end(), pfx) == n->second.end())
- {
- n->second.push_back(pfx);
- /* We must keep prefixes in rank order, largest first.
- * This is for two reasons, firstly because x-chat *ass-u-me's* this
- * state, and secondly it turns out to be a benefit to us later.
- * See above in GetPrefix().
- */
- std::sort(n->second.begin(), n->second.end(), ModeParser::PrefixComparison);
- }
- }
- else
- {
- pfxcontainer one;
- one.push_back(pfx);
- prefixes.insert(std::make_pair<User*,pfxcontainer>(user, one));
- }
- }
- else
- {
- if (n != prefixes.end())
- {
- pfxcontainer::iterator x = std::find(n->second.begin(), n->second.end(), pfx);
- if (x != n->second.end())
- n->second.erase(x);
- }
- }
+ m->second->modes += std::string(1, prefix);
}
void Channel::RemoveAllPrefixes(User* user)
{
- prefixlist::iterator n = prefixes.find(user);
- if (n != prefixes.end())
+ UserMembIter m = userlist.find(user);
+ if (m != userlist.end())
{
- prefixes.erase(n);
+ m->second->modes.clear();
}
}
projects / user / henk / code / inspircd.git / blobdiff