From 0a5b8dce0963c7c4648afab195e0face76dc7973 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: Thu, 16 Dec 2021 16:31:55 +0900
Subject: [PATCH] =?UTF-8?q?=E3=81=8A=E3=81=A3=E3=81=B1=E3=81=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/Http/Controllers/Peertube/About.php                     | 3 ++-
 app/Http/Controllers/Peertube/Account.php                   | 1 +
 app/Http/Controllers/Peertube/Admin/Users.php               | 1 +
 app/Http/Controllers/Peertube/Channel.php                   | 1 +
 app/Http/Controllers/Peertube/Home.php                      | 3 ++-
 app/Http/Controllers/Peertube/Login.php                     | 1 +
 app/Http/Controllers/Peertube/Logout.php                    | 1 +
 app/Http/Controllers/Peertube/Myaccount.php                 | 1 +
 app/Http/Controllers/Peertube/Mylibrary.php                 | 1 +
 app/Http/Controllers/Peertube/Mylibrary/History/Videos.php  | 1 +
 app/Http/Controllers/Peertube/Mylibrary/Subscriptions.php   | 1 +
 app/Http/Controllers/Peertube/Mylibrary/Videochannels.php   | 1 +
 app/Http/Controllers/Peertube/Mylibrary/Videoplaylists.php  | 1 +
 app/Http/Controllers/Peertube/Mylibrary/Videos.php          | 1 +
 app/Http/Controllers/Peertube/Notification.php              | 1 +
 app/Http/Controllers/Peertube/Signup.php                    | 1 +
 app/Http/Controllers/Peertube/Videos/Local.php              | 3 ++-
 app/Http/Controllers/Peertube/Videos/Overview.php           | 3 ++-
 app/Http/Controllers/Peertube/Videos/Recentlyadded.php      | 3 ++-
 app/Http/Controllers/Peertube/Videos/Subscriptions.php      | 1 +
 app/Http/Controllers/Peertube/Videos/Trending.php           | 3 ++-
 app/Http/Controllers/Peertube/Videos/Upload.php             | 1 +
 app/Http/Controllers/Peertube/Watch.php                     | 1 +
 .../techsuwa/component/peertube/parts/manifest.blade.php    | 6 ++++++
 .../techsuwa/component/peertube/parts/menu/footer.blade.php | 2 +-
 .../theme/techsuwa/component/peertube/parts/style.blade.php | 4 ++--
 26 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/app/Http/Controllers/Peertube/About.php b/app/Http/Controllers/Peertube/About.php
