summaryrefslogtreecommitdiff
path: root/src/core
diff options
context:
space:
mode:
Diffstat (limited to 'src/core')
-rw-r--r--src/core/cs_clear.c22
-rw-r--r--src/core/cs_modes.c22
-rw-r--r--src/core/cs_register.c4
-rw-r--r--src/core/cs_topic.c2
-rw-r--r--src/core/os_clearmodes.c20
-rw-r--r--src/core/os_oline.c1
6 files changed, 35 insertions, 36 deletions
diff --git a/src/core/cs_clear.c b/src/core/cs_clear.c
index 566286e4c..c3934d840 100644
--- a/src/core/cs_clear.c
+++ b/src/core/cs_clear.c
@@ -213,13 +213,13 @@ int do_clear(User * u)
av[2] = tmp;
/* We have to give as much nicks as modes.. - Viper */
for (i = 0; i < count; i++)
- av[i+3] = cu->user->nick;
+ av[i+3] = GET_USER(cu->user);
ac = 3 + i;
} else {
av[1] = tmp;
/* We have to give as much nicks as modes.. - Viper */
for (i = 0; i < count; i++)
- av[i+2] = cu->user->nick;
+ av[i+2] = GET_USER(cu->user);
ac = 2 + i;
}
@@ -240,8 +240,8 @@ int do_clear(User * u)
snprintf(tmp, BUFSIZE, "-%s%s%s", (isop ? "o" : ""), (isadmin ?
ircd->adminunset+1 : ""), (isown ? ircd->ownerunset+1 : ""));
/* We need to send the IRCd a nick for every mode.. - Viper */
- snprintf(tmp2, BUFSIZE, "%s %s %s", (isop ? cu->user->nick : ""),
- (isadmin ? cu->user->nick : ""), (isown ? cu->user->nick : ""));
+ snprintf(tmp2, BUFSIZE, "%s %s %s", (isop ? GET_USER(cu->user) : ""),
+ (isadmin ? GET_USER(cu->user) : ""), (isown ? GET_USER(cu->user) : ""));
if (ircdcap->tsmode) {
snprintf(buf, BUFSIZE - 1, "%ld", (long int) time(NULL));
@@ -249,7 +249,7 @@ int do_clear(User * u)
av[2] = tmp;
/* We have to give as much nicks as modes.. - Viper */
for (i = 0; i < count; i++)
- av[i+3] = cu->user->nick;
+ av[i+3] = GET_USER(cu->user);
ac = 3 + i;
anope_cmd_mode(whosends(ci), av[0], "%s %s", av[2], tmp2);
@@ -257,7 +257,7 @@ int do_clear(User * u)
av[1] = tmp;
/* We have to give as much nicks as modes.. - Viper */
for (i = 0; i < count; i++)
- av[i+2] = cu->user->nick;
+ av[i+2] = GET_USER(cu->user);
ac = 2 + i;
anope_cmd_mode(whosends(ci), av[0], "%s %s", av[1], tmp2);
@@ -283,12 +283,12 @@ int do_clear(User * u)
av[0] = sstrdup(chan);
av[1] = buf;
av[2] = sstrdup("-h");
- av[3] = sstrdup(cu->user->nick);
+ av[3] = sstrdup(GET_USER(cu->user));
ac = 4;
} else {
av[0] = sstrdup(chan);
av[1] = sstrdup("-h");
- av[2] = sstrdup(cu->user->nick);
+ av[2] = sstrdup(GET_USER(cu->user));
ac = 3;
}
@@ -337,12 +337,12 @@ int do_clear(User * u)
av[0] = sstrdup(chan);
av[1] = buf;
av[2] = sstrdup("-v");
- av[3] = sstrdup(cu->user->nick);
+ av[3] = sstrdup(GET_USER(cu->user));
ac = 4;
} else {
av[0] = sstrdup(chan);
av[1] = sstrdup("-v");
- av[2] = sstrdup(cu->user->nick);
+ av[2] = sstrdup(GET_USER(cu->user));
ac = 3;
}
@@ -386,7 +386,7 @@ int do_clear(User * u)
for (cu = c->users; cu; cu = next) {
next = cu->next;
av[0] = sstrdup(chan);
- av[1] = sstrdup(cu->user->nick);
+ av[1] = sstrdup(GET_USER(cu->user));
av[2] = sstrdup(buf);
anope_cmd_kick(whosends(ci), av[0], av[1], av[2]);
do_kick(s_ChanServ, 3, av);
diff --git a/src/core/cs_modes.c b/src/core/cs_modes.c
index 22460291a..cca0a4d4b 100644
--- a/src/core/cs_modes.c
+++ b/src/core/cs_modes.c
@@ -220,7 +220,7 @@ int do_owner(User * u)
if (!chan) {
av[0] = sstrdup(ircd->ownerset);
- av[1] = u->nick;
+ av[1] = GET_USER(u);
/* Sets the mode to the user on every channels he is on. */
@@ -228,7 +228,7 @@ int do_owner(User * u)
if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
&& is_founder(u, ci)) {
anope_cmd_mode(whosends(ci), uc->chan->name, "%s %s",
- av[0], u->nick);
+ av[0], GET_USER(u));
chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
}
}
@@ -249,10 +249,10 @@ int do_owner(User * u)
notice_lang(s_ChanServ, u, ACCESS_DENIED);
} else {
anope_cmd_mode(whosends(ci), c->name, "%s %s", ircd->ownerset,
- u->nick);
+ GET_USER(u));
av[0] = sstrdup(ircd->ownerset);
- av[1] = u->nick;
+ av[1] = GET_USER(u);
chan_set_modes(s_ChanServ, c, 2, av, 1);
free(av[0]);
}
@@ -276,7 +276,7 @@ int do_deowner(User * u)
if (!chan) {
av[0] = sstrdup(ircd->ownerunset);
- av[1] = u->nick;
+ av[1] = GET_USER(u);
/* Sets the mode to the user on every channels he is on. */
@@ -284,7 +284,7 @@ int do_deowner(User * u)
if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
&& is_founder(u, ci)) {
anope_cmd_mode(whosends(ci), uc->chan->name, "%s %s",
- av[0], u->nick);
+ av[0], GET_USER(u));
chan_set_modes(s_ChanServ, uc->chan, 2, av, 1);
}
}
@@ -305,10 +305,10 @@ int do_deowner(User * u)
notice_lang(s_ChanServ, u, ACCESS_DENIED);
} else {
anope_cmd_mode(whosends(ci), c->name, "%s %s", ircd->ownerunset,
- u->nick);
+ GET_USER(u));
av[0] = sstrdup(ircd->ownerunset);
- av[1] = u->nick;
+ av[1] = GET_USER(u);
chan_set_modes(s_ChanServ, c, 2, av, 1);
free(av[0]);
}
@@ -341,7 +341,7 @@ int do_util(User * u, CSModeUtil * util)
if ((ci = uc->chan->ci) && !(ci->flags & CI_VERBOTEN)
&& check_access(u, ci, util->levelself)) {
anope_cmd_mode(whosends(ci), uc->chan->name, "%s %s",
- util->mode, u->nick);
+ util->mode, GET_USER(u));
chan_set_modes(s_ChanServ, uc->chan, 2, av, 2);
if (util->notice && ci->flags & util->notice)
@@ -378,10 +378,10 @@ int do_util(User * u, CSModeUtil * util)
notice_lang(s_ChanServ, u, PERMISSION_DENIED);
} else {
anope_cmd_mode(whosends(ci), c->name, "%s %s", util->mode,
- u2->nick);
+ GET_USER(u2));
av[0] = util->mode;
- av[1] = u2->nick;
+ av[1] = GET_USER(u2);
chan_set_modes(s_ChanServ, c, 2, av, 3);
if (util->notice && ci->flags & util->notice)
diff --git a/src/core/cs_register.c b/src/core/cs_register.c
index ec0a33102..de3df8926 100644
--- a/src/core/cs_register.c
+++ b/src/core/cs_register.c
@@ -180,11 +180,11 @@ int do_register(User * u)
/* On most ircds you do not receive the admin/owner mode till its registered */
if (ircd->admin) {
anope_cmd_mode(s_ChanServ, chan, "%s %s", ircd->adminset,
- u->nick);
+ GET_USER(u));
}
if (ircd->owner && ircd->ownerset) {
anope_cmd_mode(s_ChanServ, chan, "%s %s", ircd->ownerset,
- u->nick);
+ GET_USER(u));
}
send_event(EVENT_CHAN_REGISTERED, 1, chan);
}
diff --git a/src/core/cs_topic.c b/src/core/cs_topic.c
index a1538e1c6..003bd2c95 100644
--- a/src/core/cs_topic.c
+++ b/src/core/cs_topic.c
@@ -104,7 +104,7 @@ int do_cs_topic(User * u)
if (ircd->join2set) {
if (whosends(ci) == s_ChanServ) {
anope_cmd_join(s_ChanServ, c->name, c->creation_time);
- anope_cmd_mode(NULL, c->name, "+o %s", s_ChanServ);
+ anope_cmd_mode(NULL, c->name, "+o %s", GET_BOT(s_ChanServ));
}
}
anope_cmd_topic(whosends(ci), c->name, u->nick, topic ? topic : "",
diff --git a/src/core/os_clearmodes.c b/src/core/os_clearmodes.c
index e309ee901..742c8c7f1 100644
--- a/src/core/os_clearmodes.c
+++ b/src/core/os_clearmodes.c
@@ -112,7 +112,7 @@ int do_clearmodes(User * u)
continue;
}
argv[0] = sstrdup("-o");
- argv[1] = cu->user->nick;
+ argv[1] = GET_USER(cu->user);
chan_set_modes(s_OperServ, c, 2, argv, 0);
free(argv[0]);
}
@@ -122,7 +122,7 @@ int do_clearmodes(User * u)
if (!chan_has_user_status(c, cu->user, CUS_OP))
continue;
argv[0] = sstrdup("-o");
- argv[1] = cu->user->nick;
+ argv[1] = GET_USER(cu->user);
anope_cmd_mode(s_OperServ, c->name, "-o %s",
cu->user->nick);
chan_set_modes(s_OperServ, c, 2, argv, 0);
@@ -138,7 +138,7 @@ int do_clearmodes(User * u)
continue;
}
argv[0] = sstrdup("-v");
- argv[1] = cu->user->nick;
+ argv[1] = GET_USER(cu->user);
chan_set_modes(s_OperServ, c, 2, argv, 0);
free(argv[0]);
}
@@ -149,7 +149,7 @@ int do_clearmodes(User * u)
if (!chan_has_user_status(c, cu->user, CUS_VOICE))
continue;
argv[0] = sstrdup("-v");
- argv[1] = cu->user->nick;
+ argv[1] = GET_USER(cu->user);
anope_cmd_mode(s_OperServ, c->name, "-v %s",
cu->user->nick);
chan_set_modes(s_OperServ, c, 2, argv, 0);
@@ -166,7 +166,7 @@ int do_clearmodes(User * u)
continue;
}
argv[0] = sstrdup("-h");
- argv[1] = cu->user->nick;
+ argv[1] = GET_USER(cu->user);
chan_set_modes(s_OperServ, c, 2, argv, 0);
free(argv[0]);
}
@@ -176,7 +176,7 @@ int do_clearmodes(User * u)
if (!chan_has_user_status(c, cu->user, CUS_HALFOP))
continue;
argv[0] = sstrdup("-h");
- argv[1] = cu->user->nick;
+ argv[1] = GET_USER(cu->user);
anope_cmd_mode(s_OperServ, c->name, "-h %s",
cu->user->nick);
chan_set_modes(s_OperServ, c, 2, argv, 0);
@@ -192,7 +192,7 @@ int do_clearmodes(User * u)
continue;
}
argv[0] = sstrdup(ircd->ownerunset);
- argv[1] = cu->user->nick;
+ argv[1] = GET_USER(cu->user);
chan_set_modes(s_OperServ, c, 2, argv, 0);
free(argv[0]);
}
@@ -202,7 +202,7 @@ int do_clearmodes(User * u)
if (!chan_has_user_status(c, cu->user, CUS_OWNER))
continue;
argv[0] = sstrdup(ircd->ownerunset);
- argv[1] = cu->user->nick;
+ argv[1] = GET_USER(cu->user);
anope_cmd_mode(s_OperServ, c->name, "%s %s",
ircd->ownerunset, cu->user->nick);
chan_set_modes(s_OperServ, c, 2, argv, 0);
@@ -219,7 +219,7 @@ int do_clearmodes(User * u)
continue;
}
argv[0] = sstrdup(ircd->adminunset);
- argv[1] = cu->user->nick;
+ argv[1] = GET_USER(cu->user);
chan_set_modes(s_OperServ, c, 2, argv, 0);
free(argv[0]);
}
@@ -229,7 +229,7 @@ int do_clearmodes(User * u)
if (!chan_has_user_status(c, cu->user, CUS_PROTECT))
continue;
argv[0] = sstrdup(ircd->adminunset);
- argv[1] = cu->user->nick;
+ argv[1] = GET_USER(cu->user);
anope_cmd_mode(s_OperServ, c->name, "%s %s",
ircd->adminunset, cu->user->nick);
chan_set_modes(s_OperServ, c, 2, argv, 0);
diff --git a/src/core/os_oline.c b/src/core/os_oline.c
index 6512ccbb9..7ccc07a52 100644
--- a/src/core/os_oline.c
+++ b/src/core/os_oline.c
@@ -90,7 +90,6 @@ int do_operoline(User * u)
notice_lang(s_OperServ, u, NICK_X_NOT_IN_USE, nick);
} else if (u2 && flags[0] == '+') {
anope_cmd_svso(s_OperServ, nick, flags);
- anope_cmd_mode(s_OperServ, nick, "+o");
common_svsmode(u2, "+o", NULL);
notice_lang(s_OperServ, u2, OPER_OLINE_IRCOP);
notice_lang(s_OperServ, u, OPER_OLINE_SUCCESS, flags, nick);
generated by cgit (git 2.34.1) at 2026-09-28 20:43:19 +0000