Changeset 74f1cde

Timestamp:

2010-03-27T18:05:38Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

410bf6d

Parents:

280c56a

Message:

irc_usermsg() works a little bit again. Have to figure out how and where
to restore multiline support though.

Files:

• irc.c (modified) (1 diff)
• irc.h (modified) (4 diffs)
• irc_channel.c (modified) (1 diff)
• irc_send.c (modified) (2 diffs)
• irc_user.c (modified) (2 diffs)

irc.c

@@ -624 +624 @@
                         irc_channel_add_user( ic, irc->user );
                         
+                        irc->last_root_cmd = g_strdup( ROOT_CHAN );
+                        
                         return 1;
                 }

irc.h

@@ -65 +65 @@
         struct irc_user *root;
         struct irc_user *user;
+        
+        char *last_root_cmd;
 
         char *password; /* HACK: Used to save the user's password, but before
@@ -86 +88 @@
         struct bee *b;
 } irc_t;
+
+typedef enum
+{
+        IRC_USER_PRIVATE = 1,
+} irc_user_flags_t;
 
 typedef struct irc_user
@@ -99 +106 @@
         char *key;
         
-        char is_private;
+        irc_user_flags_t flags;
         
         char *sendbuf;
         int sendbuf_len;
         guint sendbuf_timer;
-        int sendbuf_flags;
+        //int sendbuf_flags;
         
         //struct user *b;
@@ -190 +197 @@
 void irc_send_whois( irc_user_t *iu );
 void irc_send_who( irc_t *irc, GSList *l, const char *channel );
+void irc_send_msg( irc_user_t *iu, const char *type, const char *dst, const char *msg );
 
 /* irc_user.c */

irc_channel.c

@@ -139 +139 @@
 static gboolean control_channel_privmsg( irc_channel_t *ic, const char *msg )
 {
+        g_free( ic->irc->last_root_cmd );
+        ic->irc->last_root_cmd = g_strdup( ic->name );
+        
         root_command_string( ic->irc, msg );
         

irc_send.c

@@ -109 +109 @@
 }
 
-/* FIXME/REPLACEME */
 void irc_usermsg( irc_t *irc, char *format, ... )
 {
+        irc_channel_t *ic;
+        irc_user_t *iu;
         char text[1024];
         va_list params;
-        //irc_user_t *iu;
         
         va_start( params, format );
@@ -120 +120 @@
         va_end( params );
         
-        fprintf( stderr, "%s\n", text );
+        if( irc->last_root_cmd &&
+            irc_channel_name_ok( irc->last_root_cmd ) && 
+            ( ic = irc_channel_by_name( irc, irc->last_root_cmd ) ) &&
+            ic->flags & IRC_CHANNEL_JOINED )
+                irc_send_msg( irc->root, "PRIVMSG", irc->last_root_cmd, text );
+        else if( irc->last_root_cmd &&
+                 ( iu = irc_user_by_name( irc, irc->last_root_cmd ) ) &&
+                 iu->f == &irc_user_root_funcs )
+                irc_send_msg( iu, "PRIVMSG", irc->user->nick, text );
+        else
+        {
+                g_free( irc->last_root_cmd );
+                irc->last_root_cmd = NULL;
+                
+                irc_send_msg( irc->root, "PRIVMSG", irc->user->nick, text );
+        }
         
         /*return( irc_msgfrom( irc, u->nick, text ) );*/

irc_user.c

@@ -34 +34 @@
         iu->user = iu->host = iu->fullname = iu->nick;
         
-        iu->is_private = set_getbool( &irc->b->set, "private" );
+        iu->flags = set_getbool( &irc->b->set, "private" ) ? IRC_USER_PRIVATE : 0;
         
         iu->key = g_strdup( nick );
@@ -117 +117 @@
 static gboolean root_privmsg( irc_user_t *iu, const char *msg )
 {
+        g_free( iu->irc->last_root_cmd );
+        iu->irc->last_root_cmd = g_strdup( iu->nick );
+        
         root_command_string( iu->irc, msg );