UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-09 16:24:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Update reply view, fix visibility filtering

Browse source
This commit is contained in:
Daniel Supernault 2023-02-02 02:21:13 -07:00
parent bc17ecdaac
commit d419af4b80
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 12 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
resources/views/status/reply.blade.php
View file

@ -5,10 +5,16 @@
<div class="container reply-container"> <div class="container reply-container">
<div class="col-12 col-md-8 offset-md-2 mt-4"> <div class="col-12 col-md-8 offset-md-2 mt-4">
<div class="card shadow-none border"> <div class="card shadow-none border">
@php($authed = request()->user())
@php($pid = $authed ? request()->user()->profile_id : null)
@php($gp = $status->parent()->parent()) @php($gp = $status->parent()->parent())
@if($gp) @if($gp)
<div class="card-body p-0 m-0 bg-light border-bottom"> <div class="card-body p-0 m-0 bg-light border-bottom">
@if($gp->scope == 'archived') @if(
!in_array($gp->scope, ['public', 'unlisted', 'private']) ||
($gp->scope == 'private' && !$authed) ||
($gp->scope == 'private' && ($gp->profile_id != $pid && \App\Services\FollowerService::follows($pid, $gp->profile_id) == false))
)
<p class="text-center mb-0 py-5 font-weight-bold">This status cannot be viewed at this time.</p> <p class="text-center mb-0 py-5 font-weight-bold">This status cannot be viewed at this time.</p>
@else @else
<div class="d-flex p-0 m-0 align-items-center"> <div class="d-flex p-0 m-0 align-items-center">
@ -41,8 +47,11 @@
@php($parent = $status->parent()) @php($parent = $status->parent())
<div class="card-body p-0 m-0 bg-light border-bottom"> <div class="card-body p-0 m-0 bg-light border-bottom">
@if(
@if($parent->scope == 'archived') !in_array($parent->scope, ['public', 'unlisted', 'private']) ||
($parent->scope == 'private' && !$authed) ||
($parent->scope == 'private' && ($parent->profile_id != $pid && \App\Services\FollowerService::follows($pid, $parent->profile_id) == false))
)
<p class="text-center mb-0 py-5 font-weight-bold">This status cannot be viewed at this time.</p> <p class="text-center mb-0 py-5 font-weight-bold">This status cannot be viewed at this time.</p>
@else @else
<div class="d-flex p-0 m-0 align-items-center"> <div class="d-flex p-0 m-0 align-items-center">