aniani/irssi
1
0
Fork 0
mirror of https://github.com/irssi/irssi.git synced 2024-12-04 14:46:39 -05:00
Code

* works now as active channel with /NOTICE, /CTCP and /NCTCP.

Browse Source 
git-svn-id: http://svn.irssi.org/repos/irssi/trunk@1967 dbcabf3a-b0e7-0310-adc4-f8d773084564
This commit is contained in:
Timo Sirainen 2001-11-03 18:36:40 +00:00 committed by cras
parent 3578cea258
commit e69f081127
2 changed files with 33 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/fe-common/irc/fe-irc-commands.c
View File

@ -90,15 +90,16 @@ static void cmd_action(const char *data, IRC_SERVER_REC *server)
cmd_params_free(free_arg); cmd_params_free(free_arg);
} }
static void cmd_notice(const char *data, IRC_SERVER_REC *server) static void cmd_notice(const char *data, IRC_SERVER_REC *server,
WI_ITEM_REC *item)
{ {
char *target, *msg; char *target, *msg;
void *free_arg; void *free_arg;
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
&target, &msg)) PARAM_FLAG_OPTCHAN, item, &target, &msg))
return; return;
if (*target == '\0' || *msg == '\0') if (*target == '\0' || *msg == '\0')
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@ -108,14 +109,16 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server)
cmd_params_free(free_arg); cmd_params_free(free_arg);
} }
static void cmd_ctcp(const char *data, IRC_SERVER_REC *server) static void cmd_ctcp(const char *data, IRC_SERVER_REC *server,
WI_ITEM_REC *item)
{ {
char *target, *ctcpcmd, *ctcpdata; char *target, *ctcpcmd, *ctcpdata;
void *free_arg; void *free_arg;
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST, if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST |
PARAM_FLAG_OPTCHAN, item,
&target, &ctcpcmd, &ctcpdata)) &target, &ctcpcmd, &ctcpdata))
return; return;
if (*target == '\0' || *ctcpcmd == '\0') if (*target == '\0' || *ctcpcmd == '\0')
@ -136,15 +139,16 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server)
cmd_params_free(free_arg); cmd_params_free(free_arg);
} }
static void cmd_nctcp(const char *data, IRC_SERVER_REC *server) static void cmd_nctcp(const char *data, IRC_SERVER_REC *server,
WI_ITEM_REC *item)
{ {
char *target, *text; char *target, *text;
void *free_arg; void *free_arg;
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
&target, &text)) PARAM_FLAG_OPTCHAN, item, &target, &text))
return; return;
if (*target == '\0' || *text == '\0') if (*target == '\0' || *text == '\0')
cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);

31
src/irc/core/irc-commands.c
View File

@ -59,14 +59,16 @@ static GString *tmpstr;
static int knockout_tag; static int knockout_tag;
/* SYNTAX: NOTICE <targets> <message> */ /* SYNTAX: NOTICE <targets> <message> */
static void cmd_notice(const char *data, IRC_SERVER_REC *server) static void cmd_notice(const char *data, IRC_SERVER_REC *server,
WI_ITEM_REC *item)
{ {
char *target, *msg; char *target, *msg;
void *free_arg; void *free_arg;
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST, &target, &msg)) if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_GETREST |
PARAM_FLAG_OPTCHAN, item, &target, &msg))
return; return;
if (*target == '\0' || *msg == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*target == '\0' || *msg == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@ -77,14 +79,17 @@ static void cmd_notice(const char *data, IRC_SERVER_REC *server)
} }
/* SYNTAX: CTCP <targets> <ctcp command> [<ctcp data>] */ /* SYNTAX: CTCP <targets> <ctcp command> [<ctcp data>] */
static void cmd_ctcp(const char *data, IRC_SERVER_REC *server) static void cmd_ctcp(const char *data, IRC_SERVER_REC *server,
WI_ITEM_REC *item)
{ {
char *target, *ctcpcmd, *ctcpdata; char *target, *ctcpcmd, *ctcpdata;
void *free_arg; void *free_arg;
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST, &target, &ctcpcmd, &ctcpdata)) if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST |
PARAM_FLAG_OPTCHAN, item,
&target, &ctcpcmd, &ctcpdata))
return; return;
if (*target == '\0' || *ctcpcmd == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*target == '\0' || *ctcpcmd == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@ -99,14 +104,17 @@ static void cmd_ctcp(const char *data, IRC_SERVER_REC *server)
} }
/* SYNTAX: NCTCP <targets> <ctcp command> [<ctcp data>] */ /* SYNTAX: NCTCP <targets> <ctcp command> [<ctcp data>] */
static void cmd_nctcp(const char *data, IRC_SERVER_REC *server) static void cmd_nctcp(const char *data, IRC_SERVER_REC *server,
WI_ITEM_REC *item)
{ {
char *target, *ctcpcmd, *ctcpdata; char *target, *ctcpcmd, *ctcpdata;
void *free_arg; void *free_arg;
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST, &target, &ctcpcmd, &ctcpdata)) if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST,
PARAM_FLAG_OPTCHAN, item,
&target, &ctcpcmd, &ctcpdata))
return; return;
if (*target == '\0' || *ctcpcmd == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*target == '\0' || *ctcpcmd == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@ -118,14 +126,16 @@ static void cmd_nctcp(const char *data, IRC_SERVER_REC *server)
} }
/* SYNTAX: PART [<channels>] [<message>] */ /* SYNTAX: PART [<channels>] [<message>] */
static void cmd_part(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item) static void cmd_part(const char *data, IRC_SERVER_REC *server,
WI_ITEM_REC *item)
{ {
char *channame, *msg; char *channame, *msg;
void *free_arg; void *free_arg;
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 2 | PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST, item, &channame, &msg)) if (!cmd_get_params(data, &free_arg, 2 |
PARAM_FLAG_GETREST, item, &channame, &msg))
return; return;
if (*channame == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*channame == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);
@ -148,8 +158,9 @@ static void cmd_kick(const char *data, IRC_SERVER_REC *server, WI_ITEM_REC *item
CMD_IRC_SERVER(server); CMD_IRC_SERVER(server);
if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_OPTCHAN | PARAM_FLAG_GETREST, if (!cmd_get_params(data, &free_arg, 3 | PARAM_FLAG_GETREST |
item, &channame, &nicks, &reason)) PARAM_FLAG_OPTCHAN, item,
&channame, &nicks, &reason))
return; return;
if (*channame == '\0' || *nicks == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS); if (*channame == '\0' || *nicks == '\0') cmd_param_error(CMDERR_NOT_ENOUGH_PARAMS);