jmug/stoatchat
1
0
Fork 1
Code Issues Packages Projects Releases Wiki Activity

update code to be inline with reviews

Browse Source
This commit is contained in:
Zomatree
2023-04-20 17:45:48 +01:00
parent 426d836a09
commit 312e1dd41f
11 changed files with 12 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
crates/delta/src/routes/webhooks/webhook_delete.rs
View File

@@ -1,8 +1,8 @@
use revolt_quark::{Db, Ref, Result, EmptyResponse, models::User, perms, Permission}; use revolt_quark::{Db, Ref, Result, EmptyResponse, models::User, perms, Permission};
/// # Deletes a webhook with a token /// # Deletes a webhook
/// ///
/// deletes a webhook with a token /// deletes a webhook
#[openapi(tag = "Webhooks")] #[openapi(tag = "Webhooks")]
#[delete("/<target>")] #[delete("/<target>")]
pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> { pub async fn req(db: &Db, user: User, target: Ref) -> Result<EmptyResponse> {

2
crates/delta/src/routes/webhooks/webhook_delete_token.rs
View File

@@ -1,6 +1,6 @@
use revolt_quark::{Db, Ref, Result, EmptyResponse, Error}; use revolt_quark::{Db, Ref, Result, EmptyResponse, Error};
/// # Deletes a webhook with a token /// # Deletes a webhook
/// ///
/// deletes a webhook with a token /// deletes a webhook with a token
#[openapi(tag = "Webhooks")] #[openapi(tag = "Webhooks")]

2
crates/delta/src/routes/webhooks/webhook_edit_token.rs
View File

@@ -15,7 +15,7 @@ pub struct WebhookEditBody {
remove: Vec<FieldsWebhook> remove: Vec<FieldsWebhook>
} }
/// # Edits a webhook with a token /// # Edits a webhook
/// ///
/// edits a webhook with a token /// edits a webhook with a token
#[openapi(tag = "Webhooks")] #[openapi(tag = "Webhooks")]

2
crates/delta/src/routes/webhooks/webhook_execute_github.rs
View File

@@ -737,7 +737,7 @@ fn convert_event(data: &str, event_name: &str) -> Result<Event> {
}) })
} }
/// # executes a webhook specific to github /// # Executes a webhook specific to github
/// ///
/// executes a webhook specific to github and sends a message containg the relavent info about the event /// executes a webhook specific to github and sends a message containg the relavent info about the event
#[openapi(tag = "Webhooks")] #[openapi(tag = "Webhooks")]

2
crates/delta/src/routes/webhooks/webhook_fetch.rs
View File

@@ -16,7 +16,7 @@ pub struct WebhookData {
pub channel: String, pub channel: String,
} }
/// # gets a webhook /// # Gets a webhook
/// ///
/// gets a webhook /// gets a webhook
#[openapi(tag = "Webhooks")] #[openapi(tag = "Webhooks")]

4
crates/delta/src/routes/webhooks/webhook_fetch_token.rs
View File

@@ -1,9 +1,9 @@
use revolt_quark::{Db, Ref, Result, Error, models::Webhook}; use revolt_quark::{Db, Ref, Result, Error, models::Webhook};
use rocket::serde::json::Json; use rocket::serde::json::Json;
/// # gets a webhook /// # Gets a webhook
/// ///
/// gets a webhook /// gets a webhook with a token
#[openapi(tag = "Webhooks")] #[openapi(tag = "Webhooks")]
#[get("/<target>/<token>")] #[get("/<target>/<token>")]
pub async fn req(db: &Db, target: Ref, token: String) -> Result<Json<Webhook>> { pub async fn req(db: &Db, target: Ref, token: String) -> Result<Json<Webhook>> {

2
crates/quark/src/impl/dummy/channels/webhook.rs
View File

@@ -26,7 +26,7 @@ impl AbstractWebhook for DummyDb {
}) })
} }
async fn update_webook(&self, webhook_id: &str, partial_webhook: &PartialWebhook, remove: &[FieldsWebhook]) -> Result<()> { async fn update_webhook(&self, webhook_id: &str, partial_webhook: &PartialWebhook, remove: &[FieldsWebhook]) -> Result<()> {
info!("updating webhook {webhook_id}, {partial_webhook:?}, removing {remove:?}"); info!("updating webhook {webhook_id}, {partial_webhook:?}, removing {remove:?}");
Ok(()) Ok(())

3
crates/quark/src/impl/generic/channels/webhook.rs
View File

@@ -42,7 +42,7 @@ impl Webhook {
self.apply_options(partial.clone()); self.apply_options(partial.clone());
db.update_webook(&self.id, &partial, &remove).await?; db.update_webhook(&self.id, &partial, &remove).await?;
partial.token = None; // Avoid leaking the token to people who receive the event partial.token = None; // Avoid leaking the token to people who receive the event
@@ -65,7 +65,6 @@ impl Webhook {
pub fn into_message_webhook(self) -> MessageWebhook { pub fn into_message_webhook(self) -> MessageWebhook {
MessageWebhook { MessageWebhook {
id: self.id,
name: self.name, name: self.name,
avatar: self.avatar.map(|f| f.id) avatar: self.avatar.map(|f| f.id)
} }

2
crates/quark/src/impl/mongo/channels/webhook.rs
View File

@@ -26,7 +26,7 @@ impl AbstractWebhook for MongoDb {
Ok(()) Ok(())
} }
async fn update_webook(&self, webhook_id: &str, partial_webhook: &PartialWebhook, remove: &[FieldsWebhook]) -> Result<()> { async fn update_webhook(&self, webhook_id: &str, partial_webhook: &PartialWebhook, remove: &[FieldsWebhook]) -> Result<()> {
self.update_one_by_id( self.update_one_by_id(
COL, COL,
webhook_id, webhook_id,

2
crates/quark/src/models/channels/message.rs
View File

@@ -112,8 +112,6 @@ pub struct Interactions {
/// Information about the webhook which /// Information about the webhook which
#[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, Validate, Default)] #[derive(Serialize, Deserialize, JsonSchema, Debug, Clone, Validate, Default)]
pub struct MessageWebhook { pub struct MessageWebhook {
// Id of Webhook
pub id: String,
// The name of the webhook - 1 to 32 chars // The name of the webhook - 1 to 32 chars
pub name: String, pub name: String,
// The id of the avatar of the webhook, if it has one // The id of the avatar of the webhook, if it has one

2
crates/quark/src/traits/channels/webhook.rs
View File

@@ -6,6 +6,6 @@ pub trait AbstractWebhook: Sync + Send {
async fn insert_webhook(&self, webhook: &Webhook) -> Result<()>; async fn insert_webhook(&self, webhook: &Webhook) -> Result<()>;
async fn fetch_webhook(&self, webhook_id: &str) -> Result<Webhook>; async fn fetch_webhook(&self, webhook_id: &str) -> Result<Webhook>;
async fn delete_webhook(&self, webhook_id: &str) -> Result<()>; async fn delete_webhook(&self, webhook_id: &str) -> Result<()>;
async fn update_webook(&self, webhook_id: &str, partial_webhook: &PartialWebhook, remove: &[FieldsWebhook]) -> Result<()>; async fn update_webhook(&self, webhook_id: &str, partial_webhook: &PartialWebhook, remove: &[FieldsWebhook]) -> Result<()>;
async fn fetch_webhooks_for_channel(&self, channel: &str) -> Result<Vec<Webhook>>; async fn fetch_webhooks_for_channel(&self, channel: &str) -> Result<Vec<Webhook>>;
} }