プッシー
このコミットが含まれているのは:
コミット
4a34eac644
|
@ -36,7 +36,7 @@ class Account extends Common {
|
||||||
return $this->ptapi_get('/api/v1/accounts/'.$id.'/video-channels?start=0&count=20&sort=-updatedAt&withStats=false');
|
return $this->ptapi_get('/api/v1/accounts/'.$id.'/video-channels?start=0&count=20&sort=-updatedAt&withStats=false');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getVideo ($id) {
|
function getVideo ($id) {
|
||||||
return $this->ptapi_get('/api/v1/video-channels/'.$id.'/videos?start=0&count=5&sort=-publishedAt&nsfw=both');
|
return $this->ptapi_get('/api/v1/video-channels/'.$id.'/videos?start=0&count=5&sort=-publishedAt&nsfw=both');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,7 +26,7 @@ class Watch extends Common {
|
||||||
return $this->ptapi_get('/api/v1/videos/'.$id);
|
return $this->ptapi_get('/api/v1/videos/'.$id);
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getRecommend ($tags) {
|
function getRecommend ($tags) {
|
||||||
$tag = '';
|
$tag = '';
|
||||||
foreach ($tags as $t) {
|
foreach ($tags as $t) {
|
||||||
$tag .= 'tagsOneOf='.urlencode($t).'&';
|
$tag .= 'tagsOneOf='.urlencode($t).'&';
|
||||||
|
@ -34,7 +34,7 @@ class Watch extends Common {
|
||||||
return $this->ptapi_get('/api/v1/search/videos?start=0&count=6&nsfw=both&'.$tag.'sort=-publishedAt&searchTarget=local');
|
return $this->ptapi_get('/api/v1/search/videos?start=0&count=6&nsfw=both&'.$tag.'sort=-publishedAt&searchTarget=local');
|
||||||
}
|
}
|
||||||
|
|
||||||
public function getComment ($id) {
|
function getComment ($id) {
|
||||||
return $this->ptapi_get('/api/v1/videos/'.$id.'/comment-threads');
|
return $this->ptapi_get('/api/v1/videos/'.$id.'/comment-threads');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -106,6 +106,7 @@ input {
|
||||||
min-width: var(--avatarSize);
|
min-width: var(--avatarSize);
|
||||||
min-height: var(--avatarSize);
|
min-height: var(--avatarSize);
|
||||||
}
|
}
|
||||||
|
|
||||||
.video-info-channel {
|
.video-info-channel {
|
||||||
font-weight: 600;
|
font-weight: 600;
|
||||||
font-size: 15px;
|
font-size: 15px;
|
||||||
|
@ -960,7 +961,6 @@ h2 {
|
||||||
.actor-handle { color: #dd00ee !important; }
|
.actor-handle { color: #dd00ee !important; }
|
||||||
.actor-counters { color: #bb00bb !important; }
|
.actor-counters { color: #bb00bb !important; }
|
||||||
.section-label { margin-bottom: 5px !important; }
|
.section-label { margin-bottom: 5px !important; }
|
||||||
.owner-description, .icon.icon-logo { display: none !important; }
|
|
||||||
.view-account short { margin-top: 0px !important; }
|
.view-account short { margin-top: 0px !important; }
|
||||||
|
|
||||||
.instance-name {
|
.instance-name {
|
||||||
|
@ -1349,10 +1349,7 @@ my-actor-avatar {
|
||||||
.initial.blue {
|
.initial.blue {
|
||||||
background-color: #009fd4;
|
background-color: #009fd4;
|
||||||
}
|
}
|
||||||
.avatar.account {
|
|
||||||
object-fit: cover;
|
|
||||||
border-radius: 50%;
|
|
||||||
}
|
|
||||||
.initial {
|
.initial {
|
||||||
background-color: #3c2109;
|
background-color: #3c2109;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
@ -1361,14 +1358,7 @@ my-actor-avatar {
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
font-size: var(--initialFontSize);
|
font-size: var(--initialFontSize);
|
||||||
}
|
}
|
||||||
.avatar {
|
|
||||||
--avatarSize: 100%;
|
|
||||||
--initialFontSize: 22px;
|
|
||||||
width: var(--avatarSize);
|
|
||||||
height: var(--avatarSize);
|
|
||||||
min-width: var(--avatarSize);
|
|
||||||
min-height: var(--avatarSize);
|
|
||||||
}
|
|
||||||
.initial {
|
.initial {
|
||||||
background-color: #3c2109;
|
background-color: #3c2109;
|
||||||
color: #fff;
|
color: #fff;
|
||||||
|
@ -1377,14 +1367,6 @@ my-actor-avatar {
|
||||||
justify-content: center;
|
justify-content: center;
|
||||||
font-size: var(--initialFontSize);
|
font-size: var(--initialFontSize);
|
||||||
}
|
}
|
||||||
.avatar {
|
|
||||||
--avatarSize: 100%;
|
|
||||||
--initialFontSize: 22px;
|
|
||||||
width: var(--avatarSize);
|
|
||||||
height: var(--avatarSize);
|
|
||||||
min-width: var(--avatarSize);
|
|
||||||
min-height: var(--avatarSize);
|
|
||||||
}
|
|
||||||
.root-comment .right {
|
.root-comment .right {
|
||||||
width: 100%;
|
width: 100%;
|
||||||
}
|
}
|
||||||
|
@ -1455,10 +1437,6 @@ p {
|
||||||
margin-top: 0;
|
margin-top: 0;
|
||||||
margin-bottom: 1rem;
|
margin-bottom: 1rem;
|
||||||
}
|
}
|
||||||
p {
|
|
||||||
margin-top: 0;
|
|
||||||
margin-bottom: 1rem;
|
|
||||||
}
|
|
||||||
.comment-actions {
|
.comment-actions {
|
||||||
margin-bottom: 10px;
|
margin-bottom: 10px;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
|
@ -2,10 +2,10 @@
|
||||||
<my-list-overflow>
|
<my-list-overflow>
|
||||||
<div class="d-flex align-items-center text-nowrap w-100 list-overflow-parent">
|
<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;">
|
<span id="pe_0" class="ng-star-inserted" style="visibility: inherit;">
|
||||||
<a routerlinkactive="active" class="title-page ng-star-inserted active" href="/a/world_order/video-channels">チャンネル</a>
|
<a routerlinkactive="active" 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>
|
||||||
</span>
|
</span>
|
||||||
<span id="pe_1" class="ng-star-inserted" style="visibility: inherit;">
|
<span id="pe_1" class="ng-star-inserted" style="visibility: inherit;">
|
||||||
<a routerlinkactive="active" class="title-page ng-star-inserted" href="/a/world_order/videos">動画</a>
|
<a routerlinkactive="active" class="title-page ng-star-inserted" href="/peertube/a/{{ $res['owner']->name }}{{ $res['owner']->host != 'video.076.ne.jp' ? '@'.$res['owner']->host : '' }}/videos">動画</a>
|
||||||
</span>
|
</span>
|
||||||
</div>
|
</div>
|
||||||
</my-list-overflow>
|
</my-list-overflow>
|
||||||
|
|
|
@ -35,7 +35,7 @@
|
||||||
@else
|
@else
|
||||||
@foreach ($res['comment']->data as $k => $v)
|
@foreach ($res['comment']->data as $k => $v)
|
||||||
@if (!$v->isDeleted)
|
@if (!$v->isDeleted)
|
||||||
<div myinfinitescroller="" class="comment-threads ng-star-inserted">
|
<div class="comment-threads ng-star-inserted">
|
||||||
<div>
|
<div>
|
||||||
<div id="highlighted-comment" class="anchor"></div>
|
<div id="highlighted-comment" class="anchor"></div>
|
||||||
<my-video-comment class="ng-star-inserted">
|
<my-video-comment class="ng-star-inserted">
|
||||||
|
@ -81,7 +81,7 @@
|
||||||
@endif
|
@endif
|
||||||
@endforeach
|
@endforeach
|
||||||
@endif
|
@endif
|
||||||
<div myinfinitescroller="" class="comment-threads ng-star-inserted">
|
<div class="comment-threads ng-star-inserted">
|
||||||
<div>
|
<div>
|
||||||
<div id="highlighted-comment" class="anchor"></div>
|
<div id="highlighted-comment" class="anchor"></div>
|
||||||
</div>
|
</div>
|
||||||
|
|
新しいイシューから参照