suwako
/
LightPeer
アーカイブ
1
0
フォーク 0
コード イシュー プルリクエスト プロジェクト リリース Wiki アクティビティ

コミットを比較

基準: suwako:84ba825d22d7883d750844efe9f21f015b65ed17
ブランチ タグ
suwako:master
suwako:dev
suwako:2022年2月12日
...
比較: suwako:17e6c6c78ebee25fd0c22a3b2d63a04b1d3d6df0
ブランチ タグ
suwako:master
suwako:dev
suwako:2022年2月12日

3 コミット
84ba825d22 ... 17e6c6c78e

作成者 SHA1 メッセージ 日付
守矢諏訪子 17e6c6c78e ロリ 2022-02-11 18:25:24 +09:00
守矢諏訪子 e050e773a0 チキン 2022-02-11 18:10:56 +09:00
守矢諏訪子 ea20d45276 スタイルリンク 2022-02-11 17:34:02 +09:00
24個のファイルの変更、151行の追加、99行の削除
統計情報を表示 すべてのファイルを展開 すべてのファイルを折り畳む

2
app/helpers.php
ファイルの表示

@ -112,7 +112,7 @@ function ptDuration ($v) {
$minutes = sprintf("%02d", floor($seconds / 60));
$seconds -= sprintf("%02d", $minutes * 60);
return $hours != 0 ? $hours.':' : ''.$minutes != 0 ? $minutes.':' : '0:'.$seconds;
return ($hours != 0 ? $hours.':' : '').($minutes != 0 ? $minutes.':' : '0:').$seconds;
}
function ptAvatar ($v) {

2
public/css/styles.css vendored
ファイルの表示

@ -4,7 +4,6 @@
font-style: normal;
font-stretch: normal;
font-display: swap;
src: url(SourceSans3VF-Roman.ttf.123081915e9fbb9f01bd.woff2) format("woff2")
}
@font-face {
@ -13,7 +12,6 @@
font-style: italic;
font-stretch: normal;
font-display: swap;
src: url(SourceSans3VF-Italic.ttf.797355866311afb6142d.woff2) format("woff2")
}
.peertube-button {

1
resources/views/layout/component/a/channels.blade.php
ファイルの表示

@ -2,7 +2,6 @@
<div class="margin-content">
<div class="channels">
@foreach ($res['channel']->data as $ch)
<?php $fullchan = $ch->name.($ch->host != 'video.076.ne.jp' ? '@'.$ch->host : ''); ?>
<div class="channel ng-star-inserted">
@include('layout.component.a.channels.avatar')
@include('layout.component.common.subscribe')

4
resources/views/layout/component/a/channels/avatar.blade.php
ファイルの表示

@ -1,11 +1,11 @@
<div class="channel-avatar-row">
<my-actor-avatar title="この動画チャンネルを見る">
<a title="この動画チャンネルを見る" href="/c/{{ $fullchan }}" class="ng-star-inserted">
<a title="この動画チャンネルを見る" href="/c/{{ ptFullHandle($ch) }}" class="ng-star-inserted">
<img class="avatar channelng ng-star-inserted" src="{{ ptAvatar($ch) }}" alt="チャンネルのアバター">
</a>
</my-actor-avatar>
<h2>
<a title="この動画チャンネルを見る" href="/c/{{ $fullchan }}"> {{ $ch->displayName }} </a>
<a title="この動画チャンネルを見る" href="/c/{{ ptFullHandle($ch) }}"> {{ $ch->displayName }} </a>
</h2>
<div class="actor-counters">
<div class="followers">{{ $ch->followersCount }}人登録者</div>・<span class="videos-count ng-star-inserted"> {{ $ch->video->total }}枚動画 </span>

4
resources/views/layout/component/a/channels/videos.blade.php
ファイルの表示

@ -4,7 +4,7 @@
<div class="video-miniature">
<my-video-thumbnail>
<a class="video-thumbnail ng-star-inserted" href="/w/{{ $v->shortUUID }}">
<img alt="" aria-label="{{ $v->name }}" src="https://video.076.ne.jp/{{ $v->thumbnailPath }}" class="ng-star-inserted">
<img alt="" aria-label="{{ $v->name }}" src="{{ env('PEER_URI') }}{{ $v->thumbnailPath }}" class="ng-star-inserted">
<div class="video-thumbnail-label-overlay warning ng-star-inserted"></div>
<div class="video-thumbnail-label-overlay danger ng-star-inserted"></div>
<div class="video-thumbnail-duration-overlay ng-star-inserted">{{ ptDuration($v->duration) }}</div>
@ -42,6 +42,6 @@
@endforeach
<div class="miniature-show-channel ng-star-inserted">
<a href="/c/{{ $fullchan }}">このチャンネルを表示&gt;</a>
<a href="/c/{{ ptFullHandle($ch) }}">このチャンネルを表示&gt;</a>
</div>
</div>

2
resources/views/layout/component/a/videos.blade.php
ファイルの表示

@ -5,6 +5,6 @@
@endforeach
</div>
@include('layout.component.common.paginate', [
'root' => '/a/'.$res['owner']->name.($res['owner']->host != 'video.076.ne.jp' ? '@'.$res['owner']->host : '').'/'.$res['cat']
'root' => '/a/'.ptFullHandle($res['owner']).'/'.$res['cat']
])
</div>

22
resources/views/layout/component/about/about.blade.php
ファイルの表示

@ -1,22 +0,0 @@
<div class="margin-content offset-content">
<div class="row">
<div class="col-md-12 col-xl-6">
@include('pages.peertube.about.components.about.ippan')
@include('pages.peertube.about.components.about.admin')
@include('pages.peertube.about.components.about.creation')
@include('pages.peertube.about.components.about.mentelife')
@include('pages.peertube.about.components.about.business')
@include('pages.peertube.about.components.about.information')
@include('pages.peertube.about.components.about.moderation')
@include('pages.peertube.about.components.about.cock')
@include('pages.peertube.about.components.about.terms')
@include('pages.peertube.about.components.about.other')
</div>
<div class="col-md-12 col-xl-6">
@include('pages.peertube.about.components.features')
</div>
<div class="col">
@include('pages.peertube.about.components.statistics')
</div>
</div>
</div>

16
resources/views/layout/component/about/about/features.blade.php
ファイルの表示

@ -20,14 +20,14 @@
</tr>
<tr>
<th scope="row" class="label">新規ユーザー登録</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->signup->allowed])
@include('layout.component.about.about.isfeature', ['check' => $conf->signup->allowed])
</tr>
<tr>
<th colspan="2" class="label">動画のアップロード</th>
</tr>
<tr>
<th scope="row" class="sub-label">複数の解像度へのトランスコーディング</th>
@include('pages.peertube.about.components.isfeature', ['check' => count($conf->transcoding->enabledResolutions) != 0])
@include('layout.component.about.about.isfeature', ['check' => count($conf->transcoding->enabledResolutions) != 0])
</tr>
<tr>
<th scope="row" class="sub-label">動画のアップロード</th>
@ -44,11 +44,11 @@
</tr>
<tr>
<th scope="row" class="sub-label">ライブ配信</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->live->enabled])
@include('layout.component.about.about.isfeature', ['check' => $conf->live->enabled])
</tr>
<tr class="ng-star-inserted">
<th scope="row" class="sub-label">複数の解像度でのライブ配信のトランスコーディング</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->live->transcoding->enabled && count($conf->live->transcoding->enabledResolutions) > 1])
@include('layout.component.about.about.isfeature', ['check' => $conf->live->transcoding->enabled && count($conf->live->transcoding->enabledResolutions) > 1])
</tr>
<tr class="ng-star-inserted">
<th scope="row" class="sub-label">同時ライブ配信の最大</th>
@ -59,25 +59,25 @@
</tr>
<tr>
<th scope="row" class="sub-label">HTTP でのインポート (YouTube、Vimeo、ダイレクトURLなど)</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->import->videos->http->enabled])
@include('layout.component.about.about.isfeature', ['check' => $conf->import->videos->http->enabled])
</tr>
<tr>
<th scope="row" class="sub-label">Torrent でのインポート</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->import->videos->torrent->enabled])
@include('layout.component.about.about.isfeature', ['check' => $conf->import->videos->torrent->enabled])
</tr>
<tr>
<th colspan="2" class="label">プレーヤー</th>
</tr>
<tr>
<th scope="row" class="sub-label">P2P機能</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->tracker->enabled])
@include('layout.component.about.about.isfeature', ['check' => $conf->tracker->enabled])
</tr>
<tr>
<th colspan="2" class="label">検索</th>
</tr>
<tr>
<th scope="row" class="sub-label">他のインスタンスのコンテンツ</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->search->searchIndex->enabled])
@include('layout.component.about.about.isfeature', ['check' => $conf->search->searchIndex->enabled])
</tr>
<tr>
<th colspan="2" class="label">Plugins &amp; Themes</th>

