Changeset 31cf416

Timestamp:

Jan 11, 2007, 5:29:21 PM (18 years ago)

Author:

Nelson Elhage <nelhage@mit.edu>

Branches:

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

Children:

1dfc7df

Parents:

30c735c

git-author:

Nelson Elhage <nelhage@mit.edu> (01/11/07 17:26:44)

git-committer:

Nelson Elhage <nelhage@mit.edu> (01/11/07 17:29:21)

Message:

Some stupid Net::Jabber::MUC bugfixes.

File:

• perl/lib/Net/Jabber/MUC.pm (modified) (4 diffs)

perl/lib/Net/Jabber/MUC.pm

@@ -55 +55 @@
         $jid = Net::Jabber::JID->new($jid) unless UNIVERSAL::isa($jid, 'Net::Jabber::JID');
         $args{jid} = $jid;
-    } else if($args{room} && $args{server} && $args{nick}) {
+    } elsif($args{room} && $args{server} && $args{nick}) {
         $args{jid} = New::Jabber::JID->new($args{room}."@".$args{server}."/".$args{nick});
     } else {
@@ -166 +166 @@
     my $sid = shift;
     my $packet = shift;
-    
+
     $self->_handlePresence($packet) if $packet->GetTag() eq "presence";
 }
@@ -181 +181 @@
 
     my $type = $presence->GetType() || "available";
-    my $from = $presence->GetFrom();
-
-    return unless $from->GetJid('base') eq $self->BaseJID;
-
-    if($type eq 'available') {
+    my $from = Net::Jabber::JID->new($presence->GetFrom());
+
+    return unless $from->GetJID('base') eq $self->BaseJID;
+
+    owl::error('JID matches');
+
+    if($type eq 'unavailable') {
         delete $self->{PRESENCE}->{$from->GetJID('full')};
-    } else {
+    } elsif($type eq 'available') {
         $self->{PRESENCE}->{$from->GetJID('full')} = $from;
     }
@@ -215 +217 @@
 sub Presence {
     my $self = shift;
-    return keys %{$self->{PRESENCE}};
-}
+    return values %{$self->{PRESENCE}};
+}
+
+1;