From f760a2f3eac64411a092a5590dee5d33cd72be68 Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 28 Feb 2024 00:02:24 +0200 Subject: [PATCH] Don't save "null" as cookies --- cmd/lscli/go.mod | 3 +-- cmd/lscli/go.sum | 6 ++---- database/user.go | 2 +- go.mod | 3 +-- go.sum | 6 ++---- 5 files changed, 7 insertions(+), 13 deletions(-) diff --git a/cmd/lscli/go.mod b/cmd/lscli/go.mod index 317c655..e96c12a 100644 --- a/cmd/lscli/go.mod +++ b/cmd/lscli/go.mod @@ -9,7 +9,7 @@ require ( github.com/tidwall/gjson v1.17.1 github.com/zyedidia/clipboard v1.0.4 go.mau.fi/mautrix-meta v0.1.0 - go.mau.fi/util v0.4.0 + go.mau.fi/util v0.4.1-0.20240227220036-e5cb5e96d15c ) require ( @@ -26,6 +26,5 @@ require ( golang.org/x/crypto v0.19.0 // indirect golang.org/x/net v0.21.0 // indirect golang.org/x/sys v0.17.0 // indirect - golang.org/x/text v0.14.0 // indirect google.golang.org/protobuf v1.32.0 // indirect ) diff --git a/cmd/lscli/go.sum b/cmd/lscli/go.sum index 9802e46..7348d11 100644 --- a/cmd/lscli/go.sum +++ b/cmd/lscli/go.sum @@ -36,8 +36,8 @@ github.com/zyedidia/clipboard v1.0.4 h1:r6GUQOyPtIaApRLeD56/U+2uJbXis6ANGbKWCljU github.com/zyedidia/clipboard v1.0.4/go.mod h1:zykFnZUXX0ErxqvYLUFEq7QDJKId8rmh2FgD0/Y8cjA= go.mau.fi/libsignal v0.1.0 h1:vAKI/nJ5tMhdzke4cTK1fb0idJzz1JuEIpmjprueC+c= go.mau.fi/libsignal v0.1.0/go.mod h1:R8ovrTezxtUNzCQE5PH30StOQWWeBskBsWE55vMfY9I= -go.mau.fi/util v0.4.0 h1:S2X3qU4pUcb/vxBRfAuZjbrR9xVMAXSjQojNBLPBbhs= -go.mau.fi/util v0.4.0/go.mod h1:leeiHtgVBuN+W9aDii3deAXnfC563iN3WK6BF8/AjNw= +go.mau.fi/util v0.4.1-0.20240227220036-e5cb5e96d15c h1:Da1lLtFQhT0ADc4FapwNJrW5VKG0AqEuwF6j/dqRlI0= +go.mau.fi/util v0.4.1-0.20240227220036-e5cb5e96d15c/go.mod h1:leeiHtgVBuN+W9aDii3deAXnfC563iN3WK6BF8/AjNw= go.mau.fi/whatsmeow v0.0.0-20240227155050-c5e8575efc35 h1:I3FV1mIbEnELeECHa2udc4nwkHozY0qwVVJB2gUJRr4= go.mau.fi/whatsmeow v0.0.0-20240227155050-c5e8575efc35/go.mod h1:lQHbhaG/fI+6hfGqz5Vzn2OBJBEZ05H0kCP6iJXriN4= golang.org/x/crypto v0.19.0 h1:ENy+Az/9Y1vSrlrvBSyna3PITt4tiZLf7sgCjZBX7Wo= @@ -49,8 +49,6 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543 h1:E7g+9GITq07hpfrRu66IVDexMakfv52eLZ2CXBWiKr4= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= diff --git a/database/user.go b/database/user.go index 7a40bba..ce8f0af 100644 --- a/database/user.go +++ b/database/user.go @@ -80,7 +80,7 @@ func (uq *UserQuery) GetAllLoggedIn(ctx context.Context) ([]*User, error) { } func (u *User) sqlVariables() []any { - return []any{u.MXID, dbutil.NumPtr(u.MetaID), u.WADeviceID, dbutil.JSON{Data: u.Cookies}, u.InboxFetched, dbutil.StrPtr(u.ManagementRoom), dbutil.StrPtr(u.SpaceRoom)} + return []any{u.MXID, dbutil.NumPtr(u.MetaID), u.WADeviceID, dbutil.JSONPtr(u.Cookies), u.InboxFetched, dbutil.StrPtr(u.ManagementRoom), dbutil.StrPtr(u.SpaceRoom)} } func (u *User) Insert(ctx context.Context) error { diff --git a/go.mod b/go.mod index 15a8f4e..66e6e23 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/mattn/go-sqlite3 v1.14.22 github.com/rs/zerolog v1.32.0 go.mau.fi/libsignal v0.1.0 - go.mau.fi/util v0.4.0 + go.mau.fi/util v0.4.1-0.20240227220036-e5cb5e96d15c go.mau.fi/whatsmeow v0.0.0-20240227155050-c5e8575efc35 golang.org/x/crypto v0.19.0 golang.org/x/exp v0.0.0-20240213143201-ec583247a57a @@ -35,7 +35,6 @@ require ( github.com/yuin/goldmark v1.7.0 // indirect go.mau.fi/zeroconfig v0.1.2 // indirect golang.org/x/sys v0.17.0 // indirect - golang.org/x/text v0.14.0 // indirect gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect gopkg.in/yaml.v3 v3.0.1 // indirect maunium.net/go/mauflag v1.0.0 // indirect diff --git a/go.sum b/go.sum index af1723a..15a18ae 100644 --- a/go.sum +++ b/go.sum @@ -51,8 +51,8 @@ github.com/yuin/goldmark v1.7.0 h1:EfOIvIMZIzHdB/R/zVrikYLPPwJlfMcNczJFMs1m6sA= github.com/yuin/goldmark v1.7.0/go.mod h1:uzxRWxtg69N339t3louHJ7+O03ezfj6PlliRlaOzY1E= go.mau.fi/libsignal v0.1.0 h1:vAKI/nJ5tMhdzke4cTK1fb0idJzz1JuEIpmjprueC+c= go.mau.fi/libsignal v0.1.0/go.mod h1:R8ovrTezxtUNzCQE5PH30StOQWWeBskBsWE55vMfY9I= -go.mau.fi/util v0.4.0 h1:S2X3qU4pUcb/vxBRfAuZjbrR9xVMAXSjQojNBLPBbhs= -go.mau.fi/util v0.4.0/go.mod h1:leeiHtgVBuN+W9aDii3deAXnfC563iN3WK6BF8/AjNw= +go.mau.fi/util v0.4.1-0.20240227220036-e5cb5e96d15c h1:Da1lLtFQhT0ADc4FapwNJrW5VKG0AqEuwF6j/dqRlI0= +go.mau.fi/util v0.4.1-0.20240227220036-e5cb5e96d15c/go.mod h1:leeiHtgVBuN+W9aDii3deAXnfC563iN3WK6BF8/AjNw= go.mau.fi/whatsmeow v0.0.0-20240227155050-c5e8575efc35 h1:I3FV1mIbEnELeECHa2udc4nwkHozY0qwVVJB2gUJRr4= go.mau.fi/whatsmeow v0.0.0-20240227155050-c5e8575efc35/go.mod h1:lQHbhaG/fI+6hfGqz5Vzn2OBJBEZ05H0kCP6iJXriN4= go.mau.fi/zeroconfig v0.1.2 h1:DKOydWnhPMn65GbXZOafgkPm11BvFashZWLct0dGFto= @@ -70,8 +70,6 @@ golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.12.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg= golang.org/x/sys v0.17.0 h1:25cE3gD+tdBA7lp7QfhuV+rJiE9YXTcS3VG1SqssI/Y= golang.org/x/sys v0.17.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA= -golang.org/x/text v0.14.0 h1:ScX5w1eTa3QqT8oi6+ziP7dTV1S2+ALU0bI+0zXKWiQ= -golang.org/x/text v0.14.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU= golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0= google.golang.org/protobuf v1.32.0 h1:pPC6BG5ex8PDFnkbrGU3EixyhKcQ2aDuBS36lqK/C7I= google.golang.org/protobuf v1.32.0/go.mod h1:c6P6GXX6sHbq/GpV6MGZEdwhWPcYBgnhAHhKbcUYpos=