yong-purple_ruby 0.4.0 → 0.4.1

data/Manifest.txt

@@ -1,6 +1,7 @@
 ext/extconf.rb
 ext/purple_ruby.c
 ext/reconnect.c
+ext/account.c
 examples/purplegw_example.rb
 Manifest.txt
 History.txt

data/Rakefile

@@ -3,7 +3,7 @@ require 'hoe'
 
 EXT = "ext/ruburple_ext.#{Hoe::DLEXT}"
 
-Hoe.new('purple_ruby', '0.4.0') do |p|
+Hoe.new('purple_ruby', '0.4.1') do |p|
   p.author = 'yong'
   p.email = 'yong@intridea.com'
   p.url = 'http://www.intridea.com'

data/examples/purplegw_example.rb

@@ -52,11 +52,15 @@ class PurpleGWExample
     end
     
     #request for authorization when someone adds this account to their buddy list
-    PurpleRuby.watch_authorize do |acc, remote_user, message| 
-      puts "authorize request: #{acc.username} #{remote_user} #{message}"
+    PurpleRuby.watch_new_buddy do |acc, remote_user, message| 
+      puts "new buddy: #{acc.username} #{remote_user} #{message}"
       true #'true': accept; 'false': deny
     end
     
+    PurpleRuby.watch_notify_message do |type, title, primary, secondary|
+      puts "notification: #{type}, #{title}, #{primary}, #{secondary}"
+    end
+    
     #listen a tcp port, parse incoming data and send it out.
     #We assume the incoming data is in the following format (separated by comma):
     #<protocol>,<user>,<message>

data/ext/account.c

@@ -0,0 +1,163 @@
+/*
+ * adopted from finch's gntaccount.c
+ */
+
+/* finch
+ *
+ * Finch is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02111-1301  USA
+ */
+
+#include <libpurple/account.h>
+#include <libpurple/conversation.h>
+#include <libpurple/core.h>
+#include <libpurple/debug.h>
+#include <libpurple/cipher.h>
+#include <libpurple/eventloop.h>
+#include <libpurple/ft.h>
+#include <libpurple/log.h>
+#include <libpurple/notify.h>
+#include <libpurple/prefs.h>
+#include <libpurple/prpl.h>
+#include <libpurple/pounce.h>
+#include <libpurple/request.h>
+#include <libpurple/savedstatuses.h>
+#include <libpurple/sound.h>
+#include <libpurple/status.h>
+#include <libpurple/util.h>
+#include <libpurple/whiteboard.h>
+#include <libpurple/network.h>
+
+#include <ruby.h>
+
+extern ID CALL;
+extern VALUE cAccount;
+extern VALUE new_buddy_handler;
+
+static char *
+make_info(PurpleAccount *account, PurpleConnection *gc, const char *remote_user,
+          const char *id, const char *alias, const char *msg)
+{
+	if (msg != NULL && *msg == '\0')
+		msg = NULL;
+
+	return g_strdup_printf(_("%s%s%s%s has made %s his or her buddy%s%s"),
+	                       remote_user,
+	                       (alias != NULL ? " ("  : ""),
+	                       (alias != NULL ? alias : ""),
+	                       (alias != NULL ? ")"   : ""),
+	                       (id != NULL
+	                        ? id
+	                        : (purple_connection_get_display_name(gc) != NULL
+	                           ? purple_connection_get_display_name(gc)
+	                           : purple_account_get_username(account))),
+	                       (msg != NULL ? ": " : "."),
+	                       (msg != NULL ? msg  : ""));
+}
+
+static void
+notify_added(PurpleAccount *account, const char *remote_user,
+			const char *id, const char *alias,
+			const char *msg)
+{
+	char *buffer;
+	PurpleConnection *gc;
+
+	gc = purple_account_get_connection(account);
+
+	buffer = make_info(account, gc, remote_user, id, alias, msg);
+
+	purple_notify_info(NULL, NULL, buffer, NULL);
+
+	g_free(buffer);
+}
+
+static void
+request_add(PurpleAccount *account, const char *remote_user,
+		  const char *id, const char *alias,
+		  const char *message)
+{
+	if (new_buddy_handler != Qnil) {
+    VALUE *args = g_new(VALUE, 3);
+    args[0] = Data_Wrap_Struct(cAccount, NULL, NULL, account);
+    args[1] = rb_str_new2(NULL == remote_user ? "" : remote_user);
+    args[2] = rb_str_new2(NULL == message ? "" : message);
+    VALUE v = rb_funcall2((VALUE)new_buddy_handler, CALL, 3, args);
+    
+    if (v != Qnil && v != Qfalse) {
+      PurpleConnection *gc = purple_account_get_connection(account);
+	    if (g_list_find(purple_connections_get_all(), gc))
+	    {
+		    purple_blist_request_add_buddy(account, remote_user,
+									     NULL, alias);
+	    }
+    }
+    
+    g_free(args);
+  }
+}
+
+static void *request_authorize(PurpleAccount *account,
+                        const char *remote_user,
+                        const char *id,
+                        const char *alias,
+                        const char *message,
+                        gboolean on_list,
+                        PurpleAccountRequestAuthorizationCb auth_cb,
+                        PurpleAccountRequestAuthorizationCb deny_cb,
+                        void *user_data)
+{
+  if (new_buddy_handler != Qnil) {
+    VALUE *args = g_new(VALUE, 3);
+    args[0] = Data_Wrap_Struct(cAccount, NULL, NULL, account);
+    args[1] = rb_str_new2(NULL == remote_user ? "" : remote_user);
+    args[2] = rb_str_new2(NULL == message ? "" : message);
+    VALUE v = rb_funcall2((VALUE)new_buddy_handler, CALL, 3, args);
+    
+    if (v != Qnil && v != Qfalse) {
+      auth_cb(user_data);
+	    purple_blist_request_add_buddy(account, remote_user, NULL, alias);
+    } else {
+      deny_cb(user_data);
+    }
+    
+    g_free(args);
+  }
+  
+  return NULL;
+}
+
+static void
+request_close(void *uihandle)
+{
+	purple_request_close(PURPLE_REQUEST_ACTION, uihandle);
+}
+
+PurpleAccountUiOps account_ops =
+{
+	notify_added,
+	NULL,
+	request_add,
+	request_authorize,
+	request_close,
+	NULL,
+	NULL,
+	NULL,
+	NULL
+};
+

