From 1c34478624e664918c8848ab1573cb44ada7da66 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:33:48 +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                               |  8 +++++
 public/css/peertube/myaccount.css             | 30 +++++++------------
 .../peertube/a/channels/avatar.blade.php      |  2 +-
 .../component/peertube/a/info.blade.php       |  4 +--
 .../component/peertube/a/links.blade.php      |  4 +--
 .../component/peertube/c/head/info.blade.php  |  4 +--
 .../component/peertube/c/head/owner.blade.php | 12 ++++----
 .../component/peertube/c/links.blade.php      |  4 +--
 .../component/peertube/c/playlists.blade.php  |  2 +-
 .../peertube/common/videominature.blade.php   |  2 +-
 .../peertube/menu/top/loggedin.blade.php      |  6 ++--
 .../notifications/account.blade.php           |  2 +-
 .../notifications/actorfollow.blade.php       |  8 ++---
 .../notifications/comment.blade.php           |  8 ++---
 .../my-account/notifications/video.blade.php  |  2 +-
 .../peertube/videos/channels.blade.php        |  4 +--
 .../peertube/w/info/channel.blade.php         | 14 ++++-----
 .../peertube/w/info/comments.blade.php        |  6 ++--
 .../peertube/w/videorecommend.blade.php       |  4 +--
 19 files changed, 63 insertions(+), 63 deletions(-)

diff --git a/app/helpers.php b/app/helpers.php
index a54eb36..78e4e0a 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -41,6 +41,14 @@ function checkLegit ($t) {
   return $check->id;
 }
 
+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 userDetail ($id, $kero=null) {
   if ($kero || $id) {
     $log_username = null;
diff --git a/public/css/peertube/myaccount.css b/public/css/peertube/myaccount.css
index 3a7b4ae..887dbe9 100644
--- a/public/css/peertube/myaccount.css
+++ b/public/css/peertube/myaccount.css
@@ -200,6 +200,17 @@
   color: var(--whiteColor);
 }
 
+svg {
+  overflow: hidden;
+  vertical-align: middle;
+}
+
+.notification my-global-icon {
+  margin-inline-start: 3px;
+  margin-inline-end: 11px;
+  width: 24px;
+}
+
 .header-filter a my-global-icon .feather, .header-filter a my-global-icon .material, .header-filter a my-global-icon .misc {
   color: var(--greyForegroundColor);
 }
@@ -457,11 +468,6 @@ my-user-notifications {
   background-color: var(--menuAndHeaderBackgroundColor);
 }
 
-#custom-css .notification {
-  background-color: var(--mainBackgroundColor);
-  color: var(--mainForegroundColor);
-}
-
 .notification.unread {
   background-color: #0000000d;
 }
@@ -503,18 +509,4 @@ img {
   color: var(--greyForegroundColor);
   min-width: 70px;
   text-align: end;
-}
-
-#custom-css .notification {
-  background-color: var(--mainBackgroundColor);
-  color: var(--mainForegroundColor);
-}
-
-.notification {
-  display: flex;
-  align-items: center;
-  font-size: inherit;
-  padding: 15px 5px 15px 10px;
-  border-bottom: 1px solid rgba(0,0,0,.1);
-  word-break: break-word;
 }
\ No newline at end of file
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 c9a41bd..8ec0488 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="{{ !is_null($ch->avatar) ? 'https://video.076.ne.jp'.$ch->avatar->path : '/img/noicon.jpg' }}" alt="チャンネルのアバター">
+      <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($ch->avatar) }}" 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 44da229..f943b57 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="{{ !is_null($res['owner']->avatar) ? 'https://video.076.ne.jp'.$res['owner']->avatar->path : '/img/noicon.jpg' }}" alt="アカウントのアバター">
+      <img class="account avatar ng-star-inserted" src="{{ ptAvatar($res['owner']->avatar) }}" alt="アカウントのアバター">
     </my-actor-avatar>
     <div>
       <div class="section-label">アカウント</div>
