logo

mastofe

My custom branche(s) on git.pleroma.social/pleroma/mastofe
commit: 889b814385b55785cec98de4dd26f2986e705052
parent: aa2fa227e9cdd5aa4f8facd93775f6180e44a17b
Author: Eugen Rochko <eugen@zeonfederated.com>
Date:   Thu,  2 Feb 2017 16:57:09 +0100

Fix bug

Diffstat:

Mapp/channels/application_cable/channel.rb4++--
1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/channels/application_cable/channel.rb b/app/channels/application_cable/channel.rb @@ -5,11 +5,11 @@ module ApplicationCable protected def hydrate_status(encoded_message) - message = OJ.load(encoded_message) + message = Oj.load(encoded_message) return [nil, message] if message['event'] == 'delete' - status_json = OJ.load(message['payload']) + status_json = Oj.load(message['payload']) status = Status.find(status_json['id']) [status, message]