#include "modes/cmode_o.h"
/* +h (channel halfop) */
#include "modes/cmode_h.h"
+/* +v (channel voice) */
+#include "modes/cmode_v.h"
+
+/* +s (server notices) */
+#include "modes/umode_s.h"
+/* +w (see wallops) */
+#include "modes/umode_w.h"
+/* +i (invisible) */
+#include "modes/umode_i.h"
+/* +o (operator) */
+#include "modes/umode_o.h"
+/* +n (notice mask - our implementation of snomasks) */
+#include "modes/umode_n.h"
extern int MODCOUNT;
extern std::vector<Module*> modules;
{
return "";
}
- n->uc_modes = ((ucrec*)(*i))->uc_modes | MASK;
+ n->uc_modes = n->uc_modes | MASK;
switch (MASK)
{
case UCMODE_OP:
return "";
}
-/*
-char* ModeParser::GiveVoice(userrec *user,char *dest,chanrec *chan,int status)
+void ModeParser::DisplayCurrentModes(userrec *user, userrec* targetuser, chanrec* targetchannel, const char* text)
{
- userrec *d = this->SanityChecks(user,dest,chan,status);
-
- if (d)
+ if (targetchannel)
{
- if (IS_LOCAL(user))
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_VOICE));
-
- if (MOD_RESULT == ACR_DENY)
- return NULL;
- if (MOD_RESULT == ACR_DEFAULT)
- {
- if ((status < STATUS_HOP) && (!is_uline(user->server)))
- {
- WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
- return NULL;
- }
- }
- }
-
- return this->Grant(d,chan,UCMODE_VOICE);
+ /* Display channel's current mode string */
+ WriteServ(user->fd,"324 %s %s +%s",user->nick, targetchannel->name, chanmodes(targetchannel, targetchannel->HasUser(user)));
+ WriteServ(user->fd,"329 %s %s %d", user->nick, targetchannel->name, targetchannel->created);
+ return;
}
- return NULL;
-}
-
-char* ModeParser::TakeVoice(userrec *user,char *dest,chanrec *chan,int status)
-{
- userrec *d = this->SanityChecks(user,dest,chan,status);
-
- if (d)
+ else if (targetuser)
{
- if (IS_LOCAL(user))
- {
- int MOD_RESULT = 0;
- FOREACH_RESULT(I_OnAccessCheck,OnAccessCheck(user,d,chan,AC_DEVOICE));
-
- if (MOD_RESULT == ACR_DENY)
- return NULL;
- if (MOD_RESULT == ACR_DEFAULT)
- {
- if ((status < STATUS_HOP) && (!is_uline(user->server)))
- {
- WriteServ(user->fd,"482 %s %s :You must be at least a half-operator to change modes on this channel",user->nick, chan->name);
- return NULL;
- }
- }
- }
-
- return this->Revoke(d,chan,UCMODE_VOICE);
+ /* Display user's current mode string */
+ WriteServ(user->fd,"221 %s :+%s",targetuser->nick,targetuser->FormatModes());
+ WriteServ(user->fd, "008 %s :+%s", targetuser->nick, targetuser->FormatNoticeMasks());
+ return;
}
- return NULL;
-}*/
-void ModeParser::Process(char **parameters, int pcnt, userrec *user, bool servermode)
+ /* No such nick/channel */
+ WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, text);
+ return;
+}
+
+void ModeParser::Process(const char** parameters, int pcnt, userrec *user, bool servermode)
{
std::string target = parameters[0];
ModeType type = MODETYPE_USER;
log(DEBUG,"ModeParser::Process start");
- if (pcnt > 1)
+ if (pcnt == 1)
+ {
+ this->DisplayCurrentModes(user, targetuser, targetchannel, parameters[0]);
+ }
+ else if (pcnt > 1)
{
if (targetchannel)
{
- log(DEBUG,"Target type is CHANNEL");
type = MODETYPE_CHANNEL;
mask = MASK_CHANNEL;
}
else if (targetuser)
{
- log(DEBUG,"Target type is USER");
type = MODETYPE_USER;
mask = MASK_USER;
}
else
{
/* No such nick/channel */
- log(DEBUG,"Target type is UNKNOWN, bailing");
+ WriteServ(user->fd,"401 %s %s :No such nick/channel",user->nick, parameters[0]);
return;
}
+
+ /* Special case for displaying the list for listmodes,
+ * e.g. MODE #chan b, or MODE #chan +b without a parameter
+ */
+ if ((type== MODETYPE_CHANNEL) && (pcnt == 2))
+ {
+ const char* mode = parameters[1];
+ if (*mode == '+')
+ mode++;
+
+ unsigned char handler_id = ((*mode) - 65) | mask;
+ ModeHandler* mh = modehandlers[handler_id];
+
+ if ((mh) && (mh->IsListMode()))
+ {
+ mh->DisplayList(user, targetchannel);
+ }
+ }
+
std::string mode_sequence = parameters[1];
std::string parameter = "";
std::ostringstream parameter_list;
std::string output_sequence = "";
bool adding = true, state_change = false;
- int handler_id = 0;
+ unsigned char handler_id = 0;
int parameter_counter = 2; /* Index of first parameter */
for (std::string::const_iterator letter = mode_sequence.begin(); letter != mode_sequence.end(); letter++)
}
}
+ /* It's an oper only mode, check if theyre an oper. If they arent,
+ * eat any parameter that came with the mode, and continue to next
+ */
+ if ((IS_LOCAL(user)) && (modehandlers[handler_id]->NeedsOper()) && (!*user->oper))
+ continue;
+
/* Call the handler for the mode */
ModeAction ma = modehandlers[handler_id]->OnModeChange(user, targetuser, targetchannel, parameter, adding);
{
WriteChannelWithServ(Config->ServerName,targetchannel,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
}
+ else
+ {
+ WriteServ(targetuser->fd,"MODE %s %s",targetuser->nick,output_sequence.c_str());
+ }
}
else
{
WriteChannel(targetchannel,user,"MODE %s %s%s",targetchannel->name,output_sequence.c_str(),parameter_list.str().c_str());
FOREACH_MOD(I_OnMode,OnMode(user, targetchannel, TYPE_CHANNEL, output_sequence + parameter_list.str()));
}
+ else
+ {
+ WriteTo(user,targetuser,"MODE %s %s",targetuser->nick,output_sequence.c_str());
+ FOREACH_MOD(I_OnMode,OnMode(user, targetuser, TYPE_USER, output_sequence));
+ }
}
}
}
}
-void cmd_mode::Handle (char **parameters, int pcnt, userrec *user)
+void cmd_mode::Handle (const char** parameters, int pcnt, userrec *user)
{
if (!user)
return;
* If they do that, thats their problem, and if i ever EVER see an
* official InspIRCd developer do that, i'll beat them with a paddle!
*/
- if ((modeletter < 'A') || (modeletter > 'z'))
+ if ((mh->GetModeChar() < 'A') || (mh->GetModeChar() > 'z'))
return false;
mh->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
- pos = (modeletter-65) | mask;
+ pos = (mh->GetModeChar()-65) | mask;
if (modehandlers[pos])
return false;
modehandlers[pos] = mh;
- log(DEBUG,"ModeParser::AddMode: added mode %c",modeletter);
+ log(DEBUG,"ModeParser::AddMode: added mode %c",mh->GetModeChar());
+ return true;
+}
+
+bool ModeParser::AddModeWatcher(ModeWatcher* mw)
+{
+ unsigned char mask = 0;
+ unsigned char pos = 0;
+
+ if (!mw)
+ return false;
+
+ if ((mw->GetModeChar() < 'A') || (mw->GetModeChar() > 'z'))
+ return false;
+
+ mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+ pos = (mw->GetModeChar()-65) | mask;
+
+ modewatchers[pos].push_back(mw);
+ log(DEBUG,"ModeParser::AddModeWatcher: watching mode %c",mw->GetModeChar());
+
+ return true;
+}
+
+bool ModeParser::DelModeWatcher(ModeWatcher* mw)
+{
+ unsigned char mask = 0;
+ unsigned char pos = 0;
+
+ if (!mw)
+ return false;
+
+ if ((mw->GetModeType() < 'A') || (mw->GetModeType() > 'z'))
+ return false;
+
+ mw->GetModeType() == MODETYPE_USER ? mask = MASK_USER : mask = MASK_CHANNEL;
+ pos = (mw->GetModeChar()-65) | mask;
+
+ ModeWatchIter a = find(modewatchers[pos].begin(),modewatchers[pos].end(),mw);
+
+ if (a == modewatchers[pos].end())
+ return false;
+
+ modewatchers[pos].erase(a);
+ log(DEBUG,"ModeParser::DelModeWatcher: stopped watching mode %c",mw->GetModeChar());
+
return true;
}
/* Initialise the RFC mode letters */
- /* Start with simple modes, no params */
+ /* Start with channel simple modes, no params */
this->AddMode(new ModeChannelSecret, 's');
this->AddMode(new ModeChannelPrivate, 'p');
this->AddMode(new ModeChannelModerated, 'm');
this->AddMode(new ModeChannelNoExternal, 'n');
this->AddMode(new ModeChannelInviteOnly, 'i');
- /* Now modes with params */
+ /* Cannel modes with params */
this->AddMode(new ModeChannelKey, 'k');
this->AddMode(new ModeChannelLimit, 'l');
- /* Now listmodes */
+ /* Channel listmodes */
this->AddMode(new ModeChannelBan, 'b');
this->AddMode(new ModeChannelOp, 'o');
this->AddMode(new ModeChannelHalfOp, 'h');
-
- /* TODO: Modes +v, +h */
+ this->AddMode(new ModeChannelVoice, 'v');
+
+ /* Now for usermodes */
+ this->AddMode(new ModeUserServerNotice, 's');
+ this->AddMode(new ModeUserWallops, 'w');
+ this->AddMode(new ModeUserInvisible, 'i');
+ this->AddMode(new ModeUserOperator, 'o');
+ this->AddMode(new ModeUserServerNoticeMask, 'n');
}
projects / user / henk / code / inspircd.git / blobdiff