From 6aa0687108539af09d18963ab2e1b4abd3081ae7 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?= <renraku@076.ne.jp>
Date: Wed, 15 Dec 2021 19:01:37 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=9E=E3=83=B3=E3=82=B3=E3=83=81=E3=83=B3?=
 =?UTF-8?q?=E3=83=9D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Peertube/Account.php                 | 5 +++--
 .../component/peertube/parts/a/channels/avatar.blade.php  | 4 +++-
 .../component/peertube/parts/c/head/banner.blade.php      | 8 +++++---
 .../component/peertube/parts/c/head/info.blade.php        | 2 +-
 routes/view/peertube.php                                  | 2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/app/Http/Controllers/Peertube/Account.php b/app/Http/Controllers/Peertube/Account.php
index 7594c99..a91d2f3 100644
--- a/app/Http/Controllers/Peertube/Account.php
+++ b/app/Http/Controllers/Peertube/Account.php
@@ -13,15 +13,16 @@ class Account extends Common {
     $this->common = new Common;
   }
 
-  public function index ($id) {
+  public function index ($id, $cat='video-channels') {
     $res = [];
     $res['page'] = 'account';
+    $res['cat'] = $cat;
     $res['owner'] = $this->getOwner($id);
     if (!empty($res['owner'])) $res['owner']->totalVideo = 0;
     $res['channel'] = $this->getChannel($id);
     if (!empty($res['owner'])) {
       foreach ($res['channel']->data as $k => $v) {
-        $res['channel']->data[$k]->video = $this->getVideo($v->name);
+        $res['channel']->data[$k]->video = $this->getVideo($v->name.'@'.$v->host);
         $res['owner']->totalVideo += $res['channel']->data[$k]->video->total;
       }
     }
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/a/channels/avatar.blade.php b/resources/views/theme/techsuwa/component/peertube/parts/a/channels/avatar.blade.php
index 9be89dc..7cb23c6 100644
--- a/resources/views/theme/techsuwa/component/peertube/parts/a/channels/avatar.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/parts/a/channels/avatar.blade.php
@@ -11,6 +11,8 @@
     <div class="followers">{{ $ch->followersCount }}人登録者</div>・<span class="videos-count ng-star-inserted"> {{ $ch->video->total }}枚動画 </span>
   </div>
   <div class="description-html">
-    <p>ダンスパフォーマンスユニット「{{ $ch->displayName }}」の非公式チャンネルです。</p>
+    <p>
+      <?php echo $ch->description; ?>
+    </p>
   </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/c/head/banner.blade.php b/resources/views/theme/techsuwa/component/peertube/parts/c/head/banner.blade.php
index 7ab4393..7c7cd56 100644
--- a/resources/views/theme/techsuwa/component/peertube/parts/c/head/banner.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/parts/c/head/banner.blade.php
@@ -1,3 +1,5 @@
-<div class="banner ng-star-inserted">
-  <img alt="Channel banner" src="https://video.076.ne.jp{{ $res['channel']->banner->path }}">
-</div>
\ No newline at end of file
+@if (!is_null($res['channel']->banner))
+  <div class="banner ng-star-inserted">
+    <img alt="Channel banner" src="https://video.076.ne.jp{{ $res['channel']->banner->path }}">
+  </div>
+@endif
\ No newline at end of file
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/c/head/info.blade.php b/resources/views/theme/techsuwa/component/peertube/parts/c/head/info.blade.php
index d201669..375f11e 100644
--- a/resources/views/theme/techsuwa/component/peertube/parts/c/head/info.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/parts/c/head/info.blade.php
@@ -11,7 +11,7 @@
             <h1 title="Channel created on {{ date('Y/m/d', strtotime($res['channel']->createdAt)) }}">{{ $res['channel']->displayName }}</h1>
           </div>
           <div class="actor-handle">
-            <span>@worldorder</span>
+            <span>{{ '@'.$res['channel']->name }}{{ $res['channel']->host != 'video.076.ne.jp' ? '@'.$res['channel']->host : '' }}</span>
           </div>
           <div class="actor-counters">
             <span>{{ $res['channel']->followersCount }}人登録者</span>
diff --git a/routes/view/peertube.php b/routes/view/peertube.php
index 647c635..8227c20 100644
--- a/routes/view/peertube.php
+++ b/routes/view/peertube.php
@@ -1,7 +1,7 @@
 <?php
 
 Route::group(['prefix' => 'peertube'], function () {
-  Route::any('/a/{id}', 'Peertube\Account@index');
+  Route::any('/a/{id}/{cat?}', 'Peertube\Account@index');
   Route::any('/c/{id}/{cat?}/{page?}', 'Peertube\Channel@index');
   Route::any('/w/{id}', 'Peertube\Watch@index');
 });