This one too, grr

[user/henk/code/inspircd.git] / src / modules / m_nickflood.cpp

diff --git a/src/modules/m_nickflood.cpp b/src/modules/m_nickflood.cpp
index c5ba4065b2b7645c4516c762253ab48a866875b0..181bbaa4c6ab039d54164eb6f9ab3f9b1f03ac7e 100644 (file)
--- a/src/modules/m_nickflood.cpp
+++ b/src/modules/m_nickflood.cpp
@@ -90,7 +90,7 @@ class NickFlood : public ModeHandler
  public:
        NickFlood(InspIRCd* Instance) : ModeHandler(Instance, 'F', 1, 0, false, MODETYPE_CHANNEL, false) { }
 
-       ModePair ModeSet(userrec* source, userrec* dest, chanrec* channel, const std::string &parameter)
+       ModePair ModeSet(User* source, User* dest, Channel* channel, const std::string &parameter)
        {
                nickfloodsettings* x;
                if (channel->GetExt("nickflood",x))
@@ -99,13 +99,13 @@ class NickFlood : public ModeHandler
                        return std::make_pair(false, parameter);
        } 
 
-       bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, chanrec* channel)
+       bool CheckTimeStamp(time_t theirs, time_t ours, const std::string &their_param, const std::string &our_param, Channel* channel)
        {
                /* When TS is equal, the alphabetically later one wins */
                return (their_param < our_param);
        }
 
-       ModeAction OnModeChange(userrec* source, userrec* dest, chanrec* channel, std::string &parameter, bool adding)
+       ModeAction OnModeChange(User* source, User* dest, Channel* channel, std::string &parameter, bool adding)
        {
                nickfloodsettings* dummy;
 
@@ -215,15 +215,18 @@ class ModuleNickFlood : public Module
        {
                
                jf = new NickFlood(ServerInstance);
-               if (!ServerInstance->AddMode(jf, 'F'))
+               if (!ServerInstance->AddMode(jf))
                        throw ModuleException("Could not add new modes!");
        }
 
-       virtual int OnUserPreNick(userrec* user, const std::string &newnick)
+       virtual int OnUserPreNick(User* user, const std::string &newnick)
        {
+               if (isdigit(newnick[0])) /* allow switches to UID */
+                       return 0;
+
                for (UCListIter i = user->chans.begin(); i != user->chans.end(); i++)
                {
-                       chanrec *channel = i->first;
+                       Channel *channel = i->first;
 
                        nickfloodsettings *f;
                        if (channel->GetExt("nickflood", f))
@@ -251,7 +254,7 @@ class ModuleNickFlood : public Module
                return 0;
        }
        
-       void OnChannelDelete(chanrec* chan)
+       void OnChannelDelete(Channel* chan)
        {
                nickfloodsettings *f;
                if (chan->GetExt("nickflood",f))