UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-19 19:43:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #5302 from pixelfed/staging

Browse source 
Staging
This commit is contained in:
daniel 2024-09-18 02:29:13 -06:00 committed by GitHub
commit b88671bff5
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Services/PronounService.php
View file

@ -70,6 +70,8 @@ class PronounService {
'her', 'her',
'hers', 'hers',
'hir', 'hir',
'it',
'its',
'mer', 'mer',
'mers', 'mers',
'ne', 'ne',

4
resources/assets/components/AccountImport.vue
View file

@ -369,6 +369,10 @@
async filterPostMeta(media) { async filterPostMeta(media) {
let fbfix = await this.fixFacebookEncoding(media); let fbfix = await this.fixFacebookEncoding(media);
let json = JSON.parse(fbfix); 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 res = json.filter(j => {
let ids = j.media.map(m => m.uri).filter(m => { let ids = j.media.map(m => m.uri).filter(m => {
if(this.config.allow_video_posts == true) { if(this.config.allow_video_posts == true) {