diff options
| -rw-r--r-- | go-src/windows.go | 2 | ||||
| -rw-r--r-- | go-src/windowsHelpers.go | 10 |
2 files changed, 7 insertions, 5 deletions
diff --git a/go-src/windows.go b/go-src/windows.go index 1b4e49e..89294a1 100644 --- a/go-src/windows.go +++ b/go-src/windows.go @@ -115,6 +115,7 @@ func chatsWindow(values ...string) { " : ", &values[0], chatsWindow, + values, chatWindow, chatNameExists, ) @@ -246,6 +247,7 @@ func directMessagesWindow(values ...string) { " (", &values[0], directMessagesWindow, + values, directMessageWindow, usernameExists, ) diff --git a/go-src/windowsHelpers.go b/go-src/windowsHelpers.go index f59f34f..7d2e35c 100644 --- a/go-src/windowsHelpers.go +++ b/go-src/windowsHelpers.go @@ -90,26 +90,26 @@ func handleInputActions(input string, handleNav bool, ia ...inputAction) func() return nil } -func handleComplexInputActions(input string, allValues []string, nameSep string, pageArgument *string, currentWindow window, singleValueWindow window, existsCheck func(string) bool) { +func handleComplexInputActions(input string, allValues []string, nameSep string, pageArgument *string, currentWindow window, currentWindowValues []string, singleValueWindow window, existsCheck func(string) bool) { // If user input is number, navigate to chat of given number, else show error if chatI, err := strconv.Atoi(input); chatI >= 0 && chatI <= len(allValues) && err == nil { defer singleValueWindow(strings.Split(allValues[utils.MaxInt(len(allValues)-pageSize*len(*pageArgument), 0)+chatI-1], " : ")[0]) - } else if input == ">" && pageArgument != nil { + } else if input == ">" { // If possible, increment to the next page (adds a dot to the end of the string) if len(*pageArgument) < totalPages(len(allValues)) { *pageArgument += "." } - defer currentWindow(allValues...) + defer currentWindow(currentWindowValues...) } else if input == "<" { // If possible, decrement to the previous page (removes a dot from the string) if len(*pageArgument) > 1 { utils.StrShortenRight(*&pageArgument, 1) } - defer currentWindow(allValues...) + defer currentWindow(currentWindowValues...) } else if existsCheck(input) { defer singleValueWindow(input) } else { - defer showError(invalidCommand, currentWindow) + defer showError(invalidCommand, currentWindow, currentWindowValues...) } } |