Merge branch 'develop' of git.gnuher.de:settel/knowyt into develop
This commit is contained in:
commit
21a24632b2
@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"name": "knowyt",
|
"name": "knowyt",
|
||||||
"version": "2.13",
|
"version": "2.14",
|
||||||
"private": true,
|
"private": true,
|
||||||
"scripts": {
|
"scripts": {
|
||||||
"lint": "tsc-strict",
|
"lint": "tsc-strict",
|
||||||
|
@ -132,6 +132,7 @@ const removeGame = async (): Promise<void> => {
|
|||||||
if (confirm('remove game and wipe all of it\'s data?')) {
|
if (confirm('remove game and wipe all of it\'s data?')) {
|
||||||
console.log(1)
|
console.log(1)
|
||||||
await useEngine().removeGame()
|
await useEngine().removeGame()
|
||||||
|
document.location.reload()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
</script>
|
</script>
|
||||||
|
@ -3,6 +3,7 @@ package application
|
|||||||
import (
|
import (
|
||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
|
"path"
|
||||||
|
|
||||||
"sirlab.de/go/knowyt/game"
|
"sirlab.de/go/knowyt/game"
|
||||||
"sirlab.de/go/knowyt/log"
|
"sirlab.de/go/knowyt/log"
|
||||||
@ -47,6 +48,17 @@ func (app *Application) removePlayerById(id string, gm *game.Game) error {
|
|||||||
return fmt.Errorf("couldn't find player %s in game %s", id, gm.GetId())
|
return fmt.Errorf("couldn't find player %s in game %s", id, gm.GetId())
|
||||||
}
|
}
|
||||||
|
|
||||||
|
quotesInfo := gm.GetQuotesInfoByUser(userToRemove)
|
||||||
|
for _, quote := range quotesInfo.Quotes {
|
||||||
|
gameDirName := path.Join(app.config.DataDir, "games", gm.GetId())
|
||||||
|
quoteFileNameShort := quote.Id + ".json"
|
||||||
|
quoteFileName := path.Join(gameDirName, "quotes", quoteFileNameShort)
|
||||||
|
|
||||||
|
if err := gm.RemoveQuote(quoteFileName, userToRemove.GetId(), quote.Id); err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
if err := userToRemove.RemovePlayer(); err != nil {
|
if err := userToRemove.RemovePlayer(); err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user