chris
/
pixelfed
forked from mirror/pixelfed
1
0
Fork 0
Code Pull Requests Activity

Update ImportPipeline

This commit is contained in:
Daniel Supernault 2019-03-18 14:04:14 -06:00
parent 77819a6dd0
commit c7819514d9
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
app/Jobs/ImportPipeline/ImportInstagram.php
View File

@ -24,7 +24,7 @@ class ImportInstagram implements ShouldQueue
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
protected $job;
protected $import;
/**
* Delete the job if its models no longer exist.
@ -38,9 +38,9 @@ class ImportInstagram implements ShouldQueue
*
* @return void
*/
public function __construct(ImportJob $job)
public function __construct(ImportJob $import)
{
$this->job = $job;
$this->import = $import;
}
/**
@ -53,9 +53,9 @@ class ImportInstagram implements ShouldQueue
if(config('pixelfed.import.instagram.enabled') != true) {
return;
}
$job = $this->job;
$profile = $this->job->profile;
$job = ImportJob::findOrFail($this->import->id);
$profile = Profile::findOrFail($job->profile_id);
$json = $job->mediaJson();
$collection = $json['photos'];
$files = $job->files;
@ -78,9 +78,9 @@ class ImportInstagram implements ShouldQueue
$filename = last( explode('/', $import['path']) );
$importData = ImportData::whereJobId($job->id)
->whereOriginalName($filename)
->firstOrFail();
->first();
if(is_file(storage_path("app/$importData->path")) == false) {
if(empty($importData) || is_file(storage_path("app/$importData->path")) == false) {
continue;
}
@ -92,6 +92,8 @@ class ImportInstagram implements ShouldQueue
$status->profile_id = $profile->id;
$status->caption = strip_tags($caption);
$status->is_nsfw = false;
$status->type = 'photo';
$status->scope = 'unlisted';
$status->visibility = 'unlisted';
$status->created_at = $taken_at;
$status->save();