Changeset 0d8a9bb0

Timestamp:

2015-11-15T23:19:13Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

80c2f3c

Parents:

d6e2aa8

git-author:

dequis <dx@…> (15-11-15 22:10:19)

git-committer:

dequis <dx@…> (15-11-15 23:19:13)

Message:

irc_send_whois: Refactor out a get_status_message() function

Because i'm going to use it elsewhere.

File:

• irc_send.c (modified) (3 diffs)

irc_send.c

@@ -248 +248 @@
 }
 
+/* msg1 and msg2 are output parameters. If msg2 is non-null, msg1 is guaranteed to be non-null too.
+   The idea is to defer the formatting of "$msg1 ($msg2)" to later calls to avoid a g_strdup_printf() here. */
+static void get_status_message(bee_user_t *bu, char **msg1, char **msg2)
+{
+        *msg1 = NULL;
+        *msg2 = NULL;
+
+        if (!(bu->flags & BEE_USER_ONLINE)) {
+                *msg1 = "User is offline";
+
+        } else if ((bu->status && *bu->status) ||
+                   (bu->status_msg && *bu->status_msg)) {
+
+                if (bu->status && bu->status_msg) {
+                        *msg1 = bu->status;
+                        *msg2 = bu->status_msg;
+                } else {
+                        *msg1 = bu->status ? : bu->status_msg;
+                }
+        }
+
+        if (*msg1 && !**msg1) {
+                *msg1 = (bu->flags & BEE_USER_AWAY) ? "Away" : NULL;
+        }
+}
+
 void irc_send_whois(irc_user_t *iu)
 {
@@ -257 +283 @@
         if (iu->bu) {
                 bee_user_t *bu = iu->bu;
+                char *msg1, *msg2;
+                int num;
 
                 irc_send_num(irc, 312, "%s %s.%s :%s network", iu->nick, bu->ic->acc->user,
@@ -262 +290 @@
                              bu->ic->acc->prpl->name);
 
-                if ((bu->status && *bu->status) ||
-                    (bu->status_msg && *bu->status_msg)) {
-                        int num = bu->flags & BEE_USER_AWAY ? 301 : 320;
-
-                        if (bu->status && bu->status_msg) {
-                                irc_send_num(irc, num, "%s :%s (%s)", iu->nick, bu->status, bu->status_msg);
-                        } else {
-                                irc_send_num(irc, num, "%s :%s", iu->nick, bu->status ? : bu->status_msg);
-                        }
-                } else if (!(bu->flags & BEE_USER_ONLINE)) {
-                        irc_send_num(irc, 301, "%s :%s", iu->nick, "User is offline");
+                num = (bu->flags & BEE_USER_AWAY || !(bu->flags & BEE_USER_ONLINE)) ? 301 : 320;
+
+                get_status_message(bu, &msg1, &msg2);
+
+                if (msg1 && msg2) {
+                        irc_send_num(irc, num, "%s :%s (%s)", iu->nick, msg1, msg2);
+                } else if (msg1) {
+                        irc_send_num(irc, num, "%s :%s", iu->nick, msg1);
                 }