Merge pull request #5041 from pixelfed/staging

Staging

.env.example

@@ -0,0 +1,78 @@
+APP_NAME="Pixelfed"
+APP_ENV="production"
+APP_KEY=
+APP_DEBUG="false"
+
+# Instance Configuration
+OPEN_REGISTRATION="false"
+ENFORCE_EMAIL_VERIFICATION="false"
+PF_MAX_USERS="1000"
+OAUTH_ENABLED="true"
+
+# Media Configuration
+PF_OPTIMIZE_IMAGES="true"
+IMAGE_QUALITY="80"
+MAX_PHOTO_SIZE="15000"
+MAX_CAPTION_LENGTH="500"
+MAX_ALBUM_LENGTH="4"
+
+# Instance URL Configuration
+APP_URL="http://localhost"
+APP_DOMAIN="localhost"
+ADMIN_DOMAIN="localhost"
+SESSION_DOMAIN="localhost"
+TRUST_PROXIES="*"
+
+# Database Configuration
+DB_CONNECTION="mysql"
+DB_HOST="127.0.0.1"
+DB_PORT="3306"
+DB_DATABASE="pixelfed"
+DB_USERNAME="pixelfed"
+DB_PASSWORD="pixelfed"
+
+# Redis Configuration
+REDIS_CLIENT="predis"
+REDIS_SCHEME="tcp"
+REDIS_HOST="127.0.0.1"
+REDIS_PASSWORD="null"
+REDIS_PORT="6379"
+
+# Laravel Configuration
+SESSION_DRIVER="database"
+CACHE_DRIVER="redis"
+QUEUE_DRIVER="redis"
+BROADCAST_DRIVER="log"
+LOG_CHANNEL="stack"
+HORIZON_PREFIX="horizon-"
+
+# ActivityPub Configuration
+ACTIVITY_PUB="false"
+AP_REMOTE_FOLLOW="false"
+AP_INBOX="false"
+AP_OUTBOX="false"
+AP_SHAREDINBOX="false"
+
+# Experimental Configuration
+EXP_EMC="true"
+
+## Mail Configuration (Post-Installer)
+MAIL_DRIVER=log
+MAIL_HOST=smtp.mailtrap.io
+MAIL_PORT=2525
+MAIL_USERNAME=null
+MAIL_PASSWORD=null
+MAIL_ENCRYPTION=null
+MAIL_FROM_ADDRESS="pixelfed@example.com"
+MAIL_FROM_NAME="Pixelfed"
+
+## S3 Configuration (Post-Installer)
+PF_ENABLE_CLOUD=false
+FILESYSTEM_CLOUD=s3
+#AWS_ACCESS_KEY_ID=
+#AWS_SECRET_ACCESS_KEY=
+#AWS_DEFAULT_REGION=
+#AWS_BUCKET=<BucketName>
+#AWS_URL=
+#AWS_ENDPOINT=
+#AWS_USE_PATH_STYLE_ENDPOINT=false

Dockerfile

@@ -237,7 +237,7 @@ USER ${RUNTIME_UID}:${RUNTIME_GID}
 
 # Generate optimized autoloader now that we have all files around
 RUN set -ex \
-    && composer dump-autoload --optimize
+    && ENABLE_CONFIG_CACHE=false composer dump-autoload --optimize
 
 USER root
 

app/Jobs/FollowPipeline/UnfollowPipeline.php

@@ -4,114 +4,115 @@ namespace App\Jobs\FollowPipeline;
 
 use App\Follower;
 use App\FollowRequest;
+use App\Jobs\HomeFeedPipeline\FeedUnfollowPipeline;
 use App\Notification;
 use App\Profile;
+use App\Services\AccountService;
+use App\Services\FollowerService;
+use App\Services\NotificationService;
 use Cache;
 use Illuminate\Bus\Queueable;
 use Illuminate\Contracts\Queue\ShouldQueue;
 use Illuminate\Foundation\Bus\Dispatchable;
 use Illuminate\Queue\InteractsWithQueue;
 use Illuminate\Queue\SerializesModels;
