Merge pull request normen#37 from keegancsmith/terminal-bell

add UseTerminalBell as an alternative to desktop notifications

Author: normen

README.md

@@ -84,9 +84,9 @@ To configure the used command and its parameters edit the `show_command` paramet
 
 Some commands such as the `/add` and `/remove` require a "user id" as their input. You can copy the user ID of a selected chat or a selected message to the clipboard with `Ctrl-c` (default mapping) and easily append them to the current input using `Ctrl-v`.
 
-### Desktop Notifications
+### Notifications
 
-The app supports basic desktop notifications through the `gen2brain/beeep` library, to enable it set `enable_notifications = true` in `whatscli.config`.
+The app supports basic desktop notifications through the `gen2brain/beeep` library, to enable it set `enable_notifications = true` in `whatscli.config`. Set `use_terminal_bell = true` to ring your terminal's bell instead of sending a desktop notification.
 
 ### Configuration
 

config/settings.go

@@ -25,6 +25,7 @@ type General struct {
 	CmdPrefix           string
 	ShowCommand         string
 	EnableNotifications bool
+	UseTerminalBell     bool
 	NotificationTimeout int64
 }
 
@@ -76,6 +77,7 @@ var Config = IniFile{
 		CmdPrefix:           "/",
 		ShowCommand:         "jp2a --color",
 		EnableNotifications: false,
+		UseTerminalBell:     false,
 		NotificationTimeout: 60,
 	},
 	&Keymap{

messages/session_manager.go

@@ -89,8 +89,8 @@ func (sm *SessionManager) runManager() error {
 				if int64(msg.Info.Timestamp) > time.Now().Unix()-30 {
 					if int64(msg.Info.Timestamp) > sm.lastSent.Unix()+config.Config.General.NotificationTimeout {
 						sm.db.NewUnreadChat(msg.Info.RemoteJid)
-						if config.Config.General.EnableNotifications && !msg.Info.FromMe {
-							err := beeep.Notify(sm.db.GetIdShort(msg.Info.RemoteJid), msg.Text, "")
+						if !msg.Info.FromMe {
+							err := notify(sm.db.GetIdShort(msg.Info.RemoteJid), msg.Text)
 							if err != nil {
 								sm.uiHandler.PrintError(err)
 							}
@@ -101,8 +101,8 @@ func (sm *SessionManager) runManager() error {
 				// notify if message is younger than 30 sec and not in focus
 				if int64(msg.Info.Timestamp) > time.Now().Unix()-30 {
 					sm.db.NewUnreadChat(msg.Info.RemoteJid)
-					if config.Config.General.EnableNotifications && !msg.Info.FromMe {
-						err := beeep.Notify(sm.db.GetIdShort(msg.Info.RemoteJid), msg.Text, "")
+					if !msg.Info.FromMe {
+						err := notify(sm.db.GetIdShort(msg.Info.RemoteJid), msg.Text)
 						if err != nil {
 							sm.uiHandler.PrintError(err)
 						}
@@ -985,3 +985,15 @@ func writeSession(session whatsapp.Session) error {
 func removeSession() error {
 	return os.Remove(config.GetSessionFilePath())
 }
+
+// notify will send a notification via beeep if EnableNotification is true. If
+// UseTerminalBell is true it will send a terminal bell instead.
+func notify(title, message string) error {
+	if !config.Config.General.EnableNotifications {
+		return nil
+	} else if config.Config.General.UseTerminalBell {
+		_, err := fmt.Printf("\a")
+		return err
+	}
+	return beeep.Notify(title, message, "")
+}