sugoidogo/modrinth
1
0
Fork 0
mirror of https://github.com/modrinth/code.git synced 2026-07-31 21:26:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: word separators in Typesense search fields regression (#6492)

Browse Source
This commit is contained in:
aecsocket
2026-06-24 18:09:18 +00:00
committed by GitHub
parent e56f3ae18a
commit 586cdc90f9
1 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
apps/labrinth/src/search/backend/typesense/mod.rs
+30 -32
View File
@@ -359,7 +359,7 @@ pub struct TypesenseFieldSpec {
pub facet: bool,
pub sort: bool,
pub optional: bool,
pub token_separators: Option<&'static [&'static str]>,
pub token_separators: &'static [&'static str],
}
impl SearchField {
@@ -371,7 +371,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
SearchField::Name => TypesenseFieldSpec {
path: "name",
@@ -379,7 +379,7 @@ impl SearchField {
facet: true,
sort: false,
optional: false,
token_separators: None,
token_separators: &["-"],
},
SearchField::Author => TypesenseFieldSpec {
path: "author",
@@ -387,7 +387,7 @@ impl SearchField {
facet: true,
sort: false,
optional: false,
token_separators: None,
token_separators: &["-"],
},
SearchField::License => TypesenseFieldSpec {
path: "license",
@@ -395,7 +395,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
SearchField::ProjectTypes => TypesenseFieldSpec {
path: "project_types",
@@ -403,7 +403,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
SearchField::ProjectId => TypesenseFieldSpec {
path: "project_id",
@@ -411,7 +411,7 @@ impl SearchField {
facet: true,
sort: false,
optional: false,
token_separators: None,
token_separators: &["-"],
},
SearchField::OpenSource => TypesenseFieldSpec {
path: "open_source",
@@ -419,7 +419,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
SearchField::Environment => TypesenseFieldSpec {
path: "environment",
@@ -427,7 +427,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
SearchField::GameVersions => TypesenseFieldSpec {
path: "game_versions",
@@ -435,7 +435,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: Some(&["-", "."]),
token_separators: &["-", "."],
},
SearchField::ClientSide => TypesenseFieldSpec {
path: "client_side",
@@ -443,7 +443,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
SearchField::ServerSide => TypesenseFieldSpec {
path: "server_side",
@@ -451,7 +451,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
SearchField::MinecraftServerRegion => TypesenseFieldSpec {
path: "minecraft_server.region",
@@ -459,7 +459,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
SearchField::MinecraftServerLanguages => TypesenseFieldSpec {
path: "minecraft_server.languages",
@@ -467,7 +467,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
SearchField::MinecraftJavaServerContentKind => TypesenseFieldSpec {
path: "minecraft_java_server.content.kind",
@@ -475,7 +475,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
SearchField::MinecraftJavaServerContentSupportedGameVersions => {
TypesenseFieldSpec {
@@ -484,7 +484,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: Some(&["-", "."]),
token_separators: &["-", "."],
}
}
SearchField::MinecraftJavaServerPingData => TypesenseFieldSpec {
@@ -493,7 +493,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
SearchField::DependencyProjectIds => TypesenseFieldSpec {
path: "dependency_project_ids",
@@ -501,7 +501,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
SearchField::CompatibleDependencyProjectIds => TypesenseFieldSpec {
path: "compatible_dependency_project_ids",
@@ -509,7 +509,7 @@ impl SearchField {
facet: true,
sort: false,
optional: true,
token_separators: None,
token_separators: &["-"],
},
}
}
@@ -521,9 +521,20 @@ static TYPESENSE_SEARCH_FIELDS: LazyLock<Vec<Value>> = LazyLock::new(|| {
SearchField::iter()
.map(|field| {
let spec = field.typesense_spec();
let token_separators = spec
.token_separators
.iter()
.map(|sep| Value::String((*sep).to_string()))
.collect::<Vec<_>>();
let mut obj = serde_json::Map::from_iter([
("name".to_string(), Value::String(spec.path.to_string())),
("type".to_string(), Value::String(spec.ty.to_string())),
(
"token_separators".to_string(),
Value::Array(token_separators),
),
]);
if spec.facet {
obj.insert("facet".to_string(), Value::Bool(true));
@@ -534,19 +545,6 @@ static TYPESENSE_SEARCH_FIELDS: LazyLock<Vec<Value>> = LazyLock::new(|| {
if spec.optional {
obj.insert("optional".to_string(), Value::Bool(true));
}
if let Some(token_separators) = spec.token_separators {
obj.insert(
"token_separators".to_string(),
Value::Array(
token_separators
.iter()
.map(|separator| {
Value::String((*separator).to_string())
})
.collect(),
),
);
}
Value::Object(obj)
})
.collect()