- Includes fuer einige Header bereinigt.

[ngircd-alex.git] / src / ngircd / irc.c

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 7296f83f1001ac7335f81705f00e37e7a53a9b2b..0db8ce057a587b905bcb50ad53ac5276cffea41b 100644 (file)
--- a/src/ngircd/irc.c
+++ b/src/ngircd/irc.c
@@ -9,11 +9,20 @@
  * Naehere Informationen entnehmen Sie bitter der Datei COPYING. Eine Liste
  * der an ngIRCd beteiligten Autoren finden Sie in der Datei AUTHORS.
  *
- * $Id: irc.c,v 1.78 2002/02/27 18:23:45 alex Exp $
+ * $Id: irc.c,v 1.81 2002/02/27 20:55:44 alex Exp $
  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $
+ * Revision 1.81  2002/02/27 20:55:44  alex
+ * - Channel-Topics werden nun auch korrekt von anderen Server angenommen.
+ *
+ * Revision 1.80  2002/02/27 20:33:13  alex
+ * - Channel-Topics implementiert.
+ *
+ * Revision 1.79  2002/02/27 18:57:21  alex
+ * - PRIVMSG zeugt nun bei Texten an User an, wenn diese "away" sind.
+ *
  * Revision 1.78  2002/02/27 18:23:45  alex
  * - IRC-Befehl "AWAY" implementert.
  *
@@ -1231,6 +1240,13 @@ GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
        if( cl )
        {
                /* Okay, Ziel ist ein User */
+               if(( Client_Type( Client ) != CLIENT_SERVER ) && ( strchr( Client_Modes( cl ), 'a' )))
+               {
+                       /* Ziel-User ist AWAY: Meldung verschicken */
+                       if( ! IRC_WriteStrClient( from, RPL_AWAY_MSG, Client_ID( from ), Client_ID( cl ), Client_Away( cl ))) return DISCONNECTED;
+               }
+
+               /* Text senden */
                if( Client_Conn( from ) > NONE ) Conn_UpdateIdle( Client_Conn( from ));
                return IRC_WriteStrClientPrefix( cl, from, "PRIVMSG %s :%s", Client_ID( cl ), Req->argv[1] );
        }
@@ -2094,7 +2110,7 @@ GLOBAL BOOLEAN IRC_LINKS( CLIENT *Client, REQUEST *Req )
 
 GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
 {
-       CHAR *channame, *flags, modes[8];
+       CHAR *channame, *flags, *topic, modes[8];
        BOOLEAN is_new_chan;
        CLIENT *target;
        CHANNEL *chan;
@@ -2176,7 +2192,8 @@ GLOBAL BOOLEAN IRC_JOIN( CLIENT *Client, REQUEST *Req )
                        IRC_WriteStrClientPrefix( Client, target, "JOIN :%s", channame );
 
                        /* Topic an Client schicken */
-                       IRC_WriteStrClient( Client, RPL_TOPIC_MSG, Client_ID( Client ), channame, "What a wonderful channel!" );
+                       topic = Channel_Topic( chan );
+                       if( *topic ) IRC_WriteStrClient( Client, RPL_TOPIC_MSG, Client_ID( Client ), channame, topic );
 
                        /* Mitglieder an Client Melden */
                        Send_NAMES( Client, chan );
@@ -2226,6 +2243,55 @@ GLOBAL BOOLEAN IRC_PART( CLIENT *Client, REQUEST *Req )
 } /* IRC_PART */
 
 
+GLOBAL BOOLEAN IRC_TOPIC( CLIENT *Client, REQUEST *Req )
+{
+       CHANNEL *chan;
+       CLIENT *from;
+       CHAR *topic;
+       
+       assert( Client != NULL );
+       assert( Req != NULL );
+
+       if(( Client_Type( Client ) != CLIENT_USER ) && ( Client_Type( Client ) != CLIENT_SERVER )) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
+       /* Falsche Anzahl Parameter? */
+       if(( Req->argc < 1 ) || ( Req->argc > 2 )) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+       if( Client_Type( Client ) == CLIENT_SERVER ) from = Client_GetFromID( Req->prefix );
+       else from = Client;
+       if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
+
+       /* Welcher Channel? */
+       chan = Channel_Search( Req->argv[0] );
+       if( ! chan ) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
+
+       /* Ist der User Mitglied in dem Channel? */
+       if( ! Channel_IsMemberOf( chan, from )) return IRC_WriteStrClient( from, ERR_NOTONCHANNEL_MSG, Client_ID( from ), Req->argv[0] );
+
+       if( Req->argc == 1 )
+       {
+               /* Topic erfragen */
+               topic = Channel_Topic( chan );
+               if( *topic ) return IRC_WriteStrClient( from, RPL_TOPIC_MSG, Client_ID( from ), Channel_Name( chan ), topic );
+               else return IRC_WriteStrClient( from, RPL_NOTOPIC_MSG, Client_ID( from ), Channel_Name( chan ));
+       }
+
+       if( strchr( Channel_Modes( chan ), 't' ))
+       {
+               /* Topic Lock. Ist der User ein Channel Operator? */
+               if( ! strchr( Channel_UserModes( chan, from ), 'o' )) return IRC_WriteStrClient( from, ERR_CHANOPRIVSNEEDED_MSG, Client_ID( from ), Channel_Name( chan ));
+       }
+
+       /* Topic setzen */
+       Channel_SetTopic( chan, Req->argv[1] );
+       Log( LOG_DEBUG, "User \"%s\" set topic on \"%s\": %s", Client_Mask( from ), Channel_Name( chan ), Req->argv[1][0] ? Req->argv[1] : "<none>" );
+
+       /* im Channel bekannt machen */
+       IRC_WriteStrChannelPrefix( Client, chan, from, TRUE, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
+       return IRC_WriteStrClientPrefix( from, from, "TOPIC %s :%s", Req->argv[0], Req->argv[1] );
+} /* IRC_TOPIC */
+
+
 GLOBAL BOOLEAN IRC_VERSION( CLIENT *Client, REQUEST *Req )
 {
        CLIENT *target, *prefix;