X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/75a9b0c8b04401954a08302e3d0665d8ba45cfa8..12894c8888675e4627d0e16b850e73648b5f3dce:/extensions/m_oaccept.c

diff --git a/extensions/m_oaccept.c b/extensions/m_oaccept.c
index a01a962..f0b38ed 100644
--- a/extensions/m_oaccept.c
+++ b/extensions/m_oaccept.c
@@ -4,8 +4,9 @@
 #include "modules.h"
 #include "send.h"
 #include "numeric.h"
+#include "hash.h"
 
-void mo_oaccept(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
+static int mo_oaccept(struct Client *client_p, struct Client *source_p, int parc, const char *parv[]);
 
 struct Message oaccept_msgtab = {
 	"OACCEPT", 0, 0, 0, MFLG_SLOW,
@@ -14,33 +15,44 @@ struct Message oaccept_msgtab = {
 
 mapi_clist_av1 oaccept_clist[] = { &oaccept_msgtab, NULL };
 
-DECLARE_MODULE_AV1(omode, NULL, NULL, oaccept_clist, NULL, NULL, "$Id $");
+DECLARE_MODULE_AV1(oaccept, NULL, NULL, oaccept_clist, NULL, NULL, "$Id $");
 
-void
+static int
 mo_oaccept(struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
 {
 	struct Metadata *md;
+	struct DictionaryIter iter;
 	struct Client *target_p;
+	char *text = rb_strdup("");
 
 	if(!(target_p = find_client(parv[1])))
 	{
 		sendto_one(source_p, form_str(ERR_NOSUCHNICK), parv[1]);
-		return;
+		return 0;
 	}
 
+	rb_sprintf(text, "O%s", source_p->id);
+
 	/* Don't allow someone to pointlessly fill up someone's metadata
 	 * with identical OACCEPT entries. */
-	if((md = user_metadata_find(target_p, "OACCEPT")))
-		if(!strcmp(source_p->name, md->value))
+	DICTIONARY_FOREACH(md, &iter, target_p->user->metadata)
+	{
+		if(!strcmp(md->value, "OACCEPT") && !strcmp(md->name, text))
 		{
 			sendto_one_notice(source_p, ":You're already on %s's OACCEPT list", target_p->name);
-			return;
+			return 0;
 		}
+	}
 
-	user_metadata_add(target_p, "OACCEPT", source_p->name, 1);
+	user_metadata_add(target_p, text, "OACCEPT", 1);
 
 	sendto_wallops_flags(UMODE_WALLOP, &me,
 			     "OACCEPT called for %s by %s!%s@%s",
 			     target_p->name,
 			     source_p->name, source_p->username, source_p->host);
+		sendto_server(NULL, NULL, NOCAPS, NOCAPS, 
+			      ":%s WALLOPS :OACCEPT called for %s by %s!%s@%s",
+			      me.name, target_p->name, source_p->name, source_p->username,
+			      source_p->host);
+	return 0;
 }