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 @@
{{ $ch->followersCount }}人登録者
・ {{ $ch->video->total }}枚動画
-
ダンスパフォーマンスユニット「{{ $ch->displayName }}」の非公式チャンネルです。
+
+ description; ?>
+
\ 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 @@
-
-
-
\ No newline at end of file
+@if (!is_null($res['channel']->banner))
+
+
+
+@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 @@
{{ $res['channel']->displayName }}
- @worldorder
+ {{ '@'.$res['channel']->name }}{{ $res['channel']->host != 'video.076.ne.jp' ? '@'.$res['channel']->host : '' }}
{{ $res['channel']->followersCount }}人登録者
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 @@
'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');
});