From 65161f128c907d086040357221f989a5d8b096e2 Mon Sep 17 00:00:00 2001 From: Alex Denes Date: Fri, 30 Oct 2020 22:15:22 +0100 Subject: [PATCH] Fix CAP commands and add them to public includes --- include/helpers.h | 11 +++++++++++ src/helpers.h | 13 +++++++------ 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/include/helpers.h b/include/helpers.h index cbb9fb3..2064d9e 100644 --- a/include/helpers.h +++ b/include/helpers.h @@ -86,6 +86,17 @@ extern IRC_Message* Assm_cmd_ISON(char* users[]); extern void Tok_cmd_PING(IRC_Message* mesg, char* source, char* target); extern void Tok_FArgOpt(IRC_Message* mesg, char** optarg, char** reqarg); +#ifdef UIRC_IRCV3 +#define Assm_cmd_CAP_END() Assm_AUTO(CAP, false, (char*[]){"END", NULL}, 0) +#define Assm_cmd_CAP_LIST() Assm_AUTO(CAP, false, (char*[]){"LIST", NULL}, 0) + +#define Assm_cmd_CAP_LS(version) Assm_AUTO(CAP, false, (char*[]){"LS", version, NULL}, 0) +#define Assm_cmd_CAP_REQ(caps) Assm_AUTO(CAP, true, (char*[]){"REQ", caps, NULL}, 1) + +#define Assm_cmd_CAP_NEW(nick, caps) Assm_AUTO(CAP, true, (char*[]){"NEW", nick, caps, NULL}, 2) +#define Assm_cmd_CAP_DEL(nick, caps) Assm_AUTO(CAP, true, (char*[]){"DEL", nick, caps, NULL}, 2) +#endif + extern size_t Assm_tag_timestamp(char* buf, size_t len, time_t time); #endif #endif diff --git a/src/helpers.h b/src/helpers.h index cd38310..4b4d068 100644 --- a/src/helpers.h +++ b/src/helpers.h @@ -90,16 +90,17 @@ IRC_Message* Assm_cmd_USERHOST(char* users[]); IRC_Message* Assm_cmd_ISON(char* users[]); #ifdef UIRC_IRCV3 -#define Assm_cmd_CAP_END() Assm_AUTO(CAP, false, (char*[]){NULL}, 0) -#define Assm_cmd_CAP_LIST() Assm_AUTO(CAP, false, (char*[]){NULL}, 0) +#define Assm_cmd_CAP_END() Assm_AUTO(CAP, false, (char*[]){"END", NULL}, 0) +#define Assm_cmd_CAP_LIST() Assm_AUTO(CAP, false, (char*[]){"LIST", NULL}, 0) -#define Assm_cmd_CAP_LS(version) Assm_AUTO(CAP, false, (char*[]){version, NULL}, 0) -#define Assm_cmd_CAP_REQ(caps) Assm_AUTO(CAP, true, (char*[]){caps, NULL}, 1) +#define Assm_cmd_CAP_LS(version) Assm_AUTO(CAP, false, (char*[]){"LS", version, NULL}, 0) +#define Assm_cmd_CAP_REQ(caps) Assm_AUTO(CAP, true, (char*[]){"REQ", caps, NULL}, 1) -#define Assm_cmd_CAP_NEW(nick, caps) Assm_AUTO(CAP, true, (char*[]){nick, caps, NULL}, 2) -#define Assm_cmd_CAP_DEL(nick, caps) Assm_AUTO(CAP, true, (char*[]){nick, caps, NULL}, 2) +#define Assm_cmd_CAP_NEW(nick, caps) Assm_AUTO(CAP, true, (char*[]){"NEW", nick, caps, NULL}, 2) +#define Assm_cmd_CAP_DEL(nick, caps) Assm_AUTO(CAP, true, (char*[]){"DEL", nick, caps, NULL}, 2) #endif + void Tok_cmd_PING(IRC_Message* mesg, char** source, char** target); void Tok_FArgOpt(IRC_Message* mesg, char** optarg, char** reqarg); #endif