aitzol/Plume
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request 'PR #818 from Github' (#831) from gh-pr-818 into main

Browse Source 
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/831
This commit is contained in:
kiwii 2020-11-22 11:45:47 +00:00
commit a59f167771
1 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/routes/instance.rs
View File

@ -210,11 +210,19 @@ pub fn add_email_blocklist(
form: LenientForm<NewBlocklistedEmail>, form: LenientForm<NewBlocklistedEmail>,
rockets: PlumeRocket, rockets: PlumeRocket,
) -> Result<Flash<Redirect>, ErrorPage> { ) -> Result<Flash<Redirect>, ErrorPage> {
BlocklistedEmail::insert(&*rockets.conn, form.0)?; let result = BlocklistedEmail::insert(&*rockets.conn, form.0);
Ok(Flash::success(
Redirect::to(uri!(admin_email_blocklist: page = None)), if let Err(Error::Db(_)) = result {
i18n!(rockets.intl.catalog, "Email Blocked"), Ok(Flash::error(
)) Redirect::to(uri!(admin_email_blocklist: page = None)),
i18n!(rockets.intl.catalog, "Email already blocked")
))
} else {
Ok(Flash::success(
Redirect::to(uri!(admin_email_blocklist: page = None)),
i18n!(rockets.intl.catalog, "Email Blocked"),
))
}
} }
#[get("/admin/emails?<page>")] #[get("/admin/emails?<page>")]
pub fn admin_email_blocklist( pub fn admin_email_blocklist(