Skip to content

Commit

Permalink
Fix wrong param name in scheduled statuses and return params in API
Browse files Browse the repository at this point in the history
The database column and API param are called in_reply_to_id, not
in_reply_to_status_id, so it makes no sense to encode it that way
  • Loading branch information
Gargron committed Jan 6, 2019
1 parent 8ad57a0 commit 00ddde8
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 6 deletions.
6 changes: 5 additions & 1 deletion app/serializers/rest/scheduled_status_serializer.rb
@@ -1,11 +1,15 @@
# frozen_string_literal: true

class REST::ScheduledStatusSerializer < ActiveModel::Serializer
attributes :id, :scheduled_at
attributes :id, :scheduled_at, :params

has_many :media_attachments, serializer: REST::MediaAttachmentSerializer

def id
object.id.to_s
end

def params
object.params.without(:application_id)
end
end
8 changes: 4 additions & 4 deletions app/services/post_status_service.rb
Expand Up @@ -167,10 +167,10 @@ def scheduled_status_attributes

def scheduled_options
@options.tap do |options_hash|
options_hash[:in_reply_to_status_id] = options_hash.delete(:thread)&.id
options_hash[:application_id] = options_hash.delete(:application)&.id
options_hash[:scheduled_at] = nil
options_hash[:idempotency] = nil
options_hash[:in_reply_to_id] = options_hash.delete(:thread)&.id
options_hash[:application_id] = options_hash.delete(:application)&.id
options_hash[:scheduled_at] = nil
options_hash[:idempotency] = nil
end
end
end
2 changes: 1 addition & 1 deletion app/workers/publish_scheduled_status_worker.rb
Expand Up @@ -18,7 +18,7 @@ def perform(scheduled_status_id)
def options_with_objects(options)
options.tap do |options_hash|
options_hash[:application] = Doorkeeper::Application.find(options_hash.delete(:application_id)) if options[:application_id]
options_hash[:thread] = Status.find(options_hash.delete(:in_reply_to_status_id)) if options_hash[:in_reply_to_status_id]
options_hash[:thread] = Status.find(options_hash.delete(:in_reply_to_id)) if options_hash[:in_reply_to_id]
end
end
end

0 comments on commit 00ddde8

Please sign in to comment.