X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/3fd3d7e1761f37e125e652daeaae4c32cf1c2266..9dd128b4da6e54ca9f97cfcd48e345a57790ffbe:/extensions/override.c

diff --git a/extensions/override.c b/extensions/override.c
index 312318b2..91b3d6eb 100644
--- a/extensions/override.c
+++ b/extensions/override.c
@@ -34,10 +34,10 @@ static void handle_client_exit(void *data);
 
 mapi_hfn_list_av1 override_hfnlist[] = {
 	{ "umode_changed", (hookfn) check_umode_change },
-	{ "get_channel_access", (hookfn) hack_channel_access },
-	{ "can_join", (hookfn) hack_can_join },
-	{ "can_kick", (hookfn) hack_can_kick },
-	{ "can_send", (hookfn) hack_can_send },
+	{ "get_channel_access", (hookfn) hack_channel_access, HOOK_HIGHEST },
+	{ "can_join", (hookfn) hack_can_join, HOOK_HIGHEST },
+	{ "can_kick", (hookfn) hack_can_kick, HOOK_HIGHEST },
+	{ "can_send", (hookfn) hack_can_send, HOOK_HIGHEST },
 	{ "client_exit", (hookfn) handle_client_exit },
 	{ NULL, NULL }
 };
@@ -98,7 +98,7 @@ expire_override_deadlines(void *unused)
 			break;
 		else if (session_p->deadline < rb_current_time())
 		{
-		        const char *parv[4] = {session_p->client->name, session_p->client->name, "-p", NULL};
+			const char *parv[4] = {session_p->client->name, session_p->client->name, "-p", NULL};
 			user_mode(session_p->client, session_p->client, 3, parv);
 		}
 	}
@@ -108,6 +108,7 @@ static void
 check_umode_change(void *vdata)
 {
 	hook_data_umode_changed *data = (hook_data_umode_changed *)vdata;
+	bool changed = false;
 	struct Client *source_p = data->client;
 
 	if (!MyClient(source_p))
@@ -116,9 +117,7 @@ check_umode_change(void *vdata)
 	if (data->oldumodes & UMODE_OPER && !IsOper(source_p))
 		source_p->umodes &= ~user_modes['p'];
 
-	/* didn't change +p umode, we don't need to do anything */
-	if (!((data->oldumodes ^ source_p->umodes) & user_modes['p']))
-		return;
+	changed = ((data->oldumodes ^ source_p->umodes) & user_modes['p']);
 
 	if (source_p->umodes & user_modes['p'])
 	{
@@ -129,12 +128,12 @@ check_umode_change(void *vdata)
 			return;
 		}
 
-		update_session_deadline(source_p, NULL);
-
-		sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has enabled oper-override (+p)",
-				       get_oper_name(source_p));
+		if (changed)
+		{
+			update_session_deadline(source_p, NULL);
+		}
 	}
-	else if (!(source_p->umodes & user_modes['p']))
+	else if (changed && !(source_p->umodes & user_modes['p']))
 	{
 		rb_dlink_node *n, *tn;
 
@@ -145,9 +144,6 @@ check_umode_change(void *vdata)
 			if (session_p->client != source_p)
 				continue;
 
-			sendto_realops_snomask(SNO_GENERAL, L_NETWIDE, "%s has disabled oper-override (+p)",
-					       get_oper_name(session_p->client));
-
 			rb_dlinkDelete(n, &overriding_opers);
 			rb_free(session_p);
 		}
@@ -261,11 +257,20 @@ struct ev_entry *expire_override_deadlines_ev = NULL;
 static int
 _modinit(void)
 {
+	rb_dlink_node *ptr;
+
 	/* add the usermode to the available slot */
 	user_modes['p'] = find_umode_slot();
 	construct_umodebuf();
 
-        expire_override_deadlines_ev = rb_event_add("expire_override_deadlines", expire_override_deadlines, NULL, 60);
+	RB_DLINK_FOREACH(ptr, lclient_list.head)
+	{
+		struct Client *client_p = ptr->data;
+		if (IsPerson(client_p) && (client_p->umodes & user_modes['p']))
+			update_session_deadline(client_p, NULL);
+	}
+
+	expire_override_deadlines_ev = rb_event_add("expire_override_deadlines", expire_override_deadlines, NULL, 60);
 
 	return 0;
 }
@@ -273,10 +278,18 @@ _modinit(void)
 static void
 _moddeinit(void)
 {
+	rb_dlink_node *n, *tn;
+
 	/* disable the umode and remove it from the available list */
 	user_modes['p'] = 0;
 	construct_umodebuf();
 
+	RB_DLINK_FOREACH_SAFE(n, tn, overriding_opers.head)
+	{
+		rb_dlinkDelete(n, &overriding_opers);
+		rb_free(n->data);
+	}
+
 	rb_event_delete(expire_override_deadlines_ev);
 }