From 510b93071920fc97e6a3aba76ce08534545b77f6 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: Sun, 19 Dec 2021 23:40:12 +0900
Subject: [PATCH] =?UTF-8?q?=E3=82=A8=E3=83=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/helpers.php                                               | 4 ++--
 .../techsuwa/component/peertube/a/channels/avatar.blade.php   | 2 +-
 .../views/theme/techsuwa/component/peertube/a/info.blade.php  | 2 +-
 .../theme/techsuwa/component/peertube/c/head/info.blade.php   | 2 +-
 .../theme/techsuwa/component/peertube/c/head/owner.blade.php  | 2 +-
 .../theme/techsuwa/component/peertube/c/playlists.blade.php   | 2 +-
 .../techsuwa/component/peertube/menu/top/loggedin.blade.php   | 2 +-
 .../peertube/my-account/notifications/actorfollow.blade.php   | 2 +-
 .../peertube/my-account/notifications/comment.blade.php       | 2 +-
 .../peertube/my-account/notifications/video.blade.php         | 2 +-
 .../techsuwa/component/peertube/videos/channels.blade.php     | 2 +-
 .../techsuwa/component/peertube/w/info/channel.blade.php      | 4 ++--
 .../techsuwa/component/peertube/w/info/comments.blade.php     | 2 +-
 .../techsuwa/component/peertube/w/videorecommend.blade.php    | 2 +-
 14 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index 78e4e0a..5ba668a 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -45,8 +45,8 @@ function ptFullHandle ($v) {
   return $v->name.($v->host != env('PEER_URI') ? '@'.$v->host : '');
 }
 
-function ptAvatar ($avatar) {
-  return isset($avatar) && !is_null($avatar) ? env('PEER_URI').$avatar->path : '/img/noicon.jpg';
+function ptAvatar ($v) {
+  return isset($v->avatar) && !is_null($v->avatar) ? env('PEER_URI').$v->avatar->path : '/img/noicon.jpg';
 }
 
 function userDetail ($id, $kero=null) {
diff --git a/resources/views/theme/techsuwa/component/peertube/a/channels/avatar.blade.php b/resources/views/theme/techsuwa/component/peertube/a/channels/avatar.blade.php
index 8ec0488..6350f42 100644
--- a/resources/views/theme/techsuwa/component/peertube/a/channels/avatar.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/a/channels/avatar.blade.php
@@ -1,7 +1,7 @@
 <div class="channel-avatar-row">
   <my-actor-avatar title="この動画チャンネルを見る">
     <a title="この動画チャンネルを見る" href="/peertube/c/{{ $fullchan }}" class="ng-star-inserted">
-      <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($ch->avatar) }}" alt="チャンネルのアバター">
+      <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($ch) }}" alt="チャンネルのアバター">
     </a>
   </my-actor-avatar>
   <h2>
diff --git a/resources/views/theme/techsuwa/component/peertube/a/info.blade.php b/resources/views/theme/techsuwa/component/peertube/a/info.blade.php
index f943b57..3739d0a 100644
--- a/resources/views/theme/techsuwa/component/peertube/a/info.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/a/info.blade.php
@@ -1,7 +1,7 @@
 <div class="account-info">
   <div class="account-avatar-row">
     <my-actor-avatar class="main-avatar">
-      <img class="account avatar ng-star-inserted" src="{{ ptAvatar($res['owner']->avatar) }}" alt="アカウントのアバター">
+      <img class="account avatar ng-star-inserted" src="{{ ptAvatar($res['owner']) }}" alt="アカウントのアバター">
     </my-actor-avatar>
     <div>
       <div class="section-label">アカウント</div>
diff --git a/resources/views/theme/techsuwa/component/peertube/c/head/info.blade.php b/resources/views/theme/techsuwa/component/peertube/c/head/info.blade.php
index 292e705..0e6ed58 100644
--- a/resources/views/theme/techsuwa/component/peertube/c/head/info.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/c/head/info.blade.php
@@ -1,7 +1,7 @@
 <div class="channel-info">
   <div class="channel-avatar-row">
     <my-actor-avatar class="main-avatar">
-      <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($res['channel']->avatar) }}" alt="チャンネルのアバター">
+      <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($res['channel']) }}" alt="チャンネルのアバター">
     </my-actor-avatar>
     <div>
       <div class="section-label">動画チャンネル</div>
diff --git a/resources/views/theme/techsuwa/component/peertube/c/head/owner.blade.php b/resources/views/theme/techsuwa/component/peertube/c/head/owner.blade.php
index ef8efdf..9789740 100644
--- a/resources/views/theme/techsuwa/component/peertube/c/head/owner.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/c/head/owner.blade.php
@@ -4,7 +4,7 @@
     <div class="avatar-row">
       <my-actor-avatar class="account-avatar">
         <a title="{{ ptFullHandle($res['channel']->ownerAccount) }} (アカウントページへ) " href="/peertube/a/{{ ptFullHandle($res['channel']->ownerAccount) }}" class="ng-star-inserted">
