Marco
ae3e73f711
1. Implement thread-safe ringbuffer for websocket messages This implements a ringbuffer that is used to decouple the raw websocket connection from the messages that the game handler handles. 2. Change websocket handling With this commit, we stop waiting for the websocket connection to be established before the game starts. Now, the Connection type is responsible for waiting for the websocket connection before writing. Some bugs are still happening: 1. The rejoining client is not told the state of the board 2. Invalid moves are not handled by the client (not sure why though) 3. The still-connected client should be told, that the opponent disconnected. Then the client should show the passphrase again 3. Introduce method to send status of board and player 4. Reconnect works (kind of) With the right changes in the client, the reconnect works (but only for the first time). WARNING: At the moment, we will create a new player whenever connection wants to join a private game. This will also clear all the disconnect callbacks that we set in the player.
103 lines
1.5 KiB
Go
103 lines
1.5 KiB
Go
package utils
|
|
|
|
import (
|
|
"strings"
|
|
|
|
"github.com/tjarratt/babble"
|
|
)
|
|
|
|
type Passphrase string
|
|
|
|
func NewPassphrase() Passphrase {
|
|
var phrase string
|
|
var retries int
|
|
var word string
|
|
var words = 2
|
|
//TODO make sure passphrases are unique
|
|
for words > 0 {
|
|
retries = 20
|
|
for {
|
|
word = getCleanWord()
|
|
if isAccecpable(word) {
|
|
phrase = phrase + word + " "
|
|
break
|
|
}
|
|
if retries == 1 { //this is our last try, we take any word
|
|
phrase = phrase + word + " "
|
|
}
|
|
retries -= 1
|
|
}
|
|
words -= 1
|
|
}
|
|
return Passphrase(strings.TrimSpace(phrase))
|
|
}
|
|
|
|
func (p Passphrase) String() string {
|
|
return string(p)
|
|
}
|
|
|
|
func isAccecpable(s string) bool {
|
|
l := len(s)
|
|
if l > 8 || l < 3 {
|
|
return false
|
|
}
|
|
|
|
for _, rune := range s {
|
|
if !isEnglishLetter(rune) {
|
|
return false
|
|
}
|
|
}
|
|
return true
|
|
}
|
|
|
|
func isProfanity(s string) bool {
|
|
contains := []string{
|
|
"nigg",
|
|
"fag",
|
|
"ass",
|
|
"bitch",
|
|
"rape",
|
|
"ass",
|
|
"scrot",
|
|
"rect",
|
|
}
|
|
startsWith := []string{
|
|
"spic",
|
|
"chin",
|
|
"cunt",
|
|
}
|
|
|
|
for _, word := range contains {
|
|
if strings.Contains(s, word) {
|
|
return true
|
|
}
|
|
}
|
|
for _, word := range startsWith {
|
|
if strings.HasPrefix(s, word) {
|
|
return true
|
|
}
|
|
}
|
|
return false
|
|
}
|
|
|
|
func isEnglishLetter(r rune) bool {
|
|
if (r < 'a' || r > 'z') && (r < 'A' || r > 'Z') {
|
|
return false
|
|
}
|
|
return true
|
|
}
|
|
|
|
func getCleanWord() string {
|
|
var word string
|
|
|
|
babbler := babble.NewBabbler()
|
|
babbler.Count = 1
|
|
|
|
for {
|
|
word = babbler.Babble()
|
|
if !isProfanity(word) {
|
|
return word
|
|
}
|
|
}
|
|
}
|