4
resources/views/layout/component/about/about/instance.blade.php
ファイルの表示

@ -104,12 +104,12 @@
<?php echo nl2br($res['about']->instance->terms); ?>
</div>
</div>
@include('pages.peertube.about.components.about.other')
@include('layout.component.about.about.other')
</div>
<div class="col-md-12 col-xl-6">
<h2 class="sr-only">特徴</h2>
</div>
@include('pages.peertube.about.components.about.features')
@include('layout.component.about.about.features')
<div class="col">
<div id="statistics" class="anchor"></div>
<a class="anchor-link" href="/about/instance#statistics">

2
resources/views/layout/component/about/about/other.blade.php
ファイルの表示

@ -2,4 +2,4 @@
<a class="anchor-link ng-star-inserted" href="/about/instance#other-information">
<h2 class="middle-title">その他の情報</h2>
</a>
@include('pages.peertube.about.components.about.other.hardware')
@include('layout.component.about.about.other.hardware')

16
resources/views/layout/component/about/features.blade.php
ファイルの表示

@ -27,14 +27,14 @@
</tr>
<tr>
<th scope="row" class="label">新規ユーザー登録</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->signup->allowed])
@include('layout.component.about.isfeature', ['check' => $conf->signup->allowed])
</tr>
<tr>
<th colspan="2" class="label">動画のアップロード</th>
</tr>
<tr>
<th scope="row" class="sub-label">複数の解像度へのトランスコーディング</th>
@include('pages.peertube.about.components.isfeature', ['check' => count($conf->transcoding->enabledResolutions) != 0])
@include('layout.component.about.isfeature', ['check' => count($conf->transcoding->enabledResolutions) != 0])
</tr>
<tr>
<th scope="row" class="sub-label">動画のアップロード</th>
@ -51,11 +51,11 @@
</tr>
<tr>
<th scope="row" class="sub-label">ライブ配信</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->live->enabled])
@include('layout.component.about.isfeature', ['check' => $conf->live->enabled])
</tr>
<tr class="ng-star-inserted">
<th scope="row" class="sub-label">複数の解像度でのライブ配信のトランスコーディング</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->live->transcoding->enabled && count($conf->live->transcoding->enabledResolutions) > 1])
@include('layout.component.about.isfeature', ['check' => $conf->live->transcoding->enabled && count($conf->live->transcoding->enabledResolutions) > 1])
</tr>
<tr class="ng-star-inserted">
<th scope="row" class="sub-label">同時ライブ配信の最大</th>
@ -66,25 +66,25 @@
</tr>
<tr>
<th scope="row" class="sub-label">HTTP でのインポート (YouTube、Vimeo、ダイレクトURLなど)</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->import->videos->http->enabled])
@include('layout.component.about.isfeature', ['check' => $conf->import->videos->http->enabled])
</tr>
<tr>
<th scope="row" class="sub-label">Torrent でのインポート</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->import->videos->torrent->enabled])
@include('layout.component.about.isfeature', ['check' => $conf->import->videos->torrent->enabled])
</tr>
<tr>
<th colspan="2" class="label">プレーヤー</th>
</tr>
<tr>
<th scope="row" class="sub-label">P2P機能</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->tracker->enabled])
@include('layout.component.about.isfeature', ['check' => $conf->tracker->enabled])
</tr>
<tr>
<th colspan="2" class="label">検索</th>
</tr>
<tr>
<th scope="row" class="sub-label">他のインスタンスのコンテンツ</th>
@include('pages.peertube.about.components.isfeature', ['check' => $conf->search->searchIndex->enabled])
@include('layout.component.about.isfeature', ['check' => $conf->search->searchIndex->enabled])
</tr>
<tr>
<th colspan="2" class="label">Plugins &amp; Themes</th>

