Repository navigation
bridge: 发送完成后只清被发出的那份草稿 - #22
Open
std-external wants to merge 1 commit into
Open
std-external wants to merge 1 commit into
std-external wants to merge 1 commit into
Conversation
慢网下发完上一条时会把用户正在打的下一条一起清掉:_clearDraftAfterSend 在 发送完成的回调里直接删掉会话当前草稿,还推一条 draftMessageEmpty,客户端把 云端草稿应用到输入框就空了。 发送开始前快照草稿,完成时只有与快照的 date/message 一致才清那一条;发送前 没有草稿或期间又打了新的都不动。任何情况下都不再推 draftMessageEmpty: 发送端自己按下发送时已经清过输入框,事后推空草稿只会盖掉别处正在打的内容。 sendMedia / sendMultiMedia 同一处理。
std-external
force-pushed
the
fix/draft-clear-after-send
branch
from
November 20, 2026 14:46
71f36a3 to
5b16691
Compare
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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
问题
群友(QQ 群反馈,报告人 Anillc)在慢网下遇到:上一条消息还在发送中时,他开始打下一条;上一条发送成功的那一刻,输入框里正在打的内容被清空。
报告人确认没有应用 #21 的发送排队 patch,所以这个 bug 与排队无关(排队只会让「发送完成」更晚、窗口更大)。
原因
DialogRpc._clearDraftAfterSend在发送完成之后执行,无条件删掉该会话「此刻存着的草稿」,再推一条updateDraftMessage(draftMessageEmpty)(date取当前时间):History::skipCloudDraftUpdate只比较_acceptCloudDraftsAfter)拦不住它,客户端把「无草稿」应用到输入框时(ComposeControls::applyCloudDraft→applyDraft→createLocalDraftFromCloud→clearLocalDraft),正在打的内容就没了。修复
_draftBeforeSend:sendMessage/sendMedia/sendMultiMedia在开始发送之前快照该会话的草稿(作用域 +date+message)。_clearDraftAfterSend接收这份快照:只有发送完成时存着的草稿与快照date/message完全一致,才删掉那一条;发送前没有草稿、或期间用户又打了新的,都不动。draftMessageEmpty:发送端按下发送时自己已经清了输入框,事后推空草稿只会把其它正在编辑的内容重新盖成空。为什么保留「清草稿」这一步
官方客户端(tdesktop)点发送时只带
clear_draft标记并清掉本端草稿:apiwrap.cpp:4919-4924、媒体发送api_sending.cpp:976-982:设f_clear_draft+clearCloudDraft+startSavingCloudDraft;ApiWrap::saveCurrentDraftToCloud,只有本地草稿与云端草稿不相等才排队发messages.saveDraft(apiwrap.cpp:2367-2392)。发送之后两边都是空的,所以客户端不会补发一条空saveDraft。服务端那份草稿只能由
clear_draft来清,这正是本 PR 保留的部分(req.clearDraft时才清)。整个删掉的话,草稿行会留在库里,getDialogs继续把它投影成dialog.draft(dialogs.ts:4632),客户端History::applyDialog会把已经发出去的文本重新塞回输入框。所以本 PR 删掉的是「无条件清」和「发送后推空草稿」这两点,保留清草稿本身。
验证
updateDraftMessage(draftMessageEmpty)发出去(update-manager.ts:1040-1044会打印update send ... types=...),修复前会有。drafts.test.ts「keeps the draft started while the previous send is still in flight」:saveDraft → 卡住的 sendMessage → 期间 saveDraft 下一条 → 放行。修复前断言失败(新草稿被删成 undefined),修复后草稿保留且没有空草稿更新。saveDraft("")推空草稿的行为不变。vitest run packages/bridge/src --exclude '**/*.e2e.test.ts':856 passed / 1 failed(voice-worker-client需要本机cargo,环境问题);另有 2 个 suite 因本地node_modules旧安装缺cron包无法加载,与本次改动无关。tsc --project tsconfig.test.json:改动文件无类型错误。yarn build)。来源:QQ 群内反馈(报告人 Anillc)。(本 PR 由维护者代为提交)