Merge pull request #3473 from pixelfed/staging

Staging
2024-09-03 20:06:04 +02:00 · 2022-05-15 23:35:21 -06:00 · 2022-05-15 23:35:21 -06:00 · 54f4cac9c2
commit 54f4cac9c2
parent eaddb2147a 306b6232b6
63 changed files with 222 additions and 153 deletions
--- a/.env.docker
+++ b/.env.docker
@ -83,6 +83,8 @@ REDIS_PASSWORD=redis_password
 REDIS_PORT=6379
 REDIS_DATABASE=0

+HORIZON_PREFIX="horizon-"
+
 ## EXPERIMENTS 
 EXP_LC=false
 EXP_REC=false
@ -145,4 +147,4 @@ TRUST_PROXIES="*"

 ## Passport
 #PASSPORT_PRIVATE_KEY=
-#PASSPORT_PUBLIC_KEY=
+#PASSPORT_PUBLIC_KEY=
--- a/.env.example
+++ b/.env.example
@ -23,6 +23,8 @@ CACHE_DRIVER=redis
 SESSION_DRIVER=redis
 QUEUE_DRIVER=redis

+HORIZON_PREFIX="horizon-"
+
 REDIS_SCHEME=tcp
 REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
--- a/.env.testing
+++ b/.env.testing
@ -28,6 +28,8 @@ REDIS_HOST=127.0.0.1
 REDIS_PASSWORD=null
 REDIS_PORT=6379

+HORIZON_PREFIX="horizon-"
+
 MAIL_DRIVER=log
 MAIL_HOST=smtp.mailtrap.io
 MAIL_PORT=2525
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@ -2,13 +2,21 @@

 ## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.11.3...dev)

