4 files changed, 54 insertions, 1 deletions
diff --git a/lib/hooks/exec.go b/lib/hooks/exec.go
new file mode 100644
index 00000000..bea35f32
--- /dev/null
+++ b/lib/hooks/exec.go
@@ -0,0 +1,22 @@
+package hooks
+
+import (
+	"os"
+	"os/exec"
+
+	"git.sr.ht/~rjarry/aerc/log"
+)
+
+func RunHook(h HookType) error {
+	cmd := h.Cmd()
+	if cmd == "" {
+		return nil
+	}
+	env := h.Env()
+	log.Debugf("hooks: running command %q (env %v)", cmd, env)
+
+	proc := exec.Command("sh", "-c", cmd)
+	proc.Env = os.Environ()
+	proc.Env = append(proc.Env, env...)
+	return proc.Run()
+}
diff --git a/lib/hooks/interface.go b/lib/hooks/interface.go
new file mode 100644
index 00000000..ed38c3ac
--- /dev/null
+++ b/lib/hooks/interface.go
@@ -0,0 +1,6 @@
+package hooks
+
+type HookType interface {
+	Cmd() string
+	Env() []string
+}
diff --git a/lib/hooks/mail-received.go b/lib/hooks/mail-received.go
new file mode 100644
index 00000000..66622e9e
--- /dev/null
+++ b/lib/hooks/mail-received.go
@@ -0,0 +1,25 @@
+package hooks
+
+import (
+	"fmt"
+
+	"git.sr.ht/~rjarry/aerc/config"
+	"git.sr.ht/~rjarry/aerc/models"
+)
+
+type MailReceived struct {
+	MsgInfo *models.MessageInfo
+}
+
+func (m *MailReceived) Cmd() string {
+	return config.Hooks.MailReceived
+}
+
+func (m *MailReceived) Env() []string {
+	from := m.MsgInfo.Envelope.From[0]
+	return []string{
+		fmt.Sprintf("AERC_FROM_NAME=%s", from.Name),
+		fmt.Sprintf("AERC_FROM_ADDRESS=%s", from.Address),
+		fmt.Sprintf("AERC_SUBJECT=%s", m.MsgInfo.Envelope.Subject),
+	}
+}
diff --git a/lib/msgstore.go b/lib/msgstore.go
index 38fa82e6..5349aa62 100644
--- a/lib/msgstore.go
+++ b/lib/msgstore.go
@@ -271,7 +271,7 @@ func (store *MessageStore) Update(msg types.WorkerMessage) {
 		}
 		seen := msg.Info.Flags.Has(models.SeenFlag)
 		recent := msg.Info.Flags.Has(models.RecentFlag)
-		if !seen && recent {
+		if !seen && recent && msg.Info.Envelope != nil {
 			store.triggerNewEmail(msg.Info)
 		}
 		if _, ok := store.pendingHeaders[msg.Info.Uid]; msg.Info.Envelope != nil && ok {