Changeset 71c4bb6

Timestamp:

2010-12-13T02:22:20Z (14 years ago)

Author:

Miklos Vajna <vmiklos@…>

Branches:

master

Children:

451f121

Parents:

77aa416

Message:

Adding /ctcp call|hangup support

Location:

skype

Files:

• README (modified) (1 diff)
• skype.c (modified) (4 diffs)

skype/README

@@ -307 +307 @@
   communication is encrypted.
 
-- Managing outgoing calls (with call duration at the end, including
-  SkypeOut calls if you use a phone number instead of a nick):
-
-  * `account skype set call nick`
-  * `account skype set -del skype/call`
+- Managing outgoing calls (with call duration at the end):
+
+  * `/ctcp nick call`
+  * `/ctcp nick hangup`
+
+- Managing outgoing SkypeOut or conference calls:
+
+  * `account skype set call +18005551234`
+  * `account skype set call nick1 nick2`
+  * `account skype set -del call`
 
 - Managing incoming calls via questions, just like when you add / remove

skype/skype.c

@@ -1118 +1118 @@
 }
 
+static void skype_call(struct im_connection *ic, char *value) {
+        char *nick = g_strdup(value);
+        char *ptr = strchr(nick, '@');
+
+        if (ptr)
+                *ptr = '\0';
+        skype_printf(ic, "CALL %s", nick);
+        g_free(nick);
+}
+
+static void skype_hangup(struct im_connection *ic)
+{
+        struct skype_data *sd = ic->proto_data;
+
+        if (sd->call_id) {
+                skype_printf(ic, "SET CALL %s STATUS FINISHED",
+                                sd->call_id);
+                g_free(sd->call_id);
+                sd->call_id = 0;
+        } else
+                imcb_error(ic, "There are no active calls currently.");
+}
+
 static char *skype_set_call(set_t *set, char *value)
 {
         account_t *acc = set->data;
         struct im_connection *ic = acc->ic;
-        struct skype_data *sd = ic->proto_data;
-        char *nick, *ptr;
+        char *nick;
 
         if (value) {
@@ -1131 +1153 @@
                 /* We are starting a call */
                 if (u)
-                        nick = g_strdup(u->handle);
+                        nick = u->handle;
                 else
 #endif
-                        nick = g_strdup(value);
-                ptr = strchr(nick, '@');
-                if (ptr)
-                        *ptr = '\0';
-
-                skype_printf(ic, "CALL %s", nick);
-                g_free(nick);
-        } else {
-                /* We are ending a call */
-                if (sd->call_id) {
-                        skype_printf(ic, "SET CALL %s STATUS FINISHED",
-                                sd->call_id);
-                        g_free(sd->call_id);
-                        sd->call_id = NULL;
-                } else
-                        imcb_error(ic, "There are no active calls currently.");
-        }
+                        nick = value;
+                skype_call(ic, nick);
+        } else
+                skype_hangup(ic);
         return value;
 }
@@ -1314 +1323 @@
 }
 
+#if BITLBEE_VERSION_CODE >= BITLBEE_VER(3, 0, 1)
+GList *skype_buddy_action_list( bee_user_t *bu )
+{
+        static GList *ret = NULL;
+
+        if (ret == NULL)
+        {
+                static const struct buddy_action ba[3] = {
+                        {"CALL", "Initiate a call" },
+                        {"HANGUP", "Hang up a call" },
+                };
+
+                ret = g_list_prepend(ret, (void*) ba + 0);
+        }
+
+        return ret;
+}
+
+void *skype_buddy_action( struct bee_user *bu, const char *action, char * const args[], void *data )
+{
+        if (!g_strcasecmp(action, "CALL")) {
+                skype_call(bu->ic, bu->handle);
+        } else if (!g_strcasecmp(action, "HANGUP")) {
+                skype_hangup(bu->ic);
+        }
+
+        return NULL;
+}
+#endif
+
 void init_plugin(void)
 {
@@ -1335 +1374 @@
         ret->handle_cmp = g_strcasecmp;
         ret->chat_topic = skype_chat_topic;
+#if BITLBEE_VERSION_CODE >= BITLBEE_VER(3, 0, 1)
+        ret->buddy_action_list = skype_buddy_action_list;
+        ret->buddy_action = skype_buddy_action;
+#endif
         register_protocol(ret);
 }