data/ext/purple_ruby.c

@@ -120,7 +120,7 @@ static PurpleEventLoopUiOps glib_eventloops =
 };
 
 static VALUE cPurpleRuby;
-static VALUE cAccount;
+VALUE cAccount;
 const char* UI_ID = "purplegw";
 static GMainLoop *main_loop = NULL;
 static VALUE im_handler = Qnil;
@@ -128,10 +128,11 @@ static VALUE signed_on_handler = Qnil;
 static VALUE connection_error_handler = Qnil;
 static VALUE notify_message_handler = Qnil;
 static VALUE request_handler = Qnil;
-static VALUE authorize_handler = Qnil;
+VALUE new_buddy_handler = Qnil;
 static GHashTable* data_hash_table = NULL;
 static GHashTable* fd_hash_table = NULL;
-static ID CALL;
+ID CALL;
+extern PurpleAccountUiOps account_ops;
 
 extern void
 finch_connection_report_disconnect(PurpleConnection *gc, PurpleConnectionError reason,
@@ -179,36 +180,6 @@ static void write_conv(PurpleConversation *conv, const char *who, const char *al
   }
 }
 
-static void *request_authorize(PurpleAccount *account,
-                        const char *remote_user,
-                        const char *id,
-                        const char *alias,
-                        const char *message,
-                        gboolean on_list,
-                        PurpleAccountRequestAuthorizationCb auth_cb,
-                        PurpleAccountRequestAuthorizationCb deny_cb,
-                        void *user_data)
-{
-  if (authorize_handler != Qnil) {
-    VALUE *args = g_new(VALUE, 3);
-    args[0] = Data_Wrap_Struct(cAccount, NULL, NULL, account);
-    args[1] = rb_str_new2(remote_user);
-    args[2] = rb_str_new2(message);
-    VALUE v = rb_funcall2((VALUE)authorize_handler, CALL, 3, args);
-    
-    if (v != Qnil && v != Qfalse) {
-      auth_cb(user_data);
-	    purple_blist_request_add_buddy(account, remote_user, NULL, alias);
-    } else {
-      deny_cb(user_data);
-    }
-    
-    g_free(args);
-  }
-  
-  return NULL;
-}
-
 static PurpleConversationUiOps conv_uiops = 
 {
 	NULL,                      /* create_conversation  */
@@ -247,19 +218,6 @@ static PurpleConnectionUiOps connection_ops =
 	NULL
 };
 
-static PurpleAccountUiOps account_ops =
-{
-	NULL, /*notify_added*/
-	NULL,
-	NULL, /*request_add*/
-	request_authorize,
-	NULL, /*request_close*/
-	NULL,
-	NULL,
-	NULL,
-	NULL
-};
-
 static void* notify_message(PurpleNotifyMsgType type, 
 	const char *title,
 	const char *primary, 
@@ -416,11 +374,11 @@ static VALUE watch_request(VALUE self)
   return request_handler;
 }
 
-static VALUE watch_authorize(VALUE self)
+static VALUE watch_new_buddy(VALUE self)
 {
   purple_accounts_set_ui_ops(&account_ops);
-  authorize_handler = rb_block_proc();
-  return authorize_handler;
+  new_buddy_handler = rb_block_proc();
+  return new_buddy_handler;
 }
 
 static void signed_on(PurpleConnection* connection)
@@ -717,7 +675,7 @@ void Init_purple_ruby()
   rb_define_singleton_method(cPurpleRuby, "watch_incoming_im", watch_incoming_im, 0);
   rb_define_singleton_method(cPurpleRuby, "watch_notify_message", watch_notify_message, 0);
   rb_define_singleton_method(cPurpleRuby, "watch_request", watch_request, 0);
-  rb_define_singleton_method(cPurpleRuby, "watch_authorize", watch_authorize, 0);
+  rb_define_singleton_method(cPurpleRuby, "watch_new_buddy", watch_new_buddy, 0);
   rb_define_singleton_method(cPurpleRuby, "watch_incoming_ipc", watch_incoming_ipc, 2);
   rb_define_singleton_method(cPurpleRuby, "login", login, 3);
   rb_define_singleton_method(cPurpleRuby, "main_loop_run", main_loop_run, 0);

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: yong-purple_ruby
 version: !ruby/object:Gem::Version 
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors: 
 - yong
@@ -36,6 +36,7 @@ files:
 - ext/extconf.rb
 - ext/purple_ruby.c
 - ext/reconnect.c
+- ext/account.c
 - examples/purplegw_example.rb
 - Manifest.txt
 - History.txt