mirror
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed.git
1
0
Fork 1
Code Issues Releases Wiki Activity

Update Status model

This commit is contained in:
Daniel Supernault 2018-11-03 21:48:57 -06:00
parent 0f35996ed7
commit 69606293b3
No known key found for this signature in database
GPG Key ID: 0DEF1C662C9033F7
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Status.php
View File

@ -52,7 +52,7 @@ class Status extends Model
{ {
$type = $this->viewType(); $type = $this->viewType();
$is_nsfw = !$showNsfw ? $this->is_nsfw : false; $is_nsfw = !$showNsfw ? $this->is_nsfw : false;
if ($this->media->count() == 0 || $is_nsfw || !in_array($type,['image', 'album'])) { if ($this->media->count() == 0 || $is_nsfw || !in_array($type,['image', 'album', 'video'])) {
return 'data:image/gif;base64,R0lGODlhAQABAIAAAMLCwgAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw=='; return 'data:image/gif;base64,R0lGODlhAQABAIAAAMLCwgAAACH5BAAAAAAALAAAAAABAAEAAAICRAEAOw==';
} }
@ -66,7 +66,7 @@ class Status extends Model
$path = config('app.url')."/p/{$username}/{$id}"; $path = config('app.url')."/p/{$username}/{$id}";
if (!is_null($this->in_reply_to_id)) { if (!is_null($this->in_reply_to_id)) {
$pid = $this->in_reply_to_id; $pid = $this->in_reply_to_id;
$path = config('app.url')."/p/{$username}/{$pid}/c/{$id}"; $path = "{$this->parent()->url()}#comment-{$id}";
} }
return url($path); return url($path);