Changeset 83e92bf

Timestamp:

2010-03-27T12:30:00Z (15 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Branches:

master

Children:

9b69eb7

Parents:

b95932e

Message:

Topic handling changes.

Files:

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

irc.c

@@ -620 +620 @@
                         
                         ic = irc_channel_new( irc, ROOT_CHAN );
-                        irc_channel_set_topic( ic, CONTROL_TOPIC );
+                        irc_channel_set_topic( ic, CONTROL_TOPIC, irc->root );
                         irc_channel_add_user( ic, irc->user );
                         

irc.h

@@ -118 +118 @@
         char *name;
         char *topic;
+        char *topic_who;
+        time_t topic_time;
         char mode[8];
         GSList *users;
@@ -145 +147 @@
 irc_channel_t *irc_channel_new( irc_t *irc, const char *name );
 irc_channel_t *irc_channel_by_name( irc_t *irc, const char *name );
+int irc_channel_free( irc_channel_t *ic );
 int irc_channel_add_user( irc_channel_t *ic, irc_user_t *iu );
 int irc_channel_del_user( irc_channel_t *ic, irc_user_t *iu );
-int irc_channel_set_topic( irc_channel_t *ic, const char *topic );
+int irc_channel_set_topic( irc_channel_t *ic, const char *topic, const irc_user_t *who );
 
 /* irc_commands.c */
@@ -160 +163 @@
 void irc_send_part( irc_channel_t *ic, irc_user_t *iu, const char *reason );
 void irc_send_names( irc_channel_t *ic );
-void irc_send_topic( irc_channel_t *ic );
+void irc_send_topic( irc_channel_t *ic, gboolean topic_change );
 void irc_send_whois( irc_user_t *iu );
 

irc_channel.c

@@ -109 +109 @@
 }
 
-int irc_channel_set_topic( irc_channel_t *ic, const char *topic )
+int irc_channel_set_topic( irc_channel_t *ic, const char *topic, const irc_user_t *iu )
 {
         g_free( ic->topic );
         ic->topic = g_strdup( topic );
         
+        g_free( ic->topic_who );
+        if( iu )
+                ic->topic_who = g_strdup_printf( "%s!%s@%s", iu->nick, iu->user, iu->host );
+        else
+                ic->topic_who = NULL;
+        
+        ic->topic_time = time( NULL );
+        
         if( ic->flags & IRC_CHANNEL_JOINED )
-                irc_send_topic( ic );
+                irc_send_topic( ic, TRUE );
         
         return 1;

irc_send.c

@@ -135 +135 @@
                 irc_write( irc, ":%s MODE %s +%s", irc->root->host, ic->name, ic->mode );
                 irc_send_names( ic );
-                irc_send_topic( ic );
+                irc_send_topic( ic, FALSE );
         }
 }
@@ -182 +182 @@
 }
 
-void irc_send_topic( irc_channel_t *ic )
-{
-        if( ic->topic )
+void irc_send_topic( irc_channel_t *ic, gboolean topic_change )
+{
+        if( topic_change && ic->topic_who )
+        {
+                irc_write( ic->irc, ":%s TOPIC %s :%s", ic->topic_who, 
+                           ic->name, ic->topic && *ic->topic ? ic->topic : "" );
+        }
+        else if( ic->topic )
+        {
                 irc_send_num( ic->irc, 332, "%s :%s", ic->name, ic->topic );
+                if( ic->topic_who )
+                        irc_send_num( ic->irc, 333, "%s %s %d",
+                                      ic->name, ic->topic_who, (int) ic->topic_time );
+        }
         else
                 irc_send_num( ic->irc, 331, "%s :No topic for this channel", ic->name );