From 4b981e0fad8d7bebc7e9fa71ca3a4e1684e0b651 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Mon, 3 Jan 2022 00:56:29 +0900 Subject: [PATCH 1/3] (cargo-release) version {{version}} --- Cargo.lock | 2 +- Cargo.toml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 47a8d649..e8db801e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2966,7 +2966,7 @@ dependencies = [ [[package]] name = "plume" -version = "0.7.0" +version = "0.7.1-dev" dependencies = [ "activitypub", "askama_escape", diff --git a/Cargo.toml b/Cargo.toml index 4aa8e9a4..65dd3477 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,7 +1,7 @@ [package] authors = ["Plume contributors"] name = "plume" -version = "0.7.0" +version = "0.7.1-dev" repository = "https://github.com/Plume-org/Plume" edition = "2018" From f0e7ea5640d7985c631f9a37f36f43dca0cfb79c Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Mon, 3 Jan 2022 01:17:07 +0900 Subject: [PATCH 2/3] (cargo-release) version {{version}} --- Cargo.lock | 12 ++++++------ plume-api/Cargo.toml | 2 +- plume-cli/Cargo.toml | 2 +- plume-common/Cargo.toml | 2 +- plume-front/Cargo.toml | 2 +- plume-macro/Cargo.toml | 2 +- plume-models/Cargo.toml | 2 +- 7 files changed, 12 insertions(+), 12 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index e8db801e..0aba290d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -3008,7 +3008,7 @@ dependencies = [ [[package]] name = "plume-api" -version = "0.7.0" +version = "0.7.1-dev" dependencies = [ "serde 1.0.130", "serde_derive", @@ -3016,7 +3016,7 @@ dependencies = [ [[package]] name = "plume-cli" -version = "0.7.0" +version = "0.7.1-dev" dependencies = [ "clap", "diesel", @@ -3027,7 +3027,7 @@ dependencies = [ [[package]] name = "plume-common" -version = "0.7.0" +version = "0.7.1-dev" dependencies = [ "activitypub", "activitystreams-derive", @@ -3055,7 +3055,7 @@ dependencies = [ [[package]] name = "plume-front" -version = "0.7.0" +version = "0.7.1-dev" dependencies = [ "console_error_panic_hook", "gettext", @@ -3072,7 +3072,7 @@ dependencies = [ [[package]] name = "plume-macro" -version = "0.7.0" +version = "0.7.1-dev" dependencies = [ "proc-macro2 0.4.30", "quote 0.6.13", @@ -3081,7 +3081,7 @@ dependencies = [ [[package]] name = "plume-models" -version = "0.7.0" +version = "0.7.1-dev" dependencies = [ "activitypub", "ammonia", diff --git a/plume-api/Cargo.toml b/plume-api/Cargo.toml index 8d6d9f9a..a8743b54 100644 --- a/plume-api/Cargo.toml +++ b/plume-api/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "plume-api" -version = "0.7.0" +version = "0.7.1-dev" authors = ["Plume contributors"] edition = "2018" diff --git a/plume-cli/Cargo.toml b/plume-cli/Cargo.toml index 82ecb6e5..575bffea 100644 --- a/plume-cli/Cargo.toml +++ b/plume-cli/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "plume-cli" -version = "0.7.0" +version = "0.7.1-dev" authors = ["Plume contributors"] edition = "2018" diff --git a/plume-common/Cargo.toml b/plume-common/Cargo.toml index 1d6cd1ab..6e1d9912 100644 --- a/plume-common/Cargo.toml +++ b/plume-common/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "plume-common" -version = "0.7.0" +version = "0.7.1-dev" authors = ["Plume contributors"] edition = "2018" diff --git a/plume-front/Cargo.toml b/plume-front/Cargo.toml index 29542eb2..7e92038e 100644 --- a/plume-front/Cargo.toml +++ b/plume-front/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "plume-front" -version = "0.7.0" +version = "0.7.1-dev" authors = ["Plume contributors"] edition = "2018" diff --git a/plume-macro/Cargo.toml b/plume-macro/Cargo.toml index 498abcad..680e2ba3 100644 --- a/plume-macro/Cargo.toml +++ b/plume-macro/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "plume-macro" -version = "0.7.0" +version = "0.7.1-dev" authors = ["Trinity Pointard "] edition = "2018" description = "Plume procedural macros" diff --git a/plume-models/Cargo.toml b/plume-models/Cargo.toml index 9c0f9f40..de65b5b8 100644 --- a/plume-models/Cargo.toml +++ b/plume-models/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "plume-models" -version = "0.7.0" +version = "0.7.1-dev" authors = ["Plume contributors"] edition = "2018" From bac373a818fb3aba5d95458ba294f62df1ec4356 Mon Sep 17 00:00:00 2001 From: Kitaiti Makoto Date: Mon, 3 Jan 2022 02:06:59 +0900 Subject: [PATCH 3/3] Fix comment link --- templates/partials/comment.rs.html | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/templates/partials/comment.rs.html b/templates/partials/comment.rs.html index 499f9bbb..f9f78da3 100644 --- a/templates/partials/comment.rs.html +++ b/templates/partials/comment.rs.html @@ -6,6 +6,7 @@ @if let Some(comm) = Some(&comment_tree.comment) { @if let Ok(author) = comm.get_author(ctx.0) { +@* comment-@comm.id is used for link *@
@@ -15,8 +16,9 @@ @author.fqn

- @if let Some(ref ap_url) = comm.ap_url { - @comm.creation_date.format("%B %e, %Y %H:%M") + @if let Ok(post) = comm.get_post(ctx.0) { + @* comment-@comm.id is same to this div's id attribute *@ + @comm.creation_date.format("%B %e, %Y %H:%M") }