Skip to content

Commit

Permalink
Merge pull request 'Fix #326 and #721: Keep title in URI' (#920) from…
Browse files Browse the repository at this point in the history
… keep-title-in-uri into main

Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/920
  • Loading branch information
KitaitiMakoto committed Apr 10, 2021
2 parents 859a1fd + dfcdcc1 commit fa7a44f
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 15 deletions.
2 changes: 0 additions & 2 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ gettext = { git = "https://github.com/Plume-org/gettext/", rev = "294c54d74c699f
gettext-macros = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
gettext-utils = { git = "https://github.com/Plume-org/gettext-macros/", rev = "a7c605f7edd6bfbfbfe7778026bfefd88d82db10" }
guid-create = "0.1"
heck = "0.3.0"
lettre = "0.9.2"
lettre_email = "0.9.2"
num_cpus = "1.10"
Expand Down
1 change: 0 additions & 1 deletion plume-models/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ ammonia = "2.1.1"
askama_escape = "0.1"
bcrypt = "0.5"
guid-create = "0.1"
heck = "0.3.0"
itertools = "0.8.0"
lazy_static = "1.0"
ldap3 = "0.7.1"
Expand Down
14 changes: 9 additions & 5 deletions plume-models/src/posts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ use activitypub::{
};
use chrono::{NaiveDateTime, TimeZone, Utc};
use diesel::{self, BelongingToDsl, ExpressionMethods, QueryDsl, RunQueryDsl, SaveChangesDsl};
use heck::KebabCase;
use once_cell::sync::Lazy;
use plume_common::{
activity_pub::{
Expand Down Expand Up @@ -253,6 +252,11 @@ impl Post {
ap_url(&format!("{}/~/{}/{}/", CONFIG.base_url, blog.fqn, slug))
}

// It's better to calc slug in insert and update
pub fn slug(title: &str) -> &str {
title
}

pub fn get_authors(&self, conn: &Connection) -> Result<Vec<User>> {
use crate::schema::post_authors;
use crate::schema::users;
Expand Down Expand Up @@ -648,12 +652,12 @@ impl FromId<DbConn> for Post {
.and_then(|mut post| {
let mut updated = false;

let slug = title.to_kebab_case();
let slug = Self::slug(&title);
let content = SafeString::new(&article.object_props.content_string()?);
let subtitle = article.object_props.summary_string()?;
let source = article.ap_object_props.source_object::<Source>()?.content;
if post.slug != slug {
post.slug = slug;
post.slug = slug.to_string();
updated = true;
}
if post.title != title {
Expand Down Expand Up @@ -692,7 +696,7 @@ impl FromId<DbConn> for Post {
conn,
NewPost {
blog_id: blog?.id,
slug: title.to_kebab_case(),
slug: Self::slug(&title).to_string(),
title,
content: SafeString::new(&article.object_props.content_string()?),
published: true,
Expand Down Expand Up @@ -837,7 +841,7 @@ impl AsObject<User, Update, &DbConn> for PostUpdate {
}

if let Some(title) = self.title {
post.slug = title.to_kebab_case();
post.slug = Post::slug(&title).to_string();
post.title = title;
}

Expand Down
3 changes: 1 addition & 2 deletions src/api/posts.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use chrono::NaiveDateTime;
use heck::KebabCase;
use rocket_contrib::json::Json;

use crate::api::{authorization::*, Api};
Expand Down Expand Up @@ -109,7 +108,7 @@ pub fn create(

let author = User::get(&conn, auth.0.user_id)?;

let slug = &payload.title.clone().to_kebab_case();
let slug = Post::slug(&payload.title);
let date = payload.creation_date.clone().and_then(|d| {
NaiveDateTime::parse_from_str(format!("{} 00:00:00", d).as_ref(), "%Y-%m-%d %H:%M:%S").ok()
});
Expand Down
7 changes: 3 additions & 4 deletions src/routes/posts.rs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
use chrono::Utc;
use heck::KebabCase;
use rocket::http::uri::Uri;
use rocket::request::LenientForm;
use rocket::response::{Flash, Redirect};
Expand Down Expand Up @@ -236,7 +235,7 @@ pub fn update(
let intl = &rockets.intl.catalog;

let new_slug = if !post.published {
form.title.to_string().to_kebab_case()
Post::slug(&form.title).to_string()
} else {
post.slug.clone()
};
Expand Down Expand Up @@ -400,7 +399,7 @@ pub struct NewPostForm {
}

pub fn valid_slug(title: &str) -> Result<(), ValidationError> {
let slug = title.to_string().to_kebab_case();
let slug = Post::slug(title);
if slug.is_empty() {
Err(ValidationError::new("empty_slug"))
} else if slug == "new" {
Expand All @@ -419,7 +418,7 @@ pub fn create(
rockets: PlumeRocket,
) -> Result<RespondOrRedirect, ErrorPage> {
let blog = Blog::find_by_fqn(&conn, &blog_name).expect("post::create: blog error");
let slug = form.title.to_string().to_kebab_case();
let slug = Post::slug(&form.title);
let user = rockets.user.clone().unwrap();

let mut errors = match form.validate() {
Expand Down

0 comments on commit fa7a44f

Please sign in to comment.