~cytrogen/masto-fe

317cd26fbabc922494b1d581c11d93760e507456 — Emelia Smith 2 years ago 12a6cf5
Remove queued_at value from pubsub payloads (#26173)

M app/workers/push_conversation_worker.rb => app/workers/push_conversation_worker.rb +1 -1
@@ 9,7 9,7 @@ class PushConversationWorker
    message      = InlineRenderer.render(conversation, conversation.account, :conversation)
    timeline_id  = "timeline:direct:#{conversation.account_id}"

    redis.publish(timeline_id, Oj.dump(event: :conversation, payload: message, queued_at: (Time.now.to_f * 1000.0).to_i))
    redis.publish(timeline_id, Oj.dump(event: :conversation, payload: message))
  rescue ActiveRecord::RecordNotFound
    true
  end

M app/workers/push_encrypted_message_worker.rb => app/workers/push_encrypted_message_worker.rb +1 -1
@@ 9,7 9,7 @@ class PushEncryptedMessageWorker
    message           = InlineRenderer.render(encrypted_message, nil, :encrypted_message)
    timeline_id       = "timeline:#{encrypted_message.device.account_id}:#{encrypted_message.device.device_id}"

    redis.publish(timeline_id, Oj.dump(event: :encrypted_message, payload: message, queued_at: (Time.now.to_f * 1000.0).to_i))
    redis.publish(timeline_id, Oj.dump(event: :encrypted_message, payload: message))
  rescue ActiveRecord::RecordNotFound
    true
  end

M app/workers/push_update_worker.rb => app/workers/push_update_worker.rb +1 -2
@@ 25,8 25,7 @@ class PushUpdateWorker
  def message
    Oj.dump(
      event: update? ? :'status.update' : :update,
      payload: @payload,
      queued_at: (Time.now.to_f * 1000.0).to_i
      payload: @payload
    )
  end