@@ -11,7 +11,7 @@
             <h1 title="Created on {{ date('Y/m/d', strtotime($res['owner']->createdAt)) }}">{{ $res['owner']->displayName }}</h1>
           </div>
           <div class="actor-handle">
-            <span>{{ '@'.$res['owner']->name }}{{ $res['owner']->host != 'video.076.ne.jp' ? '@'.$res['owner']->host : '' }}</span>
+            <span>{{ '@'.ptFullHandle($res['owner']) }}</span>
           </div>
           <div class="actor-counters">
             <span>{{ $res['owner']->followersCount }}人登録者</span>・<span class="videos-count ng-star-inserted"> {{ $res['owner']->totalVideo }}枚動画 </span>
diff --git a/resources/views/theme/techsuwa/component/peertube/a/links.blade.php b/resources/views/theme/techsuwa/component/peertube/a/links.blade.php
index 7792a40..1170406 100644
--- a/resources/views/theme/techsuwa/component/peertube/a/links.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/a/links.blade.php
@@ -2,10 +2,10 @@
   <my-list-overflow>
     <div class="d-flex align-items-center text-nowrap w-100 list-overflow-parent">
       <span id="pe_0" class="ng-star-inserted" style="visibility: inherit;">
-        <a class="title-page ng-star-inserted active" href="/peertube/a/{{ $res['owner']->name }}{{ $res['owner']->host != 'video.076.ne.jp' ? '@'.$res['owner']->host : '' }}/video-channels">チャンネル</a>
+        <a class="title-page ng-star-inserted active" href="/peertube/a/{{ ptFullHandle($res['owner']) }}/video-channels">チャンネル</a>
       </span>
       <span id="pe_1" class="ng-star-inserted" style="visibility: inherit;">
-        <a class="title-page ng-star-inserted" href="/peertube/a/{{ $res['owner']->name }}{{ $res['owner']->host != 'video.076.ne.jp' ? '@'.$res['owner']->host : '' }}/videos">動画</a>
+        <a class="title-page ng-star-inserted" href="/peertube/a/{{ ptFullHandle($res['owner']) }}/videos">動画</a>
       </span>
     </div>
   </my-list-overflow>
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 c86a3e0..292e705 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="{{ !is_null($res['channel']->avatar) ? 'https://video.076.ne.jp'.$res['channel']->avatar->path : '/img/noicon.jpg' }}" alt="チャンネルのアバター">
+      <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($res['channel']->avatar) }}" alt="チャンネルのアバター">
     </my-actor-avatar>
     <div>
       <div class="section-label">動画チャンネル</div>
@@ -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>{{ '@'.$res['channel']->name }}{{ $res['channel']->host != 'video.076.ne.jp' ? '@'.$res['channel']->host : '' }}</span>
+            <span>{{ '@'.ptFullHandle($res['channel']) }}</span>
           </div>
           <div class="actor-counters">
             <span>{{ $res['channel']->followersCount }}人登録者</span>
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 ff030aa..ef8efdf 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
@@ -3,20 +3,20 @@
     <div class="section-label">OWNER ACCOUNT</div>
     <div class="avatar-row">
       <my-actor-avatar class="account-avatar">
-        <a title="{{ $res['channel']->ownerAccount->name }} (アカウントページへ) " href="/peertube/a/{{ $res['channel']->ownerAccount->name }}{{ $res['channel']->ownerAccount->host != 'video.076.ne.jp' ? '@'.$res['channel']->ownerAccount->host : '' }}" class="ng-star-inserted">
-          <img class="account avatar ng-star-inserted" src="{{ !is_null($res['channel']->ownerAccount->avatar) ? 'https://video.076.ne.jp'.$res['channel']->ownerAccount->avatar->path : '/img/noicon.jpg' }}" alt="アカウントのアバター">
+        <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="アカウントのアバター">
         </a>
       </my-actor-avatar>
       <div class="actor-info">
       <h4>
