Merge pull request #4285 from pixelfed/staging

Staging

CHANGELOG.md

@@ -16,6 +16,9 @@
 - Update filesystems, store all files as public by default and add default permissions. Fixes #4273, #4275. Closes #3825 ([22da2647](https://github.com/pixelfed/pixelfed/commit/22da2647))
 - Update Profile model, fix avatar url path generation. Fixes #4041, Fixes #4031, Fixes #3523 ([28bf8649](https://github.com/pixelfed/pixelfed/commit/28bf8649))
 - Update filesystem config, change FILESYSTEM_DRIVER env variable to DANGEROUSLY_SET_FILESYSTEM_DRIVER and remove from default env configs. Changing the default filesystem should be avoided, use FILESYSTEM_CLOUD for s3 support, otherwise you can break things ([573c88d7](https://github.com/pixelfed/pixelfed/commit/573c88d7))
+- Update MediaS3GarbageCollector, fix handle ([2eee36cf](https://github.com/pixelfed/pixelfed/commit/2eee36cf))
+- Update StatusController, allow users to delete replies to posts ([738925c2](https://github.com/pixelfed/pixelfed/commit/738925c2))
+- Update admin autospam/report email templates, remove image previews ([76be49ac](https://github.com/pixelfed/pixelfed/commit/76be49ac))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.5 (2023-03-25)](https://github.com/pixelfed/pixelfed/compare/v0.11.4...v0.11.5)

app/Http/Controllers/StatusController.php

@@ -219,7 +219,17 @@ class StatusController extends Controller
 			$u->save();
 		}
 
-		if ($status->profile_id == $user->profile->id || $user->is_admin == true) {
+		if($status->in_reply_to_id) {
+			$parent = Status::find($status->in_reply_to_id);
+			if($parent && ($parent->profile_id == $user->profile_id) || ($status->profile_id == $user->profile_id) || $user->is_admin) {
+				Cache::forget('_api:statuses:recent_9:' . $status->profile_id);
+				Cache::forget('profile:status_count:' . $status->profile_id);
+				Cache::forget('profile:embed:' . $status->profile_id);
+				StatusService::del($status->id, true);
+				Cache::forget('profile:status_count:'.$status->profile_id);
+				StatusDelete::dispatch($status);
+			}
+		} else if ($status->profile_id == $user->profile_id || $user->is_admin == true) {
 			Cache::forget('_api:statuses:recent_9:' . $status->profile_id);
 			Cache::forget('profile:status_count:' . $status->profile_id);
 			Cache::forget('profile:embed:' . $status->profile_id);

public/js/manifest.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r,a,t={},n={};function d(e){var r=n[e];if(void 0!==r)return r.exports;var a=n[e]={id:e,loaded:!1,exports:{}};return t[e].call(a.exports,a,a.exports,d),a.loaded=!0,a.exports}d.m=t,e=[],d.O=(r,a,t,n)=>{if(!a){var o=1/0;for(l=0;l<e.length;l++){for(var[a,t,n]=e[l],c=!0,i=0;i<a.length;i++)(!1&n||o>=n)&&Object.keys(d.O).every((e=>d.O[e](a[i])))?a.splice(i--,1):(c=!1,n<o&&(o=n));if(c){e.splice(l--,1);var s=t();void 0!==s&&(r=s)}}return r}n=n||0;for(var l=e.length;l>0&&e[l-1][2]>n;l--)e[l]=e[l-1];e[l]=[a,t,n]},d.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return d.d(r,{a:r}),r},d.d=(e,r)=>{for(var a in r)d.o(r,a)&&!d.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:r[a]})},d.f={},d.e=e=>Promise.all(Object.keys(d.f).reduce(((r,a)=>(d.f[a](e,r),r)),[])),d.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:"fe353e697fb7660b",1983:"f6ebdaac1fd552ca",2470:"0cd2b4778c793399",2521:"44a18841089fdde3",2530:"e788db6a43d0d0a5",2586:"c413851da244ae3f",2732:"1cfdf19c4525eafa",3351:"c7fe4bae81961b13",3365:"91ab72a8dcd1a8a8",3623:"a740588ad1724793",4028:"5075813f1b00e10d",4509:"24c230550b6938b2",4958:"4f1b3ea93df06670",4965:"e7d0bff764b64064",5865:"c1d1dd0b53c97ee5",6053:"1a834e4a7bdbf21a",6869:"45a990056083f92b",7004:"7c1195b63e04d568",7019:"76807a8ff71bd205",8021:"d6c1d467c11796b1",8250:"9b9bf1b64e2aa1c1",8517:"afde7c4a5fcab6df",8600:"7f58a5ccc6659eb2",8625:"c406db7b14d07d36",8900:"cac5527f5b83302b",9144:"65caad6c0546d8c9"}[e]+".js",d.miniCssF=e=>({138:"css/spa",703:"css/admin",1242:"css/appdark",6170:"css/app",8737:"css/portfolio",9994:"css/landing"}[e]+".css"),d.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),d.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},a="pixelfed:",d.l=(e,t,n,o)=>{if(r[e])r[e].push(t);else{var c,i;if(void 0!==n)for(var s=document.getElementsByTagName("script"),l=0;l<s.length;l++){var u=s[l];if(u.getAttribute("src")==e||u.getAttribute("data-webpack")==a+n){c=u;break}}c||(i=!0,(c=document.createElement("script")).charset="utf-8",c.timeout=120,d.nc&&c.setAttribute("nonce",d.nc),c.setAttribute("data-webpack",a+n),c.src=e),r[e]=[t];var f=(a,t)=>{c.onerror=c.onload=null,clearTimeout(b);var n=r[e];if(delete r[e],c.parentNode&&c.parentNode.removeChild(c),n&&n.forEach((e=>e(t))),a)return a(t)},b=setTimeout(f.bind(null,void 0,{type:"timeout",target:c}),12e4);c.onerror=f.bind(null,c.onerror),c.onload=f.bind(null,c.onload),i&&document.head.appendChild(c)}},d.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},d.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),d.p="/",(()=>{var e={8929:0,1242:0,6170:0,8737:0,703:0,9994:0,138:0};d.f.j=(r,a)=>{var t=d.o(e,r)?e[r]:void 0;if(0!==t)if(t)a.push(t[2]);else if(/^(1242|138|6170|703|8737|8929|9994)$/.test(r))e[r]=0;else{var n=new Promise(((a,n)=>t=e[r]=[a,n]));a.push(t[2]=n);var o=d.p+d.u(r),c=new Error;d.l(o,(a=>{if(d.o(e,r)&&(0!==(t=e[r])&&(e[r]=void 0),t)){var n=a&&("load"===a.type?"missing":a.type),o=a&&a.target&&a.target.src;c.message="Loading chunk "+r+" failed.\n("+n+": "+o+")",c.name="ChunkLoadError",c.type=n,c.request=o,t[1](c)}}),"chunk-"+r,r)}},d.O.j=r=>0===e[r];var r=(r,a)=>{var t,n,[o,c,i]=a,s=0;if(o.some((r=>0!==e[r]))){for(t in c)d.o(c,t)&&(d.m[t]=c[t]);if(i)var l=i(d)}for(r&&r(a);s<o.length;s++)n=o[s],d.o(e,n)&&e[n]&&e[n][0](),e[n]=0;return d.O(l)},a=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];a.forEach(r.bind(null,0)),a.push=r.bind(null,a.push.bind(a))})(),d.nc=void 0})();
+(()=>{"use strict";var e,r,a,t={},n={};function o(e){var r=n[e];if(void 0!==r)return r.exports;var a=n[e]={id:e,loaded:!1,exports:{}};return t[e].call(a.exports,a,a.exports,o),a.loaded=!0,a.exports}o.m=t,e=[],o.O=(r,a,t,n)=>{if(!a){var d=1/0;for(l=0;l<e.length;l++){for(var[a,t,n]=e[l],c=!0,i=0;i<a.length;i++)(!1&n||d>=n)&&Object.keys(o.O).every((e=>o.O[e](a[i])))?a.splice(i--,1):(c=!1,n<d&&(d=n));if(c){e.splice(l--,1);var s=t();void 0!==s&&(r=s)}}return r}n=n||0;for(var l=e.length;l>0&&e[l-1][2]>n;l--)e[l]=e[l-1];e[l]=[a,t,n]},o.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return o.d(r,{a:r}),r},o.d=(e,r)=>{for(var a in r)o.o(r,a)&&!o.o(e,a)&&Object.defineProperty(e,a,{enumerable:!0,get:r[a]})},o.f={},o.e=e=>Promise.all(Object.keys(o.f).reduce(((r,a)=>(o.f[a](e,r),r)),[])),o.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:"fe353e697fb7660b",1983:"f6ebdaac1fd552ca",2470:"07ca9c4759ba59dd",2521:"44a18841089fdde3",2530:"089b7465b2359979",2586:"c413851da244ae3f",2732:"1cfdf19c4525eafa",3351:"5757ad3940569422",3365:"91ab72a8dcd1a8a8",3623:"1aabfedaab1849ba",4028:"5075813f1b00e10d",4509:"24c230550b6938b2",4958:"4f1b3ea93df06670",4965:"70b04c7698c2172b",5865:"881f8b0a9934e053",6053:"1a834e4a7bdbf21a",6869:"0f947cc09af5c8c3",7004:"7c1195b63e04d568",7019:"76807a8ff71bd205",8021:"d6c1d467c11796b1",8250:"9b9bf1b64e2aa1c1",8517:"3f13ec9fc49e9d2b",8600:"7f58a5ccc6659eb2",8625:"c406db7b14d07d36",8900:"ff59ca12d08bb810",9144:"65caad6c0546d8c9"}[e]+".js",o.miniCssF=e=>({138:"css/spa",703:"css/admin",1242:"css/appdark",6170:"css/app",8737:"css/portfolio",9994:"css/landing"}[e]+".css"),o.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),o.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},a="pixelfed:",o.l=(e,t,n,d)=>{if(r[e])r[e].push(t);else{var c,i;if(void 0!==n)for(var s=document.getElementsByTagName("script"),l=0;l<s.length;l++){var u=s[l];if(u.getAttribute("src")==e||u.getAttribute("data-webpack")==a+n){c=u;break}}c||(i=!0,(c=document.createElement("script")).charset="utf-8",c.timeout=120,o.nc&&c.setAttribute("nonce",o.nc),c.setAttribute("data-webpack",a+n),c.src=e),r[e]=[t];var f=(a,t)=>{c.onerror=c.onload=null,clearTimeout(b);var n=r[e];if(delete r[e],c.parentNode&&c.parentNode.removeChild(c),n&&n.forEach((e=>e(t))),a)return a(t)},b=setTimeout(f.bind(null,void 0,{type:"timeout",target:c}),12e4);c.onerror=f.bind(null,c.onerror),c.onload=f.bind(null,c.onload),i&&document.head.appendChild(c)}},o.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},o.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),o.p="/",(()=>{var e={8929:0,1242:0,6170:0,8737:0,703:0,9994:0,138:0};o.f.j=(r,a)=>{var t=o.o(e,r)?e[r]:void 0;if(0!==t)if(t)a.push(t[2]);else if(/^(1242|138|6170|703|8737|8929|9994)$/.test(r))e[r]=0;else{var n=new Promise(((a,n)=>t=e[r]=[a,n]));a.push(t[2]=n);var d=o.p+o.u(r),c=new Error;o.l(d,(a=>{if(o.o(e,r)&&(0!==(t=e[r])&&(e[r]=void 0),t)){var n=a&&("load"===a.type?"missing":a.type),d=a&&a.target&&a.target.src;c.message="Loading chunk "+r+" failed.\n("+n+": "+d+")",c.name="ChunkLoadError",c.type=n,c.request=d,t[1](c)}}),"chunk-"+r,r)}},o.O.j=r=>0===e[r];var r=(r,a)=>{var t,n,[d,c,i]=a,s=0;if(d.some((r=>0!==e[r]))){for(t in c)o.o(c,t)&&(o.m[t]=c[t]);if(i)var l=i(o)}for(r&&r(a);s<d.length;s++)n=d[s],o.o(e,n)&&e[n]&&e[n][0](),e[n]=0;return o.O(l)},a=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];a.forEach(r.bind(null,0)),a.push=r.bind(null,a.push.bind(a))})(),o.nc=void 0})();

