Changeset 537d9b9 for irc_im.c

Timestamp:

2016-11-20T08:40:36Z (8 years ago)

Author:

dequis <dx@…>

Children:

3f44e43

Parents:

ba52ac5 (diff), 9f03c47 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge master up to commit '9f03c47' into parson

File:

• irc_im.c (modified) (12 diffs)

irc_im.c

@@ -120 +120 @@
         }
 
-        if ((irc->caps & CAP_AWAY_NOTIFY) &&
-            ((bu->flags & BEE_USER_AWAY) != (old->flags & BEE_USER_AWAY) ||
-             (bu->flags & BEE_USER_ONLINE) != (old->flags & BEE_USER_ONLINE))) {
-                irc_send_away_notify(iu);
-        }
-
         if ((bu->flags & BEE_USER_ONLINE) != (old->flags & BEE_USER_ONLINE)) {
                 if (bu->flags & BEE_USER_ONLINE) {
@@ -153 +147 @@
 
         bee_irc_channel_update(irc, NULL, iu);
+
+        /* If away-notify enabled, send status updates when:
+         * Away or Online state changes
+         * Status changes (e.g. "Away" to "Mobile")
+         * Status message changes
+         */
+        if ((irc->caps & CAP_AWAY_NOTIFY) &&
+            ((bu->flags & BEE_USER_AWAY) != (old->flags & BEE_USER_AWAY) ||
+             (bu->flags & BEE_USER_ONLINE) != (old->flags & BEE_USER_ONLINE) ||
+             (g_strcmp0(bu->status, old->status) != 0) ||
+             (g_strcmp0(bu->status_msg, old->status_msg) != 0))) {
+                irc_send_away_notify(iu);
+        }
 
         return TRUE;
@@ -292 +299 @@
         }
 
-        wrapped = word_wrap(msg, 425);
+        wrapped = word_wrap(msg, IRC_WORD_WRAP);
         irc_send_msg(src_iu, message_type, dst, wrapped, prefix);
         g_free(wrapped);
@@ -342 +349 @@
 }
 
-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 +377 @@
         }
 
-        bee_irc_user_nick_update(iu);
+        bee_irc_user_nick_update(iu, TRUE);
 
         return TRUE;
@@ -377 +384 @@
 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 +400 @@
         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 +435 @@
 {
         bee_user_t *bu = iu->bu;
-        bee_user_flags_t online;
 
         if (bu == FALSE) {
@@ -438 +440 @@
         }
 
-        /* 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);
+
 }
 
@@ -461 +457 @@
         }
 
-        if ((away = irc_user_get_away(iu)) &&
+        if (iu->last_channel == NULL &&
+            (away = irc_user_get_away(iu)) &&
             time(NULL) >= iu->away_reply_timeout) {
                 irc_send_num(iu->irc, 301, "%s :%s", iu->nick, away);
@@ -676 +673 @@
         }
 
-        wrapped = word_wrap(msg, 425);
+        wrapped = word_wrap(msg, IRC_WORD_WRAP);
         irc_send_msg(iu, "PRIVMSG", ic->name, wrapped, ts);
         g_free(ts);
@@ -1146 +1143 @@
 
         bee_irc_log,
+        bee_irc_user_nick_change,
 };