Changeset dd43c62

Timestamp:

2015-05-28T05:26:24Z (9 years ago)

Author:

dequis <dx@…>

Branches:

master

Children:

faeb521

Parents:

3d31618

git-author:

Artem Savkov <artem.savkov@…> (28-03-15 01:23:42)

git-committer:

dequis <dx@…> (28-05-15 05:26:24)

Message:

Gmail notifications support through new imcb_notify_email() API

Files:

• doc/user-guide/commands.xml (modified) (1 diff)
• protocols/bee.h (modified) (1 diff)
• protocols/bee_user.c (modified) (1 diff)
• protocols/jabber/iq.c (modified) (7 diffs)
• protocols/jabber/jabber.c (modified) (3 diffs)
• protocols/jabber/jabber.h (modified) (3 diffs)
• protocols/msn/msn.c (modified) (2 diffs)
• protocols/msn/ns.c (modified) (2 diffs)
• protocols/purple/purple.c (modified) (3 diffs)
• protocols/yahoo/yahoo.c (modified) (3 diffs)

doc/user-guide/commands.xml

@@ -1023 +1023 @@
         </bitlbee-setting>
 
+        <bitlbee-setting name="notify_handle" type="string" scope="account">
+                <default>empty</default>
+
+                <description>
+                        <para>
+                                This setting is available for protocols with e-mail notification functionality. If set to empty all e-mail notifications will go to control channel, if set to some string - this will be the name of a contact who will PRIVMSG you on every new notification.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
+        <bitlbee-setting name="gmail_notifications" type="boolean" scope="account">
+                <default>false</default>
+
+                <description>
+                        <para>
+                                Same as "mail_notifications" but GMail specific.
+                        </para>
+                </description>
+
+        </bitlbee-setting>
+
         <bitlbee-setting name="message_length" type="integer" scope="account">
                 <default>140</default>

protocols/bee.h

@@ -156 +156 @@
 G_MODULE_EXPORT void imcb_buddy_msg(struct im_connection *ic, const char *handle, const char *msg, guint32 flags,
                                     time_t sent_at);
+G_MODULE_EXPORT void imcb_notify_email(struct im_connection *ic, const char *handle, char *msg, guint32 flags,
+                                       time_t sent_at);
 
 /* bee_chat.c */

protocols/bee_user.c

@@ -271 +271 @@
 }
 
