diff --git a/editor/tview.go b/editor/tview.go index f062e75040c79e01d1b798e9aeda28f454692693..543215b51da345f20cc198fea558776a777a6efd 100644 --- a/editor/tview.go +++ b/editor/tview.go @@ -132,7 +132,7 @@ Press Enter for more help, press Escape to return.`) app.SetInputCapture(func(event *tcell.EventKey) *tcell.EventKey { if event.Key() == tcell.KeyF1 { - pages.ShowPage("help") //TODO: Check when clicking outside help window with the mouse. Then clicking help again. + pages.ShowPage("help") return nil } return event diff --git a/main.go b/main.go index dca4e183bf08fd148dfd8c3863a22b7bee6c690a..06ba61b1368db6aa95bb95c19c2ede3b5aeb9225 100644 --- a/main.go +++ b/main.go @@ -26,11 +26,6 @@ func main() { Usage: "user to run bulletin as", Required: true, }, - &cli.StringFlag{ - Name: "name", - Aliases: []string{"n"}, - Usage: "TODO: name for development", - }, &cli.StringFlag{ Name: "batch", Aliases: []string{"b"}, @@ -61,7 +56,7 @@ func main() { os.Exit(exitcode) } - err := this.StartThis(user, cmd.String("name")) + err := this.StartThis(user) if err != nil { return err } diff --git a/this/this.go b/this/this.go index e7588d9dec06fd239876c2ff5b3847af4163292e..23cf5c3bc3cdabc3418024313e7bcc3885b6c11b 100644 --- a/this/this.go +++ b/this/this.go @@ -35,7 +35,7 @@ var Folder storage.Folder var MsgID int64 // StartThis starts a session. -func StartThis(login, name string) error { +func StartThis(login string) error { // Validate the login name. err := users.ValidLogin(login) if err != nil { @@ -53,12 +53,10 @@ func StartThis(login, name string) error { User, err = Q.GetUser(ctx, login) if User.Login != login { - if name == "" { - fmt.Printf("Welcome new user %s\n", login) - name, err = ask.GetLine("please enter your name: ") - if err != nil { - return err - } + fmt.Printf("Welcome new user %s\n", login) + name, err := ask.GetLine("please enter your name: ") + if err != nil { + return err } User, err = Q.AddUser(ctx, storage.AddUserParams{