web: use multi-stage building for the container file

web: remove all unnecessary junk from the container after building (experiment & saves ~2GBs)
2024-12-14 00:07:59 -05:00 · 2024-12-12 18:39:10 -05:00
58 changed files with 1191 additions and 5828 deletions
--- a/.drone.yml
+++ b/.drone.yml
@ -1,88 +0,0 @@
---
-kind: pipeline
-type: docker
-
-platform:
-  os: linux
-  arch: amd64
-
-steps:
-  - name: api
-    image: plugins/docker
-    settings:
-      registry: registry.itzana.me
-      repo: registry.itzana.me/strafesnet/maptest-api
-      tags:
-        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-        - ${DRONE_BRANCH}
-      username:
-        from_secret: REGISTRY_USER
-      password:
-        from_secret: REGISTRY_PASS
-      dockerfile: Containerfile
-      context: .
-    when:
-      branch:
-        - master
-        - staging
-
-  - name: frontend
-    image: plugins/docker
-    settings:
-      registry: registry.itzana.me
-      repo: registry.itzana.me/strafesnet/maptest-frontend
-      tags:
-        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-        - ${DRONE_BRANCH}
-      username:
-        from_secret: REGISTRY_USER
-      password:
-        from_secret: REGISTRY_PASS
-      dockerfile: web/Containerfile
-      context: web
-    when:
-      branch:
-        - master
-        - staging
-
-  - name: validator
-    image: plugins/docker
-    settings:
-      registry: registry.itzana.me
-      repo: registry.itzana.me/strafesnet/maptest-validator
-      tags:
-        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-        - ${DRONE_BRANCH}
-      username:
-        from_secret: REGISTRY_USER
-      password:
-        from_secret: REGISTRY_PASS
-      dockerfile: validation/Containerfile
-      context: validation
-    when:
-      branch:
-        - master
-        - staging
-
-  - name: deploy
-    image: argoproj/argocd:latest
-    commands:
-      - echo "Deploy!" # Not going to do actually do this until 
-    environment:
-      USERNAME:
-        from_secret: ARGO_USER
-      PASSWORD:
-        from_secret: ARGO_PASS
-    depends_on:
-      - api
-      - frontend
-      - validator
-    when:
-      branch:
-        - master
-        - staging
---
-kind: signature
-hmac: 9958fd5b01af1ebcc75f7277fe71eb5336b899445c359cecf1b14e83b3d05059
-
-...
--- a/3
+++ b/3
@ -7,6 +7,9 @@ WORKDIR /app
 # Copy go.mod and go.sum files
 COPY go.mod go.sum ./

+# Download dependencies
+RUN --mount=type=secret,id=netrc,dst=/root/.netrc go mod download
+
 # Copy the entire project
 COPY . .

--- a/12
+++ b/12
@ -1,12 +0,0 @@
-maps-service:
-	DOCKER_BUILDKIT=1 docker build . -f Containerfile -t maps-service 
-
-web:
-	docker build web -f web/Containerfile -t maps-service-web
-
-validation:
-	docker build validation -f validation/Containerfile -t maps-service-validation
-
-all: maps-service web validation
-
-.PHONY: maps-service web validation
--- a/compose.yaml
+++ b/compose.yaml
@ -3,23 +3,32 @@ networks:
  maps-service-network:
    driver: bridge

+secrets:
+  netrc:
+    file: /home/quat/.netrc
+
 services:
  nats:
    image: docker.io/nats:latest
    container_name: nats
-    command: ["-js"] #"-DVV"
+    command: ["-js"]
    networks:
      - maps-service-network
+    ports:
+      - "4222:4222"

-  mapsservice:
-    image:
-      maps-service
-    container_name: mapsservice
+  maps-service:
+    build:
+      secrets:
+        - netrc
+      context: .
+      dockerfile: Containerfile
+    container_name: maps-service
    command: [
      # debug
      "--debug","serve",
      # http service port
-      "--port","8082",
+      "--port","8081",
      # postgres
      "--pg-host","10.0.0.29",
      "--pg-port","5432",
@ -28,92 +37,38 @@ services:
      "--pg-password","happypostgresuser",
      # other hosts
      "--nats-host","nats:4222",
-      "--auth-rpc-host","authrpc:8081"
+      "--auth-rpc-host","localhost:8090"
    ]
    depends_on:
-      - authrpc
      - nats
    networks:
      - maps-service-network
    ports:
-      - "8082:8082"
+      - "8081:8081"

  web:
-    image:
-      maps-service-web
+    build:
+      context: web
+      dockerfile: Containerfile
    networks:
      - maps-service-network
    ports:
      - "3000:3000"

  validation:
-    image:
-      maps-service-validation
+    build:
+      context: validation
+      dockerfile: Containerfile
    container_name: validation
    environment:
-      - RBXCOOKIE
-      - API_HOST=http://mapsservice:8082
+      - RBXCOOKIE=RBXCOOKIE
+      - API_HOST=http://localhost:8081
      - NATS_HOST=nats:4222
-      - DATA_HOST=http://dataservice:9000
+      - DATA_HOST=http://localhost:9000
    depends_on:
      - nats
-      # note: this races the mapsservice which creates a nats stream
+      # note: this races the maps-service which creates a nats stream
      # the validation will panic if the nats stream is not created
-      - mapsservice
-      - dataservice
+      - maps-service
    networks:
      - maps-service-network
-
-  dataservice:
-    image: registry.itzana.me/strafesnet/data-service:master
-    container_name: dataservice
-    environment:
-      - DEBUG=true
-      - PG_HOST=10.0.0.29
-      - PG_PORT=5432
-      - PG_USER=quat
-      - PG_DB=data
-      - PG_PASS=happypostgresuser
-    networks:
-      - maps-service-network
-
-  authredis:
-    image: docker.io/redis:latest
-    container_name: authredis
-    volumes:
-      - redis-data:/data
-    command: ["redis-server", "--appendonly", "yes"]
-    networks:
-      - maps-service-network
-
-  authrpc:
-    image: registry.itzana.me/strafesnet/auth-service:master
-    container_name: authrpc
-    command: ["serve", "rpc"]
-    environment:
-      - REDIS_ADDR=authredis:6379
-    env_file:
-      - ../auth-compose/auth-service.env
-    depends_on:
-      - authredis
-    networks:
-      - maps-service-network
-    logging:
-      driver: "none"
-
-  auth-web:
-    image: registry.itzana.me/strafesnet/auth-service:master
-    command: ["serve", "web"]
-    environment:
-      - REDIS_ADDR=authredis:6379
-    env_file:
-      - ../auth-compose/auth-service.env
-    depends_on:
-      - authredis
-    networks:
-      - maps-service-network
-    ports:
-      - "8080:8080"
-
-volumes:
-  redis-data:
--- a/openapi.yaml
+++ b/openapi.yaml
@ -19,19 +19,17 @@ paths:
      operationId: listSubmissions
      tags:
        - Submissions
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              required:
-              - Page
-              type: object
-              properties:
-                Page:
-                  $ref: "#/components/schemas/Pagination"
-                Filter:
-                  $ref: "#/components/schemas/SubmissionFilter"
+      parameters:
+        - name: page
+          in: query
+          required: true
+          schema:
+            $ref: "#/components/schemas/Pagination"
+        - name: filter
+          in: query
+          required: false
+          schema:
+            $ref: "#/components/schemas/SubmissionFilter"
      security:
      - cookieAuth: []
      responses:
@ -297,41 +295,6 @@ paths:
              schema:
                $ref: "#/components/schemas/Error"
  /script-policy:
-    get:
-      summary: Get list of script policies
-      operationId: listScriptPolicy
-      tags:
-        - ScriptPolicy
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              required:
-              - Page
-              type: object
-              properties:
-                Page:
-                  $ref: "#/components/schemas/Pagination"
-                Filter:
-                  $ref: "#/components/schemas/ScriptPolicyFilter"
-      security:
-      - cookieAuth: []
-      responses:
-        "200":
-          description: Successful response
-          content:
-            application/json:
-              schema:
-                type: array
-                items:
-                  $ref: "#/components/schemas/ScriptPolicy"
-        default:
-          description: General Error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
    post:
      summary: Create a new script policy
      operationId: createScriptPolicy
@ -752,22 +715,6 @@ components:
        Policy:
          type: integer
          format: int32
-    ScriptPolicyFilter:
-      type: object
-      properties:
-        ID:
-          type: integer
-          format: int64
-        FromScriptHash:
-          type: string
-          minLength: 16
-          maxLength: 16
-        ToScriptID:
-          type: integer
-          format: int64
-        Policy:
-          type: integer
-          format: int32
    ScriptPolicyCreate:
      required:
      - FromScriptID
--- a/pkg/api/oas_client_gen.go
+++ b/pkg/api/oas_client_gen.go
@ -126,18 +126,12 @@ type Invoker interface {
 	//
 	// GET /submissions/{SubmissionID}
 	GetSubmission(ctx context.Context, params GetSubmissionParams) (*Submission, error)
-	// ListScriptPolicy invokes listScriptPolicy operation.
-	//
-	// Get list of script policies.
-	//
-	// GET /script-policy
-	ListScriptPolicy(ctx context.Context, request *ListScriptPolicyReq) ([]ScriptPolicy, error)
 	// ListSubmissions invokes listSubmissions operation.
 	//
 	// Get list of submissions.
 	//
 	// GET /submissions
-	ListSubmissions(ctx context.Context, request *ListSubmissionsReq) ([]Submission, error)
+	ListSubmissions(ctx context.Context, params ListSubmissionsParams) ([]Submission, error)
 	// SetSubmissionCompleted invokes setSubmissionCompleted operation.
 	//
 	// Retrieve map with ID.
@ -2206,125 +2200,17 @@ func (c *Client) sendGetSubmission(ctx context.Context, params GetSubmissionPara
 	return result, nil
 }

-// ListScriptPolicy invokes listScriptPolicy operation.
-//
-// Get list of script policies.
-//
-// GET /script-policy
-func (c *Client) ListScriptPolicy(ctx context.Context, request *ListScriptPolicyReq) ([]ScriptPolicy, error) {
-	res, err := c.sendListScriptPolicy(ctx, request)
-	return res, err
-}
-
-func (c *Client) sendListScriptPolicy(ctx context.Context, request *ListScriptPolicyReq) (res []ScriptPolicy, err error) {
-	otelAttrs := []attribute.KeyValue{
-		otelogen.OperationID("listScriptPolicy"),
-		semconv.HTTPRequestMethodKey.String("GET"),
-		semconv.HTTPRouteKey.String("/script-policy"),
-	}
-
-	// Run stopwatch.
-	startTime := time.Now()
-	defer func() {
-		// Use floating point division here for higher precision (instead of Millisecond method).
-		elapsedDuration := time.Since(startTime)
-		c.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), metric.WithAttributes(otelAttrs...))
-	}()
-
-	// Increment request counter.
-	c.requests.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
-
-	// Start a span for this request.
-	ctx, span := c.cfg.Tracer.Start(ctx, ListScriptPolicyOperation,
-		trace.WithAttributes(otelAttrs...),
-		clientSpanKind,
-	)
-	// Track stage for error reporting.
-	var stage string
-	defer func() {
-		if err != nil {
-			span.RecordError(err)
-			span.SetStatus(codes.Error, stage)
-			c.errors.Add(ctx, 1, metric.WithAttributes(otelAttrs...))
-		}
-		span.End()
-	}()
-
-	stage = "BuildURL"
-	u := uri.Clone(c.requestURL(ctx))
-	var pathParts [1]string
-	pathParts[0] = "/script-policy"
-	uri.AddPathParts(u, pathParts[:]...)
-
-	stage = "EncodeRequest"
-	r, err := ht.NewRequest(ctx, "GET", u)
-	if err != nil {
-		return res, errors.Wrap(err, "create request")
-	}
-	if err := encodeListScriptPolicyRequest(request, r); err != nil {
-		return res, errors.Wrap(err, "encode request")
-	}
-
-	{
-		type bitset = [1]uint8
-		var satisfied bitset
-		{
-			stage = "Security:CookieAuth"
-			switch err := c.securityCookieAuth(ctx, ListScriptPolicyOperation, r); {
-			case err == nil: // if NO error
-				satisfied[0] |= 1 << 0
-			case errors.Is(err, ogenerrors.ErrSkipClientSecurity):
-				// Skip this security.
-			default:
-				return res, errors.Wrap(err, "security \"CookieAuth\"")
-			}
-		}
-
-		if ok := func() bool {
-		nextRequirement:
-			for _, requirement := range []bitset{
-				{0b00000001},
-			} {
-				for i, mask := range requirement {
-					if satisfied[i]&mask != mask {
-						continue nextRequirement
-					}
-				}
-				return true
-			}
-			return false
-		}(); !ok {
-			return res, ogenerrors.ErrSecurityRequirementIsNotSatisfied
-		}
-	}
-
-	stage = "SendRequest"
-	resp, err := c.cfg.Client.Do(r)
-	if err != nil {
-		return res, errors.Wrap(err, "do request")
-	}
-	defer resp.Body.Close()
-
-	stage = "DecodeResponse"
-	result, err := decodeListScriptPolicyResponse(resp)
-	if err != nil {
-		return res, errors.Wrap(err, "decode response")
-	}
-
-	return result, nil
-}
-
 // ListSubmissions invokes listSubmissions operation.
 //
 // Get list of submissions.
 //
 // GET /submissions
