Merge branch 'staging' into ld

CHANGELOG.md

@@ -9,6 +9,10 @@
 - 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))
 
 ## [v0.11.3 (2022-05-09)](https://github.com/pixelfed/pixelfed/compare/v0.11.2...v0.11.3)
 

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!");

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)

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,

app/Util/ActivityPub/Inbox.php

@@ -667,6 +667,7 @@ class Inbox
 					if($story) {
 						StoryExpire::dispatch($story)->onQueue('story');
 					}
+					break;
 
 				default:
 					return;

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', true),
-	'emc' => env('EXP_EMC', false),
 ];

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', '*'),
 ];

resources/assets/js/components/PostComponent.vue

@@ -735,7 +735,6 @@ export default {
 						layout: this.profileLayout,
 						showProfileMorePosts: false,
 						profileMorePosts: [],
-						replySending: false,
 						reactionBarLoading: true,
 						tributeSettings: {
 							collection: [

resources/assets/js/components/PostMenu.vue

@@ -160,7 +160,7 @@
 						});
 					break;
 					case 'suspend':
-						msg = 'Are you sure you want to suspend the account of ' + username + ' ?';
+						let msg = 'Are you sure you want to suspend the account of ' + username + ' ?';
 						swal({
 							title: 'Confirm',
 							text: msg,

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'

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>

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',
 ];

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">

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>

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

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

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

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

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>