From adc1eedda3162f882ee59984a3b35064dfbde492 Mon Sep 17 00:00:00 2001 From: Alexander Barton Date: Sun, 2 Jun 2002 15:23:46 +0000 Subject: [PATCH] - IRC_INVITE() implementiert. --- src/ngircd/irc-op.c | 49 ++++++++++++++++++++++++++++++++++++++++++--- 1 file changed, 46 insertions(+), 3 deletions(-) diff --git a/src/ngircd/irc-op.c b/src/ngircd/irc-op.c index 2590f916..77f7a819 100644 --- a/src/ngircd/irc-op.c +++ b/src/ngircd/irc-op.c @@ -9,7 +9,7 @@ * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS. * - * $Id: irc-op.c,v 1.2 2002/06/01 14:39:34 alex Exp $ + * $Id: irc-op.c,v 1.3 2002/06/02 15:23:46 alex Exp $ * * irc-op.c: Befehle zur Channel-Verwaltung */ @@ -27,6 +27,7 @@ #include "channel.h" #include "defines.h" #include "irc-write.h" +#include "lists.h" #include "log.h" #include "messages.h" #include "parse.h" @@ -81,15 +82,57 @@ IRC_BAN( CLIENT *Client, REQUEST *Req ) GLOBAL BOOLEAN IRC_INVITE( CLIENT *Client, REQUEST *Req ) { + CHANNEL *chan; + CLIENT *target, *from; + BOOLEAN remember = FALSE; + assert( Client != NULL ); assert( Req != NULL ); /* Valider Client? */ if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client )); - /* Keine Parameter? */ - if( Req->argc < 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + /* Falsche Anzahl Parameter? */ + if( Req->argc != 2 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command ); + if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_Search( Req->prefix ); + else from = Client; + if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix ); + + /* User suchen */ + target = Client_Search( Req->argv[0] ); + if( ! target ) return IRC_WriteStrClient( from, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->argv[0] ); + + chan = Channel_Search( Req->argv[1] ); + + if( chan ) + { + /* Der Channel existiert bereits; ist der User Mitglied? */ + if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( Client ), Req->argv[1] ); + + /* Ist der Channel "invite-only"? */ + if( strchr( Channel_Modes( chan ), 'i' )) + { + /* Ja. Der User muss Channel-Operator sein! */ + if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan )); + remember = TRUE; + } + + /* Ist der Ziel-User bereits Mitglied? */ + if( Channel_IsMemberOf( chan, target )) return IRC_WriteStrClient( from, ERR_USERONCHANNEL_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] ); + + } + + Log( LOG_DEBUG, "User \"%s\" invites \"%s\" to \"%s\" ...", Client_Mask( from ), Req->argv[0], Req->argv[1] ); + IRC_WriteStrClientPrefix( target, from, "INVITE %s %s", Req->argv[0], Req->argv[1] ); + if( remember ) Lists_AddInvited( Client_Mask( target ), chan ); + + if( Client_Conn( target ) > NONE ) + { + /* lokaler Zeil-Client, Status-Code melden */ + if( ! IRC_WriteStrClientPrefix( from, from, RPL_INVITING_MSG, Client_ID( from ), Req->argv[0], Req->argv[1] )) return DISCONNECTED; + } + return CONNECTED; } /* IRC_INVITE */ -- 2.39.2