-        <a title="視聴回数" href="/peertube/a/{{ $res['channel']->ownerAccount->name }}{{ $res['channel']->ownerAccount->host != 'video.076.ne.jp' ? '@'.$res['channel']->ownerAccount->host : '' }}">{{ $res['channel']->ownerAccount->displayName }}</a>
+        <a title="視聴回数" href="/peertube/a/{{ ptFullHandle($res['channel']->ownerAccount) }}">{{ $res['channel']->ownerAccount->displayName }}</a>
       </h4>
-      <div class="actor-handle">{{ '@'.$res['channel']->ownerAccount->name }}{{ $res['channel']->ownerAccount->host != 'video.076.ne.jp' ? '@'.$res['channel']->ownerAccount->host : '' }}</div>
+      <div class="actor-handle">{{ '@'.ptFullHandle($res['channel']->ownerAccount) }}</div>
     </div>
   </div>
   <div class="owner-description">
     <div class="description-html"></div>
   </div>
-  <a class="view-account short" href="/peertube/a/{{ $res['channel']->ownerAccount->name }}{{ $res['channel']->ownerAccount->host != 'video.076.ne.jp' ? '@'.$res['channel']->ownerAccount->host : '' }}">視聴回数</a>
-  <a class="view-account complete" href="/peertube/a/{{ $res['channel']->ownerAccount->name }}{{ $res['channel']->ownerAccount->host != 'video.076.ne.jp' ? '@'.$res['channel']->ownerAccount->host : '' }}"> View owner account </a>
+  <a class="view-account short" href="/peertube/a/{{ ptFullHandle($res['channel']->ownerAccount) }}">視聴回数</a>
+  <a class="view-account complete" href="/peertube/a/{{ ptFullHandle($res['channel']->ownerAccount) }}"> View owner account </a>
 </div>
\ No newline at end of file
diff --git a/resources/views/theme/techsuwa/component/peertube/c/links.blade.php b/resources/views/theme/techsuwa/component/peertube/c/links.blade.php
index 19a076d..51ba830 100644
--- a/resources/views/theme/techsuwa/component/peertube/c/links.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/c/links.blade.php
@@ -2,10 +2,10 @@
   <my-list-overflow>
     <div class="d-flex align-items-center text-nowrap w-100 list-overflow-parent">
       <span id="pe_0" class="ng-star-inserted" style="visibility: inherit;">
-        <a class="title-page ng-star-inserted{{ $res['cat'] == 'videos' ? ' active' : '' }}" href="/peertube/c/{{ $res['channel']->name }}{{ $res['channel']->host != 'video.076.ne.jp' ? '@'.$res['channel']->host : '' }}/videos">動画</a>
+        <a class="title-page ng-star-inserted{{ $res['cat'] == 'videos' ? ' active' : '' }}" href="/peertube/c/{{ ptFullHandle($res['channel']) }}/videos">動画</a>
       </span>
       <span id="pe_1" class="ng-star-inserted" style="visibility: inherit;">
-        <a class="title-page ng-star-inserted{{ $res['cat'] == 'video-playlists' ? ' active' : '' }}" href="/peertube/c/{{ $res['channel']->name }}{{ $res['channel']->host != 'video.076.ne.jp' ? '@'.$res['channel']->host : '' }}/video-playlists">プレイリスト</a>
+        <a class="title-page ng-star-inserted{{ $res['cat'] == 'video-playlists' ? ' active' : '' }}" href="/peertube/c/{{ ptFullHandle($res['channel']) }}/video-playlists">プレイリスト</a>
       </span>
     </div>
   </my-list-overflow>
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 3b6361d..27fdaff 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="{{ !is_null($v->thumbnailPath) ? 'https://video.076.ne.jp'.$v->thumbnailPath : '/img/noicon.jpg' }}" class="ng-star-inserted">
+                <img alt="" aria-labelledby="{{ $v->displayName }}" src="{{ ptAvatar($v->thumbnailPath) }}" 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/common/videominature.blade.php b/resources/views/theme/techsuwa/component/peertube/common/videominature.blade.php
index 82b2417..a18124d 100644
--- a/resources/views/theme/techsuwa/component/peertube/common/videominature.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/common/videominature.blade.php
@@ -47,7 +47,7 @@
                 </span>
               </span>
               @if ($res['page'] != 'channel')
