diff --git a/CHANGELOG.md b/CHANGELOG.md index 5c73b4e37..d762a135b 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -90,6 +90,7 @@ - Update login view, add email prefill logic ([d76f0168](https://github.com/pixelfed/pixelfed/commit/d76f0168)) - Update LoginController, fix captcha validation error message ([0325e171](https://github.com/pixelfed/pixelfed/commit/0325e171)) - Update ApiV1Controller, properly cast boolean sensitive parameter. Fixes #4888 ([0aff126a](https://github.com/pixelfed/pixelfed/commit/0aff126a)) +- Update AccountImport.vue, fix new IG export format ([59aa6a4b](https://github.com/pixelfed/pixelfed/commit/59aa6a4b)) - ([](https://github.com/pixelfed/pixelfed/commit/)) ## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9) diff --git a/public/js/account-import.js b/public/js/account-import.js index 74d4d9e4d..b68bfb495 100644 Binary files a/public/js/account-import.js and b/public/js/account-import.js differ diff --git a/public/js/admin.js b/public/js/admin.js index d71cbfa94..a216de097 100644 Binary files a/public/js/admin.js and b/public/js/admin.js differ diff --git a/public/js/collectioncompose.js b/public/js/collectioncompose.js index e295e7965..d729c9132 100644 Binary files a/public/js/collectioncompose.js and b/public/js/collectioncompose.js differ diff --git a/public/js/collections.js b/public/js/collections.js index f59c88863..bce9e53b6 100644 Binary files a/public/js/collections.js and b/public/js/collections.js differ diff --git a/public/js/compose.chunk.10e7f993dcc726f9.js b/public/js/compose.chunk.10e7f993dcc726f9.js deleted file mode 100644 index 106a118f4..000000000 Binary files a/public/js/compose.chunk.10e7f993dcc726f9.js and /dev/null differ diff --git a/public/js/compose.chunk.1ac292c93b524406.js b/public/js/compose.chunk.1ac292c93b524406.js new file mode 100644 index 000000000..ed1b93071 Binary files /dev/null and b/public/js/compose.chunk.1ac292c93b524406.js differ diff --git a/public/js/compose.js b/public/js/compose.js index 699a19dad..e64303401 100644 Binary files a/public/js/compose.js and b/public/js/compose.js differ diff --git a/public/js/daci.chunk.b17a0b11877389d7.js b/public/js/daci.chunk.8d4acc1db3f27a51.js similarity index 67% rename from public/js/daci.chunk.b17a0b11877389d7.js rename to public/js/daci.chunk.8d4acc1db3f27a51.js index ccbc67f41..75059480a 100644 Binary files a/public/js/daci.chunk.b17a0b11877389d7.js and b/public/js/daci.chunk.8d4acc1db3f27a51.js differ diff --git a/public/js/discover.chunk.9606885dad3c8a99.js b/public/js/discover.chunk.b1846efb6bd1e43c.js similarity index 61% rename from public/js/discover.chunk.9606885dad3c8a99.js rename to public/js/discover.chunk.b1846efb6bd1e43c.js index 7892b83f2..fb2ff1482 100644 Binary files a/public/js/discover.chunk.9606885dad3c8a99.js and b/public/js/discover.chunk.b1846efb6bd1e43c.js differ diff --git a/public/js/discover~findfriends.chunk.02be60ab26503531.js b/public/js/discover~findfriends.chunk.941b524eee8b8d63.js similarity index 67% rename from public/js/discover~findfriends.chunk.02be60ab26503531.js rename to public/js/discover~findfriends.chunk.941b524eee8b8d63.js index 60d93a0a6..cbf5bdb24 100644 Binary files a/public/js/discover~findfriends.chunk.02be60ab26503531.js and b/public/js/discover~findfriends.chunk.941b524eee8b8d63.js differ diff --git a/public/js/discover~hashtag.bundle.6c2ff384b17ea58d.js b/public/js/discover~hashtag.bundle.6c2ff384b17ea58d.js new file mode 100644 index 000000000..3ef77ac5d Binary files /dev/null and b/public/js/discover~hashtag.bundle.6c2ff384b17ea58d.js differ diff --git a/public/js/discover~hashtag.bundle.9cfffc517f35044e.js b/public/js/discover~hashtag.bundle.9cfffc517f35044e.js deleted file mode 100644 index afb2b3de0..000000000 Binary files a/public/js/discover~hashtag.bundle.9cfffc517f35044e.js and /dev/null differ diff --git a/public/js/discover~memories.chunk.ce9cc6446020e9b3.js b/public/js/discover~memories.chunk.7d917826c3e9f17b.js similarity index 67% rename from public/js/discover~memories.chunk.ce9cc6446020e9b3.js rename to public/js/discover~memories.chunk.7d917826c3e9f17b.js index ec86c87f7..f8ed91112 100644 Binary files a/public/js/discover~memories.chunk.ce9cc6446020e9b3.js and b/public/js/discover~memories.chunk.7d917826c3e9f17b.js differ diff --git a/public/js/discover~myhashtags.chunk.6eab2414b2b16e19.js b/public/js/discover~myhashtags.chunk.a72fc4882db8afd3.js similarity index 73% rename from public/js/discover~myhashtags.chunk.6eab2414b2b16e19.js rename to public/js/discover~myhashtags.chunk.a72fc4882db8afd3.js index 31039621f..adab1bc44 100644 Binary files a/public/js/discover~myhashtags.chunk.6eab2414b2b16e19.js and b/public/js/discover~myhashtags.chunk.a72fc4882db8afd3.js differ diff --git a/public/js/discover~serverfeed.chunk.0f2dcc473fdce17e.js b/public/js/discover~serverfeed.chunk.8365948d1867de3a.js similarity index 67% rename from public/js/discover~serverfeed.chunk.0f2dcc473fdce17e.js rename to public/js/discover~serverfeed.chunk.8365948d1867de3a.js index ed30efc2f..fba06dbca 100644 Binary files a/public/js/discover~serverfeed.chunk.0f2dcc473fdce17e.js and b/public/js/discover~serverfeed.chunk.8365948d1867de3a.js differ diff --git a/public/js/discover~settings.chunk.732c1f76a00d9204.js b/public/js/discover~settings.chunk.be88dc5ba1a24a7d.js similarity index 68% rename from public/js/discover~settings.chunk.732c1f76a00d9204.js rename to public/js/discover~settings.chunk.be88dc5ba1a24a7d.js index 959ab4d3f..76bbfcf7d 100644 Binary files a/public/js/discover~settings.chunk.732c1f76a00d9204.js and b/public/js/discover~settings.chunk.be88dc5ba1a24a7d.js differ diff --git a/public/js/dms~message.chunk.15157ff4a6c17cc7.js b/public/js/dms~message.chunk.76edeafda3d92320.js similarity index 63% rename from public/js/dms~message.chunk.15157ff4a6c17cc7.js rename to public/js/dms~message.chunk.76edeafda3d92320.js index e74ff4325..17a5262d9 100644 Binary files a/public/js/dms~message.chunk.15157ff4a6c17cc7.js and b/public/js/dms~message.chunk.76edeafda3d92320.js differ diff --git a/public/js/home.chunk.351f55e9d09b6482.js b/public/js/home.chunk.351f55e9d09b6482.js deleted file mode 100644 index c6f3e4d4f..000000000 Binary files a/public/js/home.chunk.351f55e9d09b6482.js and /dev/null differ diff --git a/public/js/home.chunk.f3f4f632025b560f.js b/public/js/home.chunk.f3f4f632025b560f.js new file mode 100644 index 000000000..76c5f028a Binary files /dev/null and b/public/js/home.chunk.f3f4f632025b560f.js differ diff --git a/public/js/home.chunk.351f55e9d09b6482.js.LICENSE.txt b/public/js/home.chunk.f3f4f632025b560f.js.LICENSE.txt similarity index 100% rename from public/js/home.chunk.351f55e9d09b6482.js.LICENSE.txt rename to public/js/home.chunk.f3f4f632025b560f.js.LICENSE.txt diff --git a/public/js/landing.js b/public/js/landing.js index 8a3b2322c..c9da7051d 100644 Binary files a/public/js/landing.js and b/public/js/landing.js differ diff --git a/public/js/manifest.js b/public/js/manifest.js index d6fe923ca..5f337f9b3 100644 Binary files a/public/js/manifest.js and b/public/js/manifest.js differ diff --git a/public/js/portfolio.js b/public/js/portfolio.js index ce1e7097f..f28a7af06 100644 Binary files a/public/js/portfolio.js and b/public/js/portfolio.js differ diff --git a/public/js/post.chunk.23fc9e82d4fadc83.js b/public/js/post.chunk.eb9804ff282909ae.js similarity index 72% rename from public/js/post.chunk.23fc9e82d4fadc83.js rename to public/js/post.chunk.eb9804ff282909ae.js index 6e8aa73f4..130499b2c 100644 Binary files a/public/js/post.chunk.23fc9e82d4fadc83.js and b/public/js/post.chunk.eb9804ff282909ae.js differ diff --git a/public/js/post.chunk.23fc9e82d4fadc83.js.LICENSE.txt b/public/js/post.chunk.eb9804ff282909ae.js.LICENSE.txt similarity index 100% rename from public/js/post.chunk.23fc9e82d4fadc83.js.LICENSE.txt rename to public/js/post.chunk.eb9804ff282909ae.js.LICENSE.txt diff --git a/public/js/profile.chunk.0e5bd852054d6355.js b/public/js/profile.chunk.d52916cb68c9a146.js similarity index 64% rename from public/js/profile.chunk.0e5bd852054d6355.js rename to public/js/profile.chunk.d52916cb68c9a146.js index acf4175dc..f6ea10fa0 100644 Binary files a/public/js/profile.chunk.0e5bd852054d6355.js and b/public/js/profile.chunk.d52916cb68c9a146.js differ diff --git a/public/js/profile.js b/public/js/profile.js index a9fcd40df..0c28afe41 100644 Binary files a/public/js/profile.js and b/public/js/profile.js differ diff --git a/public/js/profile~followers.bundle.731f680cfb96563d.js b/public/js/profile~followers.bundle.5deed93248f20662.js similarity index 70% rename from public/js/profile~followers.bundle.731f680cfb96563d.js rename to public/js/profile~followers.bundle.5deed93248f20662.js index 51805c382..171ddf72d 100644 Binary files a/public/js/profile~followers.bundle.731f680cfb96563d.js and b/public/js/profile~followers.bundle.5deed93248f20662.js differ diff --git a/public/js/profile~following.bundle.3d95796c9f1678dd.js b/public/js/profile~following.bundle.d2b3b1fc2e05dbd3.js similarity index 70% rename from public/js/profile~following.bundle.3d95796c9f1678dd.js rename to public/js/profile~following.bundle.d2b3b1fc2e05dbd3.js index 24db7dafa..9a35b3e2b 100644 Binary files a/public/js/profile~following.bundle.3d95796c9f1678dd.js and b/public/js/profile~following.bundle.d2b3b1fc2e05dbd3.js differ diff --git a/public/js/spa.js b/public/js/spa.js index b496ba432..baee816fd 100644 Binary files a/public/js/spa.js and b/public/js/spa.js differ diff --git a/public/js/status.js b/public/js/status.js index fb8eb6b7e..0bced46dd 100644 Binary files a/public/js/status.js and b/public/js/status.js differ diff --git a/public/js/stories.js b/public/js/stories.js index e38874d8e..545526829 100644 Binary files a/public/js/stories.js and b/public/js/stories.js differ diff --git a/public/js/timeline.js b/public/js/timeline.js index a0ec87563..ed0fc1214 100644 Binary files a/public/js/timeline.js and b/public/js/timeline.js differ diff --git a/public/mix-manifest.json b/public/mix-manifest.json index 29b3788c0..68c9c44bd 100644 Binary files a/public/mix-manifest.json and b/public/mix-manifest.json differ diff --git a/resources/assets/components/AccountImport.vue b/resources/assets/components/AccountImport.vue index 6e1fe9fcf..f7b7279f5 100644 --- a/resources/assets/components/AccountImport.vue +++ b/resources/assets/components/AccountImport.vue @@ -381,7 +381,7 @@ let file = this.$refs.zipInput.files[0]; let entries = await this.model(file); if (entries && entries.length) { - let files = await entries.filter(e => e.filename === 'content/posts_1.json'); + let files = await entries.filter(e => e.filename === 'content/posts_1.json' || e.filename === 'your_instagram_activity/content/posts_1.json'); if(!files || !files.length) { this.contactModal( @@ -402,7 +402,7 @@ let entries = await this.model(file); if (entries && entries.length) { this.zipFiles = entries; - let media = await entries.filter(e => e.filename === 'content/posts_1.json')[0].getData(new zip.TextWriter()); + let media = await entries.filter(e => e.filename === 'content/posts_1.json' || e.filename === 'your_instagram_activity/content/posts_1.json')[0].getData(new zip.TextWriter()); this.filterPostMeta(media); let imgs = await Promise.all(entries.filter(entry => {