mirrors/Plume
1
0
Fork 0
mirror of https://git.joinplu.me/Plume/Plume.git synced 2024-07-03 11:25:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'Run cargo fmt' (#839) from fmt into main

Browse source 
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/839
This commit is contained in:
KitaitiMakoto 2020-12-06 17:05:39 +00:00
parent 174ed738bd 50462204e8
commit 963e742dcf
3 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
plume-common/src/utils.rs
View file

@ -294,8 +294,7 @@ pub fn md_to_html<'a>(
} }
let hashtag = text_acc; let hashtag = text_acc;
let link = Tag::Link( let link = Tag::Link(
format!("{}tag/{}", base_url, &hashtag) format!("{}tag/{}", base_url, &hashtag).into(),
.into(),
hashtag.to_owned().into(), hashtag.to_owned().into(),
); );

2
src/routes/instance.rs
View file

@ -215,7 +215,7 @@ pub fn add_email_blocklist(
if let Err(Error::Db(_)) = result { if let Err(Error::Db(_)) = result {
Ok(Flash::error( Ok(Flash::error(
Redirect::to(uri!(admin_email_blocklist: page = None)), Redirect::to(uri!(admin_email_blocklist: page = None)),
i18n!(rockets.intl.catalog, "Email already blocked") i18n!(rockets.intl.catalog, "Email already blocked"),
)) ))
} else { } else {
Ok(Flash::success( Ok(Flash::success(

4
src/routes/posts.rs
View file

@ -318,9 +318,7 @@ pub fn update(
.filter(|t| !t.is_empty()) .filter(|t| !t.is_empty())
.collect::<HashSet<_>>() .collect::<HashSet<_>>()
.into_iter() .into_iter()
.filter_map(|t| { .filter_map(|t| Tag::build_activity(t.to_string()).ok())
Tag::build_activity(t.to_string()).ok()
})
.collect::<Vec<_>>(); .collect::<Vec<_>>();
post.update_tags(&conn, tags) post.update_tags(&conn, tags)
.expect("post::update: tags error"); .expect("post::update: tags error");