From 15cb1375c848d02ac16ed333be8200d0c6302cf3 Mon Sep 17 00:00:00 2001
From: usbharu <64310155+usbharu@users.noreply.github.com>
Date: Wed, 4 Sep 2024 19:12:42 +0900
Subject: [PATCH] =?UTF-8?q?feat:=20=E4=B8=80=E9=83=A8=E3=81=AEnoscript?=
 =?UTF-8?q?=E3=82=BF=E3=82=B0=E3=82=92=E5=89=8A=E9=99=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/homeTimeline.html     |  4 +-
 .../src/main/resources/templates/index.html   |  1 +
 .../resources/templates/post-postForm.html    |  2 -
 .../main/resources/templates/postById.html    |  5 +-
 .../main/resources/templates/userById.html    | 51 +++++++++----------
 5 files changed, 28 insertions(+), 35 deletions(-)
diff --git a/hideout-core/src/main/resources/templates/homeTimeline.html b/hideout-core/src/main/resources/templates/homeTimeline.html
index 60bc762b..1a543ba7 100644
--- a/hideout-core/src/main/resources/templates/homeTimeline.html
+++ b/hideout-core/src/main/resources/templates/homeTimeline.html
@@ -5,8 +5,6 @@
     <title>Title</title>
 </head>
 <body>
-<noscript>
-    <div th:replace="~{fragments-timeline :: simple-timline(${timeline},'/home')}"></div>
-</noscript>
+<div th:replace="~{fragments-timeline :: simple-timline(${timeline},'/home')}"></div>
 </body>
 </html>
\ No newline at end of file
diff --git a/hideout-core/src/main/resources/templates/index.html b/hideout-core/src/main/resources/templates/index.html
index 5caf7bd2..9d9d39df 100644
--- a/hideout-core/src/main/resources/templates/index.html
+++ b/hideout-core/src/main/resources/templates/index.html
@@ -9,6 +9,7 @@
     <th:block th:if="${image != null}">
         <meta property="og:image" th:content="${image}">
     </th:block>
+    <meta http-equiv="refresh" th:content="${'1; url='+nsUrl}">
 </head>
 <body>
 <noscript>
diff --git a/hideout-core/src/main/resources/templates/post-postForm.html b/hideout-core/src/main/resources/templates/post-postForm.html
index e4aae89b..44a306ab 100644
--- a/hideout-core/src/main/resources/templates/post-postForm.html
+++ b/hideout-core/src/main/resources/templates/post-postForm.html
@@ -8,7 +8,6 @@
 </head>
 <body>
 
-<noscript>
     <div>
         <img alt="" height="80px" src="" th:src="${user.iconUrl}" width="80px">
         <div style="display: inline-block">
@@ -56,7 +55,6 @@
             <input th:value="#{post-form.new-posts-submit}" type="submit" value="Publish!">
         </div>
     </form>
-</noscript>
 
 </body>
 </html>
\ No newline at end of file
diff --git a/hideout-core/src/main/resources/templates/postById.html b/hideout-core/src/main/resources/templates/postById.html
index bbf5e358..8f2f8d3a 100644
--- a/hideout-core/src/main/resources/templates/postById.html
+++ b/hideout-core/src/main/resources/templates/postById.html
@@ -18,8 +18,8 @@
 
 </head>
 <body>
-<noscript>
-    <th:block th:if=" ${post.reply != null}">
+
+<th:block th:if=" ${post.reply != null}">
         <th:block th:replace="~{fragments-post :: single-simple-post(${post.reply})}"></th:block>
         <hr>
     </th:block>
@@ -40,6 +40,5 @@
         <th:block th:replace="={fragments-post :: single-simple-post(${post.repost})}"></th:block>
         <cite th:text="${post.repost.apId}"></cite>
     </th:block>
-</noscript>
 </body>
 </html>
\ No newline at end of file
diff --git a/hideout-core/src/main/resources/templates/userById.html b/hideout-core/src/main/resources/templates/userById.html
index 66212568..679a2840 100644
--- a/hideout-core/src/main/resources/templates/userById.html
+++ b/hideout-core/src/main/resources/templates/userById.html
@@ -5,33 +5,30 @@
     <title th:text="#{user-by-id.title(${user.screenName},${instance.name})}">User - hideout</title>
 </head>
 <body>
-<noscript>
-    <div>
-        <img height="150px" th:src="${user.iconUrl}" width="150px" alt="">
-        <img height="150px" th:src="${user.bannerURL}" width="600px" alt="">
-    </div>
-    <div>
-        <th:block th:if="${user.locked}">
-            <h2 th:text="${user.screenName} + '(private)'"></h2>
-        </th:block>
+<div>
+    <img alt="" height="150px" th:src="${user.iconUrl}" width="150px">
+    <img alt="" height="150px" th:src="${user.bannerURL}" width="600px">
+</div>
+<div>
+    <th:block th:if="${user.locked}">
+        <h2 th:text="${user.screenName} + '(private)'"></h2>
+    </th:block>
 
-        <th:block th:if="!${user.locked}">
-            <h2 th:text="${user.screenName}"></h2>
-        </th:block>
-        <p th:text="${user.name} + '@' + ${user.host}"></p>
-    </div>
-    <div>
-        <p th:text="${user.description}"></p>
-    </div>
-    <div>
-        <p th:if="user.postsCount != null" th:text="#{user-by-id.postsCount(${user.postsCount})}">0 Posts</p>
-        <p th:if="user.followingCount != null" th:text="#{user-by-id.followingCount(${user.followingCount})}">0
-            Following</p>
-        <p th:if="user.followersCount != null" th:text="#{user-by-id.followersCount(${user.followersCount})}">0
-            Followers</p>
-    </div>
-    <div th:replace="~{fragments-timeline :: simple-timline(${userTimeline},'/users/'+${user.name}+'@'+${user.host})}"></div>
-
-</noscript>
+    <th:block th:if="!${user.locked}">
+        <h2 th:text="${user.screenName}"></h2>
+    </th:block>
+    <p th:text="${user.name} + '@' + ${user.host}"></p>
+</div>
+<div>
+    <p th:text="${user.description}"></p>
+</div>
+<div>
+    <p th:if="user.postsCount != null" th:text="#{user-by-id.postsCount(${user.postsCount})}">0 Posts</p>
+    <p th:if="user.followingCount != null" th:text="#{user-by-id.followingCount(${user.followingCount})}">0
+        Following</p>
+    <p th:if="user.followersCount != null" th:text="#{user-by-id.followersCount(${user.followersCount})}">0
+        Followers</p>
+</div>
+<div th:replace="~{fragments-timeline :: simple-timline(${userTimeline},'/users/'+${user.name}+'@'+${user.host})}"></div>
 </body>
 </html>
\ No newline at end of file
