Merge pull request #4147 from pixelfed/staging

Staging

CHANGELOG.md

@@ -92,6 +92,7 @@
 - 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))
+- Update AP helpers, ingest attachments in replies ([c504e643](https://github.com/pixelfed/pixelfed/commit/c504e643))
 -  ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)

app/Util/ActivityPub/Helpers.php

@@ -496,6 +496,9 @@ class Helpers {
 		if($reply_to == null) {
 			self::importNoteAttachment($activity, $status);
 		} else {
+			if(isset($activity['attachment']) && !empty($activity['attachment'])) {
+				self::importNoteAttachment($activity, $status);
+			}
 			StatusReplyPipeline::dispatch($status);
 		}
 

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:"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})();
+(()=>{"use strict";var e,r,t,n={},o={};function a(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,a),t.loaded=!0,t.exports}a.m=n,e=[],a.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],c=!0,i=0;i<t.length;i++)(!1&o||d>=o)&&Object.keys(a.O).every((e=>a.O[e](t[i])))?t.splice(i--,1):(c=!1,o<d&&(d=o));if(c){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]},a.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return a.d(r,{a:r}),r},a.d=(e,r)=>{for(var t in r)a.o(r,t)&&!a.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},a.f={},a.e=e=>Promise.all(Object.keys(a.f).reduce(((r,t)=>(a.f[t](e,r),r)),[])),a.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:"c5608f771be873ca",2521:"b4e0fef2bfd282de",2530:"8cbed746da3c3307",2586:"88ef87270cef7295",2732:"3396750e3f3e370d",3351:"9e385ba7c7242192",3365:"ffe36114c17441be",3623:"53fdd18a929791f0",4028:"2358054dc4c0a62b",4509:"1e765099c99b7409",4958:"3ef6d6fe45dbe91b",4965:"1cb17840dc8aea5f",5865:"02abe63d47f8d51e",6053:"e36cd010dbca7065",6869:"cdad3298b78ff083",7004:"37981267c6a91fdd",7019:"2f72cbbe9aa1b317",8021:"de2898072b8b7c67",8250:"233c3a2e6c08c397",8517:"fc282ba63a43593c",8600:"1346cd4a2aea418e",8625:"3d192304050edfc2",8900:"a24b7b8c20612b1b",9144:"dcf1fb170b2dae10"}[e]+".js",a.miniCssF=e=>({138:"css/spa",703:"css/admin",1242:"css/appdark",6170:"css/app",8737:"css/portfolio",9994:"css/landing"}[e]+".css"),a.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),a.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},t="pixelfed:",a.l=(e,n,o,d)=>{if(r[e])r[e].push(n);else{var c,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){c=f;break}}c||(i=!0,(c=document.createElement("script")).charset="utf-8",c.timeout=120,a.nc&&c.setAttribute("nonce",a.nc),c.setAttribute("data-webpack",t+o),c.src=e),r[e]=[n];var u=(t,n)=>{c.onerror=c.onload=null,clearTimeout(b);var o=r[e];if(delete r[e],c.parentNode&&c.parentNode.removeChild(c),o&&o.forEach((e=>e(n))),t)return t(n)},b=setTimeout(u.bind(null,void 0,{type:"timeout",target:c}),12e4);c.onerror=u.bind(null,c.onerror),c.onload=u.bind(null,c.onload),i&&document.head.appendChild(c)}},a.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),a.p="/",(()=>{var e={8929:0,1242:0,6170:0,8737:0,703:0,9994:0,138:0};a.f.j=(r,t)=>{var n=a.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=a.p+a.u(r),c=new Error;a.l(d,(t=>{if(a.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;c.message="Loading chunk "+r+" failed.\n("+o+": "+d+")",c.name="ChunkLoadError",c.type=o,c.request=d,n[1](c)}}),"chunk-"+r,r)}},a.O.j=r=>0===e[r];var r=(r,t)=>{var n,o,[d,c,i]=t,s=0;if(d.some((r=>0!==e[r]))){for(n in c)a.o(c,n)&&(a.m[n]=c[n]);if(i)var l=i(a)}for(r&&r(t);s<d.length;s++)o=d[s],a.o(e,o)&&e[o]&&e[o][0](),e[o]=0;return a.O(l)},t=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),a.nc=void 0})();