-use Log;
-use Illuminate\Support\Facades\Redis;
-use App\Services\AccountService;
-use App\Services\FollowerService;
-use App\Services\NotificationService;
-use App\Jobs\HomeFeedPipeline\FeedUnfollowPipeline;
 
 class UnfollowPipeline implements ShouldQueue
 {
-	use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
+    use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
 
-	protected $actor;
+    protected $actor;
-	protected $target;
 
-	/**
+    protected $target;
-	 * Create a new job instance.
-	 *
-	 * @return void
-	 */
-	public function __construct($actor, $target)
-	{
-		$this->actor = $actor;
-		$this->target = $target;
-	}
 
-	/**
+    /**
-	 * Execute the job.
+     * Create a new job instance.
-	 *
+     *
-	 * @return void
+     * @return void
-	 */
+     */
-	public function handle()
+    public function __construct($actor, $target)
-	{
+    {
-		$actor = $this->actor;
+        $this->actor = $actor;
-		$target = $this->target;
+        $this->target = $target;
+    }
 
-		$actorProfile = Profile::find($actor);
+    /**
-		if(!$actorProfile) {
+     * Execute the job.
-			return;
+     *
-		}
+     * @return void
-		$targetProfile = Profile::find($target);
+     */
-		if(!$targetProfile) {
+    public function handle()
-			return;
+    {
-		}
+        $actor = $this->actor;
+        $target = $this->target;
 
-		FeedUnfollowPipeline::dispatch($actor, $target)->onQueue('follow');
+        $actorProfile = Profile::find($actor);
+        if (! $actorProfile) {
+            return;
+        }
+        $targetProfile = Profile::find($target);
+        if (! $targetProfile) {
+            return;
+        }
 
-		FollowerService::remove($actor, $target);
+        FeedUnfollowPipeline::dispatch($actor, $target)->onQueue('follow');
 
-		$actorProfileSync = Cache::get(FollowerService::FOLLOWING_SYNC_KEY . $actor);
+        FollowerService::remove($actor, $target);
-		if(!$actorProfileSync) {
-			FollowServiceWarmCache::dispatch($actor)->onQueue('low');
-		} else {
-			if($actorProfile->following_count) {
-				$actorProfile->decrement('following_count');
-			} else {
-				$count = Follower::whereProfileId($actor)->count();
-				$actorProfile->following_count = $count;
-				$actorProfile->save();
-			}
-			Cache::put(FollowerService::FOLLOWING_SYNC_KEY . $actor, 1, 604800);
-			AccountService::del($actor);
-		}
 
-		$targetProfileSync = Cache::get(FollowerService::FOLLOWERS_SYNC_KEY . $target);
+        $actorProfileSync = Cache::get(FollowerService::FOLLOWING_SYNC_KEY.$actor);
-		if(!$targetProfileSync) {
+        if (! $actorProfileSync) {
-			FollowServiceWarmCache::dispatch($target)->onQueue('low');
+            FollowServiceWarmCache::dispatch($actor)->onQueue('low');
-		} else {
+        } else {
-			if($targetProfile->followers_count) {
+            if ($actorProfile->following_count) {
-				$targetProfile->decrement('followers_count');
+                $actorProfile->decrement('following_count');
-			} else {
+            } else {
-				$count = Follower::whereFollowingId($target)->count();
+                $count = Follower::whereProfileId($actor)->count();
-				$targetProfile->followers_count = $count;
+                $actorProfile->following_count = $count;
-				$targetProfile->save();
+                $actorProfile->save();
-			}
+            }
-			Cache::put(FollowerService::FOLLOWERS_SYNC_KEY . $target, 1, 604800);
+            Cache::put(FollowerService::FOLLOWING_SYNC_KEY.$actor, 1, 604800);
-			AccountService::del($target);
+            AccountService::del($actor);
-		}
+        }
 
-		if($targetProfile->domain == null) {
+        $targetProfileSync = Cache::get(FollowerService::FOLLOWERS_SYNC_KEY.$target);
-			Notification::withTrashed()
+        if (! $targetProfileSync) {
-				->whereProfileId($target)
+            FollowServiceWarmCache::dispatch($target)->onQueue('low');
-				->whereAction('follow')
+        } else {
-				->whereActorId($actor)
+            if ($targetProfile->followers_count) {
-				->whereItemId($target)
+                $targetProfile->decrement('followers_count');
-				->whereItemType('App\Profile')
+            } else {
-				->get()
+                $count = Follower::whereFollowingId($target)->count();
-				->each(function($n) {
+                $targetProfile->followers_count = $count;
-					NotificationService::del($n->profile_id, $n->id);
+                $targetProfile->save();
-					$n->forceDelete();
+            }
-				});
+            Cache::put(FollowerService::FOLLOWERS_SYNC_KEY.$target, 1, 604800);
-		}
+            AccountService::del($target);
+        }
 
-		if($actorProfile->domain == null && config('instance.timeline.home.cached')) {
+        if ($targetProfile->domain == null) {
-			Cache::forget('pf:timelines:home:' . $actor);
+            Notification::withTrashed()
-		}
+                ->whereProfileId($target)
+                ->whereAction('follow')
+                ->whereActorId($actor)
+                ->whereItemId($target)
+                ->whereItemType('App\Profile')
+                ->get()
+                ->each(function ($n) {
+                    NotificationService::del($n->profile_id, $n->id);
+                    $n->forceDelete();
+                });
+        }
 
-		FollowRequest::whereFollowingId($target)
+        if ($actorProfile->domain == null && config('instance.timeline.home.cached')) {
-			->whereFollowerId($actor)
+            Cache::forget('pf:timelines:home:'.$actor);
-			->delete();
+        }
 
-		return;
+        FollowRequest::whereFollowingId($target)
-	}
+            ->whereFollowerId($actor)
+            ->delete();
+
+        AccountService::del($target);
+        AccountService::del($actor);
+
+    }
 }

docker/shared/root/docker/helpers.sh

@@ -467,14 +467,14 @@ function await-database-ready()
     case "${DB_CONNECTION:-}" in
         mysql)
             # shellcheck disable=SC2154
-            while ! echo "SELECT 1" | mysql --user="${DB_USERNAME}" --password="${DB_PASSWORD}" --host="${DB_HOST}" "${DB_DATABASE}" --silent >/dev/null; do
+            while ! echo "SELECT 1" | mysql --user="${DB_USERNAME}" --password="${DB_PASSWORD}" --host="${DB_HOST}" --port="${DOCKER_DB_HOST_PORT}" "${DB_DATABASE}" --silent >/dev/null; do
                 staggered-sleep
             done
             ;;
 
         pgsql)
             # shellcheck disable=SC2154
-            while ! echo "SELECT 1" | PGPASSWORD="${DB_PASSWORD}" psql --user="${DB_USERNAME}" --host="${DB_HOST}" "${DB_DATABASE}" >/dev/null; do
+            while ! echo "SELECT 1" | PGPASSWORD="${DB_PASSWORD}" psql --user="${DB_USERNAME}" --host="${DB_HOST}" --port="${DOCKER_DB_HOST_PORT}" "${DB_DATABASE}" >/dev/null; do
                 staggered-sleep
             done
             ;;