Adding a Mention model, test stubs

3 files changed, 42 insertions, 20 deletions

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 3150a0bad..17cc8e323 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -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
diff --git a/app/services/process_feed_service.rb b/app/services/process_feed_service.rb
index 703938b46..210de8cdb 100644
--- a/app/services/process_feed_service.rb
+++ b/app/services/process_feed_service.rb
@@ -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
diff --git a/app/services/process_mentions_service.rb b/app/services/process_mentions_service.rb
new file mode 100644
index 000000000..93866666a
--- /dev/null
+++ b/app/services/process_mentions_service.rb
@@ -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