update logic, add tests

granary/bluesky.py

@@ -201,8 +201,9 @@ def web_url_to_at_uri(url, handle=None, did=None):
   type = match.group('type')
   tid = match.group('tid')
 
-  # If a did has been provided explicitly, replace the existing handle with it.
-  if did and HANDLE_PATTERN.match(id):
+  # If a did and handle have been provided explicitly,
+  # replace the existing handle with the did.
+  if did and handle and id == handle:
     id = did
 
   if type:

granary/tests/test_bluesky.py

@@ -449,9 +449,24 @@ def test_web_url_to_at_uri(self):
 
       self.assertEqual(
         'at://did:plc:foo',
+        web_url_to_at_uri('https://bsky.app/profile/foo.com', handle='foo.com', did='did:plc:foo')
+      )
+
+      self.assertEqual(
+        'at://foo.com',
         web_url_to_at_uri('https://bsky.app/profile/foo.com', did='did:plc:foo')
       )
 
+      self.assertEqual(
+        'at://foo.com',
+        web_url_to_at_uri('https://bsky.app/profile/foo.com', handle='foo.com')
+      )
+
+      self.assertEqual(
+        'at://foo.com',
+        web_url_to_at_uri('https://bsky.app/profile/foo.com', handle='alice.com', did='did:plc:foo')
+      )
+
     for url in ('at://foo', 'http://not/bsky.app', 'https://bsky.app/x'):
       with self.assertRaises(ValueError):
         web_url_to_at_uri(url)