From 517a56ef13d0fce267cecf0d77f101f32d508495 Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Tue, 5 Aug 2025 18:51:26 -0700 Subject: [PATCH 1/3] Makefile: remove operation on nonexistent directory --- Makefile | 1 - 1 file changed, 1 deletion(-) diff --git a/Makefile b/Makefile index 7d42ee7..9d2035f 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,5 @@ clean: rm -rf build - rm -rf web/dist test: go fmt ./... -- 2.49.1 From fabd0a6759783fa429bcda54cc5bafc79c5fc8ee Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Thu, 7 Aug 2025 03:20:37 +0000 Subject: [PATCH 2/3] Cut Down Maps Fields (#22) Closes #20 I'm assuming protobuf will fill Thumbnail with a default value (0) since it dosn't exist yet. Reviewed-on: https://git.itzana.me/StrafesNET/public-api/pulls/22 Reviewed-by: itzaname Co-authored-by: Rhys Lloyd Co-committed-by: Rhys Lloyd --- go.mod | 2 +- go.sum | 4 ++-- pkg/api/dto/map.go | 7 ++----- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/go.mod b/go.mod index 8a065af..7781d0c 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.24.0 require ( git.itzana.me/StrafesNET/dev-service v0.0.0-20250628022558-4cf59e46f9f1 - git.itzana.me/strafesnet/go-grpc v0.0.0-20250628021738-df0a4ad40969 + git.itzana.me/strafesnet/go-grpc v0.0.0-20250807005013-301d35b914ef github.com/gin-gonic/gin v1.10.1 github.com/sirupsen/logrus v1.9.3 github.com/swaggo/files v1.0.1 diff --git a/go.sum b/go.sum index e0fdc9b..80adbef 100644 --- a/go.sum +++ b/go.sum @@ -2,8 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw= git.itzana.me/StrafesNET/dev-service v0.0.0-20250628022558-4cf59e46f9f1 h1:Ndpa4d93gCQrW5pm64u9IRaDJTfu7fKfLqm8ctzML1o= git.itzana.me/StrafesNET/dev-service v0.0.0-20250628022558-4cf59e46f9f1/go.mod h1:KJal0K++M6HEzSry6JJ2iDPZtOQn5zSstNlDbU3X4Jg= -git.itzana.me/strafesnet/go-grpc v0.0.0-20250628021738-df0a4ad40969 h1:bGfsRi9WrklI5cwvfvI/jJAGa3PQgJVNAzseFBW56mY= -git.itzana.me/strafesnet/go-grpc v0.0.0-20250628021738-df0a4ad40969/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs= +git.itzana.me/strafesnet/go-grpc v0.0.0-20250807005013-301d35b914ef h1:SJi4V4+xzScFnbMRN1gkZxcqR1xKfiT7CaXanLltEzw= +git.itzana.me/strafesnet/go-grpc v0.0.0-20250807005013-301d35b914ef/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs= github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/KyleBanks/depth v1.2.1 h1:5h8fQADFrWtarTdtDudMmGsC7GPbOAu6RVB3ffsVFHc= github.com/KyleBanks/depth v1.2.1/go.mod h1:jzSb9d0L43HxTQfT+oSA1EEp2q+ne2uh6XgeJcm8brE= diff --git a/pkg/api/dto/map.go b/pkg/api/dto/map.go index 5251df1..3b93dfc 100644 --- a/pkg/api/dto/map.go +++ b/pkg/api/dto/map.go @@ -2,7 +2,6 @@ package dto import ( "git.itzana.me/strafesnet/go-grpc/maps" - "time" ) type MapFilter struct { @@ -12,9 +11,8 @@ type MapFilter struct { type Map struct { ID int64 `json:"id"` DisplayName string `json:"display_name"` - Creator string `json:"creator"` GameID int32 `json:"game_id"` - Date time.Time `json:"date"` + Thumbnail uint64 `json:"thumbnail"` } // @name Map // FromGRPC converts a maps.MapResponse protobuf message to a Map domain object @@ -25,9 +23,8 @@ func (m *Map) FromGRPC(resp *maps.MapResponse) *Map { m.ID = resp.ID m.DisplayName = resp.DisplayName - m.Creator = resp.Creator - m.Date = time.Unix(resp.Date, 0) m.GameID = resp.GameID + m.Thumbnail = resp.Thumbnail return m } -- 2.49.1 From a7524c2766d2c03655b815c3cef056ce1cd45145 Mon Sep 17 00:00:00 2001 From: Rhys Lloyd Date: Fri, 8 Aug 2025 00:55:21 +0000 Subject: [PATCH 3/3] Update Docs (#24) Reviewed-on: https://git.itzana.me/StrafesNET/public-api/pulls/24 Co-authored-by: Rhys Lloyd Co-committed-by: Rhys Lloyd --- docs/docs.go | 12 +++++------- docs/swagger.json | 12 +++++------- docs/swagger.yaml | 7 +++---- 3 files changed, 13 insertions(+), 18 deletions(-) diff --git a/docs/docs.go b/docs/docs.go index b7ae024..e7aecb5 100644 --- a/docs/docs.go +++ b/docs/docs.go @@ -301,7 +301,8 @@ const docTemplate = `{ { "type": "array", "items": { - "type": "integer" + "type": "integer", + "format": "int64" }, "collectionFormat": "csv", "description": "Comma-separated array of time IDs (25 Limit)", @@ -631,12 +632,6 @@ const docTemplate = `{ "Map": { "type": "object", "properties": { - "creator": { - "type": "string" - }, - "date": { - "type": "string" - }, "display_name": { "type": "string" }, @@ -645,6 +640,9 @@ const docTemplate = `{ }, "id": { "type": "integer" + }, + "thumbnail": { + "type": "integer" } } }, diff --git a/docs/swagger.json b/docs/swagger.json index bdd5d24..372f700 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -294,7 +294,8 @@ { "type": "array", "items": { - "type": "integer" + "type": "integer", + "format": "int64" }, "collectionFormat": "csv", "description": "Comma-separated array of time IDs (25 Limit)", @@ -624,12 +625,6 @@ "Map": { "type": "object", "properties": { - "creator": { - "type": "string" - }, - "date": { - "type": "string" - }, "display_name": { "type": "string" }, @@ -638,6 +633,9 @@ }, "id": { "type": "integer" + }, + "thumbnail": { + "type": "integer" } } }, diff --git a/docs/swagger.yaml b/docs/swagger.yaml index 1107f02..6a8bb2b 100644 --- a/docs/swagger.yaml +++ b/docs/swagger.yaml @@ -7,16 +7,14 @@ definitions: type: object Map: properties: - creator: - type: string - date: - type: string display_name: type: string game_id: type: integer id: type: integer + thumbnail: + type: integer type: object PagedResponse-Map: properties: @@ -418,6 +416,7 @@ paths: description: Comma-separated array of time IDs (25 Limit) in: query items: + format: int64 type: integer name: ids required: true -- 2.49.1