Change routing. Remove a macro

This commit is contained in:
jude
2023-10-05 18:54:53 +01:00
parent 2681280a39
commit e3d3418f99
8 changed files with 132 additions and 93 deletions

View File

@ -6,11 +6,12 @@ use rocket::{
};
use serenity::{
client::Context,
model::id::{ChannelId, GuildId},
model::id::{ChannelId, GuildId, UserId},
};
use sqlx::{MySql, Pool};
use crate::{
check_authorization,
guards::transaction::Transaction,
routes::{
dashboard::{
@ -28,7 +29,7 @@ pub async fn export_reminders(
ctx: &State<Context>,
pool: &State<Pool<MySql>>,
) -> JsonResult {
check_authorization!(cookies, ctx.inner(), id);
check_authorization(cookies, ctx.inner(), id).await?;
let mut csv_writer = WriterBuilder::new().quote_style(QuoteStyle::Always).from_writer(vec![]);
@ -128,7 +129,7 @@ pub(crate) async fn import_reminders(
ctx: &State<Context>,
mut transaction: Transaction<'_>,
) -> JsonResult {
check_authorization!(cookies, ctx.inner(), id);
check_authorization(cookies, ctx.inner(), id).await?;
let user_id =
cookies.get_private("userid").map(|c| c.value().parse::<u64>().ok()).flatten().unwrap();
@ -231,7 +232,7 @@ pub async fn export_todos(
ctx: &State<Context>,
pool: &State<Pool<MySql>>,
) -> JsonResult {
check_authorization!(cookies, ctx.inner(), id);
check_authorization(cookies, ctx.inner(), id).await?;
let mut csv_writer = WriterBuilder::new().quote_style(QuoteStyle::Always).from_writer(vec![]);
@ -286,7 +287,7 @@ pub async fn import_todos(
ctx: &State<Context>,
pool: &State<Pool<MySql>>,
) -> JsonResult {
check_authorization!(cookies, ctx.inner(), id);
check_authorization(cookies, ctx.inner(), id).await?;
let channels_res = GuildId(id).channels(&ctx.inner()).await;
@ -381,7 +382,7 @@ pub async fn export_reminder_templates(
ctx: &State<Context>,
pool: &State<Pool<MySql>>,
) -> JsonResult {
check_authorization!(cookies, ctx.inner(), id);
check_authorization(cookies, ctx.inner(), id).await?;
let mut csv_writer = WriterBuilder::new().quote_style(QuoteStyle::Always).from_writer(vec![]);