瀏覽代碼

Fix wrong param name in scheduled statuses and return params in API (#9725)

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
master
Eugen Rochko 5 年之前
committed by GitHub
父節點
當前提交
1cbdf8d218
沒有發現已知的金鑰在資料庫的簽署中 GPG Key ID: 4AEE18F83AFDEB23
共有 3 個文件被更改,包括 10 次插入6 次删除
  1. +5
    -1
      app/serializers/rest/scheduled_status_serializer.rb
  2. +4
    -4
      app/services/post_status_service.rb
  3. +1
    -1
      app/workers/publish_scheduled_status_worker.rb

+ 5
- 1
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

+ 4
- 4
app/services/post_status_service.rb 查看文件

@@ -167,10 +167,10 @@ class PostStatusService < BaseService

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

+ 1
- 1
app/workers/publish_scheduled_status_worker.rb 查看文件

@@ -18,7 +18,7 @@ class PublishScheduledStatusWorker
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

Loading…
取消
儲存