Merge pull request #288 from edk0/umode-o-split

[solanum.git] / extensions / m_opme.c

diff --git a/extensions/m_opme.c b/extensions/m_opme.c
index e23d6c760e0f4418ac543956776ec6756978967c..1766c8336233717481530cc047158e09c3ddcc24 100644 (file)
--- a/extensions/m_opme.c
+++ b/extensions/m_opme.c
@@ -15,8 +15,6 @@
  *   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 3554 2007-08-10 22:31:14Z jilles $
  */
 #include "stdinc.h"
 #include "channel.h"
@@ -34,26 +32,27 @@
 #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: 3554 $");
-
+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;
@@ -63,14 +62,14 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *
        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)
@@ -80,14 +79,14 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *
                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;
 
@@ -104,17 +103,11 @@ mo_opme(struct Client *client_p, struct Client *source_p, int parc, const char *
                              ":%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, CAP_TS6, NOCAPS, ":%s PART %s", source_p->id, parv[1]);
-               sendto_server(NULL, chptr, NOCAPS, CAP_TS6, ":%s PART %s", source_p->name, parv[1]);
                sendto_server(NULL, chptr, CAP_TS6, NOCAPS,
                              ":%s SJOIN %ld %s + :@%s",
                              me.id, (long) chptr->channelts, parv[1], source_p->id);
-               sendto_server(NULL, chptr, NOCAPS, CAP_TS6,
-                             ":%s SJOIN %ld %s + :@%s",
-                             me.name, (long) chptr->channelts, parv[1], source_p->name);
        }
 
-       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;
 }