Merge pull request #4890 from pixelfed/staging

Update AccountImport.vue, fix new IG export format
2024-11-22 06:21:27 +00:00 · 2024-02-01 23:21:03 -07:00 · 2024-02-01 23:21:03 -07:00 · 9dcb25c8e2
commit 9dcb25c8e2
parent 33d1faf734 5b7111c56f
36 changed files with 3 additions and 2 deletions
--- 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)
--- a/public/js/account-import.js
+++ b/public/js/account-import.js
--- a/public/js/admin.js
+++ b/public/js/admin.js
--- a/public/js/collectioncompose.js
+++ b/public/js/collectioncompose.js
--- a/public/js/collections.js
+++ b/public/js/collections.js
--- a/public/js/compose.chunk.10e7f993dcc726f9.js
+++ b/public/js/compose.chunk.10e7f993dcc726f9.js
--- a/public/js/compose.chunk.1ac292c93b524406.js
+++ b/public/js/compose.chunk.1ac292c93b524406.js
--- a/public/js/compose.js
+++ b/public/js/compose.js
--- a/public/js/daci.chunk.8d4acc1db3f27a51.js
+++ b/public/js/daci.chunk.8d4acc1db3f27a51.js
--- a/public/js/discover.chunk.b1846efb6bd1e43c.js
+++ b/public/js/discover.chunk.b1846efb6bd1e43c.js
--- a/public/js/discover~findfriends.chunk.941b524eee8b8d63.js
+++ b/public/js/discover~findfriends.chunk.941b524eee8b8d63.js
--- a/public/js/discover~hashtag.bundle.6c2ff384b17ea58d.js
+++ b/public/js/discover~hashtag.bundle.6c2ff384b17ea58d.js
--- a/public/js/discover~hashtag.bundle.9cfffc517f35044e.js
+++ b/public/js/discover~hashtag.bundle.9cfffc517f35044e.js
--- a/public/js/discover~memories.chunk.7d917826c3e9f17b.js
+++ b/public/js/discover~memories.chunk.7d917826c3e9f17b.js
--- a/public/js/discover~myhashtags.chunk.a72fc4882db8afd3.js
+++ b/public/js/discover~myhashtags.chunk.a72fc4882db8afd3.js
--- a/public/js/discover~serverfeed.chunk.8365948d1867de3a.js
+++ b/public/js/discover~serverfeed.chunk.8365948d1867de3a.js
--- a/public/js/discover~settings.chunk.be88dc5ba1a24a7d.js
+++ b/public/js/discover~settings.chunk.be88dc5ba1a24a7d.js
--- a/public/js/dms~message.chunk.76edeafda3d92320.js
+++ b/public/js/dms~message.chunk.76edeafda3d92320.js
--- a/public/js/home.chunk.351f55e9d09b6482.js
+++ b/public/js/home.chunk.351f55e9d09b6482.js
--- a/public/js/home.chunk.f3f4f632025b560f.js
+++ b/public/js/home.chunk.f3f4f632025b560f.js
--- a/public/js/home.chunk.f3f4f632025b560f.js.LICENSE.txt
+++ b/public/js/home.chunk.f3f4f632025b560f.js.LICENSE.txt
--- a/public/js/landing.js
+++ b/public/js/landing.js
--- a/public/js/manifest.js
+++ b/public/js/manifest.js
--- a/public/js/portfolio.js
+++ b/public/js/portfolio.js
--- a/public/js/post.chunk.eb9804ff282909ae.js
+++ b/public/js/post.chunk.eb9804ff282909ae.js
--- a/public/js/post.chunk.eb9804ff282909ae.js.LICENSE.txt
+++ b/public/js/post.chunk.eb9804ff282909ae.js.LICENSE.txt
--- a/public/js/profile.chunk.d52916cb68c9a146.js
+++ b/public/js/profile.chunk.d52916cb68c9a146.js
--- a/public/js/profile.js
+++ b/public/js/profile.js
--- a/public/js/profile~followers.bundle.5deed93248f20662.js
+++ b/public/js/profile~followers.bundle.5deed93248f20662.js
--- a/public/js/profile~following.bundle.d2b3b1fc2e05dbd3.js
+++ b/public/js/profile~following.bundle.d2b3b1fc2e05dbd3.js
--- a/public/js/spa.js
+++ b/public/js/spa.js
--- a/public/js/status.js
+++ b/public/js/status.js
--- a/public/js/stories.js
+++ b/public/js/stories.js
--- a/public/js/timeline.js
+++ b/public/js/timeline.js
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
--- 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 => {