Merge pull request #3692 from pixelfed/staging

Staging

CHANGELOG.md

@@ -6,6 +6,7 @@
 - Update ApiV1Controller, include self likes in favourited_by endpoint ([58b331d2](https://github.com/pixelfed/pixelfed/commit/58b331d2))
 - Update PublicApiController, remove expensive and unused relationships ([2ecc3144](https://github.com/pixelfed/pixelfed/commit/2ecc3144))
 - Update status deletion, fix database lock issues and side effects ([04e8c96a](https://github.com/pixelfed/pixelfed/commit/04e8c96a))
+- Fix remote profile avatar urls when storing locally ([b0422d4f](https://github.com/pixelfed/pixelfed/commit/b0422d4f))
 -  ([](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/Services/MediaStorageService.php

@@ -236,7 +236,10 @@ class MediaStorageService {
 		$tmpBase = storage_path('app/remcache/');
 		$tmpPath = 'avatar_' . $avatar->profile_id . '-' . $path;
 		$tmpName = $tmpBase . $tmpPath;
-		$data = file_get_contents($url, false, null, 0, $head['length']);
+		$data = @file_get_contents($url, false, null, 0, $head['length']);
+		if(!$data) {
+			return;
+		}
 		file_put_contents($tmpName, $data);
 
 		$disk = Storage::disk($driver);
@@ -245,7 +248,7 @@ class MediaStorageService {
 
 		$avatar->media_path = $base . $path;
 		$avatar->is_remote = true;
-		$avatar->cdn_url = $permalink;
+		$avatar->cdn_url = $local ? config('app.url') . $permalink : $permalink;
 		$avatar->size = $head['length'];
 		$avatar->change_count = $avatar->change_count + 1;
 		$avatar->last_fetched_at = now();

database/migrations/2022_10_09_043758_fix_cdn_url_in_avatars_table.php

@@ -0,0 +1,41 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Support\Facades\Cache;
+use App\Services\AccountService;
+use App\Avatar;
+
+class FixCdnUrlInAvatarsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        $baseUrl = 'https://' . config('pixelfed.domain.app');
+        Avatar::whereNotNull('cdn_url')
+        ->chunk(50, function($avatars) use($baseUrl) {
+            foreach($avatars as $avatar) {
+                if(substr($avatar->cdn_url, 0, 23) === '/storage/cache/avatars/') {
+                    $avatar->cdn_url = $baseUrl . $avatar->cdn_url;
+                    $avatar->save();
+                }
+                Cache::forget('avatar:' . $avatar->profile_id);
+                AccountService::del($avatar->profile_id);
+            }
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+    }
+}

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=>722===e?"js/home-17lx4qxke.js":423===e?"js/compose-17lx4qxke.js":828===e?"js/post-17lx4qxke.js":489===e?"js/profile-17lx4qxke.js":409===e?"js/dmym-17lx4qxke.js":253===e?"js/dmyh-17lx4qxke.js":151===e?"js/daci-17lx4qxke.js":624===e?"js/dffc-17lx4qxke.js":566===e?"js/dsfc-17lx4qxke.js":376===e?"js/dssc-17lx4qxke.js":589===e?"js/discover-17lx4qxke.js":784===e?"js/notifications-17lx4qxke.js":649===e?"js/dms-17lx4qxke.js":490===e?"js/dmsg-17lx4qxke.js":void 0,n.miniCssF=e=>({138:"css/spa",170:"css/app",242:"css/appdark",703:"css/admin",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,138:0,703:0,994: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|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,t,r,s={},i={};function o(e){var t=i[e];if(void 0!==t)return t.exports;var r=i[e]={id:e,loaded:!1,exports:{}};return s[e].call(r.exports,r,r.exports,o),r.loaded=!0,r.exports}o.m=s,e=[],o.O=(t,r,s,i)=>{if(!r){var n=1/0;for(c=0;c<e.length;c++){for(var[r,s,i]=e[c],d=!0,l=0;l<r.length;l++)(!1&i||n>=i)&&Object.keys(o.O).every((e=>o.O[e](r[l])))?r.splice(l--,1):(d=!1,i<n&&(n=i));if(d){e.splice(c--,1);var a=s();void 0!==a&&(t=a)}}return t}i=i||0;for(var c=e.length;c>0&&e[c-1][2]>i;c--)e[c]=e[c-1];e[c]=[r,s,i]},o.n=e=>{var t=e&&e.__esModule?()=>e.default:()=>e;return o.d(t,{a:t}),t},o.d=(e,t)=>{for(var r in t)o.o(t,r)&&!o.o(e,r)&&Object.defineProperty(e,r,{enumerable:!0,get:t[r]})},o.f={},o.e=e=>Promise.all(Object.keys(o.f).reduce(((t,r)=>(o.f[r](e,t),t)),[])),o.u=e=>113===e?"js/home-ivl9d2teh.js":844===e?"js/compose-ivl9d2teh.js":635===e?"js/post-ivl9d2teh.js":761===e?"js/profile-ivl9d2teh.js":51===e?"js/dmym-ivl9d2teh.js":40===e?"js/dmyh-ivl9d2teh.js":200===e?"js/daci-ivl9d2teh.js":576===e?"js/dffc-ivl9d2teh.js":788===e?"js/dsfc-ivl9d2teh.js":382===e?"js/dssc-ivl9d2teh.js":854===e?"js/discover-ivl9d2teh.js":13===e?"js/notifications-ivl9d2teh.js":641===e?"js/dms-ivl9d2teh.js":732===e?"js/dmsg-ivl9d2teh.js":void 0,o.miniCssF=e=>({138:"css/spa",170:"css/app",242:"css/appdark",703:"css/admin",994:"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,t)=>Object.prototype.hasOwnProperty.call(e,t),t={},r="pixelfed:",o.l=(e,s,i,n)=>{if(t[e])t[e].push(s);else{var d,l;if(void 0!==i)for(var a=document.getElementsByTagName("script"),c=0;c<a.length;c++){var u=a[c];if(u.getAttribute("src")==e||u.getAttribute("data-webpack")==r+i){d=u;break}}d||(l=!0,(d=document.createElement("script")).charset="utf-8",d.timeout=120,o.nc&&d.setAttribute("nonce",o.nc),d.setAttribute("data-webpack",r+i),d.src=e),t[e]=[s];var f=(r,s)=>{d.onerror=d.onload=null,clearTimeout(p);var i=t[e];if(delete t[e],d.parentNode&&d.parentNode.removeChild(d),i&&i.forEach((e=>e(s))),r)return r(s)},p=setTimeout(f.bind(null,void 0,{type:"timeout",target:d}),12e4);d.onerror=f.bind(null,d.onerror),d.onload=f.bind(null,d.onload),l&&document.head.appendChild(d)}},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={929:0,242:0,170:0,138:0,703:0,994:0};o.f.j=(t,r)=>{var s=o.o(e,t)?e[t]:void 0;if(0!==s)if(s)r.push(s[2]);else if(/^(138|170|242|703|929|994)$/.test(t))e[t]=0;else{var i=new Promise(((r,i)=>s=e[t]=[r,i]));r.push(s[2]=i);var n=o.p+o.u(t),d=new Error;o.l(n,(r=>{if(o.o(e,t)&&(0!==(s=e[t])&&(e[t]=void 0),s)){var i=r&&("load"===r.type?"missing":r.type),n=r&&r.target&&r.target.src;d.message="Loading chunk "+t+" failed.\n("+i+": "+n+")",d.name="ChunkLoadError",d.type=i,d.request=n,s[1](d)}}),"chunk-"+t,t)}},o.O.j=t=>0===e[t];var t=(t,r)=>{var s,i,[n,d,l]=r,a=0;if(n.some((t=>0!==e[t]))){for(s in d)o.o(d,s)&&(o.m[s]=d[s]);if(l)var c=l(o)}for(t&&t(r);a<n.length;a++)i=n[a],o.o(e,i)&&e[i]&&e[i][0](),e[i]=0;return o.O(c)},r=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];r.forEach(t.bind(null,0)),r.push=t.bind(null,r.push.bind(r))})(),o.nc=void 0})();

public/mix-manifest.json

@@ -19,29 +19,29 @@
     "/js/admin.js": "/js/admin.js?id=fd88b96423314b41cc763a0714554a04",
     "/js/rempro.js": "/js/rempro.js?id=8ad8738264b7e0733f89ca605d6f347c",
     "/js/rempos.js": "/js/rempos.js?id=47f6c3b3dc7954179a9e2024614449d4",
-    "/js/live-player.js": "/js/live-player.js?id=dd54a729ca39d7eebff1bdb6ef53e236",
-    "/js/spa.js": "/js/spa.js?id=d9e65a3ac701b2c4fddbb02658e7ab8a",
+    "/js/live-player.js": "/js/live-player.js?id=be9bb8d1d615e03356a7ea2a755dabd9",
+    "/js/spa.js": "/js/spa.js?id=c7903ea5481557c969ffc97999d64a12",
     "/js/stories.js": "/js/stories.js?id=814a25875cac8987d85c801dcb453114",
     "/js/installer.js": "/js/installer.js?id=d7b03f6c0bb707bec8ff9f81d328ac4a",
-    "/js/manifest.js": "/js/manifest.js?id=5ebf5f52b571313e55587bf61ebd2706",
-    "/js/home-17lx4qxke.js": "/js/home-17lx4qxke.js?id=daf78e3740b296105a23614f0a03b123",
-    "/js/compose-17lx4qxke.js": "/js/compose-17lx4qxke.js?id=67c5d0e9287dafe875bd1b82faf749be",
-    "/js/post-17lx4qxke.js": "/js/post-17lx4qxke.js?id=68933969779e203116258826f93145bf",
-    "/js/profile-17lx4qxke.js": "/js/profile-17lx4qxke.js?id=9b22b121a01286a1d1bdd03dca76cc98",
-    "/js/dmym-17lx4qxke.js": "/js/dmym-17lx4qxke.js?id=6e41cd457cda2e6238e1fb50fdcfde8c",
-    "/js/dmyh-17lx4qxke.js": "/js/dmyh-17lx4qxke.js?id=6ecacfe81dd96d1ad867d78d8b932bec",
-    "/js/daci-17lx4qxke.js": "/js/daci-17lx4qxke.js?id=03db69be7517ad0611ccd76e005d030a",
-    "/js/dffc-17lx4qxke.js": "/js/dffc-17lx4qxke.js?id=05a26cbea493daada0e618b231cb71d2",
-    "/js/dsfc-17lx4qxke.js": "/js/dsfc-17lx4qxke.js?id=b6609b8f485e1bc1adaedb4a28ca9e9d",
-    "/js/dssc-17lx4qxke.js": "/js/dssc-17lx4qxke.js?id=c23f36b4f500c262e2fbf6ce7415aa2e",
-    "/js/discover-17lx4qxke.js": "/js/discover-17lx4qxke.js?id=d3aaed9361205eda72fda2b7825898c0",
-    "/js/notifications-17lx4qxke.js": "/js/notifications-17lx4qxke.js?id=e449ee54823fbb2a370cbe6ba6ed4e5a",
-    "/js/dms-17lx4qxke.js": "/js/dms-17lx4qxke.js?id=9cd2ccd75e925a8f9b403f218d9f4f62",
-    "/js/dmsg-17lx4qxke.js": "/js/dmsg-17lx4qxke.js?id=a3fee10de597636b298c5c7de7ba028e",
-    "/css/appdark.css": "/css/appdark.css?id=d6006aa8d3880210368434c64b942a40",
-    "/css/app.css": "/css/app.css?id=66c10c9502955c88d471277fface8c32",
+    "/js/manifest.js": "/js/manifest.js?id=9ba42a85f6a0413c7493b02f749e3cc7",
+    "/js/home-ivl9d2teh.js": "/js/home-ivl9d2teh.js?id=a4f4874c61183b173479a9a67fa2e66f",
+    "/js/compose-ivl9d2teh.js": "/js/compose-ivl9d2teh.js?id=76a6e4e6eebeff5f9134db38263c6cd0",
+    "/js/post-ivl9d2teh.js": "/js/post-ivl9d2teh.js?id=de1b91878b05352f272dc2ab479d87b5",
+    "/js/profile-ivl9d2teh.js": "/js/profile-ivl9d2teh.js?id=a0b0d663e43431010fdaf446866106cf",
+    "/js/dmym-ivl9d2teh.js": "/js/dmym-ivl9d2teh.js?id=83dd473d9e9d005df20dc7973e4d3cf1",
+    "/js/dmyh-ivl9d2teh.js": "/js/dmyh-ivl9d2teh.js?id=e6bcbb23a10d6234ddfec0fcb21a6445",
+    "/js/daci-ivl9d2teh.js": "/js/daci-ivl9d2teh.js?id=5417060d4abef7ee44026081535509c8",
+    "/js/dffc-ivl9d2teh.js": "/js/dffc-ivl9d2teh.js?id=625d349892ac8e8ead5b65b7d20d4bca",
+    "/js/dsfc-ivl9d2teh.js": "/js/dsfc-ivl9d2teh.js?id=e948c7fe25618009af148cc765d3f829",
+    "/js/dssc-ivl9d2teh.js": "/js/dssc-ivl9d2teh.js?id=05be7e6a0bab04e8f23de3246dba5d50",
+    "/js/discover-ivl9d2teh.js": "/js/discover-ivl9d2teh.js?id=4e76e2d0b0bf815e1b23cb721d0ce8c4",
+    "/js/notifications-ivl9d2teh.js": "/js/notifications-ivl9d2teh.js?id=87e6ae02b7626c021e853d706920c647",
+    "/js/dms-ivl9d2teh.js": "/js/dms-ivl9d2teh.js?id=6068ce1647a66a8e9b50f2fbf4b7578e",
+    "/js/dmsg-ivl9d2teh.js": "/js/dmsg-ivl9d2teh.js?id=1a9976846519afea24cb9f316ab77e0e",
+    "/css/appdark.css": "/css/appdark.css?id=aa186d0136f89d136461f0f5d84de682",
+    "/css/app.css": "/css/app.css?id=140a427d89c3aae4f78e87cf6ec7eef3",
     "/css/spa.css": "/css/spa.css?id=4c78f163c6ad4e0f25ced75c7dd624b6",
-    "/css/admin.css": "/css/admin.css?id=c370da65565066b3fbcf2808bd0a4468",
-    "/css/landing.css": "/css/landing.css?id=1481d8b409a3e114d32a857db0bef4fd",
-    "/js/vendor.js": "/js/vendor.js?id=4b8baeff156b0f280596a985b98255bc"
+    "/css/admin.css": "/css/admin.css?id=3730bb9975e2a6ddc931f66dce1fcf49",
+    "/css/landing.css": "/css/landing.css?id=b488c3f0db85a50607d8ae12ac394a0f",
+    "/js/vendor.js": "/js/vendor.js?id=898bcd5e9be546c8b5699fe37805770e"
 }