+### Breaking
+- Replaced `predis` with `phpredis` as default redis driver due to predis being deprecated, install [phpredis](https://github.com/phpredis/phpredis/blob/develop/INSTALL.markdown) if you're still using predis.
+
 ### Updates
 - Improve S3 support by removing `ListObjects` call in media deletion ([#3438](https://github.com/pixelfed/pixelfed/pull/3438))
 - Enforce UTC in incoming activities ([18931a1f](https://github.com/pixelfed/pixelfed/commit/18931a1f))
 - Add storage flags to admin dashboard diagnostics ([#3444](https://github.com/pixelfed/pixelfed/pull/3444))
 - Hardcode UTC application timezone to prevent timezone issues ([b0d2c5e1](https://github.com/pixelfed/pixelfed/commit/b0d2c5e1))
 - Remove arbitrary metro url redirect timeout ([84209c24](https://github.com/pixelfed/pixelfed/commit/84209c24))
+- Fix JSON-LD contexts ([#3464](https://github.com/pixelfed/pixelfed/pull/3464))
 - Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1))
+- Add trusted proxies flag to admin dashboard diagnostics ([#3450](https://github.com/pixelfed/pixelfed/pull/3450))
+- Fix json-ld attributes, fixes #3423 ([95f902b1](https://github.com/pixelfed/pixelfed/commit/95f902b1))
+- Update exp config, enforce mastoapi compatibility by default ([a160b233](https://github.com/pixelfed/pixelfed/commit/a160b233))
+- Update home timeline, redirect to /i/web unless force_old_ui is presen ([5ff4730f](https://github.com/pixelfed/pixelfed/commit/5ff4730f))

 ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)

--- a/app/Console/Commands/Installer.php
+++ b/app/Console/Commands/Installer.php
@ -97,7 +97,6 @@ class Installer extends Command
            if(extension_loaded($ext) == false) {
                $this->error("- {$ext} extension not found, aborting installation");
                exit;
-            } else {
            }
        }
        $this->info("- Required PHP extensions found!");
--- a/app/Http/Controllers/AdminController.php
+++ b/app/Http/Controllers/AdminController.php
@ -120,7 +120,7 @@ class AdminController extends Controller
 	public function appsHome(Request $request)
 	{
 		$filter = $request->input('filter');
-		if(in_array($filter, ['revoked'])) {
+		if($filter == 'revoked') {
 			$apps = OauthClient::with('user')
 			->whereNotNull('user_id')
 			->whereRevoked(true)
--- a/app/Http/Controllers/DirectMessageController.php
+++ b/app/Http/Controllers/DirectMessageController.php
@ -796,13 +796,8 @@ class DirectMessageController extends Controller

 		$body = [
 			'@context' => [
-				'https://www.w3.org/ns/activitystreams',
 				'https://w3id.org/security/v1',
-				[
-					'sc'                => 'http://schema.org#',
-					'Hashtag'           => 'as:Hashtag',
-					'sensitive'         => 'as:sensitive',
-				]
+				'https://www.w3.org/ns/activitystreams',
 			],
 			'id'                    => $dm->status->permalink(),
 			'type'                  => 'Create',
@ -845,12 +840,6 @@ class DirectMessageController extends Controller
 		$body = [
 			'@context' => [
 				'https://www.w3.org/ns/activitystreams',
-				'https://w3id.org/security/v1',
-				[
-					'sc'				=> 'http://schema.org#',
-					'Hashtag'			=> 'as:Hashtag',
-					'sensitive'			=> 'as:sensitive',
-				]
 			],
 			'id' => $dm->status->permalink('#delete'),
 			'to' => [
--- a/app/Http/Controllers/SiteController.php
+++ b/app/Http/Controllers/SiteController.php
@ -29,11 +29,11 @@ class SiteController extends Controller

 	public function homeTimeline(Request $request)
 	{
-		$this->validate($request, [
-			'layout' => 'nullable|string|in:grid,feed'
-		]);
-		$layout = $request->input('layout', 'feed');
-		return view('timeline.home', compact('layout'));
+		if($request->has('force_old_ui')) {
+			return view('timeline.home', ['layout' => 'feed']);
+		}
+
+		return redirect('/i/web');
 	}

 	public function changeLocale(Request $request, $locale)
--- a/app/Transformer/ActivityPub/ProfileTransformer.php
+++ b/app/Transformer/ActivityPub/ProfileTransformer.php
@ -11,13 +11,10 @@ class ProfileTransformer extends Fractal\TransformerAbstract
    {
        return [
          '@context' => [
-            'https://www.w3.org/ns/activitystreams',
            'https://w3id.org/security/v1',
+            'https://www.w3.org/ns/activitystreams',
            [
              'manuallyApprovesFollowers' => 'as:manuallyApprovesFollowers',
-              'PropertyValue'             => 'schema:PropertyValue',
-              'schema'                    => 'http://schema.org#',
-              'value'                     => 'schema:value'
            ],
          ],
          'id'                        => $profile->permalink(),
--- a/app/Transformer/ActivityPub/Verb/CreateNote.php
+++ b/app/Transformer/ActivityPub/Verb/CreateNote.php
@ -53,17 +53,32 @@ class CreateNote extends Fractal\TransformerAbstract

 		return [
 			'@context' => [
-				'https://www.w3.org/ns/activitystreams',
 				'https://w3id.org/security/v1',
+				'https://www.w3.org/ns/activitystreams',
 				[
-					'sc'				=> 'http://schema.org#',
 					'Hashtag' 			=> 'as:Hashtag',
 					'sensitive' 		=> 'as:sensitive',
-					'commentsEnabled' 	=> 'sc:Boolean',
-					'@capabilities'		=> [
-						'@announce'			=> '@id',
-						'@like'				=> '@id',
-						'@reply'			=> '@id',
+					'schema' 		=> 'http://schema.org/',
+					'pixelfed' 		=> 'http://pixelfed.org/ns#'
+					'commentsEnabled' 	=> [
+						'@id' 		=> 'pixelfed:commentsEnabled',
+						'@type' 		=> 'schema:Boolean'
+					],
+					'capabilities'		=> [
+						'@id' 		=> 'pixelfed:capabilities',
+						'@container' => '@set'
+					],
+					'announce'		=> [
+						'@id' 		=> 'pixelfed:canAnnounce',
+						'@type' => '@id'
+					],
+					'like'		=> [
+						'@id' 		=> 'pixelfed:canLike',
+						'@type' => '@id'
+					],
+					'reply'		=> [
+						'@id' 		=> 'pixelfed:canReply',
+						'@type' => '@id'
 					],
 					'toot' 				=> 'http://joinmastodon.org/ns#',
 					'Emoji'				=> 'toot:Emoji'
--- a/app/Transformer/ActivityPub/Verb/CreateQuestion.php
+++ b/app/Transformer/ActivityPub/Verb/CreateQuestion.php
@ -16,18 +16,35 @@ class CreateQuestion extends Fractal\TransformerAbstract
 	{
 		return [
 			'@context' => [
-				'https://www.w3.org/ns/activitystreams',
 				'https://w3id.org/security/v1',
+				'https://www.w3.org/ns/activitystreams',
 				[
-					'sc'				=> 'http://schema.org#',
 					'Hashtag' 			=> 'as:Hashtag',
 					'sensitive' 		=> 'as:sensitive',
-					'commentsEnabled' 	=> 'sc:Boolean',
-					'@capabilities'		=> [
-						'@announce'			=> '@id',
-						'@like'				=> '@id',
-						'@reply'			=> '@id',
+					'schema' 		=> 'http://schema.org/',
+					'pixelfed' 		=> 'http://pixelfed.org/ns#'
+					'commentsEnabled' 	=> [
+						'@id' 		=> 'pixelfed:commentsEnabled',
+						'@type' 		=> 'schema:Boolean'
 					],
+					'capabilities'		=> [
+						'@id' 		=> 'pixelfed:capabilities',
+						'@container' => '@set'
+					],
+					'announce'		=> [
+						'@id' 		=> 'pixelfed:canAnnounce',
+						'@type' => '@id'
+					],
+					'like'		=> [
+						'@id' 		=> 'pixelfed:canLike',
+						'@type' => '@id'
+					],
+					'reply'		=> [
+						'@id' 		=> 'pixelfed:canReply',
+						'@type' => '@id'
+					],
+					'toot' 				=> 'http://joinmastodon.org/ns#',
+					'Emoji'				=> 'toot:Emoji'
 				]
 			],
 			'id' 					=> $status->permalink(),
--- a/app/Transformer/ActivityPub/Verb/Note.php
+++ b/app/Transformer/ActivityPub/Verb/Note.php
@ -54,17 +54,32 @@ class Note extends Fractal\TransformerAbstract

 		return [
 			'@context' => [
-				'https://www.w3.org/ns/activitystreams',
 				'https://w3id.org/security/v1',
+				'https://www.w3.org/ns/activitystreams',
 				[
-					'sc'				=> 'http://schema.org#',
 					'Hashtag' 			=> 'as:Hashtag',
 					'sensitive' 		=> 'as:sensitive',
-					'commentsEnabled' 	=> 'sc:Boolean',
-					'@capabilities'		=> [
-						'@announce'			=> '@id',
-						'@like'				=> '@id',
-						'@reply'			=> '@id',
+					'schema' 		=> 'http://schema.org/',
+					'pixelfed' 		=> 'http://pixelfed.org/ns#'
+					'commentsEnabled' 	=> [
+						'@id' 		=> 'pixelfed:commentsEnabled',
+						'@type' 		=> 'schema:Boolean'
+					],
+					'capabilities'		=> [
+						'@id' 		=> 'pixelfed:capabilities',
+						'@container' => '@set'
+					],
+					'announce'		=> [
+						'@id' 		=> 'pixelfed:canAnnounce',
+						'@type' => '@id'
+					],
+					'like'		=> [
+						'@id' 		=> 'pixelfed:canLike',
+						'@type' => '@id'
+					],
+					'reply'		=> [
+						'@id' 		=> 'pixelfed:canReply',
+						'@type' => '@id'
 					],
 					'toot' 				=> 'http://joinmastodon.org/ns#',
 					'Emoji'				=> 'toot:Emoji'
--- a/app/Transformer/ActivityPub/Verb/Question.php
+++ b/app/Transformer/ActivityPub/Verb/Question.php
@ -32,58 +32,75 @@ class Question extends Fractal\TransformerAbstract
 		$tags = array_merge($mentions, $hashtags);

 		return [
-				'@context' => [
-					'https://www.w3.org/ns/activitystreams',
-					'https://w3id.org/security/v1',
-					[
-						'sc'				=> 'http://schema.org#',
-						'Hashtag' 			=> 'as:Hashtag',
-						'sensitive' 		=> 'as:sensitive',
-						'commentsEnabled' 	=> 'sc:Boolean',
-						'@capabilities'		=> [
-							'@announce'			=> '@id',
-							'@like'				=> '@id',
-							'@reply'			=> '@id',
-						],
+			'@context' => [
+				'https://w3id.org/security/v1',
+				'https://www.w3.org/ns/activitystreams',
+				[
+					'Hashtag' 			=> 'as:Hashtag',
+					'sensitive' 		=> 'as:sensitive',
+					'schema' 		=> 'http://schema.org/',
+					'pixelfed' 		=> 'http://pixelfed.org/ns#'
+					'commentsEnabled' 	=> [
+						'@id' 		=> 'pixelfed:commentsEnabled',
+						'@type' 		=> 'schema:Boolean'
+					],
+					'capabilities'		=> [
+						'@id' 		=> 'pixelfed:capabilities',
+						'@container' => '@set'
+					],
+					'announce'		=> [
+						'@id' 		=> 'pixelfed:canAnnounce',
+						'@type' => '@id'
+					],
+					'like'		=> [
+						'@id' 		=> 'pixelfed:canLike',
+						'@type' => '@id'
+					],
+					'reply'		=> [
+						'@id' 		=> 'pixelfed:canReply',
+						'@type' => '@id'
+					],
+					'toot' 				=> 'http://joinmastodon.org/ns#',
+					'Emoji'				=> 'toot:Emoji'
+				]
+			],
+			'id' 				=> $status->url(),
+			'type' 				=> 'Question',
+			'summary'   		=> null,
+			'content'   		=> $status->rendered ?? $status->caption,
+			'inReplyTo' 		=> $status->in_reply_to_id ? $status->parent()->url() : null,
+			'published'    		=> $status->created_at->toAtomString(),
+			'url'          		=> $status->url(),
+			'attributedTo' 		=> $status->profile->permalink(),
+			'to'           		=> $status->scopeToAudience('to'),
+			'cc' 				=> $status->scopeToAudience('cc'),
+			'sensitive'       	=> (bool) $status->is_nsfw,
+			'attachment'      	=> [],
+			'tag' 				=> $tags,
+			'commentsEnabled'  => (bool) !$status->comments_disabled,
+			'capabilities' => [
+				'announce' => 'https://www.w3.org/ns/activitystreams#Public',
+				'like' => 'https://www.w3.org/ns/activitystreams#Public',
+				'reply' => $status->comments_disabled == true ? null : 'https://www.w3.org/ns/activitystreams#Public'
+			],
+			'location' => $status->place_id ? [
+					'type' => 'Place',
+					'name' => $status->place->name,
+					'longitude' => $status->place->long,
+					'latitude' => $status->place->lat,
+					'country' => $status->place->country
+				] : null,
+			'endTime' => $status->poll->expires_at->toAtomString(),
+			'oneOf' => collect($status->poll->poll_options)->map(function($option, $index) use($status) {
+				return [
+					'type' => 'Note',
+					'name' => $option,
+					'replies' => [
+						'type' => 'Collection',
+						'totalItems' => $status->poll->cached_tallies[$index]
 					]
-				],
-				'id' 				=> $status->url(),
-				'type' 				=> 'Question',
-				'summary'   		=> null,
-				'content'   		=> $status->rendered ?? $status->caption,
-				'inReplyTo' 		=> $status->in_reply_to_id ? $status->parent()->url() : null,
-				'published'    		=> $status->created_at->toAtomString(),
-				'url'          		=> $status->url(),
-				'attributedTo' 		=> $status->profile->permalink(),
-				'to'           		=> $status->scopeToAudience('to'),
-				'cc' 				=> $status->scopeToAudience('cc'),
-				'sensitive'       	=> (bool) $status->is_nsfw,
-				'attachment'      	=> [],
-				'tag' 				=> $tags,
-				'commentsEnabled'  => (bool) !$status->comments_disabled,
-				'capabilities' => [
-					'announce' => 'https://www.w3.org/ns/activitystreams#Public',
-					'like' => 'https://www.w3.org/ns/activitystreams#Public',
-					'reply' => $status->comments_disabled == true ? null : 'https://www.w3.org/ns/activitystreams#Public'
-				],
-				'location' => $status->place_id ? [
-						'type' => 'Place',
-						'name' => $status->place->name,
-						'longitude' => $status->place->long,
-						'latitude' => $status->place->lat,
-						'country' => $status->place->country
-					] : null,
-				'endTime' => $status->poll->expires_at->toAtomString(),
-				'oneOf' => collect($status->poll->poll_options)->map(function($option, $index) use($status) {
-					return [
-						'type' => 'Note',
-						'name' => $option,
-						'replies' => [
-							'type' => 'Collection',
-							'totalItems' => $status->poll->cached_tallies[$index]
-						]
-					];
-				})
-			];
+				];
+			})
+		];
 	}
 }
--- a/app/Transformer/Api/Mastodon/v1/StatusTransformer.php
+++ b/app/Transformer/Api/Mastodon/v1/StatusTransformer.php
@ -38,7 +38,6 @@ class StatusTransformer extends Fractal\TransformerAbstract
 				'website'   => null
 			 ],
 			'mentions'                  => [],
-			'tags'                      => [],
 			'emojis'                    => [],
 			'card'                      => null,
 			'poll'                      => null,
--- a/app/Util/ActivityPub/Inbox.php
+++ b/app/Util/ActivityPub/Inbox.php
@ -667,6 +667,7 @@ class Inbox
 					if($story) {
 						StoryExpire::dispatch($story)->onQueue('story');
 					}
+					break;

 				default:
 					return;
--- a/config/database.php
+++ b/config/database.php
@ -107,7 +107,7 @@ return [

    'redis' => [

-        'client' => env('REDIS_CLIENT', 'predis'),
+        'client' => env('REDIS_CLIENT', 'phpredis'),

        'default' => [
            'scheme'   => env('REDIS_SCHEME', 'tcp'),
--- a/config/exp.php
+++ b/config/exp.php
@ -32,6 +32,5 @@ return [
 	'spa' => true,

 	// Enforce Mastoapi Compatibility (alpha)
-	// Note: this may break 3rd party apps who use non-mastodon compliant fields
-	'emc' => env('EXP_EMC', false),
+	'emc' => env('EXP_EMC', true),
 ];
--- a/config/horizon.php
+++ b/config/horizon.php
@ -52,7 +52,7 @@ return [
 	|
 	*/

-	'prefix' => env('HORIZON_PREFIX', 'horizon-'.str_random(8).':'),
+	'prefix' => env('HORIZON_PREFIX', 'horizon-'),

 	/*
 	|--------------------------------------------------------------------------
--- a/config/trustedproxy.php
+++ b/config/trustedproxy.php
@ -23,5 +23,5 @@ return [
     * how many proxies that client's request has
     * subsequently passed through.
     */
-    'proxies' => env('TRUST_PROXIES', ''),
+    'proxies' => env('TRUST_PROXIES', '*'),
 ];
--- a/public/js/compose-mh8cayo8d.js
+++ b/public/js/compose-mh8cayo8d.js
--- a/public/js/daci-mh8cayo8d.js
+++ b/public/js/daci-mh8cayo8d.js
--- a/public/js/daci-nza92p6rg.js
+++ b/public/js/daci-nza92p6rg.js
--- a/public/js/dffc-mh8cayo8d.js
+++ b/public/js/dffc-mh8cayo8d.js
--- a/public/js/dffc-nza92p6rg.js
+++ b/public/js/dffc-nza92p6rg.js
--- a/public/js/discover-mh8cayo8d.js
+++ b/public/js/discover-mh8cayo8d.js
--- a/public/js/dms-mh8cayo8d.js
+++ b/public/js/dms-mh8cayo8d.js
--- a/public/js/dmsg-mh8cayo8d.js
+++ b/public/js/dmsg-mh8cayo8d.js
--- a/public/js/dmyh-mh8cayo8d.js
+++ b/public/js/dmyh-mh8cayo8d.js
--- a/public/js/dmyh-nza92p6rg.js
+++ b/public/js/dmyh-nza92p6rg.js
--- a/public/js/dmym-mh8cayo8d.js
+++ b/public/js/dmym-mh8cayo8d.js
--- a/public/js/dmym-nza92p6rg.js
+++ b/public/js/dmym-nza92p6rg.js
--- a/public/js/dsfc-mh8cayo8d.js
+++ b/public/js/dsfc-mh8cayo8d.js
--- a/public/js/dsfc-nza92p6rg.js
+++ b/public/js/dsfc-nza92p6rg.js
--- a/public/js/dssc-mh8cayo8d.js
+++ b/public/js/dssc-mh8cayo8d.js
--- a/public/js/dssc-nza92p6rg.js
+++ b/public/js/dssc-nza92p6rg.js
--- a/public/js/home-mh8cayo8d.js
+++ b/public/js/home-mh8cayo8d.js
--- a/public/js/home-nza92p6rg.js
+++ b/public/js/home-nza92p6rg.js
--- a/public/js/loops.js
+++ b/public/js/loops.js
@ -1 +0,0 @@
-(self.webpackChunkpixelfed=self.webpackChunkpixelfed||[]).push([[215],{85528:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>a});var s=n(19755);Object.defineProperty(HTMLMediaElement.prototype,"playing",{get:function(){return!!(this.currentTime>0&&!this.paused&&!this.ended&&this.readyState>2)}});const a={data:function(){return{loading:!0,version:1,loops:[],tab:"new"}},mounted:function(){var t=this;axios.get("/api/v2/loops").then((function(e){t.loops=e.data,t.loading=!1}))},methods:{videoSrc:function(t){return t.media_attachments[0].url},posterSrc:function(t){return t.media_attachments[0].preview_url},setTab:function(t){this.tab=t},toggleVideo:function(t,e){var n=e.target;s("video").each((function(){n.src!=s(this)[0].src&&s(this)[0].pause()})),n.playing?n.pause():n.play()},incrementLoop:function(t){},timestamp:function(t){return new Date(t.created_at).toLocaleDateString()},getTitle:function(t){return(t.content?t.content:"Untitled").trim()},truncate:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:15;return _.truncate(t,{length:e})}}}},45502:(t,e,n)=>{Vue.component("loops-component",n(41091).default)},83796:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>r});var s=n(23645),a=n.n(s)()((function(t){return t[1]}));a.push([t.id,".loops-container .card{box-shadow:none}.loops-container .card .card-img-top{border-radius:0}.loops-container a{color:#343a40}.loops-container .card-body a:hover,a.hashtag{color:#28a745!important}",""]);const r=a},44402:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>i});var s=n(93379),a=n.n(s),r=n(83796),o={insert:"head",singleton:!1};a()(r.default,o);const i=r.default.locals||{}},41091:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>o});var s=n(6939),a=n(61539),r={};for(const t in a)"default"!==t&&(r[t]=()=>a[t]);n.d(e,r);n(48264);const o=(0,n(51900).default)(a.default,s.render,s.staticRenderFns,!1,null,null,null).exports},61539:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>r});var s=n(85528),a={};for(const t in s)"default"!==t&&(a[t]=()=>s[t]);n.d(e,a);const r=s.default},48264:(t,e,n)=>{"use strict";n.r(e);var s=n(44402),a={};for(const t in s)"default"!==t&&(a[t]=()=>s[t]);n.d(e,a)},6939:(t,e,n)=>{"use strict";n.r(e);var s=n(54995),a={};for(const t in s)"default"!==t&&(a[t]=()=>s[t]);n.d(e,a)},54995:(t,e,n)=>{"use strict";n.r(e),n.d(e,{render:()=>s,staticRenderFns:()=>a});var s=function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"w-100 h-100"},[t.loading?n("div",{staticClass:"d-flex justify-content-center align-items-center",staticStyle:{"min-height":"400px"}},[n("img",{attrs:{src:"/img/pixelfed-icon-grey.svg"}})]):n("div",[n("div",{staticClass:"mb-4"},[n("p",{staticClass:"text-center"},[n("a",{class:["new"==t.tab?"btn font-weight-bold py-0 btn-success":"btn font-weight-bold py-0 btn-outline-success"],attrs:{href:"#"},on:{click:function(e){return e.preventDefault(),t.setTab("new")}}},[t._v("New")]),t._v(" "),n("a",{class:["about"==t.tab?"btn font-weight-bold py-0 btn-success":"btn font-weight-bold py-0 btn-outline-success"],attrs:{href:"#"},on:{click:function(e){return e.preventDefault(),t.setTab("about")}}},[t._v("About")])])]),t._v(" "),"about"!=t.tab?n("div",{staticClass:"row loops-container"},t._l(t.loops,(function(e,s){return n("div",{staticClass:"col-12 col-md-4 mb-3"},[n("div",{staticClass:"card border border-success"},[n("div",{staticClass:"embed-responsive embed-responsive-1by1"},[n("video",{staticClass:"embed-responsive-item",attrs:{src:t.videoSrc(e),preload:"none",width:"100%",height:"100%",loop:"",poster:t.posterSrc(e)},on:{click:function(n){return t.toggleVideo(e,n)}}})]),t._v(" "),n("div",{staticClass:"card-body"},[n("p",{staticClass:"username font-weight-bolder lead d-flex justify-content-between"},[n("a",{attrs:{href:e.account.url,title:e.account.acct}},[t._v(t._s(t.truncate(e.account.acct)))]),t._v(" "),n("a",{attrs:{href:e.url}},[t._v(t._s(t.timestamp(e)))])]),t._v(" "),n("p",{staticClass:"small text-muted text-truncate",domProps:{innerHTML:t._s(t.getTitle(e))}}),t._v(" "),n("div",{staticClass:"small text-muted d-flex justify-content-between mb-0"},[n("span",[t._v(t._s(e.favourites_count)+" Likes")]),t._v(" "),n("span",[t._v(t._s(e.reblogs_count)+" Shares")]),t._v(" "),n("span",[t._v(t._s(e.reply_count)+" Comments")])])])])])})),0):n("div",{staticClass:"col-12"},[t._m(0)])])])},a=[function(){var t=this,e=t.$createElement,n=t._self._c||e;return n("div",{staticClass:"card"},[n("div",{staticClass:"card-body"},[n("p",{staticClass:"lead text-center mb-0"},[t._v("Loops are an exciting new way to explore short videos on Pixelfed.")])])])}]}},t=>{t.O(0,[898],(()=>{return e=45502,t(t.s=e);var e}));t.O()}]);
--- a/public/js/manifest.js
+++ b/public/js/manifest.js
@ -1 +1 @@
-(()=>{"use strict";var e,r,t,n={},o={};function a(e){var r=o[e];if(void 0!==r)return r.exports;var t=o[e]={id:e,loaded:!1,exports:{}};return n[e].call(t.exports,t,t.exports,a),t.loaded=!0,t.exports}a.m=n,e=[],a.O=(r,t,n,o)=>{if(!t){var s=1/0;for(p=0;p<e.length;p++){for(var[t,n,o]=e[p],i=!0,d=0;d<t.length;d++)(!1&o||s>=o)&&Object.keys(a.O).every((e=>a.O[e](t[d])))?t.splice(d--,1):(i=!1,o<s&&(s=o));if(i){e.splice(p--,1);var l=n();void 0!==l&&(r=l)}}return r}o=o||0;for(var p=e.length;p>0&&e[p-1][2]>o;p--)e[p]=e[p-1];e[p]=[t,n,o]},a.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return a.d(r,{a:r}),r},a.d=(e,r)=>{for(var t in r)a.o(r,t)&&!a.o(e,t)&&Object.defineProperty(e,t,{enumerable:!0,get:r[t]})},a.f={},a.e=e=>Promise.all(Object.keys(a.f).reduce(((r,t)=>(a.f[t](e,r),r)),[])),a.u=e=>299===e?"js/home-nza92p6rg.js":918===e?"js/compose-nza92p6rg.js":317===e?"js/post-nza92p6rg.js":192===e?"js/profile-nza92p6rg.js":111===e?"js/dmym-nza92p6rg.js":483===e?"js/dmyh-nza92p6rg.js":281===e?"js/daci-nza92p6rg.js":271===e?"js/dffc-nza92p6rg.js":549===e?"js/dsfc-nza92p6rg.js":565===e?"js/dssc-nza92p6rg.js":void 0,a.miniCssF=e=>({138:"css/spa",170:"css/app",242:"css/appdark",703:"css/admin",994:"css/landing"}[e]+".css"),a.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),a.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},t="pixelfed:",a.l=(e,n,o,s)=>{if(r[e])r[e].push(n);else{var i,d;if(void 0!==o)for(var l=document.getElementsByTagName("script"),p=0;p<l.length;p++){var c=l[p];if(c.getAttribute("src")==e||c.getAttribute("data-webpack")==t+o){i=c;break}}i||(d=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,a.nc&&i.setAttribute("nonce",a.nc),i.setAttribute("data-webpack",t+o),i.src=e),r[e]=[n];var u=(t,n)=>{i.onerror=i.onload=null,clearTimeout(f);var o=r[e];if(delete r[e],i.parentNode&&i.parentNode.removeChild(i),o&&o.forEach((e=>e(n))),t)return t(n)},f=setTimeout(u.bind(null,void 0,{type:"timeout",target:i}),12e4);i.onerror=u.bind(null,i.onerror),i.onload=u.bind(null,i.onload),d&&document.head.appendChild(i)}},a.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),a.p="/",(()=>{var e={929:0,242:0,170:0,138:0,703:0,994:0};a.f.j=(r,t)=>{var n=a.o(e,r)?e[r]:void 0;if(0!==n)if(n)t.push(n[2]);else if(/^(138|170|242|703|929|994)$/.test(r))e[r]=0;else{var o=new Promise(((t,o)=>n=e[r]=[t,o]));t.push(n[2]=o);var s=a.p+a.u(r),i=new Error;a.l(s,(t=>{if(a.o(e,r)&&(0!==(n=e[r])&&(e[r]=void 0),n)){var o=t&&("load"===t.type?"missing":t.type),s=t&&t.target&&t.target.src;i.message="Loading chunk "+r+" failed.\n("+o+": "+s+")",i.name="ChunkLoadError",i.type=o,i.request=s,n[1](i)}}),"chunk-"+r,r)}},a.O.j=r=>0===e[r];var r=(r,t)=>{var n,o,[s,i,d]=t,l=0;if(s.some((r=>0!==e[r]))){for(n in i)a.o(i,n)&&(a.m[n]=i[n]);if(d)var p=d(a)}for(r&&r(t);l<s.length;l++)o=s[l],a.o(e,o)&&e[o]&&e[o][0](),e[o]=0;return a.O(p)},t=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];t.forEach(r.bind(null,0)),t.push=r.bind(null,t.push.bind(t))})()})();
+(()=>{"use strict";var e,r,o,t={},s={};function a(e){var r=s[e];if(void 0!==r)return r.exports;var o=s[e]={id:e,loaded:!1,exports:{}};return t[e].call(o.exports,o,o.exports,a),o.loaded=!0,o.exports}a.m=t,e=[],a.O=(r,o,t,s)=>{if(!o){var n=1/0;for(l=0;l<e.length;l++){for(var[o,t,s]=e[l],d=!0,i=0;i<o.length;i++)(!1&s||n>=s)&&Object.keys(a.O).every((e=>a.O[e](o[i])))?o.splice(i--,1):(d=!1,s<n&&(n=s));if(d){e.splice(l--,1);var c=t();void 0!==c&&(r=c)}}return r}s=s||0;for(var l=e.length;l>0&&e[l-1][2]>s;l--)e[l]=e[l-1];e[l]=[o,t,s]},a.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return a.d(r,{a:r}),r},a.d=(e,r)=>{for(var o in r)a.o(r,o)&&!a.o(e,o)&&Object.defineProperty(e,o,{enumerable:!0,get:r[o]})},a.f={},a.e=e=>Promise.all(Object.keys(a.f).reduce(((r,o)=>(a.f[o](e,r),r)),[])),a.u=e=>74===e?"js/home-mh8cayo8d.js":509===e?"js/compose-mh8cayo8d.js":357===e?"js/post-mh8cayo8d.js":779===e?"js/profile-mh8cayo8d.js":411===e?"js/dmym-mh8cayo8d.js":426===e?"js/dmyh-mh8cayo8d.js":1===e?"js/daci-mh8cayo8d.js":120===e?"js/dffc-mh8cayo8d.js":203===e?"js/dsfc-mh8cayo8d.js":130===e?"js/dssc-mh8cayo8d.js":902===e?"js/discover-mh8cayo8d.js":886===e?"js/notifications-mh8cayo8d.js":771===e?"js/dms-mh8cayo8d.js":401===e?"js/dmsg-mh8cayo8d.js":void 0,a.miniCssF=e=>({138:"css/spa",170:"css/app",242:"css/appdark",703:"css/admin",994:"css/landing"}[e]+".css"),a.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),a.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},o="pixelfed:",a.l=(e,t,s,n)=>{if(r[e])r[e].push(t);else{var d,i;if(void 0!==s)for(var c=document.getElementsByTagName("script"),l=0;l<c.length;l++){var u=c[l];if(u.getAttribute("src")==e||u.getAttribute("data-webpack")==o+s){d=u;break}}d||(i=!0,(d=document.createElement("script")).charset="utf-8",d.timeout=120,a.nc&&d.setAttribute("nonce",a.nc),d.setAttribute("data-webpack",o+s),d.src=e),r[e]=[t];var f=(o,t)=>{d.onerror=d.onload=null,clearTimeout(p);var s=r[e];if(delete r[e],d.parentNode&&d.parentNode.removeChild(d),s&&s.forEach((e=>e(t))),o)return o(t)},p=setTimeout(f.bind(null,void 0,{type:"timeout",target:d}),12e4);d.onerror=f.bind(null,d.onerror),d.onload=f.bind(null,d.onload),i&&document.head.appendChild(d)}},a.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},a.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),a.p="/",(()=>{var e={929:0,242:0,170:0,138:0,703:0,994:0};a.f.j=(r,o)=>{var t=a.o(e,r)?e[r]:void 0;if(0!==t)if(t)o.push(t[2]);else if(/^(138|170|242|703|929|994)$/.test(r))e[r]=0;else{var s=new Promise(((o,s)=>t=e[r]=[o,s]));o.push(t[2]=s);var n=a.p+a.u(r),d=new Error;a.l(n,(o=>{if(a.o(e,r)&&(0!==(t=e[r])&&(e[r]=void 0),t)){var s=o&&("load"===o.type?"missing":o.type),n=o&&o.target&&o.target.src;d.message="Loading chunk "+r+" failed.\n("+s+": "+n+")",d.name="ChunkLoadError",d.type=s,d.request=n,t[1](d)}}),"chunk-"+r,r)}},a.O.j=r=>0===e[r];var r=(r,o)=>{var t,s,[n,d,i]=o,c=0;if(n.some((r=>0!==e[r]))){for(t in d)a.o(d,t)&&(a.m[t]=d[t]);if(i)var l=i(a)}for(r&&r(o);c<n.length;c++)s=n[c],a.o(e,s)&&e[s]&&e[s][0](),e[s]=0;return a.O(l)},o=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];o.forEach(r.bind(null,0)),o.push=r.bind(null,o.push.bind(o))})()})();
--- a/public/js/notifications-mh8cayo8d.js
+++ b/public/js/notifications-mh8cayo8d.js
--- a/public/js/post-mh8cayo8d.js
+++ b/public/js/post-mh8cayo8d.js
--- a/public/js/post-nza92p6rg.js
+++ b/public/js/post-nza92p6rg.js
--- a/public/js/profile-mh8cayo8d.js
+++ b/public/js/profile-mh8cayo8d.js
--- a/public/js/profile-nza92p6rg.js
+++ b/public/js/profile-nza92p6rg.js
--- a/public/js/profile.js
+++ b/public/js/profile.js
--- a/public/js/rempos.js
+++ b/public/js/rempos.js
--- a/public/js/rempro.js
+++ b/public/js/rempro.js
--- a/public/js/spa.js
+++ b/public/js/spa.js
--- a/public/js/status.js
+++ b/public/js/status.js
--- a/public/js/timeline.js
+++ b/public/js/timeline.js
--- a/public/js/vendor.js
+++ b/public/js/vendor.js
--- a/public/mix-manifest.json
+++ b/public/mix-manifest.json
@ -3,14 +3,13 @@
    "/js/activity.js": "/js/activity.js?id=d14e608dd1ecac4d900cd639f2199b62",
    "/js/components.js": "/js/components.js?id=35beb0748dd5518371686a5f00348fbf",
    "/js/discover.js": "/js/discover.js?id=0c98508635d6adae9bf8f76c9f5c918c",
-    "/js/profile.js": "/js/profile.js?id=c43b721fc76902c474563f2e3cf9fcbf",
-    "/js/status.js": "/js/status.js?id=64ae070933b89df06481c6035f897a2f",
-    "/js/timeline.js": "/js/timeline.js?id=ab7a627c078da5cf1a556d496b031442",
+    "/js/profile.js": "/js/profile.js?id=a67847419ea0a9a5438f3232d3de1ac0",
+    "/js/status.js": "/js/status.js?id=39b7c5bad40b75724ab78fdbd744ada9",
+    "/js/timeline.js": "/js/timeline.js?id=34753780652d2133f84b005cdf116e62",
    "/js/compose.js": "/js/compose.js?id=07a87bcfbf033c6abeaf073b2e96a83b",
    "/js/compose-classic.js": "/js/compose-classic.js?id=f11c60795e27213e446054259fdc8b50",
    "/js/search.js": "/js/search.js?id=4bb81cba317cf1ad35f2c98dce78fd9d",
    "/js/developers.js": "/js/developers.js?id=dd22facb8cf2746992404468a9373ac5",
-    "/js/loops.js": "/js/loops.js?id=e7c0af056441d86d4372f25447a72c98",
    "/js/hashtag.js": "/js/hashtag.js?id=5fe9d15d07a227f91eabd874cbb9fea2",
    "/js/collectioncompose.js": "/js/collectioncompose.js?id=d7acc36deab8f6a1f67361f05f88e2d8",
    "/js/collections.js": "/js/collections.js?id=12533dbfbe7a0bf7ef20fc57fb34e19a",
@ -18,25 +17,29 @@
    "/js/story-compose.js": "/js/story-compose.js?id=afe8f35cf52d92ac48ee68a9916d218d",
    "/js/direct.js": "/js/direct.js?id=fdc882e5cc91d890d70f7a5512da506e",
    "/js/admin.js": "/js/admin.js?id=fd88b96423314b41cc763a0714554a04",
-    "/js/rempro.js": "/js/rempro.js?id=f8a8839ec4d1fc5a2fe75a5355fbf39c",
-    "/js/rempos.js": "/js/rempos.js?id=6adb34adf68f74778365143b28fb5b9b",
-    "/js/spa.js": "/js/spa.js?id=931fcbe664a4bad4ca58d888da869b34",
+    "/js/rempro.js": "/js/rempro.js?id=8095a2e0e824b8f8ffcf86b9f7600a44",
+    "/js/rempos.js": "/js/rempos.js?id=1b3f3259b7a1cdcde3c3f47d16aa8312",
+    "/js/spa.js": "/js/spa.js?id=046bf3684f6da99b622fae267cefbdc0",
    "/js/stories.js": "/js/stories.js?id=814a25875cac8987d85c801dcb453114",
-    "/js/manifest.js": "/js/manifest.js?id=a298b1dc4eac00125187fb43f0ae8416",
-    "/js/home-nza92p6rg.js": "/js/home-nza92p6rg.js?id=534f880cc41ea4101f108ba26631ade6",
-    "/js/compose-nza92p6rg.js": "/js/compose-nza92p6rg.js?id=b9c298d9a8866c4cd621222c92cec661",
-    "/js/post-nza92p6rg.js": "/js/post-nza92p6rg.js?id=780632681af3f15e920dbcaf7348ae65",
-    "/js/profile-nza92p6rg.js": "/js/profile-nza92p6rg.js?id=59d7a9f3d48899916e30627373fd0bc2",
-    "/js/dmym-nza92p6rg.js": "/js/dmym-nza92p6rg.js?id=1b1176d78c05d5300df4199114cd5f10",
-    "/js/dmyh-nza92p6rg.js": "/js/dmyh-nza92p6rg.js?id=0fe80e2c037c3a1df9b24f9520cbaa4a",
-    "/js/daci-nza92p6rg.js": "/js/daci-nza92p6rg.js?id=6d9e3404e4e6b40ac19e8c5c70c45fb2",
-    "/js/dffc-nza92p6rg.js": "/js/dffc-nza92p6rg.js?id=a1871137c3f6d275d3dc34584181402e",
-    "/js/dsfc-nza92p6rg.js": "/js/dsfc-nza92p6rg.js?id=93ee8e8b8f3a327ea01b2255e08bb2a0",
-    "/js/dssc-nza92p6rg.js": "/js/dssc-nza92p6rg.js?id=9d7a06ddb6de2fbf1eec7c7589bf1139",
+    "/js/manifest.js": "/js/manifest.js?id=133d3b69419e344e17c064841753cfe8",
+    "/js/home-mh8cayo8d.js": "/js/home-mh8cayo8d.js?id=618098aadf8337d3a424dc75dfd10de4",
+    "/js/compose-mh8cayo8d.js": "/js/compose-mh8cayo8d.js?id=c0b9e6b47fbf73854bff902445bda8fe",
+    "/js/post-mh8cayo8d.js": "/js/post-mh8cayo8d.js?id=ced2737e3e8fea61c4c82db668f7d96c",
+    "/js/profile-mh8cayo8d.js": "/js/profile-mh8cayo8d.js?id=f82d2d9d254d761e90d3c8d6da06226d",
+    "/js/dmym-mh8cayo8d.js": "/js/dmym-mh8cayo8d.js?id=5b1a1707dac44e0441fb09fcb8370758",
+    "/js/dmyh-mh8cayo8d.js": "/js/dmyh-mh8cayo8d.js?id=b10da5f7ff4e29f3fad5064a29f2d2d1",
+    "/js/daci-mh8cayo8d.js": "/js/daci-mh8cayo8d.js?id=6e545502d3d6ea9a7b930468fe87f7e7",
+    "/js/dffc-mh8cayo8d.js": "/js/dffc-mh8cayo8d.js?id=1678070b3c88245f5420b362c1da8237",
+    "/js/dsfc-mh8cayo8d.js": "/js/dsfc-mh8cayo8d.js?id=07d562f2d0780d5181ab52c36e16b5ff",
+    "/js/dssc-mh8cayo8d.js": "/js/dssc-mh8cayo8d.js?id=feae0609e4b17dc720674c5114e52f0c",
+    "/js/discover-mh8cayo8d.js": "/js/discover-mh8cayo8d.js?id=67963c1377522084edeed5be81f1dd15",
+    "/js/notifications-mh8cayo8d.js": "/js/notifications-mh8cayo8d.js?id=807361eeb82680bb0da0d89d50e244a6",
+    "/js/dms-mh8cayo8d.js": "/js/dms-mh8cayo8d.js?id=4b6f07bd529143d2921301efd17999b5",
+    "/js/dmsg-mh8cayo8d.js": "/js/dmsg-mh8cayo8d.js?id=7d2de89710c165d0ef311929222283b6",
    "/css/appdark.css": "/css/appdark.css?id=65bb8633bbd34c87111591cab68cf3dc",
    "/css/app.css": "/css/app.css?id=f2e24fbb268e9946443459877f623d98",
    "/css/spa.css": "/css/spa.css?id=8f0ae3d3a6614e8a1fe6687d58f6b806",
    "/css/admin.css": "/css/admin.css?id=c370da65565066b3fbcf2808bd0a4468",
    "/css/landing.css": "/css/landing.css?id=56100236f07142e041bb3716e64466a3",
-    "/js/vendor.js": "/js/vendor.js?id=81240eb42d2f62ea6368d88a29c16892"
+    "/js/vendor.js": "/js/vendor.js?id=001124b36242eb5ae784f6532121219d"
 }
--- a/resources/assets/js/components/PostComponent.vue
+++ b/resources/assets/js/components/PostComponent.vue
@ -735,7 +735,6 @@ export default {
 						layout: this.profileLayout,
 						showProfileMorePosts: false,
 						profileMorePosts: [],
-						replySending: false,
 						reactionBarLoading: true,
 						tributeSettings: {
 							collection: [
--- a/resources/assets/js/components/RemotePost.vue
+++ b/resources/assets/js/components/RemotePost.vue
@ -614,7 +614,6 @@ export default {
 						layout: this.profileLayout,
 						showProfileMorePosts: false,
 						profileMorePosts: [],
-						replySending: false,
 						reactionBarLoading: true,
 						profileUrl: null,
 						currentLayout: 'status'
--- a/resources/assets/js/components/partials/PollCard.vue
+++ b/resources/assets/js/components/partials/PollCard.vue
@ -98,7 +98,7 @@
 							<div>
 								<p class="mb-0 small text-lighter font-weight-bold d-flex justify-content-between">
 									<span>{{ status.poll.votes_count }} votes</span>
-									<a v-if="tab != 'results' && authenticated && !activeRefreshTimeout & status.poll.expired != true && status.poll.voted" class="text-lighter" @click.prevent="refreshResults()" href="#">Refresh Results</a>
+									<a v-if="tab != 'results' && authenticated && !activeRefreshTimeout && status.poll.expired != true && status.poll.voted" class="text-lighter" @click.prevent="refreshResults()" href="#">Refresh Results</a>
 									<span v-if="tab != 'results' && authenticated && refreshingResults" class="text-lighter">
 										<div class="spinner-border spinner-border-sm" role="status">
 											<span class="sr-only">Loading...</span>
--- a/resources/lang/fi/profile.php
+++ b/resources/lang/fi/profile.php
@ -4,6 +4,5 @@ return [
  'emptyTimeline'  => 'Tällä käyttäjällä ei ole vielä päivityksiä!',
  'emptyFollowers' => 'Tällä käyttäjällä ei ole vielä seuraajia!',
  'emptyFollowing' => 'Tämä käyttäjä ei vielä seuraa ketään!',
-  'savedWarning'   => 'Only you can see what you\'ve saved',
  'savedWarning'   => 'Vain sinä voit nähdä, mitä olet tallentanut',
 ];
--- a/resources/views/admin/diagnostics/home.blade.php
+++ b/resources/views/admin/diagnostics/home.blade.php
@ -184,6 +184,11 @@
 			<strong><span class="badge badge-primary">Storage</span> Filesystems default (local/s3/spaces): </strong>
 			<span>{{ config_cache('filesystems.default')}}</span>
 		</li>
+		<li>
+			<strong><span class="badge badge-primary">Network</span> TrustedProxy: </strong>
+			<span>{{ config('trustedproxy.proxies') }}</span>
+		</li>
+
 	</ul>
 </div>
 <div class="pb-3 border-bottom">
--- a/resources/views/profile/embed.blade.php
+++ b/resources/views/profile/embed.blade.php
@ -37,7 +37,7 @@
  <div class="card status-card-embed card-md-rounded-0 border">
    <div class="card-header d-inline-flex align-items-center justify-content-between bg-white">
      <div>
-        <img src="{{$profile['avatar']}}" width="32px" height="32px" target="_blank" style="border-radius: 32px;">
+        <img src="{{$profile['avatar']}}" width="32px" height="32px" style="border-radius: 32px;">
        <a class="username font-weight-bold pl-2 text-dark" target="_blank" href="{{$profile['url']}}">
          {{$profile['username']}}
        </a>
--- a/resources/views/settings/avatar.blade.php
+++ b/resources/views/settings/avatar.blade.php
@ -27,6 +27,7 @@
              Max Size: 1 MB. Supported formats: jpeg, png.
            </small>
          </div>
+        </form>
        </div>
      </div>
    </div>
@ -39,8 +40,6 @@
        </div>
      </div>
    </div>
-    </form>
-
  </div>

-@endsection
+@endsection
--- a/resources/views/settings/email.blade.php
+++ b/resources/views/settings/email.blade.php
@ -9,7 +9,7 @@
@if ($errors->any())
    <div class="alert alert-danger px-3 h6 text-center">
            @foreach($errors->all() as $error)
-                <p class="font-weight-bold mb-1">{{ $error }}</li>
+                <p class="font-weight-bold mb-1">{{ $error }}</p>
            @endforeach
    </div>
@endif
--- a/resources/views/settings/password.blade.php
+++ b/resources/views/settings/password.blade.php
@ -9,7 +9,7 @@
@if ($errors->any())
    <div class="alert alert-danger px-3 h6 text-center">
            @foreach($errors->all() as $error)
-                <p class="font-weight-bold mb-1">{{ $error }}</li>
+                <p class="font-weight-bold mb-1">{{ $error }}</p>
            @endforeach
    </div>
@endif
--- a/resources/views/settings/template.blade.php
+++ b/resources/views/settings/template.blade.php
@ -9,7 +9,7 @@
@if ($errors->any())
    <div class="alert alert-danger px-3 h6 text-center">
            @foreach($errors->all() as $error)
-                <p class="font-weight-bold mb-1">{{ $error }}</li>
+                <p class="font-weight-bold mb-1">{{ $error }}</p>
            @endforeach
    </div>
@endif
--- a/resources/views/status/embed.blade.php
+++ b/resources/views/status/embed.blade.php
@ -37,7 +37,7 @@
 	@php($item = $status)
 	<div class="card status-card-embed card-md-rounded-0 border">
 		<div class="card-header d-inline-flex align-items-center bg-white">
-			<img src="{{$item->profile->avatarUrl()}}" width="32px" height="32px" target="_blank" style="border-radius: 32px;">
+			<img src="{{$item->profile->avatarUrl()}}" width="32px" height="32px" style="border-radius: 32px;">
 			<a class="username font-weight-bold pl-2 text-dark" target="_blank" href="{{$item->profile->url()}}">
 				{{$item->profile->username}}
 			</a>
				`@ -1 +0,0 @@`
				(self.webpackChunkpixelfed=self.webpackChunkpixelfed\|\|[]).push([[215],{85528:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>a});var s=n(19755);Object.defineProperty(HTMLMediaElement.prototype,"playing",{get:function(){return!!(this.currentTime>0&&!this.paused&&!this.ended&&this.readyState>2)}});const a={data:function(){return{loading:!0,version:1,loops:[],tab:"new"}},mounted:function(){var t=this;axios.get("/api/v2/loops").then((function(e){t.loops=e.data,t.loading=!1}))},methods:{videoSrc:function(t){return t.media_attachments[0].url},posterSrc:function(t){return t.media_attachments[0].preview_url},setTab:function(t){this.tab=t},toggleVideo:function(t,e){var n=e.target;s("video").each((function(){n.src!=s(this)[0].src&&s(this)[0].pause()})),n.playing?n.pause():n.play()},incrementLoop:function(t){},timestamp:function(t){return new Date(t.created_at).toLocaleDateString()},getTitle:function(t){return(t.content?t.content:"Untitled").trim()},truncate:function(t){var e=arguments.length>1&&void 0!==arguments[1]?arguments[1]:15;return _.truncate(t,{length:e})}}}},45502:(t,e,n)=>{Vue.component("loops-component",n(41091).default)},83796:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>r});var s=n(23645),a=n.n(s)()((function(t){return t[1]}));a.push([t.id,".loops-container .card{box-shadow:none}.loops-container .card .card-img-top{border-radius:0}.loops-container a{color:#343a40}.loops-container .card-body a:hover,a.hashtag{color:#28a745!important}",""]);const r=a},44402:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>i});var s=n(93379),a=n.n(s),r=n(83796),o={insert:"head",singleton:!1};a()(r.default,o);const i=r.default.locals\|\|{}},41091:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>o});var s=n(6939),a=n(61539),r={};for(const t in a)"default"!==t&&(r[t]=()=>a[t]);n.d(e,r);n(48264);const o=(0,n(51900).default)(a.default,s.render,s.staticRenderFns,!1,null,null,null).exports},61539:(t,e,n)=>{"use strict";n.r(e),n.d(e,{default:()=>r});var s=n(85528),a={};for(const t in s)"default"!==t&&(a[t]=()=>s[t]);n.d(e,a);const r=s.default},48264:(t,e,n)=>{"use strict";n.r(e);var s=n(44402),a={};for(const t in s)"default"!==t&&(a[t]=()=>s[t]);n.d(e,a)},6939:(t,e,n)=>{"use strict";n.r(e);var s=n(54995),a={};for(const t in s)"default"!==t&&(a[t]=()=>s[t]);n.d(e,a)},54995:(t,e,n)=>{"use strict";n.r(e),n.d(e,{render:()=>s,staticRenderFns:()=>a});var s=function(){var t=this,e=t.$createElement,n=t._self._c\|\|e;return n("div",{staticClass:"w-100 h-100"},[t.loading?n("div",{staticClass:"d-flex justify-content-center align-items-center",staticStyle:{"min-height":"400px"}},[n("img",{attrs:{src:"/img/pixelfed-icon-grey.svg"}})]):n("div",[n("div",{staticClass:"mb-4"},[n("p",{staticClass:"text-center"},[n("a",{class:["new"==t.tab?"btn font-weight-bold py-0 btn-success":"btn font-weight-bold py-0 btn-outline-success"],attrs:{href:"#"},on:{click:function(e){return e.preventDefault(),t.setTab("new")}}},[t._v("New")]),t._v(" "),n("a",{class:["about"==t.tab?"btn font-weight-bold py-0 btn-success":"btn font-weight-bold py-0 btn-outline-success"],attrs:{href:"#"},on:{click:function(e){return e.preventDefault(),t.setTab("about")}}},[t._v("About")])])]),t._v(" "),"about"!=t.tab?n("div",{staticClass:"row loops-container"},t._l(t.loops,(function(e,s){return n("div",{staticClass:"col-12 col-md-4 mb-3"},[n("div",{staticClass:"card border border-success"},[n("div",{staticClass:"embed-responsive embed-responsive-1by1"},[n("video",{staticClass:"embed-responsive-item",attrs:{src:t.videoSrc(e),preload:"none",width:"100%",height:"100%",loop:"",poster:t.posterSrc(e)},on:{click:function(n){return t.toggleVideo(e,n)}}})]),t._v(" "),n("div",{staticClass:"card-body"},[n("p",{staticClass:"username font-weight-bolder lead d-flex justify-content-between"},[n("a",{attrs:{href:e.account.url,title:e.account.acct}},[t._v(t._s(t.truncate(e.account.acct)))]),t._v(" "),n("a",{attrs:{href:e.url}},[t._v(t._s(t.timestamp(e)))])]),t._v(" "),n("p",{staticClass:"small text-muted text-truncate",domProps:{innerHTML:t._s(t.getTitle(e))}}),t._v(" "),n("div",{staticClass:"small text-muted d-flex justify-content-between mb-0"},[n("span",[t._v(t._s(e.favourites_count)+" Likes")]),t._v(" "),n("span",[t._v(t._s(e.reblogs_count)+" Shares")]),t._v(" "),n("span",[t._v(t._s(e.reply_count)+" Comments")])])])])])})),0):n("div",{staticClass:"col-12"},[t._m(0)])])])},a=[function(){var t=this,e=t.$createElement,n=t._self._c\|\|e;return n("div",{staticClass:"card"},[n("div",{staticClass:"card-body"},[n("p",{staticClass:"lead text-center mb-0"},[t._v("Loops are an exciting new way to explore short videos on Pixelfed.")])])])}]}},t=>{t.O(0,[898],(()=>{return e=45502,t(t.s=e);var e}));t.O()}]);