UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-11-19 13:01:26 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #4146 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2023-02-02 02:24:09 -07:00 committed by GitHub
commit 8207dbf457
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
7 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
CHANGELOG.md
View file

@ -91,6 +91,7 @@
- Update MentionPipeline, store non-local mentions ([17149230](https://github.com/pixelfed/pixelfed/commit/17149230)) - Update MentionPipeline, store non-local mentions ([17149230](https://github.com/pixelfed/pixelfed/commit/17149230))
- Update Like model, increase rate limit to 500 likes per day ([ab7676f9](https://github.com/pixelfed/pixelfed/commit/ab7676f9)) - Update Like model, increase rate limit to 500 likes per day ([ab7676f9](https://github.com/pixelfed/pixelfed/commit/ab7676f9))
- Update ComposeController, fix validation issue ([80e6a5a9](https://github.com/pixelfed/pixelfed/commit/80e6a5a9)) - Update ComposeController, fix validation issue ([80e6a5a9](https://github.com/pixelfed/pixelfed/commit/80e6a5a9))
- Update reply view, fix visibility filtering ([d419af4b](https://github.com/pixelfed/pixelfed/commit/d419af4b))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4) ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

BIN
public/js/compose.chunk.88ef87270cef7295.js vendored Normal file
View file

Binary file not shown.

BIN
public/js/compose.chunk.8cb53474a239060b.js vendored
View file

Binary file not shown.

BIN
public/js/compose.js vendored
View file

Binary file not shown.

BIN
public/js/manifest.js vendored
View file

Binary file not shown.

BIN
public/mix-manifest.json
View file

Binary file not shown.

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