aboutsummaryrefslogtreecommitdiffstats
path: root/lib
diff options
context:
space:
mode:
authorMoritz Poldrack <git@moritz.sh>2023-03-15 22:40:37 +0100
committerRobin Jarry <robin@jarry.cc>2023-04-01 01:01:09 +0200
commit2fef0f4a60c8026c156ad8d75078bccde6a540d8 (patch)
treecff6819cd0950294ee5e7c20b57582c23d628b4e /lib
parent088d63ce934c34e113a5b3154dfcf91b49132067 (diff)
downloadaerc-2fef0f4a60c8026c156ad8d75078bccde6a540d8.tar.gz
config: replace triggers with hooks
Deprecate triggers and replace them with hooks. Now that aerc supports running arbitrary ex commands over IPC, it is possible to run internal aerc commands *and* shell commands via external shell scripts. Hooks only allow running shell commands. Hooks info is passed via environment variables. Implements: https://todo.sr.ht/~rjarry/aerc/136 Signed-off-by: Moritz Poldrack <git@moritz.sh> Signed-off-by: Robin Jarry <robin@jarry.cc> Tested-by: Bence Ferdinandy <bence@ferdinandy.com>
Diffstat (limited to 'lib')
-rw-r--r--lib/hooks/exec.go22
-rw-r--r--lib/hooks/interface.go6
-rw-r--r--lib/hooks/mail-received.go25
-rw-r--r--lib/msgstore.go2
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 {