diff --git a/crates/core/database/src/events/client.rs b/crates/core/database/src/events/client.rs index b0b67aae..59fb7d3e 100644 --- a/crates/core/database/src/events/client.rs +++ b/crates/core/database/src/events/client.rs @@ -243,8 +243,7 @@ impl EventV1 { pub async fn p_user(self, id: String, db: &Database) { self.clone().p(id.clone()).await; - // ! FIXME: this should be captured by member list in the future - // ! and not immediately fanned out to users + // TODO: this should be captured by member list in the future and not immediately fanned out to users if let Ok(members) = db.fetch_all_memberships(&id).await { for member in members { self.clone().p(member.id.server).await; diff --git a/crates/core/database/src/models/messages/ops/reference.rs b/crates/core/database/src/models/messages/ops/reference.rs index 20c6ac59..63c7cea8 100644 --- a/crates/core/database/src/models/messages/ops/reference.rs +++ b/crates/core/database/src/models/messages/ops/reference.rs @@ -60,7 +60,7 @@ impl AbstractMessages for ReferenceDb { .cloned() .collect(); - // TODO: sorting, etc (will be required for tests) + // FIXME: sorting, etc (will be required for tests) Ok(matched_messages) diff --git a/crates/core/database/src/models/servers/model.rs b/crates/core/database/src/models/servers/model.rs index e3ab13c1..4faf7d71 100644 --- a/crates/core/database/src/models/servers/model.rs +++ b/crates/core/database/src/models/servers/model.rs @@ -23,7 +23,7 @@ auto_derived_partial!( pub description: Option, /// Channels within this server - // ! FIXME: this may be redundant + // TODO: investigate if this is redundant and can be removed pub channels: Vec, /// Categories for this server #[serde(skip_serializing_if = "Option::is_none")] diff --git a/crates/core/database/src/tasks/process_embeds.rs b/crates/core/database/src/tasks/process_embeds.rs index e03ba914..459b8b3a 100644 --- a/crates/core/database/src/tasks/process_embeds.rs +++ b/crates/core/database/src/tasks/process_embeds.rs @@ -132,7 +132,7 @@ pub async fn generate( return Err(create_error!(LabelMe)); } - // ! FIXME: batch request to january + // TODO: batch request to january let mut tasks = Vec::new(); for link in links { diff --git a/crates/core/models/src/v0/servers.rs b/crates/core/models/src/v0/servers.rs index d8eafde5..7a854175 100644 --- a/crates/core/models/src/v0/servers.rs +++ b/crates/core/models/src/v0/servers.rs @@ -22,7 +22,7 @@ auto_derived_partial!( pub description: Option, /// Channels within this server - // ! FIXME: this may be redundant + // TODO: investigate if this is redundant and can be removed pub channels: Vec, /// Categories for this server #[cfg_attr(feature = "serde", serde(skip_serializing_if = "Option::is_none"))] diff --git a/crates/core/permissions/src/impl.rs b/crates/core/permissions/src/impl.rs index 039a1076..b129bcf9 100644 --- a/crates/core/permissions/src/impl.rs +++ b/crates/core/permissions/src/impl.rs @@ -37,6 +37,12 @@ pub async fn calculate_user_permissions(query: &mut P) -> Pe } else { permissions.into() } + + // TODO: add boolean switch for permission for users to globally message a user + // maybe an enum? + // PrivacyLevel { Private, Friends, Mutual, Public, Global } + + // TODO: add boolean switch for permission for users to mutually DM a user } /// Calculate permissions against a server diff --git a/crates/delta/src/routes/channels/group_add_member.rs b/crates/delta/src/routes/channels/group_add_member.rs index 47989314..0fc701fb 100644 --- a/crates/delta/src/routes/channels/group_add_member.rs +++ b/crates/delta/src/routes/channels/group_add_member.rs @@ -31,8 +31,7 @@ pub async fn req( match &channel { Channel::Group { .. } => { - // FIXME: use permissions here? - // interesting if users could block new group invites + // TODO: use permissions here? interesting if users could block new group invites let member = member_id.as_user(db).await?; if !user.is_friends_with(&member.id) { return Err(create_error!(NotFriends)); diff --git a/crates/delta/src/routes/channels/group_remove_member.rs b/crates/delta/src/routes/channels/group_remove_member.rs index ef505954..5a86da40 100644 --- a/crates/delta/src/routes/channels/group_remove_member.rs +++ b/crates/delta/src/routes/channels/group_remove_member.rs @@ -148,7 +148,7 @@ mod test { .await; dbg!(response.into_string().await); - // TODO: finish impl + // FIXME: finish impl // assert_eq!(response.status(), Status::NotFound); } @@ -185,6 +185,6 @@ mod test { .dispatch() .await; - // TODO: impl assert_eq!(response.status(), Status::Forbidden); + // FIXME: impl assert_eq!(response.status(), Status::Forbidden); } } diff --git a/crates/quark/src/events/impl.rs b/crates/quark/src/events/impl.rs index d8bb85bf..e38fa969 100644 --- a/crates/quark/src/events/impl.rs +++ b/crates/quark/src/events/impl.rs @@ -568,8 +568,7 @@ impl EventV1 { pub async fn p_user(self, id: String, db: &Database) { self.clone().p(id.clone()).await; - // ! FIXME: this should be captured by member list in the future - // ! and not immediately fanned out to users + // TODO: this should be captured by member list in the future and not immediately fanned out to users if let Ok(members) = db.fetch_all_memberships(&id).await { for member in members { self.clone().p(member.id.server).await; diff --git a/crates/quark/src/impl/generic/users/user.rs b/crates/quark/src/impl/generic/users/user.rs index 2eaa894a..e0fb6919 100644 --- a/crates/quark/src/impl/generic/users/user.rs +++ b/crates/quark/src/impl/generic/users/user.rs @@ -170,7 +170,8 @@ impl User { /// Check if this user can acquire another server pub async fn can_acquire_server(&self, db: &Database) -> Result { - // ! FIXME: hardcoded max server count + // hardcoded max server count + // NB. fixed in new crate Ok(db.fetch_server_count(&self.id).await? <= 100) } diff --git a/crates/quark/src/models/servers/server.rs b/crates/quark/src/models/servers/server.rs index 375b1447..aa9e9d77 100644 --- a/crates/quark/src/models/servers/server.rs +++ b/crates/quark/src/models/servers/server.rs @@ -93,7 +93,6 @@ pub struct Server { pub description: Option, /// Channels within this server - // ! FIXME: this may be redundant pub channels: Vec, /// Categories for this server #[serde(skip_serializing_if = "Option::is_none")] diff --git a/crates/quark/src/permissions/impl/user.rs b/crates/quark/src/permissions/impl/user.rs index c1ed1054..f2b37048 100644 --- a/crates/quark/src/permissions/impl/user.rs +++ b/crates/quark/src/permissions/impl/user.rs @@ -78,12 +78,6 @@ async fn calculate_permission(data: &mut PermissionCalculator<'_>, db: &crate::D _ => {} } - // ! FIXME: add boolean switch for permission for users to globally message a user - // maybe an enum? - // PrivacyLevel { Private, Friends, Mutual, Public, Global } - - // ! FIXME: add boolean switch for permission for users to mutually DM a user - if data.flag_has_mutual_connection || data .perspective diff --git a/crates/quark/src/traits/channels/channel.rs b/crates/quark/src/traits/channels/channel.rs index d4436574..895ec981 100644 --- a/crates/quark/src/traits/channels/channel.rs +++ b/crates/quark/src/traits/channels/channel.rs @@ -43,7 +43,7 @@ pub trait AbstractChannel: Sync + Send { async fn remove_user_from_group(&self, channel: &str, user: &str) -> Result<()>; /// Set role permission for a channel - /// ! FIXME: may want to refactor to just use normal updates + /// TODO: may want to refactor to just use normal updates async fn set_channel_role_permission( &self, channel: &str, diff --git a/crates/quark/src/types/january.rs b/crates/quark/src/types/january.rs index e7ed95a0..e42f3b23 100644 --- a/crates/quark/src/types/january.rs +++ b/crates/quark/src/types/january.rs @@ -2,10 +2,10 @@ use async_lock::Semaphore; use async_std::task::spawn; use futures::future::join_all; use linkify::{LinkFinder, LinkKind}; +use once_cell::sync::Lazy; use regex::Regex; use serde::{Deserialize, Serialize}; use std::{collections::HashSet, sync::Arc}; -use once_cell::sync::Lazy; use crate::{models::attachment::File, Error, Result}; @@ -187,8 +187,6 @@ impl Embed { max_embeds: usize, semaphore: Arc, ) -> Result> { - - // Ignore code blocks. let content = RE_CODE.replace_all(&content, ""); @@ -233,7 +231,6 @@ impl Embed { return Err(Error::LabelMe); } - // ! FIXME: batch request to january? let client = reqwest::Client::new(); let mut tasks = Vec::new();