mirror of
https://github.com/irssi/irssi.git
synced 2024-12-04 14:46:39 -05:00
Added optional channel parameter to /OP, /DEOP, /VOICE and /DEVOICE
commands. git-svn-id: http://svn.irssi.org/repos/irssi/trunk@2366 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
parent
33d30268b4
commit
c4e8d67bf9
@ -581,18 +581,30 @@ static void get_wildcard_nicks(GString *output, const char *mask,
|
|||||||
g_slist_free(nicks);
|
g_slist_free(nicks);
|
||||||
}
|
}
|
||||||
|
|
||||||
static char *get_nicks(IRC_CHANNEL_REC *channel,
|
static char *get_nicks(IRC_SERVER_REC *server, WI_ITEM_REC *item,
|
||||||
const char *data, int op, int voice)
|
const char *data, int op, int voice,
|
||||||
|
IRC_CHANNEL_REC **ret_channel)
|
||||||
{
|
{
|
||||||
|
IRC_CHANNEL_REC *channel;
|
||||||
GString *str;
|
GString *str;
|
||||||
char **matches, **match, *ret;
|
char **matches, **match, *ret, *channame, *nicks;
|
||||||
|
void *free_arg;
|
||||||
|
|
||||||
g_return_val_if_fail(channel != NULL, NULL);
|
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
|
||||||
g_return_val_if_fail(data != NULL, NULL);
|
PARAM_FLAG_OPTCHAN, item, &channame, &nicks))
|
||||||
if (*data == '\0') return NULL;
|
return NULL;
|
||||||
|
|
||||||
|
if (*nicks == '\0')
|
||||||
|
return NULL;
|
||||||
|
|
||||||
|
channel = irc_channel_find(server, channame);
|
||||||
|
if (channel == NULL) {
|
||||||
|
cmd_params_free(free_arg);
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
str = g_string_new(NULL);
|
str = g_string_new(NULL);
|
||||||
matches = g_strsplit(data, " ", -1);
|
matches = g_strsplit(nicks, " ", -1);
|
||||||
for (match = matches; *match != NULL; match++) {
|
for (match = matches; *match != NULL; match++) {
|
||||||
if (strchr(*match, '*') == NULL &&
|
if (strchr(*match, '*') == NULL &&
|
||||||
strchr(*match, '?') == NULL) {
|
strchr(*match, '?') == NULL) {
|
||||||
@ -606,20 +618,23 @@ static char *get_nicks(IRC_CHANNEL_REC *channel,
|
|||||||
if (str->len > 0) g_string_truncate(str, str->len-1);
|
if (str->len > 0) g_string_truncate(str, str->len-1);
|
||||||
ret = str->str;
|
ret = str->str;
|
||||||
g_string_free(str, FALSE);
|
g_string_free(str, FALSE);
|
||||||
|
|
||||||
|
cmd_params_free(free_arg);
|
||||||
|
|
||||||
|
*ret_channel = channel;
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* SYNTAX: OP <nicks> */
|
/* SYNTAX: OP <nicks> */
|
||||||
static void cmd_op(const char *data, IRC_SERVER_REC *server,
|
static void cmd_op(const char *data, IRC_SERVER_REC *server,
|
||||||
IRC_CHANNEL_REC *channel)
|
WI_ITEM_REC *item)
|
||||||
{
|
{
|
||||||
|
IRC_CHANNEL_REC *channel;
|
||||||
char *nicks;
|
char *nicks;
|
||||||
|
|
||||||
CMD_IRC_SERVER(server);
|
CMD_IRC_SERVER(server);
|
||||||
if (!IS_IRC_CHANNEL(channel))
|
|
||||||
cmd_return_error(CMDERR_NOT_JOINED);
|
|
||||||
|
|
||||||
nicks = get_nicks(channel, data, 0, -1);
|
nicks = get_nicks(server, item, data, 0, -1, &channel);
|
||||||
if (nicks != NULL && *nicks != '\0')
|
if (nicks != NULL && *nicks != '\0')
|
||||||
channel_set_singlemode(channel, nicks, "+o");
|
channel_set_singlemode(channel, nicks, "+o");
|
||||||
g_free_not_null(nicks);
|
g_free_not_null(nicks);
|
||||||
@ -627,15 +642,14 @@ static void cmd_op(const char *data, IRC_SERVER_REC *server,
|
|||||||
|
|
||||||
/* SYNTAX: DEOP <nicks> */
|
/* SYNTAX: DEOP <nicks> */
|
||||||
static void cmd_deop(const char *data, IRC_SERVER_REC *server,
|
static void cmd_deop(const char *data, IRC_SERVER_REC *server,
|
||||||
IRC_CHANNEL_REC *channel)
|
WI_ITEM_REC *item)
|
||||||
{
|
{
|
||||||
|
IRC_CHANNEL_REC *channel;
|
||||||
char *nicks;
|
char *nicks;
|
||||||
|
|
||||||
CMD_IRC_SERVER(server);
|
CMD_IRC_SERVER(server);
|
||||||
if (!IS_IRC_CHANNEL(channel))
|
|
||||||
cmd_return_error(CMDERR_NOT_JOINED);
|
|
||||||
|
|
||||||
nicks = get_nicks(channel, data, 1, -1);
|
nicks = get_nicks(server, item, data, 1, -1, &channel);
|
||||||
if (nicks != NULL && *nicks != '\0')
|
if (nicks != NULL && *nicks != '\0')
|
||||||
channel_set_singlemode(channel, nicks, "-o");
|
channel_set_singlemode(channel, nicks, "-o");
|
||||||
g_free_not_null(nicks);
|
g_free_not_null(nicks);
|
||||||
@ -643,15 +657,14 @@ static void cmd_deop(const char *data, IRC_SERVER_REC *server,
|
|||||||
|
|
||||||
/* SYNTAX: VOICE <nicks> */
|
/* SYNTAX: VOICE <nicks> */
|
||||||
static void cmd_voice(const char *data, IRC_SERVER_REC *server,
|
static void cmd_voice(const char *data, IRC_SERVER_REC *server,
|
||||||
IRC_CHANNEL_REC *channel)
|
WI_ITEM_REC *item)
|
||||||
{
|
{
|
||||||
|
IRC_CHANNEL_REC *channel;
|
||||||
char *nicks;
|
char *nicks;
|
||||||
|
|
||||||
CMD_IRC_SERVER(server);
|
CMD_IRC_SERVER(server);
|
||||||
if (!IS_IRC_CHANNEL(channel))
|
|
||||||
cmd_return_error(CMDERR_NOT_JOINED);
|
|
||||||
|
|
||||||
nicks = get_nicks(channel, data, 0, 0);
|
nicks = get_nicks(server, item, data, 0, 0, &channel);
|
||||||
if (nicks != NULL && *nicks != '\0')
|
if (nicks != NULL && *nicks != '\0')
|
||||||
channel_set_singlemode(channel, nicks, "+v");
|
channel_set_singlemode(channel, nicks, "+v");
|
||||||
g_free_not_null(nicks);
|
g_free_not_null(nicks);
|
||||||
@ -659,15 +672,14 @@ static void cmd_voice(const char *data, IRC_SERVER_REC *server,
|
|||||||
|
|
||||||
/* SYNTAX: DEVOICE <nicks> */
|
/* SYNTAX: DEVOICE <nicks> */
|
||||||
static void cmd_devoice(const char *data, IRC_SERVER_REC *server,
|
static void cmd_devoice(const char *data, IRC_SERVER_REC *server,
|
||||||
IRC_CHANNEL_REC *channel)
|
WI_ITEM_REC *item)
|
||||||
{
|
{
|
||||||
|
IRC_CHANNEL_REC *channel;
|
||||||
char *nicks;
|
char *nicks;
|
||||||
|
|
||||||
CMD_IRC_SERVER(server);
|
CMD_IRC_SERVER(server);
|
||||||
if (!IS_IRC_CHANNEL(channel))
|
|
||||||
cmd_return_error(CMDERR_NOT_JOINED);
|
|
||||||
|
|
||||||
nicks = get_nicks(channel, data, -1, 1);
|
nicks = get_nicks(server, item, data, -1, 1, &channel);
|
||||||
if (nicks != NULL && *nicks != '\0')
|
if (nicks != NULL && *nicks != '\0')
|
||||||
channel_set_singlemode(channel, nicks, "-v");
|
channel_set_singlemode(channel, nicks, "-v");
|
||||||
g_free_not_null(nicks);
|
g_free_not_null(nicks);
|
||||||
|
Loading…
Reference in New Issue
Block a user