Merge pull request #4146 from pixelfed/staging

Staging

CHANGELOG.md

@@ -91,6 +91,7 @@
 - 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 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/))
 
 ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

public/js/manifest.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r,t,n={},o={};function c(e){var r=o[e];if(void 0!==r)return r.exports;var t=o[e]={id:e,loaded:!1,exports:{}};return n[e].call(t.exports,t,t.exports,c),t.loaded=!0,t.exports}c.m=n,e=[],c.O=(r,t,n,o)=>{if(!t){var d=1/0;for(l=0;l<e.length;l++){for(var[t,n,o]=e[l],a=!0,i=0;i<t.length;i++)(!1&o||d>=o)&&Object.keys(c.O).every((e=>c.O[e](t[i])))?t.splice(i--,1):(a=!1,o<d&&(d=o));if(a){e.splice(l--,1);var s=n();void 0!==s&&(r=s)}}return r}o=o||0;for(var l=e.length;l>0&&e[l-1][2]>o;l--)e[l]=e[l-1];e[l]=[t,n,o]},c.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return c.d(r,{a:r}),r},c.d=(e,r)=>{for(var t in r)c.o(r,t)&&!c.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},c.f={},c.e=e=>Promise.all(Object.keys(c.f).reduce(((r,t)=>(c.f[t](e,r),r)),[])),c.u=e=>"js/"+{1084:"profile~followers.bundle",1983:"kb.bundle",2470:"home.chunk",2521:"about.bundle",2530:"discover~myhashtags.chunk",2586:"compose.chunk",2732:"dms~message.chunk",3351:"discover~settings.chunk",3365:"dms.chunk",3623:"discover~findfriends.chunk",4028:"error404.bundle",4509:"static~privacy.bundle",4958:"discover.chunk",4965:"discover~memories.chunk",5865:"post.chunk",6053:"notifications.chunk",6869:"profile.chunk",7004:"help.bundle",7019:"discover~hashtag.bundle",8021:"contact.bundle",8250:"i18n.bundle",8517:"daci.chunk",8600:"changelog.bundle",8625:"profile~following.bundle",8900:"discover~serverfeed.chunk",9144:"static~tos.bundle"}[e]+"."+{1084:"d4dc19a65836f5ba",1983:"ffb0bccb31e767a2",2470:"8c3769fdc92892bd",2521:"b4e0fef2bfd282de",2530:"618830aef5559bf1",2586:"8cb53474a239060b",2732:"3396750e3f3e370d",3351:"4fbc8bb8149db211",3365:"ffe36114c17441be",3623:"cc989090c726b4b0",4028:"2358054dc4c0a62b",4509:"1e765099c99b7409",4958:"3ef6d6fe45dbe91b",4965:"fe415377e8207e21",5865:"a99f16eef68087b8",6053:"e36cd010dbca7065",6869:"eb0b0c1747789bd3",7004:"37981267c6a91fdd",7019:"2f72cbbe9aa1b317",8021:"de2898072b8b7c67",8250:"233c3a2e6c08c397",8517:"4e49bec856ffd88e",8600:"1346cd4a2aea418e",8625:"3d192304050edfc2",8900:"88749601266fb795",9144:"dcf1fb170b2dae10"}[e]+".js",c.miniCssF=e=>({138:"css/spa",703:"css/admin",1242:"css/appdark",6170:"css/app",8737:"css/portfolio",9994:"css/landing"}[e]+".css"),c.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),c.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},t="pixelfed:",c.l=(e,n,o,d)=>{if(r[e])r[e].push(n);else{var a,i;if(void 0!==o)for(var s=document.getElementsByTagName("script"),l=0;l<s.length;l++){var f=s[l];if(f.getAttribute("src")==e||f.getAttribute("data-webpack")==t+o){a=f;break}}a||(i=!0,(a=document.createElement("script")).charset="utf-8",a.timeout=120,c.nc&&a.setAttribute("nonce",c.nc),a.setAttribute("data-webpack",t+o),a.src=e),r[e]=[n];var u=(t,n)=>{a.onerror=a.onload=null,clearTimeout(b);var o=r[e];if(delete r[e],a.parentNode&&a.parentNode.removeChild(a),o&&o.forEach((e=>e(n))),t)return t(n)},b=setTimeout(u.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=u.bind(null,a.onerror),a.onload=u.bind(null,a.onload),i&&document.head.appendChild(a)}},c.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},c.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),c.p="/",(()=>{var e={8929:0,1242:0,6170:0,8737:0,703:0,9994:0,138:0};c.f.j=(r,t)=>{var n=c.o(e,r)?e[r]:void 0;if(0!==n)if(n)t.push(n[2]);else if(/^(1242|138|6170|703|8737|8929|9994)$/.test(r))e[r]=0;else{var o=new Promise(((t,o)=>n=e[r]=[t,o]));t.push(n[2]=o);var d=c.p+c.u(r),a=new Error;c.l(d,(t=>{if(c.o(e,r)&&(0!==(n=e[r])&&(e[r]=void 0),n)){var o=t&&("load"===t.type?"missing":t.type),d=t&&t.target&&t.target.src;a.message="Loading chunk "+r+" failed.\n("+o+": "+d+")",a.name="ChunkLoadError",a.type=o,a.request=d,n[1](a)}}),"chunk-"+r,r)}},c.O.j=r=>0===e[r];var r=(r,t)=>{var n,o,[d,a,i]=t,s=0;if(d.some((r=>0!==e[r]))){for(n in a)c.o(a,n)&&(c.m[n]=a[n]);if(i)var l=i(c)}for(r&&r(t);s<d.length;s++)o=d[s],c.o(e,o)&&e[o]&&e[o][0](),e[o]=0;return c.O(l)},t=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),c.nc=void 0})();
+(()=>{"use strict";var e,r,t,n={},o={};function c(e){var r=o[e];if(void 0!==r)return r.exports;var t=o[e]={id:e,loaded:!1,exports:{}};return n[e].call(t.exports,t,t.exports,c),t.loaded=!0,t.exports}c.m=n,e=[],c.O=(r,t,n,o)=>{if(!t){var d=1/0;for(l=0;l<e.length;l++){for(var[t,n,o]=e[l],a=!0,i=0;i<t.length;i++)(!1&o||d>=o)&&Object.keys(c.O).every((e=>c.O[e](t[i])))?t.splice(i--,1):(a=!1,o<d&&(d=o));if(a){e.splice(l--,1);var s=n();void 0!==s&&(r=s)}}return r}o=o||0;for(var l=e.length;l>0&&e[l-1][2]>o;l--)e[l]=e[l-1];e[l]=[t,n,o]},c.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return c.d(r,{a:r}),r},c.d=(e,r)=>{for(var t in r)c.o(r,t)&&!c.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},c.f={},c.e=e=>Promise.all(Object.keys(c.f).reduce(((r,t)=>(c.f[t](e,r),r)),[])),c.u=e=>"js/"+{1084:"profile~followers.bundle",1983:"kb.bundle",2470:"home.chunk",2521:"about.bundle",2530:"discover~myhashtags.chunk",2586:"compose.chunk",2732:"dms~message.chunk",3351:"discover~settings.chunk",3365:"dms.chunk",3623:"discover~findfriends.chunk",4028:"error404.bundle",4509:"static~privacy.bundle",4958:"discover.chunk",4965:"discover~memories.chunk",5865:"post.chunk",6053:"notifications.chunk",6869:"profile.chunk",7004:"help.bundle",7019:"discover~hashtag.bundle",8021:"contact.bundle",8250:"i18n.bundle",8517:"daci.chunk",8600:"changelog.bundle",8625:"profile~following.bundle",8900:"discover~serverfeed.chunk",9144:"static~tos.bundle"}[e]+"."+{1084:"d4dc19a65836f5ba",1983:"ffb0bccb31e767a2",2470:"8c3769fdc92892bd",2521:"b4e0fef2bfd282de",2530:"618830aef5559bf1",2586:"88ef87270cef7295",2732:"3396750e3f3e370d",3351:"4fbc8bb8149db211",3365:"ffe36114c17441be",3623:"cc989090c726b4b0",4028:"2358054dc4c0a62b",4509:"1e765099c99b7409",4958:"3ef6d6fe45dbe91b",4965:"fe415377e8207e21",5865:"a99f16eef68087b8",6053:"e36cd010dbca7065",6869:"eb0b0c1747789bd3",7004:"37981267c6a91fdd",7019:"2f72cbbe9aa1b317",8021:"de2898072b8b7c67",8250:"233c3a2e6c08c397",8517:"4e49bec856ffd88e",8600:"1346cd4a2aea418e",8625:"3d192304050edfc2",8900:"88749601266fb795",9144:"dcf1fb170b2dae10"}[e]+".js",c.miniCssF=e=>({138:"css/spa",703:"css/admin",1242:"css/appdark",6170:"css/app",8737:"css/portfolio",9994:"css/landing"}[e]+".css"),c.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),c.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},t="pixelfed:",c.l=(e,n,o,d)=>{if(r[e])r[e].push(n);else{var a,i;if(void 0!==o)for(var s=document.getElementsByTagName("script"),l=0;l<s.length;l++){var f=s[l];if(f.getAttribute("src")==e||f.getAttribute("data-webpack")==t+o){a=f;break}}a||(i=!0,(a=document.createElement("script")).charset="utf-8",a.timeout=120,c.nc&&a.setAttribute("nonce",c.nc),a.setAttribute("data-webpack",t+o),a.src=e),r[e]=[n];var u=(t,n)=>{a.onerror=a.onload=null,clearTimeout(b);var o=r[e];if(delete r[e],a.parentNode&&a.parentNode.removeChild(a),o&&o.forEach((e=>e(n))),t)return t(n)},b=setTimeout(u.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=u.bind(null,a.onerror),a.onload=u.bind(null,a.onload),i&&document.head.appendChild(a)}},c.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},c.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),c.p="/",(()=>{var e={8929:0,1242:0,6170:0,8737:0,703:0,9994:0,138:0};c.f.j=(r,t)=>{var n=c.o(e,r)?e[r]:void 0;if(0!==n)if(n)t.push(n[2]);else if(/^(1242|138|6170|703|8737|8929|9994)$/.test(r))e[r]=0;else{var o=new Promise(((t,o)=>n=e[r]=[t,o]));t.push(n[2]=o);var d=c.p+c.u(r),a=new Error;c.l(d,(t=>{if(c.o(e,r)&&(0!==(n=e[r])&&(e[r]=void 0),n)){var o=t&&("load"===t.type?"missing":t.type),d=t&&t.target&&t.target.src;a.message="Loading chunk "+r+" failed.\n("+o+": "+d+")",a.name="ChunkLoadError",a.type=o,a.request=d,n[1](a)}}),"chunk-"+r,r)}},c.O.j=r=>0===e[r];var r=(r,t)=>{var n,o,[d,a,i]=t,s=0;if(d.some((r=>0!==e[r]))){for(n in a)c.o(a,n)&&(c.m[n]=a[n]);if(i)var l=i(c)}for(r&&r(t);s<d.length;s++)o=d[s],c.o(e,o)&&e[o]&&e[o][0](),e[o]=0;return c.O(l)},t=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),c.nc=void 0})();

