diff options
Diffstat (limited to 'internal/notify/service.go')
| -rw-r--r-- | internal/notify/service.go | 17 |
1 files changed, 12 insertions, 5 deletions
diff --git a/internal/notify/service.go b/internal/notify/service.go index a8f0728..86918d4 100644 --- a/internal/notify/service.go +++ b/internal/notify/service.go @@ -103,8 +103,9 @@ func (s *Service) Notify(appName string, replacesID uint32, appIcon, summary, bo tag := StackTagFromHints(hints) now := time.Now().UnixMilli() ms := EffectiveTimeoutMS(expireTimeout, u) - // image-data wins over image-path, and its blob cannot be written until - // Add has assigned the id the filename is derived from. + // Spec priority is image-data > image-path > the deprecated icon_data. A + // raw blob cannot be written until Add has assigned the id the filename is + // derived from, so any raw tier is held in pendingImage. var pendingImage []byte n := &Popup{ App: appName, @@ -115,14 +116,20 @@ func (s *Service) Notify(appName string, replacesID uint32, appIcon, summary, bo Actions: ParseActions(actions), Created: now, } - if raw, ok := ImageDataFromHints(hints); ok { + var raw *RawImage + if r, ok := ImageDataFromHints(hints); ok { + raw = r + } else if path, ok := ImagePathFromHints(hints); ok { + n.Image = ResolveIcon(path) + } else if r, ok := IconDataFromHints(hints); ok { + raw = r + } + if raw != nil { if data, err := raw.PNG(); err == nil { pendingImage = data } else { log.Printf("notifyd: encode image: %v", err) } - } else if path, ok := ImagePathFromHints(hints); ok { - n.Image = ResolveIcon(path) } if ms > 0 { n.Expires = now + ms |