PostStatusService can attach media to status, ProcessFeedService likewise

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

app/services/process_feed_service.rb

@@ -38,6 +38,7 @@ class ProcessFeedService < BaseService
     # If we added a status, go through accounts it mentions and create respective relations
     unless status.new_record?
       record_remote_mentions(status, entry.xpath('./xmlns:link[@rel="mentioned"]'))
+      process_attachments(entry, status)
       DistributionWorker.perform_async(status.id)
     end
   end
@@ -68,6 +69,16 @@ class ProcessFeedService < BaseService
     end
   end
 
+  def process_attachments(entry, status)
+    entry.xpath('./xmlns:link[@rel="enclosure"]').each do |enclosure_link|
+      next if enclosure_link.attribute('href').nil?
+
+      media = MediaAttachment.new(account: status.account, status: status, remote_url: enclosure_link.attribute('href').value)
+      media.file_remote_url = enclosure_link.attribute('href').value
+      media.save
+    end
+  end
+
   def add_post!(_entry, status)
     status.save!
   end