[326] in BarnOwl Developers
[D-O-H] r472 - / trunk/owl/perl/modules
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:04:57 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
To: dirty-owl-hackers@mit.edu
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Sun, 24 Dec 2006 18:00:48 -0500 (EST)
Author: nelhage
Date: 2006-12-24 18:00:27 -0500 (Sun, 24 Dec 2006)
New Revision: 472
Modified:
/
trunk/owl/perl/modules/jabber.pl
Log:
r15867@phanatique: nelhage | 2006-12-24 17:59:01 -0500
Some cleanup of the jabber.pl style
Property changes on:
___________________________________________________________________
Name: svk:merge
- 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24121
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:15860
+ 6122c8b4-0e12-0410-9533-8bcd7c66c992:/local/dirty-owl-hacks:24121
6aa88b72-b502-0410-8cb4-a5dd0230fb79:/owl-local:1356
bb873fd7-8e23-0410-944a-99ec44c633eb:/local/d-o-h:15867
Modified: trunk/owl/perl/modules/jabber.pl
===================================================================
--- trunk/owl/perl/modules/jabber.pl 2006-12-24 19:15:05 UTC (rev 471)
+++ trunk/owl/perl/modules/jabber.pl 2006-12-24 23:00:27 UTC (rev 472)
@@ -38,29 +38,28 @@
my $self = shift;
my $jidStr = shift;
- $self->{Client}->{$jidStr} =
- Net::Jabber::Client->new(
- debuglevel => owl::getvar('debug') eq 'on' ? 1 : 0,
- debugfile => 'jabber.log'
- );
- my $refConn = \$self->{Client}->{$jidStr};
- $self->{Roster}->{$jidStr} = $$refConn->Roster();
- return $refConn;
+ my $client = Net::Jabber::Client->new(
+ owl::getvar('debug') eq 'on'
+ ? (debuglevel => ? 1 : 0,
+ debugfile => 'jabber.log')
+ : ()
+ );
+
+ $self->{Client}->{$jidStr} = $client;
+ $self->{Roster}->{$jidStr} = $client->Roster();
+ return $client;
}
sub removeConnection {
my $self = shift;
my $jidStr = shift;
- my $ret = 0;
- foreach my $j ( keys %{ $self->{Client} } ) {
- if ($j eq $jidStr) {
- $self->{Client}->{$j}->Disconnect();
- delete $self->{Roster}->{$j};
- delete $self->{Client}->{$j};
- $ret = 1;
- }
- }
- return $ret;
+ return 0 unless exists $self->{Client}->{$jidStr};
+
+ $self->{Client}->{$jidStr}->Disconnect();
+ delete $self->{Roster}->{$jidStr};
+ delete $self->{Client}->{$jidStr};
+
+ return 1;
}
sub connected {
@@ -76,10 +75,7 @@
sub jidExists {
my $self = shift;
my $jidStr = shift;
- foreach my $j ( keys %{ $self->{Client} } ) {
- return 1 if ($j eq $jidStr);
- }
- return 0;
+ return exists $self->{Client}->{$jidStr};
}
sub sidExists {
@@ -91,47 +87,35 @@
return 0;
}
-sub getConnRefFromSid {
+sub getConnectionFromSid {
my $self = shift;
my $sid = shift;
- foreach my $j ( keys %{ $self->{Client} } ) {
- if ($self->{Client}->{$j}->{SESSION}->{id} eq $sid) {
- return \$self->{Client}->{$j};
- }
+ foreach my $c (values %{ $self->{Client} }) {
+ return $c if $c->{SESSION}->{id} eq $sid;
}
return undef;
}
-sub getConnRefFromJidStr {
+sub getConnectionFromJidStr {
my $self = shift;
my $jidStr = shift;
- foreach my $j ( keys %{ $self->{Client} } ) {
- if ($jidStr eq $j) {
- return \$self->{Client}->{$j};
- }
- }
- return undef;
+ return $self->{Client}->{$jidStr};
}
-sub getRosterRefFromSid {
+sub getRosterFromSid {
my $self = shift;
my $sid = shift;
- foreach my $j ( keys %{ $self->{Client} } ) {
- if ($self->{Client}->{$j}->{SESSION}->{id} eq $sid) {
- return \$self->{Roster}->{$j};
- }
+ foreach my $j ( $self->getJids ) {
+ return $self->{Roster}->{$j}
+ if $self->{Client}->{$j}->{SESSION}->{id} eq $sid;
}
return undef;
}
-sub getRosterRefFromJidStr {
+sub getRosterFromJidStr {
my $self = shift;
my $jidStr = shift;
- foreach my $j ( keys %{ $self->{Client} } ) {
- if ($jidStr eq $j) {
- return \$self->{Roster}->{$j};
- }
- }
+ return $self->{Roster}->{$jidStr};
return undef;
}
################################################################################
@@ -160,9 +144,9 @@
return if ( !$conn->connected() );
foreach my $jid ( $conn->getJids() ) {
- my $client = $conn->getConnRefFromJidStr($jid);
+ my $client = $conn->getConnectionFromJidStr($jid);
- my $status = $$client->Process(0);
+ my $status = $client->Process(0);
if ( !defined($status) ) {
owl::error("Jabber account $jid disconnected!");
do_logout($jid);
@@ -178,13 +162,13 @@
my $roster = shift;
my $buddy = shift;
my $blistStr .= " ";
- my %jq = $$roster->query($buddy);
- my $res = $$roster->resource($buddy);
+ my %jq = $roster->query($buddy);
+ my $res = $roster->resource($buddy);
$blistStr .= $jq{name} ? $jq{name} . "\t(" .$buddy->GetJID() . ')' : $buddy->GetJID();
if ($res) {
- my %rq = $$roster->resourceQuery( $buddy, $res );
+ my %rq = $roster->resourceQuery( $buddy, $res );
$blistStr .= " [" . ( $rq{show} ? $rq{show} : 'online' ) . "]";
$blistStr .= " " . $rq{status} if $rq{status};
$blistStr = boldify($blistStr);
@@ -208,18 +192,18 @@
$jid = resolveJID($jid);
return "" unless $jid;
my $blist = "";
- my $roster = $conn->getRosterRefFromJidStr($jid);
- if ($$roster) {
+ my $roster = $conn->getRosterFromJidStr($jid);
+ if ($roster) {
$blist .= "\n" . boldify("Jabber Roster for $jid\n");
- foreach my $group ( $$roster->groups() ) {
+ foreach my $group ( $roster->groups() ) {
$blist .= " Group: $group\n";
- foreach my $buddy ( $$roster->jids( 'group', $group ) ) {
+ foreach my $buddy ( $roster->jids( 'group', $group ) ) {
$blist .= blist_listBuddy( $roster, $buddy );
}
}
- my @unsorted = $$roster->jids('nogroup');
+ my @unsorted = $roster->jids('nogroup');
if (@unsorted) {
$blist .= " [unsorted]\n";
foreach my $buddy (@unsorted) {
@@ -343,14 +327,14 @@
#XXX Todo: Add more callbacks.
# * MUC presence handlers
- $$client->SetMessageCallBacks(
+ $client->SetMessageCallBacks(
chat => sub { owl_jabber::process_incoming_chat_message(@_) },
error => sub { owl_jabber::process_incoming_error_message(@_) },
groupchat => sub { owl_jabber::process_incoming_groupchat_message(@_) },
headline => sub { owl_jabber::process_incoming_headline_message(@_) },
normal => sub { owl_jabber::process_incoming_normal_message(@_) }
);
- $$client->SetPresenceCallBacks(
+ $client->SetPresenceCallBacks(
# available => sub { owl_jabber::process_presence_available(@_) },
# unavailable => sub { owl_jabber::process_presence_available(@_) },
subscribe => sub { owl_jabber::process_presence_subscribe(@_) },
@@ -358,13 +342,13 @@
unsubscribe => sub { owl_jabber::process_presence_unsubscribe(@_) },
unsubscribed => sub { owl_jabber::process_presence_unsubscribed(@_) });
- my $status = $$client->Connect( %{ $vars{jlogin_connhash} } );
+ my $status = $client->Connect( %{ $vars{jlogin_connhash} } );
if ( !$status ) {
$conn->removeConnection($jidStr);
owl::error("We failed to connect");
}
else {
- my @result = $$client->AuthSend( %{ $vars{jlogin_authhash} } );
+ my @result = $client->AuthSend( %{ $vars{jlogin_authhash} } );
if ( $result[0] ne 'ok' ) {
if ( !$vars{jlogin_havepass} && $result[0] == 401 ) {
@@ -378,8 +362,8 @@
"Error in connect: " . join( " ", @result ) );
}
else {
- ${ $conn->getRosterRefFromJidStr($jidStr) }->fetch();
- $$client->PresenceSend( priority => 1 );
+ ${ $conn->getRosterFromJidStr($jidStr) }->fetch();
+ $client->PresenceSend( priority => 1 );
queue_admin_msg("Connected to jabber as $jidStr");
}
}
@@ -569,7 +553,7 @@
$x->SetPassword($password);
}
- ${ $conn->getConnRefFromJidStr($jid) }->Send($presence);
+ $conn->getConnectionFromJidStr($jid)->Send($presence);
}
sub jmuc_part {
@@ -578,8 +562,7 @@
$muc = shift @args if scalar @args;
die("Usage: jmuc part {muc} [-a account]") unless $muc;
- ${ $conn->getConnRefFromJidStr($jid) }
- ->PresenceSend( to => $muc, type => 'unavailable' );
+ $conn->getConnectionFromJidStr($jid)->PresenceSend( to => $muc, type => 'unavailable' );
queue_admin_msg("$jid has left $muc.");
}
@@ -597,7 +580,7 @@
my $x = $message->NewChild('http://jabber.org/protocol/muc#user');
$x->AddInvite();
$x->GetInvite()->SetTo($invite_jid);
- ${ $conn->getConnRefFromJidStr($jid) }->Send($message);
+ $conn->getConnectionFromJidStr($jid)->Send($message);
queue_admin_msg("$jid has invited $invite_jid to $muc.");
}
@@ -612,7 +595,7 @@
my $x = $query->NewChild("jabber:x:data");
$x->SetType('submit');
- ${ $conn->getConnRefFromJidStr($jid) }->Send($iq);
+ $conn->getConnectionFromJidStr($jid)->Send($iq);
queue_admin_msg("Accepted default instant configuration for $muc");
}
@@ -676,7 +659,7 @@
my $purgeGroups = shift;
my $baseJid = baseJID($jid);
- my $roster = $conn->getRosterRefFromJidStr($jid);
+ my $roster = $conn->getRosterFromJidStr($jid);
# Adding lots of users with the same name is a bad idea.
$name = "" unless (1 == scalar(@ARGV));
@@ -685,10 +668,10 @@
$p->SetType('subscribe');
foreach my $to (@ARGV) {
- jroster_add($jid, $name, \@groups, $purgeGroups, ($to)) unless ($$roster->exists($to));
+ jroster_add($jid, $name, \@groups, $purgeGroups, ($to)) unless ($roster->exists($to));
$p->SetTo($to);
- ${ $conn->getConnRefFromJidStr($jid) }->Send($p);
+ $conn->getConnectionFromJidStr($jid)->Send($p);
queue_admin_msg("You ($baseJid) have requested a subscription to ($to)'s presence.");
}
}
@@ -704,7 +687,7 @@
$p->SetType('unsubscribe');
foreach my $to (@ARGV) {
$p->SetTo($to);
- ${ $conn->getConnRefFromJidStr($jid) }->Send($p);
+ $conn->getConnectionFromJidStr($jid)->Send($p);
queue_admin_msg("You ($baseJid) have unsubscribed from ($to)'s presence.");
}
}
@@ -716,13 +699,13 @@
my $purgeGroups = shift;
my $baseJid = baseJID($jid);
- my $roster = $conn->getRosterRefFromJidStr($jid);
+ my $roster = $conn->getRosterFromJidStr($jid);
# Adding lots of users with the same name is a bad idea.
$name = "" unless (1 == scalar(@ARGV));
foreach my $to (@ARGV) {
- my %jq = $$roster->query($to);
+ my %jq = $roster->query($to);
my $iq = new Net::XMPP::IQ;
$iq->SetType('set');
my $item = new XML::Stream::Node('item');
@@ -746,7 +729,7 @@
$item->put_attrib(jid => $to);
$item->put_attrib(name => $name) if $name;
- ${ $conn->getConnRefFromJidStr($jid) }->Send($iq);
+ $conn->getConnectionFromJidStr($jid)->Send($iq);
my $msg = "$baseJid: "
. ($name ? "$name ($to)" : "($to)")
. " is on your roster in the following groups: { "
@@ -770,7 +753,7 @@
$item->put_attrib(subscription=> 'remove');
foreach my $to (@ARGV) {
$item->put_attrib(jid => $to);
- ${ $conn->getConnRefFromJidStr($jid) }->Send($iq);
+ $conn->getConnectionFromJidStr($jid)->Send($iq);
queue_admin_msg("You ($baseJid) have removed ($to) from your roster.");
}
}
@@ -786,7 +769,7 @@
$p->SetType('subscribed');
foreach my $to (@ARGV) {
$p->SetTo($to);
- ${ $conn->getConnRefFromJidStr($jid) }->Send($p);
+ $conn->getConnectionFromJidStr($jid)->Send($p);
queue_admin_msg("($to) has been subscribed to your ($baseJid) presence.");
}
}
@@ -802,7 +785,7 @@
$p->SetType('unsubscribed');
foreach my $to (@ARGV) {
$p->SetTo($to);
- ${ $conn->getConnRefFromJidStr($jid) }->Send($p);
+ $conn->getConnectionFromJidStr($jid)->Send($p);
queue_admin_msg("($to) has been unsubscribed from your ($baseJid) presence.");
}
}
@@ -832,10 +815,10 @@
}
if ($vars{jwrite}{sid} && $conn->sidExists( $vars{jwrite}{sid} )) {
- ${ $conn->getConnRefFromSid($vars{jwrite}{sid}) }->Send($j);
+ $conn->getConnectionFromSid($vars{jwrite}{sid})->Send($j);
}
else {
- ${ $conn->getConnRefFromJidStr($vars{jwrite}{from}) }->Send($j);
+ $conn->getConnectionFromJidStr($vars{jwrite}{from})->Send($j);
}
delete $vars{jwrite};
@@ -967,7 +950,7 @@
if ($to eq $cJid->GetJID('base') ||
$to eq $cJid->GetJID('full')) {
my $reply = $p->Reply(type=>"unsubscribed");
- ${ $conn->getConnRefFromJidStr($jid) }->Send($reply);
+ $conn->getConnectionFromJidStr($jid)->Send($reply);
return;
}
}
