From 2db780d982e99383d051412124f5ce4a3bb662d9 Mon Sep 17 00:00:00 2001
From: Xeltica <xeltica@gmail.com>
Date: Fri, 24 Jul 2020 04:07:54 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=87=E3=82=B6=E3=82=A4=E3=83=B3=E8=AA=BF?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/_base.pug  | 13 ++++++++-----
 src/views/react.pug  |  2 +-
 src/views/renote.pug |  2 +-
 src/views/reply.pug  |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/views/_base.pug b/src/views/_base.pug
index 5c1a1eb..1e76d96 100644
--- a/src/views/_base.pug
+++ b/src/views/_base.pug
@@ -6,9 +6,15 @@ mixin note-header(note)
         span.name= getUserName(note.user)
         span.acct(style="color: gray")= getAcct(note.user)  
 
+mixin sub-note(note)
+    .sub-note
+        +avatar(note.user)                  
+        +note-header(note)
+        p= note.text
+
 mixin note(note)
     if (note.reply)
-        +note(note.reply)(style="opacity: 0.5")
+        +sub-note(note.reply)(style="opacity: 0.5")
     if (note.renote && !note.text)
         p: b 🔁 !{getUserName(note.user)} がRenote
         +note(note.renote)
@@ -22,10 +28,7 @@ mixin note(note)
                 != note.text
             if (note.renote)
                 p RN:
-                .sub-note
-                    +avatar(note.renote.user)                  
-                    +note-header(note.renote)
-                    p= note.renote.text
+                +sub-note(note.renote)
             aside
                 span.visibility= getVisibility(note)
                 span.date= new Date(note.createdAt).toLocaleString()
diff --git a/src/views/react.pug b/src/views/react.pug
index b06ab5d..b5dc3cf 100644
--- a/src/views/react.pug
+++ b/src/views/react.pug
@@ -2,7 +2,7 @@ extends _base
 
 block content
     h2 このノートにリアクションを押しますか？
-    +note(note)
+    +sub-note(note)
     form(action="action/react", method="post")
         each val in reactions
             div: label
diff --git a/src/views/renote.pug b/src/views/renote.pug
index b81f77a..31db883 100644
--- a/src/views/renote.pug
+++ b/src/views/renote.pug
@@ -2,6 +2,6 @@ extends _base
 
 block content
     h2 このノートをリノートしますか？
-    +note(note)
+    +sub-note(note)
     +post-form('action/create-note', "コメント(省略可能)", "リノート")
         input(type="hidden", name="renoteId", value=note.id)
\ No newline at end of file
diff --git a/src/views/reply.pug b/src/views/reply.pug
index 52557fe..8a692c8 100644
--- a/src/views/reply.pug
+++ b/src/views/reply.pug
@@ -2,6 +2,6 @@ extends _base
 
 block content
     h2 このノートに返信しますか？
-    +note(note)
+    +sub-note(note)
     +post-form('action/create-note', "何と返そうか？", "返信")
         input(type="hidden", name="replyId", value=note.id)
\ No newline at end of file