fix formatting

This commit is contained in:
Thom Dickson
2023-01-05 01:17:05 -05:00
parent 48baaf03dc
commit a98d26b11a
2 changed files with 31 additions and 31 deletions

View File

@@ -213,9 +213,9 @@ func (b *Btelegram) handleRecv(updates <-chan tgbotapi.Update) {
// set the ID's from the channel or group message
rmsg.ID = strconv.Itoa(message.MessageID)
rmsg.Channel = strconv.FormatInt(message.Chat.ID, 10)
if message.MessageThreadID != 0 {
rmsg.Channel += "/" + strconv.Itoa(message.MessageThreadID)
}
if message.MessageThreadID != 0 {
rmsg.Channel += "/" + strconv.Itoa(message.MessageThreadID)
}
// preserve threading from telegram reply
if message.ReplyToMessage != nil &&

View File

@@ -89,33 +89,33 @@ func TGGetParseMode(b *Btelegram, username string, text string) (textout string,
func (b *Btelegram) Send(msg config.Message) (string, error) {
b.Log.Debugf("=> Receiving %#v", msg)
var chatid int64
topicid := 0
var chatid int64
topicid := 0
// get the chatid
if strings.Contains(msg.Channel, "/") {
s := strings.Split(msg.Channel, "/")
if len(s) < 2 {
b.Log.Errorf("Invalid channel format: %#v\n", msg.Channel)
return "", nil
}
id, err := strconv.ParseInt(s[0], 10, 64)
if err != nil {
return "", err
}
chatid = id
tid, err := strconv.Atoi(s[1])
if err != nil {
return "", err
}
topicid = tid
} else {
id, err := strconv.ParseInt(msg.Channel, 10, 64)
if err != nil {
return "", err
}
chatid = id
}
if strings.Contains(msg.Channel, "/") {
s := strings.Split(msg.Channel, "/")
if len(s) < 2 {
b.Log.Errorf("Invalid channel format: %#v\n", msg.Channel)
return "", nil
}
id, err := strconv.ParseInt(s[0], 10, 64)
if err != nil {
return "", err
}
chatid = id
tid, err := strconv.Atoi(s[1])
if err != nil {
return "", err
}
topicid = tid
} else {
id, err := strconv.ParseInt(msg.Channel, 10, 64)
if err != nil {
return "", err
}
chatid = id
}
// map the file SHA to our user (caches the avatar)
if msg.Event == config.EventAvatarDownload {
@@ -182,9 +182,9 @@ func (b *Btelegram) getFileDirectURL(id string) string {
func (b *Btelegram) sendMessage(chatid int64, topicid int, username, text string, parentID int) (string, error) {
m := tgbotapi.NewMessage(chatid, "")
m.Text, m.ParseMode = TGGetParseMode(b, username, text)
if topicid != 0 {
m.BaseChat.MessageThreadID = topicid
}
if topicid != 0 {
m.BaseChat.MessageThreadID = topicid
}
m.ReplyToMessageID = parentID
m.DisableWebPagePreview = b.GetBool("DisableWebPagePreview")