From 385a0048bf7f5ce38bb215d8ad1eaa600a70e437 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Mon, 26 Nov 2018 10:48:58 -0500 Subject: [PATCH] MM-13015 Remove metadata field from post when metadata is disabled (#9882) --- app/post_metadata_test.go | 4 ++++ model/post.go | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/post_metadata_test.go b/app/post_metadata_test.go index c174ec18e6..e66fcb7b19 100644 --- a/app/post_metadata_test.go +++ b/app/post_metadata_test.go @@ -402,6 +402,10 @@ func TestPreparePostForClient(t *testing.T) { post = th.App.PreparePostForClient(post) assert.Nil(t, post.Metadata) + + b := post.ToJson() + + assert.NotContains(t, string(b), "metadata", "json shouldn't include a metadata field, not even a falsey one") }) } diff --git a/model/post.go b/model/post.go index c252976d28..8b107e4049 100644 --- a/model/post.go +++ b/model/post.go @@ -81,7 +81,7 @@ type Post struct { HasReactions bool `json:"has_reactions,omitempty"` // Transient data populated before sending a post to the client - Metadata *PostMetadata `json:"metadata" db:"-"` + Metadata *PostMetadata `json:"metadata,omitempty" db:"-"` } type PostEphemeral struct {