validation: remove allocation

.drone.yml

@@ -24,7 +24,7 @@ steps:
         - staging
 
   - name: build-validator
-    image: rust:1.92
+    image: clux/muslrust:1.91.0-stable
     commands:
       - make build-validator
     when:
@@ -32,15 +32,6 @@ steps:
         - master
         - staging
 
-  - name: build-combobulator
-    image: rust:1.92
-    commands:
-      - make build-combobulator
-    when:
-      branch:
-        - master
-        - staging
-
   - name: build-frontend
     image: oven/bun:1.3.3
     commands:
@@ -121,29 +112,6 @@ steps:
       event:
         - push
 
-  - name: image-combobulator
-    image: plugins/docker
-    settings:
-      registry: registry.itzana.me
-      repo: registry.itzana.me/strafesnet/maptest-combobulator
-      tags:
-        - ${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-        - ${DRONE_BRANCH}
-      username:
-        from_secret: REGISTRY_USER
-      password:
-        from_secret: REGISTRY_PASS
-      dockerfile: combobulator/Containerfile
-      context: .
-    depends_on:
-      - build-combobulator
-    when:
-      branch:
-        - master
-        - staging
-      event:
-        - push
-
   - name: deploy
     image: argoproj/argocd:latest
     commands:
@@ -151,7 +119,6 @@ steps:
       - argocd app --grpc-web set ${DRONE_BRANCH}-maps-service --kustomize-image registry.itzana.me/strafesnet/maptest-api:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
       - argocd app --grpc-web set ${DRONE_BRANCH}-maps-service --kustomize-image registry.itzana.me/strafesnet/maptest-frontend:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
       - argocd app --grpc-web set ${DRONE_BRANCH}-maps-service --kustomize-image registry.itzana.me/strafesnet/maptest-validator:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
-      - argocd app --grpc-web set ${DRONE_BRANCH}-maps-service --kustomize-image registry.itzana.me/strafesnet/maptest-combobulator:${DRONE_BRANCH}-${DRONE_BUILD_NUMBER}
     environment:
       USERNAME:
         from_secret: ARGO_USER
@@ -161,7 +128,6 @@ steps:
       - image-backend
       - image-frontend
       - image-validator
-      - image-combobulator
     when:
       branch:
         - master
@@ -177,13 +143,12 @@ steps:
     depends_on:
       - build-backend
       - build-validator
-      - build-combobulator
       - build-frontend
     when:
       event:
         - pull_request
 ---
 kind: signature
-hmac: a654fea05ccf642bb3a41ce777808ff995c8bd7286f2403fae179ce0db025619
+hmac: 6de9d4b91f14b30561856daf275d1fd523e1ce7a5a3651b660f0d8907b4692fb
 
 ...

Cargo.toml

@@ -1,17 +1,6 @@
 [workspace]
 members = [
-	"combobulator",
 	"validation",
 	"submissions-api-rs",
 ]
 resolver = "2"
-
-[workspace.dependencies]
-async-nats = "0.46.0"
-futures-util = "0.3.31"
-rbx_asset = { version = "0.5.0", features = ["gzip", "rustls-tls"], default-features = false, registry = "strafesnet" }
-rbx_binary = "2.0.1"
-rbx_dom_weak = "4.1.0"
-serde = { version = "1.0.215", features = ["derive"] }
-serde_json = "1.0.133"
-tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "signal"] }

Makefile

@@ -7,17 +7,14 @@ build-backend:
 	CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo -o build/server cmd/maps-service/service.go
 
 build-validator:
-	cargo build --release --bin maps-validation
+	cargo build --release --target x86_64-unknown-linux-musl --bin maps-validation
-
-build-combobulator:
-	cargo build --release --bin maps-combobulator
 
 build-frontend:
 	rm -rf web/build
 	cd web && bun install --frozen-lockfile
 	cd web && bun run build
 
-build: build-backend build-validator build-combobulator build-frontend
+build: build-backend build-validator build-frontend
 
 # image
 image-backend:
@@ -26,9 +23,6 @@ image-backend:
 image-validator:
 	docker build . -f validation/Containerfile -t maptest-validator
 
-image-combobulator:
-	docker build . -f combobulator/Containerfile -t maptest-combobulator
-
 image-frontend:
 	docker build web -f web/Containerfile -t maptest-frontend
 
@@ -39,12 +33,9 @@ docker-backend:
 docker-validator:
 	make build-validator
 	make image-validator
-docker-combobulator:
-	make build-combobulator
-	make image-combobulator
 docker-frontend:
 	make image-frontend
 
-docker: docker-backend docker-validator docker-combobulator docker-frontend
+docker: docker-backend docker-validator docker-frontend
 
-.PHONY: clean build-backend build-validator build-combobulator build-frontend build image-backend image-validator image-combobulator image-frontend docker-backend docker-validator docker-combobulator docker-frontend docker
+.PHONY: clean build-backend build-validator build-frontend build image-backend image-validator image-frontend docker-backend docker-validator docker-frontend docker

combobulator/Cargo.toml

@@ -1,22 +0,0 @@
-[package]
-name = "maps-combobulator"
-version = "0.1.0"
-edition = "2024"
-
-[dependencies]
-async-nats.workspace = true
-aws-config = { version = "1", features = ["behavior-version-latest"] }
-aws-sdk-s3 = "1"
-futures-util.workspace = true
-map-tool = { version = "3.0.0", registry = "strafesnet", features = ["roblox"], default-features = false }
-rbx_asset.workspace = true
-rbx_binary.workspace = true
-rbx_dom_weak.workspace = true
-rbxassetid = { version = "0.1.0", registry = "strafesnet" }
-serde.workspace = true
-serde_json.workspace = true
-strafesnet_deferred_loader = { version = "0.6.0", registry = "strafesnet" }
-strafesnet_rbx_loader = { version = "0.10.0", registry = "strafesnet" }
-strafesnet_snf = { version = "0.3.2", registry = "strafesnet" }
-tokio.workspace = true
-tokio-stream = "0.1"

combobulator/Containerfile