-                <a tabindex="-1" class="video-miniature-channel ng-star-inserted" href="/peertube/c/{{ $v->channel->name }}{{ $v->channel->host != 'video.076.ne.jp' ? '@'.$v->channel->host : '' }}"> {{ $v->channel->name }}{{ $v->channel->host != 'video.076.ne.jp' ? '@'.$v->channel->host : '' }} </a>
+                <a tabindex="-1" class="video-miniature-channel ng-star-inserted" href="/peertube/c/{{ ptFullHandle($v->channel) }}"> {{ $v->channel->displayName }} </a>
               @endif
               <div class="video-info-privacy"></div>
             </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 1b585eb..6faa028 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
@@ -1,14 +1,14 @@
 <div class="logged-in-block ng-star-inserted">
   <div>
     <div placement="bottom-left auto" autoclose="outside" class="logged-in-more dropdown">
-      <a href="/peertube/a/{{ $res['userinfo']['me']->account->name }}{{ $res['userinfo']['me']->account->host != 'video.076.ne.jp' ? '@'.$res['userinfo']['me']->account->host : '' }}">
+      <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="{{ !is_null($res['userinfo']['me']->account->avatar) ? 'https://video.076.ne.jp'.$res['userinfo']['me']->account->avatar->path : '/img/noicon.jpg' }}" alt="アカウントのアバター">
+            <img class="account avatar avatar-34 ng-star-inserted" src="{{ ptAvatar($res['userinfo']['me']->account->avatar) }}" alt="アカウントのアバター">
           </my-actor-avatar>
           <div class="logged-in-info">
             <div class="logged-in-display-name">{{ $res['userinfo']['me']->account->displayName }}</div>
-            <div class="logged-in-username">{{ '@'.$res['userinfo']['me']->account->name }}{{ $res['userinfo']['me']->account->host != 'video.076.ne.jp' ? '@'.$res['userinfo']['me']->account->host : '' }}</div>
+            <div class="logged-in-username">{{ '@'.ptFullHandle($res['userinfo']['me']->account) }}</div>
           </div>
         </div>
       </a>
diff --git a/resources/views/theme/techsuwa/component/peertube/my-account/notifications/account.blade.php b/resources/views/theme/techsuwa/component/peertube/my-account/notifications/account.blade.php
index e63073c..c59e9cb 100644
--- a/resources/views/theme/techsuwa/component/peertube/my-account/notifications/account.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/my-account/notifications/account.blade.php
@@ -2,5 +2,5 @@
   <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-user-plus"><path d="M16 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="8.5" cy="7" r="4"></circle><line x1="20" y1="8" x2="20" y2="14"></line><line x1="23" y1="11" x2="17" y2="11"></line></svg>
 </my-global-icon>
 <div class="message ng-star-inserted">
-  <a href="/peertube/a/{{ $n->account->name }}{{ $n->account->host != 'video.076.ne.jp' ? '@'.$n->account->host : '' }}">{{ $n->account->displayName }}</a>さんがこのインスタンスに登録しました
+  <a href="/peertube/a/{{ ptFullHandle($n->account) }}">{{ $n->account->displayName }}</a>さんがこのインスタンスに登録しました
 </div>
\ No newline at end of file
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 8637145..66971ad 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
@@ -3,8 +3,8 @@
     <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-users"><path d="M17 21v-2a4 4 0 0 0-4-4H5a4 4 0 0 0-4 4v2"></path><circle cx="9" cy="7" r="4"></circle><path d="M23 21v-2a4 4 0 0 0-3-3.87"></path><path d="M16 3.13a4 4 0 0 1 0 7.75"></path></svg>
   </my-global-icon>
 @elseif ($n->actorFollow->following->type == 'account')
