forked from didirus/AstralRinth
* 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>
278 lines
8.0 KiB
Rust
278 lines
8.0 KiB
Rust
use super::ids::*;
|
|
use crate::database::models::DatabaseError;
|
|
use crate::models::threads::{MessageBody, ThreadType};
|
|
use chrono::{DateTime, Utc};
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
pub struct ThreadBuilder {
|
|
pub type_: ThreadType,
|
|
pub members: Vec<DBUserId>,
|
|
pub project_id: Option<DBProjectId>,
|
|
pub report_id: Option<DBReportId>,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
|
|
pub struct DBThread {
|
|
pub id: DBThreadId,
|
|
|
|
pub project_id: Option<DBProjectId>,
|
|
pub report_id: Option<DBReportId>,
|
|
pub type_: ThreadType,
|
|
|
|
pub messages: Vec<DBThreadMessage>,
|
|
pub members: Vec<DBUserId>,
|
|
}
|
|
|
|
pub struct ThreadMessageBuilder {
|
|
pub author_id: Option<DBUserId>,
|
|
pub body: MessageBody,
|
|
pub thread_id: DBThreadId,
|
|
pub hide_identity: bool,
|
|
}
|
|
|
|
#[derive(Debug, Clone, Serialize, Deserialize, utoipa::ToSchema)]
|
|
pub struct DBThreadMessage {
|
|
pub id: DBThreadMessageId,
|
|
pub thread_id: DBThreadId,
|
|
pub author_id: Option<DBUserId>,
|
|
pub body: MessageBody,
|
|
pub created: DateTime<Utc>,
|
|
pub hide_identity: bool,
|
|
}
|
|
|
|
impl ThreadMessageBuilder {
|
|
pub async fn insert(
|
|
&self,
|
|
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
|
) -> Result<DBThreadMessageId, DatabaseError> {
|
|
let thread_message_id = generate_thread_message_id(transaction).await?;
|
|
|
|
sqlx::query!(
|
|
"
|
|
INSERT INTO threads_messages (
|
|
id, author_id, body, thread_id, hide_identity
|
|
)
|
|
VALUES (
|
|
$1, $2, $3, $4, $5
|
|
)
|
|
",
|
|
thread_message_id as DBThreadMessageId,
|
|
self.author_id.map(|x| x.0),
|
|
serde_json::value::to_value(self.body.clone())?,
|
|
self.thread_id as DBThreadId,
|
|
self.hide_identity
|
|
)
|
|
.execute(&mut **transaction)
|
|
.await?;
|
|
|
|
Ok(thread_message_id)
|
|
}
|
|
}
|
|
|
|
impl ThreadBuilder {
|
|
pub async fn insert(
|
|
&self,
|
|
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
|
) -> Result<DBThreadId, DatabaseError> {
|
|
let thread_id = generate_thread_id(&mut *transaction).await?;
|
|
sqlx::query!(
|
|
"
|
|
INSERT INTO threads (
|
|
id, thread_type, mod_id, report_id
|
|
)
|
|
VALUES (
|
|
$1, $2, $3, $4
|
|
)
|
|
",
|
|
thread_id as DBThreadId,
|
|
self.type_.as_str(),
|
|
self.project_id.map(|x| x.0),
|
|
self.report_id.map(|x| x.0),
|
|
)
|
|
.execute(&mut **transaction)
|
|
.await?;
|
|
|
|
let (thread_ids, members): (Vec<_>, Vec<_>) =
|
|
self.members.iter().map(|m| (thread_id.0, m.0)).unzip();
|
|
sqlx::query!(
|
|
"
|
|
INSERT INTO threads_members (
|
|
thread_id, user_id
|
|
)
|
|
SELECT * FROM UNNEST ($1::int8[], $2::int8[])
|
|
",
|
|
&thread_ids[..],
|
|
&members[..],
|
|
)
|
|
.execute(&mut **transaction)
|
|
.await?;
|
|
|
|
Ok(thread_id)
|
|
}
|
|
}
|
|
|
|
impl DBThread {
|
|
pub async fn get<'a, E>(
|
|
id: DBThreadId,
|
|
exec: E,
|
|
) -> Result<Option<DBThread>, sqlx::Error>
|
|
where
|
|
E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
|
|
{
|
|
Self::get_many(&[id], exec)
|
|
.await
|
|
.map(|x| x.into_iter().next())
|
|
}
|
|
|
|
pub async fn get_many<'a, E>(
|
|
thread_ids: &[DBThreadId],
|
|
exec: E,
|
|
) -> Result<Vec<DBThread>, sqlx::Error>
|
|
where
|
|
E: sqlx::Executor<'a, Database = sqlx::Postgres> + Copy,
|
|
{
|
|
use futures::stream::TryStreamExt;
|
|
|
|
let thread_ids_parsed: Vec<i64> =
|
|
thread_ids.iter().map(|x| x.0).collect();
|
|
let threads = sqlx::query!(
|
|
"
|
|
SELECT t.id, t.thread_type, t.mod_id, t.report_id,
|
|
ARRAY_AGG(DISTINCT tm.user_id) filter (where tm.user_id is not null) members,
|
|
JSONB_AGG(DISTINCT jsonb_build_object('id', tmsg.id, 'author_id', tmsg.author_id, 'thread_id', tmsg.thread_id, 'body', tmsg.body, 'created', tmsg.created, 'hide_identity', tmsg.hide_identity)) filter (where tmsg.id is not null) messages
|
|
FROM threads t
|
|
LEFT OUTER JOIN threads_messages tmsg ON tmsg.thread_id = t.id
|
|
LEFT OUTER JOIN threads_members tm ON tm.thread_id = t.id
|
|
WHERE t.id = ANY($1)
|
|
GROUP BY t.id
|
|
",
|
|
&thread_ids_parsed
|
|
)
|
|
.fetch(exec)
|
|
.map_ok(|x| DBThread {
|
|
id: DBThreadId(x.id),
|
|
project_id: x.mod_id.map(DBProjectId),
|
|
report_id: x.report_id.map(DBReportId),
|
|
type_: ThreadType::from_string(&x.thread_type),
|
|
messages: {
|
|
let mut messages: Vec<DBThreadMessage> = serde_json::from_value(
|
|
x.messages.unwrap_or_default(),
|
|
)
|
|
.ok()
|
|
.unwrap_or_default();
|
|
messages.sort_by(|a, b| a.created.cmp(&b.created));
|
|
messages
|
|
},
|
|
members: x.members.unwrap_or_default().into_iter().map(DBUserId).collect(),
|
|
})
|
|
.try_collect::<Vec<DBThread>>()
|
|
.await?;
|
|
|
|
Ok(threads)
|
|
}
|
|
|
|
pub async fn remove_full(
|
|
id: DBThreadId,
|
|
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
|
) -> Result<Option<()>, sqlx::error::Error> {
|
|
sqlx::query!(
|
|
"
|
|
DELETE FROM threads_messages
|
|
WHERE thread_id = $1
|
|
",
|
|
id as DBThreadId,
|
|
)
|
|
.execute(&mut **transaction)
|
|
.await?;
|
|
sqlx::query!(
|
|
"
|
|
DELETE FROM threads_members
|
|
WHERE thread_id = $1
|
|
",
|
|
id as DBThreadId
|
|
)
|
|
.execute(&mut **transaction)
|
|
.await?;
|
|
sqlx::query!(
|
|
"
|
|
DELETE FROM threads
|
|
WHERE id = $1
|
|
",
|
|
id as DBThreadId,
|
|
)
|
|
.execute(&mut **transaction)
|
|
.await?;
|
|
|
|
Ok(Some(()))
|
|
}
|
|
}
|
|
|
|
impl DBThreadMessage {
|
|
pub async fn get<'a, E>(
|
|
id: DBThreadMessageId,
|
|
exec: E,
|
|
) -> Result<Option<DBThreadMessage>, sqlx::Error>
|
|
where
|
|
E: sqlx::Executor<'a, Database = sqlx::Postgres>,
|
|
{
|
|
Self::get_many(&[id], exec)
|
|
.await
|
|
.map(|x| x.into_iter().next())
|
|
}
|
|
|
|
pub async fn get_many<'a, E>(
|
|
message_ids: &[DBThreadMessageId],
|
|
exec: E,
|
|
) -> Result<Vec<DBThreadMessage>, sqlx::Error>
|
|
where
|
|
E: sqlx::Executor<'a, Database = sqlx::Postgres>,
|
|
{
|
|
use futures::stream::TryStreamExt;
|
|
|
|
let message_ids_parsed: Vec<i64> =
|
|
message_ids.iter().map(|x| x.0).collect();
|
|
let messages = sqlx::query!(
|
|
"
|
|
SELECT tm.id, tm.author_id, tm.thread_id, tm.body, tm.created, tm.hide_identity
|
|
FROM threads_messages tm
|
|
WHERE tm.id = ANY($1)
|
|
",
|
|
&message_ids_parsed
|
|
)
|
|
.fetch(exec)
|
|
.map_ok(|x| DBThreadMessage {
|
|
id: DBThreadMessageId(x.id),
|
|
thread_id: DBThreadId(x.thread_id),
|
|
author_id: x.author_id.map(DBUserId),
|
|
body: serde_json::from_value(x.body).unwrap_or(MessageBody::Deleted { private: false }),
|
|
created: x.created,
|
|
hide_identity: x.hide_identity,
|
|
})
|
|
.try_collect::<Vec<DBThreadMessage>>()
|
|
.await?;
|
|
|
|
Ok(messages)
|
|
}
|
|
|
|
pub async fn remove_full(
|
|
id: DBThreadMessageId,
|
|
private: bool,
|
|
transaction: &mut sqlx::Transaction<'_, sqlx::Postgres>,
|
|
) -> Result<Option<()>, sqlx::error::Error> {
|
|
sqlx::query!(
|
|
"
|
|
UPDATE threads_messages
|
|
SET body = $2
|
|
WHERE id = $1
|
|
",
|
|
id as DBThreadMessageId,
|
|
serde_json::to_value(MessageBody::Deleted { private })
|
|
.unwrap_or(serde_json::json!({}))
|
|
)
|
|
.execute(&mut **transaction)
|
|
.await?;
|
|
|
|
Ok(Some(()))
|
|
}
|
|
}
|