ソースを参照

エロ

dev-master
コミット
510b930719
  1. 4
      app/helpers.php
  2. 2
      resources/views/theme/techsuwa/component/peertube/a/channels/avatar.blade.php
  3. 2
      resources/views/theme/techsuwa/component/peertube/a/info.blade.php
  4. 2
      resources/views/theme/techsuwa/component/peertube/c/head/info.blade.php
  5. 2
      resources/views/theme/techsuwa/component/peertube/c/head/owner.blade.php
  6. 2
      resources/views/theme/techsuwa/component/peertube/c/playlists.blade.php
  7. 2
      resources/views/theme/techsuwa/component/peertube/menu/top/loggedin.blade.php
  8. 2
      resources/views/theme/techsuwa/component/peertube/my-account/notifications/actorfollow.blade.php
  9. 2
      resources/views/theme/techsuwa/component/peertube/my-account/notifications/comment.blade.php
  10. 2
      resources/views/theme/techsuwa/component/peertube/my-account/notifications/video.blade.php
  11. 2
      resources/views/theme/techsuwa/component/peertube/videos/channels.blade.php
  12. 4
      resources/views/theme/techsuwa/component/peertube/w/info/channel.blade.php
  13. 2
      resources/views/theme/techsuwa/component/peertube/w/info/comments.blade.php
  14. 2
      resources/views/theme/techsuwa/component/peertube/w/videorecommend.blade.php

4
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) {

2
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>

2
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>

2
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>

2
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">

2
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>

2
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>

2
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">

2
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">

2
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>

2
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>

4
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>

2
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>

2
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">

読み込み中…
キャンセル
保存