Version updates (#3626)

* Update some Labrinth dependencies

* Update some Labrinth dependencies

* Update some Labrinth dependencies

* Update zip in Labrinth

* Update itertools in Labrinth

* Update validator in labrinth

* Update thiserror in labrinth

* Update rust_decimal, redis, and deadpool-redis in labrinth

* Update totp-rs and spdx in labrinth

* Update maxminddb and tar in labrinth

* Update sentry and sentry-actix in labrinth

* Update image in labrinth

* Update lettre in labrinth

* Update derive-new and rust_iso3166 in labrinth

* Update async-stripe and json-patch in labrinth

* Update clap and iana-time-zone in labrinth

* Update labrinth to Rust 2024

* Cargo fmt

* Just do a full cargo update

* Update daedelus to Rust 2024

* Update daedelus_client to Rust 2024

* Set the formatting edition to 2024

* Fix formatting

IntelliJ messed up my formatting
This commit is contained in:
Josiah Glosson
2025-05-09 07:27:55 -05:00
committed by GitHub
parent 6e46317a37
commit 62de07e4e6
146 changed files with 1942 additions and 2311 deletions

View File

@@ -5,7 +5,7 @@ use std::collections::HashMap;
use super::super::ids::OrganizationId;
use super::super::teams::TeamId;
use super::super::users::UserId;
use crate::database::models::{version_item, DatabaseError};
use crate::database::models::{DatabaseError, version_item};
use crate::database::redis::RedisPool;
use crate::models::ids::{ProjectId, VersionId};
use crate::models::projects::{

View File

@@ -15,8 +15,8 @@ pub use super::threads::ThreadMessageId;
pub use crate::models::billing::{
ChargeId, ProductId, ProductPriceId, UserSubscriptionId,
};
use ariadne::ids::base62_id_impl;
pub use ariadne::ids::Base62Id;
use ariadne::ids::base62_id_impl;
pub use ariadne::users::UserId;
base62_id_impl!(ProjectId, ProjectId);

View File

@@ -92,18 +92,26 @@ impl From<DBNotification> for Notification {
..
} => (
"You have been invited to join a team!".to_string(),
format!("An invite has been sent for you to be {role} of a team"),
format!(
"An invite has been sent for you to be {role} of a team"
),
format!("/project/{project_id}"),
vec![
NotificationAction {
name: "Accept".to_string(),
action_route: ("POST".to_string(), format!("team/{team_id}/join")),
action_route: (
"POST".to_string(),
format!("team/{team_id}/join"),
),
},
NotificationAction {
name: "Deny".to_string(),
action_route: (
"DELETE".to_string(),
format!("team/{team_id}/members/{}", UserId::from(notif.user_id)),
format!(
"team/{team_id}/members/{}",
UserId::from(notif.user_id)
),
),
},
],
@@ -114,7 +122,8 @@ impl From<DBNotification> for Notification {
team_id,
..
} => (
"You have been invited to join an organization!".to_string(),
"You have been invited to join an organization!"
.to_string(),
format!(
"An invite has been sent for you to be {role} of an organization"
),
@@ -122,7 +131,10 @@ impl From<DBNotification> for Notification {
vec![
NotificationAction {
name: "Accept".to_string(),
action_route: ("POST".to_string(), format!("team/{team_id}/join")),
action_route: (
"POST".to_string(),
format!("team/{team_id}/join"),
),
},
NotificationAction {
name: "Deny".to_string(),

View File

@@ -15,7 +15,7 @@ pub struct PackFormat {
pub name: String,
#[validate(length(max = 2048))]
pub summary: Option<String>,
#[validate]
#[validate(nested)]
pub files: Vec<PackFile>,
pub dependencies: std::collections::HashMap<PackDependency, String>,
}