-  <a href="/peertube/a/{{ $n->actorFollow->follower->name }}{{ $n->actorFollow->follower->host != 'video.076.ne.jp' ? '@'.$n->actorFollow->follower->host : '' }}" class="ng-star-inserted">
-    <img alt="" aria-labelledby="avatar" class="avatar" src="{{ !is_null($n->actorFollow->follower->avatar) ? 'https://video.076.ne.jp'.$n->actorFollow->follower->avatar->path : '/img/noicon.jpg' }}">
+  <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) }}">
   </a>
 @endif
 <div class="message ng-star-inserted">
@@ -15,8 +15,8 @@
       あなたのインスタンスに<a href="/peertube/admin/follows/followers-list">新しいフォロワー</a>が登録されました ({{ $n->actorFollow->follower->host }})
     @endif
   @elseif ($n->actorFollow->following->type == 'account')
-    <a href="/peertube/a/{{ $n->actorFollow->follower->name }}{{ $n->actorFollow->follower->host != 'video.076.ne.jp' ? '@'.$n->actorFollow->follower->host : '' }}">{{ $n->actorFollow->follower->displayName }}</a>さんはああたをフォローしています
+    <a href="/peertube/a/{{ ptFullHandle($n->actorFollow->follower) }}">{{ $n->actorFollow->follower->displayName }}</a>さんはああたをフォローしています
   @elseif ($n->actorFollow->following->type == 'channel')
-    <a href="/peertube/a/{{ $n->actorFollow->follower->name }}{{ $n->actorFollow->follower->host != 'video.076.ne.jp' ? '@'.$n->actorFollow->follower->host : '' }}">{{ $n->actorFollow->follower->displayName }}</a>さんは「{{ $n->actorFollow->following->displayName }}」というチャンネルをフォローしています
+    <a href="/peertube/a/{{ ptFullHandle($n->actorFollow->follower) }}">{{ $n->actorFollow->follower->displayName }}</a>さんは「{{ $n->actorFollow->following->displayName }}」というチャンネルをフォローしています
   @endif
 </div>
\ No newline at end of file
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 5e2595e..0965d9d 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,12 +1,12 @@
-<a href="/peertube/a/{{ $n->comment->account->name }}{{ $n->comment->account->host != 'video.076.ne.jp' ? '@'.$n->comment->account->host : '' }}" class="ng-star-inserted">
-  <img alt="" aria-labelledby="avatar" class="avatar" src="{{ !is_null($n->comment->account->avatar) ? 'https://video.076.ne.jp'.$n->comment->account->avatar->path : '/img/noicon.jpg' }}">
+<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) }}">
 </a>
 @if ($n->type == 11)
   <div class="message ng-star-inserted">
-    <a href="/peertube/a/{{ $n->comment->account->name }}{{ $n->comment->account->host != 'video.076.ne.jp' ? '@'.$n->comment->account->host : '' }}">{{ $n->comment->account->displayName }}</a>さんは<a href="/peertube/w/{{ $n->comment->video->shortUUID }}#threadId={{ $n->comment->threadId }}">{{ $n->comment->video->name }}</a>という動画でメンションされました。
+    <a href="/peertube/a/{{ ptFullHandle($n->comment->account) }}">{{ $n->comment->account->displayName }}</a>さんは<a href="/peertube/w/{{ $n->comment->video->shortUUID }}#threadId={{ $n->comment->threadId }}">{{ $n->comment->video->name }}</a>という動画でメンションされました。
   </div>
 @elseif ($n->type == 2)
   <div class="message ng-star-inserted">
