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

Merge pull request 'Fix #967 Fix comment link' (#974) from fix-comment-link into main

Browse Source 
Reviewed-on: https://git.joinplu.me/Plume/Plume/pulls/974
This commit is contained in:
KitaitiMakoto 2022-01-02 17:08:10 +00:00
commit 637bd3347b
9 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Cargo.lock generated
View File

@ -2966,7 +2966,7 @@ dependencies = [
[[package]] [[package]]
name = "plume" name = "plume"
version = "0.7.0" version = "0.7.1-dev"
dependencies = [ dependencies = [
"activitypub", "activitypub",
"askama_escape", "askama_escape",
@ -3008,7 +3008,7 @@ dependencies = [
[[package]] [[package]]
name = "plume-api" name = "plume-api"
version = "0.7.0" version = "0.7.1-dev"
dependencies = [ dependencies = [
"serde 1.0.130", "serde 1.0.130",
"serde_derive", "serde_derive",
@ -3016,7 +3016,7 @@ dependencies = [
[[package]] [[package]]
name = "plume-cli" name = "plume-cli"
version = "0.7.0" version = "0.7.1-dev"
dependencies = [ dependencies = [
"clap", "clap",
"diesel", "diesel",
@ -3027,7 +3027,7 @@ dependencies = [
[[package]] [[package]]
name = "plume-common" name = "plume-common"
version = "0.7.0" version = "0.7.1-dev"
dependencies = [ dependencies = [
"activitypub", "activitypub",
"activitystreams-derive", "activitystreams-derive",
@ -3055,7 +3055,7 @@ dependencies = [
[[package]] [[package]]
name = "plume-front" name = "plume-front"
version = "0.7.0" version = "0.7.1-dev"
dependencies = [ dependencies = [
"console_error_panic_hook", "console_error_panic_hook",
"gettext", "gettext",
@ -3072,7 +3072,7 @@ dependencies = [
[[package]] [[package]]
name = "plume-macro" name = "plume-macro"
version = "0.7.0" version = "0.7.1-dev"
dependencies = [ dependencies = [
"proc-macro2 0.4.30", "proc-macro2 0.4.30",
"quote 0.6.13", "quote 0.6.13",
@ -3081,7 +3081,7 @@ dependencies = [
[[package]] [[package]]
name = "plume-models" name = "plume-models"
version = "0.7.0" version = "0.7.1-dev"
dependencies = [ dependencies = [
"activitypub", "activitypub",
"ammonia", "ammonia",

2
Cargo.toml
View File

@ -1,7 +1,7 @@
[package] [package]
authors = ["Plume contributors"] authors = ["Plume contributors"]
name = "plume" name = "plume"
version = "0.7.0" version = "0.7.1-dev"
repository = "https://github.com/Plume-org/Plume" repository = "https://github.com/Plume-org/Plume"
edition = "2018" edition = "2018"

2
plume-api/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "plume-api" name = "plume-api"
version = "0.7.0" version = "0.7.1-dev"
authors = ["Plume contributors"] authors = ["Plume contributors"]
edition = "2018" edition = "2018"

2
plume-cli/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "plume-cli" name = "plume-cli"
version = "0.7.0" version = "0.7.1-dev"
authors = ["Plume contributors"] authors = ["Plume contributors"]
edition = "2018" edition = "2018"

2
plume-common/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "plume-common" name = "plume-common"
version = "0.7.0" version = "0.7.1-dev"
authors = ["Plume contributors"] authors = ["Plume contributors"]
edition = "2018" edition = "2018"

2
plume-front/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "plume-front" name = "plume-front"
version = "0.7.0" version = "0.7.1-dev"
authors = ["Plume contributors"] authors = ["Plume contributors"]
edition = "2018" edition = "2018"

2
plume-macro/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "plume-macro" name = "plume-macro"
version = "0.7.0" version = "0.7.1-dev"
authors = ["Trinity Pointard <trinity.pointard@insa-rennes.fr>"] authors = ["Trinity Pointard <trinity.pointard@insa-rennes.fr>"]
edition = "2018" edition = "2018"
description = "Plume procedural macros" description = "Plume procedural macros"

2
plume-models/Cargo.toml
View File

@ -1,6 +1,6 @@
[package] [package]
name = "plume-models" name = "plume-models"
version = "0.7.0" version = "0.7.1-dev"
authors = ["Plume contributors"] authors = ["Plume contributors"]
edition = "2018" edition = "2018"

6
templates/partials/comment.rs.html
View File

@ -6,6 +6,7 @@
@if let Some(comm) = Some(&comment_tree.comment) { @if let Some(comm) = Some(&comment_tree.comment) {
@if let Ok(author) = comm.get_author(ctx.0) { @if let Ok(author) = comm.get_author(ctx.0) {
@* comment-@comm.id is used for link *@
<div class="comment u-comment h-cite" id="comment-@comm.id"> <div class="comment u-comment h-cite" id="comment-@comm.id">
<main class="content"> <main class="content">
<header> <header>
@ -15,8 +16,9 @@
<small>@author.fqn</small> <small>@author.fqn</small>
</a> </a>
<p class="dt-published" datetime="@comm.creation_date.format("%F %T")"> <p class="dt-published" datetime="@comm.creation_date.format("%F %T")">
@if let Some(ref ap_url) = comm.ap_url { @if let Ok(post) = comm.get_post(ctx.0) {
<a class="u-url" href="@ap_url">@comm.creation_date.format("%B %e, %Y %H:%M")</a> @* comment-@comm.id is same to this div's id attribute *@
<a class="u-url" href="@post.ap_url#comment-@comm.id">@comm.creation_date.format("%B %e, %Y %H:%M")</a>
} }
</p> </p>