22
resources/views/layout/component/about/instance.blade.php ノーマルファイル
ファイルの表示

@ -0,0 +1,22 @@
<div class="margin-content offset-content">
<div class="row">
<div class="col-md-12 col-xl-6">
@include('layout.component.about.about.ippan')
@include('layout.component.about.about.admin')
@include('layout.component.about.about.creation')
@include('layout.component.about.about.mentelife')
@include('layout.component.about.about.business')
@include('layout.component.about.about.information')
@include('layout.component.about.about.moderation')
@include('layout.component.about.about.cock')
@include('layout.component.about.about.terms')
@include('layout.component.about.about.other')
</div>
<div class="col-md-12 col-xl-6">
@include('layout.component.about.features')
</div>
<div class="col">
@include('layout.component.about.statistics')
</div>
</div>
</div>

18
resources/views/layout/component/about/statistics.blade.php
ファイルの表示

@ -5,17 +5,17 @@
<section class="ng-star-inserted">
<h3>ローカル</h3>
<div class="row">
@include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalUsers, 'label' => 'ユーザー'])
@include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalLocalVideos, 'label' => '動画'])
@include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalLocalVideoViews, 'label' => '動画視聴回数'])
@include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalLocalVideoComments, 'label' => '動画のコメント'])
@include('pages.peertube.about.components.statcard', ['value' => round($res['stats']->totalLocalVideoFilesSize / 1024 / 1024 / 1024, 1).' GiB', 'label' => '合計アップロードサイズ'])
@include('layout.component.about.statcard', ['value' => $res['stats']->totalUsers, 'label' => 'ユーザー'])
@include('layout.component.about.statcard', ['value' => $res['stats']->totalLocalVideos, 'label' => '動画'])
@include('layout.component.about.statcard', ['value' => $res['stats']->totalLocalVideoViews, 'label' => '動画視聴回数'])
@include('layout.component.about.statcard', ['value' => $res['stats']->totalLocalVideoComments, 'label' => '動画のコメント'])
@include('layout.component.about.statcard', ['value' => round($res['stats']->totalLocalVideoFilesSize / 1024 / 1024 / 1024, 1).' GiB', 'label' => '合計アップロードサイズ'])
</div>
<h3>他インスタンスとの連合</h3>
<div class="row">
@include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalVideos, 'label' => '動画'])
@include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalVideoComments, 'label' => '動画のコメント'])
@include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalInstanceFollowers, 'label' => 'フォロワー'])
@include('pages.peertube.about.components.statcard', ['value' => $res['stats']->totalInstanceFollowing, 'label' => 'フォロー'])
@include('layout.component.about.statcard', ['value' => $res['stats']->totalVideos, 'label' => '動画'])
@include('layout.component.about.statcard', ['value' => $res['stats']->totalVideoComments, 'label' => '動画のコメント'])
@include('layout.component.about.statcard', ['value' => $res['stats']->totalInstanceFollowers, 'label' => 'フォロワー'])
@include('layout.component.about.statcard', ['value' => $res['stats']->totalInstanceFollowing, 'label' => 'フォロー'])
</div>
</section>

