Changeset 89701bb

Timestamp:

Jan 23, 2012, 3:34:06 PM (12 years ago)

Author:

GitHub Merge Button <merge-button@github.com>

Parents:

389d487 (diff), 8da4e96 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge 8da4e9656e73162249189dccadc5fe0922d88508 into 389d48749c4eb68f218e9fd6faf953ba542bfb75

Files:

• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (4 diffs)
• owl.c (modified) (2 diffs)
• zwrite.c (modified) (5 diffs)

perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm

@@ -171 +171 @@
 our $showOffline = 0;
 
+sub blist_getBuddyStatus {
+    my $jid = shift;
+    my $buddy = shift;
+    my $roster = $conn->getRosterFromJID($jid);
+    my %jq  = $roster->query($buddy);
+    my $res = $roster->resource($buddy);
+    if ($res) {
+        my %rq = $roster->resourceQuery( $buddy, $res );
+        return $rq{show} ? $rq{show} : 'online';
+    } else {
+        return "unknown";
+    }
+}
+
 sub blist_listBuddy {
     my $roster = shift;
@@ -303 +317 @@
             summary => "Show your Jabber roster.",
             usage   => "jlist"
+        }
+    );
+    BarnOwl::new_command(
+        jabber_get_buddy_status => \&cmd_jabber_get_buddy_status,
+        {
+            summary => "Get the status of a given buddy.",
+            usage   => "jabber_get_buddy_status [-a account] buddy"
         }
     );
@@ -859 +880 @@
 }
 
+sub cmd_jabber_get_buddy_status {
+    my $cmd = shift;
+    local @ARGV = @_;
+    my $getopt = Getopt::Long::Parser->new;
+    my ($jid, $buddy);
+
+    $getopt->configure('no_getopt_compat');
+    $getopt->getoptions(
+        'account=s' => \$jid,
+    );
+    $jid ||= defaultJID();
+    if ($jid) {
+        $jid = resolveConnectedJID($jid);
+        return unless $jid;
+    }
+    else {
+        die("You must specify an account with -a <jid>\n");
+    }
+    $buddy = shift @ARGV;
+    if(!$buddy) {
+        die("You must specify a JID to get the status of.\n");
+    }
+    my $buddy_jid = resolveDestJID($buddy, $jid);
+    return blist_getBuddyStatus($jid, $buddy_jid);
+}
+
 
 sub jroster_sub {
@@ -1482 +1529 @@
 }
 
+sub complete_jabber_get_buddy_status {
+    my $ctx = shift;
+    return complete_flags($ctx,
+                          [qw()],
+                          {
+                              "-a" => \&complete_account,
+                          },
+                          \&complete_user_or_muc
+        );
+}
+
 BarnOwl::Completion::register_completer(jwrite => sub { BarnOwl::Module::Jabber::complete_jwrite(@_) });
+BarnOwl::Completion::register_completer(jabber_get_buddy_status => sub { BarnOwl::Module::Jabber::complete_jabber_get_buddy_status(@_) });
 
 1;

owl.c

@@ -585 +585 @@
   );
 
+  owl_function_debugmsg("startup: setting context interactive");
+
+  owl_global_pop_context(&g);
+  owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
+
   /* process the startup file */
   owl_function_debugmsg("startup: processing startup file");
@@ -596 +601 @@
       owl_function_error("No such style: %s", owl_global_get_default_style(&g));
 
-  owl_function_debugmsg("startup: setting context interactive");
-
-  owl_global_pop_context(&g);
-  owl_global_push_context(&g, OWL_CTX_INTERACTIVE|OWL_CTX_RECV, NULL, "recv", NULL);
-
   source = owl_window_redraw_source_new();
   g_source_attach(source, NULL);

zwrite.c

@@ -4 +4 @@
 {
   owl_zwrite *z = g_new(owl_zwrite, 1);
-  if (owl_zwrite_create_from_line(z, line) < 0) {
-    owl_zwrite_delete(z);
+  if (owl_zwrite_create_from_line(z, line) != 0) {
+    g_free(z);
     return NULL;
   }
@@ -14 +14 @@
 {
   owl_zwrite *z = g_new(owl_zwrite, 1);
-  if (owl_zwrite_create(z, argc, argv) < 0) {
-    owl_zwrite_delete(z);
+  if (owl_zwrite_create(z, argc, argv) != 0) {
+    g_free(z);
     return NULL;
   }
@@ -135 +135 @@
 
   if (badargs) {
+    owl_zwrite_cleanup(z);
     return(-1);
   }
@@ -142 +143 @@
       z->recips->len == 0) {
     owl_function_error("You must specify a recipient for zwrite");
+    owl_zwrite_cleanup(z);
     return(-1);
   }
@@ -267 +269 @@
   owl_zwrite z;
   int rv;
-  rv=owl_zwrite_create_from_line(&z, cmd);
-  if (rv) return(rv);
+  rv = owl_zwrite_create_from_line(&z, cmd);
+  if (rv != 0) return rv;
   if (!owl_zwrite_is_message_set(&z)) {
     owl_zwrite_set_message(&z, msg);