public/mix-manifest.json

@@ -24,17 +24,17 @@
     "/js/installer.js": "/js/installer.js?id=cd240ae970947b76ac49032ba95e0922",
     "/js/admin_invite.js": "/js/admin_invite.js?id=307a53250701e3b12164af9495e88447",
     "/js/landing.js": "/js/landing.js?id=7e3ab65813c4bf28182f5bdf0825774c",
-    "/js/manifest.js": "/js/manifest.js?id=35e00317b1d7075dc2c556bbd08b86e4",
-    "/js/home.chunk.0cd2b4778c793399.js": "/js/home.chunk.0cd2b4778c793399.js?id=63d1868b688b0f3cdc2feadf9473e837",
+    "/js/manifest.js": "/js/manifest.js?id=3a3c9125fa8e8ae768f7a35892c3b3a9",
+    "/js/home.chunk.07ca9c4759ba59dd.js": "/js/home.chunk.07ca9c4759ba59dd.js?id=bf14f1fb09d02f87eaaae5773c246bc9",
     "/js/compose.chunk.c413851da244ae3f.js": "/js/compose.chunk.c413851da244ae3f.js?id=6389b021170bc21b58fc5bc28920f9af",
-    "/js/post.chunk.c1d1dd0b53c97ee5.js": "/js/post.chunk.c1d1dd0b53c97ee5.js?id=7ef8490a9547ec369c7c5b468da771d0",
-    "/js/profile.chunk.45a990056083f92b.js": "/js/profile.chunk.45a990056083f92b.js?id=98796453d2016cb8704c5885f4572c95",
-    "/js/discover~memories.chunk.e7d0bff764b64064.js": "/js/discover~memories.chunk.e7d0bff764b64064.js?id=069ec21e0c9316de51707bb570eeb8bb",
-    "/js/discover~myhashtags.chunk.e788db6a43d0d0a5.js": "/js/discover~myhashtags.chunk.e788db6a43d0d0a5.js?id=1bebedd3778a9d58c0b02cce1cd1e979",
-    "/js/daci.chunk.afde7c4a5fcab6df.js": "/js/daci.chunk.afde7c4a5fcab6df.js?id=75d1d1b1f941ab4e1d4f47a0adaa112c",
-    "/js/discover~findfriends.chunk.a740588ad1724793.js": "/js/discover~findfriends.chunk.a740588ad1724793.js?id=c686767352cdb7dac82f86654f13df71",
-    "/js/discover~serverfeed.chunk.cac5527f5b83302b.js": "/js/discover~serverfeed.chunk.cac5527f5b83302b.js?id=8c65cb4477666294a15cb6cac899c0ea",
-    "/js/discover~settings.chunk.c7fe4bae81961b13.js": "/js/discover~settings.chunk.c7fe4bae81961b13.js?id=247d9f0e915aa75ba81888f954c0a4a4",
+    "/js/post.chunk.881f8b0a9934e053.js": "/js/post.chunk.881f8b0a9934e053.js?id=89108b6e10ed316dc2d17ae28ea61262",
+    "/js/profile.chunk.0f947cc09af5c8c3.js": "/js/profile.chunk.0f947cc09af5c8c3.js?id=fbf3060fadbca5da7c77b174dca58782",
+    "/js/discover~memories.chunk.70b04c7698c2172b.js": "/js/discover~memories.chunk.70b04c7698c2172b.js?id=437858b8ee0fce1fcaf4625b1ab669ba",
+    "/js/discover~myhashtags.chunk.089b7465b2359979.js": "/js/discover~myhashtags.chunk.089b7465b2359979.js?id=daac449d68cd3030296937e709d6d5ab",
+    "/js/daci.chunk.3f13ec9fc49e9d2b.js": "/js/daci.chunk.3f13ec9fc49e9d2b.js?id=e2cc591b5eec1bf8b825e6247595006b",
+    "/js/discover~findfriends.chunk.1aabfedaab1849ba.js": "/js/discover~findfriends.chunk.1aabfedaab1849ba.js?id=1801453e5066687ec8f7a20832b77982",
+    "/js/discover~serverfeed.chunk.ff59ca12d08bb810.js": "/js/discover~serverfeed.chunk.ff59ca12d08bb810.js?id=ceb384971dccbc3891fee0a33fdf977b",
+    "/js/discover~settings.chunk.5757ad3940569422.js": "/js/discover~settings.chunk.5757ad3940569422.js?id=4d083efb280d6934177f7b007feded3a",
     "/js/discover.chunk.4f1b3ea93df06670.js": "/js/discover.chunk.4f1b3ea93df06670.js?id=6dcffad6c504442e374de397cc711eb6",
     "/js/notifications.chunk.1a834e4a7bdbf21a.js": "/js/notifications.chunk.1a834e4a7bdbf21a.js?id=9137fe578cf3544cd3f4f30d5a8538ee",
     "/js/dms.chunk.91ab72a8dcd1a8a8.js": "/js/dms.chunk.91ab72a8dcd1a8a8.js?id=752e3b061c1e76baa73b5d38657bf93e",
