From c4377fdcd213fcf239c2fa01ce31ca92ec64ee9b Mon Sep 17 00:00:00 2001
From: Ryan Barrett <git@ryanb.org>
Date: Tue, 2 Apr 2024 15:32:38 -0700
Subject: [PATCH] bluesky.from_as1: facets: handle tag displayName with @/#
 prefix char

---
 granary/bluesky.py            | 2 +-
 granary/tests/test_bluesky.py | 6 ++++++
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/granary/bluesky.py b/granary/bluesky.py
index 64f2e7e0..64a6f19f 100644
--- a/granary/bluesky.py
+++ b/granary/bluesky.py
@@ -536,7 +536,7 @@ def from_as1(obj, out_type=None, blobs=None, client=None):
       except (KeyError, ValueError, IndexError, TypeError):
         pass
 
-      name = tag.get('displayName')
+      name = tag.get('displayName', '').strip().lstrip('@#')
       if type == 'hashtag':
         facet['features'] = [{
           '$type': 'app.bsky.richtext.facet#tag',
diff --git a/granary/tests/test_bluesky.py b/granary/tests/test_bluesky.py
index bbe2380c..c9671d32 100644
--- a/granary/tests/test_bluesky.py
+++ b/granary/tests/test_bluesky.py
@@ -785,6 +785,12 @@ def test_from_as1_tag_mention_html_content_guess_index(self):
       'content': '<p>foo <a href="https://bsky.app/...">@you.com</a> bar</p>',
     }))
 
+  def test_from_as1_tag_mention_at_char_html_content_guess_index(self):
+    note = copy.deepcopy(NOTE_AS_TAG_MENTION)
+    note['content'] = '<p>foo <a href="https://bsky.app/...">@you.com</a> bar</p>'
+    note['tags'][0]['displayName'] = '@you.com'
+    self.assert_equals(POST_BSKY_FACET_MENTION, from_as1(note))
+
   def test_from_as1_drop_tag_with_start_past_content_length(self):
     note = copy.deepcopy(NOTE_AS_TAG_HASHTAG)
     note['tags'][0]['startIndex'] = len(note['content']) + 2