From 55090ed9518390887d78b33098613570441ec3ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jonne=20Ha=C3=9F?= Date: Sat, 1 Feb 2020 21:00:31 +0100 Subject: [PATCH] API: ensure nsfw field in post is returned as a boolean --- app/models/status_message.rb | 2 +- spec/integration/api/posts_controller_spec.rb | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/models/status_message.rb b/app/models/status_message.rb index 4f8e192d7ea..a55ba9118af 100644 --- a/app/models/status_message.rb +++ b/app/models/status_message.rb @@ -58,7 +58,7 @@ def self.tag_stream(tag_ids) end def nsfw - text.try(:match, /#nsfw/i) || super + !!(text.try(:match, /#nsfw/i) || super) # rubocop:disable Style/DoubleNegation end def comment_email_subject diff --git a/spec/integration/api/posts_controller_spec.rb b/spec/integration/api/posts_controller_spec.rb index 6cecda8b8cb..5d62a22a033 100644 --- a/spec/integration/api/posts_controller_spec.rb +++ b/spec/integration/api/posts_controller_spec.rb @@ -80,7 +80,7 @@ context "access full post by post ID" 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]} location_params = {location_address: "somewhere", location_coords: "1,2"} merged_params = base_params.merge(location_params) @@ -694,7 +694,7 @@ def confirm_post_top_level(post, reference_post) expect(post["post_type"]).to eq(reference_post.post_type) expect(post["provider_display_name"]).to eq(reference_post.provider_display_name) 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 def confirm_interactions(interactions, reference_post)