mirror of
https://framagit.org/tykayn/mastodon.git
synced 2023-08-25 08:33:12 +02:00
Fix processing mentions to domains with non-ascii TLDs (#16689)
Fixes #16602
This commit is contained in:
parent
2688f18d06
commit
5899fe70b6
@ -58,8 +58,8 @@ class Account < ApplicationRecord
|
|||||||
hub_url
|
hub_url
|
||||||
)
|
)
|
||||||
|
|
||||||
USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i
|
USERNAME_RE = /[a-z0-9_]+([a-z0-9_\.-]+[a-z0-9_]+)?/i
|
||||||
MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[a-z0-9]+)?)/i
|
MENTION_RE = /(?<=^|[^\/[:word:]])@((#{USERNAME_RE})(?:@[[:word:]\.\-]+[[:word:]]+)?)/i
|
||||||
|
|
||||||
include AccountAssociations
|
include AccountAssociations
|
||||||
include AccountAvatar
|
include AccountAvatar
|
||||||
|
@ -42,6 +42,24 @@ RSpec.describe ProcessMentionsService, type: :service do
|
|||||||
expect(a_request(:post, remote_user.inbox_url)).to have_been_made.once
|
expect(a_request(:post, remote_user.inbox_url)).to have_been_made.once
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
context 'with an IDN TLD' do
|
||||||
|
let(:remote_user) { Fabricate(:account, username: 'foo', protocol: :activitypub, domain: 'xn--y9a3aq.xn--y9a3aq', inbox_url: 'http://example.com/inbox') }
|
||||||
|
let(:status) { Fabricate(:status, account: account, text: "Hello @foo@հայ.հայ") }
|
||||||
|
|
||||||
|
before do
|
||||||
|
stub_request(:post, remote_user.inbox_url)
|
||||||
|
subject.call(status)
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'creates a mention' do
|
||||||
|
expect(remote_user.mentions.where(status: status).count).to eq 1
|
||||||
|
end
|
||||||
|
|
||||||
|
it 'sends activity to the inbox' do
|
||||||
|
expect(a_request(:post, remote_user.inbox_url)).to have_been_made.once
|
||||||
|
end
|
||||||
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
context 'Temporarily-unreachable ActivityPub user' do
|
context 'Temporarily-unreachable ActivityPub user' do
|
||||||
|
Loading…
Reference in New Issue
Block a user