From f6590570ffce319d9e97223453be6c05eb7d4146 Mon Sep 17 00:00:00 2001 From: Arnaud Date: Sun, 8 Sep 2024 20:34:00 +0200 Subject: [PATCH 1/2] Fixes pixelfed/pixelfed#5272 Instagram import fails silently if there's one post only in posts_1.json --- resources/assets/components/AccountImport.vue | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/resources/assets/components/AccountImport.vue b/resources/assets/components/AccountImport.vue index 406c5c1ce..4cc6408f1 100644 --- a/resources/assets/components/AccountImport.vue +++ b/resources/assets/components/AccountImport.vue @@ -369,6 +369,10 @@ async filterPostMeta(media) { let fbfix = await this.fixFacebookEncoding(media); let json = JSON.parse(fbfix); + /* Sometimes the JSON isn't an array, when there's only one post */ + if (!Array.isArray(json)) { + json = new Array(json); + } let res = json.filter(j => { let ids = j.media.map(m => m.uri).filter(m => { if(this.config.allow_video_posts == true) { From 0fe21513f91b6e5fc97d9c0eed6b82fab1dbb609 Mon Sep 17 00:00:00 2001 From: freyja Date: Mon, 9 Sep 2024 19:23:34 -0400 Subject: [PATCH 2/2] Update PronounService.php with it its pronouns --- app/Services/PronounService.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/Services/PronounService.php b/app/Services/PronounService.php index dce1d591a..a33ac0296 100644 --- a/app/Services/PronounService.php +++ b/app/Services/PronounService.php @@ -70,6 +70,8 @@ class PronounService { 'her', 'hers', 'hir', + 'it', + 'its', 'mer', 'mers', 'ne',