public/mix-manifest.json

@@ -6,7 +6,7 @@
     "/js/profile.js": "/js/profile.js?id=e31b4254f68233ffee9c05a4baaeff50",
     "/js/status.js": "/js/status.js?id=911159f4750d07cba6794fa180b64431",
     "/js/timeline.js": "/js/timeline.js?id=02c4e526090057ba0f3f0ce117c8d94d",
-    "/js/compose.js": "/js/compose.js?id=0d11677c5fcaba068e4cc642b1c9285a",
+    "/js/compose.js": "/js/compose.js?id=0b4fda60bcc85db7cad45d5c3b95042d",
     "/js/compose-classic.js": "/js/compose-classic.js?id=359aeeb12406e705f6afd9fb86d09acb",
     "/js/search.js": "/js/search.js?id=8e7ab35b3e9f4464d4a567c92802cba0",
     "/js/developers.js": "/js/developers.js?id=8a4578e14108dcd931944610c8f5e843",
@@ -25,9 +25,9 @@
     "/js/portfolio.js": "/js/portfolio.js?id=4fb6929e78830b1bb71410180b8b2772",
     "/js/installer.js": "/js/installer.js?id=1bee003053a612758cf75db8db61a71a",
     "/js/admin_invite.js": "/js/admin_invite.js?id=307a53250701e3b12164af9495e88447",
