already_sent_t silent_id = ++LocalUser::already_sent_id;
already_sent_t seen_id = ++LocalUser::already_sent_id;
- 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));
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;
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)