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

Update InstagramImport trait

Browse source
This commit is contained in:
Daniel Supernault 2020-05-25 21:31:35 -06:00
parent 3b7e9e07e1
commit ef07d17423
No known key found for this signature in database
GPG key ID: 0DEF1C662C9033F7
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/Http/Controllers/Import/Instagram.php
View file

@ -27,7 +27,7 @@ trait Instagram
->whereNotNull('completed_at') ->whereNotNull('completed_at')
->exists(); ->exists();
if($completed == true) { if($completed == true) {
return redirect(route('settings'))->with(['errors' => ['You can only import from Instagram once.']]); return redirect(route('settings'))->with(['error' => 'You can only import from Instagram once during the beta. Please report any issues!']);
} }
$job = $this->instagramRedirectOrNew(); $job = $this->instagramRedirectOrNew();
return redirect($job->url()); return redirect($job->url());
@ -160,7 +160,6 @@ trait Instagram
{ {
$profile = Auth::user()->profile; $profile = Auth::user()->profile;
try { try {
$import = ImportJob::whereProfileId($profile->id) $import = ImportJob::whereProfileId($profile->id)
->where('uuid', $uuid) ->where('uuid', $uuid)
@ -173,8 +172,6 @@ trait Instagram
\Log::info($e); \Log::info($e);
} }
return redirect(route('settings'))->with(['status' => [ return redirect(route('settings'))->with(['status' => 'Import successful! It may take a few minutes to finish.']);
'Import successful! It may take a few minutes to finish.'
]]);
} }
} }