nocebo/diaspora
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

API: ensure nsfw field in post is returned as a boolean

Browse source
This commit is contained in:
Jonne Haß 2020-02-01 21:00:31 +01:00
parent 0754c92116
commit b921b71b97
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/models/status_message.rb
View file

@ -58,7 +58,7 @@ class StatusMessage < Post
end end
def nsfw def nsfw
text.try(:match, /#nsfw/i) || super !!(text.try(:match, /#nsfw/i) || super) # rubocop:disable Style/DoubleNegation
end end
def comment_email_subject def comment_email_subject

4
spec/integration/api/posts_controller_spec.rb
View file

@ -80,7 +80,7 @@ describe Api::V1::PostsController do
context "access full post by post ID" do context "access full post by post ID" do
it "gets post" do it "gets post" do
base_params = {status_message: {text: "myText"}, public: true} base_params = {status_message: {text: "myText #nsfw"}, public: true}
poll_params = {poll_question: "something?", poll_answers: %w[yes no maybe]} poll_params = {poll_question: "something?", poll_answers: %w[yes no maybe]}
location_params = {location_address: "somewhere", location_coords: "1,2"} location_params = {location_address: "somewhere", location_coords: "1,2"}
merged_params = base_params.merge(location_params) merged_params = base_params.merge(location_params)
@ -704,7 +704,7 @@ describe Api::V1::PostsController do
expect(post["post_type"]).to eq(reference_post.post_type) expect(post["post_type"]).to eq(reference_post.post_type)
expect(post["provider_display_name"]).to eq(reference_post.provider_display_name) expect(post["provider_display_name"]).to eq(reference_post.provider_display_name)
expect(post["public"]).to eq(reference_post.public) expect(post["public"]).to eq(reference_post.public)
expect(post["nsfw"]).to eq(reference_post.nsfw) expect(post["nsfw"]).to eq(!!reference_post.nsfw) # rubocop:disable Style/DoubleNegation
end end
def confirm_interactions(interactions, reference_post) def confirm_interactions(interactions, reference_post)