- neue Konstante: CHANNEL_TOPIC_LEN

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

diff --git a/src/ngircd/irc.c b/src/ngircd/irc.c
index 9d48a8ca245ab13f07d18272bc77f521f6a6e680..bb781709087aa57ac1d636b2c67544769ba6a999 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.76 2002/02/27 16:04:14 alex Exp $
+ * $Id: irc.c,v 1.79 2002/02/27 18:57:21 alex Exp $
  *
  * irc.c: IRC-Befehle
  *
  * $Log: irc.c,v $
+ * 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.
+ *
+ * Revision 1.77  2002/02/27 17:05:41  alex
+ * - PRIVMSG beachtet nun die Channel-Modes "n" und "m".
+ *
  * Revision 1.76  2002/02/27 16:04:14  alex
  * - Bug bei belegtem Nickname bei User-Registrierung (NICK-Befehl) behoben.
  *
@@ -1203,7 +1212,8 @@ GLOBAL BOOLEAN IRC_MOTD( CLIENT *Client, REQUEST *Req )
 
 GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
 {
-       CLIENT *to, *from;
+       BOOLEAN is_member, has_voice, is_op, ok;
+       CLIENT *cl, *from;
        CHANNEL *chan;
        
        assert( Client != NULL );
@@ -1220,18 +1230,41 @@ GLOBAL BOOLEAN IRC_PRIVMSG( CLIENT *Client, REQUEST *Req )
        else from = Client;
        if( ! from ) return IRC_WriteStrClient( Client, ERR_NOSUCHNICK_MSG, Client_ID( Client ), Req->prefix );
 
-       to = Client_Search( Req->argv[0] );
-       if( to )
+       cl = Client_Search( Req->argv[0] );
+       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( to, from, "PRIVMSG %s :%s", Client_ID( to ), Req->argv[1] );
+               return IRC_WriteStrClientPrefix( cl, from, "PRIVMSG %s :%s", Client_ID( cl ), Req->argv[1] );
        }
 
        chan = Channel_Search( Req->argv[0] );
        if( chan )
        {
                /* Okay, Ziel ist ein Channel */
+               is_member = has_voice = is_op = FALSE;
+               if( Channel_IsMemberOf( chan, from ))
+               {
+                       is_member = TRUE;
+                       if( strchr( Channel_UserModes( chan, from ), 'v' )) has_voice = TRUE;
+                       if( strchr( Channel_UserModes( chan, from ), 'o' )) is_op = TRUE;
+               }
+               
+               /* pruefen, ob Client in Channel schreiben darf */
+               ok = TRUE;
+               if( strchr( Channel_Modes( chan ), 'n' ) && ( ! is_member )) ok = FALSE;
+               if( strchr( Channel_Modes( chan ), 'm' ) && ( ! is_op ) && ( ! has_voice )) ok = FALSE;
+
+               if( ! ok ) return IRC_WriteStrClient( from, ERR_CANNOTSENDTOCHAN_MSG, Client_ID( from ), Req->argv[0] );
+
+               /* Text senden */
                if( Client_Conn( from ) > NONE ) Conn_UpdateIdle( Client_Conn( from ));
                return IRC_WriteStrChannelPrefix( Client, chan, from, TRUE, "PRIVMSG %s :%s", Req->argv[0], Req->argv[1] );
        }
@@ -1362,6 +1395,14 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
                        /* Befehl kommt von einem Server, daher
                         * trauen wir ihm "unbesehen" ... */
                        x[0] = *mode_ptr;
+
+                       if(( cl ) && ( x[0] == 'a' ))
+                       {
+                               /* away */
+                               if( set ) Client_SetAway( cl, "Away" );
+                               else Client_SetAway( cl, NULL );
+                       }
+                       
                }
                else
                {
@@ -1447,7 +1488,7 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
                                                        x[0] = 'p';
                                                        break;
                                                case 'q':
-                                                       /* Quite */
+                                                       /* Quiet */
                                                        x[0] = 'q';
                                                        break;
                                                case 's':
@@ -1585,6 +1626,33 @@ GLOBAL BOOLEAN IRC_MODE( CLIENT *Client, REQUEST *Req )
 } /* IRC_MODE */
 
 
+GLOBAL BOOLEAN IRC_AWAY( CLIENT *Client, REQUEST *Req )
+{
+       assert( Client != NULL );
+       assert( Req != NULL );
+
+       if( Client_Type( Client ) != CLIENT_USER ) return IRC_WriteStrClient( Client, ERR_NOTREGISTERED_MSG, Client_ID( Client ));
+
+       /* Falsche Anzahl Parameter? */
+       if( Req->argc > 1 ) return IRC_WriteStrClient( Client, ERR_NEEDMOREPARAMS_MSG, Client_ID( Client ), Req->command );
+
+       if(( Req->argc == 1 ) && (Req->argv[0][0] ))
+       {
+               /* AWAY setzen */
+               Client_SetAway( Client, Req->argv[0] );
+               IRC_WriteStrServersPrefix( Client, Client, "MODE %s :+a", Client_ID( Client ));
+               return IRC_WriteStrClient( Client, RPL_NOWAWAY_MSG, Client_ID( Client ));
+       }
+       else
+       {
+               /* AWAY loeschen */
+               Client_SetAway( Client, NULL );
+               IRC_WriteStrServersPrefix( Client, Client, "MODE %s :-a", Client_ID( Client ));
+               return IRC_WriteStrClient( Client, RPL_UNAWAY_MSG, Client_ID( Client ));
+       }
+} /* IRC_AWAY */
+
+
 GLOBAL BOOLEAN IRC_OPER( CLIENT *Client, REQUEST *Req )
 {
        INT i;
@@ -1885,6 +1953,12 @@ GLOBAL BOOLEAN IRC_WHOIS( CLIENT *Client, REQUEST *Req )
                if( ! IRC_WriteStrClient( from, RPL_WHOISIDLE_MSG, Client_ID( from ), Client_ID( c ), Conn_GetIdle( Client_Conn ( c )))) return DISCONNECTED;
        }
 
+       /* Away? */
+       if( Client_HasMode( c, 'a' ))
+       {
+               if( ! IRC_WriteStrClient( from, RPL_AWAY_MSG, Client_ID( from ), Client_ID( c ), Client_Away( c ))) return DISCONNECTED;
+       }
+
        /* End of Whois */
        return IRC_WriteStrClient( from, RPL_ENDOFWHOIS_MSG, Client_ID( from ), Client_ID( c ));
 } /* IRC_WHOIS */