Merge branch 'release/46.0.1'

alaingilbert · Aug 2, 2021 · 327650c · 327650c
2 parents 13958b7 + cfcb2db
commit 327650c
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/cmd/ogamed/main.go b/cmd/ogamed/main.go
@@ -332,6 +332,7 @@ func start(c *cli.Context) error {
 	// For AntiGame plugin
 	// Static content
 	e.GET("/cdn/*", ogame.GetStaticHandler)
+	e.GET("/assets/css/*", ogame.GetStaticHandler)
 	e.GET("/headerCache/*", ogame.GetStaticHandler)
 	e.GET("/favicon.ico", ogame.GetStaticHandler)
 	e.GET("/game/sw.js", ogame.GetStaticHandler)

diff --git a/handlers.go b/handlers.go
@@ -99,7 +99,7 @@ func PageContentHandler(c echo.Context) error {
 // LoginHandler ...
 func LoginHandler(c echo.Context) error {
 	bot := c.Get("bot").(*OGame)
-	if err := bot.Login(); err != nil {
+	if _, err := bot.LoginWithExistingCookies(); err != nil {
 		if err == ErrBadCredentials {
 			return c.JSON(http.StatusBadRequest, ErrorResp(400, err.Error()))
 		}

diff --git a/id.go b/id.go
@@ -160,6 +160,11 @@ func (o ID) String() string {
 	return res
 }
 
+// IsValid returns either or not the id is valid
+func (o ID) IsValid() bool {
+	return o.IsDefense() || o.IsShip() || o.IsTech() || o.IsBuilding()
+}
+
 // IsFacility returns either or not the id is a facility
 func (o ID) IsFacility() bool {
 	return o == AllianceDepotID ||