-func (c *Client) ListSubmissions(ctx context.Context, request *ListSubmissionsReq) ([]Submission, error) {
-	res, err := c.sendListSubmissions(ctx, request)
+func (c *Client) ListSubmissions(ctx context.Context, params ListSubmissionsParams) ([]Submission, error) {
+	res, err := c.sendListSubmissions(ctx, params)
 	return res, err
 }

-func (c *Client) sendListSubmissions(ctx context.Context, request *ListSubmissionsReq) (res []Submission, err error) {
+func (c *Client) sendListSubmissions(ctx context.Context, params ListSubmissionsParams) (res []Submission, err error) {
 	otelAttrs := []attribute.KeyValue{
 		otelogen.OperationID("listSubmissions"),
 		semconv.HTTPRequestMethodKey.String("GET"),
@ -2364,14 +2250,46 @@ func (c *Client) sendListSubmissions(ctx context.Context, request *ListSubmissio
 	pathParts[0] = "/submissions"
 	uri.AddPathParts(u, pathParts[:]...)

+	stage = "EncodeQueryParams"
+	q := uri.NewQueryEncoder()
+	{
+		// Encode "page" parameter.
+		cfg := uri.QueryParameterEncodingConfig{
+			Name:    "page",
+			Style:   uri.QueryStyleForm,
+			Explode: true,
+		}
+
+		if err := q.EncodeParam(cfg, func(e uri.Encoder) error {
+			return params.Page.EncodeURI(e)
+		}); err != nil {
+			return res, errors.Wrap(err, "encode query")
+		}
+	}
+	{
+		// Encode "filter" parameter.
+		cfg := uri.QueryParameterEncodingConfig{
+			Name:    "filter",
+			Style:   uri.QueryStyleForm,
+			Explode: true,
+		}
+
+		if err := q.EncodeParam(cfg, func(e uri.Encoder) error {
+			if val, ok := params.Filter.Get(); ok {
+				return val.EncodeURI(e)
+			}
+			return nil
+		}); err != nil {
+			return res, errors.Wrap(err, "encode query")
+		}
+	}
+	u.RawQuery = q.Values().Encode()
+
 	stage = "EncodeRequest"
 	r, err := ht.NewRequest(ctx, "GET", u)
 	if err != nil {
 		return res, errors.Wrap(err, "create request")
 	}
-	if err := encodeListSubmissionsRequest(request, r); err != nil {
-		return res, errors.Wrap(err, "encode request")
-	}

 	{
 		type bitset = [1]uint8
--- a/pkg/api/oas_handlers_gen.go
+++ b/pkg/api/oas_handlers_gen.go
@ -3253,201 +3253,6 @@ func (s *Server) handleGetSubmissionRequest(args [1]string, argsEscaped bool, w
 	}
 }

-// handleListScriptPolicyRequest handles listScriptPolicy operation.
-//
-// Get list of script policies.
-//
-// GET /script-policy
-func (s *Server) handleListScriptPolicyRequest(args [0]string, argsEscaped bool, w http.ResponseWriter, r *http.Request) {
-	statusWriter := &codeRecorder{ResponseWriter: w}
-	w = statusWriter
-	otelAttrs := []attribute.KeyValue{
-		otelogen.OperationID("listScriptPolicy"),
-		semconv.HTTPRequestMethodKey.String("GET"),
-		semconv.HTTPRouteKey.String("/script-policy"),
-	}
-
-	// Start a span for this request.
-	ctx, span := s.cfg.Tracer.Start(r.Context(), ListScriptPolicyOperation,
-		trace.WithAttributes(otelAttrs...),
-		serverSpanKind,
-	)
-	defer span.End()
-
-	// Add Labeler to context.
-	labeler := &Labeler{attrs: otelAttrs}
-	ctx = contextWithLabeler(ctx, labeler)
-
-	// Run stopwatch.
-	startTime := time.Now()
-	defer func() {
-		elapsedDuration := time.Since(startTime)
-
-		attrSet := labeler.AttributeSet()
-		attrs := attrSet.ToSlice()
-		code := statusWriter.status
-		if code != 0 {
-			codeAttr := semconv.HTTPResponseStatusCode(code)
-			attrs = append(attrs, codeAttr)
-			span.SetAttributes(codeAttr)
-		}
-		attrOpt := metric.WithAttributes(attrs...)
-
-		// Increment request counter.
-		s.requests.Add(ctx, 1, attrOpt)
-
-		// Use floating point division here for higher precision (instead of Millisecond method).
-		s.duration.Record(ctx, float64(elapsedDuration)/float64(time.Millisecond), attrOpt)
-	}()
-
-	var (
-		recordError = func(stage string, err error) {
-			span.RecordError(err)
-
-			// https://opentelemetry.io/docs/specs/semconv/http/http-spans/#status
-			// Span Status MUST be left unset if HTTP status code was in the 1xx, 2xx or 3xx ranges,
-			// unless there was another error (e.g., network error receiving the response body; or 3xx codes with
-			// max redirects exceeded), in which case status MUST be set to Error.
-			code := statusWriter.status
-			if code >= 100 && code < 500 {
-				span.SetStatus(codes.Error, stage)
-			}
-
-			attrSet := labeler.AttributeSet()
-			attrs := attrSet.ToSlice()
-			if code != 0 {
-				attrs = append(attrs, semconv.HTTPResponseStatusCode(code))
-			}
-
-			s.errors.Add(ctx, 1, metric.WithAttributes(attrs...))
-		}
-		err          error
-		opErrContext = ogenerrors.OperationContext{
-			Name: ListScriptPolicyOperation,
-			ID:   "listScriptPolicy",
-		}
-	)
-	{
-		type bitset = [1]uint8
-		var satisfied bitset
-		{
-			sctx, ok, err := s.securityCookieAuth(ctx, ListScriptPolicyOperation, r)
-			if err != nil {
-				err = &ogenerrors.SecurityError{
-					OperationContext: opErrContext,
-					Security:         "CookieAuth",
-					Err:              err,
-				}
-				if encodeErr := encodeErrorResponse(s.h.NewError(ctx, err), w, span); encodeErr != nil {
-					defer recordError("Security:CookieAuth", err)
-				}
-				return
-			}
-			if ok {
-				satisfied[0] |= 1 << 0
-				ctx = sctx
-			}
-		}
-
-		if ok := func() bool {
-		nextRequirement:
-			for _, requirement := range []bitset{
-				{0b00000001},
-			} {
-				for i, mask := range requirement {
-					if satisfied[i]&mask != mask {
-						continue nextRequirement
-					}
-				}
-				return true
-			}
-			return false
-		}(); !ok {
-			err = &ogenerrors.SecurityError{
-				OperationContext: opErrContext,
-				Err:              ogenerrors.ErrSecurityRequirementIsNotSatisfied,
-			}
-			if encodeErr := encodeErrorResponse(s.h.NewError(ctx, err), w, span); encodeErr != nil {
-				defer recordError("Security", err)
-			}
-			return
-		}
-	}
-	request, close, err := s.decodeListScriptPolicyRequest(r)
-	if err != nil {
-		err = &ogenerrors.DecodeRequestError{
-			OperationContext: opErrContext,
-			Err:              err,
-		}
-		defer recordError("DecodeRequest", err)
-		s.cfg.ErrorHandler(ctx, w, r, err)
-		return
-	}
-	defer func() {
-		if err := close(); err != nil {
-			recordError("CloseRequest", err)
-		}
-	}()
-
-	var response []ScriptPolicy
-	if m := s.cfg.Middleware; m != nil {
-		mreq := middleware.Request{
-			Context:          ctx,
-			OperationName:    ListScriptPolicyOperation,
-			OperationSummary: "Get list of script policies",
-			OperationID:      "listScriptPolicy",
-			Body:             request,
-			Params:           middleware.Parameters{},
-			Raw:              r,
-		}
-
-		type (
-			Request  = *ListScriptPolicyReq
-			Params   = struct{}
-			Response = []ScriptPolicy
-		)
-		response, err = middleware.HookMiddleware[
-			Request,
-			Params,
-			Response,
-		](
-			m,
-			mreq,
-			nil,
-			func(ctx context.Context, request Request, params Params) (response Response, err error) {
-				response, err = s.h.ListScriptPolicy(ctx, request)
-				return response, err
-			},
-		)
-	} else {
-		response, err = s.h.ListScriptPolicy(ctx, request)
-	}
-	if err != nil {
-		if errRes, ok := errors.Into[*ErrorStatusCode](err); ok {
-			if err := encodeErrorResponse(errRes, w, span); err != nil {
-				defer recordError("Internal", err)
-			}
-			return
-		}
-		if errors.Is(err, ht.ErrNotImplemented) {
-			s.cfg.ErrorHandler(ctx, w, r, err)
-			return
-		}
-		if err := encodeErrorResponse(s.h.NewError(ctx, err), w, span); err != nil {
-			defer recordError("Internal", err)
-		}
-		return
-	}
-
-	if err := encodeListScriptPolicyResponse(response, w, span); err != nil {
-		defer recordError("EncodeResponse", err)
-		if !errors.Is(err, ht.ErrInternalServerErrorResponse) {
-			s.cfg.ErrorHandler(ctx, w, r, err)
-		}
-		return
-	}
-}
-
 // handleListSubmissionsRequest handles listSubmissions operation.
 //
 // Get list of submissions.
@ -3568,21 +3373,16 @@ func (s *Server) handleListSubmissionsRequest(args [0]string, argsEscaped bool,
 			return
 		}
 	}
-	request, close, err := s.decodeListSubmissionsRequest(r)
+	params, err := decodeListSubmissionsParams(args, argsEscaped, r)
 	if err != nil {
-		err = &ogenerrors.DecodeRequestError{
+		err = &ogenerrors.DecodeParamsError{
 			OperationContext: opErrContext,
 			Err:              err,
 		}
-		defer recordError("DecodeRequest", err)
+		defer recordError("DecodeParams", err)
 		s.cfg.ErrorHandler(ctx, w, r, err)
 		return
 	}
-	defer func() {
-		if err := close(); err != nil {
-			recordError("CloseRequest", err)
-		}
-	}()

 	var response []Submission
 	if m := s.cfg.Middleware; m != nil {
@ -3591,14 +3391,23 @@ func (s *Server) handleListSubmissionsRequest(args [0]string, argsEscaped bool,
 			OperationName:    ListSubmissionsOperation,
 			OperationSummary: "Get list of submissions",
 			OperationID:      "listSubmissions",
-			Body:             request,
-			Params:           middleware.Parameters{},
-			Raw:              r,
+			Body:             nil,
+			Params: middleware.Parameters{
+				{
+					Name: "page",
+					In:   "query",
+				}: params.Page,
+				{
+					Name: "filter",
+					In:   "query",
+				}: params.Filter,
+			},
+			Raw: r,
 		}

 		type (
-			Request  = *ListSubmissionsReq
-			Params   = struct{}
+			Request  = struct{}
+			Params   = ListSubmissionsParams
 			Response = []Submission
 		)
 		response, err = middleware.HookMiddleware[
@ -3608,14 +3417,14 @@ func (s *Server) handleListSubmissionsRequest(args [0]string, argsEscaped bool,
 		](
 			m,
 			mreq,
-			nil,
+			unpackListSubmissionsParams,
 			func(ctx context.Context, request Request, params Params) (response Response, err error) {
-				response, err = s.h.ListSubmissions(ctx, request)
+				response, err = s.h.ListSubmissions(ctx, params)
 				return response, err
 			},
 		)
 	} else {
-		response, err = s.h.ListSubmissions(ctx, request)
+		response, err = s.h.ListSubmissions(ctx, params)
 	}
 	if err != nil {
 		if errRes, ok := errors.Into[*ErrorStatusCode](err); ok {
--- a/pkg/api/oas_json_gen.go
+++ b/pkg/api/oas_json_gen.go
@ -221,228 +221,6 @@ func (s *ID) UnmarshalJSON(data []byte) error {
 	return s.Decode(d)
 }

-// Encode implements json.Marshaler.
-func (s *ListScriptPolicyReq) Encode(e *jx.Encoder) {
-	e.ObjStart()
-	s.encodeFields(e)
-	e.ObjEnd()
-}
-
-// encodeFields encodes fields.
-func (s *ListScriptPolicyReq) encodeFields(e *jx.Encoder) {
-	{
-		e.FieldStart("Page")
-		s.Page.Encode(e)
-	}
-	{
-		if s.Filter.Set {
-			e.FieldStart("Filter")
-			s.Filter.Encode(e)
-		}
-	}
-}
-
-var jsonFieldsNameOfListScriptPolicyReq = [2]string{
-	0: "Page",
-	1: "Filter",
-}
-
-// Decode decodes ListScriptPolicyReq from json.
-func (s *ListScriptPolicyReq) Decode(d *jx.Decoder) error {
-	if s == nil {
-		return errors.New("invalid: unable to decode ListScriptPolicyReq to nil")
-	}
-	var requiredBitSet [1]uint8
-
-	if err := d.ObjBytes(func(d *jx.Decoder, k []byte) error {
-		switch string(k) {
-		case "Page":
-			requiredBitSet[0] |= 1 << 0
-			if err := func() error {
-				if err := s.Page.Decode(d); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"Page\"")
-			}
-		case "Filter":
-			if err := func() error {
-				s.Filter.Reset()
-				if err := s.Filter.Decode(d); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"Filter\"")
-			}
-		default:
-			return d.Skip()
-		}
-		return nil
-	}); err != nil {
-		return errors.Wrap(err, "decode ListScriptPolicyReq")
-	}
-	// Validate required fields.
-	var failures []validate.FieldError
-	for i, mask := range [1]uint8{
-		0b00000001,
-	} {
-		if result := (requiredBitSet[i] & mask) ^ mask; result != 0 {
-			// Mask only required fields and check equality to mask using XOR.
-			//
-			// If XOR result is not zero, result is not equal to expected, so some fields are missed.
-			// Bits of fields which would be set are actually bits of missed fields.
-			missed := bits.OnesCount8(result)
-			for bitN := 0; bitN < missed; bitN++ {
-				bitIdx := bits.TrailingZeros8(result)
-				fieldIdx := i*8 + bitIdx
-				var name string
-				if fieldIdx < len(jsonFieldsNameOfListScriptPolicyReq) {
-					name = jsonFieldsNameOfListScriptPolicyReq[fieldIdx]
-				} else {
-					name = strconv.Itoa(fieldIdx)
-				}
-				failures = append(failures, validate.FieldError{
-					Name:  name,
-					Error: validate.ErrFieldRequired,
-				})
-				// Reset bit.
-				result &^= 1 << bitIdx
-			}
-		}
-	}
-	if len(failures) > 0 {
-		return &validate.Error{Fields: failures}
-	}
-
-	return nil
-}
-
-// MarshalJSON implements stdjson.Marshaler.
-func (s *ListScriptPolicyReq) MarshalJSON() ([]byte, error) {
-	e := jx.Encoder{}
-	s.Encode(&e)
-	return e.Bytes(), nil
-}
-
-// UnmarshalJSON implements stdjson.Unmarshaler.
-func (s *ListScriptPolicyReq) UnmarshalJSON(data []byte) error {
-	d := jx.DecodeBytes(data)
-	return s.Decode(d)
-}
-
-// Encode implements json.Marshaler.
-func (s *ListSubmissionsReq) Encode(e *jx.Encoder) {
-	e.ObjStart()
-	s.encodeFields(e)
-	e.ObjEnd()
-}
-
-// encodeFields encodes fields.
-func (s *ListSubmissionsReq) encodeFields(e *jx.Encoder) {
-	{
-		e.FieldStart("Page")
-		s.Page.Encode(e)
-	}
-	{
-		if s.Filter.Set {
-			e.FieldStart("Filter")
-			s.Filter.Encode(e)
-		}
-	}
-}
-
-var jsonFieldsNameOfListSubmissionsReq = [2]string{
-	0: "Page",
-	1: "Filter",
-}
-
-// Decode decodes ListSubmissionsReq from json.
-func (s *ListSubmissionsReq) Decode(d *jx.Decoder) error {
-	if s == nil {
-		return errors.New("invalid: unable to decode ListSubmissionsReq to nil")
-	}
-	var requiredBitSet [1]uint8
-
-	if err := d.ObjBytes(func(d *jx.Decoder, k []byte) error {
-		switch string(k) {
-		case "Page":
-			requiredBitSet[0] |= 1 << 0
-			if err := func() error {
-				if err := s.Page.Decode(d); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"Page\"")
-			}
-		case "Filter":
-			if err := func() error {
-				s.Filter.Reset()
-				if err := s.Filter.Decode(d); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"Filter\"")
-			}
-		default:
-			return d.Skip()
-		}
-		return nil
-	}); err != nil {
-		return errors.Wrap(err, "decode ListSubmissionsReq")
-	}
-	// Validate required fields.
-	var failures []validate.FieldError
-	for i, mask := range [1]uint8{
-		0b00000001,
-	} {
-		if result := (requiredBitSet[i] & mask) ^ mask; result != 0 {
-			// Mask only required fields and check equality to mask using XOR.
-			//
-			// If XOR result is not zero, result is not equal to expected, so some fields are missed.
-			// Bits of fields which would be set are actually bits of missed fields.
-			missed := bits.OnesCount8(result)
-			for bitN := 0; bitN < missed; bitN++ {
-				bitIdx := bits.TrailingZeros8(result)
-				fieldIdx := i*8 + bitIdx
-				var name string
-				if fieldIdx < len(jsonFieldsNameOfListSubmissionsReq) {
-					name = jsonFieldsNameOfListSubmissionsReq[fieldIdx]
-				} else {
-					name = strconv.Itoa(fieldIdx)
-				}
-				failures = append(failures, validate.FieldError{
-					Name:  name,
-					Error: validate.ErrFieldRequired,
-				})
-				// Reset bit.
-				result &^= 1 << bitIdx
-			}
-		}
-	}
-	if len(failures) > 0 {
-		return &validate.Error{Fields: failures}
-	}
-
-	return nil
-}
-
-// MarshalJSON implements stdjson.Marshaler.
-func (s *ListSubmissionsReq) MarshalJSON() ([]byte, error) {
-	e := jx.Encoder{}
-	s.Encode(&e)
-	return e.Bytes(), nil
-}
-
-// UnmarshalJSON implements stdjson.Unmarshaler.
-func (s *ListSubmissionsReq) UnmarshalJSON(data []byte) error {
-	d := jx.DecodeBytes(data)
-	return s.Decode(d)
-}
-
 // Encode encodes int32 as json.
 func (o OptInt32) Encode(e *jx.Encoder) {
 	if !o.Set {
@ -513,39 +291,6 @@ func (s *OptInt64) UnmarshalJSON(data []byte) error {
 	return s.Decode(d)
 }

-// Encode encodes ScriptPolicyFilter as json.
-func (o OptScriptPolicyFilter) Encode(e *jx.Encoder) {
-	if !o.Set {
-		return
-	}
-	o.Value.Encode(e)
-}
-
-// Decode decodes ScriptPolicyFilter from json.
-func (o *OptScriptPolicyFilter) Decode(d *jx.Decoder) error {
-	if o == nil {
-		return errors.New("invalid: unable to decode OptScriptPolicyFilter to nil")
-	}
-	o.Set = true
-	if err := o.Value.Decode(d); err != nil {
-		return err
-	}
-	return nil
-}
-
-// MarshalJSON implements stdjson.Marshaler.
-func (s OptScriptPolicyFilter) MarshalJSON() ([]byte, error) {
-	e := jx.Encoder{}
-	s.Encode(&e)
-	return e.Bytes(), nil
-}
-
-// UnmarshalJSON implements stdjson.Unmarshaler.
-func (s *OptScriptPolicyFilter) UnmarshalJSON(data []byte) error {
-	d := jx.DecodeBytes(data)
-	return s.Decode(d)
-}
-
 // Encode encodes string as json.
 func (o OptString) Encode(e *jx.Encoder) {
 	if !o.Set {
@ -581,152 +326,6 @@ func (s *OptString) UnmarshalJSON(data []byte) error {
 	return s.Decode(d)
 }

-// Encode encodes SubmissionFilter as json.
-func (o OptSubmissionFilter) Encode(e *jx.Encoder) {
-	if !o.Set {
-		return
-	}
-	o.Value.Encode(e)
-}
-
-// Decode decodes SubmissionFilter from json.
-func (o *OptSubmissionFilter) Decode(d *jx.Decoder) error {
-	if o == nil {
-		return errors.New("invalid: unable to decode OptSubmissionFilter to nil")
-	}
-	o.Set = true
-	if err := o.Value.Decode(d); err != nil {
-		return err
-	}
-	return nil
-}
-
-// MarshalJSON implements stdjson.Marshaler.
-func (s OptSubmissionFilter) MarshalJSON() ([]byte, error) {
-	e := jx.Encoder{}
-	s.Encode(&e)
-	return e.Bytes(), nil
-}
-
-// UnmarshalJSON implements stdjson.Unmarshaler.
-func (s *OptSubmissionFilter) UnmarshalJSON(data []byte) error {
-	d := jx.DecodeBytes(data)
-	return s.Decode(d)
-}
-
-// Encode implements json.Marshaler.
-func (s *Pagination) Encode(e *jx.Encoder) {
-	e.ObjStart()
-	s.encodeFields(e)
-	e.ObjEnd()
-}
-
-// encodeFields encodes fields.
-func (s *Pagination) encodeFields(e *jx.Encoder) {
-	{
-		e.FieldStart("Page")
-		e.Int32(s.Page)
-	}
-	{
-		e.FieldStart("Limit")
-		e.Int32(s.Limit)
-	}
-}
-
-var jsonFieldsNameOfPagination = [2]string{
-	0: "Page",
-	1: "Limit",
-}
-
-// Decode decodes Pagination from json.
-func (s *Pagination) Decode(d *jx.Decoder) error {
-	if s == nil {
-		return errors.New("invalid: unable to decode Pagination to nil")
-	}
-	var requiredBitSet [1]uint8
-
-	if err := d.ObjBytes(func(d *jx.Decoder, k []byte) error {
-		switch string(k) {
-		case "Page":
-			requiredBitSet[0] |= 1 << 0
-			if err := func() error {
-				v, err := d.Int32()
-				s.Page = int32(v)
-				if err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"Page\"")
-			}
-		case "Limit":
-			requiredBitSet[0] |= 1 << 1
-			if err := func() error {
-				v, err := d.Int32()
-				s.Limit = int32(v)
-				if err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"Limit\"")
-			}
-		default:
-			return d.Skip()
-		}
-		return nil
-	}); err != nil {
-		return errors.Wrap(err, "decode Pagination")
-	}
-	// Validate required fields.
-	var failures []validate.FieldError
-	for i, mask := range [1]uint8{
-		0b00000011,
-	} {
-		if result := (requiredBitSet[i] & mask) ^ mask; result != 0 {
-			// Mask only required fields and check equality to mask using XOR.
-			//
-			// If XOR result is not zero, result is not equal to expected, so some fields are missed.
-			// Bits of fields which would be set are actually bits of missed fields.
-			missed := bits.OnesCount8(result)
-			for bitN := 0; bitN < missed; bitN++ {
-				bitIdx := bits.TrailingZeros8(result)
-				fieldIdx := i*8 + bitIdx
-				var name string
-				if fieldIdx < len(jsonFieldsNameOfPagination) {
-					name = jsonFieldsNameOfPagination[fieldIdx]
-				} else {
-					name = strconv.Itoa(fieldIdx)
-				}
-				failures = append(failures, validate.FieldError{
-					Name:  name,
-					Error: validate.ErrFieldRequired,
-				})
-				// Reset bit.
-				result &^= 1 << bitIdx
-			}
-		}
-	}
-	if len(failures) > 0 {
-		return &validate.Error{Fields: failures}
-	}
-
-	return nil
-}
-
-// MarshalJSON implements stdjson.Marshaler.
-func (s *Pagination) MarshalJSON() ([]byte, error) {
-	e := jx.Encoder{}
-	s.Encode(&e)
-	return e.Bytes(), nil
-}
-
-// UnmarshalJSON implements stdjson.Unmarshaler.
-func (s *Pagination) UnmarshalJSON(data []byte) error {
-	d := jx.DecodeBytes(data)
-	return s.Decode(d)
-}
-
 // Encode implements json.Marshaler.
 func (s *Script) Encode(e *jx.Encoder) {
 	e.ObjStart()
@ -1264,120 +863,6 @@ func (s *ScriptPolicyCreate) UnmarshalJSON(data []byte) error {
 	return s.Decode(d)
 }

-// Encode implements json.Marshaler.
-func (s *ScriptPolicyFilter) Encode(e *jx.Encoder) {
-	e.ObjStart()
-	s.encodeFields(e)
-	e.ObjEnd()
-}
-
-// encodeFields encodes fields.
-func (s *ScriptPolicyFilter) encodeFields(e *jx.Encoder) {
-	{
-		if s.ID.Set {
-			e.FieldStart("ID")
-			s.ID.Encode(e)
-		}
-	}
-	{
-		if s.FromScriptHash.Set {
-			e.FieldStart("FromScriptHash")
-			s.FromScriptHash.Encode(e)
-		}
-	}
-	{
-		if s.ToScriptID.Set {
-			e.FieldStart("ToScriptID")
-			s.ToScriptID.Encode(e)
-		}
-	}
-	{
-		if s.Policy.Set {
-			e.FieldStart("Policy")
-			s.Policy.Encode(e)
-		}
-	}
-}
-
-var jsonFieldsNameOfScriptPolicyFilter = [4]string{
-	0: "ID",
-	1: "FromScriptHash",
-	2: "ToScriptID",
-	3: "Policy",
-}
-
-// Decode decodes ScriptPolicyFilter from json.
-func (s *ScriptPolicyFilter) Decode(d *jx.Decoder) error {
-	if s == nil {
-		return errors.New("invalid: unable to decode ScriptPolicyFilter to nil")
-	}
-
-	if err := d.ObjBytes(func(d *jx.Decoder, k []byte) error {
-		switch string(k) {
-		case "ID":
-			if err := func() error {
-				s.ID.Reset()
-				if err := s.ID.Decode(d); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"ID\"")
-			}
-		case "FromScriptHash":
-			if err := func() error {
-				s.FromScriptHash.Reset()
-				if err := s.FromScriptHash.Decode(d); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"FromScriptHash\"")
-			}
-		case "ToScriptID":
-			if err := func() error {
-				s.ToScriptID.Reset()
-				if err := s.ToScriptID.Decode(d); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"ToScriptID\"")
-			}
-		case "Policy":
-			if err := func() error {
-				s.Policy.Reset()
-				if err := s.Policy.Decode(d); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"Policy\"")
-			}
-		default:
-			return d.Skip()
-		}
-		return nil
-	}); err != nil {
-		return errors.Wrap(err, "decode ScriptPolicyFilter")
-	}
-
-	return nil
-}
-
-// MarshalJSON implements stdjson.Marshaler.
-func (s *ScriptPolicyFilter) MarshalJSON() ([]byte, error) {
-	e := jx.Encoder{}
-	s.Encode(&e)
-	return e.Bytes(), nil
-}
-
-// UnmarshalJSON implements stdjson.Unmarshaler.
-func (s *ScriptPolicyFilter) UnmarshalJSON(data []byte) error {
-	d := jx.DecodeBytes(data)
-	return s.Decode(d)
-}
-
 // Encode implements json.Marshaler.
 func (s *ScriptPolicyUpdate) Encode(e *jx.Encoder) {
 	e.ObjStart()
@ -2136,150 +1621,3 @@ func (s *SubmissionCreate) UnmarshalJSON(data []byte) error {
 	d := jx.DecodeBytes(data)
 	return s.Decode(d)
 }
-
-// Encode implements json.Marshaler.
-func (s *SubmissionFilter) Encode(e *jx.Encoder) {
-	e.ObjStart()
-	s.encodeFields(e)
-	e.ObjEnd()
-}
-
-// encodeFields encodes fields.
-func (s *SubmissionFilter) encodeFields(e *jx.Encoder) {
-	{
-		e.FieldStart("ID")
-		e.Int64(s.ID)
-	}
-	{
-		if s.DisplayName.Set {
-			e.FieldStart("DisplayName")
-			s.DisplayName.Encode(e)
-		}
-	}
-	{
-		if s.Creator.Set {
-			e.FieldStart("Creator")
-			s.Creator.Encode(e)
-		}
-	}
-	{
-		if s.GameID.Set {
-			e.FieldStart("GameID")
-			s.GameID.Encode(e)
-		}
-	}
-}
-
-var jsonFieldsNameOfSubmissionFilter = [4]string{
-	0: "ID",
-	1: "DisplayName",
-	2: "Creator",
-	3: "GameID",
-}
-
-// Decode decodes SubmissionFilter from json.
-func (s *SubmissionFilter) Decode(d *jx.Decoder) error {
-	if s == nil {
-		return errors.New("invalid: unable to decode SubmissionFilter to nil")
-	}
-	var requiredBitSet [1]uint8
-
-	if err := d.ObjBytes(func(d *jx.Decoder, k []byte) error {
-		switch string(k) {
-		case "ID":
-			requiredBitSet[0] |= 1 << 0
-			if err := func() error {
-				v, err := d.Int64()
-				s.ID = int64(v)
-				if err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"ID\"")
-			}
-		case "DisplayName":
-			if err := func() error {
-				s.DisplayName.Reset()
-				if err := s.DisplayName.Decode(d); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"DisplayName\"")
-			}
-		case "Creator":
-			if err := func() error {
-				s.Creator.Reset()
-				if err := s.Creator.Decode(d); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"Creator\"")
-			}
-		case "GameID":
-			if err := func() error {
-				s.GameID.Reset()
-				if err := s.GameID.Decode(d); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return errors.Wrap(err, "decode field \"GameID\"")
-			}
-		default:
-			return d.Skip()
-		}
-		return nil
-	}); err != nil {
-		return errors.Wrap(err, "decode SubmissionFilter")
-	}
-	// Validate required fields.
-	var failures []validate.FieldError
-	for i, mask := range [1]uint8{
-		0b00000001,
-	} {
-		if result := (requiredBitSet[i] & mask) ^ mask; result != 0 {
-			// Mask only required fields and check equality to mask using XOR.
-			//
-			// If XOR result is not zero, result is not equal to expected, so some fields are missed.
-			// Bits of fields which would be set are actually bits of missed fields.
-			missed := bits.OnesCount8(result)
-			for bitN := 0; bitN < missed; bitN++ {
-				bitIdx := bits.TrailingZeros8(result)
-				fieldIdx := i*8 + bitIdx
-				var name string
-				if fieldIdx < len(jsonFieldsNameOfSubmissionFilter) {
-					name = jsonFieldsNameOfSubmissionFilter[fieldIdx]
-				} else {
-					name = strconv.Itoa(fieldIdx)
-				}
-				failures = append(failures, validate.FieldError{
-					Name:  name,
-					Error: validate.ErrFieldRequired,
-				})
-				// Reset bit.
-				result &^= 1 << bitIdx
-			}
-		}
-	}
-	if len(failures) > 0 {
-		return &validate.Error{Fields: failures}
-	}
-
-	return nil
-}
-
-// MarshalJSON implements stdjson.Marshaler.
-func (s *SubmissionFilter) MarshalJSON() ([]byte, error) {
-	e := jx.Encoder{}
-	s.Encode(&e)
-	return e.Bytes(), nil
-}
-
-// UnmarshalJSON implements stdjson.Unmarshaler.
-func (s *SubmissionFilter) UnmarshalJSON(data []byte) error {
-	d := jx.DecodeBytes(data)
-	return s.Decode(d)
-}
--- a/pkg/api/oas_operations_gen.go
+++ b/pkg/api/oas_operations_gen.go
@ -23,7 +23,6 @@ const (
 	GetScriptPolicyOperation                 OperationName = "GetScriptPolicy"
 	GetScriptPolicyFromHashOperation         OperationName = "GetScriptPolicyFromHash"
 	GetSubmissionOperation                   OperationName = "GetSubmission"
-	ListScriptPolicyOperation                OperationName = "ListScriptPolicy"
 	ListSubmissionsOperation                 OperationName = "ListSubmissions"
 	SetSubmissionCompletedOperation          OperationName = "SetSubmissionCompleted"
 	UpdateScriptOperation                    OperationName = "UpdateScript"
--- a/pkg/api/oas_parameters_gen.go
+++ b/pkg/api/oas_parameters_gen.go
@ -954,6 +954,117 @@ func decodeGetSubmissionParams(args [1]string, argsEscaped bool, r *http.Request
 	return params, nil
 }

+// ListSubmissionsParams is parameters of listSubmissions operation.
+type ListSubmissionsParams struct {
+	Page   Pagination
+	Filter OptSubmissionFilter
+}
+
+func unpackListSubmissionsParams(packed middleware.Parameters) (params ListSubmissionsParams) {
+	{
+		key := middleware.ParameterKey{
+			Name: "page",
+			In:   "query",
+		}
+		params.Page = packed[key].(Pagination)
+	}
+	{
+		key := middleware.ParameterKey{
+			Name: "filter",
+			In:   "query",
+		}
+		if v, ok := packed[key]; ok {
+			params.Filter = v.(OptSubmissionFilter)
+		}
+	}
+	return params
+}
+
+func decodeListSubmissionsParams(args [0]string, argsEscaped bool, r *http.Request) (params ListSubmissionsParams, _ error) {
+	q := uri.NewQueryDecoder(r.URL.Query())
+	// Decode query: page.
+	if err := func() error {
+		cfg := uri.QueryParameterDecodingConfig{
+			Name:    "page",
+			Style:   uri.QueryStyleForm,
+			Explode: true,
+			Fields:  []uri.QueryParameterObjectField{{Name: "Page", Required: true}, {Name: "Limit", Required: true}},
+		}
+
+		if err := q.HasParam(cfg); err == nil {
+			if err := q.DecodeParam(cfg, func(d uri.Decoder) error {
+				return params.Page.DecodeURI(d)
+			}); err != nil {
+				return err
+			}
+			if err := func() error {
+				if err := params.Page.Validate(); err != nil {
+					return err
+				}
+				return nil
+			}(); err != nil {
+				return err
+			}
+		} else {
+			return validate.ErrFieldRequired
+		}
+		return nil
+	}(); err != nil {
+		return params, &ogenerrors.DecodeParamError{
+			Name: "page",
+			In:   "query",
+			Err:  err,
+		}
+	}
+	// Decode query: filter.
+	if err := func() error {
+		cfg := uri.QueryParameterDecodingConfig{
+			Name:    "filter",
+			Style:   uri.QueryStyleForm,
+			Explode: true,
+			Fields:  []uri.QueryParameterObjectField{{Name: "ID", Required: true}, {Name: "DisplayName", Required: false}, {Name: "Creator", Required: false}, {Name: "GameID", Required: false}},
+		}
+
+		if err := q.HasParam(cfg); err == nil {
+			if err := q.DecodeParam(cfg, func(d uri.Decoder) error {
+				var paramsDotFilterVal SubmissionFilter
+				if err := func() error {
+					return paramsDotFilterVal.DecodeURI(d)
+				}(); err != nil {
+					return err
+				}
+				params.Filter.SetTo(paramsDotFilterVal)
+				return nil
+			}); err != nil {
+				return err
+			}
+			if err := func() error {
+				if value, ok := params.Filter.Get(); ok {
+					if err := func() error {
+						if err := value.Validate(); err != nil {
+							return err
+						}
+						return nil
+					}(); err != nil {
+						return err
+					}
+				}
+				return nil
+			}(); err != nil {
+				return err
+			}
+		}
+		return nil
+	}(); err != nil {
+		return params, &ogenerrors.DecodeParamError{
+			Name: "filter",
+			In:   "query",
+			Err:  err,
+		}
+	}
+	return params, nil
+}
+
 // SetSubmissionCompletedParams is parameters of setSubmissionCompleted operation.
 type SetSubmissionCompletedParams struct {
 	// The unique identifier for a submission.
--- a/pkg/api/oas_request_decoders_gen.go
+++ b/pkg/api/oas_request_decoders_gen.go
@ -220,148 +220,6 @@ func (s *Server) decodeCreateSubmissionRequest(r *http.Request) (
 	}
 }

-func (s *Server) decodeListScriptPolicyRequest(r *http.Request) (
-	req *ListScriptPolicyReq,
-	close func() error,
-	rerr error,
-) {
-	var closers []func() error
-	close = func() error {
-		var merr error
-		// Close in reverse order, to match defer behavior.
-		for i := len(closers) - 1; i >= 0; i-- {
-			c := closers[i]
-			merr = multierr.Append(merr, c())
-		}
-		return merr
-	}
-	defer func() {
-		if rerr != nil {
-			rerr = multierr.Append(rerr, close())
-		}
-	}()
-	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
-	if err != nil {
-		return req, close, errors.Wrap(err, "parse media type")
-	}
-	switch {
-	case ct == "application/json":
-		if r.ContentLength == 0 {
-			return req, close, validate.ErrBodyRequired
-		}
-		buf, err := io.ReadAll(r.Body)
-		if err != nil {
-			return req, close, err
-		}
-
-		if len(buf) == 0 {
-			return req, close, validate.ErrBodyRequired
-		}
-
-		d := jx.DecodeBytes(buf)
-
-		var request ListScriptPolicyReq
-		if err := func() error {
-			if err := request.Decode(d); err != nil {
-				return err
-			}
-			if err := d.Skip(); err != io.EOF {
-				return errors.New("unexpected trailing data")
-			}
-			return nil
-		}(); err != nil {
-			err = &ogenerrors.DecodeBodyError{
-				ContentType: ct,
-				Body:        buf,
-				Err:         err,
-			}
-			return req, close, err
-		}
-		if err := func() error {
-			if err := request.Validate(); err != nil {
-				return err
-			}
-			return nil
-		}(); err != nil {
-			return req, close, errors.Wrap(err, "validate")
-		}
-		return &request, close, nil
-	default:
-		return req, close, validate.InvalidContentType(ct)
-	}
-}
-
-func (s *Server) decodeListSubmissionsRequest(r *http.Request) (
-	req *ListSubmissionsReq,
-	close func() error,
-	rerr error,
-) {
-	var closers []func() error
-	close = func() error {
-		var merr error
-		// Close in reverse order, to match defer behavior.
-		for i := len(closers) - 1; i >= 0; i-- {
-			c := closers[i]
-			merr = multierr.Append(merr, c())
-		}
-		return merr
-	}
-	defer func() {
-		if rerr != nil {
-			rerr = multierr.Append(rerr, close())
-		}
-	}()
-	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
-	if err != nil {
-		return req, close, errors.Wrap(err, "parse media type")
-	}
-	switch {
-	case ct == "application/json":
-		if r.ContentLength == 0 {
-			return req, close, validate.ErrBodyRequired
-		}
-		buf, err := io.ReadAll(r.Body)
-		if err != nil {
-			return req, close, err
-		}
-
-		if len(buf) == 0 {
-			return req, close, validate.ErrBodyRequired
-		}
-
-		d := jx.DecodeBytes(buf)
-
-		var request ListSubmissionsReq
-		if err := func() error {
-			if err := request.Decode(d); err != nil {
-				return err
-			}
-			if err := d.Skip(); err != io.EOF {
-				return errors.New("unexpected trailing data")
-			}
-			return nil
-		}(); err != nil {
-			err = &ogenerrors.DecodeBodyError{
-				ContentType: ct,
-				Body:        buf,
-				Err:         err,
-			}
-			return req, close, err
-		}
-		if err := func() error {
-			if err := request.Validate(); err != nil {
-				return err
-			}
-			return nil
-		}(); err != nil {
-			return req, close, errors.Wrap(err, "validate")
-		}
-		return &request, close, nil
-	default:
-		return req, close, validate.InvalidContentType(ct)
-	}
-}
-
 func (s *Server) decodeUpdateScriptRequest(r *http.Request) (
 	req *ScriptUpdate,
 	close func() error,
--- a/pkg/api/oas_request_encoders_gen.go
+++ b/pkg/api/oas_request_encoders_gen.go
@ -53,34 +53,6 @@ func encodeCreateSubmissionRequest(
 	return nil
 }

-func encodeListScriptPolicyRequest(
-	req *ListScriptPolicyReq,
-	r *http.Request,
-) error {
-	const contentType = "application/json"
-	e := new(jx.Encoder)
-	{
-		req.Encode(e)
-	}
-	encoded := e.Bytes()
-	ht.SetBody(r, bytes.NewReader(encoded), contentType)
-	return nil
-}
-
-func encodeListSubmissionsRequest(
-	req *ListSubmissionsReq,
-	r *http.Request,
-) error {
-	const contentType = "application/json"
-	e := new(jx.Encoder)
-	{
-		req.Encode(e)
-	}
-	encoded := e.Bytes()
-	ht.SetBody(r, bytes.NewReader(encoded), contentType)
-	return nil
-}
-
 func encodeUpdateScriptRequest(
 	req *ScriptUpdate,
 	r *http.Request,
--- a/pkg/api/oas_response_decoders_gen.go
+++ b/pkg/api/oas_response_decoders_gen.go
@ -1142,123 +1142,6 @@ func decodeGetSubmissionResponse(resp *http.Response) (res *Submission, _ error)
 	return res, errors.Wrap(defRes, "error")
 }

-func decodeListScriptPolicyResponse(resp *http.Response) (res []ScriptPolicy, _ error) {
-	switch resp.StatusCode {
-	case 200:
-		// Code 200.
-		ct, _, err := mime.ParseMediaType(resp.Header.Get("Content-Type"))
-		if err != nil {
-			return res, errors.Wrap(err, "parse media type")
-		}
-		switch {
-		case ct == "application/json":
-			buf, err := io.ReadAll(resp.Body)
-			if err != nil {
-				return res, err
-			}
-			d := jx.DecodeBytes(buf)
-
-			var response []ScriptPolicy
-			if err := func() error {
-				response = make([]ScriptPolicy, 0)
-				if err := d.Arr(func(d *jx.Decoder) error {
-					var elem ScriptPolicy
-					if err := elem.Decode(d); err != nil {
-						return err
-					}
-					response = append(response, elem)
-					return nil
-				}); err != nil {
-					return err
-				}
-				if err := d.Skip(); err != io.EOF {
-					return errors.New("unexpected trailing data")
-				}
-				return nil
-			}(); err != nil {
-				err = &ogenerrors.DecodeBodyError{
-					ContentType: ct,
-					Body:        buf,
-					Err:         err,
-				}
-				return res, err
-			}
-			// Validate response.
-			if err := func() error {
-				if response == nil {
-					return errors.New("nil is invalid value")
-				}
-				var failures []validate.FieldError
-				for i, elem := range response {
-					if err := func() error {
-						if err := elem.Validate(); err != nil {
-							return err
-						}
-						return nil
-					}(); err != nil {
-						failures = append(failures, validate.FieldError{
-							Name:  fmt.Sprintf("[%d]", i),
-							Error: err,
-						})
-					}
-				}
-				if len(failures) > 0 {
-					return &validate.Error{Fields: failures}
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "validate")
-			}
-			return response, nil
-		default:
-			return res, validate.InvalidContentType(ct)
-		}
-	}
-	// Convenient error response.
-	defRes, err := func() (res *ErrorStatusCode, err error) {
-		ct, _, err := mime.ParseMediaType(resp.Header.Get("Content-Type"))
-		if err != nil {
-			return res, errors.Wrap(err, "parse media type")
-		}
-		switch {
-		case ct == "application/json":
-			buf, err := io.ReadAll(resp.Body)
-			if err != nil {
-				return res, err
-			}
-			d := jx.DecodeBytes(buf)
-
-			var response Error
-			if err := func() error {
-				if err := response.Decode(d); err != nil {
-					return err
-				}
-				if err := d.Skip(); err != io.EOF {
-					return errors.New("unexpected trailing data")
-				}
-				return nil
-			}(); err != nil {
-				err = &ogenerrors.DecodeBodyError{
-					ContentType: ct,
-					Body:        buf,
-					Err:         err,
-				}
-				return res, err
-			}
-			return &ErrorStatusCode{
-				StatusCode: resp.StatusCode,
-				Response:   response,
-			}, nil
-		default:
-			return res, validate.InvalidContentType(ct)
-		}
-	}()
-	if err != nil {
-		return res, errors.Wrapf(err, "default (code %d)", resp.StatusCode)
-	}
-	return res, errors.Wrap(defRes, "error")
-}
-
 func decodeListSubmissionsResponse(resp *http.Response) (res []Submission, _ error) {
 	switch resp.StatusCode {
 	case 200:
--- a/pkg/api/oas_response_encoders_gen.go
+++ b/pkg/api/oas_response_encoders_gen.go
@ -181,24 +181,6 @@ func encodeGetSubmissionResponse(response *Submission, w http.ResponseWriter, sp
 	return nil
 }

-func encodeListScriptPolicyResponse(response []ScriptPolicy, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Content-Type", "application/json; charset=utf-8")
-	w.WriteHeader(200)
-	span.SetStatus(codes.Ok, http.StatusText(200))
-
-	e := new(jx.Encoder)
-	e.ArrStart()
-	for _, elem := range response {
-		elem.Encode(e)
-	}
-	e.ArrEnd()
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
 func encodeListSubmissionsResponse(response []Submission, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(200)
--- a/pkg/api/oas_router_gen.go
+++ b/pkg/api/oas_router_gen.go
@ -83,12 +83,10 @@ func (s *Server) ServeHTTP(w http.ResponseWriter, r *http.Request) {

 					if len(elem) == 0 {
 						switch r.Method {
-						case "GET":
-							s.handleListScriptPolicyRequest([0]string{}, elemIsEscaped, w, r)
 						case "POST":
 							s.handleCreateScriptPolicyRequest([0]string{}, elemIsEscaped, w, r)
 						default:
-							s.notAllowed(w, r, "GET,POST")
+							s.notAllowed(w, r, "POST")
 						}

 						return
@ -716,14 +714,6 @@ func (s *Server) FindPath(method string, u *url.URL) (r Route, _ bool) {

 					if len(elem) == 0 {
 						switch method {
-						case "GET":
-							r.name = ListScriptPolicyOperation
-							r.summary = "Get list of script policies"
-							r.operationID = "listScriptPolicy"
-							r.pathPattern = "/script-policy"
-							r.args = args
-							r.count = 0
-							return r, true
 						case "POST":
 							r.name = CreateScriptPolicyOperation
 							r.summary = "Create a new script policy"
--- a/pkg/api/oas_schemas_gen.go
+++ b/pkg/api/oas_schemas_gen.go
@ -122,56 +122,6 @@ func (s *ID) SetID(val int64) {
 	s.ID = val
 }

-type ListScriptPolicyReq struct {
-	Page   Pagination            `json:"Page"`
-	Filter OptScriptPolicyFilter `json:"Filter"`
-}
-
-// GetPage returns the value of Page.
-func (s *ListScriptPolicyReq) GetPage() Pagination {
-	return s.Page
-}
-
-// GetFilter returns the value of Filter.
-func (s *ListScriptPolicyReq) GetFilter() OptScriptPolicyFilter {
-	return s.Filter
-}
-
-// SetPage sets the value of Page.
-func (s *ListScriptPolicyReq) SetPage(val Pagination) {
-	s.Page = val
-}
-
-// SetFilter sets the value of Filter.
-func (s *ListScriptPolicyReq) SetFilter(val OptScriptPolicyFilter) {
-	s.Filter = val
-}
-
-type ListSubmissionsReq struct {
-	Page   Pagination          `json:"Page"`
-	Filter OptSubmissionFilter `json:"Filter"`
-}
-
-// GetPage returns the value of Page.
-func (s *ListSubmissionsReq) GetPage() Pagination {
-	return s.Page
-}
-
-// GetFilter returns the value of Filter.
-func (s *ListSubmissionsReq) GetFilter() OptSubmissionFilter {
-	return s.Filter
-}
-
-// SetPage sets the value of Page.
-func (s *ListSubmissionsReq) SetPage(val Pagination) {
-	s.Page = val
-}
-
-// SetFilter sets the value of Filter.
-func (s *ListSubmissionsReq) SetFilter(val OptSubmissionFilter) {
-	s.Filter = val
-}
-
 // NewOptInt32 returns new OptInt32 with value set to v.
 func NewOptInt32(v int32) OptInt32 {
 	return OptInt32{
@ -264,52 +214,6 @@ func (o OptInt64) Or(d int64) int64 {
 	return d
 }

-// NewOptScriptPolicyFilter returns new OptScriptPolicyFilter with value set to v.
-func NewOptScriptPolicyFilter(v ScriptPolicyFilter) OptScriptPolicyFilter {
-	return OptScriptPolicyFilter{
-		Value: v,
-		Set:   true,
-	}
-}
-
-// OptScriptPolicyFilter is optional ScriptPolicyFilter.
-type OptScriptPolicyFilter struct {
-	Value ScriptPolicyFilter
-	Set   bool
-}
-
-// IsSet returns true if OptScriptPolicyFilter was set.
-func (o OptScriptPolicyFilter) IsSet() bool { return o.Set }
-
-// Reset unsets value.
-func (o *OptScriptPolicyFilter) Reset() {
-	var v ScriptPolicyFilter
-	o.Value = v
-	o.Set = false
-}
-
-// SetTo sets value to v.
-func (o *OptScriptPolicyFilter) SetTo(v ScriptPolicyFilter) {
-	o.Set = true
-	o.Value = v
-}
-
-// Get returns value and boolean that denotes whether value was set.
-func (o OptScriptPolicyFilter) Get() (v ScriptPolicyFilter, ok bool) {
-	if !o.Set {
-		return v, false
-	}
-	return o.Value, true
-}
-
-// Or returns value if set, or given parameter if does not.
-func (o OptScriptPolicyFilter) Or(d ScriptPolicyFilter) ScriptPolicyFilter {
-	if v, ok := o.Get(); ok {
-		return v
-	}
-	return d
-}
-
 // NewOptString returns new OptString with value set to v.
 func NewOptString(v string) OptString {
 	return OptString{
@ -587,54 +491,6 @@ func (s *ScriptPolicyCreate) SetPolicy(val int32) {
 	s.Policy = val
 }

-// Ref: #/components/schemas/ScriptPolicyFilter
-type ScriptPolicyFilter struct {
-	ID             OptInt64  `json:"ID"`
-	FromScriptHash OptString `json:"FromScriptHash"`
-	ToScriptID     OptInt64  `json:"ToScriptID"`
-	Policy         OptInt32  `json:"Policy"`
-}
-
-// GetID returns the value of ID.
-func (s *ScriptPolicyFilter) GetID() OptInt64 {
-	return s.ID
-}
-
-// GetFromScriptHash returns the value of FromScriptHash.
-func (s *ScriptPolicyFilter) GetFromScriptHash() OptString {
-	return s.FromScriptHash
-}
-
-// GetToScriptID returns the value of ToScriptID.
-func (s *ScriptPolicyFilter) GetToScriptID() OptInt64 {
-	return s.ToScriptID
-}
-
-// GetPolicy returns the value of Policy.
-func (s *ScriptPolicyFilter) GetPolicy() OptInt32 {
-	return s.Policy
-}
-
-// SetID sets the value of ID.
-func (s *ScriptPolicyFilter) SetID(val OptInt64) {
-	s.ID = val
-}
-
-// SetFromScriptHash sets the value of FromScriptHash.
-func (s *ScriptPolicyFilter) SetFromScriptHash(val OptString) {
-	s.FromScriptHash = val
-}
-
-// SetToScriptID sets the value of ToScriptID.
-func (s *ScriptPolicyFilter) SetToScriptID(val OptInt64) {
-	s.ToScriptID = val
-}
-
-// SetPolicy sets the value of Policy.
-func (s *ScriptPolicyFilter) SetPolicy(val OptInt32) {
-	s.Policy = val
-}
-
 // Ref: #/components/schemas/ScriptPolicyUpdate
 type ScriptPolicyUpdate struct {
 	ID           int64    `json:"ID"`
--- a/pkg/api/oas_server_gen.go
+++ b/pkg/api/oas_server_gen.go
@ -110,18 +110,12 @@ type Handler interface {
 	//
 	// GET /submissions/{SubmissionID}
 	GetSubmission(ctx context.Context, params GetSubmissionParams) (*Submission, error)
-	// ListScriptPolicy implements listScriptPolicy operation.
-	//
-	// Get list of script policies.
-	//
-	// GET /script-policy
-	ListScriptPolicy(ctx context.Context, req *ListScriptPolicyReq) ([]ScriptPolicy, error)
 	// ListSubmissions implements listSubmissions operation.
 	//
 	// Get list of submissions.
 	//
 	// GET /submissions
-	ListSubmissions(ctx context.Context, req *ListSubmissionsReq) ([]Submission, error)
+	ListSubmissions(ctx context.Context, params ListSubmissionsParams) ([]Submission, error)
 	// SetSubmissionCompleted implements setSubmissionCompleted operation.
 	//
 	// Retrieve map with ID.
--- a/pkg/api/oas_unimplemented_gen.go
+++ b/pkg/api/oas_unimplemented_gen.go
@ -166,21 +166,12 @@ func (UnimplementedHandler) GetSubmission(ctx context.Context, params GetSubmiss
 	return r, ht.ErrNotImplemented
 }

-// ListScriptPolicy implements listScriptPolicy operation.
-//
-// Get list of script policies.
-//
-// GET /script-policy
-func (UnimplementedHandler) ListScriptPolicy(ctx context.Context, req *ListScriptPolicyReq) (r []ScriptPolicy, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
 // ListSubmissions implements listSubmissions operation.
 //
 // Get list of submissions.
 //
 // GET /submissions
-func (UnimplementedHandler) ListSubmissions(ctx context.Context, req *ListSubmissionsReq) (r []Submission, _ error) {
+func (UnimplementedHandler) ListSubmissions(ctx context.Context, params ListSubmissionsParams) (r []Submission, _ error) {
 	return r, ht.ErrNotImplemented
 }

--- a/pkg/api/oas_uri_gen.go
+++ b/pkg/api/oas_uri_gen.go
@ -0,0 +1,305 @@
+// Code generated by ogen, DO NOT EDIT.
+
+package api
+
+import (
+	"math/bits"
+	"strconv"
+
+	"github.com/go-faster/errors"
+
+	"github.com/ogen-go/ogen/conv"
+	"github.com/ogen-go/ogen/uri"
+	"github.com/ogen-go/ogen/validate"
+)
+
+// EncodeURI encodes Pagination as URI form.
+func (s *Pagination) EncodeURI(e uri.Encoder) error {
+	if err := e.EncodeField("Page", func(e uri.Encoder) error {
+		return e.EncodeValue(conv.Int32ToString(s.Page))
+	}); err != nil {
+		return errors.Wrap(err, "encode field \"Page\"")
+	}
+	if err := e.EncodeField("Limit", func(e uri.Encoder) error {
+		return e.EncodeValue(conv.Int32ToString(s.Limit))
+	}); err != nil {
+		return errors.Wrap(err, "encode field \"Limit\"")
+	}
+	return nil
+}
+
+var uriFieldsNameOfPagination = [2]string{
+	0: "Page",
+	1: "Limit",
+}
+
+// DecodeURI decodes Pagination from URI form.
+func (s *Pagination) DecodeURI(d uri.Decoder) error {
+	if s == nil {
+		return errors.New("invalid: unable to decode Pagination to nil")
+	}
+	var requiredBitSet [1]uint8
+
+	if err := d.DecodeFields(func(k string, d uri.Decoder) error {
+		switch k {
+		case "Page":
+			requiredBitSet[0] |= 1 << 0
+			if err := func() error {
+				val, err := d.DecodeValue()
+				if err != nil {
+					return err
+				}
+
+				c, err := conv.ToInt32(val)
+				if err != nil {
+					return err
+				}
+
+				s.Page = c
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"Page\"")
+			}
+		case "Limit":
+			requiredBitSet[0] |= 1 << 1
+			if err := func() error {
+				val, err := d.DecodeValue()
+				if err != nil {
+					return err
+				}
+
+				c, err := conv.ToInt32(val)
+				if err != nil {
+					return err
+				}
+
+				s.Limit = c
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"Limit\"")
+			}
+		default:
+			return nil
+		}
+		return nil
+	}); err != nil {
+		return errors.Wrap(err, "decode Pagination")
+	}
+	// Validate required fields.
+	var failures []validate.FieldError
+	for i, mask := range [1]uint8{
+		0b00000011,
+	} {
+		if result := (requiredBitSet[i] & mask) ^ mask; result != 0 {
+			// Mask only required fields and check equality to mask using XOR.
+			//
+			// If XOR result is not zero, result is not equal to expected, so some fields are missed.
+			// Bits of fields which would be set are actually bits of missed fields.
+			missed := bits.OnesCount8(result)
+			for bitN := 0; bitN < missed; bitN++ {
+				bitIdx := bits.TrailingZeros8(result)
+				fieldIdx := i*8 + bitIdx
+				var name string
+				if fieldIdx < len(uriFieldsNameOfPagination) {
+					name = uriFieldsNameOfPagination[fieldIdx]
+				} else {
+					name = strconv.Itoa(fieldIdx)
+				}
+				failures = append(failures, validate.FieldError{
+					Name:  name,
+					Error: validate.ErrFieldRequired,
+				})
+				// Reset bit.
+				result &^= 1 << bitIdx
+			}
+		}
+	}
+	if len(failures) > 0 {
+		return &validate.Error{Fields: failures}
+	}
+
+	return nil
+}
+
+// EncodeURI encodes SubmissionFilter as URI form.
+func (s *SubmissionFilter) EncodeURI(e uri.Encoder) error {
+	if err := e.EncodeField("ID", func(e uri.Encoder) error {
+		return e.EncodeValue(conv.Int64ToString(s.ID))
+	}); err != nil {
+		return errors.Wrap(err, "encode field \"ID\"")
+	}
+	if err := e.EncodeField("DisplayName", func(e uri.Encoder) error {
+		if val, ok := s.DisplayName.Get(); ok {
+			return e.EncodeValue(conv.StringToString(val))
+		}
+		return nil
+	}); err != nil {
+		return errors.Wrap(err, "encode field \"DisplayName\"")
+	}
+	if err := e.EncodeField("Creator", func(e uri.Encoder) error {
+		if val, ok := s.Creator.Get(); ok {
+			return e.EncodeValue(conv.StringToString(val))
+		}
+		return nil
+	}); err != nil {
+		return errors.Wrap(err, "encode field \"Creator\"")
+	}
+	if err := e.EncodeField("GameID", func(e uri.Encoder) error {
+		if val, ok := s.GameID.Get(); ok {
+			return e.EncodeValue(conv.Int32ToString(val))
+		}
+		return nil
+	}); err != nil {
+		return errors.Wrap(err, "encode field \"GameID\"")
+	}
+	return nil
+}
+
+var uriFieldsNameOfSubmissionFilter = [4]string{
+	0: "ID",
+	1: "DisplayName",
+	2: "Creator",
+	3: "GameID",
+}
+
+// DecodeURI decodes SubmissionFilter from URI form.
+func (s *SubmissionFilter) DecodeURI(d uri.Decoder) error {
+	if s == nil {
+		return errors.New("invalid: unable to decode SubmissionFilter to nil")
+	}
+	var requiredBitSet [1]uint8
+
+	if err := d.DecodeFields(func(k string, d uri.Decoder) error {
+		switch k {
+		case "ID":
+			requiredBitSet[0] |= 1 << 0
+			if err := func() error {
+				val, err := d.DecodeValue()
+				if err != nil {
+					return err
+				}
+
+				c, err := conv.ToInt64(val)
+				if err != nil {
+					return err
+				}
+
+				s.ID = c
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"ID\"")
+			}
+		case "DisplayName":
+			if err := func() error {
+				var sDotDisplayNameVal string
+				if err := func() error {
+					val, err := d.DecodeValue()
+					if err != nil {
+						return err
+					}
+
+					c, err := conv.ToString(val)
+					if err != nil {
+						return err
+					}
+
+					sDotDisplayNameVal = c
+					return nil
+				}(); err != nil {
+					return err
+				}
+				s.DisplayName.SetTo(sDotDisplayNameVal)
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"DisplayName\"")
+			}
+		case "Creator":
+			if err := func() error {
+				var sDotCreatorVal string
+				if err := func() error {
+					val, err := d.DecodeValue()
+					if err != nil {
+						return err
+					}
+
+					c, err := conv.ToString(val)
+					if err != nil {
+						return err
+					}
+
+					sDotCreatorVal = c
+					return nil
+				}(); err != nil {
+					return err
+				}
+				s.Creator.SetTo(sDotCreatorVal)
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"Creator\"")
+			}
+		case "GameID":
+			if err := func() error {
+				var sDotGameIDVal int32
+				if err := func() error {
+					val, err := d.DecodeValue()
+					if err != nil {
+						return err
+					}
+
+					c, err := conv.ToInt32(val)
+					if err != nil {
+						return err
+					}
+
+					sDotGameIDVal = c
+					return nil
+				}(); err != nil {
+					return err
+				}
+				s.GameID.SetTo(sDotGameIDVal)
+				return nil
+			}(); err != nil {
+				return errors.Wrap(err, "decode field \"GameID\"")
+			}
+		default:
+			return nil
+		}
+		return nil
+	}); err != nil {
+		return errors.Wrap(err, "decode SubmissionFilter")
+	}
+	// Validate required fields.
+	var failures []validate.FieldError
+	for i, mask := range [1]uint8{
+		0b00000001,
+	} {
+		if result := (requiredBitSet[i] & mask) ^ mask; result != 0 {
+			// Mask only required fields and check equality to mask using XOR.
+			//
+			// If XOR result is not zero, result is not equal to expected, so some fields are missed.
+			// Bits of fields which would be set are actually bits of missed fields.
+			missed := bits.OnesCount8(result)
+			for bitN := 0; bitN < missed; bitN++ {
+				bitIdx := bits.TrailingZeros8(result)
+				fieldIdx := i*8 + bitIdx
+				var name string
+				if fieldIdx < len(uriFieldsNameOfSubmissionFilter) {
+					name = uriFieldsNameOfSubmissionFilter[fieldIdx]
+				} else {
+					name = strconv.Itoa(fieldIdx)
+				}
+				failures = append(failures, validate.FieldError{
+					Name:  name,
+					Error: validate.ErrFieldRequired,
+				})
+				// Reset bit.
+				result &^= 1 << bitIdx
+			}
+		}
+	}
+	if len(failures) > 0 {
+		return &validate.Error{Fields: failures}
+	}
+
+	return nil
+}
--- a/pkg/api/oas_validators_gen.go
+++ b/pkg/api/oas_validators_gen.go
@ -8,88 +8,6 @@ import (
 	"github.com/ogen-go/ogen/validate"
 )

-func (s *ListScriptPolicyReq) Validate() error {
-	if s == nil {
-		return validate.ErrNilPointer
-	}
-
-	var failures []validate.FieldError
-	if err := func() error {
-		if err := s.Page.Validate(); err != nil {
-			return err
-		}
-		return nil
-	}(); err != nil {
-		failures = append(failures, validate.FieldError{
-			Name:  "Page",
-			Error: err,
-		})
-	}
-	if err := func() error {
-		if value, ok := s.Filter.Get(); ok {
-			if err := func() error {
-				if err := value.Validate(); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return err
-			}
-		}
-		return nil
-	}(); err != nil {
-		failures = append(failures, validate.FieldError{
-			Name:  "Filter",
-			Error: err,
-		})
-	}
-	if len(failures) > 0 {
-		return &validate.Error{Fields: failures}
-	}
-	return nil
-}
-
-func (s *ListSubmissionsReq) Validate() error {
-	if s == nil {
-		return validate.ErrNilPointer
-	}
-
-	var failures []validate.FieldError
-	if err := func() error {
-		if err := s.Page.Validate(); err != nil {
-			return err
-		}
-		return nil
-	}(); err != nil {
-		failures = append(failures, validate.FieldError{
-			Name:  "Page",
-			Error: err,
-		})
-	}
-	if err := func() error {
-		if value, ok := s.Filter.Get(); ok {
-			if err := func() error {
-				if err := value.Validate(); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return err
-			}
-		}
-		return nil
-	}(); err != nil {
-		failures = append(failures, validate.FieldError{
-			Name:  "Filter",
-			Error: err,
-		})
-	}
-	if len(failures) > 0 {
-		return &validate.Error{Fields: failures}
-	}
-	return nil
-}
-
 func (s *Pagination) Validate() error {
 	if s == nil {
 		return validate.ErrNilPointer
@ -254,44 +172,6 @@ func (s *ScriptPolicy) Validate() error {
 	return nil
 }

-func (s *ScriptPolicyFilter) Validate() error {
-	if s == nil {
-		return validate.ErrNilPointer
-	}
-
-	var failures []validate.FieldError
-	if err := func() error {
-		if value, ok := s.FromScriptHash.Get(); ok {
-			if err := func() error {
-				if err := (validate.String{
-					MinLength:    16,
-					MinLengthSet: true,
-					MaxLength:    16,
-					MaxLengthSet: true,
-					Email:        false,
-					Hostname:     false,
-					Regex:        nil,
-				}).Validate(string(value)); err != nil {
-					return errors.Wrap(err, "string")
-				}
-				return nil
-			}(); err != nil {
-				return err
-			}
-		}
-		return nil
-	}(); err != nil {
-		failures = append(failures, validate.FieldError{
-			Name:  "FromScriptHash",
-			Error: err,
-		})
-	}
-	if len(failures) > 0 {
-		return &validate.Error{Fields: failures}
-	}
-	return nil
-}
-
 func (s *ScriptUpdate) Validate() error {
 	if s == nil {
 		return validate.ErrNilPointer
--- a/pkg/datastore/datastore.go
+++ b/pkg/datastore/datastore.go
@ -41,5 +41,4 @@ type ScriptPolicy interface {
 	Create(ctx context.Context, smap model.ScriptPolicy) (model.ScriptPolicy, error)
 	Update(ctx context.Context, id int64, values OptionalMap) error
 	Delete(ctx context.Context, id int64) error
-	List(ctx context.Context, filters OptionalMap, page model.Page) ([]model.ScriptPolicy, error)
 }
--- a/pkg/datastore/gormstore/script_policy.go
+++ b/pkg/datastore/gormstore/script_policy.go
@ -62,12 +62,3 @@ func (env *ScriptPolicy) Delete(ctx context.Context, id int64) error {

 	return nil
 }
-
-func (env *ScriptPolicy) List(ctx context.Context, filters datastore.OptionalMap, page model.Page) ([]model.ScriptPolicy, error) {
-	var maps []model.ScriptPolicy
-	if err := env.db.Where(filters.Map()).Offset(int((page.Number - 1) * page.Size)).Limit(int(page.Size)).Find(&maps).Error; err != nil {
-		return nil, err
-	}
-
-	return maps, nil
-}
--- a/pkg/model/policy.go
+++ b/pkg/model/policy.go
@ -5,11 +5,10 @@ import "time"
 type Policy int32

 const (
-	ScriptPolicyNone    Policy = 0 // not yet reviewed
-	ScriptPolicyAllowed Policy = 1
-	ScriptPolicyBlocked Policy = 2
-	ScriptPolicyDelete  Policy = 3
-	ScriptPolicyReplace Policy = 4
+	ScriptPolicyAllowed Policy = 0
+	ScriptPolicyBlocked Policy = 1
+	ScriptPolicyDelete  Policy = 2
+	ScriptPolicyReplace Policy = 3
 )

 type ScriptPolicy struct {
--- a/pkg/service/script_policy.go
+++ b/pkg/service/script_policy.go
@ -47,42 +47,6 @@ func (svc *Service) CreateScriptPolicy(ctx context.Context, req *api.ScriptPolic
 	}, nil
 }

-
-// ListScriptPolicy implements listScriptPolicy operation.
-//
-// Get list of script policies.
-//
-// GET /script-policy
-func (svc *Service) ListScriptPolicy(ctx context.Context, request *api.ListScriptPolicyReq) ([]api.ScriptPolicy, error) {
-	filter := datastore.Optional()
-	//fmt.Println(request)
-	if request.Filter.IsSet() {
-		filter.AddNotNil("from_script_hash", request.Filter.Value.FromScriptHash)
-		filter.AddNotNil("to_script_id", request.Filter.Value.ToScriptID)
-		filter.AddNotNil("policy", request.Filter.Value.Policy)
-	}
-
-	items, err := svc.DB.ScriptPolicy().List(ctx, filter, model.Page{
-		Number: request.Page.GetPage(),
-		Size:   request.Page.GetLimit(),
-	})
-	if err != nil {
-		return nil, err
-	}
-
-	var resp []api.ScriptPolicy
-	for i := 0; i < len(items); i++ {
-		resp = append(resp, api.ScriptPolicy{
-			ID:             items[i].ID,
-			FromScriptHash: fmt.Sprintf("%x", items[i].FromScriptHash),
-			ToScriptID:     items[i].ToScriptID,
-			Policy:         int32(items[i].Policy),
-		})
-	}
-
-	return resp, nil
-}
-
 // DeleteScriptPolicy implements deleteScriptPolicy operation.
 //
 // Delete the specified script policy by ID.
--- a/pkg/service/submissions.go
+++ b/pkg/service/submissions.go
@ -67,7 +67,7 @@ func (svc *Service) GetSubmission(ctx context.Context, params api.GetSubmissionP
 // Get list of submissions.
 //
 // GET /submissions
-func (svc *Service) ListSubmissions(ctx context.Context, request *api.ListSubmissionsReq) ([]api.Submission, error) {
+func (svc *Service) ListSubmissions(ctx context.Context, request api.ListSubmissionsParams) ([]api.Submission, error) {
 	filter := datastore.Optional()
 	//fmt.Println(request)
 	if request.Filter.IsSet() {
@ -313,7 +313,7 @@ func (svc *Service) ActionSubmissionTriggerPublish(ctx context.Context, params a
 			return err
 		}

-		svc.Nats.Publish("maptest.submissions.publishnew", []byte(j))
+		svc.Nats.Publish("maptest.submissions.publish.new", []byte(j))
 	} else {
 		// this is a map fix
 		publish_fix_request := model.PublishFixRequest{
@ -328,7 +328,7 @@ func (svc *Service) ActionSubmissionTriggerPublish(ctx context.Context, params a
 			return err
 		}

-		svc.Nats.Publish("maptest.submissions.publishfix", []byte(j))
+		svc.Nats.Publish("maptest.submissions.publish.fix", []byte(j))
 	}

 	return nil
--- a/releaser/.cargo/config.toml
+++ b/releaser/.cargo/config.toml
@ -1,2 +0,0 @@
-[registries.strafesnet]
-index = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
--- a/releaser/.gitignore
+++ b/releaser/.gitignore
@ -1 +0,0 @@
-/target
--- a/releaser/Cargo.lock
+++ b/releaser/Cargo.lock
--- a/releaser/Cargo.toml
+++ b/releaser/Cargo.toml
@ -1,11 +0,0 @@
-[package]
-name = "releaser"
-version = "0.1.0"
-edition = "2021"
-
-[dependencies]
-submissions-api = { version = "0.1.0", registry = "strafesnet" }
-rbx_asset = { version = "0.2.5", registry = "strafesnet" }
-rust-grpc = { version = "1.0.3", registry = "strafesnet" }
-tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "signal"] }
-tonic = "0.12.3"
--- a/releaser/Containerfile
+++ b/releaser/Containerfile
@ -1,24 +0,0 @@
-# Using the `rust-musl-builder` as base image, instead of
-# the official Rust toolchain
-FROM docker.io/clux/muslrust:stable AS chef
-USER root
-RUN cargo install cargo-chef
-WORKDIR /app
-
-FROM chef AS planner
-COPY . .
-RUN cargo chef prepare --recipe-path recipe.json
-
-FROM chef AS builder
-COPY --from=planner /app/recipe.json recipe.json
-
-# Notice that we are specifying the --target flag!
-RUN cargo chef cook --release --target x86_64-unknown-linux-musl --recipe-path recipe.json
-COPY . .
-RUN cargo build --release --target x86_64-unknown-linux-musl --bin releaser
-
-FROM docker.io/alpine:latest AS runtime
-RUN addgroup -S myuser && adduser -S myuser -G myuser
-COPY --from=builder /app/target/x86_64-unknown-linux-musl/release/releaser /usr/local/bin/
-USER myuser
-ENTRYPOINT ["/usr/local/bin/releaser"]
--- a/releaser/src/main.rs
+++ b/releaser/src/main.rs
@ -1,32 +0,0 @@
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum StartupError{
-	API(submissions_api::ReqwestError),
-	GRPCConnect(tonic::transport::Error),
-}
-impl std::fmt::Display for StartupError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for StartupError{}
-
-// annoying mile-long type
-pub type MapsServiceClient=rust_grpc::maps::maps_service_client::MapsServiceClient<tonic::transport::channel::Channel>;
-
-#[tokio::main]
-async fn main()->Result<(),StartupError>{
-	// maps-service api
-	let api_host=std::env::var("API_HOST").expect("API_HOST env required");
-	let api=submissions_api::Context::new(api_host).map_err(StartupError::API)?;
-
-	// data-service grpc for creating map entries
-	let data_host=std::env::var("DATA_HOST").expect("DATA_HOST env required");
-	let maps_grpc=crate::MapsServiceClient::connect(data_host).await.map_err(StartupError::GRPCConnect)?;
-
-	// request maps pending release
-	// randomize list
-	// release maps
-
-	Ok(())
-}
--- a/submissions-api-rs/.gitignore
+++ b/submissions-api-rs/.gitignore
@ -1 +0,0 @@
-/target
--- a/submissions-api-rs/Cargo.lock
+++ b/submissions-api-rs/Cargo.lock
--- a/validation/Cargo.lock
+++ b/validation/Cargo.lock
@ -41,6 +41,22 @@ dependencies = [
 "libc",
 ]

+[[package]]
+name = "anyhow"
+version = "1.0.94"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c1fd03a028ef38ba2276dce7e33fcd6369c158a1bca17946c4b1b701891c1ff7"
+
+[[package]]
+name = "api"
+version = "0.1.0"
+dependencies = [
+ "reqwest",
+ "serde",
+ "serde_json",
+ "url",
+]
+
 [[package]]
 name = "arrayref"
 version = "0.3.9"
@ -89,6 +105,39 @@ dependencies = [
 "url",
 ]

+[[package]]
+name = "async-stream"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b5a71a6f37880a80d1d7f19efd781e4b5de42c88f0722cc13bcb6cc2cfe8476"
+dependencies = [
+ "async-stream-impl",
+ "futures-core",
+ "pin-project-lite",
+]
+
+[[package]]
+name = "async-stream-impl"
+version = "0.3.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c7c24de15d275a1ecfd47a380fb4d5ec9bfe0933f309ed5e705b775596a3574d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "async-trait"
+version = "0.1.83"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
 [[package]]
 name = "atomic-waker"
 version = "1.1.2"
@ -101,6 +150,53 @@ version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"

+[[package]]
+name = "axum"
+version = "0.7.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "edca88bc138befd0323b20752846e6587272d3b03b0343c8ea28a6f819e6e71f"
+dependencies = [
+ "async-trait",
+ "axum-core",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "itoa",
+ "matchit",
+ "memchr",
+ "mime",
+ "percent-encoding",
+ "pin-project-lite",
+ "rustversion",
+ "serde",
+ "sync_wrapper 1.0.2",
+ "tower 0.5.1",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "axum-core"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09f2bd6146b97ae3359fa0cc6d6b376d9539582c7b4220f041a33ec24c226199"
+dependencies = [
+ "async-trait",
+ "bytes",
+ "futures-util",
+ "http",
+ "http-body",
+ "http-body-util",
+ "mime",
+ "pin-project-lite",
+ "rustversion",
+ "sync_wrapper 1.0.2",
+ "tower-layer",
+ "tower-service",
+]
+
 [[package]]
 name = "backtrace"
 version = "0.3.74"
@ -191,9 +287,9 @@ dependencies = [

 [[package]]
 name = "cc"
-version = "1.2.4"
+version = "1.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9157bbaa6b165880c27a4293a474c91cdcf265cc68cc829bf10be0964a391caf"
+checksum = "f34d93e62b03caf570cccc334cbc6c2fceca82f39211051345108adcba3eebdc"
 dependencies = [
 "shlex",
 ]
@ -206,9 +302,9 @@ checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"

 [[package]]
 name = "chrono"
-version = "0.4.39"
+version = "0.4.38"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e36cc9d416881d2e24f9a963be5fb1cd90966419ac844274161d10488b3e825"
+checksum = "a21f936df1771bf62b77f047b726c4625ff2e8aa607c01ec06e5a05bd8463401"
 dependencies = [
 "android-tzdata",
 "iana-time-zone",
@ -381,6 +477,12 @@ dependencies = [
 "subtle",
 ]

+[[package]]
+name = "either"
+version = "1.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
+
 [[package]]
 name = "encoding_rs"
 version = "0.8.35"
@ -408,9 +510,9 @@ dependencies = [

 [[package]]
 name = "fastrand"
-version = "2.3.0"
+version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
+checksum = "486f806e73c5707928240ddc295403b1b93c96a02038563881c4a2fd84b81ac4"

 [[package]]
 name = "fiat-crypto"
@ -586,13 +688,19 @@ dependencies = [
 "futures-core",
 "futures-sink",
 "http",
- "indexmap",
+ "indexmap 2.7.0",
 "slab",
 "tokio",
 "tokio-util",
 "tracing",
 ]

+[[package]]
+name = "hashbrown"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888"
+
 [[package]]
 name = "hashbrown"
 version = "0.15.2"
@ -601,9 +709,9 @@ checksum = "bf151400ff0baff5465007dd2f3e717f3fe502074ca563069ce3a6629d07b289"

 [[package]]
 name = "http"
-version = "1.2.0"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f16ca2af56261c99fba8bac40a10251ce8188205a4c448fbb745a2e4daa76fea"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
 "bytes",
 "fnv",
@ -639,6 +747,12 @@ version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"

+[[package]]
+name = "httpdate"
+version = "1.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "df3b46402a9d5adb4c86a0cf463f42e19994e3ee891101b1841f30a545cb49a9"
+
 [[package]]
 name = "hyper"
 version = "1.5.1"
@ -652,6 +766,7 @@ dependencies = [
 "http",
 "http-body",
 "httparse",
+ "httpdate",
 "itoa",
 "pin-project-lite",
 "smallvec",
@ -676,6 +791,19 @@ dependencies = [
 "tower-service",
 ]

+[[package]]
+name = "hyper-timeout"
+version = "0.5.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b90d566bffbce6a75bd8b09a05aa8c2cb1fabb6cb348f8840c9e4c90a0d83b0"
+dependencies = [
+ "hyper",
+ "hyper-util",
+ "pin-project-lite",
+ "tokio",
+ "tower-service",
+]
+
 [[package]]
 name = "hyper-tls"
 version = "0.6.0"
@ -873,6 +1001,16 @@ dependencies = [
 "icu_properties",
 ]

+[[package]]
+name = "indexmap"
+version = "1.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bd070e393353796e801d209ad339e89596eb4c8d430d18ede6a1cced8fafbd99"
+dependencies = [
+ "autocfg",
+ "hashbrown 0.12.3",
+]
+
 [[package]]
 name = "indexmap"
 version = "2.7.0"
@ -880,7 +1018,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "62f822373a4fe84d4bb149bf54e584a7f4abec90e072ed49cda0edea5b95471f"
 dependencies = [
 "equivalent",
- "hashbrown",
+ "hashbrown 0.15.2",
 ]

 [[package]]
@ -889,6 +1027,15 @@ version = "2.10.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ddc24109865250148c2e0f3d25d4f0f479571723792d3802153c60922a4fb708"

+[[package]]
+name = "itertools"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "413ee7dfc52ee1a4949ceeb7dbc8a33f2d6c088194d9f922fb8318faf1f01186"
+dependencies = [
+ "either",
+]
+
 [[package]]
 name = "itoa"
 version = "1.0.14"
@ -897,9 +1044,9 @@ checksum = "d75a2a4b1b190afb6f5425f10f6a8f959d2ea0b9c2b1d79553551850539e4674"

 [[package]]
 name = "js-sys"
-version = "0.3.76"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6717b6b5b077764fb5966237269cb3c64edddde4b14ce42647430a78ced9e7b7"
+checksum = "a865e038f7f6ed956f788f0d7d60c541fff74c7bd74272c5d4cf15c63743e705"
 dependencies = [
 "once_cell",
 "wasm-bindgen",
@ -913,9 +1060,9 @@ checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"

 [[package]]
 name = "libc"
-version = "0.2.168"
+version = "0.2.167"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5aaeb2981e0606ca11d79718f8bb01164f1d6ed75080182d3abf017e6d244b6d"
+checksum = "09d6582e104315a817dff97f75133544b2e094ee22447d2acf4a74e189ba06fc"

 [[package]]
 name = "linux-raw-sys"
@ -958,6 +1105,7 @@ dependencies = [
 name = "maps-validation"
 version = "0.1.0"
 dependencies = [
+ "api",
 "async-nats",
 "futures",
 "rbx_asset",
@ -965,13 +1113,20 @@ dependencies = [
 "rbx_dom_weak",
 "rbx_reflection_database",
 "rbx_xml",
+ "rust-grpc",
 "serde",
 "serde_json",
 "siphasher",
- "submissions-api",
 "tokio",
+ "tonic",
 ]

+[[package]]
+name = "matchit"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+
 [[package]]
 name = "memchr"
 version = "2.7.4"
@ -1247,6 +1402,40 @@ dependencies = [
 "syn",
 ]

+[[package]]
+name = "prost"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2c0fef6c4230e4ccf618a35c59d7ede15dea37de8427500f50aff708806e42ec"
+dependencies = [
+ "bytes",
+ "prost-derive",
+]
+
+[[package]]
+name = "prost-derive"
+version = "0.13.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "157c5a9d7ea5c2ed2d9fb8f495b64759f7816c7eaea54ba3978f0d63000162e3"
+dependencies = [
+ "anyhow",
+ "itertools",
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "prost-types"
+version = "0.13.3-serde1"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "8819b8aaed4d56560ff473ee45247539098b6fba5c8748a429903c499d5bc4a9"
+dependencies = [
+ "prost",
+ "serde",
+ "serde_json",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.37"
@ -1288,9 +1477,9 @@ dependencies = [

 [[package]]
 name = "rbx_asset"
-version = "0.2.5"
+version = "0.2.3"
 source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "dcf243f46bd41b3880a27278177a3f9996f95ab231d9a04345ad9dd381c3a54a"
+checksum = "15542e7184e4b18e578308308cee72abcb2bfcb1d6c162f1eea50ec6cff7e3ac"
 dependencies = [
 "chrono",
 "flate2",
@ -1438,7 +1627,7 @@ dependencies = [
 "serde",
 "serde_json",
 "serde_urlencoded",
- "sync_wrapper",
+ "sync_wrapper 1.0.2",
 "system-configuration",
 "tokio",
 "tokio-native-tls",
@ -1487,6 +1676,18 @@ dependencies = [
 "serde",
 ]

+[[package]]
+name = "rust-grpc"
+version = "1.0.3"
+source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
+checksum = "9d241d8d3ce1f24ce54ead69478676d138526bc0d44bb51bea2d87e5d8e3af22"
+dependencies = [
+ "prost",
+ "prost-types",
+ "serde",
+ "tonic",
+]
+
 [[package]]
 name = "rustc-demangle"
 version = "0.1.24"
@ -1504,22 +1705,22 @@ dependencies = [

 [[package]]
 name = "rustix"
-version = "0.38.42"
+version = "0.38.41"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f93dc38ecbab2eb790ff964bb77fa94faf256fd3e73285fd7ba0903b76bedb85"
+checksum = "d7f649912bc1495e167a6edee79151c84b1bad49748cb4f1f1167f459f6224f6"
 dependencies = [
 "bitflags 2.6.0",
 "errno",
 "libc",
 "linux-raw-sys",
- "windows-sys 0.59.0",
+ "windows-sys 0.52.0",
 ]

 [[package]]
 name = "rustls"
-version = "0.23.20"
+version = "0.23.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5065c3f250cbd332cd894be57c40fa52387247659b14a2d6041d121547903b1b"
+checksum = "934b404430bb06b3fae2cba809eb45a1ab1aecd64491213d7c3301b88393f8d1"
 dependencies = [
 "once_cell",
 "ring",
@ -1565,9 +1766,9 @@ dependencies = [

 [[package]]
 name = "rustls-pki-types"
-version = "1.10.1"
+version = "1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2bf47e6ff922db3825eb750c4e2ff784c6ff8fb9e13046ef6a1d1c5401b0b37"
+checksum = "16f1201b3c9a7ee8039bcadc17b7e605e2945b27eee7631788c1bd2b0643674b"

 [[package]]
 name = "rustls-webpki"
@ -1580,6 +1781,12 @@ dependencies = [
 "untrusted",
 ]

+[[package]]
+name = "rustversion"
+version = "1.0.18"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0e819f2bc632f285be6d7cd36e25940d45b2391dd6d9b939e79de557f7014248"
+
 [[package]]
 name = "ryu"
 version = "1.0.18"
@ -1633,24 +1840,24 @@ dependencies = [

 [[package]]
 name = "semver"
-version = "1.0.24"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3cb6eb87a131f756572d7fb904f6e7b68633f09cca868c5df1c4b8d1a694bbba"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"

 [[package]]
 name = "serde"
-version = "1.0.216"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b9781016e935a97e8beecf0c933758c97a5520d32930e460142b4cd80c6338e"
+checksum = "6513c1ad0b11a9376da888e3e0baa0077f1aed55c17f50e7b2397136129fb88f"
 dependencies = [
 "serde_derive",
 ]

 [[package]]
 name = "serde_derive"
-version = "1.0.216"
+version = "1.0.215"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46f859dbbf73865c6627ed570e78961cd3ac92407a2d117204c49232485da55e"
+checksum = "ad1e866f866923f252f05c889987993144fb74e722403468a4ebd70c3cd756c0"
 dependencies = [
 "proc-macro2",
 "quote",
@ -1718,15 +1925,6 @@ version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"

-[[package]]
-name = "signal-hook-registry"
-version = "1.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "signatory"
 version = "0.27.1"
@ -1802,18 +2000,6 @@ version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"

-[[package]]
-name = "submissions-api"
-version = "0.1.0"
-source = "sparse+https://git.itzana.me/api/packages/strafesnet/cargo/"
-checksum = "7969c6c0b770ecfb57220c340f732d62a6fb1165b9ef038e33e7cd5a9658bdd5"
-dependencies = [
- "reqwest",
- "serde",
- "serde_json",
- "url",
-]
-
 [[package]]
 name = "subtle"
 version = "2.6.1"
@ -1831,6 +2017,12 @@ dependencies = [
 "unicode-ident",
 ]

+[[package]]
+name = "sync_wrapper"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2047c6ded9c721764247e62cd3b03c09ffc529b2ba5b10ec482ae507a4a70160"
+
 [[package]]
 name = "sync_wrapper"
 version = "1.0.2"
@ -1907,9 +2099,9 @@ dependencies = [

 [[package]]
 name = "time"
-version = "0.3.37"
+version = "0.3.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35e7868883861bd0e56d9ac6efcaaca0d6d5d82a2a7ec8209ff492c07cf37b21"
+checksum = "5dfd88e563464686c916c7e46e623e520ddc6d79fa6641390f2e3fa86e83e885"
 dependencies = [
 "deranged",
 "itoa",
@ -1928,9 +2120,9 @@ checksum = "ef927ca75afb808a4d64dd374f00a2adf8d0fcff8e7b184af886c3c87ec4a3f3"

 [[package]]
 name = "time-macros"
-version = "0.2.19"
+version = "0.2.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2834e6017e3e5e4b9834939793b282bc03b37a3336245fa820e35e233e2a85de"
+checksum = "3f252a68540fde3a3877aeea552b832b40ab9a69e318efd078774a01ddee1ccf"
 dependencies = [
 "num-conv",
 "time-core",
@ -1948,16 +2140,15 @@ dependencies = [

 [[package]]
 name = "tokio"
-version = "1.42.0"
+version = "1.41.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cec9b21b0450273377fc97bd4c33a8acffc8c996c987a7c5b319a0083707551"
+checksum = "22cfb5bee7a6a52939ca9224d6ac897bb669134078daa8735560897f69de4d33"
 dependencies = [
 "backtrace",
 "bytes",
 "libc",
 "mio",
 "pin-project-lite",
- "signal-hook-registry",
 "socket2",
 "tokio-macros",
 "windows-sys 0.52.0",
@ -1986,19 +2177,31 @@ dependencies = [

 [[package]]
 name = "tokio-rustls"
-version = "0.26.1"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f6d0975eaace0cf0fcadee4e4aaa5da15b5c079146f2cffb67c113be122bf37"
+checksum = "0c7bc40d0e5a97695bb96e27995cd3a08538541b0a846f65bba7a359f36700d4"
 dependencies = [
 "rustls",
+ "rustls-pki-types",
+ "tokio",
+]
+
+[[package]]
+name = "tokio-stream"
+version = "0.1.17"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eca58d7bba4a75707817a2c44174253f9236b2d5fbd055602e9d5c07c139a047"
+dependencies = [
+ "futures-core",
+ "pin-project-lite",
 "tokio",
 ]

 [[package]]
 name = "tokio-util"
-version = "0.7.13"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7fcaa8d55a2bdd6b83ace262b016eca0d79ee02818c5c1bcdf0305114081078"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
 "bytes",
 "futures-core",
@ -2028,6 +2231,76 @@ dependencies = [
 "tokio-util",
 ]

+[[package]]
+name = "tonic"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "877c5b330756d856ffcc4553ab34a5684481ade925ecc54bcd1bf02b1d0d4d52"
+dependencies = [
+ "async-stream",
+ "async-trait",
+ "axum",
+ "base64 0.22.1",
+ "bytes",
+ "h2",
+ "http",
+ "http-body",
+ "http-body-util",
+ "hyper",
+ "hyper-timeout",
+ "hyper-util",
+ "percent-encoding",
+ "pin-project",
+ "prost",
+ "socket2",
+ "tokio",
+ "tokio-stream",
+ "tower 0.4.13",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower"
+version = "0.4.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "indexmap 1.9.3",
+ "pin-project",
+ "pin-project-lite",
+ "rand",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tower-layer",
+ "tower-service",
+ "tracing",
+]
+
+[[package]]
+name = "tower"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2873938d487c3cfb9aed7546dc9f2711d867c9f90c46b889989a2cb84eba6b4f"
+dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project-lite",
+ "sync_wrapper 0.1.2",
+ "tower-layer",
+ "tower-service",
+]
+
+[[package]]
+name = "tower-layer"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
+
 [[package]]
 name = "tower-service"
 version = "0.3.3"
@ -2158,9 +2431,9 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"

 [[package]]
 name = "wasm-bindgen"
-version = "0.2.99"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a474f6281d1d70c17ae7aa6a613c87fce69a127e2624002df63dcb39d6cf6396"
+checksum = "d15e63b4482863c109d70a7b8706c1e364eb6ea449b201a76c5b89cedcec2d5c"
 dependencies = [
 "cfg-if",
 "once_cell",
@ -2169,12 +2442,13 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.99"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f89bb38646b4f81674e8f5c3fb81b562be1fd936d84320f3264486418519c79"
+checksum = "8d36ef12e3aaca16ddd3f67922bc63e48e953f126de60bd33ccc0101ef9998cd"
 dependencies = [
 "bumpalo",
 "log",
+ "once_cell",
 "proc-macro2",
 "quote",
 "syn",
@ -2183,9 +2457,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.49"
+version = "0.4.47"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38176d9b44ea84e9184eff0bc34cc167ed044f816accfe5922e54d84cf48eca2"
+checksum = "9dfaf8f50e5f293737ee323940c7d8b08a66a95a419223d9f41610ca08b0833d"
 dependencies = [
 "cfg-if",
 "js-sys",
@ -2196,9 +2470,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.99"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2cc6181fd9a7492eef6fef1f33961e3695e4579b9872a6f7c83aee556666d4fe"
+checksum = "705440e08b42d3e4b36de7d66c944be628d579796b8090bfa3471478a2260051"
 dependencies = [
 "quote",
 "wasm-bindgen-macro-support",
@ -2206,9 +2480,9 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.99"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30d7a95b763d3c45903ed6c81f156801839e5ee968bb07e534c44df0fcd330c2"
+checksum = "98c9ae5a76e46f4deecd0f0255cc223cfa18dc9b261213b8aa0c7b36f61b3f1d"
 dependencies = [
 "proc-macro2",
 "quote",
@ -2219,15 +2493,15 @@ dependencies = [

 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.99"
+version = "0.2.97"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "943aab3fdaaa029a6e0271b35ea10b72b943135afe9bffca82384098ad0e06a6"
+checksum = "6ee99da9c5ba11bd675621338ef6fa52296b76b83305e9b6e5c77d4c286d6d49"

 [[package]]
 name = "web-sys"
-version = "0.3.76"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "04dd7223427d52553d3702c004d3b2fe07c148165faa56313cb00211e31c12bc"
+checksum = "a98bc3c33f0fe7e59ad7cd041b89034fa82a7c2d4365ca538dda6cdaf513863c"
 dependencies = [
 "js-sys",
 "wasm-bindgen",
@ -2368,9 +2642,9 @@ checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"

 [[package]]
 name = "xml-rs"
-version = "0.8.24"
+version = "0.8.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ea8b391c9a790b496184c29f7f93b9ed5b16abb306c05415b68bcc16e4d06432"
+checksum = "af310deaae937e48a26602b730250b4949e125f468f11e6990be3e5304ddd96f"

 [[package]]
 name = "yoke"
--- a/validation/Cargo.toml
+++ b/validation/Cargo.toml
@ -4,15 +4,17 @@ version = "0.1.0"
 edition = "2021"

 [dependencies]
-submissions-api = { version = "0.1.0", registry = "strafesnet" }
+api = { path = "api" }
 async-nats = "0.38.0"
 futures = "0.3.31"
-rbx_asset = { version = "0.2.5", registry = "strafesnet" }
+rbx_asset = { version = "0.2.3", registry = "strafesnet" }
 rbx_binary = { version = "0.7.4", registry = "strafesnet"}
 rbx_dom_weak = { version = "2.9.0", registry = "strafesnet"}
 rbx_reflection_database = { version = "0.2.12", registry = "strafesnet"}
 rbx_xml = { version = "0.13.3", registry = "strafesnet"}
+rust-grpc = { version = "1.0.3", registry = "strafesnet" }
 serde = { version = "1.0.215", features = ["derive"] }
 serde_json = "1.0.133"
 siphasher = "1.0.1"
-tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "signal"] }
+tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "fs"] }
+tonic = "0.12.3"
--- a/validation/Containerfile
+++ b/validation/Containerfile
@ -11,7 +11,7 @@ RUN cargo chef prepare --recipe-path recipe.json

 FROM chef AS builder
 COPY --from=planner /app/recipe.json recipe.json
-
+COPY api ./api
 # Notice that we are specifying the --target flag!
 RUN cargo chef cook --release --target x86_64-unknown-linux-musl --recipe-path recipe.json
 COPY . .
--- a/submissions-api-rs/Cargo.toml
+++ b/submissions-api-rs/Cargo.toml
@ -1,5 +1,5 @@
 [package]
-name = "submissions-api"
+name = "api"
 version = "0.1.0"
 edition = "2021"
 publish = ["strafesnet"]
--- a/submissions-api-rs/LICENSE-APACHE
+++ b/submissions-api-rs/LICENSE-APACHE
--- a/submissions-api-rs/LICENSE-MIT
+++ b/submissions-api-rs/LICENSE-MIT
--- a/submissions-api-rs/src/lib.rs
+++ b/submissions-api-rs/src/lib.rs
@ -29,11 +29,10 @@ pub struct ScriptResponse{
 #[derive(serde::Deserialize)]
 #[repr(i32)]
 pub enum Policy{
-	None=0, // not yet reviewed
-	Allowed=1,
-	Blocked=2,
-	Delete=3,
-	Replace=4,
+	Allowed=0,
+	Blocked=1,
+	Delete=2,
+	Replace=3,
 }

 pub struct ScriptPolicyHashRequest{
--- a/validation/src/main.rs
+++ b/validation/src/main.rs
@ -1,19 +1,17 @@
-use futures::StreamExt;
-
+mod types;
 mod nats_types;
 mod validator;
 mod publish_new;
 mod publish_fix;
-mod message_handler;

 #[allow(dead_code)]
 #[derive(Debug)]
 pub enum StartupError{
-	API(submissions_api::ReqwestError),
+	API(api::ReqwestError),
 	NatsConnect(async_nats::ConnectError),
 	NatsGetStream(async_nats::jetstream::context::GetStreamError),
-	NatsConsumer(async_nats::jetstream::stream::ConsumerError),
-	NatsStream(async_nats::jetstream::consumer::StreamError),
+	NatsStartup(types::NatsStartupError),
+	GRPCConnect(tonic::transport::Error),
 }
 impl std::fmt::Display for StartupError{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
@ -24,8 +22,6 @@ impl std::error::Error for StartupError{}

 pub const GROUP_STRAFESNET:u64=6980477;

-pub const PARALLEL_REQUESTS:usize=16;
-
 #[tokio::main]
 async fn main()->Result<(),StartupError>{
 	// talk to roblox through STRAFESNET_CI2 account
@ -34,56 +30,33 @@ async fn main()->Result<(),StartupError>{

 	// maps-service api
 	let api_host=std::env::var("API_HOST").expect("API_HOST env required");
-	let api=submissions_api::Context::new(api_host).map_err(StartupError::API)?;
+	let api=api::Context::new(api_host).map_err(StartupError::API)?;

 	// nats
 	let nats_host=std::env::var("NATS_HOST").expect("NATS_HOST env required");
-	let nats_fut=async{
-		let nasty=async_nats::connect(nats_host).await.map_err(StartupError::NatsConnect)?;
-		// use nats jetstream
-		async_nats::jetstream::new(nasty)
-			.get_stream("maptest").await.map_err(StartupError::NatsGetStream)?
-			.get_or_create_consumer("validation",async_nats::jetstream::consumer::pull::Config{
-				name:Some("validation".to_owned()),
-				durable_name:Some("validation".to_owned()),
-				filter_subject:"maptest.submissions.>".to_owned(),
-				..Default::default()
-			}).await.map_err(StartupError::NatsConsumer)?
-			.messages().await.map_err(StartupError::NatsStream)
-	};
+	let nasty=async_nats::connect(nats_host).await.map_err(StartupError::NatsConnect)?;	// use nats jetstream
+	let stream=async_nats::jetstream::new(nasty)
+		.get_stream("maptest").await.map_err(StartupError::NatsGetStream)?;

-	let message_handler=message_handler::MessageHandler::new(cookie_context,api);
+	// data-service grpc for creating map entries
+	let data_host=std::env::var("DATA_HOST").expect("DATA_HOST env required");
+	let maps_grpc=crate::types::MapsServiceClient::connect(data_host).await.map_err(StartupError::GRPCConnect)?;

-	// Create a signal listener for SIGTERM
-	let mut sig_term=tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate()).expect("Failed to create SIGTERM signal listener");
+	// connect to nats
+	let (publish_new,publish_fix,validator)=tokio::try_join!(
+		publish_new::Publisher::new(stream.clone(),cookie_context.clone(),api.clone(),maps_grpc),
+		publish_fix::Publisher::new(stream.clone(),cookie_context.clone(),api.clone()),
+		// clone nats here because it's dropped within the function scope,
+		// meanining the last reference is dropped...
+		validator::Validator::new(stream.clone(),cookie_context,api)
+	).map_err(StartupError::NatsStartup)?;

-	// run futures
-	let mut messages=nats_fut.await?;
+	// publisher threads
+	tokio::spawn(publish_new.run());
+	tokio::spawn(publish_fix.run());

-	// process up to PARALLEL_REQUESTS in parallel
-	let main_loop=async move{
-		static SEM:tokio::sync::Semaphore=tokio::sync::Semaphore::const_new(PARALLEL_REQUESTS);
-		// use memory leak to make static lifetime
-		let message_handler=Box::leak(Box::new(message_handler));
-		// acquire a permit before attempting to receive a message, exit if either fails
-		while let (Ok(permit),Some(message_result))=(SEM.acquire().await,messages.next().await){
-			// handle the message on a new thread (mainly to decode the model file)
-			tokio::spawn(async{
-				match message_handler.handle_message_result(message_result).await{
-					Ok(())=>println!("[Validation] Success, hooray!"),
-					Err(e)=>println!("[Validation] There was an error, oopsie! {e}"),
-				}
-				// explicitly call drop to make the move semantics and permit release more obvious
-				core::mem::drop(permit);
-			});
-		}
-	};
-
-	// race sigkill and main loop termination and then die
-	tokio::select!{
-		_=sig_term.recv()=>(),
-		_=main_loop=>(),
-	};
+	// run validator on the main thread indefinitely
+	validator.run().await;

 	Ok(())
 }
--- a/validation/src/message_handler.rs
+++ b/validation/src/message_handler.rs
@ -1,47 +0,0 @@
-#[allow(dead_code)]
-#[derive(Debug)]
-pub enum HandleMessageError{
-	Messages(async_nats::jetstream::consumer::pull::MessagesError),
-	DoubleAck(async_nats::Error),
-	UnknownSubject(String),
-	PublishNew(crate::publish_new::PublishError),
-	PublishFix(crate::publish_fix::PublishError),
-	Validation(crate::validator::ValidateError),
-}
-impl std::fmt::Display for HandleMessageError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for HandleMessageError{}
-
-pub type MessageResult=Result<async_nats::jetstream::Message,async_nats::jetstream::consumer::pull::MessagesError>;
-
-pub struct MessageHandler{
-	publish_new:crate::publish_new::Publisher,
-	publish_fix:crate::publish_fix::Publisher,
-	validator:crate::validator::Validator,
-}
-
-impl MessageHandler{
-	pub fn new(
-		cookie_context:rbx_asset::cookie::CookieContext,
-		api:submissions_api::Context,
-	)->Self{
-		Self{
-			publish_new:crate::publish_new::Publisher::new(cookie_context.clone(),api.clone()),
-			publish_fix:crate::publish_fix::Publisher::new(cookie_context.clone(),api.clone()),
-			validator:crate::validator::Validator::new(cookie_context,api),
-		}
-	}
-	pub async fn handle_message_result(&self,message_result:MessageResult)->Result<(),HandleMessageError>{
-		let message=message_result.map_err(HandleMessageError::Messages)?;
-		message.double_ack().await.map_err(HandleMessageError::DoubleAck)?;
-		match message.subject.as_str(){
-			"maptest.submissions.publishnew"=>self.publish_new.publish(message).await.map_err(HandleMessageError::PublishNew),
-			"maptest.submissions.publishfix"=>self.publish_fix.publish(message).await.map_err(HandleMessageError::PublishFix),
-			"maptest.submissions.validate"=>self.validator.validate(message).await.map_err(HandleMessageError::Validation),
-			other=>Err(HandleMessageError::UnknownSubject(other.to_owned()))
-		}
-	}
-}
--- a/validation/src/publish_fix.rs
+++ b/validation/src/publish_fix.rs
@ -1,12 +1,16 @@
+use futures::StreamExt;
+use crate::types::{MessageResult,NatsStartupError};
 use crate::nats_types::PublishFixRequest;

 #[allow(dead_code)]
 #[derive(Debug)]
-pub enum PublishError{
+enum PublishError{
+	Messages(async_nats::jetstream::consumer::pull::MessagesError),
+	DoubleAck(async_nats::Error),
 	Get(rbx_asset::cookie::GetError),
 	Json(serde_json::Error),
 	Upload(rbx_asset::cookie::UploadError),
-	ApiActionSubmissionPublish(submissions_api::Error),
+	ApiActionSubmissionPublish(api::Error),
 }
 impl std::fmt::Display for PublishError{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
@ -16,21 +20,43 @@ impl std::fmt::Display for PublishError{
 impl std::error::Error for PublishError{}

 pub struct Publisher{
+	messages:async_nats::jetstream::consumer::pull::Stream,
 	roblox_cookie:rbx_asset::cookie::CookieContext,
-	api:submissions_api::Context,
+	api:api::Context,
 }
 impl Publisher{
-	pub const fn new(
+	pub async fn new(
+		stream:async_nats::jetstream::stream::Stream,
 		roblox_cookie:rbx_asset::cookie::CookieContext,
-		api:submissions_api::Context,
-	)->Self{
-		Self{
+		api:api::Context,
+	)->Result<Self,NatsStartupError>{
+		Ok(Self{
+			messages:stream.get_or_create_consumer("publish_fix",async_nats::jetstream::consumer::pull::Config{
+				name:Some("publish_fix".to_owned()),
+				durable_name:Some("publish_fix".to_owned()),
+				filter_subject:"maptest.submissions.publish.fix".to_owned(),
+				..Default::default()
+			}).await.map_err(NatsStartupError::Consumer)?
+			.messages().await.map_err(NatsStartupError::Stream)?,
 			roblox_cookie,
 			api,
+		})
+	}
+	pub async fn run(mut self){
+		while let Some(message_result)=self.messages.next().await{
+			self.publish_supress_error(message_result).await
 		}
 	}
-	pub async fn publish(&self,message:async_nats::jetstream::Message)->Result<(),PublishError>{
-		println!("publish_fix {:?}",message.message.payload);
+	async fn publish_supress_error(&self,message_result:MessageResult){
+		match self.publish(message_result).await{
+			Ok(())=>println!("[PublishFix] Published, hooray!"),
+			Err(e)=>println!("[PublishFix] There was an error, oopsie! {e}"),
+		}
+	}
+	async fn publish(&self,message_result:MessageResult)->Result<(),PublishError>{
+		println!("publish_fix {:?}",message_result);
+		let message=message_result.map_err(PublishError::Messages)?;
+		message.double_ack().await.map_err(PublishError::DoubleAck)?;
 		// decode json
 		let publish_info:PublishFixRequest=serde_json::from_slice(&message.payload).map_err(PublishError::Json)?;

@ -54,7 +80,7 @@ impl Publisher{

 		// mark submission as published
 		self.api.action_submission_publish(
-			submissions_api::SubmissionID(publish_info.SubmissionID)
+			api::SubmissionID(publish_info.SubmissionID)
 		).await.map_err(PublishError::ApiActionSubmissionPublish)?;

 		Ok(())
--- a/validation/src/publish_new.rs
+++ b/validation/src/publish_new.rs
@ -1,13 +1,18 @@
+use futures::StreamExt;
+use crate::types::{MessageResult,NatsStartupError};
 use crate::nats_types::PublishNewRequest;

 #[allow(dead_code)]
 #[derive(Debug)]
-pub enum PublishError{
+enum PublishError{
+	Messages(async_nats::jetstream::consumer::pull::MessagesError),
+	DoubleAck(async_nats::Error),
 	Get(rbx_asset::cookie::GetError),
 	Json(serde_json::Error),
 	Create(rbx_asset::cookie::CreateError),
 	SystemTime(std::time::SystemTimeError),
-	ApiActionSubmissionPublish(submissions_api::Error),
+	MapCreate(tonic::Status),
+	ApiActionSubmissionPublish(api::Error),
 }
 impl std::fmt::Display for PublishError{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
@ -17,21 +22,46 @@ impl std::fmt::Display for PublishError{
 impl std::error::Error for PublishError{}

 pub struct Publisher{
+	messages:async_nats::jetstream::consumer::pull::Stream,
 	roblox_cookie:rbx_asset::cookie::CookieContext,
-	api:submissions_api::Context,
+	api:api::Context,
+	maps_grpc:crate::types::MapsServiceClient,
 }
 impl Publisher{
-	pub const fn new(
+	pub async fn new(
+		stream:async_nats::jetstream::stream::Stream,
 		roblox_cookie:rbx_asset::cookie::CookieContext,
-		api:submissions_api::Context,
-	)->Self{
-		Self{
+		api:api::Context,
+		maps_grpc:crate::types::MapsServiceClient,
+	)->Result<Self,NatsStartupError>{
+		Ok(Self{
+			messages:stream.get_or_create_consumer("publish_new",async_nats::jetstream::consumer::pull::Config{
+				name:Some("publish_new".to_owned()),
+				durable_name:Some("publish_new".to_owned()),
+				filter_subject:"maptest.submissions.publish.new".to_owned(),
+				..Default::default()
+			}).await.map_err(NatsStartupError::Consumer)?
+			.messages().await.map_err(NatsStartupError::Stream)?,
 			roblox_cookie,
 			api,
+			maps_grpc,
+		})
+	}
+	pub async fn run(mut self){
+		while let Some(message_result)=self.messages.next().await{
+			self.publish_supress_error(message_result).await
 		}
 	}
-	pub async fn publish(&self,message:async_nats::jetstream::Message)->Result<(),PublishError>{
-		println!("publish_new {:?}",message.message.payload);
+	async fn publish_supress_error(&self,message_result:MessageResult){
+		match self.publish(message_result).await{
+			Ok(())=>println!("[PublishNew] Published, hooray!"),
+			Err(e)=>println!("[PublishNew] There was an error, oopsie! {e}"),
+		}
+	}
+	async fn publish(&self,message_result:MessageResult)->Result<(),PublishError>{
+		println!("publish_new {:?}",message_result);
+		let message=message_result.map_err(PublishError::Messages)?;
+		message.double_ack().await.map_err(PublishError::DoubleAck)?;
 		// decode json
 		let publish_info:PublishNewRequest=serde_json::from_slice(&message.payload).map_err(PublishError::Json)?;

@ -50,9 +80,28 @@ impl Publisher{
 			groupId:Some(crate::GROUP_STRAFESNET),
 		},model_data).await.map_err(PublishError::Create)?;

+		// create the map entry in the game database, including release date
+		self.maps_grpc.clone().create(rust_grpc::maps::MapRequest{
+			id:upload_response.AssetId as i64,
+			display_name:Some(publish_info.DisplayName),
+			creator:Some(publish_info.Creator),
+			game_id:Some(publish_info.GameID as i32),
+			// TODO: scheduling algorithm
+			date:Some(
+				// Publish one week from now
+				(
+					std::time::SystemTime::now()
+					+std::time::Duration::from_secs(7*24*60*60)
+				)
+				.duration_since(std::time::SystemTime::UNIX_EPOCH)
+				.map_err(PublishError::SystemTime)?
+				.as_secs() as i64
+			),
+		}).await.map_err(PublishError::MapCreate)?;
+
 		// mark submission as published
 		self.api.action_submission_publish(
-			submissions_api::SubmissionID(publish_info.SubmissionID)
+			api::SubmissionID(publish_info.SubmissionID)
 		).await.map_err(PublishError::ApiActionSubmissionPublish)?;

 		Ok(())
--- a/validation/src/types.rs
+++ b/validation/src/types.rs
@ -0,0 +1,16 @@
+
+// annoying mile-long types
+pub type MapsServiceClient=rust_grpc::maps::maps_service_client::MapsServiceClient<tonic::transport::channel::Channel>;
+pub type MessageResult=Result<async_nats::jetstream::Message,async_nats::jetstream::consumer::pull::MessagesError>;
+
+#[derive(Debug)]
+pub enum NatsStartupError{
+	Consumer(async_nats::jetstream::stream::ConsumerError),
+	Stream(async_nats::jetstream::consumer::StreamError),
+}
+impl std::fmt::Display for NatsStartupError{
+	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
+		write!(f,"{self:?}")
+	}
+}
+impl std::error::Error for NatsStartupError{}
--- a/validation/src/validator.rs
+++ b/validation/src/validator.rs
@ -1,11 +1,10 @@
-use futures::TryStreamExt;
-
+use futures::{StreamExt,TryStreamExt};
+use crate::types::{MessageResult,NatsStartupError};
 use crate::nats_types::ValidateRequest;

 const SCRIPT_CONCURRENCY:usize=16;

 enum Policy{
-	None,
 	Allowed,
 	Blocked,
 	Delete,
@ -14,16 +13,18 @@ enum Policy{

 #[allow(dead_code)]
 #[derive(Debug)]
-pub enum ValidateError{
+enum ValidateError{
 	Blocked,
 	NotAllowed,
+	Messages(async_nats::jetstream::consumer::pull::MessagesError),
+	DoubleAck(async_nats::Error),
 	Get(rbx_asset::cookie::GetError),
 	Json(serde_json::Error),
 	ReadDom(ReadDomError),
-	ApiGetScriptPolicy(submissions_api::Error),
-	ApiGetScript(submissions_api::Error),
-	ApiUpdateSubmissionModel(submissions_api::Error),
-	ApiActionSubmissionValidate(submissions_api::Error),
+	ApiGetScriptPolicy(api::Error),
+	ApiGetScript(api::Error),
+	ApiUpdateSubmissionModel(api::Error),
+	ApiActionSubmissionValidate(api::Error),
 	WriteDom(rbx_binary::EncodeError),
 	Upload(rbx_asset::cookie::UploadError),
 	Create(rbx_asset::cookie::CreateError),
@ -36,22 +37,45 @@ impl std::fmt::Display for ValidateError{
 impl std::error::Error for ValidateError{}

 pub struct Validator{
+	messages:async_nats::jetstream::consumer::pull::Stream,
 	roblox_cookie:rbx_asset::cookie::CookieContext,
-	api:submissions_api::Context,
+	api:api::Context,
 }

 impl Validator{
-	pub const fn new(
+	pub async fn new(
+		stream:async_nats::jetstream::stream::Stream,
 		roblox_cookie:rbx_asset::cookie::CookieContext,
-		api:submissions_api::Context,
-	)->Self{
-		Self{
+		api:api::Context,
+	)->Result<Self,NatsStartupError>{
+		Ok(Self{
+			messages:stream.get_or_create_consumer("validation",async_nats::jetstream::consumer::pull::Config{
+				name:Some("validation".to_owned()),
+				durable_name:Some("validation".to_owned()),
+				ack_policy:async_nats::jetstream::consumer::AckPolicy::Explicit,
+				filter_subject:"maptest.submissions.validate".to_owned(),
+				..Default::default()
+			}).await.map_err(NatsStartupError::Consumer)?
+			.messages().await.map_err(NatsStartupError::Stream)?,
 			roblox_cookie,
 			api,
+		})
+	}
+	pub async fn run(mut self){
+		while let Some(message_result)=self.messages.next().await{
+			self.validate_supress_error(message_result).await
 		}
 	}
-	pub async fn validate(&self,message:async_nats::jetstream::Message)->Result<(),ValidateError>{
-		println!("validate {:?}",message.message.payload);
+	async fn validate_supress_error(&self,message_result:MessageResult){
+		match self.validate(message_result).await{
+			Ok(())=>println!("[Validation] Validated, hooray!"),
+			Err(e)=>println!("[Validation] There was an error, oopsie! {e}"),
+		}
+	}
+	async fn validate(&self,message_result:MessageResult)->Result<(),ValidateError>{
+		println!("validate {:?}",message_result);
+		let message=message_result.map_err(ValidateError::Messages)?;
+		message.double_ack().await.map_err(ValidateError::DoubleAck)?;
 		// decode json
 		let validate_info:ValidateRequest=serde_json::from_slice(&message.payload).map_err(ValidateError::Json)?;

@ -72,7 +96,7 @@ impl Validator{
 		for &script_ref in &script_refs{
 			if let Some(script)=dom.get_by_ref(script_ref){
 				if let Some(rbx_dom_weak::types::Variant::String(source))=script.properties.get("Source"){
-					script_map.insert(source.clone(),Policy::None);
+					script_map.insert(source.clone(),Policy::Blocked);
 				}
 			}
 		}
@ -86,18 +110,17 @@ impl Validator{
 			let hash=std::hash::Hasher::finish(&hasher);

 			// fetch the script policy
-			let script_policy=self.api.get_script_policy_from_hash(submissions_api::ScriptPolicyHashRequest{
+			let script_policy=self.api.get_script_policy_from_hash(api::ScriptPolicyHashRequest{
 				hash:format!("{:x}",hash),
 			}).await.map_err(ValidateError::ApiGetScriptPolicy)?;

 			// write the policy to the script_map, fetching the replacement code if necessary
 			*replacement=match script_policy.Policy{
-				submissions_api::Policy::None=>Policy::None,
-				submissions_api::Policy::Allowed=>Policy::Allowed,
-				submissions_api::Policy::Blocked=>Policy::Blocked,
-				submissions_api::Policy::Delete=>Policy::Delete,
-				submissions_api::Policy::Replace=>{
-					let script=self.api.get_script(submissions_api::GetScriptRequest{
+				api::Policy::Allowed=>Policy::Allowed,
+				api::Policy::Blocked=>Policy::Blocked,
+				api::Policy::Delete=>Policy::Delete,
+				api::Policy::Replace=>{
+					let script=self.api.get_script(api::GetScriptRequest{
 						ScriptID:script_policy.ToScriptID,
 					}).await.map_err(ValidateError::ApiGetScript)?;
 					Policy::Replace(script.Source)
@ -115,9 +138,7 @@ impl Validator{
 				if let Some(rbx_dom_weak::types::Variant::String(source))=script.properties.get_mut("Source"){
 					match script_map.get(source.as_str()){
 						Some(Policy::Blocked)=>return Err(ValidateError::Blocked),
-						None
-						|Some(Policy::None)
-						=>return Err(ValidateError::NotAllowed),
+						None=>return Err(ValidateError::NotAllowed),
 						Some(Policy::Allowed)=>(),
 						Some(Policy::Delete)=>{
 							modified=true;
@ -137,10 +158,10 @@ impl Validator{
 		if modified{
 			// serialize model (slow!)
 			let mut data=Vec::new();
-			rbx_binary::to_writer(&mut data,&dom,dom.root().children()).map_err(ValidateError::WriteDom)?;
+			rbx_binary::to_writer(&mut data,&dom,&[dom.root_ref()]).map_err(ValidateError::WriteDom)?;

 			// upload a model lol
-			let model_id=if let Some(model_id)=validate_info.ValidatedModelID{
+			let (model_id,model_version)=if let Some(model_id)=validate_info.ValidatedModelID{
 				// upload to existing id
 				let response=self.roblox_cookie.upload(rbx_asset::cookie::UploadRequest{
 					assetid:model_id,
@ -151,7 +172,7 @@ impl Validator{
 					groupId:None,
 				},data).await.map_err(ValidateError::Upload)?;

-				response.AssetId
+				(response.AssetId,response.AssetVersionId)
 			}else{
 				// create new model
 				let response=self.roblox_cookie.create(rbx_asset::cookie::CreateRequest{
@ -162,20 +183,20 @@ impl Validator{
 					groupId:None,
 				},data).await.map_err(ValidateError::Create)?;

-				response.AssetId
+				(response.AssetId,response.AssetVersionId)
 			};

 			// update the submission to use the validated model
-			self.api.update_submission_model(submissions_api::UpdateSubmissionModelRequest{
+			self.api.update_submission_model(api::UpdateSubmissionModelRequest{
 				ID:validate_info.SubmissionID,
 				ModelID:model_id,
-				ModelVersion:1, //TODO
+				ModelVersion:model_version,
 			}).await.map_err(ValidateError::ApiUpdateSubmissionModel)?;
 		};

 		// update the submission model status to validated
 		self.api.action_submission_validate(
-			submissions_api::SubmissionID(validate_info.SubmissionID)
+			api::SubmissionID(validate_info.SubmissionID)
 		).await.map_err(ValidateError::ApiActionSubmissionValidate)?;

 		Ok(())
@ -184,7 +205,7 @@ impl Validator{

 #[allow(dead_code)]
 #[derive(Debug)]
-pub enum ReadDomError{
+enum ReadDomError{
 	Binary(rbx_binary::DecodeError),
 	Xml(rbx_xml::DecodeError),
 	Read(std::io::Error),
--- a/web/.dockerignore
+++ b/web/.dockerignore
@ -1,3 +1,15 @@
 node_modules
-build
-bun.lockb
+Dockerfile*
+docker-compose*
+.dockerignore
+.git
+.gitignore
+README.md
+LICENSE
+.vscode
+Makefile
+helm-charts
+.env
+.editorconfig
+.idea
+coverage*
--- a/web/Containerfile
+++ b/web/Containerfile
@ -1,13 +1,19 @@
-FROM oven/bun:latest
+FROM oven/bun AS build

 WORKDIR /app

 COPY . .

-EXPOSE 3000
-
+ENV NODE_ENV=production
 ENV NEXT_TELEMETRY_DISABLED=1
+RUN bun install && bun run build

-RUN bun install
-RUN bun run build
-ENTRYPOINT ["bun", "run", "start"]
+FROM build AS release
+
+WORKDIR /app
+
+COPY --from=build /app/build ./.next
+RUN bun add next
+
+EXPOSE 3000
+ENTRYPOINT ["bun", "run", "env", "--", "next", "start", "-p", "3000"]
--- a/web/next.config.ts
+++ b/web/next.config.ts
@ -2,12 +2,11 @@ import type { NextConfig } from "next";

 const nextConfig: NextConfig = {
    distDir: "build",
-    output: "standalone",
    rewrites: async () => {
    	return [
     		{
-       			source: "/v1/submissions/:submissionid/status/:statustype",
-          		destination: "http://mapsservice:8082/v1/submissions/:submissionid/status/:statustype"
+       			source: "/v1/submissions/1/status/:statustype",
+          		destination: "http://localhost:8081/v1/submissions/:statustype"
       		}
     	]
    }
--- a/web/src/app/globals.scss
+++ b/web/src/app/globals.scss
@ -1,5 +1,4 @@
 $review-border: 1px solid var(--review-border);
-$form-label-fontsize: 1.3rem;

@mixin border-with-radius {
    border: $review-border {
@ -22,7 +21,6 @@ $form-label-fontsize: 1.3rem;
 	--window-header:       #f5f5f5;
 	--comment-highlighted: #ffffd7;
 	--comment-area:        white;
-	--placeholder-text:    rgb(150,150,150);

 	@media (prefers-color-scheme: dark) {
 		--page:                rgb(15,15,15);
@ -37,7 +35,6 @@ $form-label-fontsize: 1.3rem;
 		--window-header:       rgb(10,10,10);
 		--comment-highlighted: #ffffd7;
 		--comment-area:        rgb(20,20,20);
-		--placeholder-text:    rgb(80,80,80);
 	}
 }

@ -54,11 +51,4 @@ button {

 a:active, a:link, a:hover {
 	text-decoration: none;
-}
-
-.spacer {
-    display: block;
-    width: 100%;
-    height: 1px;
-    background-color: var(--review-border);
 }
--- a/web/src/app/submissions/[submissionId]/(styles)/page.scss
+++ b/web/src/app/submissions/[submissionId]/(styles)/page.scss
@ -14,6 +14,13 @@
    width: 100vw;
 }

+.spacer {
+    display: block;
+    width: 100%;
+    height: 1px;
+    background-color: var(--review-border);
+}
+
 .by-creator {
    margin-top: 10px;
 }
--- a/web/src/app/submissions/[submissionId]/_map.tsx
+++ b/web/src/app/submissions/[submissionId]/_map.tsx
@ -1,11 +1,24 @@
+"use client"
+
+import { useState, useEffect } from "react"
 import { SubmissionInfo } from "@/app/ts/Submission"
+import { AssetImage } from "@/app/ts/Roblox"
+import Image from "next/image"

 interface AssetID {
    id: SubmissionInfo["AssetID"]
 }

-function MapImage() {
-    return <p>Fetching map image...</p>
+function MapImage(asset: AssetID) {
+	const [assetImage, setAssetImage] = useState("");
+
+	useEffect(() => {
+		AssetImage(asset.id, "420x420").then(image => setAssetImage(image))
+	}, [asset.id]);
+	if (!assetImage) {
+        return <p>Fetching map image...</p>;
+    }
+    return <Image src={assetImage} alt="Map Image"/>
 }

 export {
--- a/web/src/app/submissions/[submissionId]/_reviewButtons.tsx
+++ b/web/src/app/submissions/[submissionId]/_reviewButtons.tsx
@ -1,7 +1,7 @@
 import { Button, ButtonOwnProps } from "@mui/material";

-type Review = "Completed" | "Submit" | "Reject" | "Revoke" | "Accept" | "Validate" | "Upload"
-type Action = "completed" | "submit" | "reject" | "revoke" | "trigger-validate" | "trigger-upload"
+type Review = "Completed" | "Submit" | "Reject" | "Revoke" | "Validate" | "Publish"
+type Action = "completed" | "submit" | "reject" | "revoke" | "trigger-validate" | "trigger-publish"
 interface ReviewButton {
 	name: Review,
 	action: Action,
@ -9,10 +9,11 @@ interface ReviewButton {
 }

 function ReviewButtonClicked(action: Action) {
-	fetch(`http://localhost:3000/v1/submissions/1/status/${action}`, {
+	const post = fetch(`http://localhost:3000/v1/submissions/1/status/${action}`, {
 		method: "POST",
 		headers: {
 			"Content-type": "application/json",
+			"Cookie": "session_id=c5191ddc-eee1-4010-900c-6b2c7b6780ab"
 		}
 	})
 }
@ -24,13 +25,12 @@ function ReviewButton(props: ReviewButton) {
 export default function ReviewButtons() {
 	return (
 		<section className="review-set">
-			<ReviewButton color="info"  name="Submit"    action="submit"/>
-			<ReviewButton color="info"  name="Revoke"    action="revoke"/>
-			<ReviewButton color="info"  name="Accept"    action="trigger-validate"/>
-			<ReviewButton color="info"  name="Validate"  action="trigger-validate"/>
 			<ReviewButton color="error" name="Reject"    action="reject"/>
-			<ReviewButton color="info"  name="Upload"    action="trigger-upload"/>
+			<ReviewButton color="info"  name="Revoke"    action="revoke"/>
+			<ReviewButton color="info"  name="Publish"   action="trigger-publish"/>
 			<ReviewButton color="info"  name="Completed" action="completed"/>
+			<ReviewButton color="info"  name="Submit"    action="submit"/>
+			<ReviewButton color="info"  name="Validate"  action="trigger-validate"/>
 		</section>
 	)
 }
--- a/web/src/app/submissions/[submissionId]/page.tsx
+++ b/web/src/app/submissions/[submissionId]/page.tsx
@ -2,7 +2,7 @@

 import { SubmissionStatus, SubmissionStatusToString } from "@/app/ts/Submission";
 import type { CreatorAndReviewStatus } from "./_comments";
-import { MapImage } from "./_map";
+import { MapImage, type AssetID } from "./_map";
 import { useParams } from "next/navigation";
 import ReviewButtons from "./_reviewButtons";
 import { Rating } from "@mui/material";
@ -34,11 +34,11 @@ function Ratings() {
 	)
 }

-function RatingArea() {
+function RatingArea(asset: AssetID) {
    return (
        <aside className="review-area">
        	<section className="map-image-area">
-         		<MapImage/>
+         		<MapImage id={asset.id}/>
         	</section>
            <Ratings/>
            <ReviewButtons/>
@ -71,7 +71,7 @@ export default function SubmissionInfoPage() {
        <Webpage>
            <main className="map-page-main">
                <section className="review-section">
-                    <RatingArea/>
+                    <RatingArea id={432}/>
                    <TitleAndComments name={dynamicId.submissionId} creator="Quaternions" review={SubmissionStatus.Accepted} comments={[]}/>
                </section>
            </main>
--- a/web/src/app/submit/(styles)/page.scss
+++ b/web/src/app/submit/(styles)/page.scss
@ -1,55 +0,0 @@
-@use "../../globals.scss";
-
-::placeholder {
-	color: var(--placeholder-text)
-}
-
-.form-spacer {
-	margin-bottom: 20px;
-
-	&:last-of-type {
-		margin-top: 15px;
-	}
-}
-
-#target-asset-radio {
-	color: var(--text-color);
-	font-size: globals.$form-label-fontsize;
-}
-
-.form-field {
-	width: 850px;
-
-	& label, & input {
-		color: var(--text-color);
-	}
-	& fieldset {
-		border-color: rgb(100,100,100);
-
-	}
-	& span {
-		color: white;
-	}
-}
-
-main {
-	display: grid;
-	justify-content: center;
-	align-items: center;
-	margin-inline: auto;
-	width: 700px;
-}
-
-header h1 {
-	text-align: center;
-	color: var(--text-color);
-}
-
-form {
-	display: grid;
-	gap: 25px;
-
-	fieldset {
-		border: blue
-	}
-}
--- a/web/src/app/submit/_submit.tsx
+++ b/web/src/app/submit/_submit.tsx
@ -1,67 +0,0 @@
-interface FormNumbers {
-	readonly GameID: number,
-	readonly AssetID: number,
-	readonly AssetVersion: number
-}
-
-interface FormStrings {
-	readonly DisplayName: string,
-	readonly Creator: string,
-}
-
-function SubmitAPI(json: string) {
-	console.log(json)
-}
-
-function SafeNumbers(form: FormNumbers): Promise<FormNumbers> {
-	const form_number_values = [form.GameID, form.AssetID, form.AssetVersion]
-
-	return new Promise((resolve, reject) => {
-		form_number_values.forEach(v => {
-			if (!Number.isSafeInteger(v)) {
-				reject(`Form Value: ${v} was not a valid number`)
-			}
-		})
-		resolve(form)
-	})
-}
-
-function SafeStrings(form: FormStrings): Promise<FormStrings> {
-	const form_string_values = [form.DisplayName, form.Creator]
-
-	return new Promise((resolve, reject) => {
-		form_string_values.forEach(v => {
-			if (v.length>=128) {
-				reject(`Form value: ${v} is beyond the max 128 string limit`)
-			}
-		})
-		resolve(form)
-	})
-}
-
-export default function Submit() {
-	const form_numbers: FormNumbers = {
-		GameID:       Number((document.getElementById("game-id")       as HTMLInputElement).value),
-		AssetID:      Number((document.getElementById("asset-id")      as HTMLInputElement).value),
-		AssetVersion: Number((document.getElementById("asset-version") as HTMLInputElement).value),
-	}
-	const form_strings: FormStrings = {
-		DisplayName:  (document.getElementById("display-name")  as HTMLInputElement).value,
-		Creator:      (document.getElementById("creator")       as HTMLInputElement).value
-	}
-
-	const valid_numbers = SafeNumbers(form_numbers)
-	const valid_strings = SafeStrings(form_strings)
-
-	valid_strings.then(form_strings => {
-		valid_numbers.then(form_numbers => {
-			SubmitAPI(JSON.stringify({
-				DisplayName:  form_strings.DisplayName,
-				Creator:      form_strings.Creator,
-				GameID:       form_numbers.GameID,
-				AssetID:      form_numbers.AssetID,
-				AssetVersion: form_numbers.AssetVersion
-			}))
-		}).catch(e => console.log(e))
-	}).catch(e => console.log(e))
-}
--- a/web/src/app/submit/page.tsx
+++ b/web/src/app/submit/page.tsx
@ -1,46 +0,0 @@
-"use client"
-
-import { FormControl, FormLabel, RadioGroup, FormControlLabel, Button, TextField } from "@mui/material"
-import SendIcon from '@mui/icons-material/Send';
-import Webpage from "@/app/_components/webpage"
-import Submit from "./_submit";
-import Radio from '@mui/material/Radio';
-
-import "./(styles)/page.scss"
-
-function TargetAsset() {
-	return <FormControl>
-		<FormLabel id="target-asset-radio">Target:</FormLabel>
-		<RadioGroup defaultValue="New" aria-labelledby="target-asset-radio" name="target-asset-radio">
-			<FormControlLabel value="New" control={<Radio/>} label="New" id="asset-new"/>
-			<FormControlLabel value="Fix" control={<Radio/>} label="Fix" id="asset-Fix"/>
-		</RadioGroup>
-	</FormControl>
-}
-
-export default function SubmissionInfoPage() {
-    return (
-        <Webpage>
-        	<main>
-	        	<header>
-	          		<h1>Submit Asset</h1>
-	            	<span className="spacer form-spacer"></span>
-	          	</header>
-	        	<form>
-					<TextField className="form-field" id="display-name"  label="Display Name"  variant="outlined"/>
-					<TextField className="form-field" id="creator" 		 label="Creator"       variant="outlined"/>
-					<TextField className="form-field" id="game-id"       label="Game ID"       variant="outlined" type="number"/>
-					<TextField className="form-field" id="asset-id"      label="Asset ID"      variant="outlined" type="number"/>
-					<TextField className="form-field" id="asset-version" label="Asset Version" variant="outlined" type="number"/>
-					<TargetAsset/>
-	         	</form>
-				<span className="spacer form-spacer"></span>
-				<Button variant="contained" startIcon={<SendIcon />} onClick={() => { Submit() }} sx={{
-					width: "400px",
-					height: "50px",
-					marginInline: "auto"
-				}}>Submit</Button>
-         	</main>
-        </Webpage>
-	)
-}
--- a/web/src/app/ts/Roblox.ts
+++ b/web/src/app/ts/Roblox.ts
@ -0,0 +1,48 @@
+const FALLBACK_IMAGE = ""
+
+type thumbsizes = "420" | "720"
+type thumbsize<S extends thumbsizes> = `${S}x${S}`
+type ParsedJson<A> = {
+	errors: A,
+	data: {
+		[0]: {
+			state: string,
+			imageUrl: string,
+		}
+	}
+}
+
+function Parse<A>(json: ParsedJson<A>): string {
+	if (json.errors) {
+		console.warn(json.errors)
+		return FALLBACK_IMAGE
+	}
+	if (json.data) {
+		const data = json.data[0]
+		if (!data) { //For whatever reason roblox will sometimes return an empty array instead of an error message
+			console.warn("Roblox gave us no data,", data)
+			return FALLBACK_IMAGE
+		}
+		if (data.state === "Completed") {
+			return data.imageUrl
+		}
+		console.warn(data)
+		return FALLBACK_IMAGE
+	}
+	return FALLBACK_IMAGE
+}
+
+async function AvatarHeadshot<S extends thumbsizes>(userid: number, size: thumbsize<S>): Promise<string> {
+	const avatarthumb_api = fetch(`https://thumbnails.roproxy.com/v1/users/avatar-headshot?userIds=${userid}&size=${size}&format=Png&isCircular=false`)
+	return avatarthumb_api.then(res => res.json()).then(json => Parse(json))
+}
+
+async function AssetImage<S extends thumbsizes>(assetid: number, size: thumbsize<S>): Promise<string> {
+	const avatarthumb_api = fetch(`https://thumbnails.roblox.com/v1/assets?assetIds=${assetid}&returnPolicy=PlaceHolder&size=${size}&format=Png&isCircular=false`)
+	return avatarthumb_api.then(res => res.json()).then(json => Parse(json))
+}
+
+export {
+	AvatarHeadshot,
+	AssetImage
+}
Author	SHA1	Message	Date
rhpidfyre	49da5f6eb1	web: use multi-stage building for the container file	2024-12-14 00:07:59 -05:00
rhpidfyre	f0c39f5837	web: remove all unnecessary junk from the container after building (experiment & saves ~2GBs)	2024-12-12 18:39:10 -05:00