From 9c8c7cdf655b79ffeb15013310a83474271a721c Mon Sep 17 00:00:00 2001 From: Alessio Date: Mon, 19 Aug 2024 17:46:04 -0700 Subject: [PATCH] 'webserver' subcommand now respects the '--session' flag --- cmd/twitter/main.go | 7 +++++++ internal/webserver/server.go | 6 +++++- 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/cmd/twitter/main.go b/cmd/twitter/main.go index 375c36f..f2adcc6 100644 --- a/cmd/twitter/main.go +++ b/cmd/twitter/main.go @@ -35,6 +35,7 @@ func main() { flag.BoolVar(show_version_flag, "v", false, "") session_name := flag.String("session", "", "Name of session file to use") + flag.StringVar(session_name, "s", "", "") how_many := flag.Int("n", 50, "") flag.IntVar(how_many, "number", 50, "") @@ -521,6 +522,12 @@ func list_followed() { func start_webserver(addr string, should_auto_open bool) { app := webserver.NewApp(profile) + if api.UserHandle != "" { + err := app.SetActiveUser(api.UserHandle) + if err != nil { + die(err.Error(), false, -1) + } + } app.Run(addr, should_auto_open) } diff --git a/internal/webserver/server.go b/internal/webserver/server.go index 9e3a5d2..ef2944f 100644 --- a/internal/webserver/server.go +++ b/internal/webserver/server.go @@ -157,7 +157,11 @@ func (app *Application) Run(address string, should_auto_open bool) { app.start_background() if should_auto_open { - go openWebPage("http://" + address + "/login") + page := "/login" + if app.ActiveUser != get_default_user() { + page = "" // Load the timeline + } + go openWebPage("http://" + address + page) } err := srv.ListenAndServe() app.ErrorLog.Fatal(err)