3g0st
/
mastodon-docker-playground
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix wrong route helper in encrypted messages controller (#13952) 

And add `created_at` to encrypted message serializer
signup-info-prompt
Eugen Rochko 2020-06-03 20:32:15 +02:00 committed by GitHub
parent 77619b1654
commit f669b8bcce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/api/v1/crypto/encrypted_messages_controller.rb
View File

@ -34,11 +34,11 @@ class Api::V1::Crypto::EncryptedMessagesController < Api::BaseController
end end
def next_path def next_path
api_v1_encrypted_messages_url pagination_params(max_id: pagination_max_id) if records_continue? api_v1_crypto_encrypted_messages_url pagination_params(max_id: pagination_max_id) if records_continue?
end end
def prev_path def prev_path
api_v1_encrypted_messages_url pagination_params(min_id: pagination_since_id) unless @encrypted_messages.empty? api_v1_crypto_encrypted_messages_url pagination_params(min_id: pagination_since_id) unless @encrypted_messages.empty?
end end
def pagination_max_id def pagination_max_id

3
app/serializers/rest/encrypted_message_serializer.rb
View File

@ -2,7 +2,8 @@
class REST::EncryptedMessageSerializer < ActiveModel::Serializer class REST::EncryptedMessageSerializer < ActiveModel::Serializer
attributes :id, :account_id, :device_id, attributes :id, :account_id, :device_id,
:type, :body, :digest, :message_franking :type, :body, :digest, :message_franking,
:created_at
def id def id
object.id.to_s object.id.to_s