]> cat aescling's git repositories - mastodon.git/commitdiff
Fix missing irreversible in filters API, expires_in param (#7976)
authorEugen Rochko <eugen@zeonfederated.com>
Sat, 7 Jul 2018 16:51:45 +0000 (18:51 +0200)
committerGitHub <noreply@github.com>
Sat, 7 Jul 2018 16:51:45 +0000 (18:51 +0200)
app/controllers/api/v1/filters_controller.rb
app/serializers/rest/filter_serializer.rb

index 02efd323baf1d2fcd8137b7c0b6b438d68543791..a98080d1d140fc642efcf840e2e7f86362ca4de3 100644 (file)
@@ -43,6 +43,6 @@ class Api::V1::FiltersController < Api::BaseController
   end
 
   def resource_params
-    params.permit(:phrase, :expires_at, :irreversible, context: [])
+    params.permit(:phrase, :expires_in, :irreversible, context: [])
   end
 end
index 07f2516f8a0b22a71739f4b7920c8dd211eb8922..51340aa79b0d56f1ee823d7505459806863c8cce 100644 (file)
@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
 class REST::FilterSerializer < ActiveModel::Serializer
-  attributes :id, :phrase, :context, :expires_at
+  attributes :id, :phrase, :context, :expires_at,
+             :irreversible
 end