-    <a href="/peertube/a/{{ $n->comment->account->name }}{{ $n->comment->account->host != 'video.076.ne.jp' ? '@'.$n->comment->account->host : '' }}">{{ $n->comment->account->displayName }}</a>さんは<a href="/peertube/w/{{ $n->comment->video->shortUUID }}#threadId={{ $n->comment->threadId }}">{{ $n->comment->video->name }}</a>でコメントを投稿しました
+    <a href="/peertube/a/{{ ptFullHandle($n->comment->account) }}">{{ $n->comment->account->displayName }}</a>さんは<a href="/peertube/w/{{ $n->comment->video->shortUUID }}#threadId={{ $n->comment->threadId }}">{{ $n->comment->video->name }}</a>でコメントを投稿しました
   </div>
 @endif
\ No newline at end of file
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 229090c..3454e43 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="{{ !is_null($n->video->channel->avatar) ? 'https://video.076.ne.jp'.$n->video->channel->avatar->path : '/img/noicon.jpg' }}">
+  <img alt="" aria-labelledby="avatar" class="avatar" src="{{ ptAvatar($n->video->channel->avatar) }}">
 </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 6b0e1c1..e20090b 100644
--- a/resources/views/theme/techsuwa/component/peertube/videos/channels.blade.php
+++ b/resources/views/theme/techsuwa/component/peertube/videos/channels.blade.php
@@ -1,8 +1,8 @@
 <div class="section channel videos ng-star-inserted">
   <div class="section-title">
-    <a href="/peertube/c/{{ $res['video']->channels[0]->channel->name }}{{ $res['video']->channels[0]->channel->host != 'video.076.ne.jp' ? '@'.$res['video']->channels[0]->channel->host : '' }}">
+    <a href="/peertube/c/{{ ptFullHandle($res['video']->channels[0]->channel) }}">
       <my-actor-avatar>
-        <img class="avatar channel ng-star-inserted" src="{{ !is_null($res['video']->channels[0]->channel->avatar) ? 'https://video.076.ne.jp'.$res['video']->channels[0]->channel->avatar->path : '/img/noicon.jpg' }}" alt="チャンネルのアバター">
+        <img class="avatar channel ng-star-inserted" src="{{ ptAvatar($res['video']->channels[0]->channel->avatar) }}" 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 878cf16..b5d24a0 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
@@ -2,21 +2,21 @@
   <my-video-avatar-channel>
     <div class="wrapper">
       <my-actor-avatar class="channel">
-        <a title="{{ $res['detail']->channel->name }}{{ $res['detail']->channel->host != 'video.076.ne.jp' ? '@'.$res['detail']->channel->host : '' }} (チャンネルページへ) " href="/peertube/c/{{ $res['detail']->channel->name }}{{ $res['detail']->channel->host != 'video.076.ne.jp' ? '@'.$res['detail']->channel->host : '' }}" class="ng-star-inserted">
-          <img class="avatar channel ng-star-inserted" src="{{ !is_null($res['detail']->channel->avatar) ? 'https://video.076.ne.jp'.$res['detail']->channel->avatar->path : '/img/noicon.jpg' }}" alt="チャンネルのアバター">
+        <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="チャンネルのアバター">
         </a>
       </my-actor-avatar>
       <my-actor-avatar class="account">
-        <a title="{{ $res['detail']->account->name }}{{ $res['detail']->account->host != 'video.076.ne.jp' ? '@'.$res['detail']->account->host : '' }} (アカウントページへ) " href="/peertube/a/{{ $res['detail']->account->name }}{{ $res['detail']->account->host != 'video.076.ne.jp' ? '@'.$res['detail']->account->host : '' }}" class="ng-star-inserted">
-          <img class="account avatar ng-star-inserted" src="{{ !is_null($res['detail']->account->avatar) ? 'https://video.076.ne.jp'.$res['detail']->account->avatar->path : '/img/noicon.jpg' }}" alt="アカウントのアバター">
+        <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="アカウントのアバター">
         </a>
       </my-actor-avatar>
     </div>
   </my-video-avatar-channel>
   <div class="video-info-channel-left-links ml-1">
