From b01d21c4d48b9b508f64a191cc94a3d41c21ef40 Mon Sep 17 00:00:00 2001
From: Claire <claire.github-309c@sitedethib.com>
Date: Tue, 28 Oct 2025 15:26:08 +0100
Subject: [PATCH] Hashtag fixes (#36625)

---
 app/javascript/mastodon/components/status/handled_link.tsx | 7 ++++++-
 app/models/tag.rb                                          | 2 +-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/app/javascript/mastodon/components/status/handled_link.tsx b/app/javascript/mastodon/components/status/handled_link.tsx
index 59305d573..be816e985 100644
--- a/app/javascript/mastodon/components/status/handled_link.tsx
+++ b/app/javascript/mastodon/components/status/handled_link.tsx
@@ -26,7 +26,12 @@ export const HandledLink: FC<HandledLinkProps & ComponentProps<'a'>> = ({
   ...props
 }) => {
   // Handle hashtags
-  if (text.startsWith('#') || prevText?.endsWith('#')) {
+  if (
+    text.startsWith('#') ||
+    prevText?.endsWith('#') ||
+    text.startsWith('＃') ||
+    prevText?.endsWith('＃')
+  ) {
     const hashtag = text.slice(1).trim();
     return (
       <Link
diff --git a/app/models/tag.rb b/app/models/tag.rb
index 1514a4400..f9eb6bfd3 100644
--- a/app/models/tag.rb
+++ b/app/models/tag.rb
@@ -41,7 +41,7 @@ class Tag < ApplicationRecord
   HASHTAG_LAST_SEQUENCE = '([[:word:]_]*[[:alpha:]][[:word:]_]*)'
   HASHTAG_NAME_PAT = "#{HASHTAG_FIRST_SEQUENCE}|#{HASHTAG_LAST_SEQUENCE}".freeze
 
-  HASHTAG_RE = %r{(?<![=/)\p{Alnum}])[#|＃](#{HASHTAG_NAME_PAT})}
+  HASHTAG_RE = %r{(?<![=/)\p{Alnum}])[#＃](#{HASHTAG_NAME_PAT})}
   HASHTAG_NAME_RE = /\A(#{HASHTAG_NAME_PAT})\z/i
   HASHTAG_INVALID_CHARS_RE = /[^[:alnum:]\u0E47-\u0E4E#{HASHTAG_SEPARATORS}]/