9pfs/solanum-vs-hackint-and-charybdis
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add client_quit hook

Browse source
This commit is contained in:
Ed Kellett 2020-05-23 19:10:07 +01:00
parent e9408bc4fc
commit 260fc2cc34
No known key found for this signature in database
GPG key ID: CB9986DEF342FABC
2 changed files with 30 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
include/hook.h
View file

@ -113,6 +113,13 @@ typedef struct
const char *comment; const char *comment;
} hook_data_client_exit; } hook_data_client_exit;
typedef struct
{
struct Client *client;
const char *reason;
const char *orig_reason;
} hook_data_client_quit;
typedef struct typedef struct
{ {
struct Client *client; struct Client *client;

31
modules/core/m_quit.c
View file

@ -39,6 +39,8 @@ static const char quit_desc[] = "Provides the QUIT command to allow a user to le
static void m_quit(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void m_quit(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
static void ms_quit(struct MsgBuf *, struct Client *, struct Client *, int, const char **); static void ms_quit(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
static int h_client_quit;
struct Message quit_msgtab = { struct Message quit_msgtab = {
"QUIT", 0, 0, 0, 0, "QUIT", 0, 0, 0, 0,
{{m_quit, 0}, {m_quit, 0}, {ms_quit, 0}, mg_ignore, mg_ignore, {m_quit, 0}} {{m_quit, 0}, {m_quit, 0}, {ms_quit, 0}, mg_ignore, mg_ignore, {m_quit, 0}}
@ -46,7 +48,12 @@ struct Message quit_msgtab = {
mapi_clist_av1 quit_clist[] = { &quit_msgtab, NULL }; mapi_clist_av1 quit_clist[] = { &quit_msgtab, NULL };
DECLARE_MODULE_AV2(quit, NULL, NULL, quit_clist, NULL, NULL, NULL, NULL, quit_desc); mapi_hlist_av1 quit_hlist[] = {
{ "client_quit", &h_client_quit },
{ NULL, NULL }
};
DECLARE_MODULE_AV2(quit, NULL, NULL, quit_clist, quit_hlist, NULL, NULL, NULL, quit_desc);
/* /*
** m_quit ** m_quit
@ -55,25 +62,33 @@ DECLARE_MODULE_AV2(quit, NULL, NULL, quit_clist, NULL, NULL, NULL, NULL, quit_de
static void static void
m_quit(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]) m_quit(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{ {
char *comment = LOCAL_COPY((parc > 1 && parv[1]) ? parv[1] : client_p->name); char *comment_copy = LOCAL_COPY((parc > 1 && parv[1]) ? parv[1] : client_p->name);
const char *comment = comment_copy;
char reason[REASONLEN + 1]; char reason[REASONLEN + 1];
hook_data_client_quit hdata;
source_p->flags |= FLAGS_NORMALEX; source_p->flags |= FLAGS_NORMALEX;
if(strlen(comment) > (size_t) REASONLEN) if (strlen(comment_copy) > (size_t) REASONLEN)
comment[REASONLEN] = '\0'; comment_copy[REASONLEN] = '\0';
strip_colour(comment); strip_colour(comment_copy);
if(ConfigFileEntry.client_exit && comment[0]) hdata.client = client_p;
hdata.reason = hdata.orig_reason = comment;
call_hook(h_client_quit, &hdata);
comment = hdata.reason;
/* don't add Quit: if the reason comes from a module */
if (ConfigFileEntry.client_exit && hdata.reason == hdata.orig_reason && comment[0])
{ {
snprintf(reason, sizeof(reason), "Quit: %s", comment); snprintf(reason, sizeof(reason), "Quit: %s", comment);
comment = reason; comment = reason;
} }
if(!IsOper(source_p) && if (comment == NULL || (!IsOper(source_p) && hdata.reason == hdata.orig_reason &&
(source_p->localClient->firsttime + ConfigFileEntry.anti_spam_exit_message_time) > (source_p->localClient->firsttime + ConfigFileEntry.anti_spam_exit_message_time) >
rb_current_time()) rb_current_time()))
{ {
exit_client(client_p, source_p, source_p, "Client Quit"); exit_client(client_p, source_p, source_p, "Client Quit");
return; return;