Adding a Mention model, test stubs
This commit is contained in:
parent
42eeecba3f
commit
71fe24096c
38 changed files with 355 additions and 47 deletions
7
app/models/mention.rb
Normal file
7
app/models/mention.rb
Normal file
|
@ -0,0 +1,7 @@
|
|||
class Mention < ActiveRecord::Base
|
||||
belongs_to :account, inverse_of: :mentions
|
||||
belongs_to :status, inverse_of: :mentions
|
||||
|
||||
validates :account, :status, presence: true
|
||||
validates :account, uniqueness: { scope: :status }
|
||||
end
|
|
@ -9,6 +9,7 @@ class Status < ActiveRecord::Base
|
|||
has_many :favourites, inverse_of: :status, dependent: :destroy
|
||||
has_many :reblogs, foreign_key: 'reblog_of_id', class_name: 'Status'
|
||||
has_many :replies, foreign_key: 'in_reply_to_id', class_name: 'Status'
|
||||
has_many :mentioned_accounts, class_name: 'Mention', dependent: :destroy
|
||||
|
||||
validates :account, presence: true
|
||||
validates :uri, uniqueness: true, unless: 'local?'
|
||||
|
|
|
@ -6,30 +6,13 @@ class PostStatusService < BaseService
|
|||
# @return [Status]
|
||||
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
|
||||
|
||||
status.mentions.each do |mentioned_account|
|
||||
next if mentioned_account.local?
|
||||
send_interaction_service.(status.stream_entry, mentioned_account)
|
||||
end
|
||||
|
||||
process_mentions_service.(status)
|
||||
status
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def follow_remote_account_service
|
||||
@follow_remote_account_service ||= FollowRemoteAccountService.new
|
||||
end
|
||||
|
||||
def send_interaction_service
|
||||
@send_interaction_service ||= SendInteractionService.new
|
||||
def process_mentions_service
|
||||
@process_mentions_service ||= ProcessMentionsService.new
|
||||
end
|
||||
end
|
||||
|
|
|
@ -21,6 +21,8 @@ class ProcessFeedService < BaseService
|
|||
else
|
||||
add_post!(entry, status)
|
||||
end
|
||||
|
||||
process_mentions_service.(status) unless status.new_record?
|
||||
end
|
||||
end
|
||||
|
||||
|
@ -120,4 +122,8 @@ class ProcessFeedService < BaseService
|
|||
def follow_remote_account_service
|
||||
@follow_remote_account_service ||= FollowRemoteAccountService.new
|
||||
end
|
||||
|
||||
def process_mentions_service
|
||||
@process_mentions_service ||= ProcessMentionsService.new
|
||||
end
|
||||
end
|
||||
|
|
33
app/services/process_mentions_service.rb
Normal file
33
app/services/process_mentions_service.rb
Normal file
|
@ -0,0 +1,33 @@
|
|||
class ProcessMentionsService < BaseService
|
||||
# Scan status for mentions and fetch remote mentioned users, create
|
||||
# local mention pointers, send Salmon notifications to mentioned
|
||||
# remote users
|
||||
# @param [Status] status
|
||||
def call(status)
|
||||
status.text.scan(Account::MENTION_RE).each do |match|
|
||||
username, domain = match.first.split('@')
|
||||
local_account = Account.find_by(username: username, domain: domain)
|
||||
|
||||
if local_account.nil?
|
||||
local_account = follow_remote_account_service.("acct:#{match.first}")
|
||||
end
|
||||
|
||||
local_account.mentions.first_or_create(status: status)
|
||||
end
|
||||
|
||||
status.mentions.each do |mentioned_account|
|
||||
next if mentioned_account.local?
|
||||
send_interaction_service.(status.stream_entry, mentioned_account)
|
||||
end
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def follow_remote_account_service
|
||||
@follow_remote_account_service ||= FollowRemoteAccountService.new
|
||||
end
|
||||
|
||||
def send_interaction_service
|
||||
@send_interaction_service ||= SendInteractionService.new
|
||||
end
|
||||
end
|
Loading…
Add table
Add a link
Reference in a new issue