Merge pull request #4051 from pixelfed/staging

Staging

app/Util/Media/Filter.php

@@ -28,7 +28,7 @@ class Filter {
 		'Chill' => 'filter-lofi',
 		'Van' => 'filter-ludwig',
 		'Apache' => 'filter-maven',
-		'Mayflower' => 'filter-mayfair',
+		'May' => 'filter-mayfair',
 		'Ceres' => 'filter-moon',
 		'Knoxville' => 'filter-nashville',
 		'Felicity' => 'filter-perpetua',

public/js/manifest.js

@@ -1 +1 @@
-(()=>{"use strict";var e,r,t,s={},o={};function n(e){var r=o[e];if(void 0!==r)return r.exports;var t=o[e]={id:e,loaded:!1,exports:{}};return s[e].call(t.exports,t,t.exports,n),t.loaded=!0,t.exports}n.m=s,e=[],n.O=(r,t,s,o)=>{if(!t){var i=1/0;for(c=0;c<e.length;c++){for(var[t,s,o]=e[c],l=!0,a=0;a<t.length;a++)(!1&o||i>=o)&&Object.keys(n.O).every((e=>n.O[e](t[a])))?t.splice(a--,1):(l=!1,o<i&&(i=o));if(l){e.splice(c--,1);var d=s();void 0!==d&&(r=d)}}return r}o=o||0;for(var c=e.length;c>0&&e[c-1][2]>o;c--)e[c]=e[c-1];e[c]=[t,s,o]},n.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return n.d(r,{a:r}),r},n.d=(e,r)=>{for(var t in r)n.o(r,t)&&!n.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},n.f={},n.e=e=>Promise.all(Object.keys(n.f).reduce(((r,t)=>(n.f[t](e,r),r)),[])),n.u=e=>919===e?"js/home-12722-3lkw2.js":650===e?"js/compose-12722-3lkw2.js":335===e?"js/post-12722-3lkw2.js":387===e?"js/profile-12722-3lkw2.js":800===e?"js/dmym-12722-3lkw2.js":246===e?"js/dmyh-12722-3lkw2.js":183===e?"js/daci-12722-3lkw2.js":788===e?"js/dffc-12722-3lkw2.js":785===e?"js/dsfc-12722-3lkw2.js":340===e?"js/dssc-12722-3lkw2.js":265===e?"js/discover-12722-3lkw2.js":50===e?"js/notifications-12722-3lkw2.js":29===e?"js/dms-12722-3lkw2.js":286===e?"js/dmsg-12722-3lkw2.js":void 0,n.miniCssF=e=>({138:"css/spa",170:"css/app",242:"css/appdark",703:"css/admin",737:"css/portfolio",994:"css/landing"}[e]+".css"),n.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),n.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},t="pixelfed:",n.l=(e,s,o,i)=>{if(r[e])r[e].push(s);else{var l,a;if(void 0!==o)for(var d=document.getElementsByTagName("script"),c=0;c<d.length;c++){var u=d[c];if(u.getAttribute("src")==e||u.getAttribute("data-webpack")==t+o){l=u;break}}l||(a=!0,(l=document.createElement("script")).charset="utf-8",l.timeout=120,n.nc&&l.setAttribute("nonce",n.nc),l.setAttribute("data-webpack",t+o),l.src=e),r[e]=[s];var f=(t,s)=>{l.onerror=l.onload=null,clearTimeout(p);var o=r[e];if(delete r[e],l.parentNode&&l.parentNode.removeChild(l),o&&o.forEach((e=>e(s))),t)return t(s)},p=setTimeout(f.bind(null,void 0,{type:"timeout",target:l}),12e4);l.onerror=f.bind(null,l.onerror),l.onload=f.bind(null,l.onload),a&&document.head.appendChild(l)}},n.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},n.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),n.p="/",(()=>{var e={929:0,242:0,170:0,737:0,703:0,994:0,138:0};n.f.j=(r,t)=>{var s=n.o(e,r)?e[r]:void 0;if(0!==s)if(s)t.push(s[2]);else if(/^(138|170|242|703|737|929|994)$/.test(r))e[r]=0;else{var o=new Promise(((t,o)=>s=e[r]=[t,o]));t.push(s[2]=o);var i=n.p+n.u(r),l=new Error;n.l(i,(t=>{if(n.o(e,r)&&(0!==(s=e[r])&&(e[r]=void 0),s)){var o=t&&("load"===t.type?"missing":t.type),i=t&&t.target&&t.target.src;l.message="Loading chunk "+r+" failed.\n("+o+": "+i+")",l.name="ChunkLoadError",l.type=o,l.request=i,s[1](l)}}),"chunk-"+r,r)}},n.O.j=r=>0===e[r];var r=(r,t)=>{var s,o,[i,l,a]=t,d=0;if(i.some((r=>0!==e[r]))){for(s in l)n.o(l,s)&&(n.m[s]=l[s]);if(a)var c=a(n)}for(r&&r(t);d<i.length;d++)o=i[d],n.o(e,o)&&e[o]&&e[o][0](),e[o]=0;return n.O(c)},t=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})(),n.nc=void 0})();
+(()=>{"use strict";var e,r,s,t={},o={};function i(e){var r=o[e];if(void 0!==r)return r.exports;var s=o[e]={id:e,loaded:!1,exports:{}};return t[e].call(s.exports,s,s.exports,i),s.loaded=!0,s.exports}i.m=t,e=[],i.O=(r,s,t,o)=>{if(!s){var n=1/0;for(c=0;c<e.length;c++){for(var[s,t,o]=e[c],a=!0,d=0;d<s.length;d++)(!1&o||n>=o)&&Object.keys(i.O).every((e=>i.O[e](s[d])))?s.splice(d--,1):(a=!1,o<n&&(n=o));if(a){e.splice(c--,1);var l=t();void 0!==l&&(r=l)}}return r}o=o||0;for(var c=e.length;c>0&&e[c-1][2]>o;c--)e[c]=e[c-1];e[c]=[s,t,o]},i.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return i.d(r,{a:r}),r},i.d=(e,r)=>{for(var s in r)i.o(r,s)&&!i.o(e,s)&&Object.defineProperty(e,s,{enumerable:!0,get:r[s]})},i.f={},i.e=e=>Promise.all(Object.keys(i.f).reduce(((r,s)=>(i.f[s](e,r),r)),[])),i.u=e=>979===e?"js/home-123122-swxib.js":407===e?"js/compose-123122-swxib.js":570===e?"js/post-123122-swxib.js":777===e?"js/profile-123122-swxib.js":346===e?"js/dmym-123122-swxib.js":719===e?"js/dmyh-123122-swxib.js":206===e?"js/daci-123122-swxib.js":667===e?"js/dffc-123122-swxib.js":190===e?"js/dsfc-123122-swxib.js":258===e?"js/dssc-123122-swxib.js":503===e?"js/discover-123122-swxib.js":921===e?"js/notifications-123122-swxib.js":25===e?"js/dms-123122-swxib.js":999===e?"js/dmsg-123122-swxib.js":void 0,i.miniCssF=e=>({138:"css/spa",170:"css/app",242:"css/appdark",703:"css/admin",737:"css/portfolio",994:"css/landing"}[e]+".css"),i.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),i.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},s="pixelfed:",i.l=(e,t,o,n)=>{if(r[e])r[e].push(t);else{var a,d;if(void 0!==o)for(var l=document.getElementsByTagName("script"),c=0;c<l.length;c++){var u=l[c];if(u.getAttribute("src")==e||u.getAttribute("data-webpack")==s+o){a=u;break}}a||(d=!0,(a=document.createElement("script")).charset="utf-8",a.timeout=120,i.nc&&a.setAttribute("nonce",i.nc),a.setAttribute("data-webpack",s+o),a.src=e),r[e]=[t];var f=(s,t)=>{a.onerror=a.onload=null,clearTimeout(p);var o=r[e];if(delete r[e],a.parentNode&&a.parentNode.removeChild(a),o&&o.forEach((e=>e(t))),s)return s(t)},p=setTimeout(f.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=f.bind(null,a.onerror),a.onload=f.bind(null,a.onload),d&&document.head.appendChild(a)}},i.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},i.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),i.p="/",(()=>{var e={929:0,242:0,170:0,737:0,703:0,994:0,138:0};i.f.j=(r,s)=>{var t=i.o(e,r)?e[r]:void 0;if(0!==t)if(t)s.push(t[2]);else if(/^(138|170|242|703|737|929|994)$/.test(r))e[r]=0;else{var o=new Promise(((s,o)=>t=e[r]=[s,o]));s.push(t[2]=o);var n=i.p+i.u(r),a=new Error;i.l(n,(s=>{if(i.o(e,r)&&(0!==(t=e[r])&&(e[r]=void 0),t)){var o=s&&("load"===s.type?"missing":s.type),n=s&&s.target&&s.target.src;a.message="Loading chunk "+r+" failed.\n("+o+": "+n+")",a.name="ChunkLoadError",a.type=o,a.request=n,t[1](a)}}),"chunk-"+r,r)}},i.O.j=r=>0===e[r];var r=(r,s)=>{var t,o,[n,a,d]=s,l=0;if(n.some((r=>0!==e[r]))){for(t in a)i.o(a,t)&&(i.m[t]=a[t]);if(d)var c=d(i)}for(r&&r(s);l<n.length;l++)o=n[l],i.o(e,o)&&e[o]&&e[o][0](),e[o]=0;return i.O(c)},s=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];s.forEach(r.bind(null,0)),s.push=r.bind(null,s.push.bind(s))})(),i.nc=void 0})();

