From eec0dc46a6d6782f6aebdc759d4822ef17fd57a2 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 5 Sep 2016 18:39:53 +0200
Subject: PostStatusService can attach media to status, ProcessFeedService
 likewise

---
 app/services/post_status_service.rb | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

(limited to 'app/services/post_status_service.rb')

diff --git a/app/services/post_status_service.rb b/app/services/post_status_service.rb
index 69e39c1a6..ee2136e3f 100644
--- a/app/services/post_status_service.rb
+++ b/app/services/post_status_service.rb
@@ -3,9 +3,11 @@ class PostStatusService < BaseService
   # @param [Account] account Account from which to post
   # @param [String] text Message
   # @param [Status] in_reply_to Optional status to reply to
+  # @param [Enumerable] media_ids Optional array of media IDs to attach
   # @return [Status]
-  def call(account, text, in_reply_to = nil)
+  def call(account, text, in_reply_to = nil, media_ids = nil)
     status = account.statuses.create!(text: text, thread: in_reply_to)
+    attach_media(status, media_ids)
     process_mentions_service.(status)
     DistributionWorker.perform_async(status.id)
     account.ping!(account_url(account, format: 'atom'), [Rails.configuration.x.hub_url])
@@ -14,6 +16,13 @@ class PostStatusService < BaseService
 
   private
 
+  def attach_media(status, media_ids)
+    return if media_ids.nil? || !media_ids.is_a?(Enumerable)
+
+    media = MediaAttachment.where(status_id: nil).where(id: media_ids.take(2).map { |id| id.to_i })
+    media.update(status_id: status.id)
+  end
+
   def process_mentions_service
     @process_mentions_service ||= ProcessMentionsService.new
   end
-- 
cgit