From 4ae1f8e0521d075bb9f0285cf3dfe9989876d828 Mon Sep 17 00:00:00 2001 From: Gregory Rudolph Date: Fri, 30 Oct 2020 12:25:10 -0400 Subject: [PATCH] Use fork --- .gitignore | 3 ++- chess.go | 14 +++++++------- go.mod | 3 ++- go.sum | 12 ++++-------- types.go | 4 ++-- 5 files changed, 17 insertions(+), 19 deletions(-) diff --git a/.gitignore b/.gitignore index 6cb8a56..900bb9a 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ games/* +config.json .bashrc chessbot.log -chessbot \ No newline at end of file +chessbot diff --git a/chess.go b/chess.go index db4def1..35a65b3 100644 --- a/chess.go +++ b/chess.go @@ -7,8 +7,8 @@ import ( "strings" "time" - "github.com/notnil/chess" - "github.com/notnil/chess/image" + chess "git.nightmare.haus/rudi/chessv2" + "git.nightmare.haus/rudi/chessv2/image" "samhofi.us/x/keybase/v2/types/chat1" ) @@ -55,7 +55,7 @@ func chessCommand(m chat1.MsgSummary) { } log.LogDebug("There are currently %+v games.\n", len(config.Games)) g := chess.NewGame() - game.Game = g + game.Game = *g game.ConvID = convID game.Move = true game.StartTime = time.Now() @@ -79,10 +79,10 @@ func showBoard(m chat1.MsgSummary, g *Game) { if err := pos.UnmarshalText([]byte(fenStr)); err != nil { log.LogError(fmt.Sprintf("Error in ShowBoard pos.UnmasrhalText: %+v\n", err)) } - if len(g.Game.Moves()) != 0 { + if len(g.Game.MovesHistory()) != 0 { // write board SVG to file yellow := color.RGBA{255, 255, 0, 1} - lastMove := g.Game.Moves()[len(g.Game.Moves())-1] + lastMove := g.Game.MovesHistory()[len(g.Game.MovesHistory())-1] mark := image.MarkSquares(yellow, lastMove.S1(), lastMove.S2()) if err := image.SVG(f, pos.Board(), mark); err != nil { @@ -132,8 +132,8 @@ func submitMove(m chat1.MsgSummary, g *Game) { } g.Move = !g.Move - if g.Game.Outcome() != chess.NoOutcome { - k.SendMessageByConvID(m.ConvID, fmt.Sprintf("Game completed in %+v. %s by %s.\n", time.Since(g.StartTime), g.Game.Outcome(), g.Game.Method())) + if g.Game.GameOutcome() != chess.NoOutcome { + k.SendMessageByConvID(m.ConvID, fmt.Sprintf("Game completed in %+v. %s by %s.\n", time.Since(g.StartTime), g.Game.GameOutcome(), g.Game.OutcomeMethod())) delete(config.Games, g.ConvID) } go showBoard(m, g) diff --git a/go.mod b/go.mod index 4c7cdfb..b314fcb 100644 --- a/go.mod +++ b/go.mod @@ -3,9 +3,10 @@ module git.nightmare.haus/rudi/chessbot go 1.15 require ( + git.nightmare.haus/rudi/chessv2 v0.0.0-20201030161310-809f6e9c5b9b + github.com/ajstarks/svgo v0.0.0-20200725142600-7a3c8b57fecb // indirect github.com/bwmarrin/discordgo v0.22.0 github.com/llgcode/draw2d v0.0.0-20200930101115-bfaf5d914d1e - github.com/notnil/chess v1.2.0 github.com/rogpeppe/misc v0.0.0-20200516092017-43a33a8f4c44 github.com/rudi9719/loggy v0.0.0-20201030144506-35d9b032ab93 samhofi.us/x/keybase/v2 v2.0.6 diff --git a/go.sum b/go.sum index fa4c363..6bd95e9 100644 --- a/go.sum +++ b/go.sum @@ -1,29 +1,25 @@ -github.com/ajstarks/svgo v0.0.0-20200320125537-f189e35d30ca h1:kWzLcty5V2rzOqJM7Tp/MfSX0RMSI1x4IOLApEefYxA= -github.com/ajstarks/svgo v0.0.0-20200320125537-f189e35d30ca/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= -github.com/bwmarrin/discordgo v0.22.0 h1:uBxY1HmlVCsW1IuaPjpCGT6A2DBwRn0nvOguQIxDdFM= +git.nightmare.haus/rudi/chessv2 v0.0.0-20201030161310-809f6e9c5b9b h1:E5lRCAbHzdjzRGWamND3vK4PcqEcs+w7MwTAlmJ/EJU= +git.nightmare.haus/rudi/chessv2 v0.0.0-20201030161310-809f6e9c5b9b/go.mod h1:0r7vk090XXTFcT7lF+O15ztOp7pdDaF9Upyh0H2Olbk= +github.com/ajstarks/svgo v0.0.0-20200725142600-7a3c8b57fecb h1:EVl3FJLQCzSbgBezKo/1A4ADnJ4mtJZ0RvnNzDJ44nY= +github.com/ajstarks/svgo v0.0.0-20200725142600-7a3c8b57fecb/go.mod h1:K08gAheRH3/J6wwsYMMT4xOr94bZjxIelGM0+d/wbFw= github.com/bwmarrin/discordgo v0.22.0/go.mod h1:c1WtWUGN6nREDmzIpyTp/iD3VYt4Fpx+bVyfBG7JE+M= github.com/go-gl/gl v0.0.0-20180407155706-68e253793080/go.mod h1:482civXOzJJCPzJ4ZOX/pwvXBWSnzD4OKMdH4ClKGbk= github.com/go-gl/glfw v0.0.0-20180426074136-46a8d530c326/go.mod h1:vR7hzQXu2zJy9AVAgeJqvqgH9Q5CA+iKCZ2gyEVpxRU= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0 h1:DACJavvAHhabrF08vX0COfcOBJRhZ8lUbR+ZWIs0Y5g= github.com/golang/freetype v0.0.0-20170609003504-e2365dfdc4a0/go.mod h1:E/TSTwGwJL78qG/PmXZO1EjYhfJinVAhrmmHX6Z8B9k= -github.com/gorilla/websocket v1.4.0 h1:WDFjx/TMzVgy9VdMMQi2K2Emtwi2QcUQsztZ/zLaH/Q= github.com/gorilla/websocket v1.4.0/go.mod h1:E7qHFY5m1UJ88s3WnNqhKjPHQ0heANvMoAMk2YaljkQ= github.com/jung-kurt/gofpdf v1.0.0/go.mod h1:7Id9E/uU8ce6rXgefFLlgrJj/GYY22cpxn+r32jIOes= github.com/llgcode/draw2d v0.0.0-20200930101115-bfaf5d914d1e h1:YRRazju3DMGuZTSWEj0nE2SCRcK3DW/qdHQ4UQx7sgs= github.com/llgcode/draw2d v0.0.0-20200930101115-bfaf5d914d1e/go.mod h1:mVa0dA29Db2S4LVqDYLlsePDzRJLDfdhVZiI15uY0FA= github.com/llgcode/ps v0.0.0-20150911083025-f1443b32eedb/go.mod h1:1l8ky+Ew27CMX29uG+a2hNOKpeNYEQjjtiALiBlFQbY= -github.com/notnil/chess v1.2.0 h1:5We6movgg1yzqBa68xsi0gWBM9XMIRfiaNc0Kcq6guk= -github.com/notnil/chess v1.2.0/go.mod h1:cRuJUIBFq9Xki05TWHJxHYkC+fFpq45IWwk94DdlCrA= github.com/rogpeppe/misc v0.0.0-20200516092017-43a33a8f4c44 h1:osBnWuJgXxjdv/zUO9sm32B1Peew1cPGGyonHrqXd5M= github.com/rogpeppe/misc v0.0.0-20200516092017-43a33a8f4c44/go.mod h1:hT7K6J2LNwUaaq7rtwF5VMB9kQ9yf7HgYFNVOOf41OI= github.com/rudi9719/loggy v0.0.0-20201030144506-35d9b032ab93 h1:GjCI3CXdGt2PysVpObVzmKqMgKf3RlsKLBnaSOqPpUk= github.com/rudi9719/loggy v0.0.0-20201030144506-35d9b032ab93/go.mod h1:s1ANCN8bF6HwwTpJLR458MFVGua9oqKKDbph/2jptL4= -golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16 h1:y6ce7gCWtnH+m3dCjzQ1PCuwl28DDIc3VNnvY29DlIA= golang.org/x/crypto v0.0.0-20181030102418-4d3f4d9ffa16/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81 h1:00VmoueYNlNz/aHIilyyQz/MHSqGoWJzpFv/HW8xpzI= golang.org/x/image v0.0.0-20180708004352-c73c2afc3b81/go.mod h1:ux5Hcp/YLpHSI86hEcLt0YII63i6oz57MZXIpbrjZUs= samhofi.us/x/keybase v0.0.0-20200129212102-e05e93be9f3f h1:MHSEiuiRFrFi7BTw46lC22PMk3Fit8IvVRM4xANTt20= samhofi.us/x/keybase v0.0.0-20200129212102-e05e93be9f3f/go.mod h1:fcva80IUFyWcHtV4bBSzgKg07K6Rvuvi3GtGCLNGkyE= -samhofi.us/x/keybase v0.0.0-20200409184719-3e5afcc7f988 h1:ZQDHB2AP5ouuMnANibyBJQBbxwi+tCMQHa4ttp15ac0= samhofi.us/x/keybase/v2 v2.0.6 h1:gLluTcyjbwckQxSarF1ig2klL4Li7O/THdxsgo1dUvw= samhofi.us/x/keybase/v2 v2.0.6/go.mod h1:lJivwhzMSV+WUg+XUbatszStjjFVcuLGl+xcQpqQ5GQ= diff --git a/types.go b/types.go index 56b6a46..17a37ed 100644 --- a/types.go +++ b/types.go @@ -1,14 +1,14 @@ package main import ( - "github.com/notnil/chess" + "git.nightmare.haus/rudi/chessv2" "github.com/rudi9719/loggy" "time" ) // Game is just a struct of type Game type Game struct { - Game *chess.Game + Game chess.Game StartTime time.Time ConvID string White string