-          <img class="account avatar ng-star-inserted" src="{{ ptAvatar($res['channel']->ownerAccount->avatar) }}" alt="アカウントのアバター">
+          <img class="account avatar ng-star-inserted" src="{{ ptAvatar($res['channel']->ownerAccount) }}" alt="アカウントのアバター">
         </a>
       </my-actor-avatar>
       <div class="actor-info">
diff --git a/resources/views/theme/techsuwa/component/peertube/c/playlists.blade.php b/resources/views/theme/techsuwa/component/peertube/c/playlists.blade.php
index 27fdaff..3b6361d 100644
--- a/resources/views/theme/techsuwa/component/peertube/c/playlists.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/c/playlists.blade.php
@@ -7,7 +7,7 @@
           <div class="miniature">
             <my-link class="miniature-thumbnail">
               <a tabindex="0" href="/peertube/w/p/{{ $v->shortUUID }}" class="ng-star-inserted">
-                <img alt="" aria-labelledby="{{ $v->displayName }}" src="{{ ptAvatar($v->thumbnailPath) }}" class="ng-star-inserted">
+                <img alt="" aria-labelledby="{{ $v->displayName }}" src="{{ !is_null($v->thumbnailPath) ? 'https://video.076.ne.jp'.$v->thumbnailPath : '/img/noicon.jpg' }}" class="ng-star-inserted">
                 <div class="miniature-playlist-info-overlay ng-star-inserted">動画数：{{ $v->videosLength }} </div>
                 <div class="play-overlay ng-star-inserted">
                   <div class="icon"></div>
diff --git a/resources/views/theme/techsuwa/component/peertube/menu/top/loggedin.blade.php b/resources/views/theme/techsuwa/component/peertube/menu/top/loggedin.blade.php
index 6faa028..ad8e848 100644
--- a/resources/views/theme/techsuwa/component/peertube/menu/top/loggedin.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/menu/top/loggedin.blade.php
@@ -4,7 +4,7 @@
       <a href="/peertube/a/{{ ptFullHandle($res['userinfo']['me']->account) }}">
         <div class="dropdown-toggle" aria-expanded="false">
           <my-actor-avatar size="34">
-            <img class="account avatar avatar-34 ng-star-inserted" src="{{ ptAvatar($res['userinfo']['me']->account->avatar) }}" alt="アカウントのアバター">
+            <img class="account avatar avatar-34 ng-star-inserted" src="{{ ptAvatar($res['userinfo']['me']->account) }}" alt="アカウントのアバター">
           </my-actor-avatar>
           <div class="logged-in-info">
             <div class="logged-in-display-name">{{ $res['userinfo']['me']->account->displayName }}</div>
diff --git a/resources/views/theme/techsuwa/component/peertube/my-account/notifications/actorfollow.blade.php b/resources/views/theme/techsuwa/component/peertube/my-account/notifications/actorfollow.blade.php
index 66971ad..767254e 100644
--- a/resources/views/theme/techsuwa/component/peertube/my-account/notifications/actorfollow.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/my-account/notifications/actorfollow.blade.php
@@ -4,7 +4,7 @@
   </my-global-icon>
 @elseif ($n->actorFollow->following->type == 'account')
   <a href="/peertube/a/{{ ptFullHandle($n->actorFollow->follower) }}" class="ng-star-inserted">
-    <img alt="" aria-labelledby="avatar" class="avatar" src="{{ ptAvatar($n->actorFollow->follower->avatar) }}">
+    <img alt="" aria-labelledby="avatar" class="avatar" src="{{ ptAvatar($n->actorFollow->follower) }}">
   </a>
 @endif
 <div class="message ng-star-inserted">
diff --git a/resources/views/theme/techsuwa/component/peertube/my-account/notifications/comment.blade.php b/resources/views/theme/techsuwa/component/peertube/my-account/notifications/comment.blade.php
index 0965d9d..32c954f 100644
--- a/resources/views/theme/techsuwa/component/peertube/my-account/notifications/comment.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/my-account/notifications/comment.blade.php
@@ -1,5 +1,5 @@
 <a href="/peertube/a/{{ ptFullHandle($n->comment->account) }}" class="ng-star-inserted">
-  <img alt="" aria-labelledby="avatar" class="avatar" src="{{ ptAvatar($n->comment->account->avatar) }}">
+  <img alt="" aria-labelledby="avatar" class="avatar" src="{{ ptAvatar($n->comment->account) }}">
 </a>
 @if ($n->type == 11)
   <div class="message ng-star-inserted">
diff --git a/resources/views/theme/techsuwa/component/peertube/my-account/notifications/video.blade.php b/resources/views/theme/techsuwa/component/peertube/my-account/notifications/video.blade.php
index 3454e43..e13bd14 100644
--- a/resources/views/theme/techsuwa/component/peertube/my-account/notifications/video.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/my-account/notifications/video.blade.php
@@ -1,5 +1,5 @@
 <a class="ng-star-inserted">
