1 files changed, 25 insertions, 15 deletions

diff --git a/bin/mail/deliver.sh b/bin/mail/deliver.sh
index d101602..52c5d01 100755
--- a/bin/mail/deliver.sh
+++ b/bin/mail/deliver.sh
@@ -2,6 +2,7 @@
 
 # Deliver incoming mail to proper mailbox
 # TODO image/audio mail part
+# TODO CJK Subject in index/pager mode: tofo or backslash
 
 epoch=$(date +%s)
 mail_date="$(date --rfc-email -d @${epoch})"
@@ -106,45 +107,54 @@ done <<<"$header"
 # decide mailbox by vars {{{
 if [[ "$SENDER" = pham@topo.tw && -n $CHAT_VERSION ]]; then
   private_message
+elif [[ "${FROM}" =~ riverbien ]]; then
+  mailbox=river
+elif [[ "${FROM}" =~ MAILER-DAEMON|accounts ]]; then
+  mailbox=
+elif [[ "${FROM}" =~ taiwandreamer|imtaiwanese18741130|recall ]]; then
+  mailbox=recall
 elif [[ "${TO}" =~ '+'|'=' ]]; then
   mailbox=${TO#*[+=]}       # remove chars before symbol of mailbox
   mailbox=${mailbox%@*}     # remove suffix for mail address
 elif [[ "${FROM}${RETURN_PATH}" =~ notifications@github.com|noreply@github.com ]]; then
-  mailbox=DEV/github
+  mailbox=zd/github
 elif [[ "${FROM}" =~ jgbsmart.com ]]; then
   mailbox=rent
-elif [[ "${SUBJECT}" =~ 帳單|轉帳|對帳|付款|發票|消費|繳費|收據|費用|Invoice|Billing ]]; then
+elif [[ "${SUBJECT}" =~ 帳單|轉帳|對帳|付款|發票|消費|繳費|收據|費用|簽帳|Invoice|Billing ]]; then
   mailbox=pay
 elif [[ "${TO}" =~ dmarc@topo.tw ]]; then
-  mailbox=DEV/dmarc
+  mailbox=zd/dmarc
 elif [[ "${LIST_ID}" =~ ^'Open Street Map Taiwan' ]]; then
   mailbox=FOSS/osm
 elif [[ "${TO}" =~ talk-ja@openstreetmap.org ]]; then
-  mailbox=LIST/talk-ja
-elif [[ "${LIST_ID}" =~ ^~rjarry/aerc-discuss ]]; then
-  mailbox=LIST/aerc
+  mailbox=zl/talk-ja
+elif [[ "${LIST_ID}" =~ rjarry/aerc-discuss ]]; then
+  mailbox=zl/aerc
 elif [[ "${LIST_ID}" =~ mutt-users.mutt.org ]]; then
-  mailbox=LIST/mutt
+  mailbox=zl/mutt
+elif [[ "${RECEIVED}" =~ lists.archlinux.org ]]; then
+  mailbox=zl/arch
 elif [[ "${SUBJECT}" =~ 啟用 ]]; then
   mailbox=service
 elif [[
-        "${SUBJECT}" =~  電子報|快訊|newsletter ||
-        "${FROM}${TO}" =~ substack|service@kucw.io \
+  "${SUBJECT}" =~  電子報|快訊|newsletter ||
+  "${FROM}${TO}" =~ substack|service@kucw.io|linuxhandbook
   ]]; then
   mailbox=news
-elif [[ "${SUBJECT}" =~ 密碼|安全性警示|登入|存取|驗證|login|verify|sign-in ]]; then
+elif [[ "${SUBJECT}" =~ 密碼|安全性警示|登入|存取|驗證|確認|login|verif|sign-in ]]; then
   mailbox=login
 elif [[ "${TO}" = cloudflare@topo.tw ]]; then
   mailbox=SRV/cloudflare
 elif [[
-        "${SUBJECT}" =~ 通知|提及|未讀|更新|核對|嘟文|unread|summary|mention|introduc  ||
-        "${FROM}" =~ notification[s]?@|no-reply@hackmd.io \
+  "${SUBJECT}" =~ 通知|提及|未讀|更新|核對|嘟文|unread|summary|mention|introduc  ||
+  "${FROM}" =~ iservice@narlabs.org.tw ||
+  "${FROM}" =~ notification[s]?@|no-reply@hackmd.io
   ]]; then
   mailbox=update
 elif [[
-        "${SUBJECT}${FROM}" =~ 優惠|快訊|願望清單|期待|活動|eDM ||
-        -n "${LIST_ID}${LIST_UNSUBSCRIBE}" ||
-        ${TO} =~ tienling.chou@topo.tw \
+  "${SUBJECT}${FROM}" =~ 優惠|快訊|願望清單|期待|活動|eDM|invitation ||
+  ${FROM} =~ cora.computer|noreply@steampowered.com ||
+  -n "${LIST_ID}${LIST_UNSUBSCRIBE}${FEEDBACK_ID}${THREAD_INDEX}${X_MAILGUN_TAG}${X_SFMC_STACK}"
   ]]; then
   mailbox=promote
 fi