From fd0a9df724b7656c39231a38de3749b0f2dc766a Mon Sep 17 00:00:00 2001 From: dbroqua Date: Mon, 18 Sep 2023 14:31:51 +0200 Subject: [PATCH 1/2] {DEBUG} Get images --- src/libs/aws.js | 10 +++++++--- src/middleware/Albums.js | 8 ++++---- src/middleware/Jobs.js | 2 ++ 3 files changed, 13 insertions(+), 7 deletions(-) diff --git a/src/libs/aws.js b/src/libs/aws.js index f65521b..286e3d3 100644 --- a/src/libs/aws.js +++ b/src/libs/aws.js @@ -62,11 +62,15 @@ export const uploadFromUrl = async (url) => { const filename = `${uuid()}.jpg`; const file = `/tmp/${filename}`; - const { data } = await axios.get(url, { responseType: "arraybuffer" }); + const { data } = await axios.get(url, { + headers: { + "User-Agent": + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/117.0", + }, + responseType: "arraybuffer", + }); fs.writeFileSync(file, data); return uploadFromFile(filename, file, true); - - // return s3Object; }; diff --git a/src/middleware/Albums.js b/src/middleware/Albums.js index 1b79675..a6577a2 100644 --- a/src/middleware/Albums.js +++ b/src/middleware/Albums.js @@ -43,6 +43,9 @@ class Albums extends Pages { model: "Albums", id: album._id, }; + const job = new JobsModel(jobData); + + job.save(); try { const User = await UsersModel.findOne({ _id: user._id }); @@ -110,11 +113,8 @@ Publié automatiquement via #musictopus`; await M.post("statuses", { status, media_ids }); } - - const job = new JobsModel(jobData); - - job.save(); } catch (err) { + console.log("Err:", err); throw new ErrorEvent( 500, "Mastodon", diff --git a/src/middleware/Jobs.js b/src/middleware/Jobs.js index 91964f2..36de8d8 100644 --- a/src/middleware/Jobs.js +++ b/src/middleware/Jobs.js @@ -99,6 +99,8 @@ class Jobs { await job.save(); + console.log("ERR:", err); + throw err; } } From 4ea7b42d528a5afa00b6d8e8480f493be251ba6d Mon Sep 17 00:00:00 2001 From: dbroqua Date: Mon, 18 Sep 2023 14:41:01 +0200 Subject: [PATCH 2/2] {BUGFIX} For getting files from discogs --- src/middleware/Albums.js | 5 ++++- src/middleware/Jobs.js | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/middleware/Albums.js b/src/middleware/Albums.js index a6577a2..b234097 100644 --- a/src/middleware/Albums.js +++ b/src/middleware/Albums.js @@ -92,6 +92,10 @@ Publié automatiquement via #musictopus`; const { data: buff } = await axios.get( data.images[i].uri, { + headers: { + "User-Agent": + "Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:109.0) Gecko/20100101 Firefox/117.0", + }, responseType: "arraybuffer", } ); @@ -114,7 +118,6 @@ Publié automatiquement via #musictopus`; await M.post("statuses", { status, media_ids }); } } catch (err) { - console.log("Err:", err); throw new ErrorEvent( 500, "Mastodon", diff --git a/src/middleware/Jobs.js b/src/middleware/Jobs.js index 36de8d8..91964f2 100644 --- a/src/middleware/Jobs.js +++ b/src/middleware/Jobs.js @@ -99,8 +99,6 @@ class Jobs { await job.save(); - console.log("ERR:", err); - throw err; } }