Changeset f8feb8a

Timestamp:

2015-05-07T10:33:06Z (10 years ago)

Author:

Wilmer van der Gaast <wilmer@…>

Children:

0ace810

Parents:

e9face7

Message:

add_buddy and remove_buddy should no longer be mandatory.

Files:

• irc_channel.c (modified) (2 diffs)
• protocols/rpc/rpc.c (modified) (1 diff)
• python/implugin.py (modified) (2 diffs)
• root_commands.c (modified) (2 diffs)

irc_channel.c

@@ -724 +724 @@
         }
 
+        if (!bu->ic->acc->prpl->add_buddy) {
+                irc_send_num(ic->irc, 482, "%s :IM protocol does not support contact list modification", ic->name);
+                return FALSE;
+        }
+
         bu->ic->acc->prpl->add_buddy(bu->ic, bu->handle,
                                      icc->group ? icc->group->name : NULL);
@@ -741 +746 @@
         if (icc->type != IRC_CC_TYPE_GROUP) {
                 irc_send_num(ic->irc, 482, "%s :Kicks are only possible to fill_by=group channels", ic->name);
+                return;
+        }
+
+        if (!bu->ic->acc->prpl->remove_buddy) {
+                irc_send_num(ic->irc, 482, "%s :IM protocol does not support contact list modification", ic->name);
                 return;
         }

protocols/rpc/rpc.c

@@ -883 +883 @@
         RPC_ADD_OPT_FUNC(set_away);
         RPC_ADD_OPT_FUNC(send_typing);
-        RPC_ADD_FUNC(add_buddy);     /* Consider making these two optional? */
-        RPC_ADD_FUNC(remove_buddy);
+        RPC_ADD_OPT_FUNC(add_buddy);
+        RPC_ADD_OPT_FUNC(remove_buddy);
         RPC_ADD_OPT_FUNC(add_permit);
         RPC_ADD_OPT_FUNC(add_deny);

python/implugin.py

@@ -16 +16 @@
 # BitlBee which functions are actually implemented so omitted features
 # will be disabled, but note that some/many functions are simply mandatory.
-# (Currently login/-out, buddy_msg, add/remove_buddy.)
+# (Currently login/-out, buddy_msg.)
 SUPPORTED_FUNCTIONS = [
         'login', 'keepalive', 'logout', 'buddy_msg', 'set_away',
@@ -119 +119 @@
                 self.bee.error("Ok bye!")
 
-        def add_buddy(self, handle, group):
-                return False
-        
-        def remove_buddy(self, handle, group):
-                return False
-        
         def buddy_msg(self, handle, msg, flags):
                 feed = self.feeds[handle]

root_commands.c

@@ -647 +647 @@
                 irc_rootmsg(irc, "That account is not on-line");
                 return;
+        } else if (add_on_server && !a->prpl->add_buddy) {
+                irc_rootmsg(irc, "IM protocol does not support contact list modification");
+                return;
         }
 
@@ -717 +720 @@
         s = g_strdup(bu->handle);
 
-        bu->ic->acc->prpl->remove_buddy(bu->ic, bu->handle, NULL);
+        if (bu->ic->acc->prpl->remove_buddy) {
+                bu->ic->acc->prpl->remove_buddy(bu->ic, bu->handle, NULL);
+        } else {
+                irc_rootmsg(irc, "IM protocol does not support contact list modification, "
+                                 "removal will likely not be permanent");
+        }
+
         nick_del(bu);
         if (g_slist_find(irc->users, iu)) {