X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/cbeab4bc340b7b3f4fbf424ff327758defb9598a..689afc7c51ceef329c4b09debeabf33b6eeace12:/extensions/m_opme.c

diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index 1c836214..1766c833 100644
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -34,7 +34,9 @@
 #include "s_newconf.h"
 #include "messages.h"
 
-static int mo_opme(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static const char opme_desc[] = "Allow admins to op themselves on opless channels";
+
+static void mo_opme(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 struct Message opme_msgtab = {
 	"OPME", 0, 0, 0, 0,
@@ -43,14 +45,13 @@ struct Message opme_msgtab = {
 
 mapi_clist_av1 opme_clist[] = { &opme_msgtab, NULL };
 
-DECLARE_MODULE_AV1(opme, NULL, NULL, opme_clist, NULL, NULL, "$Revision: 3554 $");
-
+DECLARE_MODULE_AV2(opme, NULL, NULL, opme_clist, NULL, NULL, NULL, NULL, opme_desc);
 
 /*
 ** mo_opme
 **      parv[1] = channel
 */
-static int
+static void
 mo_opme(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr;
@@ -61,14 +62,14 @@ mo_opme(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 	if(!IsOperAdmin(source_p))
 	{
 		sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
-		return 0;
+		return;
 	}
 
 	if((chptr = find_channel(parv[1])) == NULL)
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
 				   form_str(ERR_NOSUCHCHANNEL), parv[1]);
-		return 0;
+		return;
 	}
 
 	RB_DLINK_FOREACH(ptr, chptr->members.head)
@@ -78,14 +79,14 @@ mo_opme(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 		if(is_chanop(msptr))
 		{
 			sendto_one_notice(source_p, ":%s Channel is not opless", parv[1]);
-			return 0;
+			return;
 		}
 	}
 
 	msptr = find_channel_membership(chptr, source_p);
 
 	if(msptr == NULL)
-		return 0;
+		return;
 
 	msptr->flags |= CHFL_CHANOP;
 
@@ -107,8 +108,6 @@ mo_opme(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_
 			      me.id, (long) chptr->channelts, parv[1], source_p->id);
 	}
 
-	sendto_channel_local(ALL_MEMBERS, chptr,
+	sendto_channel_local(&me, ALL_MEMBERS, chptr,
 			     ":%s MODE %s +o %s", me.name, parv[1], source_p->name);
-
-	return 0;
 }