summaryrefslogtreecommitdiff
path: root/modules/commands
diff options
context:
space:
mode:
Diffstat (limited to 'modules/commands')
-rw-r--r--modules/commands/bs_kick.cpp6
-rw-r--r--modules/commands/cs_access.cpp4
-rw-r--r--modules/commands/cs_akick.cpp4
-rw-r--r--modules/commands/cs_ban.cpp4
-rw-r--r--modules/commands/cs_enforce.cpp12
-rw-r--r--modules/commands/cs_kick.cpp4
-rw-r--r--modules/commands/cs_mode.cpp4
-rw-r--r--modules/commands/cs_modes.cpp2
-rw-r--r--modules/commands/cs_suspend.cpp4
-rw-r--r--modules/commands/cs_sync.cpp2
-rw-r--r--modules/commands/cs_updown.cpp4
-rw-r--r--modules/commands/ns_recover.cpp4
-rw-r--r--modules/commands/os_chankill.cpp4
-rw-r--r--modules/commands/os_list.cpp8
-rw-r--r--modules/commands/os_sxline.cpp4
15 files changed, 35 insertions, 35 deletions
diff --git a/modules/commands/bs_kick.cpp b/modules/commands/bs_kick.cpp
index 3e569696e..bb6cf9179 100644
--- a/modules/commands/bs_kick.cpp
+++ b/modules/commands/bs_kick.cpp
@@ -708,7 +708,7 @@ class BSKick : public Module
UserData *GetUserData(User *u, Channel *c)
{
- UserContainer *uc = c->FindUser(u);
+ ChanUserContainer *uc = c->FindUser(u);
if (uc == NULL)
return NULL;
@@ -776,7 +776,7 @@ class BSKick : public Module
for (channel_map::const_iterator cit = ChannelList.begin(), cit_end = ChannelList.end(); cit != cit_end; ++cit)
{
Channel *c = cit->second;
- for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ++it)
+ for (Channel::ChanUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ++it)
(*it)->Shrink("bs_main_userdata");
c->Shrink("bs_main_bandata");
}
@@ -1004,7 +1004,7 @@ class BSKick : public Module
if (ud->lastline.equals_ci(realbuf) && !ud->lasttarget.empty() && !ud->lasttarget.equals_ci(ci->name))
{
- for (UChannelList::iterator it = u->chans.begin(); it != u->chans.end();)
+ for (User::ChanUserList::iterator it = u->chans.begin(); it != u->chans.end();)
{
Channel *chan = (*it)->chan;
++it;
diff --git a/modules/commands/cs_access.cpp b/modules/commands/cs_access.cpp
index ed6f4f7fa..adf49a037 100644
--- a/modules/commands/cs_access.cpp
+++ b/modules/commands/cs_access.cpp
@@ -325,7 +325,7 @@ class CommandCSAccess : public Command
Anope::string timebuf;
if (ci->c)
- for (CUserList::const_iterator cit = ci->c->users.begin(), cit_end = ci->c->users.end(); cit != cit_end; ++cit)
+ for (Channel::ChanUserList::const_iterator cit = ci->c->users.begin(), cit_end = ci->c->users.end(); cit != cit_end; ++cit)
if (access->Matches((*cit)->user, (*cit)->user->Account()))
timebuf = "Now";
if (timebuf.empty())
@@ -359,7 +359,7 @@ class CommandCSAccess : public Command
Anope::string timebuf;
if (ci->c)
- for (CUserList::const_iterator cit = ci->c->users.begin(), cit_end = ci->c->users.end(); cit != cit_end; ++cit)
+ for (Channel::ChanUserList::const_iterator cit = ci->c->users.begin(), cit_end = ci->c->users.end(); cit != cit_end; ++cit)
if (access->Matches((*cit)->user, (*cit)->user->Account()))
timebuf = "Now";
if (timebuf.empty())
diff --git a/modules/commands/cs_akick.cpp b/modules/commands/cs_akick.cpp
index 9447b1aed..52d0ecd76 100644
--- a/modules/commands/cs_akick.cpp
+++ b/modules/commands/cs_akick.cpp
@@ -378,9 +378,9 @@ class CommandCSAKick : public Command
return;
}
- for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; )
+ for (User::ChanUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; )
{
- UserContainer *uc = *it++;
+ ChanUserContainer *uc = *it++;
if (ci->CheckKick(uc->user))
++count;
diff --git a/modules/commands/cs_ban.cpp b/modules/commands/cs_ban.cpp
index 0b8959a15..3b4ae9be0 100644
--- a/modules/commands/cs_ban.cpp
+++ b/modules/commands/cs_ban.cpp
@@ -148,9 +148,9 @@ class CommandCSBan : public Command
}
int matched = 0, kicked = 0;
- for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end;)
+ for (Channel::ChanUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end;)
{
- UserContainer *uc = *it++;
+ ChanUserContainer *uc = *it++;
if (Anope::Match(uc->user->nick, target) || Anope::Match(uc->user->GetDisplayedMask(), target))
{
diff --git a/modules/commands/cs_enforce.cpp b/modules/commands/cs_enforce.cpp
index 4622af04b..fce056994 100644
--- a/modules/commands/cs_enforce.cpp
+++ b/modules/commands/cs_enforce.cpp
@@ -62,9 +62,9 @@ class CommandCSEnforce : public Command
hadsecureops = true;
}
- for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ++it)
+ for (Channel::ChanUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ++it)
{
- UserContainer *uc = *it;
+ ChanUserContainer *uc = *it;
c->SetCorrectModes(uc->user, false, false);
}
@@ -82,9 +82,9 @@ class CommandCSEnforce : public Command
Log(LOG_COMMAND, source, this) << "to enforce restricted";
std::vector<User *> users;
- for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ++it)
+ for (Channel::ChanUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ++it)
{
- UserContainer *uc = *it;
+ ChanUserContainer *uc = *it;
User *user = uc->user;
if (ci->AccessFor(user).empty())
@@ -112,9 +112,9 @@ class CommandCSEnforce : public Command
Log(LOG_COMMAND, source, this) << "to enforce registered only";
std::vector<User *> users;
- for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ++it)
+ for (Channel::ChanUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ++it)
{
- UserContainer *uc = *it;
+ ChanUserContainer *uc = *it;
User *user = uc->user;
if (!user->IsIdentified())
diff --git a/modules/commands/cs_kick.cpp b/modules/commands/cs_kick.cpp
index e02ab5185..d832951c1 100644
--- a/modules/commands/cs_kick.cpp
+++ b/modules/commands/cs_kick.cpp
@@ -77,9 +77,9 @@ class CommandCSKick : public Command
Log(LOG_COMMAND, source, this, ci) << "for " << target;
int matched = 0, kicked = 0;
- for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end;)
+ for (Channel::ChanUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end;)
{
- UserContainer *uc = *it++;
+ ChanUserContainer *uc = *it++;
if (Anope::Match(uc->user->nick, target) || Anope::Match(uc->user->GetDisplayedMask(), target))
{
diff --git a/modules/commands/cs_mode.cpp b/modules/commands/cs_mode.cpp
index c33b317a2..6bfbd0da4 100644
--- a/modules/commands/cs_mode.cpp
+++ b/modules/commands/cs_mode.cpp
@@ -265,9 +265,9 @@ class CommandCSMode : public Command
if (param.find_first_of("*?") != Anope::string::npos)
{
- for (CUserList::const_iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
+ for (Channel::ChanUserList::const_iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
{
- UserContainer *uc = *it;
+ ChanUserContainer *uc = *it;
AccessGroup targ_access = ci->AccessFor(uc->user);
diff --git a/modules/commands/cs_modes.cpp b/modules/commands/cs_modes.cpp
index 696c38dde..26783c531 100644
--- a/modules/commands/cs_modes.cpp
+++ b/modules/commands/cs_modes.cpp
@@ -79,7 +79,7 @@ class CommandModeBase : public Command
User *u = source.GetUser();
if (chan.empty() && u)
- for (UChannelList::iterator it = u->chans.begin(); it != u->chans.end(); ++it)
+ for (User::ChanUserList::iterator it = u->chans.begin(); it != u->chans.end(); ++it)
do_mode(source, com, cm, (*it)->chan->name, u->nick, set, level, levelself);
else if (!chan.empty())
do_mode(source, com, cm, chan, !nick.empty() ? nick : u->nick, set, level, levelself);
diff --git a/modules/commands/cs_suspend.cpp b/modules/commands/cs_suspend.cpp
index 097de1823..4f840f576 100644
--- a/modules/commands/cs_suspend.cpp
+++ b/modules/commands/cs_suspend.cpp
@@ -104,9 +104,9 @@ class CommandCSSuspend : public Command
{
std::vector<User *> users;
- for (CUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
+ for (Channel::ChanUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
{
- UserContainer *uc = *it;
+ ChanUserContainer *uc = *it;
User *user = uc->user;
if (!user->HasMode(UMODE_OPER) && user->server != Me)
users.push_back(user);
diff --git a/modules/commands/cs_sync.cpp b/modules/commands/cs_sync.cpp
index 23d6928a1..03cf03672 100644
--- a/modules/commands/cs_sync.cpp
+++ b/modules/commands/cs_sync.cpp
@@ -34,7 +34,7 @@ class CommandCSSync : public Command
{
Log(LOG_COMMAND, source, this, ci);
- for (CUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
+ for (Channel::ChanUserList::iterator it = ci->c->users.begin(), it_end = ci->c->users.end(); it != it_end; ++it)
ci->c->SetCorrectModes((*it)->user, true, false);
source.Reply(_("All user modes on \002%s\002 have been synced."), ci->name.c_str());
diff --git a/modules/commands/cs_updown.cpp b/modules/commands/cs_updown.cpp
index 7504c3601..28a495e50 100644
--- a/modules/commands/cs_updown.cpp
+++ b/modules/commands/cs_updown.cpp
@@ -28,7 +28,7 @@ class CommandCSUp : public Command
User *u = source.GetUser();
if (params.empty())
- for (UChannelList::iterator it = u->chans.begin(); it != u->chans.end(); ++it)
+ for (User::ChanUserList::iterator it = u->chans.begin(); it != u->chans.end(); ++it)
{
Channel *c = (*it)->chan;
c->SetCorrectModes(u, true, false);
@@ -84,7 +84,7 @@ class CommandCSDown : public Command
User *u = source.GetUser();
if (params.empty())
- for (UChannelList::iterator it = u->chans.begin(); it != u->chans.end(); ++it)
+ for (User::ChanUserList::iterator it = u->chans.begin(); it != u->chans.end(); ++it)
{
Channel *c = (*it)->chan;
RemoveAll(u, c);
diff --git a/modules/commands/ns_recover.cpp b/modules/commands/ns_recover.cpp
index ed258c4e4..edd8ec48f 100644
--- a/modules/commands/ns_recover.cpp
+++ b/modules/commands/ns_recover.cpp
@@ -61,8 +61,8 @@ class NSRecoverRequest : public IdentifyRequest
if (!u->chans.empty())
{
NSRecoverExtensibleInfo *ei = new NSRecoverExtensibleInfo;
- for (UChannelList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it)
- (*ei)[(*it)->chan->name] = *(*it)->status;
+ for (User::ChanUserList::iterator it = u->chans.begin(), it_end = u->chans.end(); it != it_end; ++it)
+ (*ei)[(*it)->chan->name] = (*it)->status;
source.GetUser()->Extend("ns_recover_info", ei);
}
diff --git a/modules/commands/os_chankill.cpp b/modules/commands/os_chankill.cpp
index c1d71831b..fc3dd6181 100644
--- a/modules/commands/os_chankill.cpp
+++ b/modules/commands/os_chankill.cpp
@@ -72,9 +72,9 @@ class CommandOSChanKill : public Command
if ((c = Channel::Find(channel)))
{
- for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; )
+ for (Channel::ChanUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; )
{
- UserContainer *uc = *it++;
+ ChanUserContainer *uc = *it++;
if (uc->user->server == Me || uc->user->HasMode(UMODE_OPER))
continue;
diff --git a/modules/commands/os_list.cpp b/modules/commands/os_list.cpp
index dfb0c00c8..82523d24a 100644
--- a/modules/commands/os_list.cpp
+++ b/modules/commands/os_list.cpp
@@ -42,9 +42,9 @@ class CommandOSChanList : public Command
{
source.Reply(_("\002%s\002 channel list:"), u2->nick.c_str());
- for (UChannelList::iterator uit = u2->chans.begin(), uit_end = u2->chans.end(); uit != uit_end; ++uit)
+ for (User::ChanUserList::iterator uit = u2->chans.begin(), uit_end = u2->chans.end(); uit != uit_end; ++uit)
{
- ChannelContainer *cc = *uit;
+ ChanUserContainer *cc = *uit;
if (!Modes.empty())
for (std::list<ChannelModeName>::iterator it = Modes.begin(), it_end = Modes.end(); it != it_end; ++it)
@@ -136,9 +136,9 @@ class CommandOSUserList : public Command
{
source.Reply(_("\002%s\002 users list:"), pattern.c_str());
- for (CUserList::iterator cuit = c->users.begin(), cuit_end = c->users.end(); cuit != cuit_end; ++cuit)
+ for (Channel::ChanUserList::iterator cuit = c->users.begin(), cuit_end = c->users.end(); cuit != cuit_end; ++cuit)
{
- UserContainer *uc = *cuit;
+ ChanUserContainer *uc = *cuit;
if (!Modes.empty())
for (std::list<UserModeName>::iterator it = Modes.begin(), it_end = Modes.end(); it != it_end; ++it)
diff --git a/modules/commands/os_sxline.cpp b/modules/commands/os_sxline.cpp
index 7f48a2645..0fff4b3f0 100644
--- a/modules/commands/os_sxline.cpp
+++ b/modules/commands/os_sxline.cpp
@@ -596,9 +596,9 @@ class CommandOSSQLine : public CommandOSSXLineBase
continue;
std::vector<User *> users;
- for (CUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ++it)
+ for (Channel::ChanUserList::iterator it = c->users.begin(), it_end = c->users.end(); it != it_end; ++it)
{
- UserContainer *uc = *it;
+ ChanUserContainer *uc = *it;
User *user = uc->user;
if (!user->HasMode(UMODE_OPER) && user->server != Me)
generated by cgit (git 2.34.1) at 2025-07-04 16:30:02 +0000