From b6ba622727b6bb817608f95b2619c95132a8c9dd Mon Sep 17 00:00:00 2001 From: Ryota Kayanuma Date: Sat, 2 Mar 2024 14:03:14 +0900 Subject: [PATCH] Use BrowserOpenURL and delete OpenURL --- app.go | 19 ------------------- continent.go | 16 ++++++++-------- 2 files changed, 8 insertions(+), 27 deletions(-) diff --git a/app.go b/app.go index a5ea6f7..649a8eb 100644 --- a/app.go +++ b/app.go @@ -9,8 +9,6 @@ import ( "log/slog" "net/http" "os" - "os/exec" - goruntime "runtime" "strings" "time" @@ -166,23 +164,6 @@ func (a *App) OpenLogDirectory() error { return openDirectory(f) } -func OpenURL(url string) error { - var cmd string - var args []string - - switch goruntime.GOOS { - case "windows": - cmd = "cmd" - args = []string{"/c", "start"} - case "darwin": - cmd = "open" - default: - cmd = "xdg-open" - } - args = append(args, url) - return exec.Command(cmd, args...).Start() -} - func (a *App) SetXRPCClient() error { // Build xrpc.Client diff --git a/continent.go b/continent.go index f2b564a..d2b2d84 100644 --- a/continent.go +++ b/continent.go @@ -19,20 +19,20 @@ func (a *App) DispatchCommand(text string) string { case "/help": { if len(words) < 2 { - OpenURL("https://github.com/kakakaya/mazesoba-continent/blob/main/README.md") + runtime.BrowserOpenURL(a.ctx, "https://github.com/kakakaya/mazesoba-continent/blob/main/README.md") } switch words[1] { case "config": { - OpenURL("https://github.com/kakakaya/mazesoba-continent/tree/main/docs/CONFIG.md") + runtime.BrowserOpenURL(a.ctx, "https://github.com/kakakaya/mazesoba-continent/tree/main/docs/CONFIG.md") } case "command": { - OpenURL("https://github.com/kakakaya/mazesoba-continent/tree/main/docs/SLASH_COMMAND.md") + runtime.BrowserOpenURL(a.ctx, "https://github.com/kakakaya/mazesoba-continent/tree/main/docs/SLASH_COMMAND.md") } default: { - OpenURL("https://github.com/kakakaya/mazesoba-continent/blob/main/README.md") + runtime.BrowserOpenURL(a.ctx, "https://github.com/kakakaya/mazesoba-continent/blob/main/README.md") } } return "" @@ -54,7 +54,7 @@ func (a *App) DispatchCommand(text string) string { case "profile": { handle_or_did := words[2] - OpenURL(fmt.Sprintf("https://bsky.app/profile/%s", handle_or_did)) + runtime.BrowserOpenURL(a.ctx, fmt.Sprintf("https://bsky.app/profile/%s", handle_or_did)) } case "search", "s": { @@ -71,11 +71,11 @@ func (a *App) DispatchCommand(text string) string { q.Add("q", strings.Join(words[2:], " ")) req.URL.RawQuery = q.Encode() - OpenURL(req.URL.String()) + runtime.BrowserOpenURL(a.ctx, req.URL.String()) } default: { - OpenURL(words[1]) // NOTE: TBC + runtime.BrowserOpenURL(a.ctx, words[1]) // NOTE: TBC } } return "" @@ -112,7 +112,7 @@ func (a *App) DispatchCommand(text string) string { switch words[1] { case "egosearch", "egs": { - OpenURL("https://bsky.app/search?q=%E3%81%BE%E3%81%9C%E3%81%9D%E3%81%B0%E5%A4%A7%E9%99%B8") + runtime.BrowserOpenURL(a.ctx, "https://bsky.app/search?q=%E3%81%BE%E3%81%9C%E3%81%9D%E3%81%B0%E5%A4%A7%E9%99%B8") } } return ""