lug/matterbridge
10
0
Fork 2
Code Issues 3 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into enhance-irc-join-part

Browse Source
This commit is contained in:
Wim
2022-09-05 22:33:49 +02:00
committed by GitHub
parent 3087867715 fda05f2262
commit 2bbd216210
47 changed files with 2011 additions and 1705 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bridge/slack/handlers.go
View File

@@ -80,7 +80,7 @@ func (b *Bslack) handleSlackClient(messages chan *config.Message) {
case *slack.FileDeletedEvent:
rmsg, err := b.handleFileDeletedEvent(ev)
if err != nil {
b.Log.Errorf("%#v", err)
b.Log.Printf("%#v", err)
continue
}
messages <- rmsg

2
bridge/telegram/handlers.go
View File

@@ -176,7 +176,7 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
if update.Message == nil && update.ChannelPost == nil &&
update.EditedMessage == nil && update.EditedChannelPost == nil {
b.Log.Error("Getting nil messages, this shouldn't happen.")
b.Log.Info("Received event without messages, skipping.")
continue
}

3
bridge/whatsappmulti/helpers.go
View File

@@ -1,3 +1,4 @@
//go:build whatsappmulti
// +build whatsappmulti
package bwhatsapp
@@ -77,7 +78,7 @@ func (b *Bwhatsapp) getSenderNotify(senderJid types.JID) string {
func (b *Bwhatsapp) GetProfilePicThumb(jid string) (*types.ProfilePictureInfo, error) {
pjid, _ := types.ParseJID(jid)
info, err := b.wc.GetProfilePictureInfo(pjid, true)
info, err := b.wc.GetProfilePictureInfo(pjid, true, "")
if err != nil {
return nil, fmt.Errorf("failed to get avatar: %v", err)
}

7
bridge/whatsappmulti/whatsapp.go
View File

@@ -1,3 +1,4 @@
//go:build whatsappmulti
// +build whatsappmulti
package bwhatsapp
@@ -234,7 +235,7 @@ func (b *Bwhatsapp) PostDocumentMessage(msg config.Message, filetype string) (st
b.Log.Debugf("=> Sending %#v", msg)
ID := whatsmeow.GenerateMessageID()
_, err = b.wc.SendMessage(groupJID, ID, &message)
_, err = b.wc.SendMessage(context.TODO(), groupJID, ID, &message)
return ID, err
}
@@ -268,7 +269,7 @@ func (b *Bwhatsapp) PostImageMessage(msg config.Message, filetype string) (strin
b.Log.Debugf("=> Sending %#v", msg)
ID := whatsmeow.GenerateMessageID()
_, err = b.wc.SendMessage(groupJID, ID, &message)
_, err = b.wc.SendMessage(context.TODO(), groupJID, ID, &message)
return ID, err
}
@@ -327,7 +328,7 @@ func (b *Bwhatsapp) Send(msg config.Message) (string, error) {
message.Conversation = &text
ID := whatsmeow.GenerateMessageID()
_, err := b.wc.SendMessage(groupJID, ID, &message)
_, err := b.wc.SendMessage(context.TODO(), groupJID, ID, &message)
return ID, err
}