#include "wildcard.h"
#include "mode.h"
-Channel::Channel(InspIRCd* Instance, const std::string &name, time_t ts) : ServerInstance(Instance)
+Channel::Channel(InspIRCd* Instance, const std::string &cname, time_t ts) : ServerInstance(Instance)
{
chan_hash::iterator findchan = ServerInstance->chanlist->find(name);
if (findchan != Instance->chanlist->end())
- throw CoreException("Cannot create duplicate channel " + name);
+ throw CoreException("Cannot create duplicate channel " + cname);
- (*(ServerInstance->chanlist))[name.c_str()] = this;
- strlcpy(this->name, name.c_str(), CHANMAX);
- this->created = ts ? ts : ServerInstance->Time(true);
+ (*(ServerInstance->chanlist))[cname.c_str()] = this;
+ strlcpy(this->name, cname.c_str(), CHANMAX);
+ this->created = ts ? ts : ServerInstance->Time();
this->age = this->created;
{
if (user->chans.size() >= user->GetMaxChans())
{
- user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+ user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn);
return NULL;
}
}
{
if (user->chans.size() >= Instance->Config->OperMaxChans)
{
- user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+ user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn);
return NULL;
}
}
{
if (user->chans.size() >= Instance->Config->MaxChans)
{
- user->WriteServ("405 %s %s :You are on too many channels",user->nick, cn);
+ user->WriteNumeric(405, "%s %s :You are on too many channels",user->nick, cn);
return NULL;
}
}
if (!IS_LOCAL(user))
{
if (!TS)
- Instance->Log(DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn);
+ Instance->Logs->Log("CHANNEL",DEBUG,"*** BUG *** Channel::JoinUser called for REMOTE user '%s' on channel '%s' but no TS given!", user->nick, cn);
}
else
{
{
if ((!key) || strcmp(key,Ptr->key))
{
- user->WriteServ("475 %s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name);
+ user->WriteNumeric(475, "%s %s :Cannot join channel (Incorrect channel key)",user->nick, Ptr->name);
return NULL;
}
}
{
if (!user->IsInvited(Ptr->name))
{
- user->WriteServ("473 %s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
+ user->WriteNumeric(473, "%s %s :Cannot join channel (Invite only)",user->nick, Ptr->name);
return NULL;
}
}
{
if (Ptr->GetUserCounter() >= Ptr->limit)
{
- user->WriteServ("471 %s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
+ user->WriteNumeric(471, "%s %s :Cannot join channel (Channel is full)",user->nick, Ptr->name);
return NULL;
}
}
{
if (Ptr->IsBanned(user))
{
- user->WriteServ("474 %s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
+ user->WriteNumeric(474, "%s %s :Cannot join channel (You're banned)",user->nick, Ptr->name);
return NULL;
}
}
{
if (Ptr->topicset)
{
- user->WriteServ("332 %s %s :%s", user->nick, Ptr->name, Ptr->topic);
- user->WriteServ("333 %s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
+ user->WriteNumeric(332, "%s %s :%s", user->nick, Ptr->name, Ptr->topic);
+ user->WriteNumeric(333, "%s %s %s %lu", user->nick, Ptr->name, Ptr->setby, (unsigned long)Ptr->topicset);
}
Ptr->UserList(user);
}
{
if (!this->HasUser(user))
{
- src->WriteServ("441 %s %s %s :They are not on that channel",src->nick, user->nick, this->name);
+ src->WriteNumeric(441, "%s %s %s :They are not on that channel",src->nick, user->nick, this->name);
return this->GetUserCounter();
}
if ((ServerInstance->ULine(user->server)) && (!ServerInstance->ULine(src->server)))
{
- src->WriteServ("482 %s %s :Only a u-line may kick a u-line from a channel.",src->nick, this->name);
+ src->WriteNumeric(482, "%s %s :Only a u-line may kick a u-line from a channel.",src->nick, this->name);
return this->GetUserCounter();
}
int MOD_RESULT = 0;
int us = this->GetStatus(user);
if ((them < STATUS_HOP) || (them < us))
{
- src->WriteServ("482 %s %s :You must be a channel %soperator",src->nick, this->name, them == STATUS_HOP ? "" : "half-");
+ src->WriteNumeric(482, "%s %s :You must be a channel %soperator",src->nick, this->name, them == STATUS_HOP ? "" : "half-");
return this->GetUserCounter();
}
}
return this->GetUserCounter();
}
-void Channel::WriteChannel(User* user, char* text, ...)
+void Channel::WriteChannel(User* user, const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
/* write formatted text from a source user to all users on a channel except
* for the sender (for privmsg etc) */
-void Channel::WriteAllExceptSender(User* user, bool serversource, char status, char* text, ...)
+void Channel::WriteAllExceptSender(User* user, bool serversource, char status, const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
this->WriteAllExceptSender(user, serversource, status, std::string(textbuffer));
}
-void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, char* text, ...)
+void Channel::WriteAllExcept(User* user, bool serversource, char status, CUList &except_list, const char* text, ...)
{
char textbuffer[MAXBUF];
va_list argsPtr;
char list[MAXBUF];
size_t dlen, curlen;
int MOD_RESULT = 0;
+ bool call_modules = true;
if (!IS_LOCAL(user))
return;
FOREACH_RESULT(I_OnUserList,OnUserList(user, this, ulist));
if (MOD_RESULT == 1)
- return;
+ call_modules = false;
+
if (MOD_RESULT != -1)
{
if ((this->IsModeSet('s')) && (!this->HasUser(user)))
{
- user->WriteServ("401 %s %s :No such nick/channel",user->nick, this->name);
+ user->WriteNumeric(401, "%s %s :No such nick/channel",user->nick, this->name);
return;
}
}
- dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name);
+ dlen = curlen = snprintf(list,MAXBUF,"%s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name);
int numusers = 0;
char* ptr = list + dlen;
if (i->first->Visibility && !i->first->Visibility->VisibleTo(user))
continue;
- size_t ptrlen = snprintf(ptr, MAXBUF, "%s%s ", this->GetPrefixChar(i->first), i->second.c_str());
- /* OnUserList can change this - reset it back to normal */
- i->second = i->first->nick;
-
- curlen += ptrlen;
- ptr += ptrlen;
+ std::string prefixlist = this->GetPrefixChar(i->first);
+ std::string nick = i->first->nick;
- numusers++;
+ if (call_modules)
+ {
+ FOREACH_MOD(I_OnNamesListItem, OnNamesListItem(user, i->first, this, prefixlist, nick));
+
+ /* Nick was nuked, a module wants us to skip it */
+ if (nick.empty())
+ continue;
+ }
+
+ size_t ptrlen = 0;
if (curlen > (480-NICKMAX))
{
user->WriteServ(std::string(list));
/* reset our lengths */
- dlen = curlen = snprintf(list,MAXBUF,"353 %s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name);
+ dlen = curlen = snprintf(list,MAXBUF,"%s %c %s :", user->nick, this->IsModeSet('s') ? '@' : this->IsModeSet('p') ? '*' : '=', this->name);
ptr = list + dlen;
ptrlen = 0;
numusers = 0;
}
+
+ ptrlen = snprintf(ptr, MAXBUF, "%s%s ", prefixlist.c_str(), nick.c_str());
+
+ curlen += ptrlen;
+ ptr += ptrlen;
+
+ numusers++;
}
/* if whats left in the list isnt empty, send it */
if (numusers)
{
- user->WriteServ(std::string(list));
+ user->WriteNumeric(353,std::string(list));
}
- user->WriteServ("366 %s %s :End of /NAMES list.", user->nick, this->name);
+ user->WriteNumeric(366, "%s %s :End of /NAMES list.", user->nick, this->name);
}
long Channel::GetMaxBans()
return pf;
}
+
const char* Channel::GetAllPrefixChars(User* user)
{
static char prefix[MAXBUF];
projects / user / henk / code / inspircd.git / blobdiff