public/mix-manifest.json

@@ -1,5 +1,5 @@
 {
-    "/js/app.js": "/js/app.js?id=798e772a73ded1feca5c0d44e8bf54a5",
+    "/js/app.js": "/js/app.js?id=152e4054060b2da1f7ad23322b80db03",
     "/js/activity.js": "/js/activity.js?id=acb021db99fe5a8c96c242b40e07c525",
     "/js/components.js": "/js/components.js?id=e647876e2aaacdd84e7804c3f0a30460",
     "/js/discover.js": "/js/discover.js?id=2aa95492789dc0605089dd44536f459a",
@@ -20,26 +20,26 @@
     "/js/rempro.js": "/js/rempro.js?id=61bb49ccfe70d28ed788750f9c6279b2",
     "/js/rempos.js": "/js/rempos.js?id=da10eddc2edd1d3a29d8ffcd75d239dc",
     "/js/live-player.js": "/js/live-player.js?id=674d2b72d4cf417d9d7a3953c55f37ca",
-    "/js/spa.js": "/js/spa.js?id=0a6c9162a781f5221d8585acf05666f6",
+    "/js/spa.js": "/js/spa.js?id=6c0377c8303b0cff8bffc4bdbfb7fae9",
     "/js/stories.js": "/js/stories.js?id=f3e34fad9d349ebf10155b3c2ecde729",
     "/js/portfolio.js": "/js/portfolio.js?id=11e6d0deeefcf4798782e141d82b07b8",
     "/js/installer.js": "/js/installer.js?id=e81d5e440c9217c7468d57d4e68694ab",
     "/js/admin_invite.js": "/js/admin_invite.js?id=6c5fe1ec07b4fc9cd4deaf353bb4abb7",
-    "/js/manifest.js": "/js/manifest.js?id=67776134d40f10fcf6f3dfacf8dbd559",
-    "/js/home-12722-3lkw2.js": "/js/home-12722-3lkw2.js?id=c32a7b0165abc89c8074d4fe3823f2a1",
-    "/js/compose-12722-3lkw2.js": "/js/compose-12722-3lkw2.js?id=ea3b22fd020fa63d53183fad7784caac",
-    "/js/post-12722-3lkw2.js": "/js/post-12722-3lkw2.js?id=6c28334c2ee641f0dfc80cfc5a401266",
-    "/js/profile-12722-3lkw2.js": "/js/profile-12722-3lkw2.js?id=7d790c3916f8357160b0cc0836441c8d",
-    "/js/dmym-12722-3lkw2.js": "/js/dmym-12722-3lkw2.js?id=6b96cb1c56fc37fde27ae51d859893e8",
-    "/js/dmyh-12722-3lkw2.js": "/js/dmyh-12722-3lkw2.js?id=4387b3402007963702b5fd6578864292",
-    "/js/daci-12722-3lkw2.js": "/js/daci-12722-3lkw2.js?id=66e0d27c17d77a50a7b669f068b7d539",
-    "/js/dffc-12722-3lkw2.js": "/js/dffc-12722-3lkw2.js?id=1ca1c9340eacab3f5b6e4cda8456377c",
-    "/js/dsfc-12722-3lkw2.js": "/js/dsfc-12722-3lkw2.js?id=bcaafe2b4e95dd049ac774ef408ad4ae",
-    "/js/dssc-12722-3lkw2.js": "/js/dssc-12722-3lkw2.js?id=b42546ce8c8210f5f87933b527e04be4",
-    "/js/discover-12722-3lkw2.js": "/js/discover-12722-3lkw2.js?id=09ef9f03977dbcae1dddc7b897d84c01",
-    "/js/notifications-12722-3lkw2.js": "/js/notifications-12722-3lkw2.js?id=af9364ea7905b79934b30048abfc2b4d",
-    "/js/dms-12722-3lkw2.js": "/js/dms-12722-3lkw2.js?id=139eff7f4eb0192f952d469d67a1c6c5",
-    "/js/dmsg-12722-3lkw2.js": "/js/dmsg-12722-3lkw2.js?id=34425ec09a4fd168f8168c391ad5a79c",
+    "/js/manifest.js": "/js/manifest.js?id=f180cb23c95ca83fe62d8fa36fe84f46",
+    "/js/home-123122-swxib.js": "/js/home-123122-swxib.js?id=ffa9c27f1e81f3a185641d28b50eed3b",
+    "/js/compose-123122-swxib.js": "/js/compose-123122-swxib.js?id=fd050889df5e7d1455ca8a44e514a0c0",
+    "/js/post-123122-swxib.js": "/js/post-123122-swxib.js?id=0d896ee3dbd95a7324fc10305752c140",
+    "/js/profile-123122-swxib.js": "/js/profile-123122-swxib.js?id=42611b82bf42fd32a147d6a3bb18300a",
+    "/js/dmym-123122-swxib.js": "/js/dmym-123122-swxib.js?id=fddd4054db349b4650937ec4a75ff005",
+    "/js/dmyh-123122-swxib.js": "/js/dmyh-123122-swxib.js?id=77b0f8f68b8d88c241c8136cb5c0ff96",
+    "/js/daci-123122-swxib.js": "/js/daci-123122-swxib.js?id=a7d4627d3d0fb77d5a5c747dfa17fd05",
+    "/js/dffc-123122-swxib.js": "/js/dffc-123122-swxib.js?id=53dbf0ad6a8558b8b79262e917cb659c",
+    "/js/dsfc-123122-swxib.js": "/js/dsfc-123122-swxib.js?id=12837001d17d17c740d8e202666b63fb",
+    "/js/dssc-123122-swxib.js": "/js/dssc-123122-swxib.js?id=6112214a6e956c0e1890dbc508527017",
+    "/js/discover-123122-swxib.js": "/js/discover-123122-swxib.js?id=9901f8d26d5daebd92809c38f6801784",
+    "/js/notifications-123122-swxib.js": "/js/notifications-123122-swxib.js?id=a708e130fc02f4394a3bd737663bf2b4",
+    "/js/dms-123122-swxib.js": "/js/dms-123122-swxib.js?id=eaacc9b8a7f9871cc67133327eb760e6",
+    "/js/dmsg-123122-swxib.js": "/js/dmsg-123122-swxib.js?id=a296a4e5c8cf25eabbb826ba1f97e7cb",
     "/css/appdark.css": "/css/appdark.css?id=de85ecce91d9ed7afa7714547eb1e26c",
     "/css/app.css": "/css/app.css?id=88a0a931d5b0e24b0d9355f548414768",
     "/css/portfolio.css": "/css/portfolio.css?id=db2c9929a56d83f9ff2aaf2161d29d36",

resources/assets/js/app.js

@@ -172,7 +172,7 @@ window.App.util = {
 			['Chill','filter-lofi'],
 			['Van','filter-ludwig'],
 			['Apache','filter-maven'],
-			['Mayflower','filter-mayfair'],
+			['May','filter-mayfair'],
 			['Ceres','filter-moon'],
 			['Knoxville','filter-nashville'],
 			['Felicity','filter-perpetua'],