Changeset 2ce12de

Timestamp:

Jul 28, 2009, 10:53:47 PM (15 years ago)

Author:

Alejandro R. Sedeño <asedeno@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

57ba9f1

Parents:

c1d9441

git-author:

Alejandro R. Sedeño <asedeno@mit.edu> (07/28/09 22:45:22)

git-committer:

Alejandro R. Sedeño <asedeno@mit.edu> (07/28/09 22:53:47)

Message:

Tab Completion for jwrite

File:

• perl/modules/Jabber/lib/BarnOwl/Module/Jabber.pm (modified) (11 diffs)

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

@@ -19 +19 @@
 use BarnOwl::Module::Jabber::Connection;
 use BarnOwl::Module::Jabber::ConnectionManager;
+use BarnOwl::Completion::Util qw(complete_flags);
 
 use Authen::SASL qw(Perl);
@@ -62 +63 @@
 $conn ||= BarnOwl::Module::Jabber::ConnectionManager->new;
 our %vars;
+our %completion_jids;
 
 sub onStart {
@@ -164 +166 @@
 
     $blistStr .= sprintf '%-15s %s', $name, $buddy->GetJID();
+    $completion_jids{$name} = 1;
+    $completion_jids{$buddy->GetJID()} = 1;
 
     if ($res) {
@@ -427 +431 @@
                 BarnOwl::error( "Error in connect: " . join( " ", @result ) );
             } else {
-                $conn->getRosterFromJID($jidStr)->fetch();
+                my $roster = $conn->getRosterFromJID($jidStr);
+                $roster->fetch();
                 $client->PresenceSend( priority => 1 );
                 my $fullJid = $client->{SESSION}->{FULLJID} || $jidStr;
@@ -437 +442 @@
                 #queue_admin_msg("Connected to jabber as $fullJid ($client->{fileno})");
                 BarnOwl::add_dispatch($client->{fileno}, sub { $client->OwlProcess() });
+
+                # populate completion from roster.
+                for my $buddy ( $roster->jids('all') ) {
+                    my %jq  = $roster->query($buddy);
+                    my $name = $jq{name} || $buddy->GetUserID();
+                    $completion_jids{$name} = 1;
+                    $completion_jids{$buddy->GetJID()} = 1;
+                }
             }
         }
@@ -647 +660 @@
                                                    MaxChars => 0
                                                   });
+    $completion_jids{$muc} = 1;
     return;
 }
@@ -701 +715 @@
 
     my $presence = "JIDs present in " . $m->BaseJID;
+    $completion_jids{$m->BaseJID} = 1;
     if($m->Anonymous) {
         $presence .= " [anonymous MUC]";
@@ -875 +890 @@
     $name = "" unless (1 == scalar(@ARGV));
 
+    $completion_jids{$baseJID} = 1;
+    $completion_jids{$name} = 1 if $name;
+
     foreach my $to (@ARGV) {
         my %jq  = $roster->query($to);
@@ -1057 +1075 @@
 
 sub process_presence_available {
-    return unless (BarnOwl::getvar('jabber:show_logins') eq 'on');
     my ( $sid, $p ) = @_;
     my $from = $p->GetFrom('jid')->GetJID('base');
+    $completion_jids{$from} = 1;
+    return unless (BarnOwl::getvar('jabber:show_logins') eq 'on');
     my $to = $p->GetTo();
     my $type = $p->GetType();
@@ -1209 +1228 @@
               if ($connection->FindMUC(jid => $to));
         }
+
+        # Populate completion.
+        if ($dir eq 'in') {
+            $completion_jids{ $props{sender} }= 1;
+        }
+        else {
+            $completion_jids{ $props{recipient} } = 1;
+        }
     }
     elsif ( $jtype eq 'groupchat' ) {
         my $nick = $props{nick} = $from->GetResource();
         my $room = $props{room} = $from->GetJID('base');
+        $completion_jids{$room} = 1;
 
         $props{sender} = $nick || $room;
@@ -1384 +1412 @@
 }
 
+################################################################################
+### Completion
+
+sub complete_user_or_muc { return keys %completion_jids; }
+sub complete_account { return $conn->getJIDs(); }
+
+sub complete_jwrite {
+    my $ctx = shift;
+    return complete_flags($ctx,
+                          [qw(-t -i -s)],
+                          {
+                              "-a" => \&complete_account,
+                          },
+                          \&complete_user_or_muc }
+        );
+}
+
+BarnOwl::Completion::register_completer(jwrite => sub { BarnOwl::Module::Jabber::complete_jwrite(@_));
+
 1;