X-Git-Url: https://jfr.im/git/irc/rqf/shadowircd.git/blobdiff_plain/0482ebf7b6bdbd48d07a75232e783386c61ed855..f0a889b602a9de1ae15a6acb50dcb94008df3494:/modules/m_invite.c

diff --git a/modules/m_invite.c b/modules/m_invite.c
index 6464ce3..eb6c041 100644
--- a/modules/m_invite.c
+++ b/modules/m_invite.c
@@ -25,7 +25,6 @@
  */
 
 #include "stdinc.h"
-#include "tools.h"
 #include "common.h"
 #include "channel.h"
 #include "client.h"
@@ -68,7 +67,11 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 	if(MyClient(source_p) && !IsFloodDone(source_p))
 		flood_endgrace(source_p);
 
-	if((target_p = find_person(parv[1])) == NULL)
+	if(MyClient(source_p))
+		target_p = find_named_person(parv[1]);
+	else
+		target_p = find_person(parv[1]);
+	if(target_p == NULL)
 	{
 		if(!MyClient(source_p) && IsDigit(parv[1][0]))
 			sendto_one_numeric(source_p, ERR_NOSUCHNICK, 
@@ -192,17 +195,17 @@ m_invite(struct Client *client_p, struct Client *source_p, int parc, const char
 static void
 add_invite(struct Channel *chptr, struct Client *who)
 {
-	dlink_node *ptr;
+	rb_dlink_node *ptr;
 
 	/* already invited? */
-	DLINK_FOREACH(ptr, who->user->invited.head)
+	RB_DLINK_FOREACH(ptr, who->user->invited.head)
 	{
 		if(ptr->data == chptr)
 			return;
 	}
 
 	/* ok, if their invite list is too long, remove the tail */
-	if((int)dlink_list_length(&who->user->invited) >= 
+	if((int)rb_dlink_list_length(&who->user->invited) >= 
 	   ConfigChannel.max_chans_per_user)
 	{
 		ptr = who->user->invited.tail;
@@ -210,10 +213,10 @@ add_invite(struct Channel *chptr, struct Client *who)
 	}
 
 	/* add user to channel invite list */
-	dlinkAddAlloc(who, &chptr->invites);
+	rb_dlinkAddAlloc(who, &chptr->invites);
 
 	/* add channel to user invite list */
-	dlinkAddAlloc(chptr, &who->user->invited);
+	rb_dlinkAddAlloc(chptr, &who->user->invited);
 }