+void imcb_notify_email(struct im_connection *ic, const char *handle, char *msg, uint32_t flags, time_t sent_at)
+{
+        if (handle != NULL) {
+                imcb_buddy_msg(ic, handle, msg, flags, sent_at);
+        } else {
+                imcb_log(ic, "%s", msg);
+        }
+}
+
 void imcb_buddy_typing(struct im_connection *ic, const char *handle, uint32_t flags)
 {

protocols/jabber/iq.c

@@ -27 +27 @@
 static xt_status jabber_parse_roster(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 static xt_status jabber_iq_display_vcard(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
+static xt_status jabber_gmail_handle_new(struct im_connection *ic, struct xt_node *node);
 
 xt_status jabber_pkt_iq(struct xt_node *node, gpointer data)
@@ -141 +142 @@
                     (strcmp(s, XMLNS_SI) == 0)) {
                         return jabber_si_handle_request(ic, node, c);
+                } else if ((c = xt_find_node(node->children, "new-mail")) &&
+                           (s = xt_find_attr(c, "xmlns")) &&
+                           (strcmp(s, XMLNS_GMAILNOTIFY) == 0)) {
+                        return jabber_gmail_handle_new(ic, node);
                 } else if (!(c = xt_find_node(node->children, "query")) ||
                            !(s = xt_find_attr(c, "xmlns"))) {
@@ -342 +347 @@
                         return XT_ABORT;
                 }
+                if (jd->flags & JFLAG_GMAILNOTIFY && node == NULL) {
+                        jabber_iq_query_server(ic, jd->server, XMLNS_DISCO_INFO);
+                }
         } else if ((jd->flags & (JFLAG_WANT_BIND | JFLAG_WANT_SESSION)) == 0) {
                 if (!jabber_get_roster(ic)) {
@@ -369 +377 @@
 
         return st;
+}
+
+xt_status jabber_iq_query_gmail(struct im_connection *ic);
+
+static xt_status jabber_gmail_handle_new(struct im_connection *ic, struct xt_node *node)
+{
+        struct xt_node *response;
+        struct jabber_data *jd = ic->proto_data;
+
+        response = jabber_make_packet("iq", "result", g_strdup_printf("%s@%s", jd->username, jd->server), NULL);
+
+        jabber_cache_add(ic, response, NULL);
+        if (!jabber_write_packet(ic, response)) {
+                return XT_ABORT;
+        }
+
+        jabber_iq_query_gmail(ic);
+
+        return XT_HANDLED;
 }
 
@@ -710 +737 @@
 }
 
+xt_status jabber_iq_parse_gmail(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
+
+xt_status jabber_iq_query_gmail(struct im_connection *ic)
+{
+        struct xt_node *node, *query;
+        struct jabber_data *jd = ic->proto_data;
+
+        node = xt_new_node("query", NULL, NULL);
+        xt_add_attr(node, "xmlns", XMLNS_GMAILNOTIFY);
+        if (jd->gmail_time) {
+                char *formatted = g_strdup_printf("%" G_GUINT64_FORMAT, (jd->gmail_time + 1));
+                xt_add_attr(node, "newer-than-time", formatted);
+                g_free(formatted);
+        }
+        if (jd->gmail_tid) {
+                xt_add_attr(node, "newer-than-tid", jd->gmail_tid);
+        }
+
+        if (!(query = jabber_make_packet("iq", "get", jd->me, node))) {
+                imcb_log(ic, "WARNING: Couldn't generate server query");
+                xt_free_node(node);
+        }
+
+        jabber_cache_add(ic, query, jabber_iq_parse_gmail);
+
+        return jabber_write_packet(ic, query) ? XT_HANDLED : XT_ABORT;
+}
+
 xt_status jabber_iq_parse_server_features(struct im_connection *ic, struct xt_node *node, struct xt_node *orig);
 
@@ -729 +784 @@
 
         return jabber_write_packet(ic, query) ? XT_HANDLED : XT_ABORT;
+}
+
+xt_status jabber_iq_parse_gmail(struct im_connection *ic, struct xt_node *node, struct xt_node *orig)
+{
+        struct xt_node *c;
+        struct jabber_data *jd = ic->proto_data;
+        char *xmlns, *from;
+        guint64 l_time = 0;
+        char *tid = NULL;
+
+        if (!(c = xt_find_node(node->children, "mailbox")) ||
+            !(from = xt_find_attr(node, "from")) ||
+            !(xmlns = xt_find_attr(c, "xmlns")) ||
+            (g_strcmp0(xmlns, XMLNS_GMAILNOTIFY) != 0)) {
+                imcb_log(ic, "WARNING: Received incomplete mailbox packet for gmail notify");
+                return XT_HANDLED;
+        }
+
+        c = c->children;
+
+        while ((c = xt_find_node(c, "mail-thread-info"))) {
+                struct xt_node *thread, *s;
+                char *subject = NULL;
+                char *snippet = NULL;
+                char *msg = NULL;
+                guint64 t_time;
+
+                t_time = g_ascii_strtoull(xt_find_attr(c, "date"), NULL, 10);
+                if (t_time && t_time > l_time) {
+                        l_time = t_time;
+                        tid = xt_find_attr(c, "tid");
+                }
+
+                thread = c->children;
+
+                if ((s = xt_find_node(thread, "subject"))) {
+                        subject = s->text;
+                }
+
+                if ((s = xt_find_node(thread, "snippet"))) {
+                        snippet = s->text;
+                }
+
+                if (subject) {
+                        msg = g_strdup_printf("New mail for %s. Subj: %s", from, subject);
+                } else {
+                        msg = g_strdup_printf("New mail for %s.", from);
+                }
+                imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), msg, 0, 0);
+
+                if (snippet) {
+                        imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), snippet, 0, 0);
+                }
+
+                c = c->next;
+                g_free(msg);
+        }
+
+        if (l_time && (!jd->gmail_time || l_time > jd->gmail_time)) {
+                jd->gmail_time = l_time;
+                if (tid) {
+                        g_free(jd->gmail_tid);
+                        jd->gmail_tid = g_strdup(tid);
+                }
+        }
+
+        return XT_HANDLED;
 }
 
