From f3b71a26337e12118720162b91431943ab403469 Mon Sep 17 00:00:00 2001
From: Alessio <me@playfulpachyderm.com>
Date: Sun, 10 Mar 2024 18:59:58 -0700
Subject: [PATCH] Move --addr flag under webserver subcommand

---
 .woodpecker/build.yml | 2 +-
 cmd/twitter/main.go   | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/.woodpecker/build.yml b/.woodpecker/build.yml
index 14211e2..b769584 100644
--- a/.woodpecker/build.yml
+++ b/.woodpecker/build.yml
@@ -33,7 +33,7 @@ pipeline:
     commands:
       - cd cmd
       - ./compile.sh
-      - ./tw --profile ../sample_data/profile --addr localhost:1000 webserver &
+      - ./tw --profile ../sample_data/profile webserver --addr localhost:1000 &
       - sleep 1
       - curl localhost:1000/cernovich > webserver_test_output.html
       - jobs -p | xargs -I{} kill -- -{}
diff --git a/cmd/twitter/main.go b/cmd/twitter/main.go
index 758dce2..3b598ac 100644
--- a/cmd/twitter/main.go
+++ b/cmd/twitter/main.go
@@ -33,7 +33,6 @@ func main() {
 	flag.BoolVar(show_version_flag, "v", false, "")
 
 	session_name := flag.String("session", "", "Name of session file to use")
-	addr := flag.String("addr", "localhost:1973", "port to listen on") // Random port that's probably not in use
 
 	how_many := flag.Int("n", 50, "")
 	flag.IntVar(how_many, "number", 50, "")
@@ -189,6 +188,8 @@ func main() {
 	case "webserver":
 		fs := flag.NewFlagSet("", flag.ExitOnError)
 		should_auto_open := fs.Bool("auto-open", false, "")
+		addr := fs.String("addr", "localhost:1973", "port to listen on") // Random port that's probably not in use
+
 		if err := fs.Parse(args[1:]); err != nil {
 			panic(err)
 		}