From 7d5fee46bdfe1b1e427043dc32107df65eb24ed6 Mon Sep 17 00:00:00 2001 From: Kane York Date: Fri, 15 Sep 2017 13:45:17 -0700 Subject: [PATCH 1/5] Remove DebugHello --- socketserver/server/commands.go | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/socketserver/server/commands.go b/socketserver/server/commands.go index d585eb4c..b02a13be 100644 --- a/socketserver/server/commands.go +++ b/socketserver/server/commands.go @@ -110,31 +110,20 @@ func callHandler(handler CommandHandler, conn *websocket.Conn, client *ClientInf return handler(conn, client, cmsg) } -var DebugHello = "" - // C2SHello implements the `hello` C2S Command. // It calls SubscribeGlobal() and SubscribeDefaults() with the client, and fills out ClientInfo.Version and ClientInfo.ClientID. func C2SHello(conn *websocket.Conn, client *ClientInfo, msg ClientMessage) (rmsg ClientMessage, err error) { ary, ok := msg.Arguments.([]interface{}) if !ok { - if DebugHello != "" { - fmt.Println("Hello error: was not an array:", ary) - } err = ErrExpectedTwoStrings return } if len(ary) != 2 { - if DebugHello != "" { - fmt.Println("Hello error: array wrong length:", ary) - } err = ErrExpectedTwoStrings return } version, ok := ary[0].(string) if !ok { - if DebugHello != "" { - fmt.Println("Hello error: version not a string:", ary) - } err = ErrExpectedTwoStrings return } @@ -151,9 +140,6 @@ func C2SHello(conn *websocket.Conn, client *ClientInfo, msg ClientMessage) (rmsg } else if ary[1] == nil { clientID = uuid.NewV4() } else { - if DebugHello != "" { - fmt.Println("Hello error: client id not acceptable:", ary) - } err = ErrExpectedTwoStrings return } From 35ce17e3ee757a09077125bff9494ddd1236d1d9 Mon Sep 17 00:00:00 2001 From: SirStendec Date: Sun, 17 Sep 2017 14:21:49 -0400 Subject: [PATCH 2/5] 3.5.524. Add socket server status to the Debug menu. Update the emoji regex. Fix global emote tooltips. --- changelog.html | 27 ++++++++++++++++----------- old_changes.html | 11 +++++++++++ src/constants.js | 4 ++-- src/main.js | 2 +- src/socket.js | 1 + src/tokenize.js | 34 ++++++++++++++++++++++++++-------- src/ui/about_page.js | 26 ++++++++++++++++++++++++++ src/ui/my_emotes.js | 6 ++++-- 8 files changed, 87 insertions(+), 24 deletions(-) diff --git a/changelog.html b/changelog.html index beb472be..1ac80905 100644 --- a/changelog.html +++ b/changelog.html @@ -1,3 +1,19 @@ +
3.5.524
+ + +
3.5.523
+ + +
3.5.522
+ +
3.5.521
-
3.5.511
- - -
3.5.510
- -
\ No newline at end of file diff --git a/old_changes.html b/old_changes.html index 52ec22ce..6ef447f4 100644 --- a/old_changes.html +++ b/old_changes.html @@ -1,3 +1,14 @@ +
3.5.511
+ + +
3.5.510
+ +
3.5.509