Fluffy/Lynxie
1
0
Fork 0
mirror of https://github.com/Fluffy-Bean/Lynxie.git synced 2025-05-14 08:02:17 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Search message history when searching for image

Browse source 
Handle more panic cases
This commit is contained in:
Michał Gdula 2025-05-12 00:13:21 +01:00
parent 573296e7d0
commit e8f6e7cc0a
1 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

34
pkg/commands/img/img.go
View file

@ -256,7 +256,6 @@ func loadImageFromBytes(buff []byte) (image.Image, error) {
} }
func findClosestImage(h *handler.Handler) (string, error) { func findClosestImage(h *handler.Handler) (string, error) {
// Get message attachments
if len(h.Message.Attachments) >= 1 { if len(h.Message.Attachments) >= 1 {
if h.Message.Attachments[0].Size > maxFileSize { if h.Message.Attachments[0].Size > maxFileSize {
return "", fmt.Errorf("file size is too big") return "", fmt.Errorf("file size is too big")
@ -265,20 +264,37 @@ func findClosestImage(h *handler.Handler) (string, error) {
return h.Message.Attachments[0].ProxyURL, nil return h.Message.Attachments[0].ProxyURL, nil
} }
// If no attachments exist... see if the message is replying to someone
if h.Message.ReferencedMessage != nil { if h.Message.ReferencedMessage != nil {
if len(h.Message.ReferencedMessage.Attachments) >= 1 { message := h.Message.ReferencedMessage
if h.Message.ReferencedMessage.Attachments[0].Size > maxFileSize {
if len(message.Attachments) >= 1 {
if message.Attachments[0].Size > maxFileSize {
return "", fmt.Errorf("file size is too big") return "", fmt.Errorf("file size is too big")
} }
return h.Message.ReferencedMessage.Attachments[0].ProxyURL, nil return message.Attachments[0].ProxyURL, nil
} }
// Maybe replying to an embed...? if len(message.Embeds) >= 1 && message.Embeds[0].Image != nil {
if len(h.Message.ReferencedMessage.Embeds) >= 1 { return message.Embeds[0].Image.ProxyURL, nil
//... no file size is provided }
return h.Message.ReferencedMessage.Embeds[0].Image.ProxyURL, nil }
history, err := h.Session.ChannelMessages(h.Message.ChannelID, 10, h.Message.ID, "", "")
if err != nil {
return "", err
}
for _, message := range history {
if len(message.Attachments) >= 1 {
if message.Attachments[0].Size > maxFileSize {
return "", fmt.Errorf("file size is too big")
}
return message.Attachments[0].ProxyURL, nil
}
if len(message.Embeds) >= 1 && message.Embeds[0].Image != nil {
return message.Embeds[0].Image.ProxyURL, nil
} }
} }