X-Git-Url: https://jfr.im/git/solanum.git/blobdiff_plain/212380e3f42f585dc1ea927402252eb943f91f7b..d09c55338feb5627da978058432a15dccec16907:/extensions/m_opme.c?ds=sidebyside

diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index 9798b774..1766c833 100644
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -15,82 +15,78 @@
  *   You should have received a copy of the GNU General Public License
  *   along with this program; if not, write to the Free Software
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- *
- *   $Id: m_opme.c 3121 2007-01-02 13:23:04Z jilles $
  */
 #include "stdinc.h"
-#include "tools.h"
-#include "patricia.h"
 #include "channel.h"
 #include "client.h"
 #include "ircd.h"
 #include "numeric.h"
-#include "s_log.h"
+#include "logger.h"
 #include "s_serv.h"
 #include "send.h"
 #include "whowas.h"
-#include "irc_string.h"
+#include "match.h"
 #include "hash.h"
 #include "msg.h"
 #include "parse.h"
 #include "modules.h"
 #include "s_conf.h"
 #include "s_newconf.h"
+#include "messages.h"
+
+static const char opme_desc[] = "Allow admins to op themselves on opless channels";
 
-static int mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+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, MFLG_SLOW,
+	"OPME", 0, 0, 0, 0,
 	{mg_unreg, mg_not_oper, mg_ignore, mg_ignore, mg_ignore, {mo_opme, 2}}
 };
 
 mapi_clist_av1 opme_clist[] = { &opme_msgtab, NULL };
 
-DECLARE_MODULE_AV1(opme, NULL, NULL, opme_clist, NULL, NULL, "$Revision: 3121 $");
-
+DECLARE_MODULE_AV2(opme, NULL, NULL, opme_clist, NULL, NULL, NULL, NULL, opme_desc);
 
 /*
 ** mo_opme
-**      parv[0] = sender prefix
 **      parv[1] = channel
 */
-static int
-mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
+static void
+mo_opme(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Channel *chptr;
 	struct membership *msptr;
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 
 	/* admins only */
 	if(!IsOperAdmin(source_p))
 	{
-		sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "opme");
-		return 0;
+		sendto_one(source_p, form_str(ERR_NOPRIVS), me.name, source_p->name, "admin");
+		return;
 	}
 
 	if((chptr = find_channel(parv[1])) == NULL)
 	{
 		sendto_one_numeric(source_p, ERR_NOSUCHCHANNEL,
 				   form_str(ERR_NOSUCHCHANNEL), parv[1]);
-		return 0;
+		return;
 	}
 
-	DLINK_FOREACH(ptr, chptr->members.head)
+	RB_DLINK_FOREACH(ptr, chptr->members.head)
 	{
 		msptr = ptr->data;
 
 		if(is_chanop(msptr))
 		{
-			sendto_one(source_p, ":%s NOTICE %s :%s Channel is not opless",
-				   me.name, parv[0], parv[1]);
-			return 0;
+			sendto_one_notice(source_p, ":%s Channel is not opless", parv[1]);
+			return;
 		}
 	}
 
 	msptr = find_channel_membership(chptr, source_p);
 
 	if(msptr == NULL)
-		return 0;
+		return;
 
 	msptr->flags |= CHFL_CHANOP;
 
@@ -106,14 +102,12 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *
 		sendto_server(NULL, NULL, NOCAPS, NOCAPS,
 			      ":%s WALLOPS :OPME called for [%s] by %s!%s@%s",
 			      me.name, parv[1], source_p->name, source_p->username, source_p->host);
-		sendto_server(NULL, chptr, NOCAPS, NOCAPS, ":%s PART %s", source_p->name, parv[1]);
-		sendto_server(NULL, chptr, NOCAPS, NOCAPS,
+		sendto_server(NULL, chptr, CAP_TS6, NOCAPS, ":%s PART %s", source_p->id, parv[1]);
+		sendto_server(NULL, chptr, CAP_TS6, NOCAPS,
 			      ":%s SJOIN %ld %s + :@%s",
-			      me.name, (long) chptr->channelts, parv[1], source_p->name);
+			      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;
 }