Merge pull request #18 from tulir/ui-refactor

Refactor UI to use interfaces and add advanced message rendering

5 files changed, 154 insertions, 0 deletions

diff --git a/lib/notification/doc.go b/lib/notification/doc.go
new file mode 100644
index 0000000..05295c6
--- /dev/null
+++ b/lib/notification/doc.go
@@ -0,0 +1,2 @@
+// Package notification contains a simple cross-platform desktop notification sending function.
+package notification
diff --git a/lib/notification/notify_darwin.go b/lib/notification/notify_darwin.go
new file mode 100644
index 0000000..1e09ef8
--- /dev/null
+++ b/lib/notification/notify_darwin.go
@@ -0,0 +1,54 @@
+// gomuks - A terminal Matrix client written in Go.
+// Copyright (C) 2018 Tulir Asokan
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package notification
+
+import (
+	"fmt"
+	"os/exec"
+	"strings"
+)
+
+var TerminalNotifierAvailable = false
+
+func init() {
+	if err := exec.Command("which", "terminal-notifier").Run(); err != nil {
+		TerminalNotifierAvailable = false
+	}
+	TerminalNotifierAvailable = true
+}
+
+func Send(title, text string, critical, sound bool) error {
+	if TerminalNotifierAvailable {
+		args := []string{"-title", "gomuks", "-subtitle", title, "-message", text}
+		if critical {
+			args = append(args, "-timeout", "15")
+		} else {
+			args = append(args, "-timeout", "4")
+		}
+		if sound {
+			args = append(args, "-sound", "default")
+		}
+// 		if len(iconPath) > 0 {
+// 			args = append(args, "-appIcon", iconPath)
+// 		}
+		return exec.Command("terminal-notifier", args...).Run()
+	}
+	title = strings.Replace(title, `"`, `\"`, -1)
+	text = strings.Replace(text, `"`, `\"`, -1)
+	notification := fmt.Sprintf("display notification \"%s\" with title \"gomuks\" subtitle \"%s\"", text, title)
+	return exec.Command("osascript", "-e", notification).Run()
+}
diff --git a/lib/notification/notify_linux.go b/lib/notification/notify_linux.go
new file mode 100644
index 0000000..f8ecdaf
--- /dev/null
+++ b/lib/notification/notify_linux.go
@@ -0,0 +1,38 @@
+// gomuks - A terminal Matrix client written in Go.
+// Copyright (C) 2018 Tulir Asokan
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package notification
+
+import "os/exec"
+
+func Send(title, text string, critical, sound bool) error {
+	args := []string{"-a", "gomuks"}
+	if critical {
+		args = append(args, "-u", "critical")
+	}
+// 	if iconPath {
+// 		args = append(args, "-i", iconPath)
+// 	}
+	args = append(args, title, text)
+	if sound {
+		soundName := "message-new-instant"
+		if critical {
+			soundName = "complete"
+		}
+		exec.Command("paplay", "/usr/share/sounds/freedesktop/stereo/"+soundName+".oga").Run()
+	}
+	return exec.Command("notify-send", args...).Run()
+}
diff --git a/lib/notification/notify_unsupported.go b/lib/notification/notify_unsupported.go
new file mode 100644
index 0000000..0b350e8
--- /dev/null
+++ b/lib/notification/notify_unsupported.go
@@ -0,0 +1,23 @@
+// +build !linux,!darwin,!windows
+
+// gomuks - A terminal Matrix client written in Go.
+// Copyright (C) 2018 Tulir Asokan
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package notification
+
+func Send(title, text string, critical, sound bool) error {
+	return nil
+}
diff --git a/lib/notification/notify_windows.go b/lib/notification/notify_windows.go
new file mode 100644
index 0000000..d927ee1
--- /dev/null
+++ b/lib/notification/notify_windows.go
@@ -0,0 +1,37 @@
+// gomuks - A terminal Matrix client written in Go.
+// Copyright (C) 2018 Tulir Asokan
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+package notification
+
+import "gopkg.in/toast.v1"
+
+func Send(title, text string, critical, sound bool) error {
+	notification := toast.Notification{
+		AppID:    "gomuks",
+		Title:    title,
+		Message:  message,
+		Audio:    toast.Silent,
+		Duration: toast.Short,
+// 		Icon: ...,
+	}
+	if sound {
+		notification.Audio = toast.IM
+	}
+	if critical {
+		notification.Duration = toast.Long
+	}
+	return notification.Push()
+}