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

Take code review remarks into account

Browse Source
This commit is contained in:
Guillaume Lazzara
2020-01-01 13:33:59 +01:00
parent 390a33a32a
commit 2011c23edd
4 changed files with 95 additions and 82 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bridge/telegram/telegram.go
+4 -7
View File
@@ -8,7 +8,7 @@ import (
"github.com/42wim/matterbridge/bridge"
"github.com/42wim/matterbridge/bridge/config"
"github.com/42wim/matterbridge/bridge/helper"
"github.com/go-telegram-bot-api/telegram-bot-api"
tgbotapi "github.com/go-telegram-bot-api/telegram-bot-api"
)
const (
@@ -56,9 +56,6 @@ func (b *Btelegram) JoinChannel(channel config.ChannelInfo) error {
}
func (b *Btelegram) Send(msg config.Message) (string, error) {
var msgRes string
var msgErr error
b.Log.Debugf("=> Receiving %#v", msg)
// get the chatid
@@ -84,7 +81,7 @@ func (b *Btelegram) Send(msg config.Message) (string, error) {
// Upload a file if it exists
if msg.Extra != nil {
for _, rmsg := range helper.HandleExtra(&msg, b.General) {
if msgRes, msgErr = b.sendMessage(chatid, rmsg.Username, rmsg.Text); msgErr != nil {
if _, msgErr := b.sendMessage(chatid, rmsg.Username, rmsg.Text); msgErr != nil {
b.Log.Errorf("sendMessage failed: %s", msgErr)
}
}
@@ -104,10 +101,10 @@ func (b *Btelegram) Send(msg config.Message) (string, error) {
// Ignore empty text field needs for prevent double messages from whatsapp to telegram
// when sending media with text caption
if msg.Text != "" {
msgRes, msgErr = b.sendMessage(chatid, msg.Username, msg.Text)
return b.sendMessage(chatid, msg.Username, msg.Text)
}
return msgRes, msgErr
return "", nil
}
func (b *Btelegram) getFileDirectURL(id string) string {