@@ -1,4 +0,0 @@
-FROM debian:trixie-slim AS runtime
-RUN apt-get update && apt-get install -y --no-install-recommends libssl3t64 ca-certificates && rm -rf /var/lib/apt/lists/*
-COPY /target/release/maps-combobulator /
-ENTRYPOINT ["/maps-combobulator"]

combobulator/src/loader.rs

@@ -1,152 +0,0 @@
-use std::collections::HashMap;
-
-use rbxassetid::{RobloxAssetId,RobloxAssetIdParseErr};
-use strafesnet_deferred_loader::{loader::Loader,texture::Texture};
-
-use strafesnet_rbx_loader::mesh::{MeshIndex,MeshType,MeshWithSize};
-
-// disallow non-static lifetimes
-fn static_ustr(s:&'static str)->rbx_dom_weak::Ustr{
-	rbx_dom_weak::ustr(s)
-}
-
-#[expect(dead_code)]
-#[derive(Debug)]
-pub enum TextureError{
-	NoTexture,
-	RobloxAssetIdParse(RobloxAssetIdParseErr),
-}
-impl std::fmt::Display for TextureError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for TextureError{}
-impl From<RobloxAssetIdParseErr> for TextureError{
-	fn from(value:RobloxAssetIdParseErr)->Self{
-		Self::RobloxAssetIdParse(value)
-	}
-}
-
-pub struct TextureLoader{
-	textures:HashMap<RobloxAssetId,Texture>,
-}
-impl TextureLoader{
-	pub fn new()->Self{
-		Self{
-			textures:HashMap::new(),
-		}
-	}
-	pub fn insert(&mut self,asset_id:RobloxAssetId,texture:Vec<u8>){
-		self.textures.insert(asset_id,Texture::ImageDDS(texture));
-	}
-}
-impl Loader for TextureLoader{
-	type Error=TextureError;
-	type Index<'a>=&'a str;
-	type Resource=Texture;
-	fn load(&mut self,index:Self::Index<'_>)->Result<Self::Resource,Self::Error>{
-		let asset_id:RobloxAssetId=index.parse()?;
-		let data=self.textures.get(&asset_id).ok_or(TextureError::NoTexture)?.clone();
-		Ok(data)
-	}
-}
-
-#[expect(dead_code)]
-#[derive(Debug)]
-pub enum MeshError{
-	NoMesh,
-	RobloxAssetIdParse(RobloxAssetIdParseErr),
-	Mesh(strafesnet_rbx_loader::mesh::Error),
-	Union(strafesnet_rbx_loader::union::Error),
-	DecodeBinary(rbx_binary::DecodeError),
-	OneChildPolicy,
-	MissingInstance,
-}
-impl std::fmt::Display for MeshError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for MeshError{}
-impl From<RobloxAssetIdParseErr> for MeshError{
-	fn from(value:RobloxAssetIdParseErr)->Self{
-		Self::RobloxAssetIdParse(value)
-	}
-}
-impl From<strafesnet_rbx_loader::mesh::Error> for MeshError{
-	fn from(value:strafesnet_rbx_loader::mesh::Error)->Self{
-		Self::Mesh(value)
-	}
-}
-impl From<strafesnet_rbx_loader::union::Error> for MeshError{
-	fn from(value:strafesnet_rbx_loader::union::Error)->Self{
-		Self::Union(value)
-	}
-}
-impl From<rbx_binary::DecodeError> for MeshError{
-	fn from(value:rbx_binary::DecodeError)->Self{
-		Self::DecodeBinary(value)
-	}
-}
-
-pub struct MeshLoader{
-	meshes:HashMap<RobloxAssetId,MeshWithSize>,
-	unions:HashMap<RobloxAssetId,rbx_dom_weak::WeakDom>,
-}
-impl MeshLoader{
-	pub fn new()->Self{
-		Self{
-			meshes:HashMap::new(),
-			unions:HashMap::new(),
-		}
-	}
-	pub fn insert_mesh(&mut self,asset_id:RobloxAssetId,mesh:MeshWithSize){
-		self.meshes.insert(asset_id,mesh);
-	}
-	pub fn insert_union(&mut self,asset_id:RobloxAssetId,union:rbx_dom_weak::WeakDom){
-		self.unions.insert(asset_id,union);
-	}
-}
-impl Loader for MeshLoader{
-	type Error=MeshError;
-	type Index<'a>=MeshIndex<'a>;
-	type Resource=MeshWithSize;
-	fn load(&mut self,index:Self::Index<'_>)->Result<Self::Resource,Self::Error>{
-		let mesh=match index.mesh_type{
-			MeshType::FileMesh=>{
-				let id:RobloxAssetId=index.content.parse()?;
-				let mesh_with_size=self.meshes.get(&id).ok_or(MeshError::NoMesh)?;
-				mesh_with_size.clone()
-			},
-			MeshType::Union{mut physics_data,mut mesh_data,size_float_bits,part_texture_description}=>{
-				// decode asset
-				let size=size_float_bits.map(f32::from_bits).into();
-				if !index.content.is_empty()&&(physics_data.is_empty()||mesh_data.is_empty()){
-					let id:RobloxAssetId=index.content.parse()?;
-					let dom=self.unions.get(&id).ok_or(MeshError::NoMesh)?;
-					let &[referent]=dom.root().children()else{
-						return Err(MeshError::OneChildPolicy);
-					};
-					let Some(instance)=dom.get_by_ref(referent)else{
-						return Err(MeshError::MissingInstance);
-					};
-					if physics_data.is_empty(){
-						if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=instance.properties.get(&static_ustr("PhysicsData")){
-							physics_data=data.as_ref();
-						}
-					}
-					if mesh_data.is_empty(){
-						if let Some(rbx_dom_weak::types::Variant::BinaryString(data))=instance.properties.get(&static_ustr("MeshData")){
-							mesh_data=data.as_ref();
-						}
-					}
-					strafesnet_rbx_loader::union::convert(physics_data,mesh_data,size,part_texture_description)?
-				}else{
-					strafesnet_rbx_loader::union::convert(physics_data,mesh_data,size,part_texture_description)?
-				}
-			},
-		};
-		Ok(mesh)
-	}
-}

combobulator/src/main.rs

@@ -1,165 +0,0 @@
-use tokio_stream::StreamExt;
-
-mod loader;
-mod nats_types;
-mod process;
-mod s3;
-
-const SUBJECT_MAPFIX_RELEASE:&str="maptest.mapfixes.release";
-const SUBJECT_SUBMISSION_BATCHRELEASE:&str="maptest.submissions.batchrelease";
-const SUBJECT_SEED:&str="maptest.combobulator.seed";
-
-#[derive(Debug)]
-pub enum StartupError{
-	NatsConnect(async_nats::ConnectError),
-	NatsGetStream(async_nats::jetstream::context::GetStreamError),
-	NatsConsumer(async_nats::jetstream::stream::ConsumerError),
-	NatsConsumerUpdate(async_nats::jetstream::stream::ConsumerUpdateError),
-	NatsStream(async_nats::jetstream::consumer::StreamError),
-}
-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{}
-
-#[expect(dead_code)]
-#[derive(Debug)]
-enum HandleMessageError{
-	Json(serde_json::Error),
-	UnknownSubject(String),
-	Process(process::Error),
-	Ack(async_nats::Error),
-	Publish(async_nats::jetstream::context::PublishError),
-}
-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{}
-
-fn from_slice<'a,T:serde::de::Deserialize<'a>>(slice:&'a [u8])->Result<T,HandleMessageError>{
-	serde_json::from_slice(slice).map_err(HandleMessageError::Json)
-}
-
-async fn handle_message(
-	processor:&process::Processor,
-	jetstream:&async_nats::jetstream::Context,
-	message:async_nats::jetstream::Message,
-)->Result<(),HandleMessageError>{
-	match message.subject.as_str(){
-		SUBJECT_MAPFIX_RELEASE=>{
-			let request:nats_types::ReleaseMapfixRequest=from_slice(&message.payload)?;
-			processor.handle_mapfix_release(request).await.map_err(HandleMessageError::Process)?;
-			message.ack().await.map_err(HandleMessageError::Ack)?;
-		},
-		SUBJECT_SUBMISSION_BATCHRELEASE=>{
-			// split batch into individual seed messages
-			let batch:nats_types::ReleaseSubmissionsBatchRequest=from_slice(&message.payload)?;
-			println!("[combobulator] Splitting batch release (operation {}, {} submissions)",
-				batch.OperationID,batch.Submissions.len());
-			for submission in batch.Submissions{
-				let seed=nats_types::SeedCombobulatorRequest{AssetID:submission.UploadedAssetID};
-				let payload=serde_json::to_vec(&seed).map_err(HandleMessageError::Json)?;
-				jetstream.publish(SUBJECT_SEED,payload.into())
-					.await.map_err(HandleMessageError::Publish)?;
-				println!("[combobulator] Queued seed for asset {}",seed.AssetID);
-			}
-			message.ack().await.map_err(HandleMessageError::Ack)?;
-		},
-		SUBJECT_SEED=>{
-			let request:nats_types::SeedCombobulatorRequest=from_slice(&message.payload)?;
-			processor.handle_seed(request).await.map_err(HandleMessageError::Process)?;
-			message.ack().await.map_err(HandleMessageError::Ack)?;
-		},
-		other=>return Err(HandleMessageError::UnknownSubject(other.to_owned())),
-	}
-
-	println!("[combobulator] Message processed and acked");
-	Ok(())
-}
-
-#[tokio::main]
-async fn main()->Result<(),StartupError>{
-	// roblox cookie api for downloading assets
-	let cookie=std::env::var("RBXCOOKIE").expect("RBXCOOKIE env required");
-	let cookie_context=rbx_asset::cookie::Context::new(rbx_asset::cookie::Cookie::new(cookie));
-
-	// s3
-	let s3_bucket=std::env::var("S3_BUCKET").expect("S3_BUCKET env required");
-	let s3_config=aws_config::load_defaults(aws_config::BehaviorVersion::latest()).await;
-	let s3_client=aws_sdk_s3::Client::new(&s3_config);
-	let s3_cache=s3::S3Cache::new(s3_client,s3_bucket);
-
-	let processor=process::Processor{
-		cookie_context,
-		s3:s3_cache,
-	};
-
-	// nats
-	let nats_host=std::env::var("NATS_HOST").expect("NATS_HOST env required");
-
-	const STREAM_NAME:&str="maptest";
-	const DURABLE_NAME:&str="combobulator";
-
-	let filter_subjects=vec![
-		SUBJECT_MAPFIX_RELEASE.to_owned(),
-		SUBJECT_SUBMISSION_BATCHRELEASE.to_owned(),
-		SUBJECT_SEED.to_owned(),
-	];
-
-	let nats_config=async_nats::jetstream::consumer::pull::Config{
-		name:Some(DURABLE_NAME.to_owned()),
-		durable_name:Some(DURABLE_NAME.to_owned()),
-		filter_subjects:filter_subjects.clone(),
-		ack_wait:std::time::Duration::from_secs(900), // 15 minutes for processing
-		max_deliver:5, // retry up to 5 times
-		..Default::default()
-	};
-
-	let nasty=async_nats::connect(nats_host).await.map_err(StartupError::NatsConnect)?;
-	let jetstream=async_nats::jetstream::new(nasty);
-	let stream=jetstream.get_stream(STREAM_NAME).await.map_err(StartupError::NatsGetStream)?;
-	let consumer=stream.get_or_create_consumer(DURABLE_NAME,nats_config.clone()).await.map_err(StartupError::NatsConsumer)?;
-
-	// update consumer config if filter subjects changed
-	if consumer.cached_info().config.filter_subjects!=filter_subjects{
-		stream.update_consumer(nats_config).await.map_err(StartupError::NatsConsumerUpdate)?;
-	}
-
-	let mut messages=consumer.messages().await.map_err(StartupError::NatsStream)?;
-
-	// SIGTERM graceful shutdown
-	let mut sig_term=tokio::signal::unix::signal(tokio::signal::unix::SignalKind::terminate())
-		.expect("Failed to create SIGTERM signal listener");
-
-	println!("[combobulator] Started, waiting for messages...");
-
-	// sequential processing loop - one message at a time
-	let main_loop=async{
-		while let Some(message_result)=messages.next().await{
-			match message_result{
-				Ok(message)=>{
-					match handle_message(&processor,&jetstream,message).await{
-						Ok(())=>println!("[combobulator] Success"),
-						Err(e)=>println!("[combobulator] Error: {e}"),
-					}
-				},
-				Err(e)=>println!("[combobulator] Message stream error: {e}"),
-			}
-		}
-	};
-
-	tokio::select!{
-		_=sig_term.recv()=>{
-			println!("[combobulator] Received SIGTERM, shutting down");
-		},
-		_=main_loop=>{
-			println!("[combobulator] Message stream ended");
-		},
-	};
-
-	Ok(())
-}

combobulator/src/nats_types.rs

@@ -1,35 +0,0 @@
-#[expect(nonstandard_style,dead_code)]
-#[derive(serde::Deserialize)]
-pub struct ReleaseMapfixRequest{
-	pub MapfixID:u64,
-	pub ModelID:u64,
-	pub ModelVersion:u64,
-	pub TargetAssetID:u64,
-}
-
-#[expect(nonstandard_style,dead_code)]
-#[derive(serde::Deserialize)]
-pub struct ReleaseSubmissionRequest{
-	pub SubmissionID:u64,
-	pub ReleaseDate:i64,
-	pub ModelID:u64,
-	pub ModelVersion:u64,
-	pub UploadedAssetID:u64,
-	pub DisplayName:String,
-	pub Creator:String,
-	pub GameID:u32,
-	pub Submitter:u64,
-}
-
-#[expect(nonstandard_style)]
-#[derive(serde::Deserialize)]
-pub struct ReleaseSubmissionsBatchRequest{
-	pub Submissions:Vec<ReleaseSubmissionRequest>,
-	pub OperationID:u32,
-}
-
-#[expect(nonstandard_style)]
-#[derive(serde::Deserialize,serde::Serialize)]
-pub struct SeedCombobulatorRequest{
-	pub AssetID:u64,
-}

combobulator/src/process.rs

@@ -1,280 +0,0 @@
-use std::io::Cursor;
-
-use crate::nats_types::ReleaseMapfixRequest;
-use crate::s3::S3Cache;
-
-use futures_util::stream::iter as stream_iter;
-use futures_util::{StreamExt,TryStreamExt};
-use strafesnet_deferred_loader::deferred_loader::LoadFailureMode;
-
-const CONCURRENT_REQUESTS:usize=16;
-
-#[expect(dead_code)]
-#[derive(Debug)]
-pub enum ConvertError{
-	IO(std::io::Error),
-	SNFMap(strafesnet_snf::map::Error),
-	RobloxLoadMesh(super::loader::MeshError),
-	RobloxLoadTexture(super::loader::TextureError),
-}
-impl std::fmt::Display for ConvertError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for ConvertError{}
-
-pub fn convert_to_snf(
-	dom:rbx_dom_weak::WeakDom,
-	mut mesh_loader:crate::loader::MeshLoader,
-	mut texture_loader:crate::loader::TextureLoader,
-)->Result<Vec<u8>,ConvertError>{
-	const FAILURE_MODE:LoadFailureMode=LoadFailureMode::DefaultToNone;
-
-	// run scripts
-	let model=strafesnet_rbx_loader::Model::new(dom);
-
-	let mut place=strafesnet_rbx_loader::Place::from(model);
-	// TODO: script errors report for burn down chart
-	let _script_errors=place.run_scripts().unwrap_or_else(|e|vec![e]);
-
-	// convert
-	let mut texture_deferred_loader=strafesnet_deferred_loader::deferred_loader::RenderConfigDeferredLoader::new();
-	let mut mesh_deferred_loader=strafesnet_deferred_loader::deferred_loader::MeshDeferredLoader::new();
-
-	let map_step1=strafesnet_rbx_loader::rbx::convert(
-		place.as_ref(),
-		&mut texture_deferred_loader,
-		&mut mesh_deferred_loader,
-	);
-
-	let meshpart_meshes=mesh_deferred_loader.into_meshes(&mut mesh_loader,FAILURE_MODE).map_err(ConvertError::RobloxLoadMesh)?;
-
-	let map_step2=map_step1.add_meshpart_meshes_and_calculate_attributes(meshpart_meshes);
-
-	let render_configs=texture_deferred_loader.into_render_configs(&mut texture_loader,FAILURE_MODE).map_err(ConvertError::RobloxLoadTexture)?;
-
-	// TODO: conversion error report for burn down chart
-	let (map,_convert_errors)=map_step2.add_render_configs_and_textures(render_configs);
-
-	let mut snf_buf=Vec::new();
-	strafesnet_snf::map::write_map(Cursor::new(&mut snf_buf),map).map_err(ConvertError::SNFMap)?;
-
-	Ok(snf_buf)
-}
-
-#[expect(dead_code)]
-#[derive(Debug)]
-pub enum Error{
-	ArchivedModel,
-	LoadDom(map_tool::roblox::LoadDomError),
-	DownloadAsset(map_tool::roblox::DownloadAssetError),
-	ConvertSnf(ConvertError),
-	S3Get(crate::s3::GetError),
-	S3Put(crate::s3::PutError),
-}
-impl std::fmt::Display for Error{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for Error{}
-
-pub struct Processor{
-	pub cookie_context:rbx_asset::cookie::Context,
-	pub s3:S3Cache,
-}
-
-impl Processor{
-	/// Download an asset, returning None if the asset is archived.
-	async fn download_asset(&self,asset_id:u64)->Result<Option<Vec<u8>>,Error>{
-		match map_tool::roblox::download_asset(&self.cookie_context,asset_id).await{
-			Ok(data)=>Ok(Some(data)),
-			Err(e)=>{
-				let s=format!("{e:?}");
-				if s.contains("Requested asset is archived"){
-					println!("[combobulator] Asset {asset_id} is archived, skipping");
-					Ok(None)
-				}else if s.contains("User is not authorized to access Asset"){
-					println!("[combobulator] User is not authorized to access Asset {asset_id}, skipping");
-					Ok(None)
-				}else if s.contains("Asset is not approved for the requester"){
-					println!("[combobulator] Asset {asset_id} is not approved for the requester, skipping");
-					Ok(None)
-				}else if s.contains("Request asset was not found"){
-					println!("[combobulator] Asset {asset_id} was not found, skipping");
-					Ok(None)
-				}else{
-					Err(Error::DownloadAsset(e))
-				}
-			}
-		}
-	}
-
-	/// Process a single model: extract assets, cache to S3, build SNF.
-	async fn process_model(&self,asset_id:u64)->Result<(),Error>{
-		println!("[combobulator] Downloading model {asset_id}");
-		let rbxl_bytes=self.download_asset(asset_id).await?
-			.ok_or(Error::ArchivedModel)?;
-
-		// decode dom
-		let dom=map_tool::roblox::load_dom(&rbxl_bytes)
-			.map_err(Error::LoadDom)?;
-
-		// extract unique assets from the file
-		let assets=map_tool::roblox::get_unique_assets(&dom);
-
-		// place textures into 'loader'
-		let texture_loader=crate::loader::TextureLoader::new();
-		// process textures: download, cache, convert to DDS
-		let texture_loader=stream_iter(assets.textures).map(async|id|{
-			let asset_id=id.0;
-			let dds_key=S3Cache::texture_dds_key(asset_id);
-
-			// fetch cached DDS
-			let dds=if let Some(dds)=self.s3.get(&dds_key).await.map_err(Error::S3Get)?{
-				dds
-			}else{
-				// check raw cache, download if missing
-				let raw_key=S3Cache::texture_raw_key(asset_id);
-				let dds_result=if let Some(data)=self.s3.get(&raw_key).await.map_err(Error::S3Get)?{
-					map_tool::roblox::convert_texture_to_dds(&data)
-				}else{
-					println!("[combobulator] Downloading texture {asset_id}");
-					let Some(data)=self.download_asset(asset_id).await? else{
-						return Ok(None);
-					};
-
-					// decode while we have ownership
-					let dds_result=map_tool::roblox::convert_texture_to_dds(&data);
-
-					self.s3.put(&raw_key,data).await.map_err(Error::S3Put)?;
-					dds_result
-				};
-
-				// handle error after cacheing data
-				let dds=match dds_result{
-					Ok(dds)=>dds,
-					Err(e)=>{
-						println!("[combobulator] Texture {asset_id} convert error: {e}");
-						return Ok(None);
-					}
-				};
-
-				self.s3.put(&dds_key,dds.clone()).await.map_err(Error::S3Put)?;
-
-				dds
-			};
-			println!("[combobulator] Texture {asset_id} processed");
-
-			Ok(Some((id,dds)))
-		})
-		.buffer_unordered(CONCURRENT_REQUESTS)
-		.try_fold(texture_loader,async|mut texture_loader,maybe_loaded_texture|{
-			if let Some((id,dds))=maybe_loaded_texture{
-				texture_loader.insert(id,dds);
-			}
-			Ok(texture_loader)
-		}).await?;
-
-		let mesh_loader=crate::loader::MeshLoader::new();
-		// process meshes
-		let mesh_loader=stream_iter(assets.meshes).map(async|id|{
-			let asset_id=id.0;
-			let mesh_key=S3Cache::mesh_key(asset_id);
-
-			let mesh_result=if let Some(data)=self.s3.get(&mesh_key).await.map_err(Error::S3Get)?{
-				strafesnet_rbx_loader::mesh::convert(&data)
-			}else{
-				println!("[combobulator] Downloading mesh {asset_id}");
-				let Some(data)=self.download_asset(asset_id).await? else{
-					return Ok(None);
-				};
-
-				// decode while we have ownership
-				let mesh_result=strafesnet_rbx_loader::mesh::convert(&data);
-
-				self.s3.put(&mesh_key,data.clone()).await.map_err(Error::S3Put)?;
-				mesh_result
-			};
-			println!("[combobulator] Mesh {asset_id} processed");
-
-			// handle error after cacheing data
-			match mesh_result{
-				Ok(mesh)=>Ok(Some((id,mesh))),
-				Err(e)=>{
-					println!("[combobulator] Mesh {asset_id} convert error: {e}");
-					Ok(None)
-				},
-			}
-		})
-		.buffer_unordered(CONCURRENT_REQUESTS)
-		.try_fold(mesh_loader,async|mut mesh_loader,maybe_loaded_mesh|{
-			if let Some((id,mesh))=maybe_loaded_mesh{
-				mesh_loader.insert_mesh(id,mesh);
-			}
-			Ok(mesh_loader)
-		}).await?;
-
-		// process unions
-		let mesh_loader=stream_iter(assets.unions).map(async|id|{
-			let asset_id=id.0;
-			let union_key=S3Cache::union_key(asset_id);
-
-			let union_result=if let Some(data)=self.s3.get(&union_key).await.map_err(Error::S3Get)?{
-				rbx_binary::from_reader(data.as_slice())
-			}else{
-				println!("[combobulator] Downloading union {asset_id}");
-				let Some(data)=self.download_asset(asset_id).await? else{
-					return Ok(None);
-				};
-
-				// decode the data while we have ownership
-				let union_result=rbx_binary::from_reader(data.as_slice());
-
-				self.s3.put(&union_key,data).await.map_err(Error::S3Put)?;
-				union_result
-			};
-			println!("[combobulator] Union {asset_id} processed");
-
-			// handle error after cacheing data
-			match union_result{
-				Ok(union)=>Ok(Some((id,union))),
-				Err(e)=>{
-					println!("[combobulator] Union {asset_id} convert error: {e}");
-					Ok(None)
-				},
-			}
-		})
-		.buffer_unordered(CONCURRENT_REQUESTS)
-		.try_fold(mesh_loader,async|mut mesh_loader,maybe_loaded_union|{
-			if let Some((id,union))=maybe_loaded_union{
-				mesh_loader.insert_union(id,union);
-			}
-			Ok(mesh_loader)
-		}).await?;
-
-		// convert to SNF and upload
-		println!("[combobulator] Converting to SNF");
-		let snf=convert_to_snf(dom,mesh_loader,texture_loader)
-			.map_err(Error::ConvertSnf)?;
-		let snf_key=S3Cache::snf_key(asset_id);
-		self.s3.put(&snf_key,snf).await.map_err(Error::S3Put)?;
-		println!("[combobulator] SNF uploaded to {snf_key}");
-
-		Ok(())
-	}
-
-	/// Handle a mapfix release message.
-	pub async fn handle_mapfix_release(&self,request:ReleaseMapfixRequest)->Result<(),Error>{
-		println!("[combobulator] Processing mapfix {} (asset {})",
-			request.MapfixID,request.TargetAssetID);
-		self.process_model(request.TargetAssetID).await
-	}
-
-	/// Handle a seed request (reprocess an existing map).
-	pub async fn handle_seed(&self,request:crate::nats_types::SeedCombobulatorRequest)->Result<(),Error>{
-		println!("[combobulator] Seeding asset {}",request.AssetID);
-		self.process_model(request.AssetID).await
-	}
-}

combobulator/src/s3.rs

@@ -1,96 +0,0 @@
-use aws_sdk_s3::Client;
-use aws_sdk_s3::primitives::ByteStream;
-
-#[expect(dead_code)]
-#[derive(Debug)]
-pub enum GetError{
-	Get(aws_sdk_s3::error::SdkError<aws_sdk_s3::operation::get_object::GetObjectError>),
-	Collect(aws_sdk_s3::primitives::ByteStreamError),
-}
-impl std::fmt::Display for GetError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for GetError{}
-
-#[expect(dead_code)]
-#[derive(Debug)]
-pub enum PutError{
-	Put(aws_sdk_s3::error::SdkError<aws_sdk_s3::operation::put_object::PutObjectError>),
-}
-impl std::fmt::Display for PutError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		write!(f,"{self:?}")
-	}
-}
-impl std::error::Error for PutError{}
-
-pub struct S3Cache{
-	client:Client,
-	bucket:String,
-}
-
-impl S3Cache{
-	pub fn new(client:Client,bucket:String)->Self{
-		Self{client,bucket}
-	}
-
-	/// Try to get a cached object. Returns None if the key doesn't exist.
-	pub async fn get(&self,key:&str)->Result<Option<Vec<u8>>,GetError>{
-		match self.client.get_object()
-			.bucket(&self.bucket)
-			.key(key)
-			.send()
-			.await
-		{
-			Ok(output)=>{
-				let bytes=output.body.collect().await.map_err(GetError::Collect)?;
-				Ok(Some(bytes.to_vec()))
-			},
-			Err(e)=>{
-				// check if it's a NoSuchKey error
-				if let aws_sdk_s3::error::SdkError::ServiceError(ref service_err)=e{
-					if service_err.err().is_no_such_key(){
-						return Ok(None);
-					}
-				}
-				Err(GetError::Get(e))
-			},
-		}
-	}
-
-	/// Put an object into S3.
-	pub async fn put(&self,key:&str,data:Vec<u8>)->Result<(),PutError>{
-		self.client.put_object()
-			.bucket(&self.bucket)
-			.key(key)
-			.body(ByteStream::from(data))
-			.send()
-			.await
-			.map_err(PutError::Put)?;
-		Ok(())
-	}
-
-	// S3 key helpers
-
-	pub fn texture_raw_key(asset_id:u64)->String{
-		format!("assets/textures/{asset_id}.raw")
-	}
-
-	pub fn texture_dds_key(asset_id:u64)->String{
-		format!("assets/textures/{asset_id}.dds")
-	}
-
-	pub fn mesh_key(asset_id:u64)->String{
-		format!("assets/meshes/{asset_id}")
-	}
-
-	pub fn union_key(asset_id:u64)->String{
-		format!("assets/unions/{asset_id}")
-	}
-
-	pub fn snf_key(model_id:u64)->String{
-		format!("maps/{model_id}.snfm")
-	}
-}

compose.yaml

@@ -34,7 +34,7 @@ services:
       "--data-rpc-host","dataservice:9000",
     ]
     env_file:
-      - /home/quat/auth-compose/strafesnet_staging.env
+      - ~/auth-compose/strafesnet_staging.env
     depends_on:
       - authrpc
       - nats
@@ -59,7 +59,7 @@ services:
       maptest-validator
     container_name: validation
     env_file:
-      - /home/quat/auth-compose/strafesnet_staging.env
+      - ~/auth-compose/strafesnet_staging.env
     environment:
       - ROBLOX_GROUP_ID=17032139 # "None" is special case string value
       - API_HOST_INTERNAL=http://submissions:8083/v1
@@ -105,7 +105,7 @@ services:
       - REDIS_ADDR=authredis:6379
       - RBX_GROUP_ID=17032139
     env_file:
-      - /home/quat/auth-compose/auth-service.env
+      - ~/auth-compose/auth-service.env
     depends_on:
       - authredis
     networks:
@@ -119,7 +119,7 @@ services:
     environment:
       - REDIS_ADDR=authredis:6379
     env_file:
-      - /home/quat/auth-compose/auth-service.env
+      - ~/auth-compose/auth-service.env
     depends_on:
       - authredis
     networks:

docs/docs.go

@@ -115,46 +115,6 @@ const docTemplate = `{
                     }
                 }
             }
-        },
-        "/map/{id}/snfm": {
-            "get": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
-                "description": "Redirects to a signed download URL for a map's SNFM file",
-                "tags": [
-                    "maps"
-                ],
-                "summary": "Download SNFM file",
-                "parameters": [
-                    {
-                        "type": "integer",
-                        "description": "Map ID",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "307": {
-                        "description": "Redirect to signed S3 URL"
-                    },
-                    "404": {
-                        "description": "Map not found",
-                        "schema": {
-                            "$ref": "#/definitions/Error"
-                        }
-                    },
-                    "default": {
-                        "description": "General error response",
-                        "schema": {
-                            "$ref": "#/definitions/Error"
-                        }
-                    }
-                }
-            }
         }
     },
     "definitions": {

docs/swagger.json

@@ -108,46 +108,6 @@
                     }
                 }
             }
-        },
-        "/map/{id}/snfm": {
-            "get": {
-                "security": [
-                    {
-                        "ApiKeyAuth": []
-                    }
-                ],
-                "description": "Redirects to a signed download URL for a map's SNFM file",
-                "tags": [
-                    "maps"
-                ],
-                "summary": "Download SNFM file",
-                "parameters": [
-                    {
-                        "type": "integer",
-                        "description": "Map ID",
-                        "name": "id",
-                        "in": "path",
-                        "required": true
-                    }
-                ],
-                "responses": {
-                    "307": {
-                        "description": "Redirect to signed S3 URL"
-                    },
-                    "404": {
-                        "description": "Map not found",
-                        "schema": {
-                            "$ref": "#/definitions/Error"
-                        }
-                    },
-                    "default": {
-                        "description": "General error response",
-                        "schema": {
-                            "$ref": "#/definitions/Error"
-                        }
-                    }
-                }
-            }
         }
     },
     "definitions": {

docs/swagger.yaml

@@ -133,31 +133,6 @@ paths:
       summary: Get map by ID
       tags:
       - maps
-  /map/{id}/snfm:
-    get:
-      description: Redirects to a signed download URL for a map's SNFM file
-      parameters:
-      - description: Map ID
-        in: path
-        name: id
-        required: true
-        type: integer
-      responses:
-        "307":
-          description: Redirect to signed S3 URL
-        "404":
-          description: Map not found
-          schema:
-            $ref: '#/definitions/Error'
-        default:
-          description: General error response
-          schema:
-            $ref: '#/definitions/Error'
-      security:
-      - ApiKeyAuth: []
-      summary: Download SNFM file
-      tags:
-      - maps
 securityDefinitions:
   ApiKeyAuth:
     in: header

generate.go

@@ -1,4 +1,4 @@
 package main
 
-//go:generate go run github.com/swaggo/swag/cmd/swag@latest init -g ./cmd/maps-service/service.go
+//go:generate swag init -g ./cmd/maps-service/service.go
 //go:generate go run github.com/ogen-go/ogen/cmd/ogen@latest --target pkg/api --clean openapi.yaml

go.mod

@@ -6,23 +6,22 @@ toolchain go1.24.5
 
 require (
 	git.itzana.me/StrafesNET/dev-service v0.0.0-20250628052121-92af8193b5ed
-	git.itzana.me/strafesnet/go-grpc v0.0.0-20260301211036-f2db3cb46e8c
+	git.itzana.me/strafesnet/go-grpc v0.0.0-20250815013325-1c84f73bdcb1
 	git.itzana.me/strafesnet/utils v0.0.0-20220716194944-d8ca164052f9
 	github.com/dchest/siphash v1.2.3
 	github.com/gin-gonic/gin v1.10.1
 	github.com/go-faster/errors v0.7.1
-	github.com/go-faster/jx v1.2.0
+	github.com/go-faster/jx v1.1.0
 	github.com/nats-io/nats.go v1.37.0
-	github.com/ogen-go/ogen v1.18.0
+	github.com/ogen-go/ogen v1.2.1
-	github.com/redis/go-redis/v9 v9.10.0
 	github.com/sirupsen/logrus v1.9.3
 	github.com/swaggo/files v1.0.1
 	github.com/swaggo/gin-swagger v1.6.0
 	github.com/swaggo/swag v1.16.6
 	github.com/urfave/cli/v2 v2.27.6
-	go.opentelemetry.io/otel v1.40.0
+	go.opentelemetry.io/otel v1.32.0
-	go.opentelemetry.io/otel/metric v1.40.0
+	go.opentelemetry.io/otel/metric v1.32.0
-	go.opentelemetry.io/otel/trace v1.40.0
+	go.opentelemetry.io/otel/trace v1.32.0
 	google.golang.org/grpc v1.48.0
 	gorm.io/driver/postgres v1.6.0
 	gorm.io/gorm v1.25.12
@@ -32,32 +31,11 @@ require (
 	github.com/KyleBanks/depth v1.2.1 // indirect
 	github.com/PuerkitoBio/purell v1.1.1 // indirect
 	github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
-	github.com/aws/aws-sdk-go-v2 v1.41.2 // indirect
-	github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.5 // indirect
-	github.com/aws/aws-sdk-go-v2/config v1.32.10 // indirect
-	github.com/aws/aws-sdk-go-v2/credentials v1.19.10 // indirect
-	github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.18 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.18 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.18 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 // indirect
-	github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.18 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.5 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.10 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.18 // indirect
-	github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.18 // indirect
-	github.com/aws/aws-sdk-go-v2/service/s3 v1.96.2 // indirect
-	github.com/aws/aws-sdk-go-v2/service/signin v1.0.6 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sso v1.30.11 // indirect
-	github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.15 // indirect
-	github.com/aws/aws-sdk-go-v2/service/sts v1.41.7 // indirect
-	github.com/aws/smithy-go v1.24.1 // indirect
 	github.com/bytedance/sonic v1.11.6 // indirect
 	github.com/bytedance/sonic/loader v0.1.1 // indirect
-	github.com/cespare/xxhash/v2 v2.3.0 // indirect
 	github.com/cloudwego/base64x v0.1.4 // indirect
 	github.com/cloudwego/iasm v0.2.0 // indirect
 	github.com/cpuguy83/go-md2man/v2 v2.0.5 // indirect
-	github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f // indirect
 	github.com/gabriel-vasile/mimetype v1.4.3 // indirect
 	github.com/gin-contrib/sse v0.1.0 // indirect
 	github.com/go-openapi/jsonpointer v0.19.5 // indirect
@@ -77,7 +55,7 @@ require (
 	github.com/jinzhu/now v1.1.5 // indirect
 	github.com/josharian/intern v1.0.0 // indirect
 	github.com/json-iterator/go v1.1.12 // indirect
-	github.com/klauspost/compress v1.18.1 // indirect
+	github.com/klauspost/compress v1.17.6 // indirect
 	github.com/klauspost/cpuid/v2 v2.2.7 // indirect
 	github.com/leodido/go-urn v1.4.0 // indirect
 	github.com/mailru/easyjson v0.7.6 // indirect
@@ -87,38 +65,36 @@ require (
 	github.com/nats-io/nuid v1.0.1 // indirect
 	github.com/pelletier/go-toml/v2 v2.2.2 // indirect
 	github.com/russross/blackfriday/v2 v2.1.0 // indirect
-	github.com/shopspring/decimal v1.4.0 // indirect
 	github.com/twitchyliquid64/golang-asm v0.15.1 // indirect
 	github.com/ugorji/go/codec v1.2.12 // indirect
 	github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 // indirect
-	go.opentelemetry.io/auto/sdk v1.2.1 // indirect
 	golang.org/x/arch v0.8.0 // indirect
-	golang.org/x/crypto v0.46.0 // indirect
+	golang.org/x/crypto v0.32.0 // indirect
-	golang.org/x/mod v0.31.0 // indirect
+	golang.org/x/mod v0.17.0 // indirect
-	golang.org/x/tools v0.40.0 // indirect
+	golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
 	google.golang.org/genproto v0.0.0-20200526211855-cb27e3aa2013 // indirect
 	google.golang.org/protobuf v1.34.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )
 
 require (
-	github.com/dlclark/regexp2 v1.11.5 // indirect
+	github.com/dlclark/regexp2 v1.11.0 // indirect
-	github.com/fatih/color v1.18.0 // indirect
+	github.com/fatih/color v1.17.0 // indirect
 	github.com/ghodss/yaml v1.0.0 // indirect
 	github.com/go-faster/yaml v0.4.6 // indirect
-	github.com/go-logr/logr v1.4.3 // indirect
+	github.com/go-logr/logr v1.4.2 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	//	github.com/golang/protobuf v1.5.4 // indirect
 	github.com/google/uuid v1.6.0 // indirect
-	github.com/mattn/go-colorable v0.1.14 // indirect
+	github.com/mattn/go-colorable v0.1.13 // indirect
 	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/segmentio/asm v1.2.1 // indirect
+	github.com/segmentio/asm v1.2.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
-	go.uber.org/zap v1.27.1 // indirect
+	go.uber.org/zap v1.27.0 // indirect
-	golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 // indirect
+	golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc // indirect
-	golang.org/x/net v0.48.0 // indirect
+	golang.org/x/net v0.34.0 // indirect
-	golang.org/x/sync v0.19.0 // indirect
+	golang.org/x/sync v0.12.0 // indirect
-	golang.org/x/sys v0.39.0 // indirect
+	golang.org/x/sys v0.29.0 // indirect
-	golang.org/x/text v0.32.0 // indirect
+	golang.org/x/text v0.23.0 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 )

go.sum

@@ -2,12 +2,8 @@ cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMT
 cloud.google.com/go v0.34.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
 git.itzana.me/StrafesNET/dev-service v0.0.0-20250628052121-92af8193b5ed h1:eGWIQx2AOrSsLC2dieuSs8MCliRE60tvpZnmxsTBtKc=
 git.itzana.me/StrafesNET/dev-service v0.0.0-20250628052121-92af8193b5ed/go.mod h1:KJal0K++M6HEzSry6JJ2iDPZtOQn5zSstNlDbU3X4Jg=
-git.itzana.me/strafesnet/go-grpc v0.0.0-20251228204118-c20dbb42afec h1:JSar9If1kzb02+Erp+zmSqHKWPPP2NqMQVK15pRmkLE=
+git.itzana.me/strafesnet/go-grpc v0.0.0-20250815013325-1c84f73bdcb1 h1:imXibfeYcae6og0TTDUFRQ3CQtstGjIoLbCn+pezD2o=
-git.itzana.me/strafesnet/go-grpc v0.0.0-20251228204118-c20dbb42afec/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs=
+git.itzana.me/strafesnet/go-grpc v0.0.0-20250815013325-1c84f73bdcb1/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs=
-git.itzana.me/strafesnet/go-grpc v0.0.0-20260301210537-0bea64387f6d h1:I73hWqmIcsSH90VHjwsg50v6emQkM0IAA04vb4wktBA=
-git.itzana.me/strafesnet/go-grpc v0.0.0-20260301210537-0bea64387f6d/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs=
-git.itzana.me/strafesnet/go-grpc v0.0.0-20260301211036-f2db3cb46e8c h1:sI50ymozoI+HFbxg1AOdCeWF6bJgpeP6OrnCvyjuQ9U=
-git.itzana.me/strafesnet/go-grpc v0.0.0-20260301211036-f2db3cb46e8c/go.mod h1:X7XTRUScRkBWq8q8bplbeso105RPDlnY7J6Wy1IwBMs=
 git.itzana.me/strafesnet/utils v0.0.0-20220716194944-d8ca164052f9 h1:7lU6jyR7S7Rhh1dnUp7GyIRHUTBXZagw8F4n4hOyxLw=
 git.itzana.me/strafesnet/utils v0.0.0-20220716194944-d8ca164052f9/go.mod h1:uyYerSieEt4v0MJCdPLppG0LtJ4Yj035vuTetWGsxjY=
 github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
@@ -18,56 +14,12 @@ github.com/PuerkitoBio/purell v1.1.1/go.mod h1:c11w/QuzBsJSee3cPx9rAFu61PvFxuPbt
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 h1:d+Bc7a5rLufV/sSk/8dngufqelfh6jnri85riMAaF/M=
 github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578/go.mod h1:uGdkoq3SwY9Y+13GIhn11/XLaGBb4BfwItxLd5jeuXE=
 github.com/antihax/optional v1.0.0/go.mod h1:uupD/76wgC+ih3iEmQUL+0Ugr19nfwCT1kdvxnR2qWY=
-github.com/aws/aws-sdk-go-v2 v1.41.2 h1:LuT2rzqNQsauaGkPK/7813XxcZ3o3yePY0Iy891T2ls=
-github.com/aws/aws-sdk-go-v2 v1.41.2/go.mod h1:IvvlAZQXvTXznUPfRVfryiG1fbzE2NGK6m9u39YQ+S4=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.5 h1:zWFmPmgw4sveAYi1mRqG+E/g0461cJ5M4bJ8/nc6d3Q=
-github.com/aws/aws-sdk-go-v2/aws/protocol/eventstream v1.7.5/go.mod h1:nVUlMLVV8ycXSb7mSkcNu9e3v/1TJq2RTlrPwhYWr5c=
-github.com/aws/aws-sdk-go-v2/config v1.32.10 h1:9DMthfO6XWZYLfzZglAgW5Fyou2nRI5CuV44sTedKBI=
-github.com/aws/aws-sdk-go-v2/config v1.32.10/go.mod h1:2rUIOnA2JaiqYmSKYmRJlcMWy6qTj1vuRFscppSBMcw=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.10 h1:EEhmEUFCE1Yhl7vDhNOI5OCL/iKMdkkYFTRpZXNw7m8=
-github.com/aws/aws-sdk-go-v2/credentials v1.19.10/go.mod h1:RnnlFCAlxQCkN2Q379B67USkBMu1PipEEiibzYN5UTE=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.18 h1:Ii4s+Sq3yDfaMLpjrJsqD6SmG/Wq/P5L/hw2qa78UAY=
-github.com/aws/aws-sdk-go-v2/feature/ec2/imds v1.18.18/go.mod h1:6x81qnY++ovptLE6nWQeWrpXxbnlIex+4H4eYYGcqfc=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.18 h1:F43zk1vemYIqPAwhjTjYIz0irU2EY7sOb/F5eJ3HuyM=
-github.com/aws/aws-sdk-go-v2/internal/configsources v1.4.18/go.mod h1:w1jdlZXrGKaJcNoL+Nnrj+k5wlpGXqnNrKoP22HvAug=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.18 h1:xCeWVjj0ki0l3nruoyP2slHsGArMxeiiaoPN5QZH6YQ=
-github.com/aws/aws-sdk-go-v2/internal/endpoints/v2 v2.7.18/go.mod h1:r/eLGuGCBw6l36ZRWiw6PaZwPXb6YOj+i/7MizNl5/k=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4 h1:WKuaxf++XKWlHWu9ECbMlha8WOEGm0OUEZqm4K/Gcfk=
-github.com/aws/aws-sdk-go-v2/internal/ini v1.8.4/go.mod h1:ZWy7j6v1vWGmPReu0iSGvRiise4YI5SkR3OHKTZ6Wuc=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.18 h1:eZioDaZGJ0tMM4gzmkNIO2aAoQd+je7Ug7TkvAzlmkU=
-github.com/aws/aws-sdk-go-v2/internal/v4a v1.4.18/go.mod h1:CCXwUKAJdoWr6/NcxZ+zsiPr6oH/Q5aTooRGYieAyj4=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.5 h1:CeY9LUdur+Dxoeldqoun6y4WtJ3RQtzk0JMP2gfUay0=
-github.com/aws/aws-sdk-go-v2/service/internal/accept-encoding v1.13.5/go.mod h1:AZLZf2fMaahW5s/wMRciu1sYbdsikT/UHwbUjOdEVTc=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.10 h1:fJvQ5mIBVfKtiyx0AHY6HeWcRX5LGANLpq8SVR+Uazs=
-github.com/aws/aws-sdk-go-v2/service/internal/checksum v1.9.10/go.mod h1:Kzm5e6OmNH8VMkgK9t+ry5jEih4Y8whqs+1hrkxim1I=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.18 h1:LTRCYFlnnKFlKsyIQxKhJuDuA3ZkrDQMRYm6rXiHlLY=
-github.com/aws/aws-sdk-go-v2/service/internal/presigned-url v1.13.18/go.mod h1:XhwkgGG6bHSd00nO/mexWTcTjgd6PjuvWQMqSn2UaEk=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.18 h1:/A/xDuZAVD2BpsS2fftFRo/NoEKQJ8YTnJDEHBy2Gtg=
-github.com/aws/aws-sdk-go-v2/service/internal/s3shared v1.19.18/go.mod h1:hWe9b4f+djUQGmyiGEeOnZv69dtMSgpDRIvNMvuvzvY=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.96.2 h1:M1A9AjcFwlxTLuf0Faj88L8Iqw0n/AJHjpZTQzMMsSc=
-github.com/aws/aws-sdk-go-v2/service/s3 v1.96.2/go.mod h1:KsdTV6Q9WKUZm2mNJnUFmIoXfZux91M3sr/a4REX8e0=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.6 h1:MzORe+J94I+hYu2a6XmV5yC9huoTv8NRcCrUNedDypQ=
-github.com/aws/aws-sdk-go-v2/service/signin v1.0.6/go.mod h1:hXzcHLARD7GeWnifd8j9RWqtfIgxj4/cAtIVIK7hg8g=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.11 h1:7oGD8KPfBOJGXiCoRKrrrQkbvCp8N++u36hrLMPey6o=
-github.com/aws/aws-sdk-go-v2/service/sso v1.30.11/go.mod h1:0DO9B5EUJQlIDif+XJRWCljZRKsAFKh3gpFz7UnDtOo=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.15 h1:edCcNp9eGIUDUCrzoCu1jWAXLGFIizeqkdkKgRlJwWc=
-github.com/aws/aws-sdk-go-v2/service/ssooidc v1.35.15/go.mod h1:lyRQKED9xWfgkYC/wmmYfv7iVIM68Z5OQ88ZdcV1QbU=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.7 h1:NITQpgo9A5NrDZ57uOWj+abvXSb83BbyggcUBVksN7c=
-github.com/aws/aws-sdk-go-v2/service/sts v1.41.7/go.mod h1:sks5UWBhEuWYDPdwlnRFn1w7xWdH29Jcpe+/PJQefEs=
-github.com/aws/smithy-go v1.24.1 h1:VbyeNfmYkWoxMVpGUAbQumkODcYmfMRfZ8yQiH30SK0=
-github.com/aws/smithy-go v1.24.1/go.mod h1:LEj2LM3rBRQJxPZTB4KuzZkaZYnZPnvgIhb4pu07mx0=
-github.com/bsm/ginkgo/v2 v2.12.0 h1:Ny8MWAHyOepLGlLKYmXG4IEkioBysk6GpaRTLC8zwWs=
-github.com/bsm/ginkgo/v2 v2.12.0/go.mod h1:SwYbGRRDovPVboqFv0tPTcG1sN61LM1Z4ARdbAV9g4c=
-github.com/bsm/gomega v1.27.10 h1:yeMWxP2pV2fG3FgAODIY8EiRE3dy0aeFYt4l7wh6yKA=
-github.com/bsm/gomega v1.27.10/go.mod h1:JyEr/xRbxbtgWNi8tIEVPUYZ5Dzef52k01W3YH0H+O0=
 github.com/bytedance/sonic v1.11.6 h1:oUp34TzMlL+OY1OUWxHqsdkgC/Zfc85zGqw9siXjrc0=
 github.com/bytedance/sonic v1.11.6/go.mod h1:LysEHSvpvDySVdC2f87zGWf6CIKJcAvqab1ZaiQtds4=
 github.com/bytedance/sonic/loader v0.1.1 h1:c+e5Pt1k/cy5wMveRDyk2X4B9hF4g7an8N3zCYjJFNM=
 github.com/bytedance/sonic/loader v0.1.1/go.mod h1:ncP89zfokxS5LZrJxl5z0UJcsk4M4yY2JpfqGeCtNLU=
 github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
 github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
-github.com/cespare/xxhash/v2 v2.3.0 h1:UL815xU9SqsFlibzuggzjXhog7bL6oX9BbNZnL2UFvs=
-github.com/cespare/xxhash/v2 v2.3.0/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs=
 github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
 github.com/cloudwego/base64x v0.1.4 h1:jwCgWpFanWmN8xoIUHa2rtzmkd5J2plF/dnLS6Xd/0Y=
 github.com/cloudwego/base64x v0.1.4/go.mod h1:0zlkT4Wn5C6NdauXdJRhSKRlJvmclQ1hhJgA0rcu/8w=
@@ -87,18 +39,16 @@ github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/dchest/siphash v1.2.3 h1:QXwFc8cFOR2dSa/gE6o/HokBMWtLUaNDVd+22aKHeEA=
 github.com/dchest/siphash v1.2.3/go.mod h1:0NvQU092bT0ipiFN++/rXm69QG9tVxLAlQHIXMPAkHc=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f h1:lO4WD4F/rVNCu3HqELle0jiPLLBs70cWOduZpkS1E78=
+github.com/dlclark/regexp2 v1.11.0 h1:G/nrcoOa7ZXlpoa/91N3X7mM3r8eIlMBBJZvsz/mxKI=
-github.com/dgryski/go-rendezvous v0.0.0-20200823014737-9f7001d12a5f/go.mod h1:cuUVRXasLTGF7a8hSLbxyZXjz+1KgoB3wDUb6vlszIc=
+github.com/dlclark/regexp2 v1.11.0/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
-github.com/dlclark/regexp2 v1.11.5 h1:Q/sSnsKerHeCkc/jSTNq1oCm7KiVgUMZRDUoRu0JQZQ=
-github.com/dlclark/regexp2 v1.11.5/go.mod h1:DHkYz0B9wPfa6wondMfaivmHpzrQ3v9q8cnmRbL6yW8=
 github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4=
 github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98=
 github.com/envoyproxy/go-control-plane v0.9.9-0.20201210154907-fd9021fe5dad/go.mod h1:cXg6YxExXjJnVBQHBLXeUAgxn2UodCpnH306RInaBQk=
 github.com/envoyproxy/go-control-plane v0.10.2-0.20220325020618-49ff273808a1/go.mod h1:KJwIaB5Mv44NWtYuAOFCVOjcI94vtpEz2JU/D2v6IjE=
 github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c=
-github.com/fatih/color v1.18.0 h1:S8gINlzdQ840/4pfAwic/ZE0djQEH3wM94VfqLTZcOM=
+github.com/fatih/color v1.17.0 h1:GlRw1BRJxkpqUCBKzKOw098ed57fEsKeNjpTe3cSjK4=
-github.com/fatih/color v1.18.0/go.mod h1:4FelSpRwEGDpQ12mAdzqdOukCy4u8WUtOY6lkT/6HfU=
+github.com/fatih/color v1.17.0/go.mod h1:YZ7TlrGPkiz6ku9fK3TLD/pl3CpsiFyu8N92HLgmosI=
 github.com/gabriel-vasile/mimetype v1.4.3 h1:in2uUcidCuFcDKtdcBxlR0rJ1+fsokWf+uqxgUFjbI0=
 github.com/gabriel-vasile/mimetype v1.4.3/go.mod h1:d8uq/6HKRL6CGdk+aubisF/M5GcPfT7nKyLpA0lbSSk=
 github.com/ghodss/yaml v1.0.0 h1:wQHKEahhL6wmXdzwWG11gIVCkOv05bNOh+Rxn0yngAk=
@@ -111,13 +61,13 @@ github.com/gin-gonic/gin v1.10.1 h1:T0ujvqyCSqRopADpgPgiTT63DUQVSfojyME59Ei63pQ=
 github.com/gin-gonic/gin v1.10.1/go.mod h1:4PMNQiOhvDRa013RKVbsiNwoyezlm2rm0uX/T7kzp5Y=
 github.com/go-faster/errors v0.7.1 h1:MkJTnDoEdi9pDabt1dpWf7AA8/BaSYZqibYyhZ20AYg=
 github.com/go-faster/errors v0.7.1/go.mod h1:5ySTjWFiphBs07IKuiL69nxdfd5+fzh1u7FPGZP2quo=
-github.com/go-faster/jx v1.2.0 h1:T2YHJPrFaYu21fJtUxC9GzmluKu8rVIFDwwGBKTDseI=
+github.com/go-faster/jx v1.1.0 h1:ZsW3wD+snOdmTDy9eIVgQdjUpXRRV4rqW8NS3t+20bg=
-github.com/go-faster/jx v1.2.0/go.mod h1:UWLOVDmMG597a5tBFPLIWJdUxz5/2emOpfsj9Neg0PE=
+github.com/go-faster/jx v1.1.0/go.mod h1:vKDNikrKoyUmpzaJ0OkIkRQClNHFX/nF3dnTJZb3skg=
 github.com/go-faster/yaml v0.4.6 h1:lOK/EhI04gCpPgPhgt0bChS6bvw7G3WwI8xxVe0sw9I=
 github.com/go-faster/yaml v0.4.6/go.mod h1:390dRIvV4zbnO7qC9FGo6YYutc+wyyUSHBgbXL52eXk=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.3 h1:CjnDlHq8ikf6E492q6eKboGOC0T8CDaOvkHCIg8idEI=
+github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.3/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/go-openapi/jsonpointer v0.19.3/go.mod h1:Pl9vOtqEWErmShwVjC8pYs9cog34VGT37dQOVbmoatg=
@@ -163,8 +113,8 @@ github.com/google/go-cmp v0.4.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/
 github.com/google/go-cmp v0.5.0/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.5/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.5.6/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
-github.com/google/go-cmp v0.7.0 h1:wk8382ETsv4JYUZwIsn6YpYiWiBsYLSJiTsyBybVuN8=
+github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.7.0/go.mod h1:pXiqmnSA92OHEEa9HXL2W4E7lf9JzCmGVUdgjX3N/iU=
+github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/gofuzz v1.0.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.1.2/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
 github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
@@ -188,8 +138,8 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
 github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
 github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
 github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
-github.com/klauspost/compress v1.18.1 h1:bcSGx7UbpBqMChDtsF28Lw6v/G94LPrrbMbdC3JH2co=
+github.com/klauspost/compress v1.17.6 h1:60eq2E/jlfwQXtvZEeBUYADs+BwKBWURIY+Gj2eRGjI=
-github.com/klauspost/compress v1.18.1/go.mod h1:ZQFFVG+MdnR0P+l6wpXgIL4NTtwiKIdBnrBd8Nrxr+0=
+github.com/klauspost/compress v1.17.6/go.mod h1:/dCuZOvVtNoHsyb+cuJD3itjs3NbnF6KH9zAO4BDxPM=
 github.com/klauspost/cpuid/v2 v2.0.9/go.mod h1:FInQzS24/EEf25PyTYn52gqo7WaD8xa0213Md/qVLRg=
 github.com/klauspost/cpuid/v2 v2.2.7 h1:ZWSB3igEs+d0qvnxR/ZBzXVmxkgt8DdzP6m9pfuVLDM=
 github.com/klauspost/cpuid/v2 v2.2.7/go.mod h1:Lcz8mBdAVJIBVzewtcLocK12l3Y+JytZYpaMropDUws=
@@ -207,8 +157,9 @@ github.com/mailru/easyjson v0.0.0-20190614124828-94de47d64c63/go.mod h1:C1wdFJiN
 github.com/mailru/easyjson v0.0.0-20190626092158-b2ccc519800e/go.mod h1:C1wdFJiN94OJF2b5HbByQZoLdCWB1Yqtg26g4irojpc=
 github.com/mailru/easyjson v0.7.6 h1:8yTIVnZgCoiM1TgqoeTl+LfU5Jg6/xL3QhGQnimLYnA=
 github.com/mailru/easyjson v0.7.6/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
-github.com/mattn/go-colorable v0.1.14 h1:9A9LHSqF/7dyVVX6g0U9cwm9pG3kP9gSzcuIPHPsaIE=
+github.com/mattn/go-colorable v0.1.13 h1:fFA4WZxdEF4tXPZVKMLwD8oUnCTTo08duU7wxecdEvA=
-github.com/mattn/go-colorable v0.1.14/go.mod h1:6LmQG8QLFO4G5z1gPvYEzlUgJ2wF+stgPZH1UqBm1s8=
+github.com/mattn/go-colorable v0.1.13/go.mod h1:7S9/ev0klgBDR4GtXTXX8a3vIGJpMovkB8vQcUbaXHg=
+github.com/mattn/go-isatty v0.0.16/go.mod h1:kYGgaQfpe5nmfYZH+SKPsOc2e4SrIfOl2e/yFXSvRLM=
 github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
 github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -223,24 +174,20 @@ github.com/nats-io/nkeys v0.4.7/go.mod h1:kqXRgRDPlGy7nGaEDMuYzmiJCIAAWDK0IMBtDm
 github.com/nats-io/nuid v1.0.1 h1:5iA8DT8V7q8WK2EScv2padNa/rTESc1KdnPw4TC2paw=
 github.com/nats-io/nuid v1.0.1/go.mod h1:19wcPz3Ph3q0Jbyiqsd0kePYG7A95tJPxeL+1OSON2c=
 github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
-github.com/ogen-go/ogen v1.18.0 h1:6RQ7lFBjOeNaUWu4getfqIh4GJbEY4hqKuzDtec/g60=
+github.com/ogen-go/ogen v1.2.1 h1:C5A0lvUMu2wl+eWIxnpXMWnuOJ26a2FyzR1CIC2qG0M=
-github.com/ogen-go/ogen v1.18.0/go.mod h1:dHFr2Wf6cA7tSxMI+zPC21UR5hAlDw8ZYUkK3PziURY=
+github.com/ogen-go/ogen v1.2.1/go.mod h1:P2zQdEu8UqaVRfD5GEFvl+9q63VjMLvDquq1wVbyInM=
 github.com/pelletier/go-toml/v2 v2.2.2 h1:aYUidT7k73Pcl9nb2gScu7NSrKCSHIDE89b3+6Wq+LM=
 github.com/pelletier/go-toml/v2 v2.2.2/go.mod h1:1t835xjRzz80PqgE6HHgN2JOsmgYu/h4qDAS4n929Rs=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
 github.com/prometheus/client_model v0.0.0-20190812154241-14fe0d1b01d4/go.mod h1:xMI15A0UPsDsEKsMN9yxemIoYk6Tm2C1GtYGdfGttqA=
-github.com/redis/go-redis/v9 v9.10.0 h1:FxwK3eV8p/CQa0Ch276C7u2d0eNC9kCmAYQ7mCXCzVs=
-github.com/redis/go-redis/v9 v9.10.0/go.mod h1:huWgSWd8mW6+m0VPhJjSSQ+d6Nh1VICQ6Q5lHuCH/Iw=
 github.com/rogpeppe/fastuuid v1.2.0/go.mod h1:jVj6XXZzXRy/MSR5jhDC/2q6DgLz+nrA6LYCDYWNEvQ=
 github.com/rogpeppe/go-internal v1.14.1 h1:UQB4HGPB6osV0SQTLymcB4TgvyWu6ZyliaW0tI/otEQ=
 github.com/rogpeppe/go-internal v1.14.1/go.mod h1:MaRKkUm5W0goXpeCfT7UZI6fk/L7L7so1lCWt35ZSgc=
 github.com/russross/blackfriday/v2 v2.1.0 h1:JIOH55/0cWyOuilr9/qlrm0BSXldqnqwMsf35Ld67mk=
 github.com/russross/blackfriday/v2 v2.1.0/go.mod h1:+Rmxgy9KzJVeS9/2gXHxylqXiyQDYRxCVz55jmeOWTM=
-github.com/segmentio/asm v1.2.1 h1:DTNbBqs57ioxAD4PrArqftgypG4/qNpXoJx8TVXxPR0=
+github.com/segmentio/asm v1.2.0 h1:9BQrFxC+YOHJlTlHGkTrFWf59nbL3XnCoFLTwDCI7ys=
-github.com/segmentio/asm v1.2.1/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
+github.com/segmentio/asm v1.2.0/go.mod h1:BqMnlJP91P8d+4ibuonYZw9mfnzI9HfxselHZr5aAcs=
-github.com/shopspring/decimal v1.4.0 h1:bxl37RwXBklmTi0C79JfXCEBD1cqqHt0bbgBAGFp81k=
-github.com/shopspring/decimal v1.4.0/go.mod h1:gawqmDU56v4yIKSwfBSFip1HdCCXN8/+DMd9qYNcwME=
 github.com/sirupsen/logrus v1.8.1/go.mod h1:yWOB1SBYBC5VeMP7gHvWumXLIWorT60ONWic61uBYv0=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
@@ -257,9 +204,8 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
 github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
 github.com/stretchr/testify v1.8.1/go.mod h1:w2LPCIKwWwSfY2zedu0+kehJoqGctiVI29o6fzry7u4=
 github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
 github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
-github.com/stretchr/testify v1.11.1 h1:7s2iGBzp5EwR7/aIZr8ao5+dra3wiQyKjjFuvgVKu7U=
-github.com/stretchr/testify v1.11.1/go.mod h1:wZwfW3scLgRK+23gO65QZefKpKQRnfz6sD981Nm4B6U=
 github.com/swaggo/files v1.0.1 h1:J1bVJ4XHZNq0I46UU90611i9/YzdrF7x92oX1ig5IdE=
 github.com/swaggo/files v1.0.1/go.mod h1:0qXmMNH6sXNf+73t65aKeB+ApmgxdnkQzVTAj2uaMUg=
 github.com/swaggo/gin-swagger v1.6.0 h1:y8sxvQ3E20/RCyrXeFfg60r6H0Z+SwpTjMYsMm+zy8M=
@@ -275,44 +221,36 @@ github.com/urfave/cli/v2 v2.27.6/go.mod h1:3Sevf16NykTbInEnD0yKkjDAeZDS0A6bzhBH5
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1 h1:gEOO8jv9F4OT7lGCjxCBTO/36wtF6j2nSip77qHd4x4=
 github.com/xrash/smetrics v0.0.0-20240521201337-686a1a2994c1/go.mod h1:Ohn+xnUBiLI6FVj/9LpzZWtj1/D6lUovWYBkxHVV3aM=
 github.com/yuin/goldmark v1.4.13/go.mod h1:6yULJ656Px+3vBD8DxQVa3kxgyrAnzto9xy5taEt/CY=
-go.opentelemetry.io/auto/sdk v1.2.1 h1:jXsnJ4Lmnqd11kwkBV2LgLoFMZKizbCi5fNZ/ipaZ64=
+go.opentelemetry.io/otel v1.32.0 h1:WnBN+Xjcteh0zdk01SVqV55d/m62NJLJdIyb4y/WO5U=
-go.opentelemetry.io/auto/sdk v1.2.1/go.mod h1:KRTj+aOaElaLi+wW1kO/DZRXwkF4C5xPbEe3ZiIhN7Y=
+go.opentelemetry.io/otel v1.32.0/go.mod h1:00DCVSB0RQcnzlwyTfqtxSm+DRr9hpYrHjNGiBHVQIg=
-go.opentelemetry.io/otel v1.39.0 h1:8yPrr/S0ND9QEfTfdP9V+SiwT4E0G7Y5MO7p85nis48=
+go.opentelemetry.io/otel/metric v1.32.0 h1:xV2umtmNcThh2/a/aCP+h64Xx5wsj8qqnkYZktzNa0M=
-go.opentelemetry.io/otel v1.39.0/go.mod h1:kLlFTywNWrFyEdH0oj2xK0bFYZtHRYUdv1NklR/tgc8=
+go.opentelemetry.io/otel/metric v1.32.0/go.mod h1:jH7CIbbK6SH2V2wE16W05BHCtIDzauciCRLoc/SyMv8=
-go.opentelemetry.io/otel v1.40.0 h1:oA5YeOcpRTXq6NN7frwmwFR0Cn3RhTVZvXsP4duvCms=
+go.opentelemetry.io/otel/trace v1.32.0 h1:WIC9mYrXf8TmY/EXuULKc8hR17vE+Hjv2cssQDe03fM=
-go.opentelemetry.io/otel v1.40.0/go.mod h1:IMb+uXZUKkMXdPddhwAHm6UfOwJyh4ct1ybIlV14J0g=
+go.opentelemetry.io/otel/trace v1.32.0/go.mod h1:+i4rkvCraA+tG6AzwloGaCtkx53Fa+L+V8e9a7YvhT8=
-go.opentelemetry.io/otel/metric v1.39.0 h1:d1UzonvEZriVfpNKEVmHXbdf909uGTOQjA0HF0Ls5Q0=
-go.opentelemetry.io/otel/metric v1.39.0/go.mod h1:jrZSWL33sD7bBxg1xjrqyDjnuzTUB0x1nBERXd7Ftcs=
-go.opentelemetry.io/otel/metric v1.40.0 h1:rcZe317KPftE2rstWIBitCdVp89A2HqjkxR3c11+p9g=
-go.opentelemetry.io/otel/metric v1.40.0/go.mod h1:ib/crwQH7N3r5kfiBZQbwrTge743UDc7DTFVZrrXnqc=
-go.opentelemetry.io/otel/trace v1.39.0 h1:2d2vfpEDmCJ5zVYz7ijaJdOF59xLomrvj7bjt6/qCJI=
-go.opentelemetry.io/otel/trace v1.39.0/go.mod h1:88w4/PnZSazkGzz/w84VHpQafiU4EtqqlVdxWy+rNOA=
-go.opentelemetry.io/otel/trace v1.40.0 h1:WA4etStDttCSYuhwvEa8OP8I5EWu24lkOzp+ZYblVjw=
-go.opentelemetry.io/otel/trace v1.40.0/go.mod h1:zeAhriXecNGP/s2SEG3+Y8X9ujcJOTqQ5RgdEJcawiA=
 go.opentelemetry.io/proto/otlp v0.7.0/go.mod h1:PqfVotwruBrMGOCsRd/89rSnXhoiJIqeYNgFYFoEGnI=
 go.uber.org/goleak v1.3.0 h1:2K3zAYmnTNqV73imy9J1T3WC+gmCePx2hEGkimedGto=
 go.uber.org/goleak v1.3.0/go.mod h1:CoHD4mav9JJNrW/WLlf7HGZPjdw8EucARQHekz1X6bE=
 go.uber.org/multierr v1.11.0 h1:blXXJkSxSSfBVBlC76pxqeO+LN3aDfLQo+309xJstO0=
 go.uber.org/multierr v1.11.0/go.mod h1:20+QtiLqy0Nd6FdQB9TLXag12DsQkrbs3htMFfDN80Y=
-go.uber.org/zap v1.27.1 h1:08RqriUEv8+ArZRYSTXy1LeBScaMpVSTBhCeaZYfMYc=
+go.uber.org/zap v1.27.0 h1:aJMhYGrd5QSmlpLMr2MftRKl7t8J8PTZPA732ud/XR8=
-go.uber.org/zap v1.27.1/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
+go.uber.org/zap v1.27.0/go.mod h1:GB2qFLM7cTU87MWRP2mPIjqfIDnGu+VIO4V/SdhGo2E=
 golang.org/x/arch v0.0.0-20210923205945-b76863e36670/go.mod h1:5om86z9Hs0C8fWVUuoMHwpExlXzs5Tkyp9hOrfG7pp8=
 golang.org/x/arch v0.8.0 h1:3wRIsP3pM4yUptoR96otTUOXI367OS0+c9eeRi9doIc=
 golang.org/x/arch v0.8.0/go.mod h1:FEVrYAQjsQXMVJ1nsMoVVXPZg6p2JE2mx8psSWTDQys=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20200622213623-75b288015ac9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto=
 golang.org/x/crypto v0.0.0-20210921155107-089bfa567519/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
-golang.org/x/crypto v0.46.0 h1:cKRW/pmt1pKAfetfu+RCEvjvZkA9RimPbh7bhFjGVBU=
+golang.org/x/crypto v0.32.0 h1:euUpcYgM8WcP71gNpTqQCn6rC2t6ULUPiOzfWaXVVfc=
-golang.org/x/crypto v0.46.0/go.mod h1:Evb/oLKmMraqjZ2iQTwDwvCtJkczlDuTmdJXoZVzqU0=
+golang.org/x/crypto v0.32.0/go.mod h1:ZnnJkOaASj8g0AjIduWNlq2NRxL0PlBrbKVyZ6V/Ugc=
 golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
-golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93 h1:fQsdNF2N+/YewlRZiricy4P1iimyPKZ/xwniHj8Q2a0=
+golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc h1:O9NuF4s+E/PvMIy+9IUZB9znFwUIXEWSstNjek6VpVg=
-golang.org/x/exp v0.0.0-20251219203646-944ab1f22d93/go.mod h1:EPRbTFwzwjXj9NpYyyrvenVh9Y+GFeEvMNh7Xuz7xgU=
+golang.org/x/exp v0.0.0-20240531132922-fd00a4e0eefc/go.mod h1:XtvwrStGgqGPLc4cjQfWqZHG1YFdYs6swckp8vpsjnc=
 golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE=
 golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU=
 golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc=
 golang.org/x/mod v0.6.0-dev.0.20220419223038-86c51ed26bb4/go.mod h1:jJ57K6gSWd91VN4djpZkiMVwK6gcyfeH4XE8wZrZaV4=
-golang.org/x/mod v0.31.0 h1:HaW9xtz0+kOcWKwli0ZXy79Ix+UW/vOfmWI5QVd2tgI=
+golang.org/x/mod v0.17.0 h1:zY54UmvipHiNd+pm+m0x9KhZ9hl1/7QNMyxXbc6ICqA=
-golang.org/x/mod v0.31.0/go.mod h1:43JraMp9cGx1Rx3AqioxrbrhNsLl2l/iNAvuBkrezpg=
+golang.org/x/mod v0.17.0/go.mod h1:hTbmBsO62+eylJbnUtE2MGJUyE7QWk4xUqPFrRgJ+7c=
 golang.org/x/net v0.0.0-20180724234803-3673e40ba225/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20180826012351-8a410e7b638d/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
 golang.org/x/net v0.0.0-20190108225652-1e06a53dbb7e/go.mod h1:mL1N/T3taQHkDXs73rZJwtUhF3w3ftmwwsq0BUmARs4=
@@ -326,8 +264,8 @@ golang.org/x/net v0.0.0-20210226172049-e18ecbb05110/go.mod h1:m0MpNAwzfU5UDzcl9v
 golang.org/x/net v0.0.0-20210421230115-4e50805a0758/go.mod h1:72T/g9IO56b78aLF+1Kcs5dz7/ng1VjMUvfKvpfy+jM=
 golang.org/x/net v0.0.0-20220722155237-a158d28d115b/go.mod h1:XRhObCWvk6IyKnWLug+ECip1KBveYUHfp+8e9klMJ9c=
 golang.org/x/net v0.7.0/go.mod h1:2Tu9+aMcznHK/AK1HMvgo6xiTLG5rD5rZLDS+rp2Bjs=
-golang.org/x/net v0.48.0 h1:zyQRTTrjc33Lhh0fBgT/H3oZq9WuvRR5gPC70xpDiQU=
+golang.org/x/net v0.34.0 h1:Mb7Mrk043xzHgnRM88suvJFwzVrRfHEHJEl5/71CKw0=
-golang.org/x/net v0.48.0/go.mod h1:+ndRgGjkh8FGtu1w1FGbEC31if4VrNVMuKTgcAAnQRY=
+golang.org/x/net v0.34.0/go.mod h1:di0qlW3YNM5oh6GqDGQr92MyTozJPmybPK4Ev/Gm31k=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
 golang.org/x/oauth2 v0.0.0-20200107190931-bf48bf16ab8d/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
 golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
@@ -335,8 +273,8 @@ golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJ
 golang.org/x/sync v0.0.0-20181221193216-37e7f081c4d4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20220722155255-886fb9371eb4/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
-golang.org/x/sync v0.19.0 h1:vV+1eWNmZ5geRlYjzm2adRgW2/mcpevXNg50YZtPCE4=
+golang.org/x/sync v0.12.0 h1:MHc5BpPuC30uJk597Ri8TV3CNZcTLu6B6z4lJy+g6Jw=
-golang.org/x/sync v0.19.0/go.mod h1:9KTHXmSnoGruLpwFjVSX0lNNA75CykiMECbovNTZqGI=
+golang.org/x/sync v0.12.0/go.mod h1:1dzgHSNfp02xaA81J2MS99Qcpr2w7fw1gpm99rleRqA=
 golang.org/x/sys v0.0.0-20180830151530-49385e6e1522/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
 golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
@@ -350,10 +288,11 @@ golang.org/x/sys v0.0.0-20210615035016-665e8c7367d1/go.mod h1:oPkhp1MJrh7nUepCBc
 golang.org/x/sys v0.0.0-20220520151302-bc2c85ada10a/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
+golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.39.0 h1:CvCKL8MeisomCi6qNZ+wbb0DN9E5AATixKsvNtMoMFk=
+golang.org/x/sys v0.29.0 h1:TPYlXGxvx1MGTn2GiZDhnjPA9wZzZeGKHHmKhHYvgaU=
-golang.org/x/sys v0.39.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
+golang.org/x/sys v0.29.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
 golang.org/x/term v0.5.0/go.mod h1:jMB1sMXY+tzblOD4FWmEbocvup2/aLOaQEp7JmGp78k=
@@ -362,8 +301,8 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
 golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
 golang.org/x/text v0.7.0/go.mod h1:mrYo+phRRbMaCq/xk9113O4dZlRixOauAjOtrjsXDZ8=
-golang.org/x/text v0.32.0 h1:ZD01bjUt1FQ9WJ0ClOL5vxgxOI/sVCNgX1YtKwcY0mU=
+golang.org/x/text v0.23.0 h1:D71I7dUrlY+VX0gQShAThNGHFxZ13dGLBHQLVl1mJlY=
-golang.org/x/text v0.32.0/go.mod h1:o/rUWzghvpD5TXrTIBuJU77MTaN0ljMWE47kxGJQ7jY=
+golang.org/x/text v0.23.0/go.mod h1:/BLNzu4aZCJ1+kcD0DNRotWKage4q2rGVAg4o22unh4=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190114222345-bf090417da8b/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20190226205152-f727befe758c/go.mod h1:9Yl7xja0Znq3iFh3HoIrodX9oNMXvdceNzlUR8zjMvY=
@@ -371,8 +310,8 @@ golang.org/x/tools v0.0.0-20190311212946-11955173bddd/go.mod h1:LCzVGOaR6xXOjkQ3
 golang.org/x/tools v0.0.0-20190524140312-2c0ae7006135/go.mod h1:RgjU9mgBXZiqYHBnxXauZ1Gv1EHHAz9KjViQ78xBX0Q=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.12/go.mod h1:hNGJHUnrk76NpqgfD5Aqm5Crs+Hm0VOH/i9J2+nxYbc=
-golang.org/x/tools v0.40.0 h1:yLkxfA+Qnul4cs9QA3KnlFu0lVmd8JJfoq+E41uSutA=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d h1:vU5i/LfpvrRCpgM/VPfJLg5KjxD3E+hfT1SH+d9zLwg=
-golang.org/x/tools v0.40.0/go.mod h1:Ik/tzLRlbscWpqqMRjyWYDisX8bG13FrdXp3o4Sr9lc=
+golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d/go.mod h1:aiJjzUbINMkxbQROHiO6hDPo2LHcIPhhQsa9DLh0yGk=
 golang.org/x/xerrors v0.0.0-20190717185122-a985d3407aa7/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
 golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=

openapi.yaml

@@ -14,41 +14,15 @@ tags:
     description: Long-running operations
   - name: Session
     description: Session queries
-  - name: Stats
-    description: Statistics queries
   - name: Submissions
     description: Submission operations
   - name: Scripts
     description: Script operations
   - name: ScriptPolicy
     description: Script policy operations
-  - name: Thumbnails
-    description: Thumbnail operations
-  - name: Users
-    description: User operations
 security:
   - cookieAuth: []
 paths:
-  /stats:
-    get:
-      summary: Get aggregate statistics
-      operationId: getStats
-      tags:
-        - Stats
-      security: []
-      responses:
-        "200":
-          description: Successful response
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Stats"
-        default:
-          description: General Error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
   /session/user:
     get:
       summary: Get information about the currently logged in user
@@ -184,29 +158,6 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Error"
-  /maps/{MapID}/combobulate:
-    post:
-      summary: Queue a map for combobulator processing
-      operationId: combobulateMap
-      tags:
-        - Maps
-      parameters:
-      - name: MapID
-        in: path
-        required: true
-        schema:
-          type: integer
-          format: int64
-          minimum: 0
-      responses:
-        "204":
-          description: Successful response
-        default:
-          description: General Error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
   /maps/{MapID}/download:
     get:
       summary: Download the map asset
@@ -235,21 +186,6 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Error"
-  /maps-admin/seed-combobulator:
-    post:
-      summary: Queue all maps for combobulator processing
-      operationId: seedCombobulator
-      tags:
-        - Maps
-      responses:
-        "204":
-          description: Successful response
-        default:
-          description: General Error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
   /mapfixes:
     get:
       summary: Get list of mapfixes
@@ -485,30 +421,6 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Error"
-  /mapfixes/{MapfixID}/description:
-    patch:
-      summary: Update description (submitter only)
-      operationId: updateMapfixDescription
-      tags:
-        - Mapfixes
-      parameters:
-        - $ref: '#/components/parameters/MapfixID'
-      requestBody:
-        required: true
-        content:
-          text/plain:
-            schema:
-              type: string
-              maxLength: 256
-      responses:
-        "204":
-          description: Successful response
-        default:
-          description: General Error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
   /mapfixes/{MapfixID}/completed:
     post:
       summary: Called by maptest when a player completes the map
@@ -1526,222 +1438,6 @@ paths:
             application/json:
               schema:
                 $ref: "#/components/schemas/Error"
-  /thumbnails/assets:
-    post:
-      summary: Batch fetch asset thumbnails
-      operationId: batchAssetThumbnails
-      tags:
-        - Thumbnails
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              required:
-                - assetIds
-              properties:
-                assetIds:
-                  type: array
-                  items:
-                    type: integer
-                    format: uint64
-                  maxItems: 100
-                  description: Array of asset IDs (max 100)
-                size:
-                  type: string
-                  enum:
-                    - "150x150"
-                    - "420x420"
-                    - "768x432"
-                  default: "420x420"
-                  description: Thumbnail size
-      responses:
-        "200":
-          description: Successful response
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  thumbnails:
-                    type: object
-                    additionalProperties:
-                      type: string
-                    description: Map of asset ID to thumbnail URL
-        default:
-          description: General Error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-  /thumbnails/asset/{AssetID}:
-    get:
-      summary: Get single asset thumbnail
-      operationId: getAssetThumbnail
-      tags:
-        - Thumbnails
-      security: []
-      parameters:
-        - name: AssetID
-          in: path
-          required: true
-          schema:
-            type: integer
-            format: uint64
-        - name: size
-          in: query
-          schema:
-            type: string
-            enum:
-              - "150x150"
-              - "420x420"
-              - "768x432"
-            default: "420x420"
-      responses:
-        "302":
-          description: Redirect to thumbnail URL
-          headers:
-            Location:
-              description: URL to redirect to
-              schema:
-                type: string
-        default:
-          description: General Error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-  /thumbnails/users:
-    post:
-      summary: Batch fetch user avatar thumbnails
-      operationId: batchUserThumbnails
-      tags:
-        - Thumbnails
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              required:
-                - userIds
-              properties:
-                userIds:
-                  type: array
-                  items:
-                    type: integer
-                    format: uint64
-                  maxItems: 100
-                  description: Array of user IDs (max 100)
-                size:
-                  type: string
-                  enum:
-                    - "150x150"
-                    - "420x420"
-                    - "768x432"
-                  default: "150x150"
-                  description: Thumbnail size
-      responses:
-        "200":
-          description: Successful response
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  thumbnails:
-                    type: object
-                    additionalProperties:
-                      type: string
-                    description: Map of user ID to thumbnail URL
-        default:
-          description: General Error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-  /thumbnails/user/{UserID}:
-    get:
-      summary: Get single user avatar thumbnail
-      operationId: getUserThumbnail
-      tags:
-        - Thumbnails
-      security: []
-      parameters:
-        - name: UserID
-          in: path
-          required: true
-          schema:
-            type: integer
-            format: uint64
-        - name: size
-          in: query
-          schema:
-            type: string
-            enum:
-              - "150x150"
-              - "420x420"
-              - "768x432"
-            default: "150x150"
-      responses:
-        "302":
-          description: Redirect to thumbnail URL
-          headers:
-            Location:
-              description: URL to redirect to
-              schema:
-                type: string
-        default:
-          description: General Error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
-  /usernames:
-    post:
-      summary: Batch fetch usernames
-      operationId: batchUsernames
-      tags:
-        - Users
-      security: []
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              required:
-                - userIds
-              properties:
-                userIds:
-                  type: array
-                  items:
-                    type: integer
-                    format: uint64
-                  maxItems: 100
-                  description: Array of user IDs (max 100)
-      responses:
-        "200":
-          description: Successful response
-          content:
-            application/json:
-              schema:
-                type: object
-                properties:
-                  usernames:
-                    type: object
-                    additionalProperties:
-                      type: string
-                    description: Map of user ID to username
-        default:
-          description: General Error
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Error"
 components:
   securitySchemes:
     cookieAuth:
@@ -2365,47 +2061,6 @@ components:
           type: integer
           format: int32
           minimum: 0
-    Stats:
-      description: Aggregate statistics for submissions and mapfixes
-      type: object
-      properties:
-        TotalSubmissions:
-          type: integer
-          format: int64
-          minimum: 0
-          description: Total number of submissions
-        TotalMapfixes:
-          type: integer
-          format: int64
-          minimum: 0
-          description: Total number of mapfixes
-        ReleasedSubmissions:
-          type: integer
-          format: int64
-          minimum: 0
-          description: Number of released submissions
-        ReleasedMapfixes:
-          type: integer
-          format: int64
-          minimum: 0
-          description: Number of released mapfixes
-        SubmittedSubmissions:
-          type: integer
-          format: int64
-          minimum: 0
-          description: Number of submissions under review
-        SubmittedMapfixes:
-          type: integer
-          format: int64
-          minimum: 0
-          description: Number of mapfixes under review
-      required:
-        - TotalSubmissions
-        - TotalMapfixes
-        - ReleasedSubmissions
-        - ReleasedMapfixes
-        - SubmittedSubmissions
-        - SubmittedMapfixes
     Error:
       description: Represents error object
       type: object

pkg/api/oas_cfg_gen.go

@@ -4,16 +4,15 @@ package api
 
 import (
 	"net/http"
-	"strings"
+
+	"go.opentelemetry.io/otel"
+	"go.opentelemetry.io/otel/metric"
+	"go.opentelemetry.io/otel/trace"
 
 	ht "github.com/ogen-go/ogen/http"
 	"github.com/ogen-go/ogen/middleware"
 	"github.com/ogen-go/ogen/ogenerrors"
 	"github.com/ogen-go/ogen/otelogen"
-	"go.opentelemetry.io/otel"
-	"go.opentelemetry.io/otel/attribute"
-	"go.opentelemetry.io/otel/metric"
-	"go.opentelemetry.io/otel/trace"
 )
 
 var (
@@ -33,7 +32,6 @@ type otelConfig struct {
 	Tracer         trace.Tracer
 	MeterProvider  metric.MeterProvider
 	Meter          metric.Meter
-	Attributes     []attribute.KeyValue
 }
 
 func (cfg *otelConfig) initOTEL() {
@@ -83,8 +81,18 @@ func (o otelOptionFunc) applyServer(c *serverConfig) {
 
 func newServerConfig(opts ...ServerOption) serverConfig {
 	cfg := serverConfig{
-		NotFound:           http.NotFound,
+		NotFound: http.NotFound,
-		MethodNotAllowed:   nil,
+		MethodNotAllowed: func(w http.ResponseWriter, r *http.Request, allowed string) {
+			status := http.StatusMethodNotAllowed
+			if r.Method == "OPTIONS" {
+				w.Header().Set("Access-Control-Allow-Methods", allowed)
+				w.Header().Set("Access-Control-Allow-Headers", "Content-Type")
+				status = http.StatusNoContent
+			} else {
+				w.Header().Set("Allow", allowed)
+			}
+			w.WriteHeader(status)
+		},
 		ErrorHandler:       ogenerrors.DefaultErrorHandler,
 		Middleware:         nil,
 		MaxMultipartMemory: 32 << 20, // 32 MB
@@ -107,44 +115,8 @@ func (s baseServer) notFound(w http.ResponseWriter, r *http.Request) {
 	s.cfg.NotFound(w, r)
 }
 
-type notAllowedParams struct {
+func (s baseServer) notAllowed(w http.ResponseWriter, r *http.Request, allowed string) {
-	allowedMethods string
+	s.cfg.MethodNotAllowed(w, r, allowed)
-	allowedHeaders map[string]string
-	acceptPost     string
-	acceptPatch    string
-}
-
-func (s baseServer) notAllowed(w http.ResponseWriter, r *http.Request, params notAllowedParams) {
-	h := w.Header()
-	isOptions := r.Method == "OPTIONS"
-	if isOptions {
-		h.Set("Access-Control-Allow-Methods", params.allowedMethods)
-		if params.allowedHeaders != nil {
-			m := r.Header.Get("Access-Control-Request-Method")
-			if m != "" {
-				allowedHeaders, ok := params.allowedHeaders[strings.ToUpper(m)]
-				if ok {
-					h.Set("Access-Control-Allow-Headers", allowedHeaders)
-				}
-			}
-		}
-		if params.acceptPost != "" {
-			h.Set("Accept-Post", params.acceptPost)
-		}
-		if params.acceptPatch != "" {
-			h.Set("Accept-Patch", params.acceptPatch)
-		}
-	}
-	if s.cfg.MethodNotAllowed != nil {
-		s.cfg.MethodNotAllowed(w, r, params.allowedMethods)
-		return
-	}
-	status := http.StatusNoContent
-	if !isOptions {
-		h.Set("Allow", params.allowedMethods)
-		status = http.StatusMethodNotAllowed
-	}
-	w.WriteHeader(status)
 }
 
 func (cfg serverConfig) baseServer() (s baseServer, err error) {
@@ -243,13 +215,6 @@ func WithMeterProvider(provider metric.MeterProvider) Option {
 	})
 }
 
-// WithAttributes specifies default otel attributes.
-func WithAttributes(attributes ...attribute.KeyValue) Option {
-	return otelOptionFunc(func(cfg *otelConfig) {
-		cfg.Attributes = attributes
-	})
-}
-
 // WithClient specifies http client to use.
 func WithClient(client ht.Client) ClientOption {
 	return optionFunc[clientConfig](func(cfg *clientConfig) {

pkg/api/oas_defaults_gen.go

@@ -1,19 +0,0 @@
-// Code generated by ogen, DO NOT EDIT.
-
-package api
-
-// setDefaults set default value of fields.
-func (s *BatchAssetThumbnailsReq) setDefaults() {
-	{
-		val := BatchAssetThumbnailsReqSize("420x420")
-		s.Size.SetTo(val)
-	}
-}
-
-// setDefaults set default value of fields.
-func (s *BatchUserThumbnailsReq) setDefaults() {
-	{
-		val := BatchUserThumbnailsReqSize("150x150")
-		s.Size.SetTo(val)
-	}
-}

pkg/api/oas_operations_gen.go

@@ -30,10 +30,6 @@ const (
 	ActionSubmissionTriggerUploadOperation          OperationName = "ActionSubmissionTriggerUpload"
 	ActionSubmissionTriggerValidateOperation        OperationName = "ActionSubmissionTriggerValidate"
 	ActionSubmissionValidatedOperation              OperationName = "ActionSubmissionValidated"
-	BatchAssetThumbnailsOperation                   OperationName = "BatchAssetThumbnails"
-	BatchUserThumbnailsOperation                    OperationName = "BatchUserThumbnails"
-	BatchUsernamesOperation                         OperationName = "BatchUsernames"
-	CombobulateMapOperation                         OperationName = "CombobulateMap"
 	CreateMapfixOperation                           OperationName = "CreateMapfix"
 	CreateMapfixAuditCommentOperation               OperationName = "CreateMapfixAuditComment"
 	CreateScriptOperation                           OperationName = "CreateScript"
@@ -44,15 +40,12 @@ const (
 	DeleteScriptOperation                           OperationName = "DeleteScript"
 	DeleteScriptPolicyOperation                     OperationName = "DeleteScriptPolicy"
 	DownloadMapAssetOperation                       OperationName = "DownloadMapAsset"
-	GetAssetThumbnailOperation                      OperationName = "GetAssetThumbnail"
 	GetMapOperation                                 OperationName = "GetMap"
 	GetMapfixOperation                              OperationName = "GetMapfix"
 	GetOperationOperation                           OperationName = "GetOperation"
 	GetScriptOperation                              OperationName = "GetScript"
 	GetScriptPolicyOperation                        OperationName = "GetScriptPolicy"
-	GetStatsOperation                               OperationName = "GetStats"
 	GetSubmissionOperation                          OperationName = "GetSubmission"
-	GetUserThumbnailOperation                       OperationName = "GetUserThumbnail"
 	ListMapfixAuditEventsOperation                  OperationName = "ListMapfixAuditEvents"
 	ListMapfixesOperation                           OperationName = "ListMapfixes"
 	ListMapsOperation                               OperationName = "ListMaps"
@@ -61,13 +54,11 @@ const (
 	ListSubmissionAuditEventsOperation              OperationName = "ListSubmissionAuditEvents"
 	ListSubmissionsOperation                        OperationName = "ListSubmissions"
 	ReleaseSubmissionsOperation                     OperationName = "ReleaseSubmissions"
-	SeedCombobulatorOperation                       OperationName = "SeedCombobulator"
 	SessionRolesOperation                           OperationName = "SessionRoles"
 	SessionUserOperation                            OperationName = "SessionUser"
 	SessionValidateOperation                        OperationName = "SessionValidate"
 	SetMapfixCompletedOperation                     OperationName = "SetMapfixCompleted"
 	SetSubmissionCompletedOperation                 OperationName = "SetSubmissionCompleted"
-	UpdateMapfixDescriptionOperation                OperationName = "UpdateMapfixDescription"
 	UpdateMapfixModelOperation                      OperationName = "UpdateMapfixModel"
 	UpdateScriptOperation                           OperationName = "UpdateScript"
 	UpdateScriptPolicyOperation                     OperationName = "UpdateScriptPolicy"

pkg/api/oas_request_decoders_gen.go

@@ -3,7 +3,6 @@
 package api
 
 import (
-	"bytes"
 	"fmt"
 	"io"
 	"mime"
@@ -11,250 +10,13 @@ import (
 
 	"github.com/go-faster/errors"
 	"github.com/go-faster/jx"
+
 	"github.com/ogen-go/ogen/ogenerrors"
 	"github.com/ogen-go/ogen/validate"
 )
 
-func (s *Server) decodeBatchAssetThumbnailsRequest(r *http.Request) (
-	req *BatchAssetThumbnailsReq,
-	rawBody []byte,
-	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 = errors.Join(merr, c())
-		}
-		return merr
-	}
-	defer func() {
-		if rerr != nil {
-			rerr = errors.Join(rerr, close())
-		}
-	}()
-	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
-	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
-	}
-	switch {
-	case ct == "application/json":
-		if r.ContentLength == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
-		}
-		buf, err := io.ReadAll(r.Body)
-		defer func() {
-			_ = r.Body.Close()
-		}()
-		if err != nil {
-			return req, rawBody, close, err
-		}
-
-		// Reset the body to allow for downstream reading.
-		r.Body = io.NopCloser(bytes.NewBuffer(buf))
-
-		if len(buf) == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
-		}
-
-		rawBody = append(rawBody, buf...)
-		d := jx.DecodeBytes(buf)
-
-		var request BatchAssetThumbnailsReq
-		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, rawBody, close, err
-		}
-		if err := func() error {
-			if err := request.Validate(); err != nil {
-				return err
-			}
-			return nil
-		}(); err != nil {
-			return req, rawBody, close, errors.Wrap(err, "validate")
-		}
-		return &request, rawBody, close, nil
-	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
-	}
-}
-
-func (s *Server) decodeBatchUserThumbnailsRequest(r *http.Request) (
-	req *BatchUserThumbnailsReq,
-	rawBody []byte,
-	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 = errors.Join(merr, c())
-		}
-		return merr
-	}
-	defer func() {
-		if rerr != nil {
-			rerr = errors.Join(rerr, close())
-		}
-	}()
-	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
-	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
-	}
-	switch {
-	case ct == "application/json":
-		if r.ContentLength == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
-		}
-		buf, err := io.ReadAll(r.Body)
-		defer func() {
-			_ = r.Body.Close()
-		}()
-		if err != nil {
-			return req, rawBody, close, err
-		}
-
-		// Reset the body to allow for downstream reading.
-		r.Body = io.NopCloser(bytes.NewBuffer(buf))
-
-		if len(buf) == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
-		}
-
-		rawBody = append(rawBody, buf...)
-		d := jx.DecodeBytes(buf)
-
-		var request BatchUserThumbnailsReq
-		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, rawBody, close, err
-		}
-		if err := func() error {
-			if err := request.Validate(); err != nil {
-				return err
-			}
-			return nil
-		}(); err != nil {
-			return req, rawBody, close, errors.Wrap(err, "validate")
-		}
-		return &request, rawBody, close, nil
-	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
-	}
-}
-
-func (s *Server) decodeBatchUsernamesRequest(r *http.Request) (
-	req *BatchUsernamesReq,
-	rawBody []byte,
-	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 = errors.Join(merr, c())
-		}
-		return merr
-	}
-	defer func() {
-		if rerr != nil {
-			rerr = errors.Join(rerr, close())
-		}
-	}()
-	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
-	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
-	}
-	switch {
-	case ct == "application/json":
-		if r.ContentLength == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
-		}
-		buf, err := io.ReadAll(r.Body)
-		defer func() {
-			_ = r.Body.Close()
-		}()
-		if err != nil {
-			return req, rawBody, close, err
-		}
-
-		// Reset the body to allow for downstream reading.
-		r.Body = io.NopCloser(bytes.NewBuffer(buf))
-
-		if len(buf) == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
-		}
-
-		rawBody = append(rawBody, buf...)
-		d := jx.DecodeBytes(buf)
-
-		var request BatchUsernamesReq
-		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, rawBody, close, err
-		}
-		if err := func() error {
-			if err := request.Validate(); err != nil {
-				return err
-			}
-			return nil
-		}(); err != nil {
-			return req, rawBody, close, errors.Wrap(err, "validate")
-		}
-		return &request, rawBody, close, nil
-	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
-	}
-}
-
 func (s *Server) decodeCreateMapfixRequest(r *http.Request) (
 	req *MapfixTriggerCreate,
-	rawBody []byte,
 	close func() error,
 	rerr error,
 ) {
@@ -275,29 +37,22 @@ func (s *Server) decodeCreateMapfixRequest(r *http.Request) (
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
 	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
+		return req, close, errors.Wrap(err, "parse media type")
 	}
 	switch {
 	case ct == "application/json":
 		if r.ContentLength == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 		buf, err := io.ReadAll(r.Body)
-		defer func() {
-			_ = r.Body.Close()
-		}()
 		if err != nil {
-			return req, rawBody, close, err
+			return req, close, err
 		}
 
-		// Reset the body to allow for downstream reading.
-		r.Body = io.NopCloser(bytes.NewBuffer(buf))
-
 		if len(buf) == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 
-		rawBody = append(rawBody, buf...)
 		d := jx.DecodeBytes(buf)
 
 		var request MapfixTriggerCreate
@@ -315,7 +70,7 @@ func (s *Server) decodeCreateMapfixRequest(r *http.Request) (
 				Body:        buf,
 				Err:         err,
 			}
-			return req, rawBody, close, err
+			return req, close, err
 		}
 		if err := func() error {
 			if err := request.Validate(); err != nil {
@@ -323,17 +78,16 @@ func (s *Server) decodeCreateMapfixRequest(r *http.Request) (
 			}
 			return nil
 		}(); err != nil {
-			return req, rawBody, close, errors.Wrap(err, "validate")
+			return req, close, errors.Wrap(err, "validate")
 		}
-		return &request, rawBody, close, nil
+		return &request, close, nil
 	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
+		return req, close, validate.InvalidContentType(ct)
 	}
 }
 
 func (s *Server) decodeCreateMapfixAuditCommentRequest(r *http.Request) (
 	req CreateMapfixAuditCommentReq,
-	rawBody []byte,
 	close func() error,
 	rerr error,
 ) {
@@ -354,21 +108,20 @@ func (s *Server) decodeCreateMapfixAuditCommentRequest(r *http.Request) (
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
 	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
+		return req, close, errors.Wrap(err, "parse media type")
 	}
 	switch {
 	case ct == "text/plain":
 		reader := r.Body
 		request := CreateMapfixAuditCommentReq{Data: reader}
-		return request, rawBody, close, nil
+		return request, close, nil
 	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
+		return req, close, validate.InvalidContentType(ct)
 	}
 }
 
 func (s *Server) decodeCreateScriptRequest(r *http.Request) (
 	req *ScriptCreate,
-	rawBody []byte,
 	close func() error,
 	rerr error,
 ) {
@@ -389,29 +142,22 @@ func (s *Server) decodeCreateScriptRequest(r *http.Request) (
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
 	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
+		return req, close, errors.Wrap(err, "parse media type")
 	}
 	switch {
 	case ct == "application/json":
 		if r.ContentLength == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 		buf, err := io.ReadAll(r.Body)
-		defer func() {
-			_ = r.Body.Close()
-		}()
 		if err != nil {
-			return req, rawBody, close, err
+			return req, close, err
 		}
 
-		// Reset the body to allow for downstream reading.
-		r.Body = io.NopCloser(bytes.NewBuffer(buf))
-
 		if len(buf) == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 
-		rawBody = append(rawBody, buf...)
 		d := jx.DecodeBytes(buf)
 
 		var request ScriptCreate
@@ -429,7 +175,7 @@ func (s *Server) decodeCreateScriptRequest(r *http.Request) (
 				Body:        buf,
 				Err:         err,
 			}
-			return req, rawBody, close, err
+			return req, close, err
 		}
 		if err := func() error {
 			if err := request.Validate(); err != nil {
@@ -437,17 +183,16 @@ func (s *Server) decodeCreateScriptRequest(r *http.Request) (
 			}
 			return nil
 		}(); err != nil {
-			return req, rawBody, close, errors.Wrap(err, "validate")
+			return req, close, errors.Wrap(err, "validate")
 		}
-		return &request, rawBody, close, nil
+		return &request, close, nil
 	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
+		return req, close, validate.InvalidContentType(ct)
 	}
 }
 
 func (s *Server) decodeCreateScriptPolicyRequest(r *http.Request) (
 	req *ScriptPolicyCreate,
-	rawBody []byte,
 	close func() error,
 	rerr error,
 ) {
@@ -468,29 +213,22 @@ func (s *Server) decodeCreateScriptPolicyRequest(r *http.Request) (
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
 	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
+		return req, close, errors.Wrap(err, "parse media type")
 	}
 	switch {
 	case ct == "application/json":
 		if r.ContentLength == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 		buf, err := io.ReadAll(r.Body)
-		defer func() {
-			_ = r.Body.Close()
-		}()
 		if err != nil {
-			return req, rawBody, close, err
+			return req, close, err
 		}
 
-		// Reset the body to allow for downstream reading.
-		r.Body = io.NopCloser(bytes.NewBuffer(buf))
-
 		if len(buf) == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 
-		rawBody = append(rawBody, buf...)
 		d := jx.DecodeBytes(buf)
 
 		var request ScriptPolicyCreate
@@ -508,7 +246,7 @@ func (s *Server) decodeCreateScriptPolicyRequest(r *http.Request) (
 				Body:        buf,
 				Err:         err,
 			}
-			return req, rawBody, close, err
+			return req, close, err
 		}
 		if err := func() error {
 			if err := request.Validate(); err != nil {
@@ -516,17 +254,16 @@ func (s *Server) decodeCreateScriptPolicyRequest(r *http.Request) (
 			}
 			return nil
 		}(); err != nil {
-			return req, rawBody, close, errors.Wrap(err, "validate")
+			return req, close, errors.Wrap(err, "validate")
 		}
-		return &request, rawBody, close, nil
+		return &request, close, nil
 	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
+		return req, close, validate.InvalidContentType(ct)
 	}
 }
 
 func (s *Server) decodeCreateSubmissionRequest(r *http.Request) (
 	req *SubmissionTriggerCreate,
-	rawBody []byte,
 	close func() error,
 	rerr error,
 ) {
@@ -547,29 +284,22 @@ func (s *Server) decodeCreateSubmissionRequest(r *http.Request) (
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
 	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
+		return req, close, errors.Wrap(err, "parse media type")
 	}
 	switch {
 	case ct == "application/json":
 		if r.ContentLength == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 		buf, err := io.ReadAll(r.Body)
-		defer func() {
-			_ = r.Body.Close()
-		}()
 		if err != nil {
-			return req, rawBody, close, err
+			return req, close, err
 		}
 
-		// Reset the body to allow for downstream reading.
-		r.Body = io.NopCloser(bytes.NewBuffer(buf))
-
 		if len(buf) == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 
-		rawBody = append(rawBody, buf...)
 		d := jx.DecodeBytes(buf)
 
 		var request SubmissionTriggerCreate
@@ -587,7 +317,7 @@ func (s *Server) decodeCreateSubmissionRequest(r *http.Request) (
 				Body:        buf,
 				Err:         err,
 			}
-			return req, rawBody, close, err
+			return req, close, err
 		}
 		if err := func() error {
 			if err := request.Validate(); err != nil {
@@ -595,17 +325,16 @@ func (s *Server) decodeCreateSubmissionRequest(r *http.Request) (
 			}
 			return nil
 		}(); err != nil {
-			return req, rawBody, close, errors.Wrap(err, "validate")
+			return req, close, errors.Wrap(err, "validate")
 		}
-		return &request, rawBody, close, nil
+		return &request, close, nil
 	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
+		return req, close, validate.InvalidContentType(ct)
 	}
 }
 
 func (s *Server) decodeCreateSubmissionAdminRequest(r *http.Request) (
 	req *SubmissionTriggerCreate,
-	rawBody []byte,
 	close func() error,
 	rerr error,
 ) {
@@ -626,29 +355,22 @@ func (s *Server) decodeCreateSubmissionAdminRequest(r *http.Request) (
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
 	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
+		return req, close, errors.Wrap(err, "parse media type")
 	}
 	switch {
 	case ct == "application/json":
 		if r.ContentLength == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 		buf, err := io.ReadAll(r.Body)
-		defer func() {
-			_ = r.Body.Close()
-		}()
 		if err != nil {
-			return req, rawBody, close, err
+			return req, close, err
 		}
 
-		// Reset the body to allow for downstream reading.
-		r.Body = io.NopCloser(bytes.NewBuffer(buf))
-
 		if len(buf) == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 
-		rawBody = append(rawBody, buf...)
 		d := jx.DecodeBytes(buf)
 
 		var request SubmissionTriggerCreate
@@ -666,7 +388,7 @@ func (s *Server) decodeCreateSubmissionAdminRequest(r *http.Request) (
 				Body:        buf,
 				Err:         err,
 			}
-			return req, rawBody, close, err
+			return req, close, err
 		}
 		if err := func() error {
 			if err := request.Validate(); err != nil {
@@ -674,17 +396,16 @@ func (s *Server) decodeCreateSubmissionAdminRequest(r *http.Request) (
 			}
 			return nil
 		}(); err != nil {
-			return req, rawBody, close, errors.Wrap(err, "validate")
+			return req, close, errors.Wrap(err, "validate")
 		}
-		return &request, rawBody, close, nil
+		return &request, close, nil
 	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
+		return req, close, validate.InvalidContentType(ct)
 	}
 }
 
 func (s *Server) decodeCreateSubmissionAuditCommentRequest(r *http.Request) (
 	req CreateSubmissionAuditCommentReq,
-	rawBody []byte,
 	close func() error,
 	rerr error,
 ) {
@@ -705,21 +426,20 @@ func (s *Server) decodeCreateSubmissionAuditCommentRequest(r *http.Request) (
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
 	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
+		return req, close, errors.Wrap(err, "parse media type")
 	}
 	switch {
 	case ct == "text/plain":
 		reader := r.Body
 		request := CreateSubmissionAuditCommentReq{Data: reader}
-		return request, rawBody, close, nil
+		return request, close, nil
 	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
+		return req, close, validate.InvalidContentType(ct)
 	}
 }
 
 func (s *Server) decodeReleaseSubmissionsRequest(r *http.Request) (
 	req []ReleaseInfo,
-	rawBody []byte,
 	close func() error,
 	rerr error,
 ) {
@@ -740,29 +460,22 @@ func (s *Server) decodeReleaseSubmissionsRequest(r *http.Request) (
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
 	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
+		return req, close, errors.Wrap(err, "parse media type")
 	}
 	switch {
 	case ct == "application/json":
 		if r.ContentLength == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 		buf, err := io.ReadAll(r.Body)
-		defer func() {
-			_ = r.Body.Close()
-		}()
 		if err != nil {
-			return req, rawBody, close, err
+			return req, close, err
 		}
 
-		// Reset the body to allow for downstream reading.
-		r.Body = io.NopCloser(bytes.NewBuffer(buf))
-
 		if len(buf) == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 
-		rawBody = append(rawBody, buf...)
 		d := jx.DecodeBytes(buf)
 
 		var request []ReleaseInfo
@@ -788,7 +501,7 @@ func (s *Server) decodeReleaseSubmissionsRequest(r *http.Request) (
 				Body:        buf,
 				Err:         err,
 			}
-			return req, rawBody, close, err
+			return req, close, err
 		}
 		if err := func() error {
 			if request == nil {
@@ -821,52 +534,16 @@ func (s *Server) decodeReleaseSubmissionsRequest(r *http.Request) (
 			}
 			return nil
 		}(); err != nil {
-			return req, rawBody, close, errors.Wrap(err, "validate")
+			return req, close, errors.Wrap(err, "validate")
 		}
-		return request, rawBody, close, nil
+		return request, close, nil
 	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
+		return req, close, validate.InvalidContentType(ct)
-	}
-}
-
-func (s *Server) decodeUpdateMapfixDescriptionRequest(r *http.Request) (
-	req UpdateMapfixDescriptionReq,
-	rawBody []byte,
-	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 = errors.Join(merr, c())
-		}
-		return merr
-	}
-	defer func() {
-		if rerr != nil {
-			rerr = errors.Join(rerr, close())
-		}
-	}()
-	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
-	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
-	}
-	switch {
-	case ct == "text/plain":
-		reader := r.Body
-		request := UpdateMapfixDescriptionReq{Data: reader}
-		return request, rawBody, close, nil
-	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
 	}
 }
 
 func (s *Server) decodeUpdateScriptRequest(r *http.Request) (
 	req *ScriptUpdate,
-	rawBody []byte,
 	close func() error,
 	rerr error,
 ) {
@@ -887,29 +564,22 @@ func (s *Server) decodeUpdateScriptRequest(r *http.Request) (
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
 	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
+		return req, close, errors.Wrap(err, "parse media type")
 	}
 	switch {
 	case ct == "application/json":
 		if r.ContentLength == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 		buf, err := io.ReadAll(r.Body)
-		defer func() {
-			_ = r.Body.Close()
-		}()
 		if err != nil {
-			return req, rawBody, close, err
+			return req, close, err
 		}
 
-		// Reset the body to allow for downstream reading.
-		r.Body = io.NopCloser(bytes.NewBuffer(buf))
-
 		if len(buf) == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 
-		rawBody = append(rawBody, buf...)
 		d := jx.DecodeBytes(buf)
 
 		var request ScriptUpdate
@@ -927,7 +597,7 @@ func (s *Server) decodeUpdateScriptRequest(r *http.Request) (
 				Body:        buf,
 				Err:         err,
 			}
-			return req, rawBody, close, err
+			return req, close, err
 		}
 		if err := func() error {
 			if err := request.Validate(); err != nil {
@@ -935,17 +605,16 @@ func (s *Server) decodeUpdateScriptRequest(r *http.Request) (
 			}
 			return nil
 		}(); err != nil {
-			return req, rawBody, close, errors.Wrap(err, "validate")
+			return req, close, errors.Wrap(err, "validate")
 		}
-		return &request, rawBody, close, nil
+		return &request, close, nil
 	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
+		return req, close, validate.InvalidContentType(ct)
 	}
 }
 
 func (s *Server) decodeUpdateScriptPolicyRequest(r *http.Request) (
 	req *ScriptPolicyUpdate,
-	rawBody []byte,
 	close func() error,
 	rerr error,
 ) {
@@ -966,29 +635,22 @@ func (s *Server) decodeUpdateScriptPolicyRequest(r *http.Request) (
 	}()
 	ct, _, err := mime.ParseMediaType(r.Header.Get("Content-Type"))
 	if err != nil {
-		return req, rawBody, close, errors.Wrap(err, "parse media type")
+		return req, close, errors.Wrap(err, "parse media type")
 	}
 	switch {
 	case ct == "application/json":
 		if r.ContentLength == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 		buf, err := io.ReadAll(r.Body)
-		defer func() {
-			_ = r.Body.Close()
-		}()
 		if err != nil {
-			return req, rawBody, close, err
+			return req, close, err
 		}
 
-		// Reset the body to allow for downstream reading.
-		r.Body = io.NopCloser(bytes.NewBuffer(buf))
-
 		if len(buf) == 0 {
-			return req, rawBody, close, validate.ErrBodyRequired
+			return req, close, validate.ErrBodyRequired
 		}
 
-		rawBody = append(rawBody, buf...)
 		d := jx.DecodeBytes(buf)
 
 		var request ScriptPolicyUpdate
@@ -1006,7 +668,7 @@ func (s *Server) decodeUpdateScriptPolicyRequest(r *http.Request) (
 				Body:        buf,
 				Err:         err,
 			}
-			return req, rawBody, close, err
+			return req, close, err
 		}
 		if err := func() error {
 			if err := request.Validate(); err != nil {
@@ -1014,10 +676,10 @@ func (s *Server) decodeUpdateScriptPolicyRequest(r *http.Request) (
 			}
 			return nil
 		}(); err != nil {
-			return req, rawBody, close, errors.Wrap(err, "validate")
+			return req, close, errors.Wrap(err, "validate")
 		}
-		return &request, rawBody, close, nil
+		return &request, close, nil
 	default:
-		return req, rawBody, close, validate.InvalidContentType(ct)
+		return req, close, validate.InvalidContentType(ct)
 	}
 }

pkg/api/oas_request_encoders_gen.go

@@ -7,51 +7,10 @@ import (
 	"net/http"
 
 	"github.com/go-faster/jx"
+
 	ht "github.com/ogen-go/ogen/http"
 )
 
-func encodeBatchAssetThumbnailsRequest(
-	req *BatchAssetThumbnailsReq,
-	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 encodeBatchUserThumbnailsRequest(
-	req *BatchUserThumbnailsReq,
-	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 encodeBatchUsernamesRequest(
-	req *BatchUsernamesReq,
-	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 encodeCreateMapfixRequest(
 	req *MapfixTriggerCreate,
 	r *http.Request,
@@ -160,16 +119,6 @@ func encodeReleaseSubmissionsRequest(
 	return nil
 }
 
-func encodeUpdateMapfixDescriptionRequest(
-	req UpdateMapfixDescriptionReq,
-	r *http.Request,
-) error {
-	const contentType = "text/plain"
-	body := req
-	ht.SetBody(r, body, contentType)
-	return nil
-}
-
 func encodeUpdateScriptRequest(
 	req *ScriptUpdate,
 	r *http.Request,

pkg/api/oas_response_decoders_gen.go

@@ -11,9 +11,8 @@ import (
 
 	"github.com/go-faster/errors"
 	"github.com/go-faster/jx"
-	"github.com/ogen-go/ogen/conv"
+
 	"github.com/ogen-go/ogen/ogenerrors"
-	"github.com/ogen-go/ogen/uri"
 	"github.com/ogen-go/ogen/validate"
 )
 
@@ -1457,342 +1456,6 @@ func decodeActionSubmissionValidatedResponse(resp *http.Response) (res *ActionSu
 	return res, errors.Wrap(defRes, "error")
 }
 
-func decodeBatchAssetThumbnailsResponse(resp *http.Response) (res *BatchAssetThumbnailsOK, _ 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 BatchAssetThumbnailsOK
-			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 &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
-			}
-			// Validate response.
-			if err := func() error {
-				if err := response.Validate(); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "validate")
-			}
-			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 decodeBatchUserThumbnailsResponse(resp *http.Response) (res *BatchUserThumbnailsOK, _ 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 BatchUserThumbnailsOK
-			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 &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
-			}
-			// Validate response.
-			if err := func() error {
-				if err := response.Validate(); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "validate")
-			}
-			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 decodeBatchUsernamesResponse(resp *http.Response) (res *BatchUsernamesOK, _ 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 BatchUsernamesOK
-			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 &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
-			}
-			// Validate response.
-			if err := func() error {
-				if err := response.Validate(); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "validate")
-			}
-			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 decodeCombobulateMapResponse(resp *http.Response) (res *CombobulateMapNoContent, _ error) {
-	switch resp.StatusCode {
-	case 204:
-		// Code 204.
-		return &CombobulateMapNoContent{}, nil
-	}
-	// 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
-			}
-			// Validate response.
-			if err := func() error {
-				if err := response.Validate(); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "validate")
-			}
-			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 decodeCreateMapfixResponse(resp *http.Response) (res *OperationID, _ error) {
 	switch resp.StatusCode {
 	case 201:
@@ -2614,105 +2277,6 @@ func decodeDownloadMapAssetResponse(resp *http.Response) (res DownloadMapAssetOK
 	return res, errors.Wrap(defRes, "error")
 }
 
-func decodeGetAssetThumbnailResponse(resp *http.Response) (res *GetAssetThumbnailFound, _ error) {
-	switch resp.StatusCode {
-	case 302:
-		// Code 302.
-		var wrapper GetAssetThumbnailFound
-		h := uri.NewHeaderDecoder(resp.Header)
-		// Parse "Location" header.
-		{
-			cfg := uri.HeaderParameterDecodingConfig{
-				Name:    "Location",
-				Explode: false,
-			}
-			if err := func() error {
-				if err := h.HasParam(cfg); err == nil {
-					if err := h.DecodeParam(cfg, func(d uri.Decoder) error {
-						var wrapperDotLocationVal string
-						if err := func() error {
-							val, err := d.DecodeValue()
-							if err != nil {
-								return err
-							}
-
-							c, err := conv.ToString(val)
-							if err != nil {
-								return err
-							}
-
-							wrapperDotLocationVal = c
-							return nil
-						}(); err != nil {
-							return err
-						}
-						wrapper.Location.SetTo(wrapperDotLocationVal)
-						return nil
-					}); err != nil {
-						return err
-					}
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "parse Location header")
-			}
-		}
-		return &wrapper, nil
-	}
-	// 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
-			}
-			// Validate response.
-			if err := func() error {
-				if err := response.Validate(); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "validate")
-			}
-			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 decodeGetMapResponse(resp *http.Response) (res *Map, _ error) {
 	switch resp.StatusCode {
 	case 200:
@@ -3218,107 +2782,6 @@ func decodeGetScriptPolicyResponse(resp *http.Response) (res *ScriptPolicy, _ er
 	return res, errors.Wrap(defRes, "error")
 }
 
-func decodeGetStatsResponse(resp *http.Response) (res *Stats, _ 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 Stats
-			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
-			}
-			// Validate response.
-			if err := func() error {
-				if err := response.Validate(); err != nil {
-					return err
-				}
-				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
-			}
-			// Validate response.
-			if err := func() error {
-				if err := response.Validate(); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "validate")
-			}
-			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 decodeGetSubmissionResponse(resp *http.Response) (res *Submission, _ error) {
 	switch resp.StatusCode {
 	case 200:
@@ -3420,105 +2883,6 @@ func decodeGetSubmissionResponse(resp *http.Response) (res *Submission, _ error)
 	return res, errors.Wrap(defRes, "error")
 }
 
-func decodeGetUserThumbnailResponse(resp *http.Response) (res *GetUserThumbnailFound, _ error) {
-	switch resp.StatusCode {
-	case 302:
-		// Code 302.
-		var wrapper GetUserThumbnailFound
-		h := uri.NewHeaderDecoder(resp.Header)
-		// Parse "Location" header.
-		{
-			cfg := uri.HeaderParameterDecodingConfig{
-				Name:    "Location",
-				Explode: false,
-			}
-			if err := func() error {
-				if err := h.HasParam(cfg); err == nil {
-					if err := h.DecodeParam(cfg, func(d uri.Decoder) error {
-						var wrapperDotLocationVal string
-						if err := func() error {
-							val, err := d.DecodeValue()
-							if err != nil {
-								return err
-							}
-
-							c, err := conv.ToString(val)
-							if err != nil {
-								return err
-							}
-
-							wrapperDotLocationVal = c
-							return nil
-						}(); err != nil {
-							return err
-						}
-						wrapper.Location.SetTo(wrapperDotLocationVal)
-						return nil
-					}); err != nil {
-						return err
-					}
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "parse Location header")
-			}
-		}
-		return &wrapper, nil
-	}
-	// 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
-			}
-			// Validate response.
-			if err := func() error {
-				if err := response.Validate(); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "validate")
-			}
-			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 decodeListMapfixAuditEventsResponse(resp *http.Response) (res []AuditEvent, _ error) {
 	switch resp.StatusCode {
 	case 200:
@@ -4452,66 +3816,6 @@ func decodeReleaseSubmissionsResponse(resp *http.Response) (res *OperationID, _
 	return res, errors.Wrap(defRes, "error")
 }
 
-func decodeSeedCombobulatorResponse(resp *http.Response) (res *SeedCombobulatorNoContent, _ error) {
-	switch resp.StatusCode {
-	case 204:
-		// Code 204.
-		return &SeedCombobulatorNoContent{}, nil
-	}
-	// 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
-			}
-			// Validate response.
-			if err := func() error {
-				if err := response.Validate(); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "validate")
-			}
-			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 decodeSessionRolesResponse(resp *http.Response) (res *Roles, _ error) {
 	switch resp.StatusCode {
 	case 200:
@@ -4928,66 +4232,6 @@ func decodeSetSubmissionCompletedResponse(resp *http.Response) (res *SetSubmissi
 	return res, errors.Wrap(defRes, "error")
 }
 
-func decodeUpdateMapfixDescriptionResponse(resp *http.Response) (res *UpdateMapfixDescriptionNoContent, _ error) {
-	switch resp.StatusCode {
-	case 204:
-		// Code 204.
-		return &UpdateMapfixDescriptionNoContent{}, nil
-	}
-	// 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
-			}
-			// Validate response.
-			if err := func() error {
-				if err := response.Validate(); err != nil {
-					return err
-				}
-				return nil
-			}(); err != nil {
-				return res, errors.Wrap(err, "validate")
-			}
-			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 decodeUpdateMapfixModelResponse(resp *http.Response) (res *UpdateMapfixModelNoContent, _ error) {
 	switch resp.StatusCode {
 	case 204:

pkg/api/oas_response_encoders_gen.go

@@ -8,11 +8,10 @@ import (
 
 	"github.com/go-faster/errors"
 	"github.com/go-faster/jx"
-	"github.com/ogen-go/ogen/conv"
-	ht "github.com/ogen-go/ogen/http"
-	"github.com/ogen-go/ogen/uri"
 	"go.opentelemetry.io/otel/codes"
 	"go.opentelemetry.io/otel/trace"
+
+	ht "github.com/ogen-go/ogen/http"
 )
 
 func encodeActionMapfixAcceptedResponse(response *ActionMapfixAcceptedNoContent, w http.ResponseWriter, span trace.Span) error {
@@ -183,55 +182,6 @@ func encodeActionSubmissionValidatedResponse(response *ActionSubmissionValidated
 	return nil
 }
 
-func encodeBatchAssetThumbnailsResponse(response *BatchAssetThumbnailsOK, 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)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeBatchUserThumbnailsResponse(response *BatchUserThumbnailsOK, 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)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeBatchUsernamesResponse(response *BatchUsernamesOK, 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)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
-func encodeCombobulateMapResponse(response *CombobulateMapNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
 func encodeCreateMapfixResponse(response *OperationID, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(201)
@@ -346,33 +296,6 @@ func encodeDownloadMapAssetResponse(response DownloadMapAssetOK, w http.Response
 	return nil
 }
 
-func encodeGetAssetThumbnailResponse(response *GetAssetThumbnailFound, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Access-Control-Expose-Headers", "Location")
-	// Encoding response headers.
-	{
-		h := uri.NewHeaderEncoder(w.Header())
-		// Encode "Location" header.
-		{
-			cfg := uri.HeaderParameterEncodingConfig{
-				Name:    "Location",
-				Explode: false,
-			}
-			if err := h.EncodeParam(cfg, func(e uri.Encoder) error {
-				if val, ok := response.Location.Get(); ok {
-					return e.EncodeValue(conv.StringToString(val))
-				}
-				return nil
-			}); err != nil {
-				return errors.Wrap(err, "encode Location header")
-			}
-		}
-	}
-	w.WriteHeader(302)
-	span.SetStatus(codes.Ok, http.StatusText(302))
-
-	return nil
-}
-
 func encodeGetMapResponse(response *Map, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(200)
@@ -443,20 +366,6 @@ func encodeGetScriptPolicyResponse(response *ScriptPolicy, w http.ResponseWriter
 	return nil
 }
 
-func encodeGetStatsResponse(response *Stats, 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)
-	response.Encode(e)
-	if _, err := e.WriteTo(w); err != nil {
-		return errors.Wrap(err, "write")
-	}
-
-	return nil
-}
-
 func encodeGetSubmissionResponse(response *Submission, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(200)
@@ -471,33 +380,6 @@ func encodeGetSubmissionResponse(response *Submission, w http.ResponseWriter, sp
 	return nil
 }
 
-func encodeGetUserThumbnailResponse(response *GetUserThumbnailFound, w http.ResponseWriter, span trace.Span) error {
-	w.Header().Set("Access-Control-Expose-Headers", "Location")
-	// Encoding response headers.
-	{
-		h := uri.NewHeaderEncoder(w.Header())
-		// Encode "Location" header.
-		{
-			cfg := uri.HeaderParameterEncodingConfig{
-				Name:    "Location",
-				Explode: false,
-			}
-			if err := h.EncodeParam(cfg, func(e uri.Encoder) error {
-				if val, ok := response.Location.Get(); ok {
-					return e.EncodeValue(conv.StringToString(val))
-				}
-				return nil
-			}); err != nil {
-				return errors.Wrap(err, "encode Location header")
-			}
-		}
-	}
-	w.WriteHeader(302)
-	span.SetStatus(codes.Ok, http.StatusText(302))
-
-	return nil
-}
-
 func encodeListMapfixAuditEventsResponse(response []AuditEvent, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(200)
@@ -630,13 +512,6 @@ func encodeReleaseSubmissionsResponse(response *OperationID, w http.ResponseWrit
 	return nil
 }
 
-func encodeSeedCombobulatorResponse(response *SeedCombobulatorNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
 func encodeSessionRolesResponse(response *Roles, w http.ResponseWriter, span trace.Span) error {
 	w.Header().Set("Content-Type", "application/json; charset=utf-8")
 	w.WriteHeader(200)
@@ -693,13 +568,6 @@ func encodeSetSubmissionCompletedResponse(response *SetSubmissionCompletedNoCont
 	return nil
 }
 
-func encodeUpdateMapfixDescriptionResponse(response *UpdateMapfixDescriptionNoContent, w http.ResponseWriter, span trace.Span) error {
-	w.WriteHeader(204)
-	span.SetStatus(codes.Ok, http.StatusText(204))
-
-	return nil
-}
-
 func encodeUpdateMapfixModelResponse(response *UpdateMapfixModelNoContent, w http.ResponseWriter, span trace.Span) error {
 	w.WriteHeader(204)
 	span.SetStatus(codes.Ok, http.StatusText(204))

pkg/api/oas_schemas_gen.go

@@ -7,7 +7,6 @@ import (
 	"io"
 	"time"
 
-	"github.com/go-faster/errors"
 	"github.com/go-faster/jx"
 )
 
@@ -193,257 +192,6 @@ func (s *AuditEventEventData) init() AuditEventEventData {
 	return m
 }
 
-type BatchAssetThumbnailsOK struct {
-	// Map of asset ID to thumbnail URL.
-	Thumbnails OptBatchAssetThumbnailsOKThumbnails `json:"thumbnails"`
-}
-
-// GetThumbnails returns the value of Thumbnails.
-func (s *BatchAssetThumbnailsOK) GetThumbnails() OptBatchAssetThumbnailsOKThumbnails {
-	return s.Thumbnails
-}
-
-// SetThumbnails sets the value of Thumbnails.
-func (s *BatchAssetThumbnailsOK) SetThumbnails(val OptBatchAssetThumbnailsOKThumbnails) {
-	s.Thumbnails = val
-}
-
-// Map of asset ID to thumbnail URL.
-type BatchAssetThumbnailsOKThumbnails map[string]string
-
-func (s *BatchAssetThumbnailsOKThumbnails) init() BatchAssetThumbnailsOKThumbnails {
-	m := *s
-	if m == nil {
-		m = map[string]string{}
-		*s = m
-	}
-	return m
-}
-
-type BatchAssetThumbnailsReq struct {
-	// Array of asset IDs (max 100).
-	AssetIds []uint64 `json:"assetIds"`
-	// Thumbnail size.
-	Size OptBatchAssetThumbnailsReqSize `json:"size"`
-}
-
-// GetAssetIds returns the value of AssetIds.
-func (s *BatchAssetThumbnailsReq) GetAssetIds() []uint64 {
-	return s.AssetIds
-}
-
-// GetSize returns the value of Size.
-func (s *BatchAssetThumbnailsReq) GetSize() OptBatchAssetThumbnailsReqSize {
-	return s.Size
-}
-
-// SetAssetIds sets the value of AssetIds.
-func (s *BatchAssetThumbnailsReq) SetAssetIds(val []uint64) {
-	s.AssetIds = val
-}
-
-// SetSize sets the value of Size.
-func (s *BatchAssetThumbnailsReq) SetSize(val OptBatchAssetThumbnailsReqSize) {
-	s.Size = val
-}
-
-// Thumbnail size.
-type BatchAssetThumbnailsReqSize string
-
-const (
-	BatchAssetThumbnailsReqSize150x150 BatchAssetThumbnailsReqSize = "150x150"
-	BatchAssetThumbnailsReqSize420x420 BatchAssetThumbnailsReqSize = "420x420"
-	BatchAssetThumbnailsReqSize768x432 BatchAssetThumbnailsReqSize = "768x432"
-)
-
-// AllValues returns all BatchAssetThumbnailsReqSize values.
-func (BatchAssetThumbnailsReqSize) AllValues() []BatchAssetThumbnailsReqSize {
-	return []BatchAssetThumbnailsReqSize{
-		BatchAssetThumbnailsReqSize150x150,
-		BatchAssetThumbnailsReqSize420x420,
-		BatchAssetThumbnailsReqSize768x432,
-	}
-}
-
-// MarshalText implements encoding.TextMarshaler.
-func (s BatchAssetThumbnailsReqSize) MarshalText() ([]byte, error) {
-	switch s {
-	case BatchAssetThumbnailsReqSize150x150:
-		return []byte(s), nil
-	case BatchAssetThumbnailsReqSize420x420:
-		return []byte(s), nil
-	case BatchAssetThumbnailsReqSize768x432:
-		return []byte(s), nil
-	default:
-		return nil, errors.Errorf("invalid value: %q", s)
-	}
-}
-
-// UnmarshalText implements encoding.TextUnmarshaler.
-func (s *BatchAssetThumbnailsReqSize) UnmarshalText(data []byte) error {
-	switch BatchAssetThumbnailsReqSize(data) {
-	case BatchAssetThumbnailsReqSize150x150:
-		*s = BatchAssetThumbnailsReqSize150x150
-		return nil
-	case BatchAssetThumbnailsReqSize420x420:
-		*s = BatchAssetThumbnailsReqSize420x420
-		return nil
-	case BatchAssetThumbnailsReqSize768x432:
-		*s = BatchAssetThumbnailsReqSize768x432
-		return nil
-	default:
-		return errors.Errorf("invalid value: %q", data)
-	}
-}
-
-type BatchUserThumbnailsOK struct {
-	// Map of user ID to thumbnail URL.
-	Thumbnails OptBatchUserThumbnailsOKThumbnails `json:"thumbnails"`
-}
-
-// GetThumbnails returns the value of Thumbnails.
-func (s *BatchUserThumbnailsOK) GetThumbnails() OptBatchUserThumbnailsOKThumbnails {
-	return s.Thumbnails
-}
-
-// SetThumbnails sets the value of Thumbnails.
-func (s *BatchUserThumbnailsOK) SetThumbnails(val OptBatchUserThumbnailsOKThumbnails) {
-	s.Thumbnails = val
-}
-
-// Map of user ID to thumbnail URL.
-type BatchUserThumbnailsOKThumbnails map[string]string
-
-func (s *BatchUserThumbnailsOKThumbnails) init() BatchUserThumbnailsOKThumbnails {
-	m := *s
-	if m == nil {
-		m = map[string]string{}
-		*s = m
-	}
-	return m
-}
-
-type BatchUserThumbnailsReq struct {
-	// Array of user IDs (max 100).
-	UserIds []uint64 `json:"userIds"`
-	// Thumbnail size.
-	Size OptBatchUserThumbnailsReqSize `json:"size"`
-}
-
-// GetUserIds returns the value of UserIds.
-func (s *BatchUserThumbnailsReq) GetUserIds() []uint64 {
-	return s.UserIds
-}
-
-// GetSize returns the value of Size.
-func (s *BatchUserThumbnailsReq) GetSize() OptBatchUserThumbnailsReqSize {
-	return s.Size
-}
-
-// SetUserIds sets the value of UserIds.
-func (s *BatchUserThumbnailsReq) SetUserIds(val []uint64) {
-	s.UserIds = val
-}
-
-// SetSize sets the value of Size.
-func (s *BatchUserThumbnailsReq) SetSize(val OptBatchUserThumbnailsReqSize) {
-	s.Size = val
-}
-
-// Thumbnail size.
-type BatchUserThumbnailsReqSize string
-
-const (
-	BatchUserThumbnailsReqSize150x150 BatchUserThumbnailsReqSize = "150x150"
-	BatchUserThumbnailsReqSize420x420 BatchUserThumbnailsReqSize = "420x420"
-	BatchUserThumbnailsReqSize768x432 BatchUserThumbnailsReqSize = "768x432"
-)
-
-// AllValues returns all BatchUserThumbnailsReqSize values.
-func (BatchUserThumbnailsReqSize) AllValues() []BatchUserThumbnailsReqSize {
-	return []BatchUserThumbnailsReqSize{
-		BatchUserThumbnailsReqSize150x150,
-		BatchUserThumbnailsReqSize420x420,
-		BatchUserThumbnailsReqSize768x432,
-	}
-}
-
-// MarshalText implements encoding.TextMarshaler.
-func (s BatchUserThumbnailsReqSize) MarshalText() ([]byte, error) {
-	switch s {
-	case BatchUserThumbnailsReqSize150x150:
-		return []byte(s), nil
-	case BatchUserThumbnailsReqSize420x420:
-		return []byte(s), nil
-	case BatchUserThumbnailsReqSize768x432:
-		return []byte(s), nil
-	default:
-		return nil, errors.Errorf("invalid value: %q", s)
-	}
-}
-
-// UnmarshalText implements encoding.TextUnmarshaler.
-func (s *BatchUserThumbnailsReqSize) UnmarshalText(data []byte) error {
-	switch BatchUserThumbnailsReqSize(data) {
-	case BatchUserThumbnailsReqSize150x150:
-		*s = BatchUserThumbnailsReqSize150x150
-		return nil
-	case BatchUserThumbnailsReqSize420x420:
-		*s = BatchUserThumbnailsReqSize420x420
-		return nil
-	case BatchUserThumbnailsReqSize768x432:
-		*s = BatchUserThumbnailsReqSize768x432
-		return nil
-	default:
-		return errors.Errorf("invalid value: %q", data)
-	}
-}
-
-type BatchUsernamesOK struct {
-	// Map of user ID to username.
-	Usernames OptBatchUsernamesOKUsernames `json:"usernames"`
-}
-
-// GetUsernames returns the value of Usernames.
-func (s *BatchUsernamesOK) GetUsernames() OptBatchUsernamesOKUsernames {
-	return s.Usernames
-}
-
-// SetUsernames sets the value of Usernames.
-func (s *BatchUsernamesOK) SetUsernames(val OptBatchUsernamesOKUsernames) {
-	s.Usernames = val
-}
-
-// Map of user ID to username.
-type BatchUsernamesOKUsernames map[string]string
-
-func (s *BatchUsernamesOKUsernames) init() BatchUsernamesOKUsernames {
-	m := *s
-	if m == nil {
-		m = map[string]string{}
-		*s = m
-	}
-	return m
-}
-
-type BatchUsernamesReq struct {
-	// Array of user IDs (max 100).
-	UserIds []uint64 `json:"userIds"`
-}
-
-// GetUserIds returns the value of UserIds.
-func (s *BatchUsernamesReq) GetUserIds() []uint64 {
-	return s.UserIds
-}
-
-// SetUserIds sets the value of UserIds.
-func (s *BatchUsernamesReq) SetUserIds(val []uint64) {
-	s.UserIds = val
-}
-
-// CombobulateMapNoContent is response for CombobulateMap operation.
-type CombobulateMapNoContent struct{}
-
 type CookieAuth struct {
 	APIKey string
 	Roles  []string
@@ -576,132 +324,6 @@ func (s *ErrorStatusCode) SetResponse(val Error) {
 	s.Response = val
 }
 
-// GetAssetThumbnailFound is response for GetAssetThumbnail operation.
-type GetAssetThumbnailFound struct {
-	Location OptString
-}
-
-// GetLocation returns the value of Location.
-func (s *GetAssetThumbnailFound) GetLocation() OptString {
-	return s.Location
-}
-
-// SetLocation sets the value of Location.
-func (s *GetAssetThumbnailFound) SetLocation(val OptString) {
-	s.Location = val
-}
-
-type GetAssetThumbnailSize string
-
-const (
-	GetAssetThumbnailSize150x150 GetAssetThumbnailSize = "150x150"
-	GetAssetThumbnailSize420x420 GetAssetThumbnailSize = "420x420"
-	GetAssetThumbnailSize768x432 GetAssetThumbnailSize = "768x432"
-)
-
-// AllValues returns all GetAssetThumbnailSize values.
-func (GetAssetThumbnailSize) AllValues() []GetAssetThumbnailSize {
-	return []GetAssetThumbnailSize{
-		GetAssetThumbnailSize150x150,
-		GetAssetThumbnailSize420x420,
-		GetAssetThumbnailSize768x432,
-	}
-}
-
-// MarshalText implements encoding.TextMarshaler.
-func (s GetAssetThumbnailSize) MarshalText() ([]byte, error) {
-	switch s {
-	case GetAssetThumbnailSize150x150:
-		return []byte(s), nil
-	case GetAssetThumbnailSize420x420:
-		return []byte(s), nil
-	case GetAssetThumbnailSize768x432:
-		return []byte(s), nil
-	default:
-		return nil, errors.Errorf("invalid value: %q", s)
-	}
-}
-
-// UnmarshalText implements encoding.TextUnmarshaler.
-func (s *GetAssetThumbnailSize) UnmarshalText(data []byte) error {
-	switch GetAssetThumbnailSize(data) {
-	case GetAssetThumbnailSize150x150:
-		*s = GetAssetThumbnailSize150x150
-		return nil
-	case GetAssetThumbnailSize420x420:
-		*s = GetAssetThumbnailSize420x420
-		return nil
-	case GetAssetThumbnailSize768x432:
-		*s = GetAssetThumbnailSize768x432
-		return nil
-	default:
-		return errors.Errorf("invalid value: %q", data)
-	}
-}
-
-// GetUserThumbnailFound is response for GetUserThumbnail operation.
-type GetUserThumbnailFound struct {
-	Location OptString
-}
-
-// GetLocation returns the value of Location.
-func (s *GetUserThumbnailFound) GetLocation() OptString {
-	return s.Location
-}
-
-// SetLocation sets the value of Location.
-func (s *GetUserThumbnailFound) SetLocation(val OptString) {
-	s.Location = val
-}
-
-type GetUserThumbnailSize string
-
-const (
-	GetUserThumbnailSize150x150 GetUserThumbnailSize = "150x150"
-	GetUserThumbnailSize420x420 GetUserThumbnailSize = "420x420"
-	GetUserThumbnailSize768x432 GetUserThumbnailSize = "768x432"
-)
-
-// AllValues returns all GetUserThumbnailSize values.
-func (GetUserThumbnailSize) AllValues() []GetUserThumbnailSize {
-	return []GetUserThumbnailSize{
-		GetUserThumbnailSize150x150,
-		GetUserThumbnailSize420x420,
-		GetUserThumbnailSize768x432,
-	}
-}
-
-// MarshalText implements encoding.TextMarshaler.
-func (s GetUserThumbnailSize) MarshalText() ([]byte, error) {
-	switch s {
-	case GetUserThumbnailSize150x150:
-		return []byte(s), nil
-	case GetUserThumbnailSize420x420:
-		return []byte(s), nil
-	case GetUserThumbnailSize768x432:
-		return []byte(s), nil
-	default:
-		return nil, errors.Errorf("invalid value: %q", s)
-	}
-}
-
-// UnmarshalText implements encoding.TextUnmarshaler.
-func (s *GetUserThumbnailSize) UnmarshalText(data []byte) error {
-	switch GetUserThumbnailSize(data) {
-	case GetUserThumbnailSize150x150:
-		*s = GetUserThumbnailSize150x150
-		return nil
-	case GetUserThumbnailSize420x420:
-		*s = GetUserThumbnailSize420x420
-		return nil
-	case GetUserThumbnailSize768x432:
-		*s = GetUserThumbnailSize768x432
-		return nil
-	default:
-		return errors.Errorf("invalid value: %q", data)
-	}
-}
-
 // Ref: #/components/schemas/Map
 type Map struct {
 	ID           int64  `json:"ID"`
@@ -1155,328 +777,6 @@ func (s *OperationID) SetOperationID(val int32) {
 	s.OperationID = val
 }
 
-// NewOptBatchAssetThumbnailsOKThumbnails returns new OptBatchAssetThumbnailsOKThumbnails with value set to v.
-func NewOptBatchAssetThumbnailsOKThumbnails(v BatchAssetThumbnailsOKThumbnails) OptBatchAssetThumbnailsOKThumbnails {
-	return OptBatchAssetThumbnailsOKThumbnails{
-		Value: v,
-		Set:   true,
-	}
-}
-
-// OptBatchAssetThumbnailsOKThumbnails is optional BatchAssetThumbnailsOKThumbnails.
-type OptBatchAssetThumbnailsOKThumbnails struct {
-	Value BatchAssetThumbnailsOKThumbnails
-	Set   bool
-}
-
-// IsSet returns true if OptBatchAssetThumbnailsOKThumbnails was set.
-func (o OptBatchAssetThumbnailsOKThumbnails) IsSet() bool { return o.Set }
-
-// Reset unsets value.
-func (o *OptBatchAssetThumbnailsOKThumbnails) Reset() {
-	var v BatchAssetThumbnailsOKThumbnails
-	o.Value = v
-	o.Set = false
-}
-
-// SetTo sets value to v.
-func (o *OptBatchAssetThumbnailsOKThumbnails) SetTo(v BatchAssetThumbnailsOKThumbnails) {
-	o.Set = true
-	o.Value = v
-}
-
-// Get returns value and boolean that denotes whether value was set.
-func (o OptBatchAssetThumbnailsOKThumbnails) Get() (v BatchAssetThumbnailsOKThumbnails, 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 OptBatchAssetThumbnailsOKThumbnails) Or(d BatchAssetThumbnailsOKThumbnails) BatchAssetThumbnailsOKThumbnails {
-	if v, ok := o.Get(); ok {
-		return v
-	}
-	return d
-}
-
-// NewOptBatchAssetThumbnailsReqSize returns new OptBatchAssetThumbnailsReqSize with value set to v.
-func NewOptBatchAssetThumbnailsReqSize(v BatchAssetThumbnailsReqSize) OptBatchAssetThumbnailsReqSize {
-	return OptBatchAssetThumbnailsReqSize{
-		Value: v,
-		Set:   true,
-	}
-}
-
-// OptBatchAssetThumbnailsReqSize is optional BatchAssetThumbnailsReqSize.
-type OptBatchAssetThumbnailsReqSize struct {
-	Value BatchAssetThumbnailsReqSize
-	Set   bool
-}
-
-// IsSet returns true if OptBatchAssetThumbnailsReqSize was set.
-func (o OptBatchAssetThumbnailsReqSize) IsSet() bool { return o.Set }
-
-// Reset unsets value.
-func (o *OptBatchAssetThumbnailsReqSize) Reset() {
-	var v BatchAssetThumbnailsReqSize
-	o.Value = v
-	o.Set = false
-}
-
-// SetTo sets value to v.
-func (o *OptBatchAssetThumbnailsReqSize) SetTo(v BatchAssetThumbnailsReqSize) {
-	o.Set = true
-	o.Value = v
-}
-
-// Get returns value and boolean that denotes whether value was set.
-func (o OptBatchAssetThumbnailsReqSize) Get() (v BatchAssetThumbnailsReqSize, 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 OptBatchAssetThumbnailsReqSize) Or(d BatchAssetThumbnailsReqSize) BatchAssetThumbnailsReqSize {
-	if v, ok := o.Get(); ok {
-		return v
-	}
-	return d
-}
-
-// NewOptBatchUserThumbnailsOKThumbnails returns new OptBatchUserThumbnailsOKThumbnails with value set to v.
-func NewOptBatchUserThumbnailsOKThumbnails(v BatchUserThumbnailsOKThumbnails) OptBatchUserThumbnailsOKThumbnails {
-	return OptBatchUserThumbnailsOKThumbnails{
-		Value: v,
-		Set:   true,
-	}
-}
-
-// OptBatchUserThumbnailsOKThumbnails is optional BatchUserThumbnailsOKThumbnails.
-type OptBatchUserThumbnailsOKThumbnails struct {
-	Value BatchUserThumbnailsOKThumbnails
-	Set   bool
-}
-
-// IsSet returns true if OptBatchUserThumbnailsOKThumbnails was set.
-func (o OptBatchUserThumbnailsOKThumbnails) IsSet() bool { return o.Set }
-
-// Reset unsets value.
-func (o *OptBatchUserThumbnailsOKThumbnails) Reset() {
-	var v BatchUserThumbnailsOKThumbnails
-	o.Value = v
-	o.Set = false
-}
-
-// SetTo sets value to v.
-func (o *OptBatchUserThumbnailsOKThumbnails) SetTo(v BatchUserThumbnailsOKThumbnails) {
-	o.Set = true
-	o.Value = v
-}
-
-// Get returns value and boolean that denotes whether value was set.
-func (o OptBatchUserThumbnailsOKThumbnails) Get() (v BatchUserThumbnailsOKThumbnails, 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 OptBatchUserThumbnailsOKThumbnails) Or(d BatchUserThumbnailsOKThumbnails) BatchUserThumbnailsOKThumbnails {
-	if v, ok := o.Get(); ok {
-		return v
-	}
-	return d
-}
-
-// NewOptBatchUserThumbnailsReqSize returns new OptBatchUserThumbnailsReqSize with value set to v.
-func NewOptBatchUserThumbnailsReqSize(v BatchUserThumbnailsReqSize) OptBatchUserThumbnailsReqSize {
-	return OptBatchUserThumbnailsReqSize{
-		Value: v,
-		Set:   true,
-	}
-}
-
-// OptBatchUserThumbnailsReqSize is optional BatchUserThumbnailsReqSize.
-type OptBatchUserThumbnailsReqSize struct {
-	Value BatchUserThumbnailsReqSize
-	Set   bool
-}
-
-// IsSet returns true if OptBatchUserThumbnailsReqSize was set.
-func (o OptBatchUserThumbnailsReqSize) IsSet() bool { return o.Set }
-
-// Reset unsets value.
-func (o *OptBatchUserThumbnailsReqSize) Reset() {
-	var v BatchUserThumbnailsReqSize
-	o.Value = v
-	o.Set = false
-}
-
-// SetTo sets value to v.
-func (o *OptBatchUserThumbnailsReqSize) SetTo(v BatchUserThumbnailsReqSize) {
-	o.Set = true
-	o.Value = v
-}
-
-// Get returns value and boolean that denotes whether value was set.
-func (o OptBatchUserThumbnailsReqSize) Get() (v BatchUserThumbnailsReqSize, 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 OptBatchUserThumbnailsReqSize) Or(d BatchUserThumbnailsReqSize) BatchUserThumbnailsReqSize {
-	if v, ok := o.Get(); ok {
-		return v
-	}
-	return d
-}
-
-// NewOptBatchUsernamesOKUsernames returns new OptBatchUsernamesOKUsernames with value set to v.
-func NewOptBatchUsernamesOKUsernames(v BatchUsernamesOKUsernames) OptBatchUsernamesOKUsernames {
-	return OptBatchUsernamesOKUsernames{
-		Value: v,
-		Set:   true,
-	}
-}
-
-// OptBatchUsernamesOKUsernames is optional BatchUsernamesOKUsernames.
-type OptBatchUsernamesOKUsernames struct {
-	Value BatchUsernamesOKUsernames
-	Set   bool
-}
-
-// IsSet returns true if OptBatchUsernamesOKUsernames was set.
-func (o OptBatchUsernamesOKUsernames) IsSet() bool { return o.Set }
-
-// Reset unsets value.
-func (o *OptBatchUsernamesOKUsernames) Reset() {
-	var v BatchUsernamesOKUsernames
-	o.Value = v
-	o.Set = false
-}
-
-// SetTo sets value to v.
-func (o *OptBatchUsernamesOKUsernames) SetTo(v BatchUsernamesOKUsernames) {
-	o.Set = true
-	o.Value = v
-}
-
-// Get returns value and boolean that denotes whether value was set.
-func (o OptBatchUsernamesOKUsernames) Get() (v BatchUsernamesOKUsernames, 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 OptBatchUsernamesOKUsernames) Or(d BatchUsernamesOKUsernames) BatchUsernamesOKUsernames {
-	if v, ok := o.Get(); ok {
-		return v
-	}
-	return d
-}
-
-// NewOptGetAssetThumbnailSize returns new OptGetAssetThumbnailSize with value set to v.
-func NewOptGetAssetThumbnailSize(v GetAssetThumbnailSize) OptGetAssetThumbnailSize {
-	return OptGetAssetThumbnailSize{
-		Value: v,
-		Set:   true,
-	}
-}
-
-// OptGetAssetThumbnailSize is optional GetAssetThumbnailSize.
-type OptGetAssetThumbnailSize struct {
-	Value GetAssetThumbnailSize
-	Set   bool
-}
-
-// IsSet returns true if OptGetAssetThumbnailSize was set.
-func (o OptGetAssetThumbnailSize) IsSet() bool { return o.Set }
-
-// Reset unsets value.
-func (o *OptGetAssetThumbnailSize) Reset() {
-	var v GetAssetThumbnailSize
-	o.Value = v
-	o.Set = false
-}
-
-// SetTo sets value to v.
-func (o *OptGetAssetThumbnailSize) SetTo(v GetAssetThumbnailSize) {
-	o.Set = true
-	o.Value = v
-}
-
-// Get returns value and boolean that denotes whether value was set.
-func (o OptGetAssetThumbnailSize) Get() (v GetAssetThumbnailSize, 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 OptGetAssetThumbnailSize) Or(d GetAssetThumbnailSize) GetAssetThumbnailSize {
-	if v, ok := o.Get(); ok {
-		return v
-	}
-	return d
-}
-
-// NewOptGetUserThumbnailSize returns new OptGetUserThumbnailSize with value set to v.
-func NewOptGetUserThumbnailSize(v GetUserThumbnailSize) OptGetUserThumbnailSize {
-	return OptGetUserThumbnailSize{
-		Value: v,
-		Set:   true,
-	}
-}
-
-// OptGetUserThumbnailSize is optional GetUserThumbnailSize.
-type OptGetUserThumbnailSize struct {
-	Value GetUserThumbnailSize
-	Set   bool
-}
-
-// IsSet returns true if OptGetUserThumbnailSize was set.
-func (o OptGetUserThumbnailSize) IsSet() bool { return o.Set }
-
-// Reset unsets value.
-func (o *OptGetUserThumbnailSize) Reset() {
-	var v GetUserThumbnailSize
-	o.Value = v
-	o.Set = false
-}
-
-// SetTo sets value to v.
-func (o *OptGetUserThumbnailSize) SetTo(v GetUserThumbnailSize) {
-	o.Set = true
-	o.Value = v
-}
-
-// Get returns value and boolean that denotes whether value was set.
-func (o OptGetUserThumbnailSize) Get() (v GetUserThumbnailSize, 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 OptGetUserThumbnailSize) Or(d GetUserThumbnailSize) GetUserThumbnailSize {
-	if v, ok := o.Get(); ok {
-		return v
-	}
-	return d
-}
-
 // NewOptInt32 returns new OptInt32 with value set to v.
 func NewOptInt32(v int32) OptInt32 {
 	return OptInt32{
@@ -1996,92 +1296,12 @@ func (s *ScriptUpdate) SetResourceID(val OptInt64) {
 	s.ResourceID = val
 }
 
-// SeedCombobulatorNoContent is response for SeedCombobulator operation.
-type SeedCombobulatorNoContent struct{}
-
 // SetMapfixCompletedNoContent is response for SetMapfixCompleted operation.
 type SetMapfixCompletedNoContent struct{}
 
 // SetSubmissionCompletedNoContent is response for SetSubmissionCompleted operation.
 type SetSubmissionCompletedNoContent struct{}
 
-// Aggregate statistics for submissions and mapfixes.
-// Ref: #/components/schemas/Stats
-type Stats struct {
-	// Total number of submissions.
-	TotalSubmissions int64 `json:"TotalSubmissions"`
-	// Total number of mapfixes.
-	TotalMapfixes int64 `json:"TotalMapfixes"`
-	// Number of released submissions.
-	ReleasedSubmissions int64 `json:"ReleasedSubmissions"`
-	// Number of released mapfixes.
-	ReleasedMapfixes int64 `json:"ReleasedMapfixes"`
-	// Number of submissions under review.
-	SubmittedSubmissions int64 `json:"SubmittedSubmissions"`
-	// Number of mapfixes under review.
-	SubmittedMapfixes int64 `json:"SubmittedMapfixes"`
-}
-
-// GetTotalSubmissions returns the value of TotalSubmissions.
-func (s *Stats) GetTotalSubmissions() int64 {
-	return s.TotalSubmissions
-}
-
-// GetTotalMapfixes returns the value of TotalMapfixes.
-func (s *Stats) GetTotalMapfixes() int64 {
-	return s.TotalMapfixes
-}
-
-// GetReleasedSubmissions returns the value of ReleasedSubmissions.
-func (s *Stats) GetReleasedSubmissions() int64 {
-	return s.ReleasedSubmissions
-}
-
-// GetReleasedMapfixes returns the value of ReleasedMapfixes.
-func (s *Stats) GetReleasedMapfixes() int64 {
-	return s.ReleasedMapfixes
-}
-
-// GetSubmittedSubmissions returns the value of SubmittedSubmissions.
-func (s *Stats) GetSubmittedSubmissions() int64 {
-	return s.SubmittedSubmissions
-}
-
-// GetSubmittedMapfixes returns the value of SubmittedMapfixes.
-func (s *Stats) GetSubmittedMapfixes() int64 {
-	return s.SubmittedMapfixes
-}
-
-// SetTotalSubmissions sets the value of TotalSubmissions.
-func (s *Stats) SetTotalSubmissions(val int64) {
-	s.TotalSubmissions = val
-}
-
-// SetTotalMapfixes sets the value of TotalMapfixes.
-func (s *Stats) SetTotalMapfixes(val int64) {
-	s.TotalMapfixes = val
-}
-
-// SetReleasedSubmissions sets the value of ReleasedSubmissions.
-func (s *Stats) SetReleasedSubmissions(val int64) {
-	s.ReleasedSubmissions = val
-}
-
-// SetReleasedMapfixes sets the value of ReleasedMapfixes.
-func (s *Stats) SetReleasedMapfixes(val int64) {
-	s.ReleasedMapfixes = val
-}
-
-// SetSubmittedSubmissions sets the value of SubmittedSubmissions.
-func (s *Stats) SetSubmittedSubmissions(val int64) {
-	s.SubmittedSubmissions = val
-}
-
-// SetSubmittedMapfixes sets the value of SubmittedMapfixes.
-func (s *Stats) SetSubmittedMapfixes(val int64) {
-	s.SubmittedMapfixes = val
-}
-
 // Ref: #/components/schemas/Submission
 type Submission struct {
 	ID                    int64    `json:"ID"`
@@ -2314,23 +1534,6 @@ func (s *Submissions) SetSubmissions(val []Submission) {
 	s.Submissions = val
 }
 
-// UpdateMapfixDescriptionNoContent is response for UpdateMapfixDescription operation.
-type UpdateMapfixDescriptionNoContent struct{}
-
-type UpdateMapfixDescriptionReq struct {
-	Data io.Reader
-}
-
-// Read reads data from the Data reader.
-//
-// Kept to satisfy the io.Reader interface.
-func (s UpdateMapfixDescriptionReq) Read(p []byte) (n int, err error) {
-	if s.Data == nil {
-		return 0, io.EOF
-	}
-	return s.Data.Read(p)
-}
-
 // UpdateMapfixModelNoContent is response for UpdateMapfixModel operation.
 type UpdateMapfixModelNoContent struct{}
 

pkg/api/oas_security_gen.go

@@ -8,6 +8,7 @@ import (
 	"strings"
 
 	"github.com/go-faster/errors"
+
 	"github.com/ogen-go/ogen/ogenerrors"
 )
 
@@ -32,7 +33,6 @@ func findAuthorization(h http.Header, prefix string) (string, bool) {
 	return "", false
 }
 
-// operationRolesCookieAuth is a private map storing roles per operation.
 var operationRolesCookieAuth = map[string][]string{
 	ActionMapfixAcceptedOperation:                   []string{},
 	ActionMapfixRejectOperation:                     []string{},
@@ -58,7 +58,6 @@ var operationRolesCookieAuth = map[string][]string{
 	ActionSubmissionTriggerUploadOperation:          []string{},
 	ActionSubmissionTriggerValidateOperation:        []string{},
 	ActionSubmissionValidatedOperation:              []string{},
-	CombobulateMapOperation:                         []string{},
 	CreateMapfixOperation:                           []string{},
 	CreateMapfixAuditCommentOperation:               []string{},
 	CreateScriptOperation:                           []string{},
@@ -71,40 +70,17 @@ var operationRolesCookieAuth = map[string][]string{
 	DownloadMapAssetOperation:                       []string{},
 	GetOperationOperation:                           []string{},
 	ReleaseSubmissionsOperation:                     []string{},
-	SeedCombobulatorOperation:                       []string{},
 	SessionRolesOperation:                           []string{},
 	SessionUserOperation:                            []string{},
 	SessionValidateOperation:                        []string{},
 	SetMapfixCompletedOperation:                     []string{},
 	SetSubmissionCompletedOperation:                 []string{},
-	UpdateMapfixDescriptionOperation:                []string{},
 	UpdateMapfixModelOperation:                      []string{},
 	UpdateScriptOperation:                           []string{},
 	UpdateScriptPolicyOperation:                     []string{},
 	UpdateSubmissionModelOperation:                  []string{},
 }
 
-// GetRolesForCookieAuth returns the required roles for the given operation.
-//
-// This is useful for authorization scenarios where you need to know which roles
-// are required for an operation.
-//
-// Example:
-//
-//	requiredRoles := GetRolesForCookieAuth(AddPetOperation)
-//
-// Returns nil if the operation has no role requirements or if the operation is unknown.
-func GetRolesForCookieAuth(operation string) []string {
-	roles, ok := operationRolesCookieAuth[operation]
-	if !ok {
-		return nil
-	}
-	// Return a copy to prevent external modification
-	result := make([]string, len(roles))
-	copy(result, roles)
-	return result
-}
-
 func (s *Server) securityCookieAuth(ctx context.Context, operationName OperationName, req *http.Request) (context.Context, bool, error) {
 	var t CookieAuth
 	const parameterName = "session_id"

pkg/api/oas_server_gen.go

@@ -155,30 +155,6 @@ type Handler interface {
 	//
 	// POST /submissions/{SubmissionID}/status/reset-uploading
 	ActionSubmissionValidated(ctx context.Context, params ActionSubmissionValidatedParams) error
-	// BatchAssetThumbnails implements batchAssetThumbnails operation.
-	//
-	// Batch fetch asset thumbnails.
-	//
-	// POST /thumbnails/assets
-	BatchAssetThumbnails(ctx context.Context, req *BatchAssetThumbnailsReq) (*BatchAssetThumbnailsOK, error)
-	// BatchUserThumbnails implements batchUserThumbnails operation.
-	//
-	// Batch fetch user avatar thumbnails.
-	//
-	// POST /thumbnails/users
-	BatchUserThumbnails(ctx context.Context, req *BatchUserThumbnailsReq) (*BatchUserThumbnailsOK, error)
-	// BatchUsernames implements batchUsernames operation.
-	//
-	// Batch fetch usernames.
-	//
-	// POST /usernames
-	BatchUsernames(ctx context.Context, req *BatchUsernamesReq) (*BatchUsernamesOK, error)
-	// CombobulateMap implements combobulateMap operation.
-	//
-	// Queue a map for combobulator processing.
-	//
-	// POST /maps/{MapID}/combobulate
-	CombobulateMap(ctx context.Context, params CombobulateMapParams) error
 	// CreateMapfix implements createMapfix operation.
 	//
 	// Trigger the validator to create a mapfix.
@@ -239,12 +215,6 @@ type Handler interface {
 	//
 	// GET /maps/{MapID}/download
 	DownloadMapAsset(ctx context.Context, params DownloadMapAssetParams) (DownloadMapAssetOK, error)
-	// GetAssetThumbnail implements getAssetThumbnail operation.
-	//
-	// Get single asset thumbnail.
-	//
-	// GET /thumbnails/asset/{AssetID}
-	GetAssetThumbnail(ctx context.Context, params GetAssetThumbnailParams) (*GetAssetThumbnailFound, error)
 	// GetMap implements getMap operation.
 	//
 	// Retrieve map with ID.
@@ -275,24 +245,12 @@ type Handler interface {
 	//
 	// GET /script-policy/{ScriptPolicyID}
 	GetScriptPolicy(ctx context.Context, params GetScriptPolicyParams) (*ScriptPolicy, error)
-	// GetStats implements getStats operation.
-	//
-	// Get aggregate statistics.
-	//
-	// GET /stats
-	GetStats(ctx context.Context) (*Stats, error)
 	// GetSubmission implements getSubmission operation.
 	//
 	// Retrieve map with ID.
 	//
 	// GET /submissions/{SubmissionID}
 	GetSubmission(ctx context.Context, params GetSubmissionParams) (*Submission, error)
-	// GetUserThumbnail implements getUserThumbnail operation.
-	//
-	// Get single user avatar thumbnail.
-	//
-	// GET /thumbnails/user/{UserID}
-	GetUserThumbnail(ctx context.Context, params GetUserThumbnailParams) (*GetUserThumbnailFound, error)
 	// ListMapfixAuditEvents implements listMapfixAuditEvents operation.
 	//
 	// Retrieve a list of audit events.
@@ -341,12 +299,6 @@ type Handler interface {
 	//
 	// POST /release-submissions
 	ReleaseSubmissions(ctx context.Context, req []ReleaseInfo) (*OperationID, error)
-	// SeedCombobulator implements seedCombobulator operation.
-	//
-	// Queue all maps for combobulator processing.
-	//
-	// POST /maps-admin/seed-combobulator
-	SeedCombobulator(ctx context.Context) error
 	// SessionRoles implements sessionRoles operation.
 	//
 	// Get list of roles for the current session.
@@ -377,12 +329,6 @@ type Handler interface {
 	//
 	// POST /submissions/{SubmissionID}/completed
 	SetSubmissionCompleted(ctx context.Context, params SetSubmissionCompletedParams) error
-	// UpdateMapfixDescription implements updateMapfixDescription operation.
-	//
-	// Update description (submitter only).
-	//
-	// PATCH /mapfixes/{MapfixID}/description
-	UpdateMapfixDescription(ctx context.Context, req UpdateMapfixDescriptionReq, params UpdateMapfixDescriptionParams) error
 	// UpdateMapfixModel implements updateMapfixModel operation.
 	//
 	// Update model following role restrictions.

pkg/api/oas_unimplemented_gen.go

@@ -232,42 +232,6 @@ func (UnimplementedHandler) ActionSubmissionValidated(ctx context.Context, param
 	return ht.ErrNotImplemented
 }
 
-// BatchAssetThumbnails implements batchAssetThumbnails operation.
-//
-// Batch fetch asset thumbnails.
-//
-// POST /thumbnails/assets
-func (UnimplementedHandler) BatchAssetThumbnails(ctx context.Context, req *BatchAssetThumbnailsReq) (r *BatchAssetThumbnailsOK, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// BatchUserThumbnails implements batchUserThumbnails operation.
-//
-// Batch fetch user avatar thumbnails.
-//
-// POST /thumbnails/users
-func (UnimplementedHandler) BatchUserThumbnails(ctx context.Context, req *BatchUserThumbnailsReq) (r *BatchUserThumbnailsOK, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// BatchUsernames implements batchUsernames operation.
-//
-// Batch fetch usernames.
-//
-// POST /usernames
-func (UnimplementedHandler) BatchUsernames(ctx context.Context, req *BatchUsernamesReq) (r *BatchUsernamesOK, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
-// CombobulateMap implements combobulateMap operation.
-//
-// Queue a map for combobulator processing.
-//
-// POST /maps/{MapID}/combobulate
-func (UnimplementedHandler) CombobulateMap(ctx context.Context, params CombobulateMapParams) error {
-	return ht.ErrNotImplemented
-}
-
 // CreateMapfix implements createMapfix operation.
 //
 // Trigger the validator to create a mapfix.
@@ -358,15 +322,6 @@ func (UnimplementedHandler) DownloadMapAsset(ctx context.Context, params Downloa
 	return r, ht.ErrNotImplemented
 }
 
-// GetAssetThumbnail implements getAssetThumbnail operation.
-//
-// Get single asset thumbnail.
-//
-// GET /thumbnails/asset/{AssetID}
-func (UnimplementedHandler) GetAssetThumbnail(ctx context.Context, params GetAssetThumbnailParams) (r *GetAssetThumbnailFound, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
 // GetMap implements getMap operation.
 //
 // Retrieve map with ID.
@@ -412,15 +367,6 @@ func (UnimplementedHandler) GetScriptPolicy(ctx context.Context, params GetScrip
 	return r, ht.ErrNotImplemented
 }
 
-// GetStats implements getStats operation.
-//
-// Get aggregate statistics.
-//
-// GET /stats
-func (UnimplementedHandler) GetStats(ctx context.Context) (r *Stats, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
 // GetSubmission implements getSubmission operation.
 //
 // Retrieve map with ID.
@@ -430,15 +376,6 @@ func (UnimplementedHandler) GetSubmission(ctx context.Context, params GetSubmiss
 	return r, ht.ErrNotImplemented
 }
 
-// GetUserThumbnail implements getUserThumbnail operation.
-//
-// Get single user avatar thumbnail.
-//
-// GET /thumbnails/user/{UserID}
-func (UnimplementedHandler) GetUserThumbnail(ctx context.Context, params GetUserThumbnailParams) (r *GetUserThumbnailFound, _ error) {
-	return r, ht.ErrNotImplemented
-}
-
 // ListMapfixAuditEvents implements listMapfixAuditEvents operation.
 //
 // Retrieve a list of audit events.
@@ -511,15 +448,6 @@ func (UnimplementedHandler) ReleaseSubmissions(ctx context.Context, req []Releas
 	return r, ht.ErrNotImplemented
 }
 
-// SeedCombobulator implements seedCombobulator operation.
-//
-// Queue all maps for combobulator processing.
-//
-// POST /maps-admin/seed-combobulator
-func (UnimplementedHandler) SeedCombobulator(ctx context.Context) error {
-	return ht.ErrNotImplemented
-}
-
 // SessionRoles implements sessionRoles operation.
 //
 // Get list of roles for the current session.
@@ -565,15 +493,6 @@ func (UnimplementedHandler) SetSubmissionCompleted(ctx context.Context, params S
 	return ht.ErrNotImplemented
 }
 
-// UpdateMapfixDescription implements updateMapfixDescription operation.
-//
-// Update description (submitter only).
-//
-// PATCH /mapfixes/{MapfixID}/description
-func (UnimplementedHandler) UpdateMapfixDescription(ctx context.Context, req UpdateMapfixDescriptionReq, params UpdateMapfixDescriptionParams) error {
-	return ht.ErrNotImplemented
-}
-
 // UpdateMapfixModel implements updateMapfixModel operation.
 //
 // Update model following role restrictions.

pkg/cmds/serve.go

@@ -8,8 +8,6 @@ import (
 	"git.itzana.me/strafesnet/go-grpc/auth"
 	"git.itzana.me/strafesnet/go-grpc/maps"
 	"git.itzana.me/strafesnet/go-grpc/maps_extended"
-	"git.itzana.me/strafesnet/go-grpc/mapfixes"
-	"git.itzana.me/strafesnet/go-grpc/submissions"
 	"git.itzana.me/strafesnet/go-grpc/users"
 	"git.itzana.me/strafesnet/go-grpc/validator"
 	"git.itzana.me/strafesnet/maps-service/pkg/api"
@@ -19,10 +17,7 @@ import (
 	"git.itzana.me/strafesnet/maps-service/pkg/service"
 	"git.itzana.me/strafesnet/maps-service/pkg/validator_controller"
 	"git.itzana.me/strafesnet/maps-service/pkg/web_api"
-	awsconfig "github.com/aws/aws-sdk-go-v2/config"
-	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/nats-io/nats.go"
-	"github.com/redis/go-redis/v9"
 	log "github.com/sirupsen/logrus"
 	"github.com/urfave/cli/v2"
 	"google.golang.org/grpc"
@@ -107,30 +102,6 @@ func NewServeCommand() *cli.Command {
 				EnvVars:  []string{"RBX_API_KEY"},
 				Required: true,
 			},
-			&cli.StringFlag{
-				Name:    "redis-host",
-				Usage:   "Host of Redis cache",
-				EnvVars: []string{"REDIS_HOST"},
-				Value:   "localhost:6379",
-			},
-			&cli.StringFlag{
-				Name:    "redis-password",
-				Usage:   "Password for Redis",
-				EnvVars: []string{"REDIS_PASSWORD"},
-				Value:   "",
-			},
-			&cli.IntFlag{
-				Name:    "redis-db",
-				Usage:   "Redis database number",
-				EnvVars: []string{"REDIS_DB"},
-				Value:   0,
-			},
-			&cli.StringFlag{
-				Name:     "s3-bucket",
-				Usage:    "S3 bucket for map assets",
-				EnvVars:  []string{"S3_BUCKET"},
-				Required: true,
-			},
 		},
 	}
 }
@@ -152,37 +123,12 @@ func serve(ctx *cli.Context) error {
 	_, err = js.AddStream(&nats.StreamConfig{
 		Name:      "maptest",
 		Subjects:  []string{"maptest.>"},
-		Retention: nats.InterestPolicy,
+		Retention: nats.WorkQueuePolicy,
 	})
 	if err != nil {
 		log.WithError(err).Fatal("failed to add stream")
 	}
 
-	// Initialize Redis client
-	redisClient := redis.NewClient(&redis.Options{
-		Addr:     ctx.String("redis-host"),
-		Password: ctx.String("redis-password"),
-		DB:       ctx.Int("redis-db"),
-	})
-
-	// Test Redis connection
-	if err := redisClient.Ping(ctx.Context).Err(); err != nil {
-		log.WithError(err).Warn("failed to connect to Redis - thumbnails will not be cached")
-	}
-
-	// Initialize Roblox client
-	robloxClient := &roblox.Client{
-		HttpClient: http.DefaultClient,
-		ApiKey:     ctx.String("rbx-api-key"),
-	}
-
-	// Initialize S3 client
-	awsCfg, err := awsconfig.LoadDefaultConfig(ctx.Context)
-	if err != nil {
-		log.WithError(err).Fatal("failed to load AWS config")
-	}
-	s3Client := s3.NewFromConfig(awsCfg)
-
 	// connect to main game database
 	conn, err := grpc.Dial(ctx.String("data-rpc-host"), grpc.WithTransportCredentials(insecure.NewCredentials()))
 	if err != nil {
@@ -193,17 +139,13 @@ func serve(ctx *cli.Context) error {
 		js,
 		maps.NewMapsServiceClient(conn),
 		users.NewUsersServiceClient(conn),
-		robloxClient,
-		redisClient,
-		s3Client,
-		ctx.String("s3-bucket"),
 	)
 
 	svc_external := web_api.NewService(
 		&svc_inner,
 		roblox.Client{
 			HttpClient: http.DefaultClient,
-			ApiKey:     ctx.String("rbx-api-key"),
+			ApiKey: ctx.String("rbx-api-key"),
 		},
 	)
 
@@ -223,11 +165,7 @@ func serve(ctx *cli.Context) error {
 	grpcServer := grpc.NewServer()
 
 	maps_controller := controller.NewMapsController(&svc_inner)
-	mapfixes_controller := controller.NewMapfixesController(&svc_inner)
-	submissions_controller := controller.NewSubmissionsController(&svc_inner)
 	maps_extended.RegisterMapsServiceServer(grpcServer,&maps_controller)
-	mapfixes.RegisterMapfixesServiceServer(grpcServer,&mapfixes_controller)
-	submissions.RegisterSubmissionsServiceServer(grpcServer,&submissions_controller)
 
 	mapfix_controller := validator_controller.NewMapfixesController(&svc_inner)
 	operation_controller := validator_controller.NewOperationsController(&svc_inner)

pkg/controller/mapfixes.go

@@ -1,149 +0,0 @@
-package controller
-
-import (
-	"context"
-
-	"git.itzana.me/strafesnet/go-grpc/mapfixes"
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-type Mapfixes struct {
-	*mapfixes.UnimplementedMapfixesServiceServer
-	inner *service.Service
-}
-
-func NewMapfixesController(
-	inner *service.Service,
-) Mapfixes {
-	return Mapfixes{
-		inner: inner,
-	}
-}
-
-func (svc *Mapfixes) Get(ctx context.Context, request *mapfixes.MapfixId) (*mapfixes.MapfixResponse, error) {
-	item, err := svc.inner.GetMapfix(ctx, request.ID)
-	if err != nil {
-		return nil, err
-	}
-
-	var validated_asset_id *uint64
-	if item.ValidatedAssetID != 0 {
-		validated_asset_id = &item.ValidatedAssetID
-	}
-	var validated_asset_version *uint64
-	if item.ValidatedAssetVersion != 0 {
-		validated_asset_version = &item.ValidatedAssetVersion
-	}
-	return &mapfixes.MapfixResponse{
-		ID:                    item.ID,
-		DisplayName:           item.DisplayName,
-		Creator:               item.Creator,
-		GameID:                uint32(item.GameID),
-		CreatedAt:             item.CreatedAt.Unix(),
-		UpdatedAt:             item.UpdatedAt.Unix(),
-		Submitter:             uint64(item.Submitter),
-		AssetVersion:          uint64(item.AssetVersion),
-		AssetID:               item.AssetID,
-		ValidatedAssetID:      validated_asset_id,
-		ValidatedAssetVersion: validated_asset_version,
-		TargetAssetID:         item.TargetAssetID,
-		StatusID:              mapfixes.MapfixStatus(item.StatusID),
-	}, nil
-}
-func (svc *Mapfixes) GetList(ctx context.Context, request *mapfixes.MapfixIdList) (*mapfixes.MapfixList, error) {
-	items, err := svc.inner.GetMapfixList(ctx, request.ID)
-	if err != nil {
-		return nil, err
-	}
-
-	resp := mapfixes.MapfixList{}
-	resp.Mapfixes = make([]*mapfixes.MapfixResponse, len(items))
-	for i, item := range items {
-		var validated_asset_id *uint64
-		if item.ValidatedAssetID != 0 {
-			validated_asset_id = &item.ValidatedAssetID
-		}
-		var validated_asset_version *uint64
-		if item.ValidatedAssetVersion != 0 {
-			validated_asset_version = &item.ValidatedAssetVersion
-		}
-		resp.Mapfixes[i] = &mapfixes.MapfixResponse{
-			ID:                    item.ID,
-			DisplayName:           item.DisplayName,
-			Creator:               item.Creator,
-			GameID:                uint32(item.GameID),
-			CreatedAt:             item.CreatedAt.Unix(),
-			UpdatedAt:             item.UpdatedAt.Unix(),
-			Submitter:             uint64(item.Submitter),
-			AssetVersion:          uint64(item.AssetVersion),
-			AssetID:               item.AssetID,
-			ValidatedAssetID:      validated_asset_id,
-			ValidatedAssetVersion: validated_asset_version,
-			TargetAssetID:         item.TargetAssetID,
-			StatusID:              mapfixes.MapfixStatus(item.StatusID),
-		}
-	}
-
-	return &resp, nil
-}
-func (svc *Mapfixes) List(ctx context.Context, request *mapfixes.ListRequest) (*mapfixes.MapfixList, error) {
-	if request.Page == nil {
-		return nil, PageError
-	}
-
-	filter := service.NewMapfixFilter()
-	if request.Filter != nil {
-		if request.Filter.DisplayName != nil {
-			filter.SetDisplayName(*request.Filter.DisplayName)
-		}
-		if request.Filter.Creator != nil {
-			filter.SetCreator(*request.Filter.Creator)
-		}
-		if request.Filter.GameID != nil {
-			filter.SetGameID(*request.Filter.GameID)
-		}
-		if request.Filter.Submitter != nil {
-			filter.SetSubmitter(*request.Filter.Submitter)
-		}
-	}
-
-	items, err := svc.inner.ListMapfixes(ctx, filter, model.Page{
-		Number: int32(request.Page.Number),
-		Size:   int32(request.Page.Size),
-	}, datastore.ListSortDateDescending)
-	if err != nil {
-		return nil, err
-	}
-
-	resp := mapfixes.MapfixList{}
-	resp.Mapfixes = make([]*mapfixes.MapfixResponse, len(items))
-	for i, item := range items {
-		var validated_asset_id *uint64
-		if item.ValidatedAssetID != 0 {
-			validated_asset_id = &item.ValidatedAssetID
-		}
-		var validated_asset_version *uint64
-		if item.ValidatedAssetVersion != 0 {
-			validated_asset_version = &item.ValidatedAssetVersion
-		}
-		resp.Mapfixes[i] = &mapfixes.MapfixResponse{
-			ID:                    item.ID,
-			DisplayName:           item.DisplayName,
-			Creator:               item.Creator,
-			GameID:                uint32(item.GameID),
-			CreatedAt:             item.CreatedAt.Unix(),
-			UpdatedAt:             item.UpdatedAt.Unix(),
-			Submitter:             uint64(item.Submitter),
-			AssetVersion:          uint64(item.AssetVersion),
-			AssetID:               item.AssetID,
-			ValidatedAssetID:      validated_asset_id,
-			ValidatedAssetVersion: validated_asset_version,
-			TargetAssetID:         item.TargetAssetID,
-			StatusID:              mapfixes.MapfixStatus(item.StatusID),
-		}
-	}
-
-	return &resp, nil
-}

pkg/controller/maps.go

@@ -195,13 +195,3 @@ func (svc *Maps) IncrementLoadCount(ctx context.Context, request *maps_extended.
 	}
 	return &maps_extended.NullResponse{}, nil
 }
-
-func (svc *Maps) GetSnfmDownloadUrl(ctx context.Context, request *maps_extended.MapId) (*maps_extended.SnfmDownloadUrl, error) {
-	url, err := svc.inner.GetSnfmDownloadUrl(ctx, request.ID)
-	if err != nil {
-		return nil, err
-	}
-	return &maps_extended.SnfmDownloadUrl{
-		Url: url,
-	}, nil
-}

pkg/controller/submissions.go

@@ -1,161 +0,0 @@
-package controller
-
-import (
-	"context"
-
-	"git.itzana.me/strafesnet/go-grpc/submissions"
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-type Submissions struct {
-	*submissions.UnimplementedSubmissionsServiceServer
-	inner *service.Service
-}
-
-func NewSubmissionsController(
-	inner *service.Service,
-) Submissions {
-	return Submissions{
-		inner: inner,
-	}
-}
-
-func (svc *Submissions) Get(ctx context.Context, request *submissions.SubmissionId) (*submissions.SubmissionResponse, error) {
-	item, err := svc.inner.GetSubmission(ctx, request.ID)
-	if err != nil {
-		return nil, err
-	}
-
-	var validated_asset_id *uint64
-	if item.ValidatedAssetID != 0 {
-		validated_asset_id = &item.ValidatedAssetID
-	}
-	var validated_asset_version *uint64
-	if item.ValidatedAssetVersion != 0 {
-		validated_asset_version = &item.ValidatedAssetVersion
-	}
-	var uploaded_asset_id *uint64
-	if item.UploadedAssetID != 0 {
-		uploaded_asset_id = &item.UploadedAssetID
-	}
-	return &submissions.SubmissionResponse{
-		ID:                    item.ID,
-		DisplayName:           item.DisplayName,
-		Creator:               item.Creator,
-		GameID:                uint32(item.GameID),
-		CreatedAt:             item.CreatedAt.Unix(),
-		UpdatedAt:             item.UpdatedAt.Unix(),
-		Submitter:             uint64(item.Submitter),
-		AssetVersion:          uint64(item.AssetVersion),
-		AssetID:               item.AssetID,
-		ValidatedAssetID:      validated_asset_id,
-		ValidatedAssetVersion: validated_asset_version,
-		UploadedAssetID:       uploaded_asset_id,
-		StatusID:              submissions.SubmissionStatus(item.StatusID),
-	}, nil
-}
-func (svc *Submissions) GetList(ctx context.Context, request *submissions.SubmissionIdList) (*submissions.SubmissionList, error) {
-	items, err := svc.inner.GetSubmissionList(ctx, request.ID)
-	if err != nil {
-		return nil, err
-	}
-
-	resp := submissions.SubmissionList{}
-	resp.Submissions = make([]*submissions.SubmissionResponse, len(items))
-	for i, item := range items {
-		var validated_asset_id *uint64
-		if item.ValidatedAssetID != 0 {
-			validated_asset_id = &item.ValidatedAssetID
-		}
-		var validated_asset_version *uint64
-		if item.ValidatedAssetVersion != 0 {
-			validated_asset_version = &item.ValidatedAssetVersion
-		}
-		var uploaded_asset_id *uint64
-		if item.UploadedAssetID != 0 {
-			uploaded_asset_id = &item.UploadedAssetID
-		}
-		resp.Submissions[i] = &submissions.SubmissionResponse{
-			ID:                    item.ID,
-			DisplayName:           item.DisplayName,
-			Creator:               item.Creator,
-			GameID:                uint32(item.GameID),
-			CreatedAt:             item.CreatedAt.Unix(),
-			UpdatedAt:             item.UpdatedAt.Unix(),
-			Submitter:             uint64(item.Submitter),
-			AssetVersion:          uint64(item.AssetVersion),
-			AssetID:               item.AssetID,
-			ValidatedAssetID:      validated_asset_id,
-			ValidatedAssetVersion: validated_asset_version,
-			UploadedAssetID:       uploaded_asset_id,
-			StatusID:              submissions.SubmissionStatus(item.StatusID),
-		}
-	}
-
-	return &resp, nil
-}
-func (svc *Submissions) List(ctx context.Context, request *submissions.ListRequest) (*submissions.SubmissionList, error) {
-	if request.Page == nil {
-		return nil, PageError
-	}
-
-	filter := service.NewSubmissionFilter()
-	if request.Filter != nil {
-		if request.Filter.DisplayName != nil {
-			filter.SetDisplayName(*request.Filter.DisplayName)
-		}
-		if request.Filter.Creator != nil {
-			filter.SetCreator(*request.Filter.Creator)
-		}
-		if request.Filter.GameID != nil {
-			filter.SetGameID(*request.Filter.GameID)
-		}
-		if request.Filter.Submitter != nil {
-			filter.SetSubmitter(*request.Filter.Submitter)
-		}
-	}
-
-	items, err := svc.inner.ListSubmissions(ctx, filter, model.Page{
-		Number: int32(request.Page.Number),
-		Size:   int32(request.Page.Size),
-	}, datastore.ListSortDateDescending)
-	if err != nil {
-		return nil, err
-	}
-
-	resp := submissions.SubmissionList{}
-	resp.Submissions = make([]*submissions.SubmissionResponse, len(items))
-	for i, item := range items {
-		var validated_asset_id *uint64
-		if item.ValidatedAssetID != 0 {
-			validated_asset_id = &item.ValidatedAssetID
-		}
-		var validated_asset_version *uint64
-		if item.ValidatedAssetVersion != 0 {
-			validated_asset_version = &item.ValidatedAssetVersion
-		}
-		var uploaded_asset_id *uint64
-		if item.UploadedAssetID != 0 {
-			uploaded_asset_id = &item.UploadedAssetID
-		}
-		resp.Submissions[i] = &submissions.SubmissionResponse{
-			ID:                    item.ID,
-			DisplayName:           item.DisplayName,
-			Creator:               item.Creator,
-			GameID:                uint32(item.GameID),
-			CreatedAt:             item.CreatedAt.Unix(),
-			UpdatedAt:             item.UpdatedAt.Unix(),
-			Submitter:             uint64(item.Submitter),
-			AssetVersion:          uint64(item.AssetVersion),
-			AssetID:               item.AssetID,
-			ValidatedAssetID:      validated_asset_id,
-			ValidatedAssetVersion: validated_asset_version,
-			UploadedAssetID:       uploaded_asset_id,
-			StatusID:              submissions.SubmissionStatus(item.StatusID),
-		}
-	}
-
-	return &resp, nil
-}

pkg/datastore/datastore.go

@@ -47,7 +47,6 @@ type Maps interface {
 	Create(ctx context.Context, smap model.Map) (model.Map, error)
 	Update(ctx context.Context, id int64, values OptionalMap) error
 	Delete(ctx context.Context, id int64) error
-	GetAll(ctx context.Context) ([]model.Map, error)
 	List(ctx context.Context, filters OptionalMap, page model.Page) ([]model.Map, error)
 	IncrementLoadCount(ctx context.Context, id int64) error
 }

pkg/datastore/filter.go

@@ -23,14 +23,6 @@ func (q OptionalMap) AddNotNil(column string, value interface{}) OptionalMap {
 	return q
 }
 
-func (q OptionalMap) Pop(column string) (interface{}, bool) {
-	value, ok := q.filter[column]
-	if ok {
-		delete(q.filter, column)
-	}
-	return value, ok
-}
-
 func (q OptionalMap) Map() map[string]interface{} {
 	return q.filter
 }

pkg/datastore/gormstore/maps.go

@@ -74,21 +74,9 @@ func (env *Maps) Delete(ctx context.Context, id int64) error {
 	return nil
 }
 
-func (env *Maps) GetAll(ctx context.Context) ([]model.Map, error) {
-	var maps []model.Map
-	if err := env.db.Find(&maps).Error; err != nil {
-		return nil, err
-	}
-	return maps, nil
-}
-
 func (env *Maps) List(ctx context.Context, filters datastore.OptionalMap, page model.Page) ([]model.Map, error) {
 	var events []model.Map
-	tx := env.db.Model(&model.Map{})
+	if err := env.db.Where(filters.Map()).Offset(int((page.Number - 1) * page.Size)).Limit(int(page.Size)).Find(&events).Error; err != nil {
-	if displayName, ok := filters.Pop("display_name"); ok {
-		tx = tx.Where("display_name ILIKE ?", "%"+displayName.(string)+"%")
-	}
-	if err := tx.Where(filters.Map()).Offset(int((page.Number - 1) * page.Size)).Limit(int(page.Size)).Find(&events).Error; err != nil {
 		return nil, err
 	}
 

pkg/model/nats.go

@@ -91,7 +91,3 @@ type ReleaseMapfixRequest struct {
 	ModelVersion  uint64
 	TargetAssetID uint64
 }
-
-type SeedCombobulatorRequest struct {
-	AssetID uint64
-}

pkg/model/policy.go

@@ -17,7 +17,7 @@ type ScriptPolicy struct {
 	// Hash of the source code that leads to this policy.
 	// If this is a replacement mapping, the original source may not be pointed to by any policy.
 	// The original source should still exist in the scripts table, which can be located by the same hash.
-	FromScriptHash int64 `gorm:"uniqueIndex"` // postgres does not support unsigned integers, so we have to pretend
+	FromScriptHash int64 // postgres does not support unsigned integers, so we have to pretend
 	// The ID of the replacement source (ScriptPolicyReplace)
 	// or verbatim source (ScriptPolicyAllowed)
 	// or 0 (other)

pkg/model/script.go

@@ -26,7 +26,7 @@ func HashParse(hash string) (uint64, error){
 type Script struct {
 	ID           int64 `gorm:"primaryKey"`
 	Name         string
-	Hash         int64 `gorm:"uniqueIndex"` // postgres does not support unsigned integers, so we have to pretend
+	Hash         int64 // postgres does not support unsigned integers, so we have to pretend
 	Source       string
 	ResourceType ResourceType // is this a submission or is it a mapfix
 	ResourceID   int64 // which submission / mapfix did this script first appear in

pkg/public_api/dto/map.go

@@ -1,9 +1,8 @@
 package dto
 
 import (
-	"time"
-
 	"git.itzana.me/strafesnet/go-grpc/maps_extended"
+	"time"
 )
 
 type MapFilter struct {

pkg/public_api/handlers/maps.go

@@ -81,47 +81,6 @@ func (h *MapHandler) Get(ctx *gin.Context) {
 	})
 }
 
-// @Summary Download SNFM file
-// @Description Redirects to a signed download URL for a map's SNFM file
-// @Tags maps
-// @Security ApiKeyAuth
-// @Param id path int true "Map ID"
-// @Success 307 "Redirect to signed S3 URL"
-// @Failure 404 {object} dto.Error "Map not found"
-// @Failure default {object} dto.Error "General error response"
-// @Router /map/{id}/snfm [get]
-func (h *MapHandler) GetSnfmDownloadUrl(ctx *gin.Context) {
-	id := ctx.Param("id")
-	mapID, err := strconv.ParseInt(id, 10, 64)
-	if err != nil {
-		ctx.JSON(http.StatusBadRequest, dto.Error{
-			Error: "Invalid map ID format",
-		})
-		return
-	}
-
-	resp, err := maps_extended.NewMapsServiceClient(h.mapsClient).GetSnfmDownloadUrl(ctx, &maps_extended.MapId{
-		ID: mapID,
-	})
-	if err != nil {
-		statusCode := http.StatusInternalServerError
-		errorMessage := "Failed to get download URL"
-
-		if status.Code(err) == codes.NotFound {
-			statusCode = http.StatusNotFound
-			errorMessage = "Map not found"
-		}
-
-		ctx.JSON(statusCode, dto.Error{
-			Error: errorMessage,
-		})
-		log.WithError(err).Error("Failed to get SNFM download URL")
-		return
-	}
-
-	ctx.Redirect(http.StatusTemporaryRedirect, resp.Url)
-}
-
 // @Summary List maps
 // @Description Get a list of maps
 // @Tags maps

pkg/public_api/router.go

@@ -93,13 +93,6 @@ func setupRoutes(cfg *RouterConfig) (*gin.Engine, error) {
 			v1.GET("/map/:id", mapsHandler.Get)
 		}
 
-		v1Download := public_api.Group("/v1")
-		{
-			v1Download.Use(middleware.ValidateRequest("Maps", "Download", cfg.devClient))
-
-			v1Download.GET("/map/:id/snfm", mapsHandler.GetSnfmDownloadUrl)
-		}
-
 		// Docs
 		public_api.GET("/docs/*any", ginSwagger.WrapHandler(swaggerfiles.Handler))
 		public_api.GET("/", func(ctx *gin.Context) {

pkg/roblox/thumbnails.go

@@ -1,160 +0,0 @@
-package roblox
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-)
-
-// ThumbnailSize represents valid Roblox thumbnail sizes
-type ThumbnailSize string
-
-const (
-	Size150x150 ThumbnailSize = "150x150"
-	Size420x420 ThumbnailSize = "420x420"
-	Size768x432 ThumbnailSize = "768x432"
-)
-
-// ThumbnailFormat represents the image format
-type ThumbnailFormat string
-
-const (
-	FormatPng  ThumbnailFormat = "Png"
-	FormatJpeg ThumbnailFormat = "Jpeg"
-)
-
-// ThumbnailRequest represents a single thumbnail request
-type ThumbnailRequest struct {
-	RequestID string `json:"requestId,omitempty"`
-	Type      string `json:"type"`
-	TargetID  uint64 `json:"targetId"`
-	Size      string `json:"size,omitempty"`
-	Format    string `json:"format,omitempty"`
-}
-
-// ThumbnailData represents a single thumbnail response
-type ThumbnailData struct {
-	TargetID uint64 `json:"targetId"`
-	State    string `json:"state"` // "Completed", "Error", "Pending"
-	ImageURL string `json:"imageUrl"`
-}
-
-// BatchThumbnailsResponse represents the API response
-type BatchThumbnailsResponse struct {
-	Data []ThumbnailData `json:"data"`
-}
-
-// GetAssetThumbnails fetches thumbnails for multiple assets in a single batch request
-// Roblox allows up to 100 assets per batch
-func (c *Client) GetAssetThumbnails(assetIDs []uint64, size ThumbnailSize, format ThumbnailFormat) ([]ThumbnailData, error) {
-	if len(assetIDs) == 0 {
-		return []ThumbnailData{}, nil
-	}
-	if len(assetIDs) > 100 {
-		return nil, GetError("batch size cannot exceed 100 assets")
-	}
-
-	// Build request payload - the API expects an array directly, not wrapped in an object
-	requests := make([]ThumbnailRequest, len(assetIDs))
-	for i, assetID := range assetIDs {
-		requests[i] = ThumbnailRequest{
-			Type:     "Asset",
-			TargetID: assetID,
-			Size:     string(size),
-			Format:   string(format),
-		}
-	}
-
-	jsonData, err := json.Marshal(requests)
-	if err != nil {
-		return nil, GetError("JSONMarshalError: " + err.Error())
-	}
-
-	req, err := http.NewRequest("POST", "https://thumbnails.roblox.com/v1/batch", bytes.NewBuffer(jsonData))
-	if err != nil {
-		return nil, GetError("RequestCreationError: " + err.Error())
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-
-	resp, err := c.HttpClient.Do(req)
-	if err != nil {
-		return nil, GetError("RequestError: " + err.Error())
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		body, _ := io.ReadAll(resp.Body)
-		return nil, GetError(fmt.Sprintf("ResponseError: status code %d, body: %s", resp.StatusCode, string(body)))
-	}
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, GetError("ReadBodyError: " + err.Error())
-	}
-
-	var response BatchThumbnailsResponse
-	if err := json.Unmarshal(body, &response); err != nil {
-		return nil, GetError("JSONUnmarshalError: " + err.Error())
-	}
-
-	return response.Data, nil
-}
-
-// GetUserAvatarThumbnails fetches avatar thumbnails for multiple users in a single batch request
-func (c *Client) GetUserAvatarThumbnails(userIDs []uint64, size ThumbnailSize, format ThumbnailFormat) ([]ThumbnailData, error) {
-	if len(userIDs) == 0 {
-		return []ThumbnailData{}, nil
-	}
-	if len(userIDs) > 100 {
-		return nil, GetError("batch size cannot exceed 100 users")
-	}
-
-	// Build request payload - the API expects an array directly, not wrapped in an object
-	requests := make([]ThumbnailRequest, len(userIDs))
-	for i, userID := range userIDs {
-		requests[i] = ThumbnailRequest{
-			Type:     "AvatarHeadShot",
-			TargetID: userID,
-			Size:     string(size),
-			Format:   string(format),
-		}
-	}
-
-	jsonData, err := json.Marshal(requests)
-	if err != nil {
-		return nil, GetError("JSONMarshalError: " + err.Error())
-	}
-
-	req, err := http.NewRequest("POST", "https://thumbnails.roblox.com/v1/batch", bytes.NewBuffer(jsonData))
-	if err != nil {
-		return nil, GetError("RequestCreationError: " + err.Error())
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-
-	resp, err := c.HttpClient.Do(req)
-	if err != nil {
-		return nil, GetError("RequestError: " + err.Error())
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		body, _ := io.ReadAll(resp.Body)
-		return nil, GetError(fmt.Sprintf("ResponseError: status code %d, body: %s", resp.StatusCode, string(body)))
-	}
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, GetError("ReadBodyError: " + err.Error())
-	}
-
-	var response BatchThumbnailsResponse
-	if err := json.Unmarshal(body, &response); err != nil {
-		return nil, GetError("JSONUnmarshalError: " + err.Error())
-	}
-
-	return response.Data, nil
-}

pkg/roblox/users.go

@@ -1,72 +0,0 @@
-package roblox
-
-import (
-	"bytes"
-	"encoding/json"
-	"fmt"
-	"io"
-	"net/http"
-)
-
-// UserData represents a single user's information
-type UserData struct {
-	ID          uint64 `json:"id"`
-	Name        string `json:"name"`
-	DisplayName string `json:"displayName"`
-}
-
-// BatchUsersResponse represents the API response for batch user requests
-type BatchUsersResponse struct {
-	Data []UserData `json:"data"`
-}
-
-// GetUsernames fetches usernames for multiple users in a single batch request
-// Roblox allows up to 100 users per batch
-func (c *Client) GetUsernames(userIDs []uint64) ([]UserData, error) {
-	if len(userIDs) == 0 {
-		return []UserData{}, nil
-	}
-	if len(userIDs) > 100 {
-		return nil, GetError("batch size cannot exceed 100 users")
-	}
-
-	// Build request payload
-	payload := map[string][]uint64{
-		"userIds": userIDs,
-	}
-
-	jsonData, err := json.Marshal(payload)
-	if err != nil {
-		return nil, GetError("JSONMarshalError: " + err.Error())
-	}
-
-	req, err := http.NewRequest("POST", "https://users.roblox.com/v1/users", bytes.NewBuffer(jsonData))
-	if err != nil {
-		return nil, GetError("RequestCreationError: " + err.Error())
-	}
-
-	req.Header.Set("Content-Type", "application/json")
-
-	resp, err := c.HttpClient.Do(req)
-	if err != nil {
-		return nil, GetError("RequestError: " + err.Error())
-	}
-	defer resp.Body.Close()
-
-	if resp.StatusCode != http.StatusOK {
-		body, _ := io.ReadAll(resp.Body)
-		return nil, GetError(fmt.Sprintf("ResponseError: status code %d, body: %s", resp.StatusCode, string(body)))
-	}
-
-	body, err := io.ReadAll(resp.Body)
-	if err != nil {
-		return nil, GetError("ReadBodyError: " + err.Error())
-	}
-
-	var response BatchUsersResponse
-	if err := json.Unmarshal(body, &response); err != nil {
-		return nil, GetError("JSONUnmarshalError: " + err.Error())
-	}
-
-	return response.Data, nil
-}

pkg/service/mapfixes.go

@@ -103,10 +103,6 @@ func (svc *Service) GetMapfix(ctx context.Context, id int64) (model.Mapfix, erro
 	return svc.db.Mapfixes().Get(ctx, id)
 }
 
-func (svc *Service) GetMapfixList(ctx context.Context, ids []int64) ([]model.Mapfix, error) {
-	return svc.db.Mapfixes().GetList(ctx, ids)
-}
-
 func (svc *Service) UpdateMapfix(ctx context.Context, id int64, pmap MapfixUpdate) error {
 	return svc.db.Mapfixes().Update(ctx, id, datastore.OptionalMap(pmap))
 }

pkg/service/maps.go

@@ -99,10 +99,6 @@ func (svc *Service) CreateMap(ctx context.Context, item model.Map) (int64, error
 	return map_item.ID, nil
 }
 
-func (svc *Service) GetAllMaps(ctx context.Context) ([]model.Map, error) {
-	return svc.db.Maps().GetAll(ctx)
-}
-
 func (svc *Service) ListMaps(ctx context.Context, filter MapFilter, page model.Page) ([]model.Map, error) {
 	return svc.db.Maps().List(ctx, datastore.OptionalMap(filter), page)
 }

pkg/service/nats_maps.go

@@ -1,21 +0,0 @@
-package service
-
-import (
-	"encoding/json"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-)
-
-func (svc *Service) NatsSeedCombobulator(assetID uint64) error {
-	request := model.SeedCombobulatorRequest{
-		AssetID: assetID,
-	}
-
-	j, err := json.Marshal(request)
-	if err != nil {
-		return err
-	}
-
-	_, err = svc.nats.Publish("maptest.combobulator.seed", j)
-	return err
-}

pkg/service/service.go

@@ -1,27 +1,17 @@
 package service
 
 import (
-	"context"
-	"fmt"
-	"time"
-
 	"git.itzana.me/strafesnet/go-grpc/maps"
 	"git.itzana.me/strafesnet/go-grpc/users"
 	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/roblox"
-	"github.com/aws/aws-sdk-go-v2/service/s3"
 	"github.com/nats-io/nats.go"
-	"github.com/redis/go-redis/v9"
 )
 
 type Service struct {
-	db               datastore.Datastore
+	db     datastore.Datastore
-	nats             nats.JetStreamContext
+	nats   nats.JetStreamContext
-	maps             maps.MapsServiceClient
+	maps   maps.MapsServiceClient
-	users            users.UsersServiceClient
+	users  users.UsersServiceClient
-	thumbnailService *ThumbnailService
-	s3Presign        *s3.PresignClient
-	s3Bucket         string
 }
 
 func NewService(
@@ -29,60 +19,11 @@ func NewService(
 	nats nats.JetStreamContext,
 	maps maps.MapsServiceClient,
 	users users.UsersServiceClient,
-	robloxClient *roblox.Client,
-	redisClient *redis.Client,
-	s3Client *s3.Client,
-	s3Bucket string,
 ) Service {
 	return Service{
-		db:               db,
+		db:     db,
-		nats:             nats,
+		nats:   nats,
-		maps:             maps,
+		maps:   maps,
-		users:            users,
+		users:  users,
-		thumbnailService: NewThumbnailService(robloxClient, redisClient),
-		s3Presign:        s3.NewPresignClient(s3Client),
-		s3Bucket:         s3Bucket,
 	}
 }
-
-func (s *Service) GetSnfmDownloadUrl(ctx context.Context, mapID int64) (string, error) {
-	key := fmt.Sprintf("maps/%d.snfm", mapID)
-	presigned, err := s.s3Presign.PresignGetObject(ctx, &s3.GetObjectInput{
-		Bucket: &s.s3Bucket,
-		Key:    &key,
-	}, s3.WithPresignExpires(5*time.Minute))
-	if err != nil {
-		return "", err
-	}
-	return presigned.URL, nil
-}
-
-// GetAssetThumbnails proxies to the thumbnail service
-func (s *Service) GetAssetThumbnails(ctx context.Context, assetIDs []uint64, size roblox.ThumbnailSize) (map[uint64]string, error) {
-	return s.thumbnailService.GetAssetThumbnails(ctx, assetIDs, size)
-}
-
-// GetUserAvatarThumbnails proxies to the thumbnail service
-func (s *Service) GetUserAvatarThumbnails(ctx context.Context, userIDs []uint64, size roblox.ThumbnailSize) (map[uint64]string, error) {
-	return s.thumbnailService.GetUserAvatarThumbnails(ctx, userIDs, size)
-}
-
-// GetSingleAssetThumbnail proxies to the thumbnail service
-func (s *Service) GetSingleAssetThumbnail(ctx context.Context, assetID uint64, size roblox.ThumbnailSize) (string, error) {
-	return s.thumbnailService.GetSingleAssetThumbnail(ctx, assetID, size)
-}
-
-// GetSingleUserAvatarThumbnail proxies to the thumbnail service
-func (s *Service) GetSingleUserAvatarThumbnail(ctx context.Context, userID uint64, size roblox.ThumbnailSize) (string, error) {
-	return s.thumbnailService.GetSingleUserAvatarThumbnail(ctx, userID, size)
-}
-
-// GetUsernames proxies to the thumbnail service
-func (s *Service) GetUsernames(ctx context.Context, userIDs []uint64) (map[uint64]string, error) {
-	return s.thumbnailService.GetUsernames(ctx, userIDs)
-}
-
-// GetSingleUsername proxies to the thumbnail service
-func (s *Service) GetSingleUsername(ctx context.Context, userID uint64) (string, error) {
-	return s.thumbnailService.GetSingleUsername(ctx, userID)
-}

pkg/service/thumbnails.go

@@ -1,218 +0,0 @@
-package service
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/roblox"
-	"github.com/redis/go-redis/v9"
-)
-
-type ThumbnailService struct {
-	robloxClient *roblox.Client
-	redisClient  *redis.Client
-	cacheTTL     time.Duration
-}
-
-func NewThumbnailService(robloxClient *roblox.Client, redisClient *redis.Client) *ThumbnailService {
-	return &ThumbnailService{
-		robloxClient: robloxClient,
-		redisClient:  redisClient,
-		cacheTTL:     24 * time.Hour, // Cache thumbnails for 24 hours
-	}
-}
-
-// CachedThumbnail represents a cached thumbnail entry
-type CachedThumbnail struct {
-	ImageURL  string    `json:"imageUrl"`
-	State     string    `json:"state"`
-	CachedAt  time.Time `json:"cachedAt"`
-}
-
-// GetAssetThumbnails fetches thumbnails with Redis caching and batching
-func (s *ThumbnailService) GetAssetThumbnails(ctx context.Context, assetIDs []uint64, size roblox.ThumbnailSize) (map[uint64]string, error) {
-	if len(assetIDs) == 0 {
-		return map[uint64]string{}, nil
-	}
-
-	result := make(map[uint64]string)
-	var missingIDs []uint64
-
-	// Try to get from cache first
-	for _, assetID := range assetIDs {
-		cacheKey := fmt.Sprintf("thumbnail:asset:%d:%s", assetID, size)
-		cached, err := s.redisClient.Get(ctx, cacheKey).Result()
-
-		if err == redis.Nil {
-			// Cache miss
-			missingIDs = append(missingIDs, assetID)
-		} else if err != nil {
-			// Redis error - treat as cache miss
-			missingIDs = append(missingIDs, assetID)
-		} else {
-			// Cache hit
-			var thumbnail CachedThumbnail
-			if err := json.Unmarshal([]byte(cached), &thumbnail); err == nil && thumbnail.State == "Completed" {
-				result[assetID] = thumbnail.ImageURL
-			} else {
-				missingIDs = append(missingIDs, assetID)
-			}
-		}
-	}
-
-	// If all were cached, return early
-	if len(missingIDs) == 0 {
-		return result, nil
-	}
-
-	// Batch fetch missing thumbnails from Roblox API
-	// Split into batches of 100 (Roblox API limit)
-	for i := 0; i < len(missingIDs); i += 100 {
-		end := i + 100
-		if end > len(missingIDs) {
-			end = len(missingIDs)
-		}
-		batch := missingIDs[i:end]
-
-		thumbnails, err := s.robloxClient.GetAssetThumbnails(batch, size, roblox.FormatPng)
-		if err != nil {
-			return nil, fmt.Errorf("failed to fetch thumbnails: %w", err)
-		}
-
-		// Process results and cache them
-		for _, thumb := range thumbnails {
-			cached := CachedThumbnail{
-				ImageURL: thumb.ImageURL,
-				State:    thumb.State,
-				CachedAt: time.Now(),
-			}
-
-			if thumb.State == "Completed" && thumb.ImageURL != "" {
-				result[thumb.TargetID] = thumb.ImageURL
-			}
-
-			// Cache the result (even if incomplete, to avoid repeated API calls)
-			cacheKey := fmt.Sprintf("thumbnail:asset:%d:%s", thumb.TargetID, size)
-			cachedJSON, _ := json.Marshal(cached)
-
-			// Use shorter TTL for incomplete thumbnails
-			ttl := s.cacheTTL
-			if thumb.State != "Completed" {
-				ttl = 5 * time.Minute
-			}
-
-			s.redisClient.Set(ctx, cacheKey, cachedJSON, ttl)
-		}
-	}
-
-	return result, nil
-}
-
-// GetUserAvatarThumbnails fetches user avatar thumbnails with Redis caching and batching
-func (s *ThumbnailService) GetUserAvatarThumbnails(ctx context.Context, userIDs []uint64, size roblox.ThumbnailSize) (map[uint64]string, error) {
-	if len(userIDs) == 0 {
-		return map[uint64]string{}, nil
-	}
-
-	result := make(map[uint64]string)
-	var missingIDs []uint64
-
-	// Try to get from cache first
-	for _, userID := range userIDs {
-		cacheKey := fmt.Sprintf("thumbnail:user:%d:%s", userID, size)
-		cached, err := s.redisClient.Get(ctx, cacheKey).Result()
-
-		if err == redis.Nil {
-			// Cache miss
-			missingIDs = append(missingIDs, userID)
-		} else if err != nil {
-			// Redis error - treat as cache miss
-			missingIDs = append(missingIDs, userID)
-		} else {
-			// Cache hit
-			var thumbnail CachedThumbnail
-			if err := json.Unmarshal([]byte(cached), &thumbnail); err == nil && thumbnail.State == "Completed" {
-				result[userID] = thumbnail.ImageURL
-			} else {
-				missingIDs = append(missingIDs, userID)
-			}
-		}
-	}
-
-	// If all were cached, return early
-	if len(missingIDs) == 0 {
-		return result, nil
-	}
-
-	// Batch fetch missing thumbnails from Roblox API
-	// Split into batches of 100 (Roblox API limit)
-	for i := 0; i < len(missingIDs); i += 100 {
-		end := i + 100
-		if end > len(missingIDs) {
-			end = len(missingIDs)
-		}
-		batch := missingIDs[i:end]
-
-		thumbnails, err := s.robloxClient.GetUserAvatarThumbnails(batch, size, roblox.FormatPng)
-		if err != nil {
-			return nil, fmt.Errorf("failed to fetch user thumbnails: %w", err)
-		}
-
-		// Process results and cache them
-		for _, thumb := range thumbnails {
-			cached := CachedThumbnail{
-				ImageURL: thumb.ImageURL,
-				State:    thumb.State,
-				CachedAt: time.Now(),
-			}
-
-			if thumb.State == "Completed" && thumb.ImageURL != "" {
-				result[thumb.TargetID] = thumb.ImageURL
-			}
-
-			// Cache the result
-			cacheKey := fmt.Sprintf("thumbnail:user:%d:%s", thumb.TargetID, size)
-			cachedJSON, _ := json.Marshal(cached)
-
-			// Use shorter TTL for incomplete thumbnails
-			ttl := s.cacheTTL
-			if thumb.State != "Completed" {
-				ttl = 5 * time.Minute
-			}
-
-			s.redisClient.Set(ctx, cacheKey, cachedJSON, ttl)
-		}
-	}
-
-	return result, nil
-}
-
-// GetSingleAssetThumbnail is a convenience method for fetching a single asset thumbnail
-func (s *ThumbnailService) GetSingleAssetThumbnail(ctx context.Context, assetID uint64, size roblox.ThumbnailSize) (string, error) {
-	results, err := s.GetAssetThumbnails(ctx, []uint64{assetID}, size)
-	if err != nil {
-		return "", err
-	}
-
-	if url, ok := results[assetID]; ok {
-		return url, nil
-	}
-
-	return "", fmt.Errorf("thumbnail not available for asset %d", assetID)
-}
-
-// GetSingleUserAvatarThumbnail is a convenience method for fetching a single user avatar thumbnail
-func (s *ThumbnailService) GetSingleUserAvatarThumbnail(ctx context.Context, userID uint64, size roblox.ThumbnailSize) (string, error) {
-	results, err := s.GetUserAvatarThumbnails(ctx, []uint64{userID}, size)
-	if err != nil {
-		return "", err
-	}
-
-	if url, ok := results[userID]; ok {
-		return url, nil
-	}
-
-	return "", fmt.Errorf("thumbnail not available for user %d", userID)
-}

pkg/service/users.go

@@ -1,108 +0,0 @@
-package service
-
-import (
-	"context"
-	"encoding/json"
-	"fmt"
-	"time"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/roblox"
-	"github.com/redis/go-redis/v9"
-)
-
-// CachedUser represents a cached user entry
-type CachedUser struct {
-	Name        string    `json:"name"`
-	DisplayName string    `json:"displayName"`
-	CachedAt    time.Time `json:"cachedAt"`
-}
-
-// GetUsernames fetches usernames with Redis caching and batching
-func (s *ThumbnailService) GetUsernames(ctx context.Context, userIDs []uint64) (map[uint64]string, error) {
-	if len(userIDs) == 0 {
-		return map[uint64]string{}, nil
-	}
-
-	result := make(map[uint64]string)
-	var missingIDs []uint64
-
-	// Try to get from cache first
-	for _, userID := range userIDs {
-		cacheKey := fmt.Sprintf("user:name:%d", userID)
-		cached, err := s.redisClient.Get(ctx, cacheKey).Result()
-
-		if err == redis.Nil {
-			// Cache miss
-			missingIDs = append(missingIDs, userID)
-		} else if err != nil {
-			// Redis error - treat as cache miss
-			missingIDs = append(missingIDs, userID)
-		} else {
-			// Cache hit
-			var user CachedUser
-			if err := json.Unmarshal([]byte(cached), &user); err == nil && user.Name != "" {
-				result[userID] = user.Name
-			} else {
-				missingIDs = append(missingIDs, userID)
-			}
-		}
-	}
-
-	// If all were cached, return early
-	if len(missingIDs) == 0 {
-		return result, nil
-	}
-
-	// Batch fetch missing usernames from Roblox API
-	// Split into batches of 100 (Roblox API limit)
-	for i := 0; i < len(missingIDs); i += 100 {
-		end := i + 100
-		if end > len(missingIDs) {
-			end = len(missingIDs)
-		}
-		batch := missingIDs[i:end]
-
-		var users []roblox.UserData
-		var err error
-		users, err = s.robloxClient.GetUsernames(batch)
-		if err != nil {
-			return nil, fmt.Errorf("failed to fetch usernames: %w", err)
-		}
-
-		// Process results and cache them
-		for _, user := range users {
-			cached := CachedUser{
-				Name:        user.Name,
-				DisplayName: user.DisplayName,
-				CachedAt:    time.Now(),
-			}
-
-			if user.Name != "" {
-				result[user.ID] = user.Name
-			}
-
-			// Cache the result
-			cacheKey := fmt.Sprintf("user:name:%d", user.ID)
-			cachedJSON, _ := json.Marshal(cached)
-
-			// Cache usernames for a long time (7 days) since they rarely change
-			s.redisClient.Set(ctx, cacheKey, cachedJSON, 7*24*time.Hour)
-		}
-	}
-
-	return result, nil
-}
-
-// GetSingleUsername is a convenience method for fetching a single username
-func (s *ThumbnailService) GetSingleUsername(ctx context.Context, userID uint64) (string, error) {
-	results, err := s.GetUsernames(ctx, []uint64{userID})
-	if err != nil {
-		return "", err
-	}
-
-	if name, ok := results[userID]; ok {
-		return name, nil
-	}
-
-	return "", fmt.Errorf("username not available for user %d", userID)
-}

pkg/web_api/mapfixes.go

@@ -2,6 +2,7 @@ package web_api
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"time"
@@ -34,10 +35,10 @@ var(
 )
 
 var (
-	ErrCreationPhaseMapfixesLimit = fmt.Errorf("%w: Active mapfixes limited to 20", ErrPermissionDenied)
+	ErrCreationPhaseMapfixesLimit = errors.New("Active mapfixes limited to 20")
-	ErrActiveMapfixSameTargetAssetID = fmt.Errorf("%w: There is an active mapfix for this map already", ErrPermissionDenied)
+	ErrActiveMapfixSameTargetAssetID = errors.New("There is an active mapfix for this map already")
 	ErrAcceptOwnMapfix = fmt.Errorf("%w: You cannot accept your own mapfix as the submitter", ErrPermissionDenied)
-	ErrCreateMapfixRateLimit = fmt.Errorf("%w: You must not create more than 5 mapfixes every 10 minutes", ErrTooManyRequests)
+	ErrCreateMapfixRateLimit = errors.New("You must not create more than 5 mapfixes every 10 minutes")
 )
 
 // POST /mapfixes
@@ -326,48 +327,6 @@ func (svc *Service) UpdateMapfixModel(ctx context.Context, params api.UpdateMapf
 	)
 }
 
-// UpdateMapfixDescription implements updateMapfixDescription operation.
-//
-// Update description (submitter only, status ChangesRequested or UnderConstruction).
-//
-// PATCH /mapfixes/{MapfixID}/description
-func (svc *Service) UpdateMapfixDescription(ctx context.Context, req api.UpdateMapfixDescriptionReq, params api.UpdateMapfixDescriptionParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
-	if !ok {
-		return ErrUserInfo
-	}
-
-	// read mapfix
-	mapfix, err := svc.inner.GetMapfix(ctx, params.MapfixID)
-	if err != nil {
-		return err
-	}
-
-	userId, err := userInfo.GetUserID()
-	if err != nil {
-		return err
-	}
-
-	// check if caller is the submitter
-	if userId != mapfix.Submitter {
-		return ErrPermissionDeniedNotSubmitter
-	}
-
-	// read the new description from request body
-	data, err := io.ReadAll(req)
-	if err != nil {
-		return err
-	}
-
-	newDescription := string(data)
-
-	// check if Status is ChangesRequested or UnderConstruction
-	update := service.NewMapfixUpdate()
-	update.SetDescription(newDescription)
-	allow_statuses := []model.MapfixStatus{model.MapfixStatusChangesRequested, model.MapfixStatusUnderConstruction}
-	return svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
-}
-
 // ActionMapfixReject invokes actionMapfixReject operation.
 //
 // Role Reviewer changes status from Submitted -> Rejected.
@@ -447,12 +406,7 @@ func (svc *Service) ActionMapfixRequestChanges(ctx context.Context, params api.A
 	target_status := model.MapfixStatusChangesRequested
 	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
-	allow_statuses := []model.MapfixStatus{
+	allow_statuses := []model.MapfixStatus{model.MapfixStatusValidated, model.MapfixStatusAcceptedUnvalidated, model.MapfixStatusSubmitted}
-		model.MapfixStatusUploaded,
-		model.MapfixStatusValidated,
-		model.MapfixStatusAcceptedUnvalidated,
-		model.MapfixStatusSubmitted,
-	}
 	err = svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
 	if err != nil {
 		return err
@@ -558,11 +512,7 @@ func (svc *Service) ActionMapfixTriggerSubmit(ctx context.Context, params api.Ac
 	target_status := model.MapfixStatusSubmitting
 	update := service.NewMapfixUpdate()
 	update.SetStatusID(target_status)
-	allow_statuses := []model.MapfixStatus{
+	allow_statuses := []model.MapfixStatus{model.MapfixStatusUnderConstruction, model.MapfixStatusChangesRequested}
-		model.MapfixStatusUnderConstruction,
-		model.MapfixStatusChangesRequested,
-		model.MapfixStatusSubmitted,
-	}
 	err = svc.inner.UpdateMapfixIfStatus(ctx, params.MapfixID, allow_statuses, update)
 	if err != nil {
 		return err

pkg/web_api/maps.go

@@ -86,61 +86,6 @@ func (svc *Service) GetMap(ctx context.Context, params api.GetMapParams) (*api.M
 	}, nil
 }
 
-// SeedCombobulator implements seedCombobulator operation.
-//
-// Queue all maps for combobulator processing.
-//
-// POST /maps-admin/seed-combobulator
-func (svc *Service) SeedCombobulator(ctx context.Context) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
-	if !ok {
-		return ErrUserInfo
-	}
-
-	has_role, err := userInfo.HasRoleSubmissionRelease()
-	if err != nil {
-		return err
-	}
-	if !has_role {
-		return ErrPermissionDeniedNeedRoleSubmissionRelease
-	}
-
-	maps, err := svc.inner.GetAllMaps(ctx)
-	if err != nil {
-		return err
-	}
-
-	for _, m := range maps {
-		if err := svc.inner.NatsSeedCombobulator(uint64(m.ID)); err != nil {
-			return err
-		}
-	}
-
-	return nil
-}
-
-// CombobulateMap implements combobulateMap operation.
-//
-// Queue a map for combobulator processing.
-//
-// POST /maps/{MapID}/combobulate
-func (svc *Service) CombobulateMap(ctx context.Context, params api.CombobulateMapParams) error {
-	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
-	if !ok {
-		return ErrUserInfo
-	}
-
-	has_role, err := userInfo.HasRoleSubmissionRelease()
-	if err != nil {
-		return err
-	}
-	if !has_role {
-		return ErrPermissionDeniedNeedRoleSubmissionRelease
-	}
-
-	return svc.inner.NatsSeedCombobulator(uint64(params.MapID));
-}
-
 // DownloadMapAsset invokes downloadMapAsset operation.
 //
 // Download the map asset.

pkg/web_api/scripts.go

@@ -36,28 +36,10 @@ func (svc *Service) CreateScript(ctx context.Context, req *api.ScriptCreate) (*a
 		return nil, err
 	}
 
-	hash := int64(model.HashSource(req.Source))
-
-	// Check if a script with this hash already exists
-	filter := service.NewScriptFilter()
-	filter.SetHash(hash)
-	existingScripts, err := svc.inner.ListScripts(ctx, filter, model.Page{Number: 1, Size: 1})
-	if err != nil {
-		return nil, err
-	}
-
-	// If script with this hash exists, return existing script ID
-	if len(existingScripts) > 0 {
-		return &api.ScriptID{
-			ScriptID: existingScripts[0].ID,
-		}, nil
-	}
-
-	// Create new script
 	script, err := svc.inner.CreateScript(ctx, model.Script{
 		ID:           0,
 		Name:         req.Name,
-		Hash:         hash,
+		Hash:         int64(model.HashSource(req.Source)),
 		Source:       req.Source,
 		ResourceType: model.ResourceType(req.ResourceType),
 		ResourceID:   req.ResourceID.Or(0),

pkg/web_api/security.go

@@ -2,7 +2,7 @@ package web_api
 
 import (
 	"context"
-	"fmt"
+	"errors"
 
 	"git.itzana.me/strafesnet/go-grpc/auth"
 	"git.itzana.me/strafesnet/maps-service/pkg/api"
@@ -11,9 +11,9 @@ import (
 
 var (
 	// ErrMissingSessionID there is no session id
-	ErrMissingSessionID = fmt.Errorf("%w: SessionID missing", ErrUserInfo)
+	ErrMissingSessionID = errors.New("SessionID missing")
 	// ErrInvalidSession caller does not have a valid session
-	ErrInvalidSession = fmt.Errorf("%w: Session invalid", ErrUserInfo)
+	ErrInvalidSession = errors.New("Session invalid")
 )
 
 type UserInfoHandle struct {

pkg/web_api/service.go

@@ -12,8 +12,6 @@ import (
 )
 
 var (
-	ErrBadRequest = errors.New("Bad request")
-	ErrTooManyRequests = errors.New("Too many requests")
 	// ErrPermissionDenied caller does not have the required role
 	ErrPermissionDenied = errors.New("Permission denied")
 	// ErrUserInfo user info is missing for some reason
@@ -28,7 +26,7 @@ var (
 	ErrPermissionDeniedNeedRoleMapDownload = fmt.Errorf("%w: Need Role MapDownload", ErrPermissionDenied)
 	ErrPermissionDeniedNeedRoleScriptWrite = fmt.Errorf("%w: Need Role ScriptWrite", ErrPermissionDenied)
 	ErrPermissionDeniedNeedRoleMaptest = fmt.Errorf("%w: Need Role Maptest", ErrPermissionDenied)
-	ErrNegativeID = fmt.Errorf("%w: A negative ID was provided", ErrBadRequest)
+	ErrNegativeID = errors.New("A negative ID was provided")
 )
 
 type Service struct {
@@ -51,20 +49,14 @@ func NewService(
 // Used for common default response.
 func (svc *Service) NewError(ctx context.Context, err error) *api.ErrorStatusCode {
 	status := 500
-	if errors.Is(err, ErrBadRequest) {
+	if errors.Is(err, datastore.ErrNotExist) {
-		status = 400
+		status = 404
-	}
-	if errors.Is(err, ErrUserInfo) {
-		status = 401
 	}
 	if errors.Is(err, ErrPermissionDenied) {
 		status = 403
 	}
-	if errors.Is(err, datastore.ErrNotExist) {
+	if errors.Is(err, ErrUserInfo) {
-		status = 404
+		status = 401
-	}
-	if errors.Is(err, ErrTooManyRequests) {
-		status = 429
 	}
 	return &api.ErrorStatusCode{
 		StatusCode: status,

pkg/web_api/stats.go

@@ -1,105 +0,0 @@
-package web_api
-
-import (
-	"context"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/api"
-	"git.itzana.me/strafesnet/maps-service/pkg/datastore"
-	"git.itzana.me/strafesnet/maps-service/pkg/model"
-	"git.itzana.me/strafesnet/maps-service/pkg/service"
-)
-
-// GET /stats
-func (svc *Service) GetStats(ctx context.Context) (*api.Stats, error) {
-	// Get total submissions count
-	totalSubmissions, _, err := svc.inner.ListSubmissionsWithTotal(ctx, service.NewSubmissionFilter(), model.Page{
-		Number: 1,
-		Size:   0, // We only want the count, not the items
-	}, datastore.ListSortDisabled)
-	if err != nil {
-		return nil, err
-	}
-
-	// Get total mapfixes count
-	totalMapfixes, _, err := svc.inner.ListMapfixesWithTotal(ctx, service.NewMapfixFilter(), model.Page{
-		Number: 1,
-		Size:   0, // We only want the count, not the items
-	}, datastore.ListSortDisabled)
-	if err != nil {
-		return nil, err
-	}
-
-	// Get released submissions count
-	releasedSubmissionsFilter := service.NewSubmissionFilter()
-	releasedSubmissionsFilter.SetStatuses([]model.SubmissionStatus{model.SubmissionStatusReleased})
-	releasedSubmissions, _, err := svc.inner.ListSubmissionsWithTotal(ctx, releasedSubmissionsFilter, model.Page{
-		Number: 1,
-		Size:   0,
-	}, datastore.ListSortDisabled)
-	if err != nil {
-		return nil, err
-	}
-
-	// Get released mapfixes count
-	releasedMapfixesFilter := service.NewMapfixFilter()
-	releasedMapfixesFilter.SetStatuses([]model.MapfixStatus{model.MapfixStatusReleased})
-	releasedMapfixes, _, err := svc.inner.ListMapfixesWithTotal(ctx, releasedMapfixesFilter, model.Page{
-		Number: 1,
-		Size:   0,
-	}, datastore.ListSortDisabled)
-	if err != nil {
-		return nil, err
-	}
-
-	// Get submitted submissions count (under review)
-	submittedSubmissionsFilter := service.NewSubmissionFilter()
-	submittedSubmissionsFilter.SetStatuses([]model.SubmissionStatus{
-		model.SubmissionStatusUnderConstruction,
-		model.SubmissionStatusChangesRequested,
-		model.SubmissionStatusSubmitting,
-		model.SubmissionStatusSubmitted,
-		model.SubmissionStatusAcceptedUnvalidated,
-		model.SubmissionStatusValidating,
-		model.SubmissionStatusValidated,
-		model.SubmissionStatusUploading,
-		model.SubmissionStatusUploaded,
-	})
-	submittedSubmissions, _, err := svc.inner.ListSubmissionsWithTotal(ctx, submittedSubmissionsFilter, model.Page{
-		Number: 1,
-		Size:   0,
-	}, datastore.ListSortDisabled)
-	if err != nil {
-		return nil, err
-	}
-
-	// Get submitted mapfixes count (under review)
-	submittedMapfixesFilter := service.NewMapfixFilter()
-	submittedMapfixesFilter.SetStatuses([]model.MapfixStatus{
-		model.MapfixStatusUnderConstruction,
-		model.MapfixStatusChangesRequested,
-		model.MapfixStatusSubmitting,
-		model.MapfixStatusSubmitted,
-		model.MapfixStatusAcceptedUnvalidated,
-		model.MapfixStatusValidating,
-		model.MapfixStatusValidated,
-		model.MapfixStatusUploading,
-		model.MapfixStatusUploaded,
-		model.MapfixStatusReleasing,
-	})
-	submittedMapfixes, _, err := svc.inner.ListMapfixesWithTotal(ctx, submittedMapfixesFilter, model.Page{
-		Number: 1,
-		Size:   0,
-	}, datastore.ListSortDisabled)
-	if err != nil {
-		return nil, err
-	}
-
-	return &api.Stats{
-		TotalSubmissions:     totalSubmissions,
-		TotalMapfixes:        totalMapfixes,
-		ReleasedSubmissions:  releasedSubmissions,
-		ReleasedMapfixes:     releasedMapfixes,
-		SubmittedSubmissions: submittedSubmissions,
-		SubmittedMapfixes:    submittedMapfixes,
-	}, nil
-}

pkg/web_api/submissions.go

@@ -2,6 +2,7 @@ package web_api
 
 import (
 	"context"
+	"errors"
 	"fmt"
 	"io"
 	"time"
@@ -12,35 +13,34 @@ import (
 	"git.itzana.me/strafesnet/maps-service/pkg/service"
 )
 
-var (
+var(
-	CreationPhaseSubmissionsLimit   = 20
+	CreationPhaseSubmissionsLimit = 20
 	CreationPhaseSubmissionStatuses = []model.SubmissionStatus{
 		model.SubmissionStatusChangesRequested,
 		model.SubmissionStatusSubmitted,
 		model.SubmissionStatusUnderConstruction,
 	}
 	// Allow 5 submissions every 10 minutes
-	CreateSubmissionRateLimit     int64 = 5
+	CreateSubmissionRateLimit int64 = 5
-	CreateSubmissionRecencyWindow       = time.Second * 600
+	CreateSubmissionRecencyWindow = time.Second*600
 )
 
 var (
-	ErrCreationPhaseSubmissionsLimit = fmt.Errorf("%w: Active submissions limited to 20", ErrPermissionDenied)
+	ErrCreationPhaseSubmissionsLimit = errors.New("Active submissions limited to 20")
-	ErrUploadedAssetIDAlreadyExists  = fmt.Errorf("%w: The submission UploadedAssetID is already set", ErrPermissionDenied)
+	ErrUploadedAssetIDAlreadyExists = errors.New("The submission UploadedAssetID is already set")
-	ErrReleaseInvalidStatus          = fmt.Errorf("%w: Only submissions with Uploaded status can be released", ErrPermissionDenied)
+	ErrReleaseInvalidStatus = errors.New("Only submissions with Uploaded status can be released")
-	ErrReleaseNoUploadedAssetID      = fmt.Errorf("%w: Only submissions with a UploadedAssetID can be released", ErrPermissionDenied)
+	ErrReleaseNoUploadedAssetID = errors.New("Only submissions with a UploadedAssetID can be released")
-	ErrAcceptOwnSubmission           = fmt.Errorf("%w: You cannot accept your own submission as the submitter", ErrPermissionDenied)
+	ErrAcceptOwnSubmission = fmt.Errorf("%w: You cannot accept your own submission as the submitter", ErrPermissionDenied)
-	ErrCreateSubmissionRateLimit     = fmt.Errorf("%w: You must not create more than 5 submissions every 10 minutes", ErrTooManyRequests)
+	ErrCreateSubmissionRateLimit = errors.New("You must not create more than 5 submissions every 10 minutes")
-	ErrDisplayNameNotUnique          = fmt.Errorf("%w: Cannot submit: A map exists with the same DisplayName", ErrPermissionDenied)
 )
 
 // POST /submissions
 func (svc *Service) CreateSubmission(ctx context.Context, request *api.SubmissionTriggerCreate) (*api.OperationID, error) {
 	// sanitization
-	if request.AssetID < 0 {
+	if request.AssetID<0{
 		return nil, ErrNegativeID
 	}
-	var ModelID = uint64(request.AssetID)
+	var ModelID=uint64(request.AssetID);
 
 	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
@@ -60,7 +60,7 @@ func (svc *Service) CreateSubmission(ctx context.Context, request *api.Submissio
 		creation_submissions, err := svc.inner.ListSubmissions(ctx, filter, model.Page{
 			Number: 1,
 			Size:   int32(CreationPhaseSubmissionsLimit),
-		}, datastore.ListSortDisabled)
+		},datastore.ListSortDisabled)
 		if err != nil {
 			return nil, err
 		}
@@ -86,8 +86,8 @@ func (svc *Service) CreateSubmission(ctx context.Context, request *api.Submissio
 	}
 
 	operation, err := svc.inner.CreateOperation(ctx, model.Operation{
-		Owner:    userId,
+		Owner:         userId,
-		StatusID: model.OperationStatusCreated,
+		StatusID:      model.OperationStatusCreated,
 	})
 	if err != nil {
 		return nil, err
@@ -110,14 +110,13 @@ func (svc *Service) CreateSubmission(ctx context.Context, request *api.Submissio
 		OperationID: operation.ID,
 	}, nil
 }
-
 // POST /submissions-admin
 func (svc *Service) CreateSubmissionAdmin(ctx context.Context, request *api.SubmissionTriggerCreate) (*api.OperationID, error) {
 	// sanitization
-	if request.AssetID < 0 {
+	if request.AssetID<0{
 		return nil, ErrNegativeID
 	}
-	var ModelID = uint64(request.AssetID)
+	var ModelID=uint64(request.AssetID);
 
 	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
@@ -135,7 +134,7 @@ func (svc *Service) CreateSubmissionAdmin(ctx context.Context, request *api.Subm
 	}
 
 	// check if caller has required role
-	has_role := roles&model.RolesSubmissionReview == model.RolesSubmissionReview
+	has_role := roles & model.RolesSubmissionReview == model.RolesSubmissionReview
 	if !has_role {
 		return nil, ErrPermissionDeniedNeedRoleSubmissionReview
 	}
@@ -156,8 +155,8 @@ func (svc *Service) CreateSubmissionAdmin(ctx context.Context, request *api.Subm
 	}
 
 	operation, err := svc.inner.CreateOperation(ctx, model.Operation{
-		Owner:    userId,
+		Owner:         userId,
-		StatusID: model.OperationStatusCreated,
+		StatusID:      model.OperationStatusCreated,
 	})
 	if err != nil {
 		return nil, err
@@ -192,18 +191,18 @@ func (svc *Service) GetSubmission(ctx context.Context, params api.GetSubmissionP
 		return nil, err
 	}
 	return &api.Submission{
-		ID:              submission.ID,
+		ID:            submission.ID,
-		DisplayName:     submission.DisplayName,
+		DisplayName:   submission.DisplayName,
-		Creator:         submission.Creator,
+		Creator:       submission.Creator,
-		GameID:          int32(submission.GameID),
+		GameID:        int32(submission.GameID),
-		CreatedAt:       submission.CreatedAt.Unix(),
+		CreatedAt:     submission.CreatedAt.Unix(),
-		UpdatedAt:       submission.UpdatedAt.Unix(),
+		UpdatedAt:     submission.UpdatedAt.Unix(),
-		Submitter:       int64(submission.Submitter),
+		Submitter:     int64(submission.Submitter),
-		AssetID:         int64(submission.AssetID),
+		AssetID:       int64(submission.AssetID),
-		AssetVersion:    int64(submission.AssetVersion),
+		AssetVersion:  int64(submission.AssetVersion),
-		Completed:       submission.Completed,
+		Completed:     submission.Completed,
 		UploadedAssetID: api.NewOptInt64(int64(submission.UploadedAssetID)),
-		StatusID:        int32(submission.StatusID),
+		StatusID:      int32(submission.StatusID),
 	}, nil
 }
 
@@ -215,28 +214,28 @@ func (svc *Service) GetSubmission(ctx context.Context, params api.GetSubmissionP
 func (svc *Service) ListSubmissions(ctx context.Context, params api.ListSubmissionsParams) (*api.Submissions, error) {
 	filter := service.NewSubmissionFilter()
 
-	if display_name, display_name_ok := params.DisplayName.Get(); display_name_ok {
+	if display_name, display_name_ok := params.DisplayName.Get(); display_name_ok{
 		filter.SetDisplayName(display_name)
 	}
-	if creator, creator_ok := params.Creator.Get(); creator_ok {
+	if creator, creator_ok := params.Creator.Get(); creator_ok{
 		filter.SetCreator(creator)
 	}
-	if game_id, game_id_ok := params.GameID.Get(); game_id_ok {
+	if game_id, game_id_ok := params.GameID.Get(); game_id_ok{
 		filter.SetGameID(uint32(game_id))
 	}
-	if submitter, submitter_ok := params.Submitter.Get(); submitter_ok {
+	if submitter, submitter_ok := params.Submitter.Get(); submitter_ok{
 		filter.SetSubmitter(uint64(submitter))
 	}
-	if asset_id, asset_id_ok := params.AssetID.Get(); asset_id_ok {
+	if asset_id, asset_id_ok := params.AssetID.Get(); asset_id_ok{
 		filter.SetAssetID(uint64(asset_id))
 	}
-	if asset_version, asset_version_ok := params.AssetVersion.Get(); asset_version_ok {
+	if asset_version, asset_version_ok := params.AssetVersion.Get(); asset_version_ok{
 		filter.SetAssetVersion(uint64(asset_version))
 	}
-	if uploaded_asset_id, uploaded_asset_id_ok := params.UploadedAssetID.Get(); uploaded_asset_id_ok {
+	if uploaded_asset_id, uploaded_asset_id_ok := params.UploadedAssetID.Get(); uploaded_asset_id_ok{
 		filter.SetUploadedAssetID(uint64(uploaded_asset_id))
 	}
-	if status_id, status_id_ok := params.StatusID.Get(); status_id_ok {
+	if status_id, status_id_ok := params.StatusID.Get(); status_id_ok{
 		filter.SetStatuses([]model.SubmissionStatus{model.SubmissionStatus(status_id)})
 	}
 
@@ -245,27 +244,27 @@ func (svc *Service) ListSubmissions(ctx context.Context, params api.ListSubmissi
 	total, items, err := svc.inner.ListSubmissionsWithTotal(ctx, filter, model.Page{
 		Number: params.Page,
 		Size:   params.Limit,
-	}, sort)
+	},sort)
 	if err != nil {
 		return nil, err
 	}
 
 	var resp api.Submissions
-	resp.Total = total
+	resp.Total=total
 	for _, item := range items {
 		resp.Submissions = append(resp.Submissions, api.Submission{
-			ID:              item.ID,
+			ID:            item.ID,
-			DisplayName:     item.DisplayName,
+			DisplayName:   item.DisplayName,
-			Creator:         item.Creator,
+			Creator:       item.Creator,
-			GameID:          int32(item.GameID),
+			GameID:        int32(item.GameID),
-			CreatedAt:       item.CreatedAt.Unix(),
+			CreatedAt:     item.CreatedAt.Unix(),
-			UpdatedAt:       item.UpdatedAt.Unix(),
+			UpdatedAt:     item.UpdatedAt.Unix(),
-			Submitter:       int64(item.Submitter),
+			Submitter:     int64(item.Submitter),
-			AssetID:         int64(item.AssetID),
+			AssetID:       int64(item.AssetID),
-			AssetVersion:    int64(item.AssetVersion),
+			AssetVersion:  int64(item.AssetVersion),
-			Completed:       item.Completed,
+			Completed:     item.Completed,
 			UploadedAssetID: api.NewOptInt64(int64(item.UploadedAssetID)),
-			StatusID:        int32(item.StatusID),
+			StatusID:      int32(item.StatusID),
 		})
 	}
 
@@ -342,9 +341,9 @@ func (svc *Service) UpdateSubmissionModel(ctx context.Context, params api.Update
 	}
 
 	event_data := model.AuditEventDataChangeModel{
-		OldModelID:      OldModelID,
+		OldModelID: OldModelID,
 		OldModelVersion: OldModelVersion,
-		NewModelID:      NewModelID,
+		NewModelID: NewModelID,
 		NewModelVersion: NewModelVersion,
 	}
 
@@ -352,7 +351,7 @@ func (svc *Service) UpdateSubmissionModel(ctx context.Context, params api.Update
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -402,7 +401,7 @@ func (svc *Service) ActionSubmissionReject(ctx context.Context, params api.Actio
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -438,12 +437,7 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params a
 	target_status := model.SubmissionStatusChangesRequested
 	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
-	allowed_statuses := []model.SubmissionStatus{
+	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusValidated, model.SubmissionStatusAcceptedUnvalidated, model.SubmissionStatusSubmitted}
-		model.SubmissionStatusUploaded,
-		model.SubmissionStatusValidated,
-		model.SubmissionStatusAcceptedUnvalidated,
-		model.SubmissionStatusSubmitted,
-	}
 	err = svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
 	if err != nil {
 		return err
@@ -457,7 +451,7 @@ func (svc *Service) ActionSubmissionRequestChanges(ctx context.Context, params a
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -510,7 +504,7 @@ func (svc *Service) ActionSubmissionRevoke(ctx context.Context, params api.Actio
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -553,37 +547,11 @@ func (svc *Service) ActionSubmissionTriggerSubmit(ctx context.Context, params ap
 		}
 	}
 
-	// check for maps with the exact same name
-	filter := service.NewMapFilter()
-	filter.SetDisplayName(submission.DisplayName)
-	maps_list, err := svc.inner.ListMaps(
-		ctx,
-		filter,
-		model.Page{
-			Number: 1,
-			Size:   1,
-		},
-	)
-	if err != nil {
-		return err
-	}
-
-	// The map search finds substrings, we only want exact matches
-	for _, m := range maps_list {
-		if m.DisplayName == submission.DisplayName {
-			return ErrDisplayNameNotUnique
-		}
-	}
-
 	// transaction
 	target_status := model.SubmissionStatusSubmitting
 	update := service.NewSubmissionUpdate()
 	update.SetStatusID(target_status)
-	allowed_statuses := []model.SubmissionStatus{
+	allowed_statuses := []model.SubmissionStatus{model.SubmissionStatusUnderConstruction, model.SubmissionStatusChangesRequested}
-		model.SubmissionStatusUnderConstruction,
-		model.SubmissionStatusChangesRequested,
-		model.SubmissionStatusSubmitted,
-	}
 	err = svc.inner.UpdateSubmissionIfStatus(ctx, params.SubmissionID, allowed_statuses, update)
 	if err != nil {
 		return err
@@ -606,7 +574,7 @@ func (svc *Service) ActionSubmissionTriggerSubmit(ctx context.Context, params ap
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -677,7 +645,7 @@ func (svc *Service) ActionSubmissionTriggerSubmitUnchecked(ctx context.Context,
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -705,7 +673,7 @@ func (svc *Service) ActionSubmissionResetSubmitting(ctx context.Context, params
 	if err != nil {
 		return err
 	}
-	if time.Now().Before(submission.UpdatedAt.Add(time.Second * 10)) {
+	if time.Now().Before(submission.UpdatedAt.Add(time.Second*10)) {
 		// the last time the submission was updated must be longer than 10 seconds ago
 		return ErrDelayReset
 	}
@@ -734,7 +702,7 @@ func (svc *Service) ActionSubmissionResetSubmitting(ctx context.Context, params
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -802,7 +770,7 @@ func (svc *Service) ActionSubmissionTriggerUpload(ctx context.Context, params ap
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -839,7 +807,7 @@ func (svc *Service) ActionSubmissionValidated(ctx context.Context, params api.Ac
 	if err != nil {
 		return err
 	}
-	if time.Now().Before(submission.UpdatedAt.Add(time.Second * 10)) {
+	if time.Now().Before(submission.UpdatedAt.Add(time.Second*10)) {
 		// the last time the submission was updated must be longer than 10 seconds ago
 		return ErrDelayReset
 	}
@@ -862,7 +830,7 @@ func (svc *Service) ActionSubmissionValidated(ctx context.Context, params api.Ac
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -934,7 +902,7 @@ func (svc *Service) ActionSubmissionTriggerValidate(ctx context.Context, params
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -994,7 +962,7 @@ func (svc *Service) ActionSubmissionRetryValidate(ctx context.Context, params ap
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -1031,7 +999,7 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params api.Act
 	if err != nil {
 		return err
 	}
-	if time.Now().Before(submission.UpdatedAt.Add(time.Second * 10)) {
+	if time.Now().Before(submission.UpdatedAt.Add(time.Second*10)) {
 		// the last time the submission was updated must be longer than 10 seconds ago
 		return ErrDelayReset
 	}
@@ -1054,7 +1022,7 @@ func (svc *Service) ActionSubmissionAccepted(ctx context.Context, params api.Act
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -1101,11 +1069,11 @@ func (svc *Service) ReleaseSubmissions(ctx context.Context, request []api.Releas
 	id_to_submission := make(map[int64]*model.Submission, len(submissions))
 
 	// check each submission to make sure it is ready to release
-	for _, submission := range submissions {
+	for _,submission := range submissions{
-		if submission.StatusID != model.SubmissionStatusUploaded {
+		if submission.StatusID != model.SubmissionStatusUploaded{
 			return nil, ErrReleaseInvalidStatus
 		}
-		if submission.UploadedAssetID == 0 {
+		if submission.UploadedAssetID == 0{
 			return nil, ErrReleaseNoUploadedAssetID
 		}
 		id_to_submission[submission.ID] = &submission
@@ -1131,8 +1099,8 @@ func (svc *Service) ReleaseSubmissions(ctx context.Context, request []api.Releas
 
 	// create a trackable long-running operation
 	operation, err := svc.inner.CreateOperation(ctx, model.Operation{
-		Owner:    userId,
+		Owner:         userId,
-		StatusID: model.OperationStatusCreated,
+		StatusID:      model.OperationStatusCreated,
 	})
 	if err != nil {
 		return nil, err
@@ -1154,10 +1122,10 @@ func (svc *Service) ReleaseSubmissions(ctx context.Context, request []api.Releas
 
 // CreateSubmissionAuditComment implements createSubmissionAuditComment operation.
 //
-// # Post a comment to the audit log
+// Post a comment to the audit log
 //
 // POST /submissions/{SubmissionID}/comment
-func (svc *Service) CreateSubmissionAuditComment(ctx context.Context, req api.CreateSubmissionAuditCommentReq, params api.CreateSubmissionAuditCommentParams) error {
+func (svc *Service) CreateSubmissionAuditComment(ctx context.Context, req api.CreateSubmissionAuditCommentReq, params api.CreateSubmissionAuditCommentParams) (error) {
 	userInfo, ok := ctx.Value("UserInfo").(UserInfoHandle)
 	if !ok {
 		return ErrUserInfo
@@ -1198,7 +1166,7 @@ func (svc *Service) CreateSubmissionAuditComment(ctx context.Context, req api.Cr
 		ctx,
 		userId,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		event_data,
@@ -1214,7 +1182,7 @@ func (svc *Service) ListSubmissionAuditEvents(ctx context.Context, params api.Li
 	return svc.inner.ListAuditEvents(
 		ctx,
 		model.Resource{
-			ID:   params.SubmissionID,
+			ID: params.SubmissionID,
 			Type: model.ResourceSubmission,
 		},
 		model.Page{

pkg/web_api/thumbnails.go

@@ -1,135 +0,0 @@
-package web_api
-
-import (
-	"context"
-	"strconv"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/api"
-	"git.itzana.me/strafesnet/maps-service/pkg/roblox"
-)
-
-// BatchAssetThumbnails handles batch fetching of asset thumbnails
-func (svc *Service) BatchAssetThumbnails(ctx context.Context, req *api.BatchAssetThumbnailsReq) (*api.BatchAssetThumbnailsOK, error) {
-	if len(req.AssetIds) == 0 {
-		return &api.BatchAssetThumbnailsOK{
-			Thumbnails: api.NewOptBatchAssetThumbnailsOKThumbnails(map[string]string{}),
-		}, nil
-	}
-
-	// Convert size string to enum
-	size := roblox.Size420x420
-	if req.Size.IsSet() {
-		sizeStr := req.Size.Value
-		switch api.BatchAssetThumbnailsReqSize(sizeStr) {
-		case api.BatchAssetThumbnailsReqSize150x150:
-			size = roblox.Size150x150
-		case api.BatchAssetThumbnailsReqSize768x432:
-			size = roblox.Size768x432
-		}
-	}
-
-	// Fetch thumbnails from service
-	thumbnails, err := svc.inner.GetAssetThumbnails(ctx, req.AssetIds, size)
-	if err != nil {
-		return nil, err
-	}
-
-	// Convert map[uint64]string to map[string]string for JSON
-	result := make(map[string]string, len(thumbnails))
-	for assetID, url := range thumbnails {
-		result[strconv.FormatUint(assetID, 10)] = url
-	}
-
-	return &api.BatchAssetThumbnailsOK{
-		Thumbnails: api.NewOptBatchAssetThumbnailsOKThumbnails(result),
-	}, nil
-}
-
-// GetAssetThumbnail handles single asset thumbnail fetch (with redirect)
-func (svc *Service) GetAssetThumbnail(ctx context.Context, params api.GetAssetThumbnailParams) (*api.GetAssetThumbnailFound, error) {
-	// Convert size string to enum
-	size := roblox.Size420x420
-	if params.Size.IsSet() {
-		sizeStr := params.Size.Value
-		switch api.GetAssetThumbnailSize(sizeStr) {
-		case api.GetAssetThumbnailSize150x150:
-			size = roblox.Size150x150
-		case api.GetAssetThumbnailSize768x432:
-			size = roblox.Size768x432
-		}
-	}
-
-	// Fetch thumbnail
-	thumbnailURL, err := svc.inner.GetSingleAssetThumbnail(ctx, params.AssetID, size)
-	if err != nil {
-		return nil, err
-	}
-
-	// Return redirect response
-	return &api.GetAssetThumbnailFound{
-		Location: api.NewOptString(thumbnailURL),
-	}, nil
-}
-
-// BatchUserThumbnails handles batch fetching of user avatar thumbnails
-func (svc *Service) BatchUserThumbnails(ctx context.Context, req *api.BatchUserThumbnailsReq) (*api.BatchUserThumbnailsOK, error) {
-	if len(req.UserIds) == 0 {
-		return &api.BatchUserThumbnailsOK{
-			Thumbnails: api.NewOptBatchUserThumbnailsOKThumbnails(map[string]string{}),
-		}, nil
-	}
-
-	// Convert size string to enum
-	size := roblox.Size150x150
-	if req.Size.IsSet() {
-		sizeStr := req.Size.Value
-		switch api.BatchUserThumbnailsReqSize(sizeStr) {
-		case api.BatchUserThumbnailsReqSize420x420:
-			size = roblox.Size420x420
-		case api.BatchUserThumbnailsReqSize768x432:
-			size = roblox.Size768x432
-		}
-	}
-
-	// Fetch thumbnails from service
-	thumbnails, err := svc.inner.GetUserAvatarThumbnails(ctx, req.UserIds, size)
-	if err != nil {
-		return nil, err
-	}
-
-	// Convert map[uint64]string to map[string]string for JSON
-	result := make(map[string]string, len(thumbnails))
-	for userID, url := range thumbnails {
-		result[strconv.FormatUint(userID, 10)] = url
-	}
-
-	return &api.BatchUserThumbnailsOK{
-		Thumbnails: api.NewOptBatchUserThumbnailsOKThumbnails(result),
-	}, nil
-}
-
-// GetUserThumbnail handles single user avatar thumbnail fetch (with redirect)
-func (svc *Service) GetUserThumbnail(ctx context.Context, params api.GetUserThumbnailParams) (*api.GetUserThumbnailFound, error) {
-	// Convert size string to enum
-	size := roblox.Size150x150
-	if params.Size.IsSet() {
-		sizeStr := params.Size.Value
-		switch api.GetUserThumbnailSize(sizeStr) {
-		case api.GetUserThumbnailSize420x420:
-			size = roblox.Size420x420
-		case api.GetUserThumbnailSize768x432:
-			size = roblox.Size768x432
-		}
-	}
-
-	// Fetch thumbnail
-	thumbnailURL, err := svc.inner.GetSingleUserAvatarThumbnail(ctx, params.UserID, size)
-	if err != nil {
-		return nil, err
-	}
-
-	// Return redirect response
-	return &api.GetUserThumbnailFound{
-		Location: api.NewOptString(thumbnailURL),
-	}, nil
-}

pkg/web_api/users.go

@@ -1,33 +0,0 @@
-package web_api
-
-import (
-	"context"
-	"strconv"
-
-	"git.itzana.me/strafesnet/maps-service/pkg/api"
-)
-
-// BatchUsernames handles batch fetching of usernames
-func (svc *Service) BatchUsernames(ctx context.Context, req *api.BatchUsernamesReq) (*api.BatchUsernamesOK, error) {
-	if len(req.UserIds) == 0 {
-		return &api.BatchUsernamesOK{
-			Usernames: api.NewOptBatchUsernamesOKUsernames(map[string]string{}),
-		}, nil
-	}
-
-	// Fetch usernames from service
-	usernames, err := svc.inner.GetUsernames(ctx, req.UserIds)
-	if err != nil {
-		return nil, err
-	}
-
-	// Convert map[uint64]string to map[string]string for JSON
-	result := make(map[string]string, len(usernames))
-	for userID, username := range usernames {
-		result[strconv.FormatUint(userID, 10)] = username
-	}
-
-	return &api.BatchUsernamesOK{
-		Usernames: api.NewOptBatchUsernamesOKUsernames(result),
-	}, nil
-}

submissions-api-rs/Cargo.toml

@@ -17,7 +17,7 @@ reqwest = { version = "0", features = [
 	# default features
 	"charset", "http2", "system-proxy"
 ], default-features = false }
-serde.workspace = true
+serde = { version = "1", features = ["derive"] }
-serde_json.workspace = true
+serde_json = "1"
 serde_repr = "0.1.19"
 url = "2"

submissions-api-rs/src/types.rs

@@ -30,6 +30,7 @@ impl<Items> std::error::Error for SingleItemError<Items> where Items:std::fmt::D
 pub type ScriptSingleItemError=SingleItemError<Vec<ScriptID>>;
 pub type ScriptPolicySingleItemError=SingleItemError<Vec<ScriptPolicyID>>;
 
+#[allow(dead_code)]
 #[derive(Debug)]
 pub struct UrlAndBody{
 	pub url:url::Url,
@@ -75,7 +76,7 @@ pub enum GameID{
 	FlyTrials=5,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Serialize)]
 pub struct CreateMapfixRequest<'a>{
 	pub OperationID:OperationID,
@@ -88,13 +89,13 @@ pub struct CreateMapfixRequest<'a>{
 	pub TargetAssetID:u64,
 	pub Description:&'a str,
 }
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Deserialize)]
 pub struct MapfixIDResponse{
 	pub MapfixID:MapfixID,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Serialize)]
 pub struct CreateSubmissionRequest<'a>{
 	pub OperationID:OperationID,
@@ -107,7 +108,7 @@ pub struct CreateSubmissionRequest<'a>{
 	pub Status:u32,
 	pub Roles:u32,
 }
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Deserialize)]
 pub struct SubmissionIDResponse{
 	pub SubmissionID:SubmissionID,
@@ -126,11 +127,11 @@ pub enum ResourceType{
 	Submission=2,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 pub struct GetScriptRequest{
 	pub ScriptID:ScriptID,
 }
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Serialize)]
 pub struct GetScriptsRequest<'a>{
 	pub Page:u32,
@@ -150,7 +151,7 @@ pub struct GetScriptsRequest<'a>{
 pub struct HashRequest<'a>{
 	pub hash:&'a str,
 }
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Deserialize)]
 pub struct ScriptResponse{
 	pub ID:ScriptID,
@@ -160,7 +161,7 @@ pub struct ScriptResponse{
 	pub ResourceType:ResourceType,
 	pub ResourceID:ResourceID,
 }
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Serialize)]
 pub struct CreateScriptRequest<'a>{
 	pub Name:&'a str,
@@ -169,7 +170,7 @@ pub struct CreateScriptRequest<'a>{
 	#[serde(skip_serializing_if="Option::is_none")]
 	pub ResourceID:Option<ResourceID>,
 }
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Deserialize)]
 pub struct ScriptIDResponse{
 	pub ScriptID:ScriptID,
@@ -185,11 +186,11 @@ pub enum Policy{
 	Replace=4,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 pub struct GetScriptPolicyRequest{
 	pub ScriptPolicyID:ScriptPolicyID,
 }
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Serialize)]
 pub struct GetScriptPoliciesRequest<'a>{
 	pub Page:u32,
@@ -201,7 +202,7 @@ pub struct GetScriptPoliciesRequest<'a>{
 	#[serde(skip_serializing_if="Option::is_none")]
 	pub Policy:Option<Policy>,
 }
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Deserialize)]
 pub struct ScriptPolicyResponse{
 	pub ID:ScriptPolicyID,
@@ -209,20 +210,20 @@ pub struct ScriptPolicyResponse{
 	pub ToScriptID:ScriptID,
 	pub Policy:Policy
 }
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Serialize)]
 pub struct CreateScriptPolicyRequest{
 	pub FromScriptID:ScriptID,
 	pub ToScriptID:ScriptID,
 	pub Policy:Policy,
 }
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Deserialize)]
 pub struct ScriptPolicyIDResponse{
 	pub ScriptPolicyID:ScriptPolicyID,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Serialize)]
 pub struct UpdateScriptPolicyRequest{
 	pub ID:ScriptPolicyID,
@@ -234,7 +235,7 @@ pub struct UpdateScriptPolicyRequest{
 	pub Policy:Option<Policy>,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct UpdateSubmissionModelRequest{
 	pub SubmissionID:SubmissionID,
@@ -275,7 +276,7 @@ pub enum MapfixStatus{
 	Released=10,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct GetMapfixesRequest<'a>{
 	pub Page:u32,
@@ -291,7 +292,7 @@ pub struct GetMapfixesRequest<'a>{
 	pub StatusID:Option<MapfixStatus>,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Serialize,serde::Deserialize)]
 pub struct MapfixResponse{
 	pub ID:MapfixID,
@@ -311,7 +312,7 @@ pub struct MapfixResponse{
 	pub Description:String,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Deserialize)]
 pub struct MapfixesResponse{
 	pub Total:u64,
@@ -341,7 +342,7 @@ pub enum SubmissionStatus{
 	Released=10,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct GetSubmissionsRequest<'a>{
 	pub Page:u32,
@@ -357,7 +358,7 @@ pub struct GetSubmissionsRequest<'a>{
 	pub StatusID:Option<SubmissionStatus>,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Deserialize)]
 pub struct SubmissionResponse{
 	pub ID:SubmissionID,
@@ -375,14 +376,14 @@ pub struct SubmissionResponse{
 	pub StatusID:SubmissionStatus,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Deserialize)]
 pub struct SubmissionsResponse{
 	pub Total:u64,
 	pub Submissions:Vec<SubmissionResponse>,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct GetMapsRequest<'a>{
 	pub Page:u32,
@@ -393,7 +394,7 @@ pub struct GetMapsRequest<'a>{
 	pub GameID:Option<GameID>,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Deserialize)]
 pub struct MapResponse{
 	pub ID:i64,
@@ -403,7 +404,7 @@ pub struct MapResponse{
 	pub Date:i64,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct GetMapfixAuditEventsRequest{
 	pub Page:u32,
@@ -411,7 +412,7 @@ pub struct GetMapfixAuditEventsRequest{
 	pub MapfixID:i64,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct GetSubmissionAuditEventsRequest{
 	pub Page:u32,
@@ -419,6 +420,7 @@ pub struct GetSubmissionAuditEventsRequest{
 	pub SubmissionID:i64,
 }
 
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde_repr::Deserialize_repr)]
 #[repr(u32)]
 pub enum AuditEventType{
@@ -473,6 +475,7 @@ pub struct AuditEventCheckList{
 	pub check_list:Vec<AuditEventCheck>,
 }
 
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub enum AuditEventData{
 	Action(AuditEventAction),
@@ -488,7 +491,7 @@ pub enum AuditEventData{
 #[derive(Clone,Copy,Debug,Hash,Eq,PartialEq,serde::Serialize,serde::Deserialize)]
 pub struct AuditEventID(pub(crate)i64);
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Deserialize)]
 pub struct AuditEventReponse{
 	pub ID:AuditEventID,
@@ -515,7 +518,7 @@ impl AuditEventReponse{
 	}
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Serialize)]
 pub struct Check{
 	pub Name:&'static str,
@@ -523,7 +526,7 @@ pub struct Check{
 	pub Passed:bool,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct ActionSubmissionSubmittedRequest{
 	pub SubmissionID:SubmissionID,
@@ -533,33 +536,33 @@ pub struct ActionSubmissionSubmittedRequest{
 	pub GameID:GameID,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct ActionSubmissionRequestChangesRequest{
 	pub SubmissionID:SubmissionID,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct ActionSubmissionUploadedRequest{
 	pub SubmissionID:SubmissionID,
 	pub UploadedAssetID:u64,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct ActionSubmissionAcceptedRequest{
 	pub SubmissionID:SubmissionID,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct CreateSubmissionAuditErrorRequest{
 	pub SubmissionID:SubmissionID,
 	pub ErrorMessage:String,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct CreateSubmissionAuditCheckListRequest<'a>{
 	pub SubmissionID:SubmissionID,
@@ -577,7 +580,7 @@ impl SubmissionID{
 	}
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct UpdateMapfixModelRequest{
 	pub MapfixID:MapfixID,
@@ -585,7 +588,7 @@ pub struct UpdateMapfixModelRequest{
 	pub ModelVersion:u64,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct ActionMapfixSubmittedRequest{
 	pub MapfixID:MapfixID,
@@ -595,32 +598,32 @@ pub struct ActionMapfixSubmittedRequest{
 	pub GameID:GameID,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct ActionMapfixRequestChangesRequest{
 	pub MapfixID:MapfixID,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct ActionMapfixUploadedRequest{
 	pub MapfixID:MapfixID,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct ActionMapfixAcceptedRequest{
 	pub MapfixID:MapfixID,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct CreateMapfixAuditErrorRequest{
 	pub MapfixID:MapfixID,
 	pub ErrorMessage:String,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct CreateMapfixAuditCheckListRequest<'a>{
 	pub MapfixID:MapfixID,
@@ -638,7 +641,7 @@ impl MapfixID{
 	}
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug)]
 pub struct ActionOperationFailedRequest{
 	pub OperationID:OperationID,
@@ -665,7 +668,7 @@ impl Resource{
 	}
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Serialize)]
 pub struct ReleaseInfo{
 	pub SubmissionID:SubmissionID,
@@ -675,7 +678,7 @@ pub struct ReleaseInfo{
 pub struct ReleaseRequest<'a>{
 	pub schedule:&'a [ReleaseInfo],
 }
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(Clone,Debug,serde::Deserialize)]
 pub struct OperationIDResponse{
 	pub OperationID:OperationID,

validation/Cargo.toml

@@ -4,18 +4,18 @@ version = "0.1.1"
 edition = "2024"
 
 [dependencies]
-async-nats.workspace = true
+async-nats = "0.45.0"
-futures-util.workspace = true
+futures = "0.3.31"
-rbx_asset.workspace = true
+rbx_asset = { version = "0.5.0", features = ["gzip", "rustls-tls"], default-features = false, registry = "strafesnet" }
-rbx_binary.workspace = true
+rbx_binary = "2.0.0"
-rbx_dom_weak.workspace = true
+rbx_dom_weak = "4.0.0"
 rbx_reflection_database = "2.0.1"
 rbx_xml = "2.0.0"
 regex = { version = "1.11.3", default-features = false }
-serde.workspace = true
+serde = { version = "1.0.215", features = ["derive"] }
-serde_json.workspace = true
+serde_json = "1.0.133"
 siphasher = "1.0.1"
-tokio.workspace = true
+tokio = { version = "1.41.1", features = ["macros", "rt-multi-thread", "signal"] }
 heck = "0.5.0"
 rust-grpc = { version = "1.6.1", registry = "strafesnet" }
 tonic = "0.14.1"

validation/Containerfile

@@ -1,4 +1,3 @@
-FROM debian:trixie-slim AS runtime
+FROM alpine:3.21 AS runtime
-RUN apt-get update && apt-get install -y --no-install-recommends libssl3t64 ca-certificates && rm -rf /var/lib/apt/lists/*
+COPY /target/x86_64-unknown-linux-musl/release/maps-validation /
-COPY /target/release/maps-validation /
 ENTRYPOINT ["/maps-validation"]

validation/src/check.rs

@@ -6,7 +6,7 @@ use heck::{ToSnakeCase,ToTitleCase};
 use rbx_dom_weak::Instance;
 use rust_grpc::validator::Check;
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	ModelInfoDownload(rbx_asset::cloud::GetError),
@@ -33,7 +33,7 @@ macro_rules! lazy_regex{
 	}};
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 pub struct CheckRequest{
 	ModelID:u64,
 	SkipChecks:bool,
@@ -79,7 +79,7 @@ struct ModeElement{
 	zone:Zone,
 	mode_id:ModeID,
 }
-#[expect(dead_code)]
+#[allow(dead_code)]
 pub enum IDParseError{
 	NoCaptures,
 	ParseInt(core::num::ParseIntError),
@@ -324,24 +324,25 @@ pub fn get_model_info<'a>(dom:&'a rbx_dom_weak::WeakDom,model_instance:&'a rbx_d
 }
 
 // check if an observed string matches an expected string
-pub struct StringEquality<'a,Str>{
+pub struct StringCheck<'a,T,Str>(Result<T,StringCheckContext<'a,Str>>);
+pub struct StringCheckContext<'a,Str>{
 	observed:&'a str,
 	expected:Str,
 }
-impl<'a,Str> StringEquality<'a,Str>
+impl<'a,Str> StringCheckContext<'a,Str>
 	where
 		&'a str:PartialEq<Str>,
 {
 	/// Compute the StringCheck, passing through the provided value on success.
-	fn check<T>(self,value:T)->Result<T,Self>{
+	fn check<T>(self,value:T)->StringCheck<'a,T,Str>{
 		if self.observed==self.expected{
-			Ok(value)
+			StringCheck(Ok(value))
 		}else{
-			Err(self)
+			StringCheck(Err(self))
 		}
 	}
 }
-impl<Str:std::fmt::Display> std::fmt::Display for StringEquality<'_,Str>{
+impl<Str:std::fmt::Display> std::fmt::Display for StringCheckContext<'_,Str>{
 	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
 		write!(f,"expected: {}, observed: {}",self.expected,self.observed)
 	}
@@ -441,7 +442,7 @@ pub struct MapInfoOwned{
 	pub creator:String,
 	pub game_id:GameID,
 }
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum IntoMapInfoOwnedError{
 	DisplayName(StringValueError),
@@ -463,66 +464,19 @@ impl TryFrom<MapInfo<'_>> for MapInfoOwned{
 struct Exists;
 struct Absent;
 
-enum DisplayNameError<'a>{
-	TitleCase(StringEquality<'a,String>),
-	Empty(StringEmpty),
-	TooLong(usize),
-	StringValue(StringValueError),
-}
-fn check_display_name<'a>(display_name:Result<&'a str,StringValueError>)->Result<&'a str,DisplayNameError<'a>>{
-	// DisplayName StringValue can be missing or whatever
-	let display_name=display_name.map_err(DisplayNameError::StringValue)?;
-
-	// DisplayName cannot be ""
-	let display_name=check_empty(display_name).map_err(DisplayNameError::Empty)?;
-
-	// DisplayName cannot exceed 50 characters
-	if 50<display_name.len(){
-		return Err(DisplayNameError::TooLong(display_name.len()));
-	}
-
-	// Check title case
-	let display_name=StringEquality{
-		observed:display_name,
-		expected:display_name.to_title_case(),
-	}.check(display_name).map_err(DisplayNameError::TitleCase)?;
-
-	Ok(display_name)
-}
-
-enum CreatorError{
-	Empty(StringEmpty),
-	TooLong(usize),
-	StringValue(StringValueError),
-}
-fn check_creator<'a>(creator:Result<&'a str,StringValueError>)->Result<&'a str,CreatorError>{
-	// Creator StringValue can be missing or whatever
-	let creator=creator.map_err(CreatorError::StringValue)?;
-
-	// Creator cannot be ""
-	let creator=check_empty(creator).map_err(CreatorError::Empty)?;
-
-	// Creator cannot exceed 50 characters
-	if 50<creator.len(){
-		return Err(CreatorError::TooLong(creator.len()));
-	}
-
-	Ok(creator)
-}
-
 /// The result of every map check.
 struct MapCheck<'a>{
 	// === METADATA CHECKS ===
 	// The root must be of class Model
-	model_class:Result<(),StringEquality<'a,&'static str>>,
+	model_class:StringCheck<'a,(),&'static str>,
 	// Model's name must be in snake case
-	model_name:Result<(),StringEquality<'a,String>>,
+	model_name:StringCheck<'a,(),String>,
 	// Map must have a StringValue named DisplayName.
 	// Value must not be empty, must be in title case.
-	display_name:Result<&'a str,DisplayNameError<'a>>,
+	display_name:Result<Result<StringCheck<'a,&'a str,String>,StringEmpty>,StringValueError>,
 	// Map must have a StringValue named Creator.
 	// Value must not be empty.
-	creator:Result<&'a str,CreatorError>,
+	creator:Result<Result<&'a str,StringEmpty>,StringValueError>,
 	// The prefix of the model's name must match the game it was submitted for.
 	// bhop_ for bhop, and surf_ for surf
 	game_id:Result<GameID,ParseGameIDError>,
@@ -557,22 +511,27 @@ struct MapCheck<'a>{
 impl<'a> ModelInfo<'a>{
 	fn check(self)->MapCheck<'a>{
 		// Check class is exactly "Model"
-		let model_class=StringEquality{
+		let model_class=StringCheckContext{
 			observed:self.model_class,
 			expected:"Model",
 		}.check(());
 
 		// Check model name is snake case
-		let model_name=StringEquality{
+		let model_name=StringCheckContext{
 			observed:self.model_name,
 			expected:self.model_name.to_snake_case(),
 		}.check(());
 
 		// Check display name is not empty and has title case
-		let display_name=check_display_name(self.map_info.display_name);
+		let display_name=self.map_info.display_name.map(|display_name|{
+			check_empty(display_name).map(|display_name|StringCheckContext{
+				observed:display_name,
+				expected:display_name.to_title_case(),
+			}.check(display_name))
+		});
 
 		// Check Creator is not empty
-		let creator=check_creator(self.map_info.creator);
+		let creator=self.map_info.creator.map(check_empty);
 
 		// Check GameID (model name was prefixed with bhop_ surf_ etc)
 		let game_id=self.map_info.game_id;
@@ -671,10 +630,10 @@ impl MapCheck<'_>{
 	fn result(self)->Result<MapInfoOwned,Result<MapCheckList,serde_json::Error>>{
 		match self{
 			MapCheck{
-				model_class:Ok(()),
+				model_class:StringCheck(Ok(())),
-				model_name:Ok(()),
+				model_name:StringCheck(Ok(())),
-				display_name:Ok(display_name),
+				display_name:Ok(Ok(StringCheck(Ok(display_name)))),
-				creator:Ok(creator),
+				creator:Ok(Ok(creator)),
 				game_id:Ok(game_id),
 				mapstart:Ok(Exists),
 				mode_start_counts:DuplicateCheck(Ok(())),
@@ -778,25 +737,27 @@ macro_rules! summary_format{
 impl MapCheck<'_>{
 	fn itemize(&self)->Result<MapCheckList,serde_json::Error>{
 		let model_class=match &self.model_class{
-			Ok(())=>passed!("ModelClass"),
+			StringCheck(Ok(()))=>passed!("ModelClass"),
-			Err(context)=>summary_format!("ModelClass","Invalid model class: {context}"),
+			StringCheck(Err(context))=>summary_format!("ModelClass","Invalid model class: {context}"),
 		};
 		let model_name=match &self.model_name{
-			Ok(())=>passed!("ModelName"),
+			StringCheck(Ok(()))=>passed!("ModelName"),
-			Err(context)=>summary_format!("ModelName","Model name must have snake_case: {context}"),
+			StringCheck(Err(context))=>summary_format!("ModelName","Model name must have snake_case: {context}"),
 		};
 		let display_name=match &self.display_name{
-			Ok(_)=>passed!("DisplayName"),
+			Ok(Ok(StringCheck(Ok(_))))=>passed!("DisplayName"),
-			Err(DisplayNameError::TitleCase(context))=>summary_format!("DisplayName","DisplayName must have Title Case: {context}"),
+			Ok(Ok(StringCheck(Err(context))))=>summary_format!("DisplayName","DisplayName must have Title Case: {context}"),
-			Err(DisplayNameError::Empty(context))=>summary_format!("DisplayName","Invalid DisplayName: {context}"),
+			Ok(Err(context))=>summary_format!("DisplayName","Invalid DisplayName: {context}"),
-			Err(DisplayNameError::TooLong(context))=>summary_format!("DisplayName","DisplayName is too long: {context} characters (50 characters max)"),
+			Err(StringValueError::ObjectNotFound)=>summary!("DisplayName","Missing DisplayName StringValue".to_owned()),
-			Err(DisplayNameError::StringValue(context))=>summary_format!("DisplayName","DisplayName StringValue: {context}"),
+			Err(StringValueError::ValueNotSet)=>summary!("DisplayName","DisplayName Value not set".to_owned()),
+			Err(StringValueError::NonStringValue)=>summary!("DisplayName","DisplayName Value is not a String".to_owned()),
 		};
 		let creator=match &self.creator{
-			Ok(_)=>passed!("Creator"),
+			Ok(Ok(_))=>passed!("Creator"),
-			Err(CreatorError::Empty(context))=>summary_format!("Creator","Invalid Creator: {context}"),
+			Ok(Err(context))=>summary_format!("Creator","Invalid Creator: {context}"),
-			Err(CreatorError::TooLong(context))=>summary_format!("Creator","Creator is too long: {context} characters (50 characters max)"),
+			Err(StringValueError::ObjectNotFound)=>summary!("Creator","Missing Creator StringValue".to_owned()),
-			Err(CreatorError::StringValue(context))=>summary_format!("Creator","Creator StringValue: {context}"),
+			Err(StringValueError::ValueNotSet)=>summary!("Creator","Creator Value not set".to_owned()),
+			Err(StringValueError::NonStringValue)=>summary!("Creator","Creator Value is not a String".to_owned()),
 		};
 		let game_id=match &self.game_id{
 			Ok(_)=>passed!("GameID"),

validation/src/check_mapfix.rs

@@ -1,7 +1,7 @@
 use crate::check::CheckListAndVersion;
 use crate::nats_types::CheckMapfixRequest;
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	Check(crate::check::Error),

validation/src/check_submission.rs

@@ -1,7 +1,7 @@
 use crate::check::CheckListAndVersion;
 use crate::nats_types::CheckSubmissionRequest;
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	Check(crate::check::Error),

validation/src/create.rs

@@ -1,7 +1,7 @@
 use crate::download::download_asset_version;
 use crate::rbx_util::{get_root_instance,get_mapinfo,read_dom,MapInfo,ReadDomError,GetRootInstanceError,GameID};
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	CreatorTypeMustBeUser,
@@ -17,11 +17,11 @@ impl std::fmt::Display for Error{
 }
 impl std::error::Error for Error{}
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 pub struct CreateRequest{
 	pub ModelID:u64,
 }
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 pub struct CreateResult{
 	pub AssetOwner:u64,
 	pub DisplayName:Option<String>,

validation/src/create_mapfix.rs

@@ -1,7 +1,7 @@
 use crate::nats_types::CreateMapfixRequest;
 use crate::create::CreateRequest;
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	Create(crate::create::Error),

validation/src/create_submission.rs

@@ -2,7 +2,7 @@ use crate::nats_types::CreateSubmissionRequest;
 use crate::create::CreateRequest;
 use crate::rbx_util::GameID;
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	Create(crate::create::Error),

validation/src/download.rs

@@ -1,4 +1,4 @@
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	ModelLocationDownload(rbx_asset::cloud::GetError),

validation/src/main.rs

@@ -1,4 +1,4 @@
-use futures_util::StreamExt;
+use futures::StreamExt;
 
 mod download;
 mod grpc;
@@ -22,6 +22,7 @@ mod validator;
 mod validate_mapfix;
 mod validate_submission;
 
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum StartupError{
 	API(tonic::transport::Error),

validation/src/message_handler.rs

@@ -1,4 +1,4 @@
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum HandleMessageError{
 	Messages(async_nats::jetstream::consumer::pull::MessagesError),

validation/src/nats_types.rs

@@ -4,7 +4,7 @@
 // Requests are sent from maps-service to validator
 // Validation invokes the REST api to update the submissions
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
 pub struct CreateSubmissionRequest{
 	// operation_id is passed back in the response message
@@ -18,7 +18,7 @@ pub struct CreateSubmissionRequest{
 	pub Roles:u32,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
 pub struct CreateMapfixRequest{
 	pub OperationID:u32,
@@ -27,7 +27,7 @@ pub struct CreateMapfixRequest{
 	pub Description:String,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
 pub struct CheckSubmissionRequest{
 	pub SubmissionID:u64,
@@ -35,7 +35,7 @@ pub struct CheckSubmissionRequest{
 	pub SkipChecks:bool,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
 pub struct CheckMapfixRequest{
 	pub MapfixID:u64,
@@ -43,7 +43,7 @@ pub struct CheckMapfixRequest{
 	pub SkipChecks:bool,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
 pub struct ValidateSubmissionRequest{
 	// submission_id is passed back in the response message
@@ -53,7 +53,7 @@ pub struct ValidateSubmissionRequest{
 	pub ValidatedModelID:Option<u64>,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
 pub struct ValidateMapfixRequest{
 	// submission_id is passed back in the response message
@@ -64,7 +64,7 @@ pub struct ValidateMapfixRequest{
 }
 
 // Create a new map
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
 pub struct UploadSubmissionRequest{
 	pub SubmissionID:u64,
@@ -73,7 +73,7 @@ pub struct UploadSubmissionRequest{
 	pub ModelName:String,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
 pub struct UploadMapfixRequest{
 	pub MapfixID:u64,
@@ -83,7 +83,7 @@ pub struct UploadMapfixRequest{
 }
 
 // Release a new map
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
 pub struct ReleaseSubmissionRequest{
 	pub SubmissionID:u64,
@@ -97,14 +97,14 @@ pub struct ReleaseSubmissionRequest{
 	pub Submitter:u64,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
 pub struct ReleaseSubmissionsBatchRequest{
 	pub Submissions:Vec<ReleaseSubmissionRequest>,
 	pub OperationID:u32,
 }
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 #[derive(serde::Deserialize)]
 pub struct ReleaseMapfixRequest{
 	pub MapfixID:u64,

validation/src/rbx_util.rs

@@ -1,4 +1,4 @@
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum ReadDomError{
 	Binary(rbx_binary::DecodeError),
@@ -79,15 +79,6 @@ pub enum StringValueError{
 	ValueNotSet,
 	NonStringValue,
 }
-impl std::fmt::Display for StringValueError{
-	fn fmt(&self,f:&mut std::fmt::Formatter<'_>)->std::fmt::Result{
-		match self{
-			StringValueError::ObjectNotFound=>write!(f,"Missing StringValue"),
-			StringValueError::ValueNotSet=>write!(f,"Value not set"),
-			StringValueError::NonStringValue=>write!(f,"Value is not a String"),
-		}
-	}
-}
 
 fn string_value(instance:Option<&rbx_dom_weak::Instance>)->Result<&str,StringValueError>{
 	let instance=instance.ok_or(StringValueError::ObjectNotFound)?;

validation/src/release_submissions_batch.rs

@@ -1,5 +1,4 @@
-use futures_util::stream::iter as stream_iter;
+use futures::StreamExt;
-use futures_util::StreamExt;
 
 use crate::download::download_asset_version;
 use crate::nats_types::ReleaseSubmissionsBatchRequest;
@@ -76,27 +75,25 @@ async fn release_inner(
 	cloud_context:&rbx_asset::cloud::Context,
 	cloud_context_luau_execution:&rbx_asset::cloud::Context,
 	load_asset_version_runtime:&rbx_asset::cloud::LuauSessionLatestRequest,
-	submissions:&crate::grpc::submissions::Service,
+	submissions_service:&crate::grpc::submissions::Service,
 )->Result<(),InnerError>{
 	let available_parallelism=std::thread::available_parallelism().map_err(InnerError::Io)?.get();
 	// set up futures
 
-	// unnecessary allocation :(
+	let submissions=&release_info.Submissions;
-	let asset_versions:Vec<_> =release_info
-	.Submissions
-	.iter()
-	.map(|submission|rbx_asset::cloud::GetAssetVersionRequest{
-		asset_id:submission.ModelID,
-		version:submission.ModelVersion,
-	})
-	.enumerate()
-	.collect();
 
 	// fut_download
-	let fut_download=stream_iter(asset_versions)
+	let fut_download=futures::stream::iter(submissions)
-	.map(|(index,asset_version)|async move{
+    .enumerate()
-		let modes=download_fut(cloud_context,asset_version).await;
+	.map(|(index,submission)|{
-		(index,modes)
+		let asset_version=rbx_asset::cloud::GetAssetVersionRequest{
+			asset_id:submission.ModelID,
+			version:submission.ModelVersion,
+		};
+		async move{
+			let modes=download_fut(cloud_context,asset_version).await;
+			(index,modes)
+		}
 	})
 	.buffer_unordered(available_parallelism.min(MAX_PARALLEL_DECODE))
 	.collect::<Vec<(usize,Result<_,DownloadFutError>)>>();
@@ -105,7 +102,7 @@ async fn release_inner(
 	let fut_load_asset_versions=load_asset_versions(
 		cloud_context_luau_execution,
 		load_asset_version_runtime,
-		release_info.Submissions.iter().map(|submission|submission.UploadedAssetID),
+		submissions.iter().map(|submission|submission.UploadedAssetID),
 	);
 
 	// execute futures
@@ -114,7 +111,7 @@ async fn release_inner(
 	let load_asset_versions=load_asset_versions_result.map_err(InnerError::LoadAssetVersions)?;
 
 	// sanity check roblox output
-	if load_asset_versions.len()!=release_info.Submissions.len(){
+	if load_asset_versions.len()!=submissions.len(){
 		return Err(InnerError::LoadAssetVersionsListLength);
 	};
 
@@ -128,7 +125,7 @@ async fn release_inner(
 		match result{
 			Ok(value)=>modes.push(value),
 			Err(error)=>errors.push(ErrorContext{
-				submission_id:release_info.Submissions[index].SubmissionID,
+				submission_id:submissions[index].SubmissionID,
 				error:error,
 			}),
 		}
@@ -138,14 +135,14 @@ async fn release_inner(
 	}
 
 	// concurrently dispatch results
-	let release_results:Vec<_> =stream_iter(
+	let release_results:Vec<_> =futures::stream::iter(
 		release_info
 		.Submissions
 		.into_iter()
 		.zip(modes)
 		.zip(load_asset_versions)
 		.map(|((submission,modes),asset_version)|async move{
-			let result=submissions.set_status_released(rust_grpc::validator::SubmissionReleaseRequest{
+			let result=submissions_service.set_status_released(rust_grpc::validator::SubmissionReleaseRequest{
 				submission_id:submission.SubmissionID,
 				map_create:Some(rust_grpc::maps_extended::MapCreate{
 					id:submission.UploadedAssetID as i64,
@@ -184,7 +181,7 @@ async fn release_inner(
 	Ok(())
 }
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	UpdateOperation(tonic::Status),

validation/src/upload_mapfix.rs

@@ -1,7 +1,7 @@
 use crate::download::download_asset_version;
 use crate::nats_types::UploadMapfixRequest;
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum InnerError{
 	Download(crate::download::Error),
@@ -43,7 +43,7 @@ async fn upload_inner(
 
 	Ok(())
 }
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	ApiActionMapfixUploaded(tonic::Status),

validation/src/upload_submission.rs

@@ -1,7 +1,7 @@
 use crate::download::download_asset_version;
 use crate::nats_types::UploadSubmissionRequest;
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum InnerError{
 	Download(crate::download::Error),
@@ -44,7 +44,7 @@ async fn upload_inner(
 	Ok(upload_response.AssetId)
 }
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	ApiActionSubmissionUploaded(tonic::Status),

validation/src/validate_mapfix.rs

@@ -1,6 +1,6 @@
 use crate::nats_types::ValidateMapfixRequest;
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	ApiActionMapfixValidate(tonic::Status),

validation/src/validate_submission.rs

@@ -1,6 +1,6 @@
 use crate::nats_types::ValidateSubmissionRequest;
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	ApiActionSubmissionValidate(tonic::Status),

validation/src/validator.rs

@@ -1,5 +1,4 @@
-use futures_util::stream::iter as stream_iter;
+use futures::TryStreamExt;
-use futures_util::TryStreamExt;
 use rust_grpc::validator::Policy;
 
 use crate::download::download_asset_version;
@@ -18,7 +17,7 @@ fn hash_source(source:&str)->u64{
 	std::hash::Hasher::finish(&hasher)
 }
 
-#[expect(dead_code)]
+#[allow(dead_code)]
 #[derive(Debug)]
 pub enum Error{
 	ModelInfoDownload(rbx_asset::cloud::GetError),
@@ -53,7 +52,7 @@ impl std::fmt::Display for Error{
 }
 impl std::error::Error for Error{}
 
-#[expect(nonstandard_style)]
+#[allow(nonstandard_style)]
 pub struct ValidateRequest{
 	pub ModelID:u64,
 	pub ModelVersion:u64,
@@ -154,7 +153,7 @@ impl crate::message_handler::MessageHandler{
 		}
 
 		// send all script hashes to REST endpoint and retrieve the replacements
-		stream_iter(script_map.iter_mut().map(Ok))
+		futures::stream::iter(script_map.iter_mut().map(Ok))
 		.try_for_each_concurrent(Some(SCRIPT_CONCURRENCY),|(source,NamePolicy{policy,name})|async{
 			// get the hash
 			let hash=hash_source(source.as_str());

web/.gitignore

@@ -1,12 +1,24 @@
+bun.lockb
+
 # dependencies
 /node_modules
+/.pnp
+.pnp.*
+.yarn/*
+!.yarn/patches
+!.yarn/plugins
+!.yarn/releases
+!.yarn/versions
 
 # testing
 /coverage
 
+# next.js
+/.next/
+/out/
+
 # production
 /build
-/dist
 
 # misc
 .DS_Store
@@ -17,22 +29,12 @@ npm-debug.log*
 yarn-debug.log*
 yarn-error.log*
 
-# env files
+# env files (can opt-in for committing if needed)
 .env*
-.env.local
+
-.env.development.local
+# vercel
-.env.test.local
+.vercel
-.env.production.local
 
 # typescript
 *.tsbuildinfo
-
+next-env.d.ts
-# editor directories and files
-.vscode/*
-!.vscode/extensions.json
-.idea
-*.suo
-*.ntvs*
-*.njsproj
-*.sln
-*.sw?

web/Containerfile

@@ -1,29 +1,13 @@
-# Build stage
+FROM registry.itzana.me/docker-proxy/oven/bun:1.3.3
-FROM registry.itzana.me/docker-proxy/oven/bun:1.3.3 AS builder
 
 WORKDIR /app
 
-COPY package.json bun.lockb* ./
-RUN bun install --frozen-lockfile
-
 COPY . .
-RUN bun run build
-
-# Release
-FROM registry.itzana.me/docker-proxy/nginx:alpine
-
-COPY --from=builder /app/build /usr/share/nginx/html
-
-# Add nginx configuration for SPA routing
-RUN echo 'server { \
-    listen 3000; \
-    location / { \
-        root /usr/share/nginx/html; \
-        index index.html; \
-        try_files $uri $uri/ /index.html; \
-    } \
-}' > /etc/nginx/conf.d/default.conf
 
 EXPOSE 3000
 
-CMD ["nginx", "-g", "daemon off;"]
+ENV NEXT_TELEMETRY_DISABLED=1
+
+RUN bun install
+RUN bun run build
+ENTRYPOINT ["bun", "run", "start"]

web/index.html

@@ -1,20 +0,0 @@
-<!doctype html>
-<html lang="en">
-  <head>
-    <meta charset="UTF-8" />
-    <link rel="icon" type="image/x-icon" href="/favicon.ico" />
-    <meta name="viewport" content="width=device-width, initial-scale=1.0" />
-    <title>StrafesNET | Maps</title>
-    <link rel="preconnect" href="https://fonts.googleapis.com" />
-    <link rel="preconnect" href="https://fonts.gstatic.com" crossorigin />
-    <link href="https://fonts.googleapis.com/css2?family=Inter:wght@400;500;600;700&family=Barlow:wght@700&display=swap" rel="stylesheet" />
-    <style>
-      * { margin: 0; padding: 0; box-sizing: border-box; }
-      body { background-color: #09090b; }
-    </style>
-  </head>
-  <body>
-    <div id="root"></div>
-    <script type="module" src="/src/main.tsx"></script>
-  </body>
-</html>

web/next.config.ts

@@ -0,0 +1,16 @@
+import type { NextConfig } from "next";
+
+const nextConfig: NextConfig = {
+    distDir: "build",
+    output: "standalone",
+    images: {
+		remotePatterns: [
+			{
+				protocol: "https",
+				hostname: "**.rbxcdn.com",
+			},
+		],
+	},
+};
+
+export default nextConfig;

web/package.json

@@ -2,24 +2,21 @@
   "name": "map-service-web",
   "version": "0.1.0",
   "private": true,
-  "type": "module",
   "scripts": {
-    "dev": "vite",
+    "dev": "next dev -p 3000 --turbopack",
-    "build": "tsc && vite build",
+    "build": "next build",
-    "preview": "vite preview",
+    "start": "next start -p 3000",
-    "lint": "eslint src --ext ts,tsx"
+    "lint": "next lint"
   },
   "dependencies": {
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
-    "@monaco-editor/react": "^4.7.0",
     "@mui/icons-material": "^7.3.6",
     "@mui/material": "^7.3.6",
-    "@tanstack/react-query": "^5.90.12",
     "date-fns": "^4.1.0",
+    "next": "^16.0.7",
     "react": "^19.2.1",
     "react-dom": "^19.2.1",
-    "react-router-dom": "^7.1.3",
     "sass": "^1.94.2"
   },
   "devDependencies": {
@@ -27,9 +24,8 @@
     "@types/node": "^24.10.1",
     "@types/react": "^19.2.7",
     "@types/react-dom": "^19.2.3",
-    "@vitejs/plugin-react": "^4.3.4",
     "eslint": "^9.39.1",
-    "typescript": "^5.9.3",
+    "eslint-config-next": "16.0.7",
-    "vite": "^6.0.7"
+    "typescript": "^5.9.3"
   }
 }

web/src/App.tsx

@@ -1,47 +0,0 @@
-import { Routes, Route } from 'react-router-dom'
-import { ThemeProvider, CssBaseline } from '@mui/material'
-import { theme } from '@/app/lib/theme'
-
-// Pages
-import Home from '@/app/page'
-import MapsPage from '@/app/maps/page'
-import MapDetailPage from '@/app/maps/[mapId]/page'
-import MapFixCreatePage from '@/app/maps/[mapId]/fix/page'
-import MapfixesPage from '@/app/mapfixes/page'
-import MapfixDetailPage from '@/app/mapfixes/[mapfixId]/page'
-import SubmissionsPage from '@/app/submissions/page'
-import SubmissionDetailPage from '@/app/submissions/[submissionId]/page'
-import SubmitPage from '@/app/submit/page'
-import AdminSubmitPage from '@/app/admin-submit/page'
-import OperationPage from '@/app/operations/[operationId]/page'
-import ReviewerDashboardPage from '@/app/reviewer-dashboard/page'
-import UserDashboardPage from '@/app/user-dashboard/page'
-import ScriptReviewPage from '@/app/script-review/page'
-import NotFound from '@/app/not-found/page'
-
-function App() {
-  return (
-    <ThemeProvider theme={theme}>
-      <CssBaseline />
-      <Routes>
-        <Route path="/" element={<Home />} />
-        <Route path="/maps" element={<MapsPage />} />
-        <Route path="/maps/:mapId" element={<MapDetailPage />} />
-        <Route path="/maps/:mapId/fix" element={<MapFixCreatePage />} />
-        <Route path="/mapfixes" element={<MapfixesPage />} />
-        <Route path="/mapfixes/:mapfixId" element={<MapfixDetailPage />} />
-        <Route path="/submissions" element={<SubmissionsPage />} />
-        <Route path="/submissions/:submissionId" element={<SubmissionDetailPage />} />
-        <Route path="/submit" element={<SubmitPage />} />
-        <Route path="/admin-submit" element={<AdminSubmitPage />} />
-        <Route path="/operations/:operationId" element={<OperationPage />} />
-        <Route path="/review" element={<ReviewerDashboardPage />} />
-        <Route path="/dashboard" element={<UserDashboardPage />} />
-        <Route path="/script-review" element={<ScriptReviewPage />} />
-        <Route path="*" element={<NotFound />} />
-      </Routes>
-    </ThemeProvider>
-  )
-}
-
-export default App

web/src/app/_components/AnimatedBackground.tsx

@@ -1,34 +0,0 @@
-import { Box } from '@mui/material';
-import { surface } from '@/app/lib/colors';
-
-const AnimatedBackground: React.FC = () => {
-    return (
-        <Box
-            sx={{
-                position: 'fixed',
-                inset: 0,
-                zIndex: 0,
-                overflow: 'hidden',
-                pointerEvents: 'none',
-                background: `
-                    radial-gradient(ellipse 80% 60% at 50% -20%, rgba(124, 58, 237, 0.08) 0%, transparent 100%),
-                    radial-gradient(ellipse 60% 40% at 80% 80%, rgba(34, 211, 238, 0.04) 0%, transparent 100%),
-                    ${surface.base}
-                `,
-            }}
-        >
-            <Box
-                sx={{
-                    position: 'absolute',
-                    inset: 0,
-                    opacity: 0.03,
-                    backgroundImage: `url("data:image/svg+xml,%3Csvg viewBox='0 0 256 256' xmlns='http://www.w3.org/2000/svg'%3E%3Cfilter id='n'%3E%3CfeTurbulence type='fractalNoise' baseFrequency='0.9' numOctaves='4' stitchTiles='stitch'/%3E%3C/filter%3E%3Crect width='100%25' height='100%25' filter='url(%23n)'/%3E%3C/svg%3E")`,
-                    backgroundRepeat: 'repeat',
-                    backgroundSize: '128px 128px',
-                }}
-            />
-        </Box>
-    );
-};
-
-export default AnimatedBackground;

web/src/app/_components/carousel.tsx

@@ -1,6 +1,6 @@
-import {Box, Button, IconButton, Typography} from "@mui/material";
+import {Box, IconButton, Typography} from "@mui/material";
 import {useEffect, useRef, useState} from "react";
-import { Link } from "react-router-dom";
+import Link from "next/link";
 import ArrowBackIosNewIcon from "@mui/icons-material/ArrowBackIosNew";
 import ArrowForwardIosIcon from "@mui/icons-material/ArrowForwardIos";
 import {SubmissionInfo} from "@/app/ts/Submission";
@@ -65,22 +65,14 @@ export function Carousel<T extends CarouselItem>({ title, items, renderItem, vie
 
     return (
         <Box mb={6}>
-            <Box display="flex" justifyContent="space-between" alignItems="center" mb={3}>
+            <Box display="flex" justifyContent="space-between" alignItems="center" mb={2}>
                 <Typography variant="h4" component="h2" fontWeight="bold">
                     {title}
                 </Typography>
-                <Link to={viewAllLink} style={{textDecoration: 'none'}}>
+                <Link href={viewAllLink} style={{textDecoration: 'none'}}>
-                    <Button
+                    <Typography component="span" color="primary">
-                        endIcon={<ArrowForwardIosIcon sx={{ fontSize: '0.875rem' }} />}
+                        View All →
-                        sx={{
+                    </Typography>
-                            color: 'primary.main',
-                            '&:hover': {
-                                backgroundColor: 'rgba(167, 139, 250, 0.08)',
-                            },
-                        }}
-                    >
-                        View All
-                    </Button>
                 </Link>
             </Box>
 
@@ -93,12 +85,9 @@ export function Carousel<T extends CarouselItem>({ title, items, renderItem, vie
                         transform: 'translateY(-50%)',
                         zIndex: 2,
                         backgroundColor: 'background.paper',
-                        border: '1px solid rgba(167, 139, 250, 0.15)',
+                        boxShadow: 2,
-                        boxShadow: '0 4px 12px rgba(0, 0, 0, 0.3)',
                         '&:hover': {
-                            backgroundColor: 'background.paper',
+                            backgroundColor: 'action.hover',
-                            borderColor: 'rgba(167, 139, 250, 0.3)',
-                            boxShadow: '0 8px 20px rgba(167, 139, 250, 0.2)',
                         },
                         visibility: scrollPosition <= 5 ? 'hidden' : 'visible',
                     }}
@@ -117,7 +106,7 @@ export function Carousel<T extends CarouselItem>({ title, items, renderItem, vie
                         '&::-webkit-scrollbar': {
                             display: 'none',
                         },
-                        gap: '20px',
+                        gap: '16px', // Fixed 16px gap - using string with px unit to ensure it's absolute
                         padding: '8px 4px',
                     }}
                 >
@@ -127,7 +116,7 @@ export function Carousel<T extends CarouselItem>({ title, items, renderItem, vie
                             sx={{
                                 flex: '0 0 auto',
                                 width: {
-                                    xs: '260px',
+                                    xs: '260px', // Fixed width at different breakpoints
                                     sm: '280px',
                                     md: '300px'
                                 }
@@ -146,12 +135,9 @@ export function Carousel<T extends CarouselItem>({ title, items, renderItem, vie
                         transform: 'translateY(-50%)',
                         zIndex: 2,
                         backgroundColor: 'background.paper',
-                        border: '1px solid rgba(167, 139, 250, 0.15)',
+                        boxShadow: 2,
-                        boxShadow: '0 4px 12px rgba(0, 0, 0, 0.3)',
                         '&:hover': {
-                            backgroundColor: 'background.paper',
+                            backgroundColor: 'action.hover',
-                            borderColor: 'rgba(167, 139, 250, 0.3)',
-                            boxShadow: '0 8px 20px rgba(167, 139, 250, 0.2)',
                         },
                         visibility: scrollPosition >= maxScroll - 5 ? 'hidden' : 'visible',
                     }}

web/src/app/_components/comments/AuditEventItem.tsx

@@ -1,14 +1,13 @@
+import React from 'react';
 import {
     Box,
     Avatar,
     Typography,
-    Tooltip,
+    Tooltip
-    Skeleton
 } from "@mui/material";
 import PersonIcon from '@mui/icons-material/Person';
 import { formatDistanceToNow, format } from "date-fns";
 import { AuditEvent, decodeAuditEvent as auditEventMessage } from "@/app/ts/AuditEvent";
-import { useUserThumbnail } from "@/app/hooks/useThumbnails";
 
 interface AuditEventItemProps {
     event: AuditEvent;
@@ -16,44 +15,17 @@ interface AuditEventItemProps {
 }
 
 export default function AuditEventItem({ event, validatorUser }: AuditEventItemProps) {
-    const isValidator = event.User === validatorUser;
-    const { thumbnailUrl, isLoading } = useUserThumbnail(isValidator ? undefined : event.User, '150x150');
-
     return (
-        <Box sx={{
+        <Box sx={{ display: 'flex', gap: 2 }}>
-            display: 'flex',
+            <Avatar
-            gap: 2,
+                src={event.User === validatorUser ? undefined : `/thumbnails/user/${event.User}`}
-            p: 2,
+            >
-            borderRadius: 1
+                <PersonIcon />
-        }}>
+            </Avatar>
-            <Box sx={{ position: 'relative', width: 40, height: 40 }}>
-                <Skeleton
-                    variant="circular"
-                    sx={{
-                        position: 'absolute',
-                        width: 40,
-                        height: 40,
-                        opacity: isLoading ? 1 : 0,
-                        transition: 'opacity 0.3s ease-in-out',
-                    }}
-                    animation="wave"
-                />
-                <Avatar
-                    src={isValidator ? undefined : (thumbnailUrl || undefined)}
-                    sx={{
-                        width: 40,
-                        height: 40,
-                        opacity: isLoading ? 0 : 1,
-                        transition: 'opacity 0.3s ease-in-out',
-                    }}
-                >
-                    <PersonIcon />
-                </Avatar>
-            </Box>
             <Box sx={{ flexGrow: 1 }}>
                 <Box sx={{ display: 'flex', justifyContent: 'space-between' }}>
                     <Typography variant="subtitle2">
-                        {isValidator ? "Validator" : event.Username || "Unknown"}
+                        {event.User === validatorUser ? "Validator" : event.Username || "Unknown"}
                     </Typography>
                     <DateDisplay date={event.Date} />
                 </Box>

web/src/app/_components/comments/AuditEventsTabPanel.tsx

@@ -1,3 +1,4 @@
+import React from 'react';
 import {
     Box,
     Stack,
@@ -21,21 +22,18 @@ export default function AuditEventsTabPanel({
     );
 
     return (
-        <Box
+        <Box role="tabpanel" hidden={activeTab !== 1}>
-            role="tabpanel"
+            {activeTab === 1 && (
-            sx={{
+                <Stack spacing={2}>
-                display: activeTab === 1 ? 'block' : 'none'
+                    {filteredEvents.map((event, index) => (
-            }}
+                        <AuditEventItem
-        >
+                            key={index}
-            <Stack spacing={2}>
+                            event={event}
-                {filteredEvents.map((event, index) => (
+                            validatorUser={validatorUser}
-                    <AuditEventItem
+                        />
-                        key={index}
+                    ))}
-                        event={event}
+                </Stack>
-                        validatorUser={validatorUser}
+            )}
-                    />
-                ))}
-            </Stack>
         </Box>
     );
 }

web/src/app/_components/comments/CommentItem.tsx

@@ -1,14 +1,13 @@
+import React from 'react';
 import {
     Box,
     Avatar,
     Typography,
-    Tooltip,
+    Tooltip
-    Skeleton
 } from "@mui/material";
 import PersonIcon from '@mui/icons-material/Person';
 import { formatDistanceToNow, format } from "date-fns";
 import { AuditEvent, decodeAuditEvent } from "@/app/ts/AuditEvent";
-import { useUserThumbnail } from "@/app/hooks/useThumbnails";
 
 interface CommentItemProps {
     event: AuditEvent;
@@ -16,43 +15,21 @@ interface CommentItemProps {
 }
 
 export default function CommentItem({ event, validatorUser }: CommentItemProps) {
-    const isValidator = event.User === validatorUser;
-    const { thumbnailUrl, isLoading } = useUserThumbnail(isValidator ? undefined : event.User, '150x150');
-
     return (
         <Box sx={{ display: 'flex', gap: 2 }}>
-            <Box sx={{ position: 'relative', width: 40, height: 40 }}>
+            <Avatar
-                <Skeleton
+                src={event.User === validatorUser ? undefined : `/thumbnails/user/${event.User}`}
-                    variant="circular"
+            >
-                    sx={{
+                <PersonIcon />
-                        position: 'absolute',
+            </Avatar>
-                        width: 40,
-                        height: 40,
-                        opacity: isLoading ? 1 : 0,
-                        transition: 'opacity 0.3s ease-in-out',
-                    }}
-                    animation="wave"
-                />
-                <Avatar
-                    src={isValidator ? undefined : (thumbnailUrl || undefined)}
-                    sx={{
-                        width: 40,
-                        height: 40,
-                        opacity: isLoading ? 0 : 1,
-                        transition: 'opacity 0.3s ease-in-out',
-                    }}
-                >
-                    <PersonIcon />
-                </Avatar>
-            </Box>
             <Box sx={{ flexGrow: 1 }}>
                 <Box sx={{ display: 'flex', justifyContent: 'space-between' }}>
                     <Typography variant="subtitle2">
-                        {isValidator ? "Validator" : event.Username || "Unknown"}
+                        {event.User === validatorUser ? "Validator" : event.Username || "Unknown"}
                     </Typography>
                     <DateDisplay date={event.Date} />
                 </Box>
-                <Typography variant="body2" sx={{ whiteSpace: 'pre-wrap' }}>{decodeAuditEvent(event)}</Typography>
+                <Typography variant="body2">{decodeAuditEvent(event)}</Typography>
             </Box>
         </Box>
     );