@@ -781 +903 @@
                         c = c->next;
                 }
+
+                if (jd->flags & JFLAG_GMAILNOTIFY) {
+                        /* search for gmail notification feature */
+                        c = xt_find_node(node->children, "query");
+                        c = c->children;
+                        while ((c = xt_find_node(c, "feature"))) {
+                                if (strcmp(xt_find_attr(c, "var"), XMLNS_GMAILNOTIFY) == 0) {
+                                        jabber_iq_query_gmail(ic);
+                                }
+                                c = c->next;
+                        }
+                }
+
         } else if (strcmp(xmlns, XMLNS_BYTESTREAMS) == 0) {
                 char *host, *jid, *port_s;

protocols/jabber/jabber.c

@@ -100 +100 @@
 
         s = set_add(&acc->set, "xmlconsole", "false", set_eval_bool, acc);
+
+        s = set_add(&acc->set, "gmail_notifications", "false", set_eval_bool, acc);
         s->flags |= ACC_SET_OFFLINE_ONLY;
+
+        s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);
+        s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
 
         acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE |
@@ -259 +264 @@
                 imcb_add_buddy(ic, JABBER_XMLCONSOLE_HANDLE, NULL);
         }
+        if (set_getbool(&acc->set, "gmail_notifications")) {
+                jd->flags |= JFLAG_GMAILNOTIFY;
+                if (set_getstr(&acc->set, "notify_handle")) {
+                        imcb_add_buddy(ic, set_getstr(&acc->set, "notify_handle"), NULL);
+                }
+        }
 
         jabber_generate_id_hash(jd);
@@ -334 +345 @@
         g_free(jd->away_message);
         g_free(jd->internal_jid);
+        g_free(jd->gmail_tid);
         g_free(jd->username);
         g_free(jd->me);

protocols/jabber/jabber.h

@@ -46 +46 @@
         JFLAG_XMLCONSOLE = 64,          /* If the user added an xmlconsole buddy. */
         JFLAG_STARTTLS_DONE = 128,      /* If a plaintext session was converted to TLS. */
+        JFLAG_GMAILNOTIFY = 256,        /* If gmail notification is enabled */
 
         JFLAG_GTALK =  0x100000,        /* Is Google Talk, as confirmed by iq discovery */
@@ -102 +103 @@
         const struct jabber_away_state *away_state;
         char *away_message;
+        guint64 gmail_time;
+        char *gmail_tid;
 
         md5_state_t cached_id_prefix;
@@ -224 +227 @@
 #define XMLNS_DELAY        "urn:xmpp:delay"                                      /* XEP-0203 */
 #define XMLNS_XDATA        "jabber:x:data"                                       /* XEP-0004 */
+#define XMLNS_GMAILNOTIFY  "google:mail:notify"                                  /* Not a XEP */
 #define XMLNS_CHATSTATES   "http://jabber.org/protocol/chatstates"               /* XEP-0085 */
 #define XMLNS_DISCO_INFO   "http://jabber.org/protocol/disco#info"               /* XEP-0030 */

protocols/msn/msn.c

@@ -46 +46 @@
         s->flags |= ACC_SET_OFFLINE_ONLY;
 
-        set_add(&acc->set, "mail_notifications", "false", set_eval_bool, acc);
+        s = set_add(&acc->set, "mail_notifications", "false", set_eval_bool, acc);
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+
+        s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);
+        s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
 
         acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE |
@@ -82 +86 @@
         msn_ns_connect(ic, server,
                        set_getint(&ic->acc->set, "port"));
