Merge pull request #5302 from pixelfed/staging

Staging
pixelfed · Sep 18, 2024 · b88671b · b88671b
2 parents 5be19ff + 0ddab93
commit b88671b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/app/Services/PronounService.php b/app/Services/PronounService.php
@@ -70,6 +70,8 @@ public static function pronouns()
 			'her',
 			'hers',
 			'hir',
+            'it',
+            'its',
 			'mer',
 			'mers',
 			'ne',

diff --git 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) {