From 52cb7270a9c5b99cc349180da656d5d9b52c1a77 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Sun, 8 May 2022 18:44:42 +0900
Subject: [PATCH 1/3] Set id attributes to action forms in post details page

---
 templates/posts/details.rs.html | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/templates/posts/details.rs.html b/templates/posts/details.rs.html
index a6674748..ce881d3b 100644
--- a/templates/posts/details.rs.html
+++ b/templates/posts/details.rs.html
@@ -78,7 +78,7 @@
         </section>
         @if ctx.2.is_some() {
             <section class="actions">
-                <form class="likes" action="@uri!(likes::create: blog = &blog.fqn, slug = &article.slug)" method="POST">
+                <form id="likes" class="likes" action="@uri!(likes::create: blog = &blog.fqn, slug = &article.slug)#likes" method="POST">
                     <p aria-label="@i18n!(ctx.1, "One like", "{0} likes"; n_likes)" title="@i18n!(ctx.1, "One like", "{0} likes"; n_likes)">
                         @n_likes
                     </p>
@@ -89,7 +89,7 @@
                         <button type="submit" class="action">@icon!("heart") @i18n!(ctx.1, "Add yours")</button>
                     }
                 </form>
-                <form class="reshares" action="@uri!(reshares::create: blog = &blog.fqn, slug = &article.slug)" method="POST">
+                <form id="reshares" class="reshares" action="@uri!(reshares::create: blog = &blog.fqn, slug = &article.slug)#reshares" method="POST">
                     <p aria-label="@i18n!(ctx.1, "One boost", "{0} boosts"; n_reshares)" title="@i18n!(ctx.1, "One boost", "{0} boosts"; n_reshares)">
                         @n_reshares
                     </p>
@@ -108,14 +108,14 @@
                 ))
             </p>
             <section class="actions">
-                <div class="likes">
+                <div id="likes" class="likes">
                     <p aria-label="@i18n!(ctx.1, "One like", "{0} likes"; n_likes)" title="@i18n!(ctx.1, "One like", "{0} likes"; n_likes)">
                         @n_likes
                     </p>
                     <a href="@uri!(posts::remote_interact: blog_name = &blog.fqn, slug = &article.slug)" class="action">@icon!("heart") @i18n!(ctx.1, "Add yours")</a>
                 </div>
 
-                <div class="reshares">
+                <div id="reshares" class="reshares">
                     <p aria-label="@i18n!(ctx.1, "One boost", "{0} boost"; n_reshares)" title="@i18n!(ctx.1, "One boost", "{0} boosts"; n_reshares)">
                         @n_reshares
                     </p>
@@ -140,11 +140,11 @@
         	    }
             </div>
         </section>
-        <section class="comments" dir="auto">
+        <section id="comments" class="comments" dir="auto">
             <h2>@i18n!(ctx.1, "Comments")</h2>
 
             @if ctx.2.is_some() {
-                <form method="post" action="@uri!(comments::create: blog_name = &blog.fqn, slug = &article.slug)">
+                <form method="post" action="@uri!(comments::create: blog_name = &blog.fqn, slug = &article.slug)#comments">
                     @(Input::new("warning", i18n!(ctx.1, "Content warning"))
                         .default(&comment_form.warning)
                         .error(&comment_errors)

From aa3e196b8f21314cfa3aa301f9a25ff1ff1b4bb8 Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Sun, 8 May 2022 18:51:09 +0900
Subject: [PATCH 2/3] Make comment content required

---
 templates/posts/details.rs.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/posts/details.rs.html b/templates/posts/details.rs.html
index ce881d3b..8ffd6ca8 100644
--- a/templates/posts/details.rs.html
+++ b/templates/posts/details.rs.html
@@ -155,7 +155,7 @@
                     @if let Some(ref prev) = previous_comment {
                         <input type="hidden" name="responding_to" value="@prev.id"/>
                     }
-                    <textarea id="plume-editor" name="content" dir="auto">@comment_form.content</textarea>
+                    <textarea id="plume-editor" name="content" dir="auto" required>@comment_form.content</textarea>
                     <input type="submit" value="@i18n!(ctx.1, "Submit comment")" />
                 </form>
             }

From 776ed058c763d2317ff27be4900da7f7d194772f Mon Sep 17 00:00:00 2001
From: Kitaiti Makoto <KitaitiMakoto@gmail.com>
Date: Sun, 8 May 2022 18:53:57 +0900
Subject: [PATCH 3/3] [skip ci]Add changelog

---
 CHANGELOG.md | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e8e842c1..e05f4a16 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,13 +8,14 @@
 
 - Basque language (#1013)
 - Unit tests for ActivityPub (#1021)
+- Move to action area after liking/boosting/commenting (#1074)
 
 ### Changed
 
 - Bump Rust to nightly 2022-01-26 (#1015)
 - Remove "Latest articles" timeline (#1069)
 - Change order of timeline tabs (#1069, #1070, #1072)
-- Migrate ActivityPub-related crates from activitypub 0.1 to activitystreams 0.7
+- Migrate ActivityPub-related crates from activitypub 0.1 to activitystreams 0.7 (#1022)
 
 ### Fixed