Changeset 830864d for protocols

Timestamp:

2015-03-15T09:31:18Z (10 years ago)

Author:

dequis <dx@…>

Children:

ac6855b3

Parents:

c0e4c22

git-author:

dequis <dx@…> (05-03-15 10:31:24)

git-committer:

dequis <dx@…> (15-03-15 09:31:18)

Message:

WIP placeholder channels with hipchat implementation

i was going to clean this up and split in two commits but uhhh...
maybe some other day, i'm tired now

not very tested and i'm not 100% happy about the design, but sucks way
less than what i had in the hip-cat branch

feedback still appreciated.

this adds channels to the channel list without creating groupchats for
them, allowing users to /join them. what the hip-cat branch did before
but with proper api and hopefully less dumb behavior

it still 'leaks' them intentionally, just like it did before, but now it
prevents saving them to the xml so yay

also slightly improved channel name generation, refactored
bee_irc_chat_name_hint into three or four functions, and so on

Location:

protocols

Files:

• bee.h (modified) (2 diffs)
• bee_chat.c (modified) (1 diff)
• jabber/hipchat.c (modified) (2 diffs)

protocols/bee.h

@@ -115 +115 @@
         gboolean (*chat_new)(bee_t *bee, struct groupchat *c);
         gboolean (*chat_free)(bee_t *bee, struct groupchat *c);
+        gboolean (*chat_placeholder_new)(bee_t *bee, struct im_connection *ic, const char *handle,
+                                         const char *name, const char *topic);
         /* System messages of any kind. */
         gboolean (*chat_log)(bee_t *bee, struct groupchat *c, const char *text);
@@ -165 +167 @@
  *   user, too. */
 G_MODULE_EXPORT struct groupchat *imcb_chat_new(struct im_connection *ic, const char *handle);
+G_MODULE_EXPORT void imcb_chat_placeholder_new(struct im_connection *ic, const char *handle, const char *name,
+                                               const char *topic);
 G_MODULE_EXPORT void imcb_chat_name_hint(struct groupchat *c, const char *name);
 G_MODULE_EXPORT void imcb_chat_free(struct groupchat *c);

protocols/bee_chat.c

@@ -54 +54 @@
 }
 
+void imcb_chat_placeholder_new(struct im_connection *ic, const char *handle, const char *name, const char *topic)
+{
+        bee_t *bee = ic->bee;
+
+        if (bee->ui->chat_placeholder_new) {
+                bee->ui->chat_placeholder_new(bee, ic, handle, name, topic);
+        }
+}
+
 void imcb_chat_name_hint(struct groupchat *c, const char *name)
 {

protocols/jabber/hipchat.c

@@ -132 +132 @@
         while ((c = xt_find_node(c, "item"))) {
                 struct xt_node *c2;
-                struct groupchat *gc;
-                struct irc_channel *ircc;
                 char *topic = NULL;
-                gboolean new_room = FALSE;
                 char *jid = xt_find_attr(c, "jid");
                 char *name = xt_find_attr(c, "name");
@@ -146 +143 @@
                 }
 
-                gc = bee_chat_by_title(ic->bee, ic, jid);
-                if (!gc) {
-                        gc = imcb_chat_new(ic, jid);
-                        new_room = TRUE;
-                }
-                imcb_chat_name_hint(gc, name);
-                imcb_chat_topic(gc, NULL, topic, 0);
-
-                ircc = gc->ui_data;
-                set_setstr(&ircc->set, "account", ic->acc->tag);
-                set_setstr(&ircc->set, "room", jid);
-                set_setstr(&ircc->set, "chat_type", "room");
-
-                if (new_room) {
-                        /* This cleans everything but leaves the irc channel around,
-                         * since it just graduated to a room.*/
-                        imcb_chat_free(gc);
-                }
-
+                imcb_chat_placeholder_new(ic, jid, name, topic);
                 c = c->next;
         }