From e034fdf1eeba02daa2353e41da89213b8067727e Mon Sep 17 00:00:00 2001 From: Wim Date: Thu, 23 May 2024 23:27:27 +0200 Subject: [PATCH] Fix api changes wrt to dependencies --- bridge/discord/discord.go | 2 +- bridge/slack/helpers.go | 4 +++- bridge/whatsappmulti/helpers.go | 3 +-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/bridge/discord/discord.go b/bridge/discord/discord.go index 51dbe6bc..9bac021a 100644 --- a/bridge/discord/discord.go +++ b/bridge/discord/discord.go @@ -90,7 +90,7 @@ func (b *Bdiscord) Connect() error { if err != nil { return err } - guilds, err := b.c.UserGuilds(100, "", "") + guilds, err := b.c.UserGuilds(100, "", "", false) if err != nil { return err } diff --git a/bridge/slack/helpers.go b/bridge/slack/helpers.go index e46e2725..309b3af8 100644 --- a/bridge/slack/helpers.go +++ b/bridge/slack/helpers.go @@ -101,7 +101,9 @@ func (b *Bslack) populateMessageWithBotInfo(ev *slack.MessageEvent, rmsg *config var err error var bot *slack.Bot for { - bot, err = b.rtm.GetBotInfo(ev.BotID) + bot, err = b.rtm.GetBotInfo(slack.GetBotInfoParameters{ + Bot: ev.BotID, + }) if err == nil { break } diff --git a/bridge/whatsappmulti/helpers.go b/bridge/whatsappmulti/helpers.go index b0686190..cecbf5a9 100644 --- a/bridge/whatsappmulti/helpers.go +++ b/bridge/whatsappmulti/helpers.go @@ -136,7 +136,7 @@ func isGroupJid(identifier string) bool { func (b *Bwhatsapp) getDevice() (*store.Device, error) { device := &store.Device{} - storeContainer, err := sqlstore.New("sqlite", "file:"+b.Config.GetString("sessionfile")+".db?_foreign_keys=on&_pragma=busy_timeout=10000", nil) + storeContainer, err := sqlstore.New("sqlite", "file:"+b.Config.GetString("sessionfile")+".db?_pragma=foreign_keys(1)&_pragma=busy_timeout=10000", nil) if err != nil { return device, fmt.Errorf("failed to connect to database: %v", err) } @@ -151,7 +151,6 @@ func (b *Bwhatsapp) getDevice() (*store.Device, error) { func (b *Bwhatsapp) getNewReplyContext(parentID string) (*proto.ContextInfo, error) { replyInfo, err := b.parseMessageID(parentID) - if err != nil { return nil, err }