mirrors/Plume
1
0
Fork 0
mirror of https://git.joinplu.me/Plume/Plume.git synced 2024-11-21 19:11:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request 'Extract Post::ap_url()' (#918) from ap_url into main

Browse source 
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/918
This commit is contained in:
KitaitiMakoto 2021-04-09 08:41:04 +00:00
commit 033fde38fe
2 changed files with 6 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
plume-models/src/posts.rs
View file

@ -73,12 +73,7 @@ impl Post {
.execute(conn)?;
let mut post = Self::last(conn)?;
if post.ap_url.is_empty() {
post.ap_url = ap_url(&format!(
"{}/~/{}/{}/",
CONFIG.base_url,
post.get_blog(conn)?.fqn,
post.slug
));
post.ap_url = Self::ap_url(post.get_blog(conn)?, &post.slug);
let _: Post = post.save_changes(conn)?;
}
@ -254,6 +249,10 @@ impl Post {
.map_err(Error::from)
}
pub fn ap_url(blog: Blog, slug: &str) -> String {
ap_url(&format!("{}/~/{}/{}/", CONFIG.base_url, blog.fqn, slug))
}
pub fn get_authors(&self, conn: &Connection) -> Result<Vec<User>> {
use crate::schema::post_authors;
use crate::schema::users;

8
src/routes/posts.rs
View file

@ -290,13 +290,7 @@ pub fn update(
let newly_published = if !post.published && !form.draft {
post.published = true;
post.creation_date = Utc::now().naive_utc();
// TODO: share code with Post::insert()
post.ap_url = plume_models::ap_url(&format!(
"{}/~/{}/{}/",
CONFIG.base_url,
post.get_blog(&conn).unwrap().fqn,
new_slug
));
post.ap_url = Post::ap_url(post.get_blog(&conn).unwrap(), &new_slug);
true
} else {
false