From c2772afdc9fb8ab72bff872bd8350fd335823c8a Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 4 Feb 2024 16:37:22 -0500 Subject: [PATCH 1/5] delete messages form server immediately by default also set default display name --- scripts/run_tests.sh | 7 +++++++ src/main.go | 22 ++++++++++++++++++++++ 2 files changed, 29 insertions(+) diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index d9113b3..f4d478e 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -24,6 +24,13 @@ then fi # Install test dependencies +if ! command -v deltachat-rpc-server &> /dev/null +then + echo "deltachat-rpc-server not found, installing..." + curl -L https://github.com/deltachat/deltachat-core-rust/releases/latest/download/deltachat-rpc-server-x86_64-linux --output deltachat-rpc-server + chmod +x deltachat-rpc-server + export PATH=`pwd`:"$PATH" +fi mkdir -p "$HOME/.cargo/bin/" export PATH="$HOME/.cargo/bin/:$PATH" if ! command -v deltachat-rpc-server &> /dev/null diff --git a/src/main.go b/src/main.go index e053d70..52ad55d 100644 --- a/src/main.go +++ b/src/main.go @@ -10,12 +10,34 @@ import ( "github.com/deltachat-bot/deltabot-cli-go/botcli" "github.com/deltachat/deltachat-rpc-client-go/deltachat" + "github.com/deltachat/deltachat-rpc-client-go/deltachat/option" "github.com/spf13/cobra" ) var cli = botcli.New("public-bots") func onBotInit(cli *botcli.BotCli, bot *deltachat.Bot, cmd *cobra.Command, args []string) { + accounts, err := bot.Rpc.GetAllAccountIds() + if err != nil { + cli.Logger.Error(err) + } + for _, accId := range accounts { + name, err := bot.Rpc.GetConfig(accId, "displayname") + if err != nil { + cli.Logger.Error(err) + } + if name.UnwrapOr("") == "" { + err = bot.Rpc.SetConfig(accId, "displayname", option.Some("Public Bots")) + if err != nil { + cli.Logger.Error(err) + } + err = bot.Rpc.SetConfig(accId, "delete_server_after", option.Some("1")) + if err != nil { + cli.Logger.Error(err) + } + } + } + bot.OnUnhandledEvent(onEvent) bot.OnNewMsg(onNewMsg) } From b420dd8ca7120bd64ce3de6044e14aec98dd4957 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 4 Feb 2024 17:42:04 -0500 Subject: [PATCH 2/5] remove old code --- scripts/run_tests.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index f4d478e..6d30fac 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -31,13 +31,6 @@ then chmod +x deltachat-rpc-server export PATH=`pwd`:"$PATH" fi -mkdir -p "$HOME/.cargo/bin/" -export PATH="$HOME/.cargo/bin/:$PATH" -if ! command -v deltachat-rpc-server &> /dev/null -then - echo "deltachat-rpc-server not found, installing..." - pip install deltachat-rpc-server -fi if ! command -v courtney &> /dev/null then echo "courtney not found, installing..." From 2b2aea3e42aea2d5f6f2ae847d4471783be53e3a Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 4 Feb 2024 18:31:35 -0500 Subject: [PATCH 3/5] update deltachat-rpc-server-go dependency --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 3216c57..57e46f3 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.21 require ( github.com/deltachat-bot/deltabot-cli-go v0.5.0 - github.com/deltachat/deltachat-rpc-client-go v1.127.1-0.20240204004424-951cc3a470da + github.com/deltachat/deltachat-rpc-client-go v1.127.1-0.20240204232737-080e111dd7d6 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.2 ) diff --git a/go.sum b/go.sum index 6318c65..27af6d3 100644 --- a/go.sum +++ b/go.sum @@ -10,8 +10,8 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/deltachat-bot/deltabot-cli-go v0.5.0 h1:WHHbG5++bO65risHzBj2jo0AOpBhJjVTKt6XH7d1KYo= github.com/deltachat-bot/deltabot-cli-go v0.5.0/go.mod h1:Lj4cmrHgOk0LKUOei5RAjx94VLTs11CfPhIqOBT+g8c= -github.com/deltachat/deltachat-rpc-client-go v1.127.1-0.20240204004424-951cc3a470da h1:j7ghoKrimFDeXQit5d11XhLZHhiKIdxbPyUZveQcwg8= -github.com/deltachat/deltachat-rpc-client-go v1.127.1-0.20240204004424-951cc3a470da/go.mod h1:Ctd0M0o87y2B0QSOn8QN6IMDWjHD7XzDKsjNMYwP208= +github.com/deltachat/deltachat-rpc-client-go v1.127.1-0.20240204232737-080e111dd7d6 h1:GyX2Llq96+fZD4qW9c6XQe6989puYP6u4ouBG4JGkFw= +github.com/deltachat/deltachat-rpc-client-go v1.127.1-0.20240204232737-080e111dd7d6/go.mod h1:Ctd0M0o87y2B0QSOn8QN6IMDWjHD7XzDKsjNMYwP208= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI= From 35f077291f805e5df86ba0a3f2f647feaadc8a2f Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 4 Feb 2024 19:54:48 -0500 Subject: [PATCH 4/5] tweak code --- scripts/run_tests.sh | 2 +- src/main.go | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/run_tests.sh b/scripts/run_tests.sh index 6d30fac..cd853ea 100755 --- a/scripts/run_tests.sh +++ b/scripts/run_tests.sh @@ -16,7 +16,7 @@ if ! command -v golangci-lint &> /dev/null then echo "golangci-lint not found, installing..." # binary will be $(go env GOPATH)/bin/golangci-lint - curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.54.2 + curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.55.2 fi if ! golangci-lint run then diff --git a/src/main.go b/src/main.go index 52ad55d..f7c48c8 100644 --- a/src/main.go +++ b/src/main.go @@ -17,6 +17,9 @@ import ( var cli = botcli.New("public-bots") func onBotInit(cli *botcli.BotCli, bot *deltachat.Bot, cmd *cobra.Command, args []string) { + bot.OnUnhandledEvent(onEvent) + bot.OnNewMsg(onNewMsg) + accounts, err := bot.Rpc.GetAllAccountIds() if err != nil { cli.Logger.Error(err) @@ -37,9 +40,6 @@ func onBotInit(cli *botcli.BotCli, bot *deltachat.Bot, cmd *cobra.Command, args } } } - - bot.OnUnhandledEvent(onEvent) - bot.OnNewMsg(onNewMsg) } func onBotStart(cli *botcli.BotCli, bot *deltachat.Bot, cmd *cobra.Command, args []string) { From e354f7a39f7236c8e54aeafa3dd9cb987545e7e2 Mon Sep 17 00:00:00 2001 From: adbenitez Date: Sun, 4 Feb 2024 19:56:54 -0500 Subject: [PATCH 5/5] update deps --- go.mod | 4 ++-- go.sum | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/go.mod b/go.mod index 57e46f3..8c9796d 100644 --- a/go.mod +++ b/go.mod @@ -3,8 +3,8 @@ module github.com/deltachat-bot/public-bots go 1.21 require ( - github.com/deltachat-bot/deltabot-cli-go v0.5.0 - github.com/deltachat/deltachat-rpc-client-go v1.127.1-0.20240204232737-080e111dd7d6 + github.com/deltachat-bot/deltabot-cli-go v0.6.0 + github.com/deltachat/deltachat-rpc-client-go v1.134.0 github.com/spf13/cobra v1.7.0 github.com/stretchr/testify v1.8.2 ) diff --git a/go.sum b/go.sum index 27af6d3..c57290f 100644 --- a/go.sum +++ b/go.sum @@ -8,10 +8,10 @@ github.com/creachadair/mds v0.8.2/go.mod h1:4vrFYUzTXMJpMBU+OA292I6IUxKWCCfZkgXg github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c= github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38= -github.com/deltachat-bot/deltabot-cli-go v0.5.0 h1:WHHbG5++bO65risHzBj2jo0AOpBhJjVTKt6XH7d1KYo= -github.com/deltachat-bot/deltabot-cli-go v0.5.0/go.mod h1:Lj4cmrHgOk0LKUOei5RAjx94VLTs11CfPhIqOBT+g8c= -github.com/deltachat/deltachat-rpc-client-go v1.127.1-0.20240204232737-080e111dd7d6 h1:GyX2Llq96+fZD4qW9c6XQe6989puYP6u4ouBG4JGkFw= -github.com/deltachat/deltachat-rpc-client-go v1.127.1-0.20240204232737-080e111dd7d6/go.mod h1:Ctd0M0o87y2B0QSOn8QN6IMDWjHD7XzDKsjNMYwP208= +github.com/deltachat-bot/deltabot-cli-go v0.6.0 h1:9hTulfKBsNshj22jsCGZ8NcDM1nPNrnU3/Ftiphy28w= +github.com/deltachat-bot/deltabot-cli-go v0.6.0/go.mod h1:sBXNRNrIjYgVT5aT1Lv2Wt7WthdTphNRt40RJovrzhI= +github.com/deltachat/deltachat-rpc-client-go v1.134.0 h1:rpGa/kL417ufyxsivT/G751aZifh8bpiPTIsXMzdDAI= +github.com/deltachat/deltachat-rpc-client-go v1.134.0/go.mod h1:Ctd0M0o87y2B0QSOn8QN6IMDWjHD7XzDKsjNMYwP208= github.com/fortytw2/leaktest v1.3.0 h1:u8491cBMTQ8ft8aeV+adlcytMZylmA5nnwwkRZjI8vw= github.com/fortytw2/leaktest v1.3.0/go.mod h1:jDsjWgpAGjm2CA7WthBh/CdZYEPF31XHquHwclZch5g= github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=