Fijxu
/
rustlog
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

distinguish opted out channels and users

This commit is contained in:
boring_nick 2023-10-24 18:49:53 +03:00
parent b160f8452e
commit c44c9d8776
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/app/mod.rs
View File

@ -127,12 +127,12 @@ impl App {
pub fn check_opted_out(&self, channel_id: &str, user_id: Option<&str>) -> Result<()> {
if self.config.opt_out.contains_key(channel_id) {
return Err(Error::OptedOut);
return Err(Error::ChannelOptedOut);
}
if let Some(user_id) = user_id {
if self.config.opt_out.contains_key(user_id) {
return Err(Error::OptedOut);
return Err(Error::UserOptedOut);
}
}

17
src/error.rs
View File

@ -20,8 +20,10 @@ pub enum Error {
Internal,
#[error("Database error")]
Clickhouse(#[from] clickhouse::error::Error),
#[error("User or channel has opted out")]
OptedOut,
#[error("The requested channel has opted out of being logged")]
ChannelOptedOut,
#[error("The requested user has opted out of being logged")]
UserOptedOut,
#[error("Not found")]
NotFound,
}
@ -35,7 +37,7 @@ impl IntoResponse for Error {
StatusCode::INTERNAL_SERVER_ERROR
}
Error::ParseInt(_) | Error::InvalidParam(_) => StatusCode::BAD_REQUEST,
Error::OptedOut => StatusCode::FORBIDDEN,
Error::ChannelOptedOut | Error::UserOptedOut => StatusCode::FORBIDDEN,
Error::NotFound => StatusCode::NOT_FOUND,
};
@ -82,7 +84,14 @@ impl OperationOutput for Error {
(
Some(403),
aide::openapi::Response {
description: Error::OptedOut.to_string(),
description: Error::ChannelOptedOut.to_string(),
..res.clone()
},
),
(
Some(403),
aide::openapi::Response {
description: Error::UserOptedOut.to_string(),
..res.clone()
},
),