beenull/himalaya
1
0
Fork 0
mirror of https://github.com/soywod/himalaya.git synced 2024-11-25 04:20:22 +00:00
Code Issues Projects Releases Packages Wiki Activity

vim: msg_id is a uuid string (#383)

Browse source 
change the id parser according to the uuid spec:
https://datatracker.ietf.org/doc/html/rfc4122#section-3

and I get this error when using the vim plugin:

	Error: cannot find maildir message by short hash "0" at "/path/to/my/INBOX"
	Caused by:
	0: cannot find maildir message id from short hash "0"
	1: the short hash "0" matches more than one hash: 030598120934103c456ce08338886728, 06edb10a55efb89de45d8560aee33c8e

Signed-off-by: Robert Günzler <r@gnzler.io>
This commit is contained in:
Robert Günzler 2022-05-28 09:49:40 +02:00 committed by GitHub
parent ba8ef9adf6
commit 0696f36f05
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
vim/autoload/himalaya/msg.vim
View file

@ -3,7 +3,7 @@ let s:trim = function("himalaya#shared#utils#trim")
let s:cli = function("himalaya#shared#cli#call")
let s:plain_req = function("himalaya#request#plain")
let s:msg_id = 0
let s:msg_id = ""
let s:draft = ""
let s:attachment_paths = []
@ -47,16 +47,17 @@ function! himalaya#msg#read()
try
let pos = getpos(".")
let s:msg_id = s:get_focused_msg_id()
if empty(s:msg_id) || s:msg_id == "HASH" | return | endif
let account = himalaya#account#curr()
let mbox = himalaya#mbox#curr_mbox()
let msg = s:cli(
\"--account %s --mailbox %s read %d",
\"--account %s --mailbox %s read %s",
\[shellescape(account), shellescape(mbox), s:msg_id],
\printf("Fetching message %d", s:msg_id),
\printf("Fetching message %s", s:msg_id),
\1,
\)
call s:close_open_buffers('Himalaya read message')
execute printf("silent! botright new Himalaya read message [%d]", s:msg_id)
execute printf("silent! botright new Himalaya read message [%s]", s:msg_id)
setlocal modifiable
silent execute "%d"
call append(0, split(substitute(msg, "\r", "", "g"), "\n"))
@ -98,12 +99,12 @@ function! himalaya#msg#reply()
let mbox = himalaya#mbox#curr_mbox()
let msg_id = stridx(bufname("%"), "Himalaya messages") == 0 ? s:get_focused_msg_id() : s:msg_id
let msg = s:cli(
\"--account %s --mailbox %s template reply %d",
\"--account %s --mailbox %s template reply %s",
\[shellescape(account), shellescape(mbox), msg_id],
\"Fetching reply template",
\0,
\)
execute printf("silent! edit Himalaya reply [%d]", msg_id)
execute printf("silent! edit Himalaya reply [%s]", msg_id)
call append(0, split(substitute(msg, "\r", "", "g"), "\n"))
silent execute "$d"
setlocal filetype=himalaya-msg-write
@ -124,12 +125,12 @@ function! himalaya#msg#reply_all()
let mbox = himalaya#mbox#curr_mbox()
let msg_id = stridx(bufname("%"), "Himalaya messages") == 0 ? s:get_focused_msg_id() : s:msg_id
let msg = s:cli(
\"--account %s --mailbox %s template reply %d --all",
\"--account %s --mailbox %s template reply %s --all",
\[shellescape(account), shellescape(mbox), msg_id],
\"Fetching reply all template",
\0
\)
execute printf("silent! edit Himalaya reply all [%d]", msg_id)
execute printf("silent! edit Himalaya reply all [%s]", msg_id)
call append(0, split(substitute(msg, "\r", "", "g"), "\n"))
silent execute "$d"
setlocal filetype=himalaya-msg-write
@ -150,12 +151,12 @@ function! himalaya#msg#forward()
let mbox = himalaya#mbox#curr_mbox()
let msg_id = stridx(bufname("%"), "Himalaya messages") == 0 ? s:get_focused_msg_id() : s:msg_id
let msg = s:cli(
\"--account %s --mailbox %s template forward %d",
\"--account %s --mailbox %s template forward %s",
\[shellescape(account), shellescape(mbox), msg_id],
\"Fetching forward template",
\0
\)
execute printf("silent! edit Himalaya forward [%d]", msg_id)
execute printf("silent! edit Himalaya forward [%s]", msg_id)
call append(0, split(substitute(msg, "\r", "", "g"), "\n"))
silent execute "$d"
setlocal filetype=himalaya-msg-write
@ -180,7 +181,7 @@ function! himalaya#msg#_copy(target_mbox)
let account = himalaya#account#curr()
let source_mbox = himalaya#mbox#curr_mbox()
let msg = s:cli(
\"--account %s --mailbox %s copy %d %s",
\"--account %s --mailbox %s copy %s %s",
\[shellescape(account), shellescape(source_mbox), msg_id, shellescape(a:target_mbox)],
\"Copying message",
\1,
@ -201,14 +202,14 @@ endfunction
function! himalaya#msg#_move(target_mbox)
try
let msg_id = stridx(bufname("%"), "Himalaya messages") == 0 ? s:get_focused_msg_id() : s:msg_id
let choice = input(printf("Are you sure you want to move the message %d? (y/N) ", msg_id))
let choice = input(printf("Are you sure you want to move the message %s? (y/N) ", msg_id))
redraw | echo
if choice != "y" | return | endif
let pos = getpos(".")
let account = himalaya#account#curr()
let source_mbox = himalaya#mbox#curr_mbox()
let msg = s:cli(
\"--account %s --mailbox %s move %d %s",
\"--account %s --mailbox %s move %s %s",
\[shellescape(account), shellescape(source_mbox), msg_id, shellescape(a:target_mbox)],
\"Moving message",
\1,
@ -294,7 +295,7 @@ function! himalaya#msg#attachments()
let mbox = himalaya#mbox#curr_mbox()
let msg_id = stridx(bufname("%"), "Himalaya messages") == 0 ? s:get_focused_msg_id() : s:msg_id
let msg = s:cli(
\"--account %s --mailbox %s attachments %d",
\"--account %s --mailbox %s attachments %s",
\[shellescape(account), shellescape(mbox), msg_id],
\"Downloading attachments",
\0
@ -375,7 +376,7 @@ function! s:bufwidth()
endfunction
function! s:get_msg_id(line)
return matchstr(a:line, '[0-9]*')
return matchstr(a:line, '[0-9a-zA-Z]*')
endfunction
function! s:get_focused_msg_id()