Changeset b2648bc for perl/modules/jabber.pl

Timestamp:

Jan 25, 2007, 12:03:54 AM (16 years ago)

Author:

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

Branches:

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

Children:

71e33ca

Parents:

45d9eb0

Message:

* Show full jid if base jid matches a muc in type 'chat'
* isa checks use Net::XMPP, objects use Net::Jabber

File:

• perl/modules/jabber.pl (modified) (16 diffs)

perl/modules/jabber.pl

@@ -97 +97 @@
                                      server => $args{server});
     }
-    $jid = $jid->GetJID('base') if UNIVERSAL::isa($jid, 'Net::Jabber::JID');
+    $jid = $jid->GetJID('base') if UNIVERSAL::isa($jid, 'Net::XMPP::JID');
 
     foreach my $muc ($self->MUCs) {
@@ -266 +266 @@
         }
         if ($vars{status_changed}) {
-            my $p = new Net::XMPP::Presence;
+            my $p = new Net::Jabber::Presence;
             $p->SetShow($vars{show}) if $vars{show};
             $p->SetStatus($vars{status}) if $vars{status};
@@ -415 +415 @@
 sub cmd_login {
     my $cmd = shift;
-    my $jid = new Net::XMPP::JID;
+    my $jid = new Net::Jabber::JID;
     $jid->SetJID(shift);
     my $password = '';
@@ -830 +830 @@
     $name = "" unless (1 == scalar(@ARGV));
 
-    my $p = new Net::XMPP::Presence;
+    my $p = new Net::Jabber::Presence;
     $p->SetType('subscribe');
 
@@ -849 +849 @@
     my $baseJID = baseJID($jid);
 
-    my $p = new Net::XMPP::Presence;
+    my $p = new Net::Jabber::Presence;
     $p->SetType('unsubscribe');
     foreach my $to (@ARGV) {
@@ -872 +872 @@
     foreach my $to (@ARGV) {
         my %jq  = $roster->query($to);
-        my $iq = new Net::XMPP::IQ;
+        my $iq = new Net::Jabber::IQ;
         $iq->SetType('set');
         my $item = new XML::Stream::Node('item');
@@ -912 +912 @@
     my $baseJID = baseJID($jid);
 
-    my $iq = new Net::XMPP::IQ;
+    my $iq = new Net::Jabber::IQ;
     $iq->SetType('set');
     my $item = new XML::Stream::Node('item');
@@ -931 +931 @@
     my $baseJID = baseJID($jid);
 
-    my $p = new Net::XMPP::Presence;
+    my $p = new Net::Jabber::Presence;
     $p->SetType('subscribed');
     foreach my $to (@ARGV) {
@@ -947 +947 @@
     my $baseJID = baseJID($jid);
 
-    my $p = new Net::XMPP::Presence;
+    my $p = new Net::Jabber::Presence;
     $p->SetType('unsubscribed');
     foreach my $to (@ARGV) {
@@ -961 +961 @@
     my $body = shift;
 
-    my $j = new Net::XMPP::Message;
+    my $j = new Net::Jabber::Message;
     $body =~ s/\n\z//;
     $j->SetMessage(
@@ -978 +978 @@
     }
 
-    $j->RemoveFrom(); # Kludge to get around gtalk's random bits after the resouce.
+    $j->RemoveFrom(); # Kludge to get around gtalk's random bits after the resource.
     if ($vars{jwrite}{sid} && $conn->sidExists( $vars{jwrite}{sid} )) {
         $conn->getConnectionFromSid($vars{jwrite}{sid})->Send($j);
@@ -1114 +1114 @@
     # Find a connection to reply with.
     foreach my $jid ($conn->getJIDs()) {
-        my $cJID = new Net::XMPP::JID;
+        my $cJID = new Net::Jabber::JID;
         $cJID->SetJID($jid);
         if ($to eq $cJID->GetJID('base') ||
@@ -1189 +1189 @@
           " -a " . ( ( $dir eq 'out' ) ? $props{from} : $props{to} );
         $props{private} = 1;
+
+        my $connection;
+        if ($dir eq 'in') {
+            $connection = $conn->getConnectionFromSid($props{sid});
+        }
+        else {
+            $connection = $conn->getConnectionFromJID($props{from});
+        }
+
+        # Check to see if we're doing personals with someone in a muc.
+        # If we are, show the full jid because the base jid is the room.
+        if ($connection) {
+            $props{sender} = $props{from}
+              if ($connection->FindMUC(jid => $from));
+            $props{recipient} = $props{to}
+              if ($connection->FindMUC(jid => $to));
+        }
     }
     elsif ( $jtype eq 'groupchat' ) {
@@ -1281 +1298 @@
 sub baseJID {
     my $givenJIDStr = shift;
-    my $givenJID    = new Net::XMPP::JID;
+    my $givenJID    = new Net::Jabber::JID;
     $givenJID->SetJID($givenJIDStr);
     return $givenJID->GetJID('base');
@@ -1288 +1305 @@
 sub resolveConnectedJID {
     my $givenJIDStr = shift;
-    my $givenJID    = new Net::XMPP::JID;
+    my $givenJID    = new Net::Jabber::JID;
     $givenJID->SetJID($givenJIDStr);
 
@@ -1306 +1323 @@
 
         foreach my $jid ( $conn->getJIDs() ) {
-            my $cJID = new Net::XMPP::JID;
+            my $cJID = new Net::Jabber::JID;
             $cJID->SetJID($jid);
             if ( $givenJIDStr eq $cJID->GetJID('base') ) {