You've already forked AstralRinth
forked from didirus/AstralRinth
Add NeoForge modpack and autoupdater support (#707)
This commit is contained in:
committed by
GitHub
parent
531b8214c0
commit
4bbfc8ccc5
@@ -84,6 +84,7 @@ pub enum EnvType {
|
|||||||
#[serde(rename_all = "kebab-case")]
|
#[serde(rename_all = "kebab-case")]
|
||||||
pub enum PackDependency {
|
pub enum PackDependency {
|
||||||
Forge,
|
Forge,
|
||||||
|
Neoforge,
|
||||||
FabricLoader,
|
FabricLoader,
|
||||||
QuiltLoader,
|
QuiltLoader,
|
||||||
Minecraft,
|
Minecraft,
|
||||||
@@ -100,6 +101,7 @@ impl PackDependency {
|
|||||||
pub fn as_str(&self) -> &'static str {
|
pub fn as_str(&self) -> &'static str {
|
||||||
match self {
|
match self {
|
||||||
PackDependency::Forge => "forge",
|
PackDependency::Forge => "forge",
|
||||||
|
PackDependency::Neoforge => "neoforge",
|
||||||
PackDependency::FabricLoader => "fabric-loader",
|
PackDependency::FabricLoader => "fabric-loader",
|
||||||
PackDependency::Minecraft => "minecraft",
|
PackDependency::Minecraft => "minecraft",
|
||||||
PackDependency::QuiltLoader => "quilt-loader",
|
PackDependency::QuiltLoader => "quilt-loader",
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
use std::collections::HashMap;
|
use std::collections::HashMap;
|
||||||
|
|
||||||
use actix_web::{get, web, HttpRequest, HttpResponse};
|
use actix_web::{get, web, HttpRequest, HttpResponse};
|
||||||
use serde::Serialize;
|
use serde::{Deserialize, Serialize};
|
||||||
use sqlx::PgPool;
|
use sqlx::PgPool;
|
||||||
|
|
||||||
use crate::auth::{filter_authorized_versions, get_user_from_headers, is_authorized};
|
use crate::auth::{filter_authorized_versions, get_user_from_headers, is_authorized};
|
||||||
@@ -16,9 +16,20 @@ pub fn config(cfg: &mut web::ServiceConfig) {
|
|||||||
cfg.service(forge_updates);
|
cfg.service(forge_updates);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#[derive(Serialize, Deserialize)]
|
||||||
|
pub struct NeoForge {
|
||||||
|
#[serde(default = "default_neoforge")]
|
||||||
|
pub neoforge: String,
|
||||||
|
}
|
||||||
|
|
||||||
|
fn default_neoforge() -> String {
|
||||||
|
"none".into()
|
||||||
|
}
|
||||||
|
|
||||||
#[get("{id}/forge_updates.json")]
|
#[get("{id}/forge_updates.json")]
|
||||||
pub async fn forge_updates(
|
pub async fn forge_updates(
|
||||||
req: HttpRequest,
|
req: HttpRequest,
|
||||||
|
web::Query(neo): web::Query<NeoForge>,
|
||||||
info: web::Path<(String,)>,
|
info: web::Path<(String,)>,
|
||||||
pool: web::Data<PgPool>,
|
pool: web::Data<PgPool>,
|
||||||
redis: web::Data<deadpool_redis::Pool>,
|
redis: web::Data<deadpool_redis::Pool>,
|
||||||
@@ -49,10 +60,16 @@ pub async fn forge_updates(
|
|||||||
|
|
||||||
let versions = database::models::Version::get_many(&project.versions, &**pool, &redis).await?;
|
let versions = database::models::Version::get_many(&project.versions, &**pool, &redis).await?;
|
||||||
|
|
||||||
|
let loaders = match &*neo.neoforge {
|
||||||
|
"only" => |x: &String| *x == "neoforge",
|
||||||
|
"include" => |x: &String| *x == "forge" || *x == "neoforge",
|
||||||
|
_ => |x: &String| *x == "forge",
|
||||||
|
};
|
||||||
|
|
||||||
let mut versions = filter_authorized_versions(
|
let mut versions = filter_authorized_versions(
|
||||||
versions
|
versions
|
||||||
.into_iter()
|
.into_iter()
|
||||||
.filter(|x| x.loaders.iter().any(|y| *y == "forge"))
|
.filter(|x| x.loaders.iter().any(loaders))
|
||||||
.collect(),
|
.collect(),
|
||||||
&user_option,
|
&user_option,
|
||||||
&pool,
|
&pool,
|
||||||
|
|||||||
Reference in New Issue
Block a user