aiden
/
pixelfed
mirror of https://github.com/pixelfed/pixelfed
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5041 from pixelfed/staging

Browse Source 
Staging
pull/5044/head
daniel 1 year ago committed by GitHub
parent 5b3d0206ae 141f6d38a7
commit 6be21891d5
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 181 additions and 102 deletions
Show Stats Download Patch File Download Diff File

78
.env.example
Unescape Escape View File

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

2
Dockerfile
Unescape Escape View File

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

199
app/Jobs/FollowPipeline/UnfollowPipeline.php
Unescape Escape View File

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

4
docker/shared/root/docker/helpers.sh
Unescape Escape View File

@ -467,14 +467,14 @@ function await-database-ready()
case "${DB_CONNECTION:-}" in case "${DB_CONNECTION:-}" in
mysql) mysql)
# shellcheck disable=SC2154 # 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 staggered-sleep
done done
;; ;;
pgsql) pgsql)
# shellcheck disable=SC2154 # 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 staggered-sleep
done done
;; ;;

Write Preview
Loading…
Cancel
Save