blacklight/aerc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

archive,move: fix reselect next message

Browse source 
Move and Archive used store.Next to select the next message. When moving
or archiving multiple messages with an upward movement, this would
result in a to-be-removed message being selected. Use findNextNonDeleted
function to select the correct next message for these commands.

Signed-off-by: Tim Culverhouse <tim@timculverhouse.com>
Acked-by: Robin Jarry <robin@jarry.cc>
This commit is contained in:
Tim Culverhouse 2022-07-31 09:41:21 -05:00 committed by Robin Jarry
parent 56dabb5c9c
commit 894668aec2
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
commands/msg/archive.go
View file

@ -53,9 +53,13 @@ func (Archive) Execute(aerc *widgets.Aerc, args []string) error {
return err return err
} }
archiveDir := acct.AccountConfig().Archive archiveDir := acct.AccountConfig().Archive
store.Next() var uids []uint32
for _, msg := range msgs {
uids = append(uids, msg.Uid)
}
store.ClearVisualMark() store.ClearVisualMark()
acct.Messages().Invalidate() acct.Messages().Invalidate()
findNextNonDeleted(uids, store)
var uidMap map[string][]uint32 var uidMap map[string][]uint32
switch args[1] { switch args[1] {

2
commands/msg/move.go
View file

@ -61,9 +61,9 @@ func (Move) Execute(aerc *widgets.Aerc, args []string) error {
if isMsgView { if isMsgView {
aerc.RemoveTab(h.msgProvider) aerc.RemoveTab(h.msgProvider)
} }
store.Next()
store.ClearVisualMark() store.ClearVisualMark()
acct.Messages().Invalidate() acct.Messages().Invalidate()
findNextNonDeleted(uids, store)
joinedArgs := strings.Join(args[optind:], " ") joinedArgs := strings.Join(args[optind:], " ")
store.Move(uids, joinedArgs, createParents, func( store.Move(uids, joinedArgs, createParents, func(
msg types.WorkerMessage) { msg types.WorkerMessage) {