Add UserManager::NextAlreadySentId() and convert all code to use it

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

diff --git a/src/modules/m_hostcycle.cpp b/src/modules/m_hostcycle.cpp
index 79b4169ec65f302999d0e9ac217d9e88986761b4..d4def647347e9e3fa0fbf4366cc85390661afa54 100644 (file)
--- a/src/modules/m_hostcycle.cpp
+++ b/src/modules/m_hostcycle.cpp
@@ -29,10 +29,10 @@ class ModuleHostCycle : public Module
                // GetFullHost() returns the original data at the time this function is called
                const std::string quitline = ":" + user->GetFullHost() + " QUIT :" + quitmsg;
 
-               already_sent_t silent_id = ++LocalUser::already_sent_id;
-               already_sent_t seen_id = ++LocalUser::already_sent_id;
+               already_sent_t silent_id = ServerInstance->Users.NextAlreadySentId();
+               already_sent_t seen_id = ServerInstance->Users.NextAlreadySentId();
 
-               UserChanList include_chans(user->chans);
+               IncludeChanList include_chans(user->chans.begin(), user->chans.end());
                std::map<User*,bool> exceptions;
 
                FOREACH_MOD(OnBuildNeighborList, (user, include_chans, exceptions));
@@ -56,10 +56,10 @@ class ModuleHostCycle : public Module
 
                std::string newfullhost = user->nick + "!" + newident + "@" + newhost;
 
-               for (UCListIter i = include_chans.begin(); i != include_chans.end(); ++i)
+               for (IncludeChanList::const_iterator i = include_chans.begin(); i != include_chans.end(); ++i)
                {
-                       Channel* c = *i;
-                       Membership* memb = c->GetUser(user);
+                       Membership* memb = *i;
+                       Channel* c = memb->chan;
                        const std::string joinline = ":" + newfullhost + " JOIN " + c->name;
                        std::string modeline;
 
@@ -72,8 +72,8 @@ class ModuleHostCycle : public Module
                                        modeline.append(" ").append(user->nick);
                        }
 
-                       const UserMembList* ulist = c->GetUsers();
-                       for (UserMembList::const_iterator j = ulist->begin(); j != ulist->end(); ++j)
+                       const Channel::MemberMap& ulist = c->GetUsers();
+                       for (Channel::MemberMap::const_iterator j = ulist.begin(); j != ulist.end(); ++j)
                        {
                                LocalUser* u = IS_LOCAL(j->first);
                                if (u == NULL || u == user)