@@ -55,7 +55,7 @@
     "/css/app.css": "/css/app.css?id=88a0a931d5b0e24b0d9355f548414768",
     "/css/portfolio.css": "/css/portfolio.css?id=d98e354f173c6a8b729626384dceaa90",
     "/css/admin.css": "/css/admin.css?id=619b6c6613a24e232048856e72110862",
-    "/css/landing.css": "/css/landing.css?id=8155e7353dcd7e899d0f9818681f12b9",
+    "/css/landing.css": "/css/landing.css?id=b3df014b08177b3e7a4eae8fbe132708",
     "/css/spa.css": "/css/spa.css?id=602c4f74ce800b7bf45a8d8a4d8cb6e5",
     "/js/vendor.js": "/js/vendor.js?id=985cea6d09ed0f4c43ee3646a991ac84"
 }

resources/assets/sass/landing.scss

@@ -30,7 +30,13 @@ body {
 
 		span {
 			font-weight: bold;
-			font-size: 24px;
+			font-size: 14px;
+			display: none;
+
+			@include media-breakpoint-up(sm) {
+				display: block;
+				font-size: 18px;
+			}
 		}
 	}
 

resources/views/emails/admin/new_autospam.blade.php

@@ -13,20 +13,6 @@ Review Autospam Report
 <x-mail::panel>
 <p style="font-size: 13px; color: #cccccc; text-align: center; font-weight: bold;margin-bottom: 10px;">Reported Status</p>
 <div style="display: flex; align-items: center;gap: 10px;">
