Merge pull request #111 from Evidlo/master

add notify_sound config option
This commit is contained in:
Tulir Asokan 2020-03-01 16:17:28 +02:00 committed by GitHub
commit da4a2c670d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 1 deletions

View File

@ -56,6 +56,8 @@ type Config struct {
RoomCacheSize int `yaml:"room_cache_size"` RoomCacheSize int `yaml:"room_cache_size"`
RoomCacheAge int64 `yaml:"room_cache_age"` RoomCacheAge int64 `yaml:"room_cache_age"`
NotifySound bool `yaml:"notify_sound"`
Dir string `yaml:"-"` Dir string `yaml:"-"`
CacheDir string `yaml:"cache_dir"` CacheDir string `yaml:"cache_dir"`
HistoryPath string `yaml:"history_path"` HistoryPath string `yaml:"history_path"`
@ -83,6 +85,8 @@ func NewConfig(configDir, cacheDir string) *Config {
RoomCacheSize: 32, RoomCacheSize: 32,
RoomCacheAge: 1 * 60, RoomCacheAge: 1 * 60,
NotifySound: true,
} }
} }

View File

@ -431,7 +431,9 @@ func (view *MainView) NotifyMessage(room *rooms.Room, message ifc.Message, shoul
if shouldNotify && !recentlyFocused { if shouldNotify && !recentlyFocused {
// Push rules say notify and the terminal is not focused, send desktop notification. // Push rules say notify and the terminal is not focused, send desktop notification.
shouldPlaySound := should.PlaySound && should.SoundName == "default" shouldPlaySound := should.PlaySound &&
should.SoundName == "default" &&
view.config.NotifySound
sendNotification(room, message.NotificationSenderName(), message.NotificationContent(), should.Highlight, shouldPlaySound) sendNotification(room, message.NotificationSenderName(), message.NotificationContent(), should.Highlight, shouldPlaySound)
} }