Changeset a1d30c5 for protocols/msn/ns.c

Timestamp:

2015-05-28T04:12:23Z (9 years ago)

Author:

dequis <dx@…>

Children:

d2d2b80

Parents:

ec8b369 (diff), 3d31618 (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 branch 'develop' into feat/hip-cat

File:

• protocols/msn/ns.c (modified) (6 diffs)

protocols/msn/ns.c

@@ -417 +417 @@
                         } else if (g_strncasecmp(ct, "text/x-msmsgsactivemailnotification", 35) == 0) {
                                 /* Notification that a message has been read... Ignore it */
-                        } else {
-                                debug("Can't handle %s packet from notification server", ct);
                         }
 
@@ -623 +621 @@
         char l[4];
 
-        if ((bd->flags & 7) == 0 || (bd->flags & MSN_BUDDY_ADL_SYNCED)) {
+        if ((bd->flags & (MSN_BUDDY_FL | MSN_BUDDY_AL)) == 0 || (bd->flags & MSN_BUDDY_ADL_SYNCED)) {
                 return FALSE;
         }
@@ -641 +639 @@
         }
 
-        g_snprintf(l, sizeof(l), "%d", bd->flags & 7);
+        g_snprintf(l, sizeof(l), "%d", bd->flags & (MSN_BUDDY_FL | MSN_BUDDY_AL));
         c = xt_new_node("c", NULL, NULL);
         xt_add_attr(c, "n", handle);
@@ -694 +692 @@
                 struct msn_buddy_data *bd = bu->data;
 
-                if (bu->ic != ic || (bd->flags & 7) == 0) {
+                if (bu->ic != ic || (bd->flags & (MSN_BUDDY_FL | MSN_BUDDY_AL)) == 0) {
                         continue;
                 }
@@ -724 +722 @@
 }
 
-// TODO: typing notifications, nudges lol, etc
-int msn_ns_sendmessage(struct im_connection *ic, bee_user_t *bu, const char *text)
+static int msn_ns_send_sdg(struct im_connection *ic, bee_user_t *bu, const char *message_type, const char *text)
 {
         struct msn_data *md = ic->proto_data;
@@ -731 +728 @@
         char *buf;
 
-        if (strncmp(text, "\r\r\r", 3) == 0) {
-                /* Err. Shouldn't happen but I guess it can. Don't send others
-                   any of the "SHAKE THAT THING" messages. :-D */
-                return 1;
-        }
-
-        buf = g_strdup_printf(MSN_MESSAGE_HEADERS, bu->handle, ic->acc->user, md->uuid, strlen(text), text);
+        buf = g_strdup_printf(MSN_MESSAGE_HEADERS, bu->handle, ic->acc->user, md->uuid, message_type, strlen(text), text);
         retval = msn_ns_write(ic, -1, "SDG %d %zd\r\n%s", ++md->trId, strlen(buf), buf);
         g_free(buf);
         return retval;
 }
+
+int msn_ns_send_typing(struct im_connection *ic, bee_user_t *bu)
+{
+        return msn_ns_send_sdg(ic, bu, "Control/Typing", "");
+}
+
+int msn_ns_send_message(struct im_connection *ic, bee_user_t *bu, const char *text)
+{
+        return msn_ns_send_sdg(ic, bu, "Text", text);
+}
+