-  <img alt="" aria-labelledby="avatar" class="avatar" src="{{ ptAvatar($n->video->channel->avatar) }}">
+  <img alt="" aria-labelledby="avatar" class="avatar" src="{{ ptAvatar($n->video->channel) }}">
 </a>
 <div class="message ng-star-inserted">
   {{ $n->video->channel->displayName }}さんは新しい動画を投稿しました: <a href="/peertube/w/{{ $n->video->shortUUID }}">{{ $n->video->name }}</a>
diff --git a/resources/views/theme/techsuwa/component/peertube/videos/channels.blade.php b/resources/views/theme/techsuwa/component/peertube/videos/channels.blade.php
index e20090b..ef1151a 100644
--- a/resources/views/theme/techsuwa/component/peertube/videos/channels.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/videos/channels.blade.php
@@ -2,7 +2,7 @@
   <div class="section-title">
     <a href="/peertube/c/{{ ptFullHandle($res['video']->channels[0]->channel) }}">
       <my-actor-avatar>
-        <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($res['video']->channels[0]->channel->avatar) }}" alt="チャンネルのアバター">
+        <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($res['video']->channels[0]->channel) }}" alt="チャンネルのアバター">
       </my-actor-avatar>
       <h2 class="section-title">{{ $res['video']->channels[0]->channel->displayName }}</h2>
     </a>
diff --git a/resources/views/theme/techsuwa/component/peertube/w/info/channel.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/channel.blade.php
index b5d24a0..6ecfe5a 100644
--- a/resources/views/theme/techsuwa/component/peertube/w/info/channel.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/w/info/channel.blade.php
@@ -3,12 +3,12 @@
     <div class="wrapper">
       <my-actor-avatar class="channel">
         <a title="{{ ptFullHandle($res['detail']->channel) }} (チャンネルページへ) " href="/peertube/c/{{ ptFullHandle($res['detail']->channel) }}" class="ng-star-inserted">
-          <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($res['detail']->channel->avatar) }}" alt="チャンネルのアバター">
+          <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($res['detail']->channel) }}" alt="チャンネルのアバター">
         </a>
       </my-actor-avatar>
       <my-actor-avatar class="account">
         <a title="{{ ptFullHandle($res['detail']->account) }} (アカウントページへ) " href="/peertube/a/{{ ptFullHandle($res['detail']->account) }}" class="ng-star-inserted">
-          <img class="account avatar ng-star-inserted" src="{{ ptAvatar($res['detail']->account->avatar) }}" alt="アカウントのアバター">
+          <img class="account avatar ng-star-inserted" src="{{ ptAvatar($res['detail']->account) }}" alt="アカウントのアバター">
         </a>
       </my-actor-avatar>
     </div>
diff --git a/resources/views/theme/techsuwa/component/peertube/w/info/comments.blade.php b/resources/views/theme/techsuwa/component/peertube/w/info/comments.blade.php
index 26d6b43..187df9f 100644
--- a/resources/views/theme/techsuwa/component/peertube/w/info/comments.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/w/info/comments.blade.php
@@ -44,7 +44,7 @@
 
                     <my-actor-avatar class="ng-star-inserted">
                       <a target="_blank" rel="noopener noreferrer" href="{{ $v->account->url }}" title="{{ $v->account->name }} (アカウントページへ) " class="ng-star-inserted">
-                        <img class="account avatar ng-star-inserted" src="{{ ptAvatar($v->account->avatar) }}" alt="アカウントのアバター">
+                        <img class="account avatar ng-star-inserted" src="{{ ptAvatar($v->account) }}" alt="アカウントのアバター">
                       </a>
                     </my-actor-avatar>
 
diff --git a/resources/views/theme/techsuwa/component/peertube/w/videorecommend.blade.php b/resources/views/theme/techsuwa/component/peertube/w/videorecommend.blade.php
index c9bd99f..9e65ee1 100644
--- a/resources/views/theme/techsuwa/component/peertube/w/videorecommend.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/w/videorecommend.blade.php
@@ -29,7 +29,7 @@
               <div class="d-flex video-miniature-meta">
                 <my-actor-avatar class="ng-star-inserted">
                   <a title="{{ $v->channel->name }} (チャンネルページへ) " href="/c/{{ $v->channel->name }}" class="ng-star-inserted">
-                    <img class="avatar avatar-32 channel ng-star-inserted" src="{{ ptAvatar($v->channel->avatar) }}" alt="チャンネルのアバター">
+                    <img class="avatar avatar-32 channel ng-star-inserted" src="{{ ptAvatar($v->channel) }}" alt="チャンネルのアバター">
                   </a>
                 </my-actor-avatar>
                 <div class="w-100 d-flex flex-column">