diff options
| -rw-r--r-- | app/models/account.rb | 2 | ||||
| -rw-r--r-- | app/models/status.rb | 11 | ||||
| -rw-r--r-- | app/services/post_status_service.rb | 19 |
3 files changed, 32 insertions, 0 deletions
diff --git a/app/models/account.rb b/app/models/account.rb index 66345b5ab..2cbec488b 100644 --- a/app/models/account.rb +++ b/app/models/account.rb @@ -14,6 +14,8 @@ class Account < ActiveRecord::Base has_many :following, through: :active_relationships, source: :target_account has_many :followers, through: :passive_relationships, source: :account + MENTION_RE = /(?:^|\W)@([a-z0-9_]+(?:@[a-z0-9\.\-]+)?)/i + def follow!(other_account) self.active_relationships.first_or_create!(target_account: other_account) end diff --git a/app/models/status.rb b/app/models/status.rb index be616dce6..80719140e 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -51,6 +51,17 @@ class Status < ActiveRecord::Base m << thread.account if reply? m << reblog.account if reblog? + unless reblog? + self.text.scan(Account::MENTION_RE).each do |match| + uri = match.first + username = uri.split('@').first + domain = uri.split('@').size == 2 ? uri.split('@').last : nil + account = Account.find_by(username: username, domain: domain) + + m << account unless account.nil? + end + end + m end diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb new file mode 100644 index 000000000..e8fc6cdef --- /dev/null +++ b/app/services/post_status_service.rb @@ -0,0 +1,19 @@ +class PostStatusService < BaseService + def call(account, text, in_reply_to = nil) + status = account.statuses.create!(text: text, thread: in_reply_to) + + status.text.scan(Account::MENTION_RE).each do |match| + next if match.first.split('@').size == 1 + username, domain = match.first.split('@') + local_account = Account.find_by(username: username, domain: domain) + next unless local_account.nil? + follow_remote_account_service.("acct:#{match.first}") + end + end + + private + + def follow_remote_account_service + @follow_remote_account_service ||= FollowRemoteAccountService.new + end +end |