Skip to content

Commit

Permalink
Twidere mention workaround (#5552)
Browse files Browse the repository at this point in the history
* Work around Twidere and Tootdon bug

Tootdon and Twidere construct @user@domain handles from mentions in toots based
solely on the mention text and account URI's domain without performing any
webfinger call or retrieving account info from the Mastodon server.

As a result, when a remote user has WEB_DOMAIN ≠ LOCAL_DOMAIN, Twidere and
Tootdon will construct the mention as @user@WEB_DOMAIN. Now, this will usually
resolve to the correct account (since the recommended configuration is to have
WEB_DOMAIN perform webfinger redirections to LOCAL_DOMAIN) when processing
mentions, but won't do so when displaying them (as it does not go through the
whole account resolution at that time).

This change rewrites mentions to the resolved account, so that displaying the
mentions will work.

* Use lookbehind instead of non-capturing group in MENTION_RE

Indeed, substitutions with the previous regexp would erroneously eat any
preceding whitespace, which would lead to concatenated mentions in the
previous commit.

Note that users will “lose” up to one character space per mention for their
toots, as that regexp is also used to remove the domain-part of mentioned
users for character counting purposes, and it also erroneously removed the
preceding character if it was a space.
  • Loading branch information
ClearlyClaire authored and Gargron committed Nov 7, 2017
1 parent 1032f39 commit 5d5c0f4
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/javascript/mastodon/features/compose/util/counter.js
Original file line number Diff line number Diff line change
Expand Up @@ -5,5 +5,5 @@ const urlPlaceholder = 'xxxxxxxxxxxxxxxxxxxxxxx';
export function countableText(inputText) {
return inputText
.replace(urlRegex, urlPlaceholder)
.replace(/(?:^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+[a-z0-9]+)/ig, '@$2');
.replace(/(^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9\.\-]+[a-z0-9]+)/ig, '$1@$3');
};
2 changes: 1 addition & 1 deletion app/models/account.rb
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
#

class Account < ApplicationRecord
MENTION_RE = /(?:^|[^\/[:word:]])@(([a-z0-9_]+)(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/i
MENTION_RE = /(?<=^|[^\/[:word:]])@(([a-z0-9_]+)(?:@[a-z0-9\.\-]+[a-z0-9]+)?)/i

include AccountAvatar
include AccountFinderConcern
Expand Down
9 changes: 6 additions & 3 deletions app/services/process_mentions_service.rb
Original file line number Diff line number Diff line change
Expand Up @@ -10,18 +10,21 @@ class ProcessMentionsService < BaseService
def call(status)
return unless status.local?

status.text.scan(Account::MENTION_RE).each do |match|
status.text = status.text.gsub(Account::MENTION_RE) do |match|
begin
mentioned_account = resolve_remote_account_service.call(match.first.to_s)
mentioned_account = resolve_remote_account_service.call($1)
rescue Goldfinger::Error, HTTP::Error
mentioned_account = nil
end

next if mentioned_account.nil? || (mentioned_account.ostatus? && status.stream_entry.hidden?)
next match if mentioned_account.nil? || (mentioned_account.ostatus? && status.stream_entry.hidden?)

mentioned_account.mentions.where(status: status).first_or_create(status: status)
"@#{mentioned_account.acct}"
end

status.save!

status.mentions.includes(:account).each do |mention|
create_notification(status, mention)
end
Expand Down

0 comments on commit 5d5c0f4

Please sign in to comment.