Changeset 06f5ef8

Timestamp:

Aug 4, 2009, 9:04:56 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:

3ff3d86

Parents:

6bc35b4

Message:

Loosen up JID resolution

1) Fall back to substring matching if the existing resolution fails
to find any matches.

2) Allow optional loosening of full JID matching and use it for
jwrite_guess(). If we can't find the right full JID, we can now fall
back to matching the bare JID.

File:

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

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

@@ -1304 +1304 @@
 sub resolveConnectedJID {
     my $givenJIDStr = shift;
+    my $loose = shift || 0;
     my $givenJID    = new Net::Jabber::JID;
     $givenJID->SetJID($givenJIDStr);
@@ -1311 +1312 @@
         # Specified account exists
         return $givenJIDStr if ($conn->jidExists($givenJIDStr) );
+        return resolveConnectedJID($givenJID->GetJID('base')) if $loose;
         die("Invalid account: $givenJIDStr");
     }
@@ -1316 +1318 @@
     # Disambiguate.
     else {
-        my $matchingJID = "";
-        my $errStr =
-          "Ambiguous account reference. Please specify a resource.\n";
-        my $ambiguous = 0;
+        my $JIDMatchingJID = "";
+        my $strMatchingJID = "";
+        my $JIDMatches = "";
+        my $strMatches = "";
+        my $JIDAmbiguous = 0;
+        my $strAmbiguous = 0;
 
         foreach my $jid ( $conn->getJIDs() ) {
@@ -1325 +1329 @@
             $cJID->SetJID($jid);
             if ( $givenJIDStr eq $cJID->GetJID('base') ) {
-                $ambiguous = 1 if ( $matchingJID ne "" );
-                $matchingJID = $jid;
-                $errStr .= "\t$jid\n";
+                $JIDAmbiguous = 1 if ( $JIDMatchingJID ne "" );
+                $JIDMatchingJID = $jid;
+                $JIDMatches .= "\t$jid\n";
             }
+            if ( $cJID->GetJID('base') =~ /$givenJIDStr/ ) {
+                $strAmbiguous = 1 if ( $strMatchingJID ne "" );
+                $strMatchingJID = $jid;
+                $strMatches .= "\t$jid\n";
+            }
         }
 
         # Need further disambiguation.
-        if ($ambiguous) {
-            die($errStr);
+        if ($JIDAmbiguous) {
+            my $errStr =
+                "Ambiguous account reference. Please specify a resource.\n";
+            die($errStr.$JIDMatches);
+        }
+
+        # It's this one.
+        elsif ($JIDMatchingJID ne "") {
+            return $JIDMatchingJID;
+        }
+
+        # Further resolution by substring.
+        elsif ($strAmbiguous) {
+            my $errStr =
+                "Ambiguous account reference. Please be more specific.\n";
+            die($errStr.$strMatches);
+        }
+
+        # It's this one, by substring.
+        elsif ($strMatchingJID ne "") {
+            return $strMatchingJID;
         }
 
         # Not one of ours.
-        elsif ( $matchingJID eq "" ) {
+        else {
             die("Invalid account: $givenJIDStr");
         }
 
-        # It's this one.
-        else {
-            return $matchingJID;
-        }
     }
     return "";
@@ -1387 +1411 @@
     my @matches;
     if($from) {
-        $from_jid = resolveConnectedJID($from);
+        $from_jid = resolveConnectedJID($from, 1);
         die("Unable to resolve account $from") unless $from_jid;
         $to_jid = resolveDestJID($to, $from_jid);