@@ -1,13 +1,14 @@
11package editor
22
33import (
4− "errors"
54 "fmt"
65 "math/rand"
76 "net/http"
87 "os"
98 "path/filepath"
9+ "regexp"
1010 "slices"
11+ "strconv"
1112 "strings"
1213 "unicode"
1314
@@ -146,7 +147,7 @@ func (m *editorCmp) send() tea.Cmd {
146147
147148 attachments := m.attachments
148149
149− if value == "" {
150+ if value == "" && !message.ContainsTextAttachment(attachments) {
150151 return nil
151152 }
152153
@@ -233,13 +234,31 @@ func (m *editorCmp) Update(msg tea.Msg) (util.Model, tea.Cmd) {
233234 m.textarea.SetValue(msg.Text)
234235 m.textarea.MoveToEnd()
235236 case tea.PasteMsg:
236− content, path, err := pasteToFile(msg)
237− if errors.Is(err, errNotAFile) {
238− m.textarea, cmd = m.textarea.Update(msg)
239− return m, cmd
237+ // If pasted text has more than 2 newlines, treat it as a file attachment.
238+ if strings.Count(msg.Content, "\n") > 2 {
239+ content := []byte(msg.Content)
240+ if len(content) > maxAttachmentSize {
241+ return m, util.ReportWarn("Paste is too big (>5mb)")
242+ }
243+ name := fmt.Sprintf("paste_%d.txt", m.pasteIdx())
244+ mimeType := mimeOf(content)
245+ attachment := message.Attachment{
246+ FileName: name,
247+ FilePath: name,
248+ MimeType: mimeType,
249+ Content: content,
250+ }
251+ return m, util.CmdHandler(filepicker.FilePickedMsg{
252+ Attachment: attachment,
253+ })
240254 }
255+
256+ // Try to parse as a file path.
257+ content, path, err := filepathToFile(msg.Content)
241258 if err != nil {
242− return m, util.ReportError(err)
259+ // Not a file path, just update the textarea normally.
260+ m.textarea, cmd = m.textarea.Update(msg)
261+ return m, cmd
243262 }
244263
245264 if len(content) > maxAttachmentSize {
@@ -256,7 +275,6 @@ func (m *editorCmp) Update(msg tea.Msg) (util.Model, tea.Cmd) {
256275 if !attachment.IsText() && !attachment.IsImage() {
257276 return m, util.ReportWarn("Invalid file content type: " + mimeType)
258277 }
259− m.textarea.InsertString(attachment.FileName)
260278 return m, util.CmdHandler(filepicker.FilePickedMsg{
261279 Attachment: attachment,
262280 })
@@ -627,33 +645,21 @@ func New(app *app.App) Editor {
627645
628646var maxAttachmentSize = 5 * 1024 * 1024 // 5MB
629647
630−var errNotAFile = errors.New("not a file")
631−
632−func pasteToFile(msg tea.PasteMsg) ([]byte, string, error) {
633− content, path, err := filepathToFile(msg.Content)
634− if err == nil {
635− return content, path, err
636− }
637−
638− if strings.Count(msg.Content, "\n") > 2 {
639− return contentToFile([]byte(msg.Content))
640− }
641−
642− return nil, "", errNotAFile
643−}
648+var pasteRE = regexp.MustCompile(`paste_(\d+).txt`)
644649
645−func contentToFile(content []byte) ([]byte, string, error) {
646− f, err := os.CreateTemp("", "paste_*.txt")
647− if err != nil {
648− return nil, "", err
649− }
650− if _, err := f.Write(content); err != nil {
651− return nil, "", err
652− }
653− if err := f.Close(); err != nil {
654− return nil, "", err
650+func (m *editorCmp) pasteIdx() int {
651+ result := 0
652+ for _, at := range m.attachments {
653+ found := pasteRE.FindStringSubmatch(at.FileName)
654+ if len(found) == 0 {
655+ continue
656+ }
657+ idx, err := strconv.Atoi(found[1])
658+ if err == nil {
659+ result = max(result, idx)
660+ }
655661 }
656− return content, f.Name(), nil
662+ return result + 1
657663}
658664
659665func filepathToFile(name string) ([]byte, string, error) {