-@if(
-	isset($reported_status['media_attachments']) &&
-	isset($reported_status['pf_type']) &&
-	count($reported_status['media_attachments']) &&
-	in_array($reported_status['pf_type'], ['photo', 'photo:album'])
-)
-<img
-	src="{{$reported_status['media_attachments'][0]['url']}}"
-	width="100"
-	height="100"
-	alt="Media preview"
-	style="object-fit: cover; border: 1px solid #cccccc; border-radius: 10px; margin-bottom: 10px;"
-	onerror="this.src='{{url('/storage/no-preview.png')}}';this.onerror=null;" />
-@endif
 @if(isset($reported_status['content']))
 <div style="font-size: 12px !important;">{{ strip_tags(str_replace(["\n", "\r", "\r\n"], ' ', $reported_status['content'])) }}</div>
 @endif

resources/views/emails/admin/new_report.blade.php

@@ -11,20 +11,6 @@ View Report
 <x-mail::panel>
 <p style="font-size: 13px; color: #cccccc; text-align: center; font-weight: bold;margin-bottom: 10px;">Reported Status</p>
 <div style="display: flex; align-items: center;gap: 10px;">
-@if(
-	isset($reported_status['media_attachments']) &&
-	isset($reported_status['pf_type']) &&
-	count($reported_status['media_attachments']) &&
-	in_array($reported_status['pf_type'], ['photo', 'photo:album'])
-)
-<img
-	src="{{$reported_status['media_attachments'][0]['url']}}"
-	width="100"
-	height="100"
-	alt="Media preview"
-	style="object-fit: cover; border: 1px solid #cccccc; border-radius: 10px; margin-bottom: 10px;"
-	onerror="this.src='{{url('/storage/no-preview.png')}}';this.onerror=null;" />
-@endif
 @if(isset($reported_status['content']))
 <div style="font-size: 12px !important;">{{ strip_tags(str_replace(["\n", "\r", "\r\n"], ' ', $reported_status['content'])) }}</div>
 @endif