Add support for hashtag on user interface
Add migration to fix typo Add support for linking hashtags with posts Rework tag search page so it says a nicer message than page not found when no post use that tag Add new string to translation
This commit is contained in:
+30
-7
@@ -139,7 +139,7 @@ fn edit(blog: String, slug: String, user: User, conn: DbConn) -> Option<Template
|
||||
content: source,
|
||||
tags: Tag::for_post(&*conn, post.id)
|
||||
.into_iter()
|
||||
.map(|t| t.tag)
|
||||
.filter_map(|t| if !t.is_hashtag {Some(t.tag)} else {None})
|
||||
.collect::<Vec<String>>()
|
||||
.join(", "),
|
||||
license: post.license.clone(),
|
||||
@@ -183,7 +183,7 @@ fn update(blog: String, slug: String, user: User, conn: DbConn, data: LenientFor
|
||||
// actually it's not "Ok"…
|
||||
Ok(Redirect::to(uri!(super::blogs::details: name = blog)))
|
||||
} else {
|
||||
let (content, mentions, _hashtag) = utils::md_to_html(form.content.to_string().as_ref());//TODO do something with hashtags
|
||||
let (content, mentions, hashtags) = utils::md_to_html(form.content.to_string().as_ref());
|
||||
|
||||
let license = if form.license.len() > 0 {
|
||||
form.license.to_string()
|
||||
@@ -215,16 +215,32 @@ fn update(blog: String, slug: String, user: User, conn: DbConn, data: LenientFor
|
||||
let old_tags = Tag::for_post(&*conn, post.id).into_iter().collect::<Vec<_>>();
|
||||
let tags = form.tags.split(",").map(|t| t.trim().to_camel_case()).filter(|t| t.len() > 0).collect::<Vec<_>>();
|
||||
for tag in tags.iter() {
|
||||
if old_tags.iter().all(|ot| &ot.tag!=tag) {
|
||||
if old_tags.iter().all(|ot| &ot.tag!=tag || ot.is_hashtag) {
|
||||
Tag::insert(&*conn, NewTag {
|
||||
tag: tag.clone(),
|
||||
is_hastag: false,
|
||||
is_hashtag: false,
|
||||
post_id: post.id
|
||||
});
|
||||
}
|
||||
}
|
||||
for ot in old_tags.iter() {
|
||||
if !tags.contains(&ot.tag) && !ot.is_hashtag {
|
||||
ot.delete(&conn);
|
||||
}
|
||||
}
|
||||
|
||||
let hashtags = hashtags.into_iter().map(|h| h.to_camel_case()).collect::<Vec<_>>();
|
||||
for hashtag in hashtags.iter() {
|
||||
if old_tags.iter().all(|ot| &ot.tag!=hashtag || !ot.is_hashtag) {
|
||||
Tag::insert(&*conn, NewTag {
|
||||
tag: hashtag.clone(),
|
||||
is_hashtag: true,
|
||||
post_id: post.id,
|
||||
});
|
||||
}
|
||||
}
|
||||
for ot in old_tags {
|
||||
if !tags.contains(&ot.tag) {
|
||||
if !hashtags.contains(&ot.tag) && ot.is_hashtag {
|
||||
ot.delete(&conn);
|
||||
}
|
||||
}
|
||||
@@ -294,7 +310,7 @@ fn create(blog_name: String, data: LenientForm<NewPostForm>, user: User, conn: D
|
||||
// actually it's not "Ok"…
|
||||
Ok(Redirect::to(uri!(super::blogs::details: name = blog_name)))
|
||||
} else {
|
||||
let (content, mentions, _hashtag) = utils::md_to_html(form.content.to_string().as_ref());//TODO do something with hashtags
|
||||
let (content, mentions, hashtags) = utils::md_to_html(form.content.to_string().as_ref());
|
||||
|
||||
let post = Post::insert(&*conn, NewPost {
|
||||
blog_id: blog.id,
|
||||
@@ -322,7 +338,14 @@ fn create(blog_name: String, data: LenientForm<NewPostForm>, user: User, conn: D
|
||||
for tag in tags {
|
||||
Tag::insert(&*conn, NewTag {
|
||||
tag: tag,
|
||||
is_hastag: false,
|
||||
is_hashtag: false,
|
||||
post_id: post.id
|
||||
});
|
||||
}
|
||||
for hashtag in hashtags {
|
||||
Tag::insert(&*conn, NewTag {
|
||||
tag: hashtag.to_camel_case(),
|
||||
is_hashtag: true,
|
||||
post_id: post.id
|
||||
});
|
||||
}
|
||||
|
||||
+7
-9
@@ -4,25 +4,23 @@ use serde_json;
|
||||
use plume_models::{
|
||||
db_conn::DbConn,
|
||||
posts::Post,
|
||||
tags::Tag,
|
||||
users::User,
|
||||
};
|
||||
use routes::Page;
|
||||
|
||||
#[get("/tag/<name>")]
|
||||
fn tag(user: Option<User>, conn: DbConn, name: String) -> Option<Template> {
|
||||
fn tag(user: Option<User>, conn: DbConn, name: String) -> Template {
|
||||
paginated_tag(user, conn, name, Page::first())
|
||||
}
|
||||
|
||||
#[get("/tag/<name>?<page>")]
|
||||
fn paginated_tag(user: Option<User>, conn: DbConn, name: String, page: Page) -> Option<Template> {
|
||||
let tag = Tag::find_by_name(&*conn, name)?;
|
||||
let posts = Post::list_by_tag(&*conn, tag.tag.clone(), page.limits());
|
||||
Some(Template::render("tags/index", json!({
|
||||
"tag": tag.clone(),
|
||||
fn paginated_tag(user: Option<User>, conn: DbConn, name: String, page: Page) -> Template {
|
||||
let posts = Post::list_by_tag(&*conn, name.clone(), page.limits());
|
||||
Template::render("tags/index", json!({
|
||||
"tag": name.clone(),
|
||||
"account": user.map(|u| u.to_json(&*conn)),
|
||||
"articles": posts.into_iter().map(|p| p.to_json(&*conn)).collect::<Vec<serde_json::Value>>(),
|
||||
"page": page.page,
|
||||
"n_pages": Page::total(Post::count_for_tag(&*conn, tag.tag) as i32)
|
||||
})))
|
||||
"n_pages": Page::total(Post::count_for_tag(&*conn, name) as i32)
|
||||
}))
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user