-    "/js/manifest.js": "/js/manifest.js?id=a2f75f4503224fa2affe5d9f40997f3b",
+    "/js/manifest.js": "/js/manifest.js?id=4512d2d15d6a0097aa017d34a6c1d125",
     "/js/home.chunk.8c3769fdc92892bd.js": "/js/home.chunk.8c3769fdc92892bd.js?id=06eaa0ca309e45110e1654b06e68fa3f",
-    "/js/compose.chunk.8cb53474a239060b.js": "/js/compose.chunk.8cb53474a239060b.js?id=a11769e519bc64db4d64bff9ba28177a",
+    "/js/compose.chunk.88ef87270cef7295.js": "/js/compose.chunk.88ef87270cef7295.js?id=6389b021170bc21b58fc5bc28920f9af",
     "/js/post.chunk.a99f16eef68087b8.js": "/js/post.chunk.a99f16eef68087b8.js?id=b19a55c3b27b569ad78cc5f431ca389e",
     "/js/profile.chunk.eb0b0c1747789bd3.js": "/js/profile.chunk.eb0b0c1747789bd3.js?id=171349902db49c6ccf8da535a9a1f197",
     "/js/discover~memories.chunk.fe415377e8207e21.js": "/js/discover~memories.chunk.fe415377e8207e21.js?id=391ea56e17f9e93fb048f498182b6640",

resources/views/status/reply.blade.php

@@ -5,10 +5,16 @@
 <div class="container reply-container">
   <div class="col-12 col-md-8 offset-md-2 mt-4">
       <div class="card shadow-none border">
+        @php($authed = request()->user())
+        @php($pid = $authed ? request()->user()->profile_id : null)
         @php($gp = $status->parent()->parent())
         @if($gp)
         <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>
         	@else
           <div class="d-flex p-0 m-0 align-items-center">
@@ -41,8 +47,11 @@
 
         @php($parent = $status->parent())
         <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>
         	@else
           <div class="d-flex p-0 m-0 align-items-center">