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

Merge pull request #645 from pixelfed/frontend-ui-refactor

Browse source 
Frontend ui refactor
This commit is contained in:
daniel 2018-12-15 18:41:29 -07:00 committed by GitHub
commit 9360779cba
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/Http/Controllers/ProfileController.php
View file

@ -136,7 +136,7 @@ class ProfileController extends Controller
return redirect($profile->url()); return redirect($profile->url());
} }
} }
$items = $profile->statuses()->whereIn('visibility',['public', 'unlisted'])->orderBy('created_at', 'desc')->take(10)->get(); $items = $profile->statuses()->whereHas('media')->whereIn('visibility',['public', 'unlisted'])->orderBy('created_at', 'desc')->take(10)->get();
return response()->view('atom.user', compact('profile', 'items')) return response()->view('atom.user', compact('profile', 'items'))
->header('Content-Type', 'application/atom+xml'); ->header('Content-Type', 'application/atom+xml');
} }

2
config/pixelfed.php
View file

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

2
resources/views/atom/user.blade.php
View file

@ -28,7 +28,7 @@
<entry> <entry>
<title>{{ $item->caption }}</title> <title>{{ $item->caption }}</title>
<link rel="alternate" href="{{ $item->url() }}" /> <link rel="alternate" href="{{ $item->url() }}" />
<id>{{ url($item->id) }}</id> <id>{{ $item->url() }}</id>
<author> <author>
<name> <![CDATA[{{ $item->profile->username }}]]></name> <name> <![CDATA[{{ $item->profile->username }}]]></name>
</author> </author>