4
resources/views/layout/component/c/head/banner.blade.php
ファイルの表示

@ -1,5 +1,5 @@
@if (!is_null($res['channel']->banner))
<div class="banner ng-star-inserted">
<img alt="Channel banner" src="https://video.076.ne.jp{{ $res['channel']->banner->path }}">
<img alt="Channel banner" src="{{ env('PEER_URI') }}{{ $res['channel']->banner->path }}">
</div>
@endif
@endif

2
resources/views/layout/component/c/playlists.blade.php
ファイルの表示

@ -7,7 +7,7 @@
<div class="miniature">
<my-link class="miniature-thumbnail">
<a tabindex="0" href="/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="{{ !is_null($v->thumbnailPath) ? env('PEER_URI').$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/layout/component/c/videos.blade.php
ファイルの表示

@ -20,7 +20,7 @@
@endforeach
</div>
@include('layout.component.common.paginate', [
'root' => '/c/'.$res['channel']->name.($res['channel']->host != 'video.076.ne.jp' ? '@'.$res['channel']->host : '').'/'.$res['cat']
'root' => '/c/'.ptFullHandle($res['channel']).'/'.$res['cat']
])
</div>
</my-videos-list>

2
resources/views/layout/component/common/videominature.blade.php
ファイルの表示

@ -3,7 +3,7 @@
<div class="video-miniature">
<my-video-thumbnail>
<a class="video-thumbnail ng-star-inserted" href="/w/{{ $v->shortUUID }}">
<img alt="" aria-label="{{ $v->name }}" src="https://video.076.ne.jp{{ $v->thumbnailPath }}" class="ng-star-inserted">
<img alt="" aria-label="{{ $v->name }}" src="{{ env('PEER_URI') }}{{ $v->thumbnailPath }}" class="ng-star-inserted">
<div class="video-thumbnail-actions-overlay ng-star-inserted">
<div placement="left" container="body" class="video-thumbnail-watch-later-overlay ng-star-inserted">
<my-global-icon iconname="clock" role="button" aria-label="「後で見る」に追加する">

2
resources/views/layout/component/manifest.blade.php
ファイルの表示

@ -21,7 +21,7 @@
<meta name="theme-color" content="#fff">
<meta property="og:platform" content="PeerTube">
<link rel="manifest" href="https://video.076.ne.jp/manifest.webmanifest?bb691a77622cbc0c1178f4dbf7d7e93daaecb079">
<link rel="manifest" href="{{ env('PEER_URI') }}/manifest.webmanifest?bb691a77622cbc0c1178f4dbf7d7e93daaecb079">
<link rel="icon" type="image/png" href="/img/favicon.jpeg">
<link rel="apple-touch-icon" href="/img/favicon.jpeg" sizes="144x144">

64
resources/views/layout/component/meta.blade.php
ファイルの表示

@ -1,36 +1,64 @@
<?php
$name = '';
$url = '/'.$res['page'];
$image = '';
if (isset($res['page'])) {
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.'さんのチャンネル';
if ($res['page'] == 'watch') {
$name = $res['detail']->name;
$url = '/w/'.$res['detail']->shortUUID;
$image = $res['detail']->previewPath;
}
else if ($res['page'] == 'account') {
$name = $res['owner']->displayName.'さんのチャンネル一覧';
$url = '/a/'.$res['owner']->name;
$image = ptAvatar($res['owner']);
}
else if ($res['page'] == 'channel') {
$name = $res['channel']->displayName.'さんのチャンネル';
$url = '/c/'.$res['channel']->name;
$image = ptAvatar($res['channel']);
}
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'] == 'overview') {
$name = 'ディスカバー';
$url = '/videos/'.$res['page'];
}
else if ($res['page'] == 'trending') {
$name = 'トレンド';
$url = '/videos/'.$res['page'];
}
else if ($res['page'] == 'recently-added') {
$name = '最近投稿された動画';
$url = '/videos/'.$res['page'];
}
else if ($res['page'] == 'local') $name = 'ローカル動画';
else if ($res['page'] == 'about') $name = 'このアプリについて';
else if ($res['page'] == 'notification') $name = '通知';
else if ($res['page'] == 'notification') {
$name = '通知';
$url = '/my-account/'.$res['page'].'s';
}
}
?>
<meta property="og:type" content="video" />
<meta property="og:site_name" content="076動画" />
<meta property="og:site_name" content="{{ $res['userinfo']['config']->instance->name }}" />
<meta property="og:title" content="{{ $name }}" />
<meta property="og:image" content="https://video.076.ne.jp/lazy-static/previews/8d97cbd1-50bb-4de3-9eb6-914027346996.jpg" />
<meta property="og:url" content="{{ env('APP_URL') }}/w/b8oKB37kqyCdt7gBtPWeWV" />
<meta property="og:image" content="{{ env('PEER_URI').$image }}" />
<meta property="og:url" content="{{ env('APP_URL').$url }}" />
<meta property="og:description" content="" />
<meta property="og:video:url" content="https://video.076.ne.jp/videos/embed/52039d41-8b56-4690-b6fa-25dedfedd5c5" />
<meta property="og:video:secure_url" content="https://video.076.ne.jp/videos/embed/52039d41-8b56-4690-b6fa-25dedfedd5c5" />
<meta property="og:video:type" content="text/html" />
<meta property="og:video:width" content="560" />
<meta property="og:video:height" content="315" />
@if ($res['page'] == 'watch')
<meta property="og:video:url" content="{{ env('PEER_URI') }}/videos/embed/{{ $res['detail']->uuid }}" />
<meta property="og:video:secure_url" content="{{ env('PEER_URI') }}/videos/embed/{{ $res['detail']->uuid }}" />
<meta property="og:video:type" content="text/html" />
<meta property="og:video:width" content="560" />
<meta property="og:video:height" content="315" />
@endif
<meta property="name" content="{{ $name }}" />
<meta property="description" content="" />
<meta property="image" content="https://video.076.ne.jp/lazy-static/previews/8d97cbd1-50bb-4de3-9eb6-914027346996.jpg" />
<meta property="image" content="{{ env('PEER_URI').$image }}" />
<meta property="twitter:card" content="summary_large_image" />
<meta property="twitter:site" content="@TechnicalSuwako" />
<meta property="twitter:title" content="{{ $name }}" />
<meta property="twitter:description" content="" />
<meta property="twitter:image" content="https://video.076.ne.jp/lazy-static/previews/8d97cbd1-50bb-4de3-9eb6-914027346996.jpg" />
<meta property="twitter:description" content="{{ $res['userinfo']['config']->instance->shortDescription }}" />
<meta property="twitter:image" content="{{ env('PEER_URI').$image }}" />

49
resources/views/layout/component/stylelink.blade.php
ファイルの表示

@ -5,21 +5,48 @@
if (isset($res['page'])) {
if ($res['page'] == 'watch') {
$name = $res['detail']->name;
$canonical .= '/videos/watch/'.$res['detail']->uuid;
$canonical .= '/w/'.$res['detail']->uuid;
}
else if ($res['page'] == 'account') {
$name = $res['owner']->displayName.'さんのチャンネル一覧';
$canonical .= '/a/'.$res['owner']->name;
}
else if ($res['page'] == 'channel') {
$name = $res['channel']->displayName.'さんのチャンネル';
$canonical .= '/c/'.$res['channel']->name;
}
else if ($res['page'] == 'home') {
$name = 'トップページ';
$canonical = '/home';
}
else if ($res['page'] == 'overview') {
$name = 'ディスカバー';
$canonical = '/videos/overview';
}
else if ($res['page'] == 'trending') {
$name = 'トレンド';
$canonical = '/videos/trending';
}
else if ($res['page'] == 'recently-added') {
$name = '最近投稿された動画';
$canonical = '/videos/recently-added';
}
else if ($res['page'] == 'local') {
$name = 'ローカル動画';
$canonical = '/local';
}
else if ($res['page'] == 'about') {
$name = 'このアプリについて';
$canonical = '/about';
}
else if ($res['page'] == 'notification') {
$name = '通知';
$canonical = '/my-account/notifications';
}
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 = 'このアプリについて';
else if ($res['page'] == 'notification') $name = '通知';
}
?>
<link rel="alternate" type="application/json+oembed" href="https://video.076.ne.jp/services/oembed?url=https%3A%2F%2Fvideo.076.ne.jp%2Fw%2Fb8oKB37kqyCdt7gBtPWeWV" title="{{ $name }}" />
<link rel="alternate" type="application/json+oembed" href="{{ env('PEER_URI') }}/services/oembed?url={{ urlencode(env('PEER_URI').$canonical) }}" title="{{ $name }}" />
<link rel="canonical" href="{{ $canonical }}" />
<link rel="stylesheet" href="/css/styles.css" />

2
resources/views/layout/component/w/info/comments.blade.php
ファイルの表示

@ -21,7 +21,7 @@
<form novalidate="" class="ng-untouched ng-pristine ng-invalid">
<div class="avatar-and-textarea">
<my-actor-avatar size="25">
<img class="account avatar avatar-25 ng-star-inserted" src="https://video.076.ne.jp/lazy-static/avatars/aa9883c7-d4d0-48c3-8e3a-72a9f2d96784.png" alt="アカウントのアバター">
<img class="account avatar avatar-25 ng-star-inserted" src="{{ env('PEER_URI') }}/lazy-static/avatars/aa9883c7-d4d0-48c3-8e3a-72a9f2d96784.png" alt="アカウントのアバター">
</my-actor-avatar>
<div class="form-group">
<textarea placeholder="コメントを入力..." myautoresize="" formcontrolname="text" rows="1" class="ng-untouched ng-pristine ng-invalid" style="overflow: hidden; height: 32px;"></textarea>

4
resources/views/layout/component/w/player.blade.php
ファイルの表示

@ -11,7 +11,7 @@
<video
playsinline="playsinline"
tabindex="-1"
poster="https://video.076.ne.jp{{ $res['detail']->previewPath }}"
poster="{{ env('PEER_URI') }}{{ $res['detail']->previewPath }}"
style="width: 100%; max-height: 720px;"
controls=""
>
@ -27,4 +27,4 @@
</video>
</div>
</div>
</div>
</div>

2
resources/views/layout/component/w/videorecommend.blade.php
ファイルの表示

@ -8,7 +8,7 @@
<div class="video-miniature">
<my-video-thumbnail>
<a class="video-thumbnail ng-star-inserted" href="/w/{{ $v->shortUUID }}">
<img alt="" aria-label="{{ $v->name }}" src="https://video.076.ne.jp{{ $v->thumbnailPath }}" class="ng-star-inserted">
<img alt="" aria-label="{{ $v->name }}" src="{{ env('PEER_URI') }}{{ $v->thumbnailPath }}" class="ng-star-inserted">
<div class="video-thumbnail-label-overlay warning ng-star-inserted"></div>
<div class="video-thumbnail-label-overlay danger ng-star-inserted"></div>
<div class="video-thumbnail-duration-overlay ng-star-inserted">{{ ptDuration($v->duration) }}</div>

2
resources/views/pages/peertube/about/instance.blade.php
ファイルの表示

@ -9,7 +9,7 @@
<div class="main-row">
<div class="row">
@include('layout.component.about.menu', ['active' => 'instance'])
@include('layout.component.about.about')
@include('layout.component.about.instance')
</div>
</div>
</div>