From 329591d69b231d60d38dc1feb9a0260fc248c0f9 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 17 Mar 2019 14:00:11 -0600 Subject: [PATCH 1/4] Update Import Settings view --- resources/views/settings/import/home.blade.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/resources/views/settings/import/home.blade.php b/resources/views/settings/import/home.blade.php index b0765e539..9f84f2115 100644 --- a/resources/views/settings/import/home.blade.php +++ b/resources/views/settings/import/home.blade.php @@ -8,7 +8,8 @@

Account Import allows you to import your data from a supported service.

-

Importing from another service will not impact existing data by default however you may choose to update avatar, bio or nickname fields during the process.

+

Warning: This is an experimental beta feature. Use at your own risk!

+

Warning: Imported posts will not appear on timelines or be delivered to followers.

Supported Services

@@ -21,10 +22,7 @@ Import from Mastodon

- Import from Pleroma -

-

- Import from GNU/Social + Import from Tumblr

@endsection \ No newline at end of file From ce519c1ad55641d8bccd63e89043d7cc79dbd909 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 17 Mar 2019 15:34:02 -0600 Subject: [PATCH 2/4] Update StatusPipeline --- app/Jobs/StatusPipeline/StatusActivityPubDeliver.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Jobs/StatusPipeline/StatusActivityPubDeliver.php b/app/Jobs/StatusPipeline/StatusActivityPubDeliver.php index 9f75db0b1..06f22a85d 100644 --- a/app/Jobs/StatusPipeline/StatusActivityPubDeliver.php +++ b/app/Jobs/StatusPipeline/StatusActivityPubDeliver.php @@ -56,7 +56,7 @@ class StatusActivityPubDeliver implements ShouldQueue $audience = $status->profile->getAudienceInbox(); - if(empty($audience)) { + if(empty($audience) || $status->visibility != 'public') { // Return on profiles with no remote followers return; } From 31dd8d38e7ca7ed1d44248c592a22ec049f51819 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 17 Mar 2019 15:34:26 -0600 Subject: [PATCH 3/4] Update ImportPipeline --- app/Jobs/ImportPipeline/ImportInstagram.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/Jobs/ImportPipeline/ImportInstagram.php b/app/Jobs/ImportPipeline/ImportInstagram.php index 57b1b5fce..c6cbd9d93 100644 --- a/app/Jobs/ImportPipeline/ImportInstagram.php +++ b/app/Jobs/ImportPipeline/ImportInstagram.php @@ -88,7 +88,7 @@ class ImportInstagram implements ShouldQueue $status->profile_id = $profile->id; $status->caption = strip_tags($caption); $status->is_nsfw = false; - $status->visibility = 'public'; + $status->visibility = 'unlisted'; $status->created_at = $taken_at; $status->save(); From e3c22306e2099eefb585a50e26d5128c4846ddd6 Mon Sep 17 00:00:00 2001 From: Daniel Supernault Date: Sun, 17 Mar 2019 15:45:16 -0600 Subject: [PATCH 4/4] Add IG import views --- .../import/instagram/step-one.blade.php | 28 +++++++++++++++++++ .../import/instagram/step-three.blade.php | 25 +++++++++++++++++ .../import/instagram/step-two.blade.php | 26 +++++++++++++++++ 3 files changed, 79 insertions(+) create mode 100644 resources/views/settings/import/instagram/step-one.blade.php create mode 100644 resources/views/settings/import/instagram/step-three.blade.php create mode 100644 resources/views/settings/import/instagram/step-two.blade.php diff --git a/resources/views/settings/import/instagram/step-one.blade.php b/resources/views/settings/import/instagram/step-one.blade.php new file mode 100644 index 000000000..0ca0ddcbf --- /dev/null +++ b/resources/views/settings/import/instagram/step-one.blade.php @@ -0,0 +1,28 @@ +@extends('settings.template') + +@section('section') + +
+

Import from Instagram

+

Step 1

+
+
+
+

Before you proceed, you need to have a backup of your account from Instagram, you can do that here.

+
+
+
+
+

Import photos directory

+

250mb limit, if your photos directory exceeds that amount, you will have to wait until we support larger imports.

+
+
+ @csrf + + +
+
+
+
+ +@endsection \ No newline at end of file diff --git a/resources/views/settings/import/instagram/step-three.blade.php b/resources/views/settings/import/instagram/step-three.blade.php new file mode 100644 index 000000000..7c09a6728 --- /dev/null +++ b/resources/views/settings/import/instagram/step-three.blade.php @@ -0,0 +1,25 @@ +@extends('settings.template') + +@section('section') + +
+

Import from Instagram

+

Step 3

+
+
+
+
+
+

Found {{$job->files->count()}} posts to import

+

+
+
+ @csrf + +
+
+
+ +
+ +@endsection \ No newline at end of file diff --git a/resources/views/settings/import/instagram/step-two.blade.php b/resources/views/settings/import/instagram/step-two.blade.php new file mode 100644 index 000000000..695f89604 --- /dev/null +++ b/resources/views/settings/import/instagram/step-two.blade.php @@ -0,0 +1,26 @@ +@extends('settings.template') + +@section('section') + +
+

Import from Instagram

+

Step 2

+
+
+
+
+
+

Import media.json file

+

10mb limit, please only upload the media.json file

+
+
+ @csrf + + +
+
+
+ +
+ +@endsection \ No newline at end of file