From 260fc2cc345996ef69a983db0d96b5696a6cbb0f Mon Sep 17 00:00:00 2001
From: Ed Kellett <e@kellett.im>
Date: Sat, 23 May 2020 19:10:07 +0100
Subject: [PATCH] Add client_quit hook

---
 include/hook.h        |  7 +++++++
 modules/core/m_quit.c | 31 +++++++++++++++++++++++--------
 2 files changed, 30 insertions(+), 8 deletions(-)

diff --git a/include/hook.h b/include/hook.h
index 099eeec7..7cc3bd54 100644
--- a/include/hook.h
+++ b/include/hook.h
@@ -113,6 +113,13 @@ typedef struct
 	const char *comment;
 } hook_data_client_exit;
 
+typedef struct
+{
+	struct Client *client;
+	const char *reason;
+	const char *orig_reason;
+} hook_data_client_quit;
+
 typedef struct
 {
 	struct Client *client;
diff --git a/modules/core/m_quit.c b/modules/core/m_quit.c
index f1851dde..a986a327 100644
--- a/modules/core/m_quit.c
+++ b/modules/core/m_quit.c
@@ -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 ms_quit(struct MsgBuf *, struct Client *, struct Client *, int, const char **);
 
+static int h_client_quit;
+
 struct Message quit_msgtab = {
 	"QUIT", 0, 0, 0, 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 };
 
-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
@@ -55,25 +62,33 @@ DECLARE_MODULE_AV2(quit, NULL, NULL, quit_clist, NULL, NULL, NULL, NULL, quit_de
 static void
 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];
+	hook_data_client_quit hdata;
 
 	source_p->flags |= FLAGS_NORMALEX;
 
-	if(strlen(comment) > (size_t) REASONLEN)
-		comment[REASONLEN] = '\0';
+	if (strlen(comment_copy) > (size_t) REASONLEN)
+		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);
 		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) >
-	   rb_current_time())
+	   rb_current_time()))
 	{
 		exit_client(client_p, source_p, source_p, "Client Quit");
 		return;