-    <a title="チャンネルページ" href="/peertube/c/{{ $res['detail']->channel->name }}{{ $res['detail']->channel->host != 'video.076.ne.jp' ? '@'.$res['detail']->channel->host : '' }}" class="ng-star-inserted"> {{ $res['detail']->channel->displayName }} </a>
-    <a title="アカウントページ" href="/peertube/a/{{ $res['detail']->account->name }}{{ $res['detail']->account->host != 'video.076.ne.jp' ? '@'.$res['detail']->account->host : '' }}" class="ng-star-inserted">
-      <span>{{ $res['detail']->account->name }}{{ $res['detail']->account->host != 'video.076.ne.jp' ? '@'.$res['detail']->account->host : '' }} 制作</span>
+    <a title="チャンネルページ" href="/peertube/c/{{ ptFullHandle($res['detail']->channel) }}" class="ng-star-inserted"> {{ $res['detail']->channel->displayName }} </a>
+    <a title="アカウントページ" href="/peertube/a/{{ ptFullHandle($res['detail']->account) }}" class="ng-star-inserted">
+      <span>{{ ptFullHandle($res['detail']->account) }} 制作</span>
     </a>
   </div>
 </div>
\ No newline at end of file
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 6224a25..26d6b43 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="{{ !is_null($v->account->avatar) ? 'https://video.076.ne.jp'.$v->account->avatar->path : '/img/noicon.jpg' }}" alt="アカウントのアバター">
+                        <img class="account avatar ng-star-inserted" src="{{ ptAvatar($v->account->avatar) }}" alt="アカウントのアバター">
                       </a>
                     </my-actor-avatar>
 
@@ -55,9 +55,9 @@
                       <div class="highlighted-comment ng-star-inserted">注目のコメント</div>
                       <div class="comment-account-date ng-star-inserted">
                         <div class="comment-account">
-                          <a href="/peertube/a/{{ $v->account->name }}{{ $v->account->host != 'video.076.ne.jp' ? '@'.$v->account->host : '' }}">
+                          <a href="/peertube/a/{{ ptFullHandle($v->account) }}">
                             <span class="comment-account-name"> {{ $v->account->displayName }} </span>
-                            <span class="comment-account-fid ml-1">{{ $v->account->name }}{{ $v->account->host != 'video.076.ne.jp' ? '@'.$v->account->host : '' }}</span>
+                            <span class="comment-account-fid ml-1">{{ ptFullHandle($v->account) }}</span>
                           </a>
                         </div>
                         <a class="comment-date" title="{{ date('Y/m/d', strtotime($v->createdAt)) }}" href="/w/{{ request()->route('id') }}#threadId={{ $v->threadId }}"> 
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 31b4f86..c9bd99f 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="{{ !is_null($v->channel->avatar) ? 'https://video.076.ne.jp'.$v->channel->avatar->path : '/img/noicon.jpg' }}" alt="チャンネルのアバター">
+                    <img class="avatar avatar-32 channel ng-star-inserted" src="{{ ptAvatar($v->channel->avatar) }}" alt="チャンネルのアバター">
                   </a>
                 </my-actor-avatar>
                 <div class="w-100 d-flex flex-column">
@@ -46,7 +46,7 @@
                       </my-video-views-counter>
                     </span>
                   </span>
-                  <a tabindex="-1" class="video-miniature-account ng-star-inserted" href="/c/{{ $v->channel->host != 'video.076.ne.jp' ? '@'.$v->channel->host : '' }}"> {{ $v->account->name }}{{ $v->account->host != 'video.076.ne.jp' ? '@'.$v->account->host : '' }} </a>
+                  <a tabindex="-1" class="video-miniature-account ng-star-inserted" href="/c/{{ ptFullHandle($v->channel) }}"> {{ ptFullHandle($v->account) }} </a>
                   <div class="video-info-privacy"></div>
                 </div>
               </div>