Merge pull request #3284 from pixelfed/staging

Staging

public/js/manifest.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r,t,o={},n={};function s(e){var r=n[e];if(void 0!==r)return r.exports;var t=n[e]={id:e,loaded:!1,exports:{}};return o[e].call(t.exports,t,t.exports,s),t.loaded=!0,t.exports}s.m=o,e=[],s.O=(r,t,o,n)=>{if(!t){var a=1/0;for(l=0;l<e.length;l++){for(var[t,o,n]=e[l],i=!0,u=0;u<t.length;u++)(!1&n||a>=n)&&Object.keys(s.O).every((e=>s.O[e](t[u])))?t.splice(u--,1):(i=!1,n<a&&(a=n));if(i){e.splice(l--,1);var d=o();void 0!==d&&(r=d)}}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]=[t,o,n]},s.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return s.d(r,{a:r}),r},s.d=(e,r)=>{for(var t in r)s.o(r,t)&&!s.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},s.f={},s.e=e=>Promise.all(Object.keys(s.f).reduce(((r,t)=>(s.f[t](e,r),r)),[])),s.u=e=>221===e?"js/home-chunk-uopy3w.js":192===e?"js/compose-chunk-uopy3w.js":678===e?"js/post-chunk-uopy3w.js":53===e?"js/profile-chunk-uopy3w.js":374===e?"js/dmym-chunk-uopy3w.js":391===e?"js/dmyh-chunk-uopy3w.js":382===e?"js/daci-chunk-uopy3w.js":141===e?"js/dffc-chunk-uopy3w.js":68===e?"js/dsfc-chunk-uopy3w.js":539===e?"js/dssc-chunk-uopy3w.js":void 0,s.miniCssF=e=>({138:"css/spa",170:"css/app",242:"css/appdark",703:"css/admin",994:"css/landing"}[e]+".css"),s.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),s.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},t="pixelfed:",s.l=(e,o,n,a)=>{if(r[e])r[e].push(o);else{var i,u;if(void 0!==n)for(var d=document.getElementsByTagName("script"),l=0;l<d.length;l++){var c=d[l];if(c.getAttribute("src")==e||c.getAttribute("data-webpack")==t+n){i=c;break}}i||(u=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,s.nc&&i.setAttribute("nonce",s.nc),i.setAttribute("data-webpack",t+n),i.src=e),r[e]=[o];var p=(t,o)=>{i.onerror=i.onload=null,clearTimeout(f);var n=r[e];if(delete r[e],i.parentNode&&i.parentNode.removeChild(i),n&&n.forEach((e=>e(o))),t)return t(o)},f=setTimeout(p.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=p.bind(null,i.onerror),i.onload=p.bind(null,i.onload),u&&document.head.appendChild(i)}},s.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},s.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),s.p="/",(()=>{var e={929:0,242:0,170:0,138:0,703:0,994:0};s.f.j=(r,t)=>{var o=s.o(e,r)?e[r]:void 0;if(0!==o)if(o)t.push(o[2]);else if(/^(138|170|242|703|929|994)$/.test(r))e[r]=0;else{var n=new Promise(((t,n)=>o=e[r]=[t,n]));t.push(o[2]=n);var a=s.p+s.u(r),i=new Error;s.l(a,(t=>{if(s.o(e,r)&&(0!==(o=e[r])&&(e[r]=void 0),o)){var n=t&&("load"===t.type?"missing":t.type),a=t&&t.target&&t.target.src;i.message="Loading chunk "+r+" failed.\n("+n+": "+a+")",i.name="ChunkLoadError",i.type=n,i.request=a,o[1](i)}}),"chunk-"+r,r)}},s.O.j=r=>0===e[r];var r=(r,t)=>{var o,n,[a,i,u]=t,d=0;if(a.some((r=>0!==e[r]))){for(o in i)s.o(i,o)&&(s.m[o]=i[o]);if(u)var l=u(s)}for(r&&r(t);d<a.length;d++)n=a[d],s.o(e,n)&&e[n]&&e[n][0](),e[n]=0;return s.O(l)},t=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();
+(()=>{"use strict";var e,r,t,o={},n={};function s(e){var r=n[e];if(void 0!==r)return r.exports;var t=n[e]={id:e,loaded:!1,exports:{}};return o[e].call(t.exports,t,t.exports,s),t.loaded=!0,t.exports}s.m=o,e=[],s.O=(r,t,o,n)=>{if(!t){var a=1/0;for(l=0;l<e.length;l++){for(var[t,o,n]=e[l],i=!0,u=0;u<t.length;u++)(!1&n||a>=n)&&Object.keys(s.O).every((e=>s.O[e](t[u])))?t.splice(u--,1):(i=!1,n<a&&(a=n));if(i){e.splice(l--,1);var d=o();void 0!==d&&(r=d)}}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]=[t,o,n]},s.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return s.d(r,{a:r}),r},s.d=(e,r)=>{for(var t in r)s.o(r,t)&&!s.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},s.f={},s.e=e=>Promise.all(Object.keys(s.f).reduce(((r,t)=>(s.f[t](e,r),r)),[])),s.u=e=>68===e?"js/home-chunk-uopy3y.js":110===e?"js/compose-chunk-uopy3y.js":561===e?"js/post-chunk-uopy3y.js":224===e?"js/profile-chunk-uopy3y.js":187===e?"js/dmym-chunk-uopy3y.js":697===e?"js/dmyh-chunk-uopy3y.js":347===e?"js/daci-chunk-uopy3y.js":525===e?"js/dffc-chunk-uopy3y.js":975===e?"js/dsfc-chunk-uopy3y.js":112===e?"js/dssc-chunk-uopy3y.js":void 0,s.miniCssF=e=>({138:"css/spa",170:"css/app",242:"css/appdark",703:"css/admin",994:"css/landing"}[e]+".css"),s.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),s.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},t="pixelfed:",s.l=(e,o,n,a)=>{if(r[e])r[e].push(o);else{var i,u;if(void 0!==n)for(var d=document.getElementsByTagName("script"),l=0;l<d.length;l++){var c=d[l];if(c.getAttribute("src")==e||c.getAttribute("data-webpack")==t+n){i=c;break}}i||(u=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,s.nc&&i.setAttribute("nonce",s.nc),i.setAttribute("data-webpack",t+n),i.src=e),r[e]=[o];var p=(t,o)=>{i.onerror=i.onload=null,clearTimeout(f);var n=r[e];if(delete r[e],i.parentNode&&i.parentNode.removeChild(i),n&&n.forEach((e=>e(o))),t)return t(o)},f=setTimeout(p.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=p.bind(null,i.onerror),i.onload=p.bind(null,i.onload),u&&document.head.appendChild(i)}},s.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},s.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),s.p="/",(()=>{var e={929:0,242:0,170:0,138:0,703:0,994:0};s.f.j=(r,t)=>{var o=s.o(e,r)?e[r]:void 0;if(0!==o)if(o)t.push(o[2]);else if(/^(138|170|242|703|929|994)$/.test(r))e[r]=0;else{var n=new Promise(((t,n)=>o=e[r]=[t,n]));t.push(o[2]=n);var a=s.p+s.u(r),i=new Error;s.l(a,(t=>{if(s.o(e,r)&&(0!==(o=e[r])&&(e[r]=void 0),o)){var n=t&&("load"===t.type?"missing":t.type),a=t&&t.target&&t.target.src;i.message="Loading chunk "+r+" failed.\n("+n+": "+a+")",i.name="ChunkLoadError",i.type=n,i.request=a,o[1](i)}}),"chunk-"+r,r)}},s.O.j=r=>0===e[r];var r=(r,t)=>{var o,n,[a,i,u]=t,d=0;if(a.some((r=>0!==e[r]))){for(o in i)s.o(i,o)&&(s.m[o]=i[o]);if(u)var l=u(s)}for(r&&r(t);d<a.length;d++)n=a[d],s.o(e,n)&&e[n]&&e[n][0](),e[n]=0;return s.O(l)},t=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();

public/mix-manifest.json

@@ -4,9 +4,9 @@
     "/js/components.js": "/js/components.js?id=8bbdcdcd1c285672e99003f724284cd8",
     "/js/discover.js": "/js/discover.js?id=0c98508635d6adae9bf8f76c9f5c918c",
     "/js/profile.js": "/js/profile.js?id=53a27fe393608594c2b1dd77854d57db",
-    "/js/status.js": "/js/status.js?id=4d3f8907603bca529a10ce49cd5cfbc5",
+    "/js/status.js": "/js/status.js?id=119ed09b22f252559934e81a62c457e3",
     "/js/timeline.js": "/js/timeline.js?id=8d7aae4d042be737251be2bc68b23e57",
-    "/js/compose.js": "/js/compose.js?id=70c7dbaeb87bcc14c5be229090d1458f",
+    "/js/compose.js": "/js/compose.js?id=f408112a208d3a550f9ca578c228d78a",
     "/js/compose-classic.js": "/js/compose-classic.js?id=3a53d79b046932f24a1d89592c81a4b0",
     "/js/search.js": "/js/search.js?id=1ad4af345d2c8a14541a03937ea4904b",
     "/js/developers.js": "/js/developers.js?id=5789400f559a5329ce547f5eed0de929",
@@ -20,19 +20,19 @@
     "/js/admin.js": "/js/admin.js?id=84492883e1542f8438b48dcf187fc07b",
     "/js/rempro.js": "/js/rempro.js?id=7734f0f0f207cf6e147125f2f6a5700e",
     "/js/rempos.js": "/js/rempos.js?id=15124ae6f97d7c583d45d56c429fc7c3",
-    "/js/spa.js": "/js/spa.js?id=7ea047c7e6b91b4a1fdcaabcc785568d",
+    "/js/spa.js": "/js/spa.js?id=9e0c863c49bfb0f0ba2dcf96154979f6",
     "/js/stories.js": "/js/stories.js?id=048de600ee6dfccaeaf06070999cb892",
-    "/js/manifest.js": "/js/manifest.js?id=60a826abd2eab18dccd4cce8cc32d3e5",
-    "/js/home-chunk-uopy3w.js": "/js/home-chunk-uopy3w.js?id=5cb170f553a4f1b720922db0e7734884",
-    "/js/compose-chunk-uopy3w.js": "/js/compose-chunk-uopy3w.js?id=8b718d76fd61c2f2698f7d3e146b25ce",
-    "/js/post-chunk-uopy3w.js": "/js/post-chunk-uopy3w.js?id=ed195d5d84da8fb9b1894b5790ec78ac",
-    "/js/profile-chunk-uopy3w.js": "/js/profile-chunk-uopy3w.js?id=9c9846fcf050ded907c1dcde52ec1921",
-    "/js/dmym-chunk-uopy3w.js": "/js/dmym-chunk-uopy3w.js?id=32bed173e0e163cf912a9287f436960f",
-    "/js/dmyh-chunk-uopy3w.js": "/js/dmyh-chunk-uopy3w.js?id=b5dbfb2fd9adbeb12d4807aedc0b0e00",
-    "/js/daci-chunk-uopy3w.js": "/js/daci-chunk-uopy3w.js?id=142ab9c8ac3d11676083d0e206f56165",
-    "/js/dffc-chunk-uopy3w.js": "/js/dffc-chunk-uopy3w.js?id=dafc4c6b15755c1701c01c1b7777fb35",
-    "/js/dsfc-chunk-uopy3w.js": "/js/dsfc-chunk-uopy3w.js?id=70df90ddb07d4b1183f8dbb8392d184f",
-    "/js/dssc-chunk-uopy3w.js": "/js/dssc-chunk-uopy3w.js?id=fcb883adf5803ec409e8f6e2a0d4a8f5",
+    "/js/manifest.js": "/js/manifest.js?id=79958d7e2481d1955136ab428567da13",
+    "/js/home-chunk-uopy3y.js": "/js/home-chunk-uopy3y.js?id=af212887e7247133ef718f576e252724",
+    "/js/compose-chunk-uopy3y.js": "/js/compose-chunk-uopy3y.js?id=4ed2e810cf500ffcbcae3bd35bdd5fc8",
+    "/js/post-chunk-uopy3y.js": "/js/post-chunk-uopy3y.js?id=2d30c54d2ff4405990500d03bb58346e",
+    "/js/profile-chunk-uopy3y.js": "/js/profile-chunk-uopy3y.js?id=8104523cb63c2fd5bc8d1e999301f85d",
+    "/js/dmym-chunk-uopy3y.js": "/js/dmym-chunk-uopy3y.js?id=ef4de2a1f7e864b67e90a48542076c08",
+    "/js/dmyh-chunk-uopy3y.js": "/js/dmyh-chunk-uopy3y.js?id=deacad87bb60825f611f354e6075d436",
+    "/js/daci-chunk-uopy3y.js": "/js/daci-chunk-uopy3y.js?id=e7d7b76db0162818fd0c3f7f3e8679d3",
+    "/js/dffc-chunk-uopy3y.js": "/js/dffc-chunk-uopy3y.js?id=3e162f827734691cc751fb28df38712f",
+    "/js/dsfc-chunk-uopy3y.js": "/js/dsfc-chunk-uopy3y.js?id=c729fdf1502f7ec3c253f451dde43c9c",
+    "/js/dssc-chunk-uopy3y.js": "/js/dssc-chunk-uopy3y.js?id=751a754548880fd3fc182f4f1a2082c9",
     "/css/appdark.css": "/css/appdark.css?id=a661085d048e4e6b953ba58086d34007",
     "/css/app.css": "/css/app.css?id=ef378884d2b1cf81e12851d2aab5089a",
     "/css/spa.css": "/css/spa.css?id=c1320213cd53b5dbb38057e8054bb0db",

resources/assets/js/components/ComposeModal.vue

@@ -909,6 +909,7 @@ export default {
 			taggedPeopleSearch: null,
 			textMode: false,
 			tributeSettings: {
+				noMatchTemplate: function () { return null; },
 				collection: [
 					{
 						trigger: '@',