+
+        if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "notify_handle")) {
+                imcb_add_buddy(ic, set_getstr(&acc->set, "notify_handle"), NULL);
+        }
 }
 

protocols/msn/ns.c

@@ -394 +394 @@
 
                                         if (inbox && folders) {
-                                                imcb_log(ic,
-                                                         "INBOX contains %s new messages, plus %s messages in other folders.", inbox,
-                                                         folders);
+                                                char *msg = g_strdup_printf(
+                                                        "INBOX contains %s new messages, plus %s messages in other folders.", inbox,
+                                                        folders);
+                                                imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), msg, 0, 0);
+                                                g_free(msg);
                                         }
 
@@ -408 +410 @@
 
                                         if (from && fromname) {
-                                                imcb_log(ic, "Received an e-mail message from %s <%s>.", fromname,
-                                                         from);
+                                                char *msg = g_strdup_printf("Received an e-mail message from %s <%s>.",
+                                                                            fromname, from);
+                                                imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), msg, 0, 0);
+                                                g_free(msg);
                                         }
 

protocols/purple/purple.c

@@ -238 +238 @@
                 s = set_add(&acc->set, "mail_notifications", "false", set_eval_bool, acc);
                 s->flags |= ACC_SET_OFFLINE_ONLY;
+
+                s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);
+                s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
         }
 
@@ -332 +335 @@
 
         purple_account_set_enabled(pd->account, "BitlBee", TRUE);
+
+        if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "notify_handle")) {
+                imcb_add_buddy(ic, set_getstr(&acc->set, "notify_handle"), NULL);
+        }
 }
 
@@ -1254 +1261 @@
 {
         struct im_connection *ic = purple_ic_by_gc(gc);
-
-        imcb_log(ic, "Received e-mail from %s for %s: %s <%s>", from, to, subject, url);
+        char *msg = g_strdup_printf("Received e-mail from %s for %s: %s <%s>", from, to, subject, url);
+
+        imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), msg, 0, 0);
+        g_free(msg);
 
         return NULL;

protocols/yahoo/yahoo.c

@@ -123 +123 @@
 static void byahoo_init(account_t *acc)
 {
-        set_add(&acc->set, "mail_notifications", "false", set_eval_bool, acc);
+        set_t *s;
+
+        s = set_add(&acc->set, "mail_notifications", "false", set_eval_bool, acc);
+        s->flags |= ACC_SET_OFFLINE_ONLY;
+
+        s = set_add(&acc->set, "notify_handle", NULL, NULL, acc);
+        s->flags |= ACC_SET_OFFLINE_ONLY | SET_NULL_OK;
 
         acc->flags |= ACC_FLAG_AWAY_MESSAGE | ACC_FLAG_STATUS_MESSAGE;
@@ -145 +151 @@
         yd->y2_id = yahoo_init(acc->user, acc->pass);
         yahoo_login(yd->y2_id, yd->current_status);
+
+        if (set_getbool(&acc->set, "mail_notifications") && set_getstr(&acc->set, "notify_handle")) {
+                imcb_add_buddy(ic, set_getstr(&acc->set, "notify_handle"), NULL);
+        }
 }
 
@@ -949 +959 @@
 {
         struct im_connection *ic = byahoo_get_ic_by_id(id);
-
-        if (!set_getbool(&ic->acc->set, "mail_notifications")) {
-                ; /* The user doesn't care. */
-        } else if (from && subj) {
-                imcb_log(ic, "Received e-mail message from %s with subject `%s'", from, subj);
-        } else if (cnt > 0) {
-                imcb_log(ic, "Received %d new e-mails", cnt);
+        char *msg;
+
+        if (set_getbool(&ic->acc->set, "mail_notifications")) {
+                if (from && subj) {
+                        msg = g_strdup_printf("Received e-mail message from %s with subject `%s'", from, subj);
+                } else if (cnt > 0) {
+                        msg = g_strdup_printf("Received %d new e-mails", cnt);
+                }
+
+                imcb_notify_email(ic, set_getstr(&ic->acc->set, "notify_handle"), msg, 0, 0);
+                g_free(msg);
         }
 }