narayana/telegabber
6
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix a crash on big emojis

Browse source
This commit is contained in:
Bohdan Horbeshko 2021-12-04 22:27:14 -05:00
parent 105f5017c3
commit 2a1c09fcdd
2 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
telegram/connect.go
View file

@ -154,6 +154,7 @@ func (c *Client) interactor() {
for { for {
state, ok := <-c.authorizer.State state, ok := <-c.authorizer.State
if !ok { if !ok {
gateway.SendMessage(c.jid, "", "Interactor is disconnected", c.xmpp)
log.Error("Interactor is disconnected") log.Error("Interactor is disconnected")
return return
} }

11
telegram/utils.go
View file

@ -247,12 +247,14 @@ func (c *Client) formatMessage(chatID int64, messageID int64, preview bool, mess
} }
var text string var text string
if message.Content != nil {
switch message.Content.MessageContentType() { switch message.Content.MessageContentType() {
case client.TypeMessageText: case client.TypeMessageText:
messageText, _ := message.Content.(*client.MessageText) messageText, _ := message.Content.(*client.MessageText)
text = messageText.Text.Text text = messageText.Text.Text
// TODO: handle other message types with labels (not supported in Zhabogram!) // TODO: handle other message types with labels (not supported in Zhabogram!)
} }
}
if text != "" { if text != "" {
if !preview { if !preview {
str.WriteString(text) str.WriteString(text)
@ -285,6 +287,11 @@ func (c *Client) formatContent(file *client.File, filename string) string {
} }
func (c *Client) messageToText(message *client.Message) string { func (c *Client) messageToText(message *client.Message) string {
if message.Content == nil {
log.Warnf("Unknown message (big emoji?): %#v", message)
return "<BIG EMOJI>"
}
markupFunction := formatter.EntityToMarkdown markupFunction := formatter.EntityToMarkdown
switch message.Content.MessageContentType() { switch message.Content.MessageContentType() {
case client.TypeMessageSticker: case client.TypeMessageSticker:
@ -378,6 +385,10 @@ func (c *Client) messageToText(message *client.Message) string {
} }
func (c *Client) contentToFilename(content client.MessageContent) (*client.File, string) { func (c *Client) contentToFilename(content client.MessageContent) (*client.File, string) {
if content == nil {
return nil, ""
}
switch content.MessageContentType() { switch content.MessageContentType() {
case client.TypeMessageSticker: case client.TypeMessageSticker:
sticker, _ := content.(*client.MessageSticker) sticker, _ := content.(*client.MessageSticker)