Update Status, generate missing status types

pull/629/head
Daniel Supernault 2018-12-10 21:14:50 -07:00
rodzic ad5d6b9977
commit b7362caf50
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 0DEF1C662C9033F7
3 zmienionych plików z 8 dodań i 14 usunięć

Wyświetl plik

@ -53,30 +53,24 @@ class Status extends Model
// todo: deprecate after 0.6.0
public function viewType()
{
return Cache::remember('status:view-type:'.$this->id, 10080, function() {
$this->setType();
$media = $this->firstMedia();
$mime = explode('/', $media->mime)[0];
$count = $this->media()->count();
$type = ($mime == 'image') ? 'image' : 'video';
if($count > 1) {
$type = ($type == 'image') ? 'album' : 'video-album';
}
return $type;
});
if($this->type) {
return $this->type;
}
return $this->setType();
}
// todo: deprecate after 0.6.0
public function setType()
{
if(in_array($this->type, self::STATUS_TYPES)) {
return;
return $this->type;
}
$mimes = $this->media->pluck('mime')->toArray();
$type = StatusController::mimeTypeCheck($mimes);
if($type) {
$this->type = $type;
$this->save();
return $type;
}
}

Wyświetl plik

@ -41,7 +41,7 @@ class StatusTransformer extends Fractal\TransformerAbstract
'language' => null,
'pinned' => null,
'pf_type' => $status->type,
'pf_type' => $status->type ?? $status->setType(),
];
}

Wyświetl plik

@ -23,7 +23,7 @@ return [
| This value is the version of your PixelFed instance.
|
*/
'version' => '0.5.0',
'version' => '0.5.1',
/*
|--------------------------------------------------------------------------