index a71a1d8..54d3d08 100644
--- a/app/Http/Controllers/Peertube/About.php
+++ b/app/Http/Controllers/Peertube/About.php
@@ -15,7 +15,8 @@ class About extends Common {
 
   public function index () {
     $res = [
-      'page' => 'dummy',
+      'page' => 'about',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Account.php b/app/Http/Controllers/Peertube/Account.php
index 430b73c..dc62945 100644
--- a/app/Http/Controllers/Peertube/Account.php
+++ b/app/Http/Controllers/Peertube/Account.php
@@ -16,6 +16,7 @@ class Account extends Common {
   public function index ($id, $cat='video-channels') {
     $res = [
       'page' => 'account',
+      'style' => 'account',
       'cat' => $cat,
       'userinfo' => $this->common->user,
     ];
diff --git a/app/Http/Controllers/Peertube/Admin/Users.php b/app/Http/Controllers/Peertube/Admin/Users.php
index a310ece..fc912b5 100644
--- a/app/Http/Controllers/Peertube/Admin/Users.php
+++ b/app/Http/Controllers/Peertube/Admin/Users.php
@@ -22,6 +22,7 @@ class Users extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Channel.php b/app/Http/Controllers/Peertube/Channel.php
index aef507f..8e8e0fc 100644
--- a/app/Http/Controllers/Peertube/Channel.php
+++ b/app/Http/Controllers/Peertube/Channel.php
@@ -18,6 +18,7 @@ class Channel extends Common {
   public function index ($id, $cat='videos', $page=0) {
     $res = [
       'page' => 'channel',
+      'style' => 'channel',
       'cat' => $cat,
       'paginate' => $page,
       'pagetotal' => 500,
diff --git a/app/Http/Controllers/Peertube/Home.php b/app/Http/Controllers/Peertube/Home.php
index 2b73045..6ddb557 100644
--- a/app/Http/Controllers/Peertube/Home.php
+++ b/app/Http/Controllers/Peertube/Home.php
@@ -15,7 +15,8 @@ class Home extends Common {
 
   public function index () {
     $res = [
-      'page' => 'dummy',
+      'page' => 'home',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Login.php b/app/Http/Controllers/Peertube/Login.php
index 21bcc4b..103272f 100644
--- a/app/Http/Controllers/Peertube/Login.php
+++ b/app/Http/Controllers/Peertube/Login.php
@@ -20,6 +20,7 @@ class Login extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Logout.php b/app/Http/Controllers/Peertube/Logout.php
index 9e0bc53..7d93987 100644
--- a/app/Http/Controllers/Peertube/Logout.php
+++ b/app/Http/Controllers/Peertube/Logout.php
@@ -20,6 +20,7 @@ class Logout extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Myaccount.php b/app/Http/Controllers/Peertube/Myaccount.php
index 6f1440e..59e75a6 100644
--- a/app/Http/Controllers/Peertube/Myaccount.php
+++ b/app/Http/Controllers/Peertube/Myaccount.php
@@ -20,6 +20,7 @@ class Myaccount extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Mylibrary.php b/app/Http/Controllers/Peertube/Mylibrary.php
index 862d51d..de147df 100644
--- a/app/Http/Controllers/Peertube/Mylibrary.php
+++ b/app/Http/Controllers/Peertube/Mylibrary.php
@@ -20,6 +20,7 @@ class Mylibrary extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Mylibrary/History/Videos.php b/app/Http/Controllers/Peertube/Mylibrary/History/Videos.php
index 1c52b26..31bd94c 100644
--- a/app/Http/Controllers/Peertube/Mylibrary/History/Videos.php
+++ b/app/Http/Controllers/Peertube/Mylibrary/History/Videos.php
@@ -20,6 +20,7 @@ class Videos extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Mylibrary/Subscriptions.php b/app/Http/Controllers/Peertube/Mylibrary/Subscriptions.php
index 8c4fdb9..b20ac5d 100644
--- a/app/Http/Controllers/Peertube/Mylibrary/Subscriptions.php
+++ b/app/Http/Controllers/Peertube/Mylibrary/Subscriptions.php
@@ -20,6 +20,7 @@ class Subscriptions extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Mylibrary/Videochannels.php b/app/Http/Controllers/Peertube/Mylibrary/Videochannels.php
index e381fba..f2f12a8 100644
--- a/app/Http/Controllers/Peertube/Mylibrary/Videochannels.php
+++ b/app/Http/Controllers/Peertube/Mylibrary/Videochannels.php
@@ -20,6 +20,7 @@ class Videochannels extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Mylibrary/Videoplaylists.php b/app/Http/Controllers/Peertube/Mylibrary/Videoplaylists.php
index 4993dc9..c667dad 100644
--- a/app/Http/Controllers/Peertube/Mylibrary/Videoplaylists.php
+++ b/app/Http/Controllers/Peertube/Mylibrary/Videoplaylists.php
@@ -20,6 +20,7 @@ class Videoplaylists extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Mylibrary/Videos.php b/app/Http/Controllers/Peertube/Mylibrary/Videos.php
index 455cad1..55abde6 100644
--- a/app/Http/Controllers/Peertube/Mylibrary/Videos.php
+++ b/app/Http/Controllers/Peertube/Mylibrary/Videos.php
@@ -20,6 +20,7 @@ class Videos extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Notification.php b/app/Http/Controllers/Peertube/Notification.php
index 5f90004..24faf63 100644
--- a/app/Http/Controllers/Peertube/Notification.php
+++ b/app/Http/Controllers/Peertube/Notification.php
@@ -20,6 +20,7 @@ class Notification extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Signup.php b/app/Http/Controllers/Peertube/Signup.php
index 6fe8739..51e2d94 100644
--- a/app/Http/Controllers/Peertube/Signup.php
+++ b/app/Http/Controllers/Peertube/Signup.php
@@ -20,6 +20,7 @@ class Signup extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'dummy',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Videos/Local.php b/app/Http/Controllers/Peertube/Videos/Local.php
index fe72a8c..d136134 100644
--- a/app/Http/Controllers/Peertube/Videos/Local.php
+++ b/app/Http/Controllers/Peertube/Videos/Local.php
@@ -17,7 +17,8 @@ class Local extends Common {
 
   public function index ($page=0) {
     $res = [
-      'page' => 'videoslist',
+      'page' => 'local',
+      'style' => 'videoslist',
       'paginate' => $page,
       'pagetotal' => 500,
       'userinfo' => $this->common->user,
diff --git a/app/Http/Controllers/Peertube/Videos/Overview.php b/app/Http/Controllers/Peertube/Videos/Overview.php
index 0e56aa9..96f99e6 100644
--- a/app/Http/Controllers/Peertube/Videos/Overview.php
+++ b/app/Http/Controllers/Peertube/Videos/Overview.php
@@ -15,7 +15,8 @@ class Overview extends Common {
 
   public function index ($page=1) {
     $res = [
-      'page' => 'videoslist',
+      'page' => 'overview',
+      'style' => 'videoslist',
       'paginate' => $page,
       'pagetotal' => 500,
       'userinfo' => $this->common->user,
diff --git a/app/Http/Controllers/Peertube/Videos/Recentlyadded.php b/app/Http/Controllers/Peertube/Videos/Recentlyadded.php
index 23feb58..24fbe25 100644
--- a/app/Http/Controllers/Peertube/Videos/Recentlyadded.php
+++ b/app/Http/Controllers/Peertube/Videos/Recentlyadded.php
@@ -17,7 +17,8 @@ class Recentlyadded extends Common {
 
   public function index ($page=0) {
     $res = [
-      'page' => 'videoslist',
+      'page' => 'recently-added',
+      'style' => 'videoslist',
       'paginate' => $page,
       'pagetotal' => 500,
       'userinfo' => $this->common->user,
diff --git a/app/Http/Controllers/Peertube/Videos/Subscriptions.php b/app/Http/Controllers/Peertube/Videos/Subscriptions.php
index c156aaf..d491648 100644
--- a/app/Http/Controllers/Peertube/Videos/Subscriptions.php
+++ b/app/Http/Controllers/Peertube/Videos/Subscriptions.php
@@ -20,6 +20,7 @@ class Subscriptions extends Common {
 
     $res = [
       'page' => 'dummy',
+      'style' => 'videoslist',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Videos/Trending.php b/app/Http/Controllers/Peertube/Videos/Trending.php
index 7b3f5e5..1141448 100644
--- a/app/Http/Controllers/Peertube/Videos/Trending.php
+++ b/app/Http/Controllers/Peertube/Videos/Trending.php
@@ -17,7 +17,8 @@ class Trending extends Common {
 
   public function index ($page=0) {
     $res = [
-      'page' => 'videoslist',
+      'page' => 'trending',
+      'style' => 'videoslist',
       'paginate' => $page,
       'pagetotal' => 500,
       'userinfo' => $this->common->user,
diff --git a/app/Http/Controllers/Peertube/Videos/Upload.php b/app/Http/Controllers/Peertube/Videos/Upload.php
index 7f6de98..6badda2 100644
--- a/app/Http/Controllers/Peertube/Videos/Upload.php
+++ b/app/Http/Controllers/Peertube/Videos/Upload.php
@@ -16,6 +16,7 @@ class Upload extends Common {
   public function index () {
     $res = [
       'page' => 'dummy',
+      'style' => 'videoslist',
       'userinfo' => $this->common->user,
     ];
     // $res['owner'] = $this->getOwner($id);
diff --git a/app/Http/Controllers/Peertube/Watch.php b/app/Http/Controllers/Peertube/Watch.php
index 085d82c..239b002 100644
--- a/app/Http/Controllers/Peertube/Watch.php
+++ b/app/Http/Controllers/Peertube/Watch.php
@@ -16,6 +16,7 @@ class Watch extends Common {
   public function index ($id) {
     $res = [
       'page' => 'watch',
+      'style' => 'watch',
       'userinfo' => $this->common->user,
     ];
     $res['detail'] = $this->getDetail($id);
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/manifest.blade.php b/resources/views/theme/techsuwa/component/peertube/parts/manifest.blade.php
index 425d90d..16b7645 100644
--- a/resources/views/theme/techsuwa/component/peertube/parts/manifest.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/parts/manifest.blade.php
@@ -5,6 +5,12 @@
     if ($res['page'] == 'watch') $name = $res['detail']->name;
     else if ($res['page'] == 'account') $name = $res['owner']->displayName.'さんのチャンネル一覧';
     else if ($res['page'] == 'channel') $name = $res['channel']->displayName.'さんのチャンネル';
+    else if ($res['page'] == 'home') $name = 'トップページ';
+    else if ($res['page'] == 'overview') $name = 'ディスカバー';
+    else if ($res['page'] == 'trending') $name = 'トレンド';
+    else if ($res['page'] == 'recently-added') $name = '最近投稿された動画';
+    else if ($res['page'] == 'local') $name = 'ローカル動画';
+    else if ($res['page'] == 'about') $name = 'このアプリについて';
   }
 ?>
 
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/menu/footer.blade.php b/resources/views/theme/techsuwa/component/peertube/parts/menu/footer.blade.php
index 1f3733f..f726b8b 100644
--- a/resources/views/theme/techsuwa/component/peertube/parts/menu/footer.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/parts/menu/footer.blade.php
@@ -4,7 +4,7 @@
       <my-global-icon iconname="help" aria-hidden="true">
         <svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-help-circle"><circle cx="12" cy="12" r="10"></circle><path d="M9.09 9a3 3 0 0 1 5.83 1c0 2-3 3-3 3"></path><line x1="12" y1="17" x2="12.01" y2="17"></line></svg>
       </my-global-icon>
-      このインスタンスについて
+      このアプリについて
     </a>
   </div>
 </div>
\ No newline at end of file
diff --git a/resources/views/theme/techsuwa/component/peertube/parts/style.blade.php b/resources/views/theme/techsuwa/component/peertube/parts/style.blade.php
index fd37c9b..e0f0c62 100644
--- a/resources/views/theme/techsuwa/component/peertube/parts/style.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/parts/style.blade.php
@@ -1,4 +1,4 @@
 <link rel="stylesheet" href="{{ asset('css/peertube/common.css') }}" />
-@if (isset($res['page']))
-  <link rel="stylesheet" href="{{ asset('css/peertube/'.$res['page'].'.css') }}" />
+@if (isset($res['style']))
+  <link rel="stylesheet" href="{{ asset('css/peertube/'.$res['style'].'.css') }}" />
 @endif
\ No newline at end of file