From 6d63096256cc4d3cf0465dd66b5cd8b207ce9dfa Mon Sep 17 00:00:00 2001 From: Neil Alexander Date: Fri, 18 Feb 2022 17:31:21 +0000 Subject: [PATCH] Don't set null values since that apparently causes Element upsetti --- internal/pushrules/action.go | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/internal/pushrules/action.go b/internal/pushrules/action.go index 71cc03fd4..15fa3e89f 100644 --- a/internal/pushrules/action.go +++ b/internal/pushrules/action.go @@ -28,10 +28,14 @@ func (a *Action) MarshalJSON() ([]byte, error) { return nil, fmt.Errorf("only set_tweak actions may have a value, but got kind %q", a.Kind) } - return json.Marshal(map[string]interface{}{ + m := map[string]interface{}{ string(a.Kind): a.Tweak, - "value": a.Value, - }) + } + if a.Value != nil { + m["value"] = a.Value + } + + return json.Marshal(m) } func (a *Action) UnmarshalJSON(bs []byte) error { @@ -51,7 +55,9 @@ func (a *Action) UnmarshalJSON(bs []byte) error { } a.Kind = SetTweakAction a.Tweak = raw.SetTweak - a.Value = raw.Value + if raw.Value != nil { + a.Value = raw.Value + } return nil }