From 2fc3378b717f40f37f3a188b68407887242d9c06 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 14 Nov 2018 01:19:52 +0200 Subject: [PATCH] Fix go vet --- Gopkg.lock | 4 ++-- vendor/maunium.net/go/mautrix/events.go | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/Gopkg.lock b/Gopkg.lock index c69ae5d..da3664e 100644 --- a/Gopkg.lock +++ b/Gopkg.lock @@ -164,14 +164,14 @@ [[projects]] branch = "master" - digest = "1:f0a9c6bdcbf2bbaa02f4f913b1956cc722daf92bec1715b51e001e53ba93b3a2" + digest = "1:1abef70ba640c92bf2763f1b1fbcb8c6e3ba1b58b2dcfeb933a09bfc51f7147b" name = "maunium.net/go/mautrix" packages = [ ".", "format", ] pruneopts = "UT" - revision = "5012a3c49b63ccb3c72cd01d2fd3442759c3ea3c" + revision = "ffb03045581b402abaa1fd51340207dfb807dc81" [[projects]] branch = "master" diff --git a/vendor/maunium.net/go/mautrix/events.go b/vendor/maunium.net/go/mautrix/events.go index 7151c27..efd3795 100644 --- a/vendor/maunium.net/go/mautrix/events.go +++ b/vendor/maunium.net/go/mautrix/events.go @@ -197,7 +197,7 @@ type Content struct { RelatesTo *RelatesTo `json:"m.relates_to,omitempty"` Command *MatchedCommand `json:"m.command,omitempty"` - PowerLevels + *PowerLevels Member Aliases []string `json:"aliases,omitempty"` Alias string `json:"alias,omitempty"` @@ -234,6 +234,13 @@ func (content *Content) GetRelatesTo() *RelatesTo { return content.RelatesTo } +func (content *Content) GetPowerLevels() *PowerLevels { + if content.PowerLevels == nil { + content.PowerLevels = &PowerLevels{} + } + return content.PowerLevels +} + func (content *Content) UnmarshalPowerLevels() (pl PowerLevels, err error) { err = json.Unmarshal(content.VeryRaw, &pl) return