From 47f9f76da1763768cef7a1da599e9f236c138b08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=83=86=E3=82=AF=E3=83=8B=E3=82=AB=E3=83=AB=E8=AB=8F?=
 =?UTF-8?q?=E8=A8=AA=E5=AD=90?= <d@076.ne.jp>
Date: Tue, 29 Dec 2020 22:01:06 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=A1=E3=83=B3=E3=83=88=E3=81=AE?=
 =?UTF-8?q?=E8=BF=94=E4=BA=8B=EF=BC=88=E3=82=88=E3=81=86=E3=81=A4=E3=81=B9?=
 =?UTF-8?q?=EF=BC=89?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Video/Prayer.php | 15 ++++++++++++++-
 resources/js/components/comments.vue  | 27 +++++++++++++++++++++++++--
 2 files changed, 39 insertions(+), 3 deletions(-)

diff --git a/app/Http/Controllers/Video/Prayer.php b/app/Http/Controllers/Video/Prayer.php
index 576e39a..508461b 100644
--- a/app/Http/Controllers/Video/Prayer.php
+++ b/app/Http/Controllers/Video/Prayer.php
@@ -88,7 +88,20 @@ class Prayer {
       $g->comment->channel = $g->snippet->topLevelComment->snippet->authorChannelUrl;
       $g->comment->icon = $g->snippet->topLevelComment->snippet->authorProfileImageUrl;
       $g->comment->created = date('Y年m月d日 H:i:s', strtotime($g->snippet->topLevelComment->snippet->publishedAt));
-      $g->comment->message = $g->snippet->topLevelComment->snippet->textDisplay;
+      $g->comment->message = strip_tags($g->snippet->topLevelComment->snippet->textDisplay, array('<br />'));
+      $g->comment->replyCount = (isset($g->snippet->totalReplyCount) ? $g->snippet->totalReplyCount : 0);
+
+      if (isset($g->replies)) {
+        $g->comment->replies = array();
+        foreach ($g->replies->comments as $k => $c) {
+          $g->comment->replies[$k]['id'] = $c->id;
+          $g->comment->replies[$k]['name'] = $c->snippet->authorDisplayName;
+          $g->comment->replies[$k]['channel'] = $c->snippet->authorChannelUrl;
+          $g->comment->replies[$k]['icon'] = $c->snippet->authorProfileImageUrl;
+          $g->comment->replies[$k]['created'] = date('Y年m月d日 H:i:s', strtotime($c->snippet->publishedAt));
+          $g->comment->replies[$k]['message'] = strip_tags($c->snippet->textDisplay, array('<br />'));
+        }
+      }
 
       $come[] = $g->comment;
     }
diff --git a/resources/js/components/comments.vue b/resources/js/components/comments.vue
index 39e3989..2f75599 100644
--- a/resources/js/components/comments.vue
+++ b/resources/js/components/comments.vue
@@ -20,10 +20,33 @@
               </cite> <span class="says">より:</span>
               <span class="comment-meta commentmetadata"> <a :href="`/blog/${slug}#comment-${c.id}`">{{ c.created }}</a></span>
             </div>
-            <p style="white-space: pre-wrap;">{{ c.message }}</p>
-            <div class="reply">返信</div>
+            <p style="white-space: pre-wrap; word-wrap: break-word; width: 500px;" v-html="c.message"></p>
+            <div class="reply">返信（{{ c.replyCount }}）</div>
           </div>
         </li>
+        <span v-if="c.replies">
+          <ul class="commentlist" v-for="(r, j) in c.replies" :key="`comment-${i}-reply-${j}`">
+            <li class="comment even thread-even depth-2" :id="`li-comment-${r.id}`">
+              <div class="commentnumber">{{ i+1 }}/{{ j+1 }}</div>
+              <div :id="`comment-${r.id}`">
+                <div>
+                  <cite class="fn">
+                    <span v-if="isvideo === 'n'">
+                      <img style="height: 24px;" :src="r.icon" :alt="`${r.name}さんのアイコン`">
+                      <a :href="r.channel">{{ (r.name || '名無しのテクニシャン') }}</a>
+                    </span>
+                    <span v-else>
+                      <span v-if="r.user_id"><a :href="`/profile/${r.user_id}`" :style="r.showcol"><img style="width: 24px; height: 24px;" :src="r.avatar" :alt="`${r.showname}さんのアイコン`"> {{ r.showname }}</a></span>
+                      <span v-else>{{ (r.name || '名無しのテクニシャン') }}</span>
+                    </span>
+                  </cite> <span class="says">より:</span>
+                  <span class="comment-meta commentmetadata"> <a :href="`/blog/${slug}#comment-${r.id}`">{{ r.created }}</a></span>
+                </div>
+                <p style="white-space: pre-wrap; word-wrap: break-word; width: 500px;" v-html="r.message"></p>
+              </div>
+            </li>
+          </ul>
+        </span>
       </ul>
     </span>
     <span v-if="isvideo !== 'n'">