m2 = new AChannel_M(ServerInstance);
m3 = new AUser_R(ServerInstance);
if (!ServerInstance->Modes->AddMode(m1) || !ServerInstance->Modes->AddMode(m2) || !ServerInstance->Modes->AddMode(m3))
- throw ModuleException("Could not add new modes!");
+ throw ModuleException("You cannot load m_services.so and m_services_account.so at the same time (or some other module has claimed our modes)!");
Implementation eventlist[] = { I_OnWhois, I_OnUserPreMessage, I_OnUserPreNotice, I_OnUserPreJoin,
- I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData };
+ I_OnSyncUserMetaData, I_OnUserQuit, I_OnCleanup, I_OnDecodeMetaData, I_On005Numeric };
- ServerInstance->Modules->Attach(eventlist, this, 8);
+ ServerInstance->Modules->Attach(eventlist, this, 9);
+ }
+
+ virtual void On005Numeric(std::string &t)
+ {
+ ServerInstance->AddExtBanChar('R');
+ ServerInstance->AddExtBanChar('M');
}
/* <- :twisted.oscnet.org 330 w00t2 w00t2 w00t :is logged in as */
user->GetExt("accountname", account);
+ if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
+ {
+ // user is ulined, can speak regardless
+ return 0;
+ }
+
if (target_type == TYPE_CHANNEL)
{
Channel* c = (Channel*)dest;
if ((c->IsModeSet('M')) && (!account))
{
- if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
- {
- // user is ulined, can speak regardless
- return 0;
- }
-
// user messaging a +M channel and is not registered
user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(c->name)+" :You need to be identified to a registered account to message this channel");
return 1;
}
+
+ if (account)
+ {
+ if (c->IsExtBanned(*account, 'M'))
+ {
+ // may not speak
+ user->WriteNumeric(477, ""+std::string(user->nick)+" "+std::string(c->name)+" :You may not speak in this channel");
+ return 1;
+ }
+ }
}
+
if (target_type == TYPE_USER)
{
User* u = (User*)dest;
if ((u->modes['R'-65]) && (!account))
{
- if ((ServerInstance->ULine(user->nick.c_str())) || (ServerInstance->ULine(user->server)))
- {
- // user is ulined, can speak regardless
- return 0;
- }
-
// user messaging a +R user and is not registered
user->WriteNumeric(477, ""+ user->nick +" "+ u->nick +" :You need to be identified to a registered account to message this user");
return 1;
return 1;
}
}
+
+ if (account)
+ {
+ if (chan->IsExtBanned(*account, 'R'))
+ {
+ // may not join
+ user->WriteNumeric(ERR_BANNEDFROMCHAN, "%s %s :Cannot join channel (You're banned)", user->nick.c_str(), chan->name.c_str());
+ return 1;
+ }
+ }
}
return 0;
}
virtual Version GetVersion()
{
- return Version(1,2,0,0,VF_COMMON|VF_VENDOR,API_VERSION);
+ return Version("$Id$",VF_COMMON|VF_VENDOR,API_VERSION);
}
};