You've already forked AstralRinth
forked from didirus/AstralRinth
39f2b0ecb6
* chore: fix typo in status message * feat(labrinth): overhaul malware scanner report storage and routes * chore: address some review comments * feat: add Delphi to Docker Compose `with-delphi` profile * chore: fix unused import Clippy lint * feat(labrinth/delphi): use PAT token authorization with project read scopes * chore: expose file IDs in version queries * fix: accept null decompiled source payloads from Delphi * tweak(labrinth): expose base62 file IDs more consistently for Delphi * feat(labrinth/delphi): support new Delphi report severity field * chore(labrinth): run `cargo sqlx prepare` to fix Docker build errors * tweak: add route for fetching Delphi issue type schema, abstract Labrinth away from issue types * chore: run `cargo sqlx prepare` * chore: fix typo on frontend generated state file message * feat: update to use new Delphi issue schema * wip: tech review endpoints * wip: add ToSchema for dependent types * wip: report issues return * wip * wip: returning more data * wip * Fix up db query * Delphi configuration to talk to Labrinth * Get Delphi working with Labrinth * Add Delphi dummy fixture * Better Delphi logging * Improve utoipa for tech review routes * Add more sorting options for tech review queue * Oops join * New routes for fetching issues and reports * Fix which kind of ID is returned in tech review endpoints * Deduplicate tech review report rows * Reduce info sent for projects * Fetch more thread info * Address PR comments * fix ci * fix postgres version mismatch * fix version creation * Implement routes * fix up tech review * Allow adding a moderation comment to Delphi rejections * fix up rebase * exclude rejected projects from tech review * add status change msg to tech review thread * cargo sqlx prepare * also ignore withheld projects * More filtering on issue search * wip: report routes * Fix up for build * cargo sqlx prepare * fix thread message privacy * New tech review search route * submit route * details have statuses now * add default to drid status * dedup issue details * fix sqlx query on empty files * fixes * Dedupe issue detail statuses and message on entering tech rev * Fix qa issues * Fix qa issues * fix review comments * typos * fix ci * feat: tech review frontend (#4781) * chore: fix typo in status message * feat(labrinth): overhaul malware scanner report storage and routes * chore: address some review comments * feat: add Delphi to Docker Compose `with-delphi` profile * chore: fix unused import Clippy lint * feat(labrinth/delphi): use PAT token authorization with project read scopes * chore: expose file IDs in version queries * fix: accept null decompiled source payloads from Delphi * tweak(labrinth): expose base62 file IDs more consistently for Delphi * feat(labrinth/delphi): support new Delphi report severity field * chore(labrinth): run `cargo sqlx prepare` to fix Docker build errors * tweak: add route for fetching Delphi issue type schema, abstract Labrinth away from issue types * chore: run `cargo sqlx prepare` * chore: fix typo on frontend generated state file message * feat: update to use new Delphi issue schema * wip: tech review endpoints * wip: add ToSchema for dependent types * wip: report issues return * wip * wip: returning more data * wip * Fix up db query * Delphi configuration to talk to Labrinth * Get Delphi working with Labrinth * Add Delphi dummy fixture * Better Delphi logging * Improve utoipa for tech review routes * Add more sorting options for tech review queue * Oops join * New routes for fetching issues and reports * Fix which kind of ID is returned in tech review endpoints * Deduplicate tech review report rows * Reduce info sent for projects * Fetch more thread info * Address PR comments * fix ci * fix ci * fix postgres version mismatch * fix version creation * Implement routes * feat: batch scan alert * feat: layout * feat: introduce surface variables * fix: theme selector * feat: rough draft of tech review card * feat: tab switcher * feat: batch scan btn * feat: api-client module for tech review * draft: impl * feat: auto icons * fix: layout issues * feat: fixes to code blocks + flag labels * feat: temp remove mock data * fix: search sort types * fix: intl & lint * chore: re-enable mock data * fix: flag badges + auto open first issue in file tab * feat: update for new routes * fix: more qa issues * feat: lazy load sources * fix: re-enable auth middleware * feat: impl threads * fix: lint & severity * feat: download btn + switch to using NavTabs with new local mode option * feat: re-add toplevel btns * feat: reports page consistency * fix: consistency on project queue * fix: icons + sizing * fix: colors and gaps * fix: impl endpoints * feat: load all flags on file tab * feat: thread generics changes * feat: more qa * feat: fix collapse * fix: qa * feat: msg modal * fix: ISO import * feat: qa fixes * fix: empty state basic * fix: collapsible region * fix: collapse thread by default * feat: rough draft of new process/flow * fix labrinth build * fix thread message privacy * New tech review search route * feat: qa fixes * feat: QA changes * fix: verdict on detail not whole issue * fix: lint + intl * fix: lint * fix: thread message for tech rev verdict * feat: use anim frames * fix: exports + typecheck * polish: qa changes * feat: qa * feat: qa polish * feat: fix malic modal * fix: lint * fix: qa + lint * fix: pagination * fix: lint * fix: qa * intl extract * fix ci --------- Signed-off-by: Calum H. <contact@cal.engineer> Co-authored-by: Alejandro González <me@alegon.dev> Co-authored-by: aecsocket <aecsocket@tutanota.com> --------- Signed-off-by: Calum H. <contact@cal.engineer> Co-authored-by: Alejandro González <me@alegon.dev> Co-authored-by: Calum H. <contact@cal.engineer>
225 lines
6.2 KiB
Rust
225 lines
6.2 KiB
Rust
use crate::{auth::AuthProvider, bitflags_serde_impl};
|
|
use ariadne::ids::UserId;
|
|
pub use ariadne::users::UserStatus;
|
|
use chrono::{DateTime, Utc};
|
|
use rust_decimal::Decimal;
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
pub const DELETED_USER: UserId = UserId(127155982985829);
|
|
|
|
bitflags::bitflags! {
|
|
#[derive(Debug, Clone, Copy)]
|
|
pub struct Badges: u64 {
|
|
const MIDAS = 1 << 0;
|
|
const EARLY_MODPACK_ADOPTER = 1 << 1;
|
|
const EARLY_RESPACK_ADOPTER = 1 << 2;
|
|
const EARLY_PLUGIN_ADOPTER = 1 << 3;
|
|
const ALPHA_TESTER = 1 << 4;
|
|
const CONTRIBUTOR = 1 << 5;
|
|
const TRANSLATOR = 1 << 6;
|
|
const AFFILIATE = 1 << 7;
|
|
}
|
|
}
|
|
|
|
impl utoipa::PartialSchema for Badges {
|
|
fn schema() -> utoipa::openapi::RefOr<utoipa::openapi::schema::Schema> {
|
|
u64::schema()
|
|
}
|
|
}
|
|
|
|
impl utoipa::ToSchema for Badges {
|
|
fn schemas(
|
|
schemas: &mut Vec<(
|
|
String,
|
|
utoipa::openapi::RefOr<utoipa::openapi::schema::Schema>,
|
|
)>,
|
|
) {
|
|
u64::schemas(schemas);
|
|
}
|
|
}
|
|
|
|
bitflags_serde_impl!(Badges, u64);
|
|
|
|
impl Default for Badges {
|
|
fn default() -> Badges {
|
|
Badges::empty()
|
|
}
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
|
|
pub struct User {
|
|
pub id: UserId,
|
|
pub username: String,
|
|
pub avatar_url: Option<String>,
|
|
pub bio: Option<String>,
|
|
pub created: DateTime<Utc>,
|
|
pub role: Role,
|
|
pub badges: Badges,
|
|
|
|
pub auth_providers: Option<Vec<AuthProvider>>,
|
|
pub email: Option<String>,
|
|
pub email_verified: Option<bool>,
|
|
pub has_password: Option<bool>,
|
|
pub has_totp: Option<bool>,
|
|
pub payout_data: Option<UserPayoutData>,
|
|
pub stripe_customer_id: Option<String>,
|
|
pub allow_friend_requests: Option<bool>,
|
|
|
|
// DEPRECATED. Always returns None
|
|
pub github_id: Option<u64>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
|
|
pub struct UserPayoutData {
|
|
pub paypal_address: Option<String>,
|
|
pub paypal_country: Option<String>,
|
|
pub venmo_handle: Option<String>,
|
|
#[serde(with = "rust_decimal::serde::float")]
|
|
pub balance: Decimal,
|
|
}
|
|
|
|
use crate::database::models::user_item::DBUser;
|
|
impl From<DBUser> for User {
|
|
fn from(data: DBUser) -> Self {
|
|
Self {
|
|
id: data.id.into(),
|
|
username: data.username,
|
|
email: None,
|
|
email_verified: None,
|
|
avatar_url: data.avatar_url,
|
|
bio: data.bio,
|
|
created: data.created,
|
|
role: Role::from_string(&data.role),
|
|
badges: data.badges,
|
|
payout_data: None,
|
|
auth_providers: None,
|
|
has_password: None,
|
|
has_totp: None,
|
|
github_id: None,
|
|
stripe_customer_id: None,
|
|
allow_friend_requests: None,
|
|
}
|
|
}
|
|
}
|
|
|
|
impl User {
|
|
pub fn from_full(db_user: DBUser) -> Self {
|
|
let mut auth_providers = Vec::new();
|
|
|
|
if db_user.github_id.is_some() {
|
|
auth_providers.push(AuthProvider::GitHub)
|
|
}
|
|
if db_user.gitlab_id.is_some() {
|
|
auth_providers.push(AuthProvider::GitLab)
|
|
}
|
|
if db_user.discord_id.is_some() {
|
|
auth_providers.push(AuthProvider::Discord)
|
|
}
|
|
if db_user.google_id.is_some() {
|
|
auth_providers.push(AuthProvider::Google)
|
|
}
|
|
if db_user.microsoft_id.is_some() {
|
|
auth_providers.push(AuthProvider::Microsoft)
|
|
}
|
|
if db_user.steam_id.is_some() {
|
|
auth_providers.push(AuthProvider::Steam)
|
|
}
|
|
if db_user.paypal_id.is_some() {
|
|
auth_providers.push(AuthProvider::PayPal)
|
|
}
|
|
|
|
Self {
|
|
id: UserId::from(db_user.id),
|
|
username: db_user.username,
|
|
email: db_user.email,
|
|
email_verified: Some(db_user.email_verified),
|
|
avatar_url: db_user.avatar_url,
|
|
bio: db_user.bio,
|
|
created: db_user.created,
|
|
role: Role::from_string(&db_user.role),
|
|
badges: db_user.badges,
|
|
auth_providers: Some(auth_providers),
|
|
has_password: Some(db_user.password.is_some()),
|
|
has_totp: Some(db_user.totp_secret.is_some()),
|
|
github_id: None,
|
|
payout_data: Some(UserPayoutData {
|
|
paypal_address: db_user.paypal_email,
|
|
paypal_country: db_user.paypal_country,
|
|
venmo_handle: db_user.venmo_handle,
|
|
balance: Decimal::ZERO,
|
|
}),
|
|
stripe_customer_id: db_user.stripe_customer_id,
|
|
allow_friend_requests: Some(db_user.allow_friend_requests),
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(
|
|
Debug, Clone, PartialEq, Eq, Hash, Serialize, Deserialize, utoipa::ToSchema,
|
|
)]
|
|
#[serde(rename_all = "lowercase")]
|
|
pub enum Role {
|
|
Developer,
|
|
Moderator,
|
|
Admin,
|
|
}
|
|
|
|
impl std::fmt::Display for Role {
|
|
fn fmt(&self, fmt: &mut std::fmt::Formatter) -> std::fmt::Result {
|
|
fmt.write_str(self.as_str())
|
|
}
|
|
}
|
|
|
|
impl Role {
|
|
pub fn from_string(string: &str) -> Role {
|
|
match string {
|
|
"admin" => Role::Admin,
|
|
"moderator" => Role::Moderator,
|
|
_ => Role::Developer,
|
|
}
|
|
}
|
|
|
|
pub fn as_str(&self) -> &'static str {
|
|
match self {
|
|
Role::Developer => "developer",
|
|
Role::Moderator => "moderator",
|
|
Role::Admin => "admin",
|
|
}
|
|
}
|
|
|
|
pub fn is_mod(&self) -> bool {
|
|
match self {
|
|
Role::Developer => false,
|
|
Role::Moderator | Role::Admin => true,
|
|
}
|
|
}
|
|
|
|
pub fn is_admin(&self) -> bool {
|
|
match self {
|
|
Role::Developer | Role::Moderator => false,
|
|
Role::Admin => true,
|
|
}
|
|
}
|
|
}
|
|
|
|
#[derive(Serialize, Deserialize)]
|
|
pub struct UserFriend {
|
|
// The user who accepted the friend request
|
|
pub id: UserId,
|
|
/// The user who sent the friend request
|
|
pub friend_id: UserId,
|
|
pub accepted: bool,
|
|
pub created: DateTime<Utc>,
|
|
}
|
|
|
|
impl UserFriend {
|
|
pub fn from(data: crate::database::models::friend_item::DBFriend) -> Self {
|
|
Self {
|
|
id: data.friend_id.into(),
|
|
friend_id: data.user_id.into(),
|
|
accepted: data.accepted,
|
|
created: data.created,
|
|
}
|
|
}
|
|
}
|