luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-26 16:44:48 +00:00
Code Issues Projects Releases Wiki Activity

Fix missing irreversible in filters API, expires_in param (#7976)

Browse source
This commit is contained in:
Eugen Rochko 2018-07-07 18:51:45 +02:00 committed by GitHub
parent c24d62220d
commit 9804ec3a6d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/controllers/api/v1/filters_controller.rb
View 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

3
app/serializers/rest/filter_serializer.rb
View 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