Merge pull request #3186 from pixelfed/staging

Update atom feeds, include media alt text. Fixes #3184
This commit is contained in:
daniel 2022-01-25 00:50:39 -07:00 committed by GitHub
commit 80ac325fb6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
6 changed files with 64 additions and 44 deletions

View file

@ -17,6 +17,8 @@
- Updated ComposeModal, add max file size and allowed mime types. Fixes #3162. ([879281cc](https://github.com/pixelfed/pixelfed/commit/879281cc))
- Updated profile embeds, fix NaN bug and improve performance. ([3bd211d7](https://github.com/pixelfed/pixelfed/commit/3bd211d7))
- Updated ApiV1Controller, improve follow count cache invalidation. ([4b6effb9](https://github.com/pixelfed/pixelfed/commit/4b6effb9))
- Updated web routes, fix atom feeds for account usernames containing a dot. ([8c54ab57](https://github.com/pixelfed/pixelfed/commit/8c54ab57))
- Updated atom feeds, include media alt text. Fixes #3184. ([5d9b6863](https://github.com/pixelfed/pixelfed/commit/5d9b6863))
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.2 (2022-01-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.1...v0.11.2)

View file

@ -5,6 +5,7 @@ namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Auth;
use Cache;
use DB;
use View;
use App\Follower;
use App\FollowRequest;
@ -15,6 +16,7 @@ use App\UserFilter;
use League\Fractal;
use App\Services\AccountService;
use App\Services\FollowerService;
use App\Services\StatusService;
use App\Util\Lexer\Nickname;
use App\Util\Webfinger\Webfinger;
use App\Transformer\ActivityPub\ProfileOutbox;
@ -187,19 +189,35 @@ class ProfileController extends Controller
{
abort_if(!config('federation.atom.enabled'), 404);
$profile = $user = Profile::whereNull('status')->whereNull('domain')->whereUsername($user)->whereIsPrivate(false)->firstOrFail();
if($profile->status != null) {
return $this->accountCheck($profile);
}
if($profile->is_private || Auth::check()) {
$blocked = $this->blockedProfileCheck($profile);
$check = $this->privateProfileCheck($profile, null);
if($check || $blocked) {
return redirect($profile->url());
}
}
$items = $profile->statuses()->whereHas('media')->whereIn('visibility',['public', 'unlisted'])->orderBy('created_at', 'desc')->take(10)->get();
return response()->view('atom.user', compact('profile', 'items'))
$pid = AccountService::usernameToId($user);
abort_if(!$pid, 404);
$profile = AccountService::get($pid);
abort_if(!$profile || $profile['locked'] || !$profile['local'], 404);
$items = DB::table('statuses')
->whereProfileId($pid)
->whereVisibility('public')
->whereType('photo')
->latest()
->take(10)
->get()
->map(function($status) {
return StatusService::get($status->id);
})
->filter(function($status) {
return $status &&
isset($status['account']) &&
isset($status['media_attachments']) &&
count($status['media_attachments']);
})
->values();
$permalink = config('app.url') . "/users/{$profile['username']}.atom";
return response()
->view('atom.user', compact('profile', 'items', 'permalink'))
->header('Content-Type', 'application/atom+xml');
}

BIN
public/js/spa.js vendored

Binary file not shown.

Binary file not shown.

View file

@ -3,36 +3,36 @@
'<?xml version="1.0" encoding="UTF-8"?>'.PHP_EOL
?>
<feed xmlns="http://www.w3.org/2005/Atom" xmlns:media="http://search.yahoo.com/mrss/">
<id>{{$profile->permalink('.atom')}}</id>
<title>{{$profile->username}} on Pixelfed</title>
<subtitle>{{$profile->bio}}</subtitle>
<updated>{{$profile->updated_at->toAtomString()}}</updated>
<id>{{$permalink}}</id>
<title>{{$profile['username']}} on Pixelfed</title>
<subtitle type="html">{{$profile['note']}}</subtitle>
<updated>{{$profile['created_at']}}</updated>
<logo></logo>
<author>
<id>{{$profile->permalink()}}</id>
<uri>{{$profile->permalink()}}</uri>
<name>{{$profile->permalink()}}</name>
<summary type="html">{{$profile->bio}}</summary>
<link rel="alternate" type="text/html" href="{{$profile->url()}}"/>
<link rel="avatar" type="image/jpeg" media:width="120" media:height="120" href="{{$profile->avatarUrl()}}"/>
<id>{{$profile['url']}}</id>
<uri>{{$profile['url']}}</uri>
<name>{{$profile['url']}}</name>
<summary type="html">{{$profile['note']}}</summary>
<link rel="alternate" type="text/html" href="{{$profile['url']}}"/>
<link rel="avatar" type="image/jpeg" media:width="120" media:height="120" href="{{$profile['avatar']}}"/>
</author>
<link rel="alternate" type="text/html" href="{{$profile->url()}}"/>
<link rel="self" type="application/atom+xml" href="{{$profile->permalink('.atom')}}"/>
<link rel="alternate" type="text/html" href="{{$profile['url']}}"/>
<link rel="self" type="application/atom+xml" href="{{$permalink}}"/>
@foreach($items as $item)
<entry>
<title>{{ $item->caption }}</title>
<link rel="alternate" href="{{ $item->url() }}" />
<id>{{ $item->url() }}</id>
<title>{{ strip_tags($item['content']) }}</title>
<link rel="alternate" href="{{ $item['url'] }}" />
<id>{{ $item['url'] }}</id>
<author>
<name> <![CDATA[{{ $item->profile->username }}]]></name>
<name> <![CDATA[{{ $profile['username'] }}]]></name>
</author>
<summary type="html">
<![CDATA[
<img id="rss_item_{{$loop->iteration}}" src="{{ $item->thumb() }}">
<p style="padding:10px;">{{ $item->caption }}</p>
<img id="rss_item_{{$loop->iteration}}" src="{{ $item['media_attachments'][0]['url'] }}" alt="{{ $item['media_attachments'][0]['description'] }}">
<p style="padding:10px;">{{ $item['content'] }}</p>
]]>
</summary>
<updated>{{ $item->updated_at->toAtomString() }}</updated>
<updated>{{ $item['created_at'] }}</updated>
</entry>
@endforeach
</feed>

View file

@ -516,7 +516,7 @@ Route::domain(config('pixelfed.domain.app'))->middleware(['validemail', 'twofact
Route::group(['prefix' => 'users'], function () {
Route::redirect('/', '/');
Route::get('{user}.atom', 'ProfileController@showAtomFeed');
Route::get('{user}.atom', 'ProfileController@showAtomFeed')->where('user', '.*');
Route::get('{username}/outbox', 'FederationController@userOutbox');
Route::get('{username}/followers', 'FederationController@userFollowers');
Route::get('{username}/following', 'FederationController@userFollowing');