public/mix-manifest.json

@@ -25,17 +25,17 @@
     "/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=4512d2d15d6a0097aa017d34a6c1d125",
+    "/js/manifest.js": "/js/manifest.js?id=fb65230a6b98288b2503e19960072fbb",
-    "/js/home.chunk.8c3769fdc92892bd.js": "/js/home.chunk.8c3769fdc92892bd.js?id=06eaa0ca309e45110e1654b06e68fa3f",
+    "/js/home.chunk.c5608f771be873ca.js": "/js/home.chunk.c5608f771be873ca.js?id=ffa99546f3c102e48c619bc17ba4a2ea",
     "/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/post.chunk.02abe63d47f8d51e.js": "/js/post.chunk.02abe63d47f8d51e.js?id=18768a4c14e5c5988a7f56bc50e3ad81",
-    "/js/profile.chunk.eb0b0c1747789bd3.js": "/js/profile.chunk.eb0b0c1747789bd3.js?id=171349902db49c6ccf8da535a9a1f197",
+    "/js/profile.chunk.cdad3298b78ff083.js": "/js/profile.chunk.cdad3298b78ff083.js?id=0f808b5e71cbd1e70c67a12d4d85353c",
-    "/js/discover~memories.chunk.fe415377e8207e21.js": "/js/discover~memories.chunk.fe415377e8207e21.js?id=391ea56e17f9e93fb048f498182b6640",
+    "/js/discover~memories.chunk.1cb17840dc8aea5f.js": "/js/discover~memories.chunk.1cb17840dc8aea5f.js?id=96bdb1a740731edeb504c5bb06b56f89",
-    "/js/discover~myhashtags.chunk.618830aef5559bf1.js": "/js/discover~myhashtags.chunk.618830aef5559bf1.js?id=540bc69c52fd09aca7c36017b95b6f8c",
+    "/js/discover~myhashtags.chunk.8cbed746da3c3307.js": "/js/discover~myhashtags.chunk.8cbed746da3c3307.js?id=2603ffd819a746c616d981997b459cab",
-    "/js/daci.chunk.4e49bec856ffd88e.js": "/js/daci.chunk.4e49bec856ffd88e.js?id=9332034558efb2340f490435a51f72d9",
+    "/js/daci.chunk.fc282ba63a43593c.js": "/js/daci.chunk.fc282ba63a43593c.js?id=58f6648c4bded7ee0588c712c970e214",
-    "/js/discover~findfriends.chunk.cc989090c726b4b0.js": "/js/discover~findfriends.chunk.cc989090c726b4b0.js?id=e3f70267a07547b574de6be7a0250286",
+    "/js/discover~findfriends.chunk.53fdd18a929791f0.js": "/js/discover~findfriends.chunk.53fdd18a929791f0.js?id=e38eee0338a0068ec0e92d3b62feaed1",
-    "/js/discover~serverfeed.chunk.88749601266fb795.js": "/js/discover~serverfeed.chunk.88749601266fb795.js?id=08e73d590e0f4dfa7d01a25859c0f9be",
+    "/js/discover~serverfeed.chunk.a24b7b8c20612b1b.js": "/js/discover~serverfeed.chunk.a24b7b8c20612b1b.js?id=296835c4551a1acbb8320fd296047751",
-    "/js/discover~settings.chunk.4fbc8bb8149db211.js": "/js/discover~settings.chunk.4fbc8bb8149db211.js?id=d805197eb404ab9b218fb4fa1354a696",
+    "/js/discover~settings.chunk.9e385ba7c7242192.js": "/js/discover~settings.chunk.9e385ba7c7242192.js?id=467f69345d83ac1fa6330da9d57b69fa",
     "/js/discover.chunk.3ef6d6fe45dbe91b.js": "/js/discover.chunk.3ef6d6fe45dbe91b.js?id=2c834cf9e9b22a1183b456330f9d5a69",
     "/js/notifications.chunk.e36cd010dbca7065.js": "/js/notifications.chunk.e36cd010dbca7065.js?id=4b058bc04867e65daa3ca296a05f9797",
     "/js/dms.chunk.ffe36114c17441be.js": "/js/dms.chunk.ffe36114c17441be.js?id=f3ece9bef4000affa34229dbb7e85fb3",