Merge pull request #3861 from pixelfed/staging

Staging

.env.docker

@@ -127,8 +127,8 @@ LOG_CHANNEL=stderr
 ## Image
 IMAGE_DRIVER=imagick
 
-## Broadcasting
+## Broadcasting: log driver for local development
-BROADCAST_DRIVER=log  # log driver for local development
+BROADCAST_DRIVER=log
 
 ## Cache
 CACHE_DRIVER=redis

.github/dependabot.yml

@@ -0,0 +1,15 @@
+# To get started with Dependabot version updates, you'll need to specify which
+# package ecosystems to update and where the package manifests are located.
+# Please see the documentation for all configuration options:
+# https://docs.github.com/github/administering-a-repository/configuration-options-for-dependency-updates
+
+version: 2
+updates:
+  - package-ecosystem: "composer" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"
+  - package-ecosystem: "npm" # See documentation for possible values
+    directory: "/" # Location of package manifests
+    schedule:
+      interval: "daily"

.node-version

@@ -0,0 +1 @@
+v14.20.1

CHANGELOG.md

@@ -29,6 +29,8 @@
 - Update Profile, fix avatarUrl paths. Fixes #3559 #3634 ([989e4249](https://github.com/pixelfed/pixelfed/commit/989e4249))
 - Update InboxPipeline, bump request timeout from 5s to 60s ([bb120019](https://github.com/pixelfed/pixelfed/commit/bb120019))
 - Update web routes, fix missing home route ([a9f4ddfc](https://github.com/pixelfed/pixelfed/commit/a9f4ddfc))
+- Allow forceHttps to be disabled, fixes #3710 ([a31bdec7](https://github.com/pixelfed/pixelfed/commit/a31bdec7))
+- ([](https://github.com/pixelfed/pixelfed/commit/))
 
 ## [v0.11.4 (2022-10-04)](https://github.com/pixelfed/pixelfed/compare/v0.11.3...v0.11.4)
 

app/Http/Controllers/Admin/AdminSettingsController.php

@@ -22,7 +22,7 @@ trait AdminSettingsController
 		$cloud_ready = !empty(config('filesystems.disks.' . $cloud_disk . '.key')) && !empty(config('filesystems.disks.' . $cloud_disk . '.secret'));
 		$types = explode(',', ConfigCacheService::get('pixelfed.media_types'));
 		$rules = ConfigCacheService::get('app.rules') ? json_decode(ConfigCacheService::get('app.rules'), true) : null;
-		$jpeg = in_array('image/jpg', $types) ? true : in_array('image/jpeg', $types);
+		$jpeg = in_array('image/jpg', $types) || in_array('image/jpeg', $types);
 		$png = in_array('image/png', $types);
 		$gif = in_array('image/gif', $types);
 		$mp4 = in_array('video/mp4', $types);

app/Providers/AppServiceProvider.php

@@ -40,7 +40,10 @@ class AppServiceProvider extends ServiceProvider
 	 */
 	public function boot()
 	{
-		URL::forceScheme('https');
+		if(config('instance.force_https_urls', true)) {
+			URL::forceScheme('https');
+		}
+
 		Schema::defaultStringLength(191);
 		Paginator::useBootstrap();
 		Avatar::observe(AvatarObserver::class);

app/Transformer/ActivityPub/Verb/CreateNote.php

@@ -115,7 +115,7 @@ class CreateNote extends Fractal\TransformerAbstract
 				'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'
+					'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public'
 				],
 				'location' => $status->place_id ? [
 						'type' => 'Place',

app/Transformer/ActivityPub/Verb/Note.php

@@ -109,7 +109,7 @@ class Note extends Fractal\TransformerAbstract
 			'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'
+				'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public'
 			],
 			'location' => $status->place_id ? [
 					'type' => 'Place',

app/Transformer/ActivityPub/Verb/Question.php

@@ -81,7 +81,7 @@ class Question extends Fractal\TransformerAbstract
 			'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'
+				'reply' => $status->comments_disabled == true ? '[]' : 'https://www.w3.org/ns/activitystreams#Public'
 			],
 			'location' => $status->place_id ? [
 					'type' => 'Place',

composer.json

@@ -35,7 +35,7 @@
 		"pixelfed/laravel-snowflake": "^2.0",
 		"pixelfed/zttp": "^0.5",
 		"pragmarx/google2fa": "^8.0",
-		"predis/predis": "^1.1",
+		"predis/predis": "^2.0",
 		"spatie/laravel-backup": "^8.0.0",
 		"spatie/laravel-image-optimizer": "^1.7",
 		"stevebauman/purify": "4.0.*",
@@ -45,6 +45,7 @@
 	},
 	"require-dev": {
 		"brianium/paratest": "^6.1",
+		"fakerphp/faker": "^1.20",
 		"laravel/telescope": "^4.9",
 		"mockery/mockery": "^1.0",
 		"nunomaduro/collision": "^6.1",

config/instance.php

@@ -1,6 +1,7 @@
 <?php
 
 return [
+	'force_https_urls' => env('FORCE_HTTPS_URLS', true),
 
 	'description' => env('INSTANCE_DESCRIPTION', 'Pixelfed - Photo sharing for everyone'),
 

docker-compose.yml

@@ -55,7 +55,7 @@ services:
 
 ## DB and Cache
   db:
-    image: mysql:8.0
+    image: mariadb:jammy
     restart: unless-stopped
     networks:
       - internal

resources/views/auth/login.blade.php

@@ -69,6 +69,10 @@
                     <hr>
 
                     <p class="text-center font-weight-bold">
+                        @if(config_cache('pixelfed.open_registration'))
+                        <a href="/register">Register</a>
+                        <span class="px-1">·</span>
+                        @endif
                         <a href="{{ route('password.request') }}">
                             {{ __('Forgot Password') }}
                         </a>