compose: don't fail on 0 attachments

This commit is contained in:
Drew DeVault 2020-10-30 10:23:57 -04:00
parent 8bd829962f
commit d325628cb2

View file

@ -546,9 +546,13 @@ func handleCompose(ctx *alps.Context, msg *OutgoingMessage, options *composeOpti
uuids := ctx.FormValue("attachment-uuids") uuids := ctx.FormValue("attachment-uuids")
for _, uuid := range strings.Split(uuids, ",") { for _, uuid := range strings.Split(uuids, ",") {
if uuid == "" {
continue
}
attachment := ctx.Session.PopAttachment(uuid) attachment := ctx.Session.PopAttachment(uuid)
if attachment == nil { if attachment == nil {
return fmt.Errorf("Unable to retrieve message attachments from session") return fmt.Errorf("Unable to retrieve message attachment %s from session", uuid)
} }
msg.Attachments = append(msg.Attachments, &refcountedAttachment{ msg.Attachments = append(msg.Attachments, &refcountedAttachment{
attachment.File, attachment.File,