Changeset a42fda4 for irc_im.c

Timestamp:

2016-03-20T03:58:05Z (5 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

8f8a56f

Parents:

14f912d

git-author:

dequis <dx@…> (08-12-15 22:31:05)

git-committer:

dequis <dx@…> (20-03-16 03:58:05)

Message:

Add imcb_buddy_nick_change(), like nick_hint but stronger

nick_hint only works when creating new users, it's a no-op after the
user is online. This new function takes care of nick changes after that.

It also helps clean up couple of hacks in irc_im.c \o/

File:

• irc_im.c (modified) (7 diffs)

irc_im.c

@@ -342 +342 @@
 }
 
-static gboolean bee_irc_user_nick_update(irc_user_t *iu);
+static gboolean bee_irc_user_nick_update(irc_user_t *iu, gboolean offline_only);
 
 static gboolean bee_irc_user_fullname(bee_t *bee, bee_user_t *bu)
@@ -370 +370 @@
         }
 
-        bee_irc_user_nick_update(iu);
+        bee_irc_user_nick_update(iu, TRUE);
 
         return TRUE;
@@ -377 +377 @@
 static gboolean bee_irc_user_nick_hint(bee_t *bee, bee_user_t *bu, const char *hint)
 {
-        bee_irc_user_nick_update((irc_user_t *) bu->ui_data);
+        bee_irc_user_nick_update((irc_user_t *) bu->ui_data, TRUE);
+
+        return TRUE;
+}
+
+static gboolean bee_irc_user_nick_change(bee_t *bee, bee_user_t *bu, const char *nick)
+{
+        bee_irc_user_nick_update((irc_user_t *) bu->ui_data, FALSE);
 
         return TRUE;
@@ -386 +393 @@
         irc_user_t *iu = (irc_user_t *) bu->ui_data;
         irc_t *irc = (irc_t *) bee->ui_data;
-        bee_user_flags_t online;
-
-        /* Take the user offline temporarily so we can change the nick (if necessary). */
-        if ((online = bu->flags & BEE_USER_ONLINE)) {
-                bu->flags &= ~BEE_USER_ONLINE;
-        }
 
         bee_irc_channel_update(irc, NULL, iu);
-        bee_irc_user_nick_update(iu);
-
-        if (online) {
-                bu->flags |= online;
-                bee_irc_channel_update(irc, NULL, iu);
-        }
-
-        return TRUE;
-}
-
-static gboolean bee_irc_user_nick_update(irc_user_t *iu)
+        bee_irc_user_nick_update(iu, FALSE);
+
+        return TRUE;
+}
+
+static gboolean bee_irc_user_nick_update(irc_user_t *iu, gboolean offline_only)
 {
         bee_user_t *bu = iu->bu;
         char *newnick;
 
-        if (bu->flags & BEE_USER_ONLINE) {
+        if (offline_only && bu->flags & BEE_USER_ONLINE) {
                 /* Ignore if the user is visible already. */
                 return TRUE;
@@ -432 +428 @@
 {
         bee_user_t *bu = iu->bu;
-        bee_user_flags_t online;
 
         if (bu == FALSE) {
@@ -438 +433 @@
         }
 
-        /* In this case, pretend the user is offline. */
-        if ((online = bu->flags & BEE_USER_ONLINE)) {
-                bu->flags &= ~BEE_USER_ONLINE;
-        }
-
         nick_del(bu);
-        bee_irc_user_nick_update(iu);
-
-        bu->flags |= online;
+        bee_irc_user_nick_update(iu, FALSE);
+
 }
 
@@ -1146 +1135 @@
 
         bee_irc_log,
+        bee_irc_user_nick_change,
 };