Repository navigation
compose: a message can carry several files, not just the first one dropped #82
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -179,9 +179,15 @@ FocusScope { | |
| property var attMetrics: ({}) | ||
| property var fetchQueue: [] | ||
| property string fetchingId: "" | ||
| // Queued attachments, oldest first: [{ path, label }]. A single draft could | ||
| // only ever ship the first of five dropped photos, silently discarding the | ||
| // rest — a drop that loses four files with no message is worse than a | ||
| // refusal. Sends go out one part per file, in this order. | ||
| property var attachDrafts: [] | ||
| readonly property int attachCount: attachDrafts.length | ||
| /** How many files one message may carry. A stray drop of a whole folder | ||
| * should be refused, not turned into eighty sends. */ | ||
| readonly property int attachMax: 10 | ||
| // What the in-flight file send / paste belong to, so late completions | ||
| // can't clobber a NEWER draft or land in a DIFFERENT conversation. | ||
| property string sendDraftPath: "" | ||
|
|
@@ -372,6 +378,15 @@ FocusScope { | |
| // Text sends queue instead of refusing while one is on the wire; each gets | ||
| // its bubble the instant Enter is pressed (see pendingSends). | ||
| property var sendQueue: [] | ||
| // Files still to ship for the send in flight: one part per file, in order. | ||
| // The caption rides the FIRST part only — repeating it on each would post | ||
| // the same sentence five times. | ||
| property var fileQueue: [] | ||
| property string sendCaption: "" | ||
| // The service is captured when the batch STARTS, never re-read per part: | ||
| // root.active can change under a multi-part send, and a later part must not | ||
| // go out on a different service from the first (war room #2). | ||
| property string sendService: "" | ||
| // Sends the Mac has not written a row for yet, {chat, text, ts}. Every | ||
| // thread reload carries them to thread.ts (--pending-stdin, never argv), | ||
| // which keeps their bubbles until the real row lands. Memory only. | ||
|
|
@@ -497,7 +512,7 @@ FocusScope { | |
| function back() { | ||
| clearThread() | ||
| composeField.text = "" | ||
| clearAttachments() // a queued file must never survive into another thread | ||
| pinToBottom = false | ||
| // Top of the list for a mouse user; the cursor row for a keyboard user. | ||
| Qt.callLater(function() { | ||
|
|
@@ -551,7 +566,7 @@ FocusScope { | |
| loading = true | ||
| composeField.text = drafts[String(t.chat)] || "" // this conversation's unsent text | ||
| composeField.cursorPosition = composeField.length | ||
| clearAttachments() // a queued file must never survive into another thread | ||
| requestThreadLoad(String(t.chat)) | ||
| } | ||
|
|
||
|
|
@@ -967,18 +982,41 @@ FocusScope { | |
|
|
||
| // ------------------------------------------------------ compose attachment | ||
|
|
||
| /** Queue one more file on the draft. The same path twice is one attachment. */ | ||
| function addAttachment(path) { | ||
| var p = String(path || "") | ||
| if (p === "") return | ||
| for (var i = 0; i < root.attachDrafts.length; i++) if (root.attachDrafts[i].path === p) return | ||
| if (root.attachDrafts.length >= root.attachMax) { | ||
| root.note = "at most " + root.attachMax + " files per message" | ||
| return | ||
| } | ||
| var parts = p.split("/") | ||
| root.attachDrafts = root.attachDrafts.concat([{ path: p, label: parts[parts.length - 1] || "file" }]) | ||
| Qt.callLater(function() { composeField.forceActiveFocus() }) | ||
| } | ||
|
|
||
| /** Queue several at once — a multi-file drop. Reports what would not fit | ||
| * rather than dropping it on the floor. */ | ||
| function addAttachments(paths) { | ||
| var before = root.attachDrafts.length | ||
| for (var i = 0; i < (paths || []).length; i++) { | ||
| if (root.attachDrafts.length >= root.attachMax) { | ||
| root.note = "attached " + (root.attachDrafts.length - before) + " — at most " | ||
| + root.attachMax + " files per message" | ||
| return | ||
| } | ||
| root.addAttachment(paths[i]) | ||
| } | ||
| } | ||
|
|
||
| function removeAttachment(path) { | ||
| root.attachDrafts = root.attachDrafts.filter(function(d) { return d.path !== String(path) }) | ||
| } | ||
|
|
||
| function clearAttachments() { | ||
| root.attachDrafts = [] | ||
| root.fileQueue = [] | ||
| } | ||
|
|
||
| function startPaste() { | ||
|
|
@@ -1329,35 +1367,35 @@ FocusScope { | |
| if (trimmed.indexOf("/attach ") === 0) { | ||
| var p = trimmed.slice(8).trim() | ||
| if (p.indexOf("~/") === 0) p = root.home + p.slice(1) | ||
| addAttachment(p) | ||
| composeField.text = "" | ||
| note = root.attachCount > 1 | ||
| ? root.attachCount + " files attached — caption, or Enter to send" | ||
| : "attached — type a caption or press Enter to send" | ||
|
Comment on lines
+1370
to
+1374
There was a problem hiding this comment.
When ten files are already queued, Useful? React with 👍 / 👎. |
||
| return | ||
| } | ||
|
|
||
| if (root.attachCount === 0 && trimmed === "") return | ||
| if (!isSendable(root.active)) { | ||
| note = "Read-only — group id unknown — send from your phone" | ||
| return | ||
| } | ||
|
|
||
| if (root.attachCount > 0) { | ||
| if (sendProc.running || fileSendProc.running) { | ||
| note = "a message is already sending" | ||
| return | ||
| } | ||
| sendChat = String(root.active.chat) | ||
| sendText = text | ||
| // One part per file, in the order they were queued; the caption goes | ||
| // with the first only. fileSendProc is a single Process, so they ship | ||
| // strictly one at a time — pumpFileSend() starts the next as each lands. | ||
| root.fileQueue = root.attachDrafts.map(function(d) { return d.path }) | ||
| root.sendCaption = trimmed | ||
| var svc = String(root.active.service || "") | ||
| root.sendService = /^(SMS|RCS)$/i.test(svc) ? svc.toUpperCase() : "" | ||
| pumpFileSend() | ||
| return | ||
| } | ||
|
|
||
|
|
@@ -1436,6 +1474,27 @@ FocusScope { | |
| sendProc.stdinEnabled = false | ||
| } | ||
|
|
||
| /** Ship the next queued file. The caption rides the FIRST part only, and | ||
| * goes over stdin — never this process's argv (audit #4, war room #1/#13). */ | ||
| function pumpFileSend() { | ||
| if (fileSendProc.running) return | ||
| if (root.fileQueue.length === 0) return | ||
| var path = root.fileQueue[0] | ||
| root.fileQueue = root.fileQueue.slice(1) | ||
| root.sendDraftPath = path | ||
|
Comment on lines
+1481
to
+1484
There was a problem hiding this comment.
This adds batching decisions—queue advancement, ordering, caption consumption, and retry state—directly to QML, while the new tests only search the QML source for strings and cannot execute these transitions. Extract this state machine into TypeScript and unit-test success, failure, removal, and navigation transitions, leaving QML to render and dispatch effects as required by the repository. AGENTS.md reference: AGENTS.md:L17-L19 Useful? React with 👍 / 👎. |
||
| var left = root.fileQueue.length | ||
| root.note = left > 0 ? "sending… (" + (left + 1) + " left)" : "sending…" | ||
| // send-file.ts owns target resolution (group guid or DM handle). | ||
| fileSendProc.command = ["bun", root.sendFileScript, root.sendChat, path, "--caption-stdin"] | ||
| .concat(root.sendService !== "" ? ["--service", root.sendService] : []) | ||
| fileSendProc.stdinEnabled = true | ||
| fileSendProc.running = true | ||
| fileSendProc.write(root.sendCaption) | ||
| fileSendProc.stdinEnabled = false | ||
| // Spent: only the first part carries it. | ||
| root.sendCaption = "" | ||
| } | ||
|
|
||
| property string copyFeedback: "" | ||
| Process { | ||
| id: copyProc | ||
|
|
@@ -1681,7 +1740,7 @@ FocusScope { | |
| if (!root.inThread || String(root.active.chat) !== root.pasteChat) return | ||
| try { | ||
| var d = JSON.parse(text.trim()) | ||
| if (d.kind === "image" || d.kind === "file") root.addAttachment(String(d.path || "")) | ||
| else if (d.kind === "text") { | ||
| composeField.insert(composeField.cursorPosition, String(d.text || "")) | ||
| } | ||
|
|
@@ -1703,18 +1762,33 @@ FocusScope { | |
| if (!ok) err = d.online === false ? "not sent — Mac unreachable" : String(d.error || err) | ||
| } catch (e) { /* fall through */ } | ||
| if (ok) { | ||
| // Retire only the part that actually shipped — the user may have | ||
| // queued another file while this one was in flight. | ||
| root.removeAttachment(root.sendDraftPath) | ||
| root.sendDraftPath = "" | ||
| root.reloadChat = root.sendChat | ||
| reloadTimer.restart() | ||
| if (root.fileQueue.length > 0) { | ||
| // More parts to go: keep sendChat/sendText, do NOT clear the | ||
| // field or hand focus back mid-batch. | ||
| root.pumpFileSend() | ||
| return | ||
| } | ||
| if (belongsHere) { | ||
| root.note = "" | ||
| if (composeField.text === root.sendText) composeField.text = "" | ||
| } | ||
| } else if (belongsHere) { | ||
| // Stop the batch: the parts still queued stay attached, so the user | ||
| // can retry them rather than hunt for which of five went out. | ||
| var left = root.fileQueue.length | ||
| root.note = left > 0 ? err + " — " + (left + 1) + " still attached" : err | ||
| root.fileQueue = [] | ||
| root.sendDraftPath = "" | ||
| } | ||
| root.fileQueue = [] | ||
| root.sendCaption = "" | ||
| root.sendService = "" | ||
| root.sendChat = "" | ||
| root.sendText = "" | ||
| if (belongsHere) composeField.forceActiveFocus() | ||
|
|
@@ -1985,7 +2059,7 @@ FocusScope { | |
| || (text >= "1" && text <= "9") | ||
| if (!jump) return false | ||
| if (searchField.activeFocus || newField.activeFocus || bubbleFocused) return false | ||
| if (composeField.activeFocus && (composeField.text.length > 0 || root.attachCount > 0)) | ||
| return false | ||
| return handleTextKey(text) === true | ||
| } | ||
|
|
@@ -3463,32 +3537,47 @@ FocusScope { | |
| foreground: root.foreground | ||
| } | ||
|
|
||
| // queued attachments — ✕ removes one. ONE CHIP PER ROW, never a | ||
| // RowLayout of N: summed implicit widths stretch the whole column | ||
| // past the panel and take every right-aligned element off-screen | ||
| // with it (CLAUDE.md; the same rule the received chips follow). | ||
| ColumnLayout { | ||
| id: attachList | ||
| Layout.fillWidth: true | ||
| visible: root.inThread && root.attachCount > 0 | ||
| spacing: Style.space(4) | ||
| Repeater { | ||
| model: root.attachDrafts | ||
| delegate: RowLayout { | ||
| required property var modelData | ||
| Layout.fillWidth: true | ||
| spacing: 0 | ||
| Rectangle { | ||
| // Capped at the compose column: a long filename must not | ||
| // push the row wider than the panel. | ||
| Layout.preferredWidth: Math.min( | ||
| Math.ceil(attachChipText.implicitWidth) + Style.space(18), | ||
| attachList.width) | ||
| Layout.preferredHeight: Math.ceil(attachChipText.implicitHeight) + Style.space(12) | ||
| radius: Style.space(14) | ||
| color: root.mineFill | ||
| opacity: 0.9 | ||
| Text { | ||
| id: attachChipText | ||
| anchors.centerIn: parent | ||
| readonly property string label: String(modelData.label || "file") | ||
| text: "📎 " + (label.length > 40 ? label.slice(0, 37) + "…" : label) + " ✕" | ||
| textFormat: Text.PlainText | ||
| color: root.mineText | ||
| font.family: root.fontFamily | ||
| font.pixelSize: root.fontCaption | ||
| } | ||
| HoverHandler { cursorShape: Qt.PointingHandCursor } | ||
| TapHandler { onTapped: root.removeAttachment(modelData.path) } | ||
| } | ||
| Item { Layout.fillWidth: true } | ||
| } | ||
| } | ||
| } | ||
|
|
||
| RowLayout { | ||
|
|
@@ -3592,7 +3681,7 @@ FocusScope { | |
| // instead; send() is the authoritative online/sendability guard. | ||
| enabled: true | ||
| readOnly: !root.online || !root.isSendable(root.active) | ||
| placeholderText: root.attachCount > 0 | ||
| ? "caption (optional) — Enter sends the file" | ||
| : root.isSendable(root.active) ? "iMessage" : "Read-only — group id unknown" | ||
| color: root.foreground | ||
|
|
@@ -3651,7 +3740,7 @@ FocusScope { | |
| } | ||
| // Actions on the selected bubble. Enter is free here: with no | ||
| // text and no queued file, send() would do nothing anyway. | ||
| var b = empty && root.attachCount === 0 ? root.selectedBubble() : null | ||
| if (b) { | ||
| if (event.key === Qt.Key_Return || event.key === Qt.Key_Enter) { event.accepted = true; root.openBubble(b); return } | ||
| if (event.matches(StandardKey.Copy)) { event.accepted = true; root.copyBubble(b); return } | ||
|
|
@@ -3670,7 +3759,7 @@ FocusScope { | |
| // send button — the blue arrow circle (lit when text OR a file is queued) | ||
| Rectangle { | ||
| Layout.alignment: Qt.AlignBottom | ||
| readonly property bool armed: composeField.text.trim() !== "" || root.attachCount > 0 | ||
| width: Style.space(28); height: width; radius: width / 2 | ||
| color: armed ? root.mineFill : Qt.rgba(root.foreground.r, root.foreground.g, root.foreground.b, 0.15) | ||
| Text { | ||
|
|
@@ -3757,9 +3846,16 @@ FocusScope { | |
| keys: ["text/uri-list"] | ||
| onDropped: (drop) => { | ||
| if (!drop.hasUrls || drop.urls.length === 0) return | ||
| // EVERY dropped file, not just urls[0]: dropping five photos used to | ||
| // attach one and discard four without saying so. | ||
| var paths = [] | ||
| for (var i = 0; i < drop.urls.length; i++) { | ||
| var u = String(drop.urls[i]) | ||
| if (u.indexOf("file://") !== 0) continue | ||
| paths.push(decodeURIComponent(u.replace(/^file:\/\//, ""))) | ||
| } | ||
| if (paths.length === 0) return | ||
| root.addAttachments(paths) | ||
| drop.accept() | ||
| } | ||
| } | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
While the first part is in flight, clicking ✕ on a later attachment only removes it from
attachDrafts; thefileQueuesnapshot still contains that path, sopumpFileSend()subsequently transmits a file the user explicitly removed. Either remove not-yet-started paths fromfileQueueas well or disable removal for the active batch.AGENTS.md reference: AGENTS.md:L8-L10
Useful? React with 👍 / 👎.