mirror
/
pixelfed
kopia lustrzana https://github.com/pixelfed/pixelfed
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

sync

pull/4844/head
Christian Winther 2024-02-10 00:23:53 +00:00
rodzic 2aeccf885f 2becd273c4
commit 3d6efd098d
73 zmienionych plików z 1640 dodań i 716 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

16
CHANGELOG.md
Wyświetl plik

@ -15,6 +15,7 @@
- Added User Domain Blocks ([#4834](https://github.com/pixelfed/pixelfed/pull/4834)) ([fa0380ac](https://github.com/pixelfed/pixelfed/commit/fa0380ac)) - Added User Domain Blocks ([#4834](https://github.com/pixelfed/pixelfed/pull/4834)) ([fa0380ac](https://github.com/pixelfed/pixelfed/commit/fa0380ac))
- Added Parental Controls ([#4862](https://github.com/pixelfed/pixelfed/pull/4862)) ([c91f1c59](https://github.com/pixelfed/pixelfed/commit/c91f1c59)) - Added Parental Controls ([#4862](https://github.com/pixelfed/pixelfed/pull/4862)) ([c91f1c59](https://github.com/pixelfed/pixelfed/commit/c91f1c59))
- Added Forgot Email Feature ([67c650b1](https://github.com/pixelfed/pixelfed/commit/67c650b1)) - Added Forgot Email Feature ([67c650b1](https://github.com/pixelfed/pixelfed/commit/67c650b1))
- Added S3 IG Import Media Storage support ([#4891](https://github.com/pixelfed/pixelfed/pull/4891)) ([081360b9](https://github.com/pixelfed/pixelfed/commit/081360b9))
### Federation ### Federation
- Update Privacy Settings, add support for Mastodon `indexable` search flag ([fc24630e](https://github.com/pixelfed/pixelfed/commit/fc24630e)) - Update Privacy Settings, add support for Mastodon `indexable` search flag ([fc24630e](https://github.com/pixelfed/pixelfed/commit/fc24630e))
@ -89,6 +90,21 @@
- Update meta tags, improve descriptions and seo/og tags ([fd44c80c](https://github.com/pixelfed/pixelfed/commit/fd44c80c)) - Update meta tags, improve descriptions and seo/og tags ([fd44c80c](https://github.com/pixelfed/pixelfed/commit/fd44c80c))
- Update login view, add email prefill logic ([d76f0168](https://github.com/pixelfed/pixelfed/commit/d76f0168)) - Update login view, add email prefill logic ([d76f0168](https://github.com/pixelfed/pixelfed/commit/d76f0168))
- Update LoginController, fix captcha validation error message ([0325e171](https://github.com/pixelfed/pixelfed/commit/0325e171)) - Update LoginController, fix captcha validation error message ([0325e171](https://github.com/pixelfed/pixelfed/commit/0325e171))
- Update ApiV1Controller, properly cast boolean sensitive parameter. Fixes #4888 ([0aff126a](https://github.com/pixelfed/pixelfed/commit/0aff126a))
- Update AccountImport.vue, fix new IG export format ([59aa6a4b](https://github.com/pixelfed/pixelfed/commit/59aa6a4b))
- Update TransformImports command, fix import service condition ([32c59f04](https://github.com/pixelfed/pixelfed/commit/32c59f04))
- Update AP helpers, more efficently update post count ([7caed381](https://github.com/pixelfed/pixelfed/commit/7caed381))
- Update AP helpers, refactor post count decrement logic ([b81ae577](https://github.com/pixelfed/pixelfed/commit/b81ae577))
- Update AP helpers, fix sensitive bug ([00ed330c](https://github.com/pixelfed/pixelfed/commit/00ed330c))
- Update NotificationEpochUpdatePipeline, use more efficient query ([4d401389](https://github.com/pixelfed/pixelfed/commit/4d401389))
- Update notification pipelines, fix non-local saving ([fa97a1f3](https://github.com/pixelfed/pixelfed/commit/fa97a1f3))
- Update NodeinfoService, disable redirects ([240e6bbe](https://github.com/pixelfed/pixelfed/commit/240e6bbe))
- Update Instance model, add entity casts ([289cad47](https://github.com/pixelfed/pixelfed/commit/289cad47))
- Update FetchNodeinfoPipeline, use more efficient dispatch ([ac01f51a](https://github.com/pixelfed/pixelfed/commit/ac01f51a))
- Update horizon.php config ([1e3acade](https://github.com/pixelfed/pixelfed/commit/1e3acade))
- Update PublicApiController, consume InstanceService blocked domains for account and statuses endpoints ([01b33fb3](https://github.com/pixelfed/pixelfed/commit/01b33fb3))
- Update ApiV1Controller, enforce blocked instance domain logic ([5b284cac](https://github.com/pixelfed/pixelfed/commit/5b284cac))
- Update ApiV2Controller, add vapid key to instance object. Thanks thisismissem! ([4d02d6f1](https://github.com/pixelfed/pixelfed/commit/4d02d6f1))
- ([](https://github.com/pixelfed/pixelfed/commit/)) - ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9) ## [v0.11.9 (2023-08-21)](https://github.com/pixelfed/pixelfed/compare/v0.11.8...v0.11.9)

57
app/Console/Commands/AccountPostCountStatUpdate.php 100644
Wyświetl plik

@ -0,0 +1,57 @@
<?php
namespace App\Console\Commands;
use Illuminate\Console\Command;
use App\Services\AccountService;
use App\Services\Account\AccountStatService;
use App\Status;
use App\Profile;
class AccountPostCountStatUpdate extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'app:account-post-count-stat-update';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Update post counts from recent activities';
/**
* Execute the console command.
*/
public function handle()
{
$ids = AccountStatService::getAllPostCountIncr();
if(!$ids || !count($ids)) {
return;
}
foreach($ids as $id) {
$acct = AccountService::get($id, true);
if(!$acct) {
AccountStatService::removeFromPostCount($id);
continue;
}
$statusCount = Status::whereProfileId($id)->count();
if($statusCount != $acct['statuses_count']) {
$profile = Profile::find($id);
if(!$profile) {
AccountStatService::removeFromPostCount($id);
continue;
}
$profile->status_count = $statusCount;
$profile->save();
AccountService::del($id);
}
AccountStatService::removeFromPostCount($id);
}
return;
}
}

54
app/Console/Commands/ImportUploadMediaToCloudStorage.php 100644
Wyświetl plik

@ -0,0 +1,54 @@
<?php
namespace App\Console\Commands;
use Illuminate\Console\Command;
use App\Models\ImportPost;
use App\Jobs\ImportPipeline\ImportMediaToCloudPipeline;
use function Laravel\Prompts\progress;
class ImportUploadMediaToCloudStorage extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'app:import-upload-media-to-cloud-storage {--limit=500}';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Migrate media imported from Instagram to S3 cloud storage.';
/**
* Execute the console command.
*/
public function handle()
{
if(
(bool) config('import.instagram.storage.cloud.enabled') === false ||
(bool) config_cache('pixelfed.cloud_storage') === false
) {
$this->error('Aborted. Cloud storage is not enabled for IG imports.');
return;
}
$limit = $this->option('limit');
$progress = progress(label: 'Migrating import media', steps: $limit);
$progress->start();
$posts = ImportPost::whereUploadedToS3(false)->take($limit)->get();
foreach($posts as $post) {
ImportMediaToCloudPipeline::dispatch($post)->onQueue('low');
$progress->advance();
}
$progress->finish();
}
}

298
app/Console/Commands/InstanceManager.php 100644
Wyświetl plik

@ -0,0 +1,298 @@
<?php
namespace App\Console\Commands;
use Illuminate\Console\Command;
use App\Instance;
use App\Profile;
use App\Services\InstanceService;
use App\Jobs\InstancePipeline\FetchNodeinfoPipeline;
use function Laravel\Prompts\select;
use function Laravel\Prompts\confirm;
use function Laravel\Prompts\progress;
use function Laravel\Prompts\search;
use function Laravel\Prompts\table;
class InstanceManager extends Command
{
/**
* The name and signature of the console command.
*
* @var string
*/
protected $signature = 'app:instance-manager';
/**
* The console command description.
*
* @var string
*/
protected $description = 'Manage Instances';
/**
* Execute the console command.
*/
public function handle()
{
$action = select(
'What action do you want to perform?',
[
'Recalculate Stats',
'Ban Instance',
'Unlist Instance',
'Unlisted Instances',
'Banned Instances',
'Unban Instance',
'Relist Instance',
],
);
switch($action) {
case 'Recalculate Stats':
return $this->recalculateStats();
break;
case 'Unlisted Instances':
return $this->viewUnlistedInstances();
break;
case 'Banned Instances':
return $this->viewBannedInstances();
break;
case 'Unlist Instance':
return $this->unlistInstance();
break;
case 'Ban Instance':
return $this->banInstance();
break;
case 'Unban Instance':
return $this->unbanInstance();
break;
case 'Relist Instance':
return $this->relistInstance();
break;
}
}
protected function recalculateStats()
{
$instanceCount = Instance::count();
$confirmed = confirm('Do you want to recalculate stats for all ' . $instanceCount . ' instances?');
if(!$confirmed) {
$this->error('Aborting...');
exit;
}
$users = progress(
label: 'Updating instance stats...',
steps: Instance::all(),
callback: fn ($instance) => $this->updateInstanceStats($instance),
);
}
protected function updateInstanceStats($instance)
{
FetchNodeinfoPipeline::dispatch($instance)->onQueue('intbg');
}
protected function unlistInstance()
{
$id = search(
'Search by domain',
fn (string $value) => strlen($value) > 0
? Instance::whereUnlisted(false)->where('domain', 'like', "%{$value}%")->pluck('domain', 'id')->all()
: []
);
$instance = Instance::find($id);
if(!$instance) {
$this->error('Oops, an error occured');
exit;
}
$tbl = [
[
$instance->domain,
number_format($instance->status_count),
number_format($instance->user_count),
]
];
table(
['Domain', 'Status Count', 'User Count'],
$tbl
);
$confirmed = confirm('Are you sure you want to unlist this instance?');
if(!$confirmed) {
$this->error('Aborting instance unlisting');
exit;
}
$instance->unlisted = true;
$instance->save();
InstanceService::refresh();
$this->info('Successfully unlisted ' . $instance->domain . '!');
exit;
}
protected function relistInstance()
{
$id = search(
'Search by domain',
fn (string $value) => strlen($value) > 0
? Instance::whereUnlisted(true)->where('domain', 'like', "%{$value}%")->pluck('domain', 'id')->all()
: []
);
$instance = Instance::find($id);
if(!$instance) {
$this->error('Oops, an error occured');
exit;
}
$tbl = [
[
$instance->domain,
number_format($instance->status_count),
number_format($instance->user_count),
]
];
table(
['Domain', 'Status Count', 'User Count'],
$tbl
);
$confirmed = confirm('Are you sure you want to re-list this instance?');
if(!$confirmed) {
$this->error('Aborting instance re-listing');
exit;
}
$instance->unlisted = false;
$instance->save();
InstanceService::refresh();
$this->info('Successfully re-listed ' . $instance->domain . '!');
exit;
}
protected function banInstance()
{
$id = search(
'Search by domain',
fn (string $value) => strlen($value) > 0
? Instance::whereBanned(false)->where('domain', 'like', "%{$value}%")->pluck('domain', 'id')->all()
: []
);
$instance = Instance::find($id);
if(!$instance) {
$this->error('Oops, an error occured');
exit;
}
$tbl = [
[
$instance->domain,
number_format($instance->status_count),
number_format($instance->user_count),
]
];
table(
['Domain', 'Status Count', 'User Count'],
$tbl
);
$confirmed = confirm('Are you sure you want to ban this instance?');
if(!$confirmed) {
$this->error('Aborting instance ban');
exit;
}
$instance->banned = true;
$instance->save();
InstanceService::refresh();
$this->info('Successfully banned ' . $instance->domain . '!');
exit;
}
protected function unbanInstance()
{
$id = search(
'Search by domain',
fn (string $value) => strlen($value) > 0
? Instance::whereBanned(true)->where('domain', 'like', "%{$value}%")->pluck('domain', 'id')->all()
: []
);
$instance = Instance::find($id);
if(!$instance) {
$this->error('Oops, an error occured');
exit;
}
$tbl = [
[
$instance->domain,
number_format($instance->status_count),
number_format($instance->user_count),
]
];
table(
['Domain', 'Status Count', 'User Count'],
$tbl
);
$confirmed = confirm('Are you sure you want to unban this instance?');
if(!$confirmed) {
$this->error('Aborting instance unban');
exit;
}
$instance->banned = false;
$instance->save();
InstanceService::refresh();
$this->info('Successfully un-banned ' . $instance->domain . '!');
exit;
}
protected function viewBannedInstances()
{
$data = Instance::whereBanned(true)
->get(['domain', 'user_count', 'status_count'])
->map(function($d) {
return [
'domain' => $d->domain,
'user_count' => number_format($d->user_count),
'status_count' => number_format($d->status_count),
];
})
->toArray();
table(
['Domain', 'User Count', 'Status Count'],
$data
);
}
protected function viewUnlistedInstances()
{
$data = Instance::whereUnlisted(true)
->get(['domain', 'user_count', 'status_count', 'banned'])
->map(function($d) {
return [
'domain' => $d->domain,
'user_count' => number_format($d->user_count),
'status_count' => number_format($d->status_count),
'banned' => $d->banned ? '✅' : null
];
})
->toArray();
table(
['Domain', 'User Count', 'Status Count', 'Banned'],
$data
);
}
}

5
app/Console/Commands/TransformImports.php
Wyświetl plik

@ -70,6 +70,11 @@ class TransformImports extends Command
} }
$idk = ImportService::getId($ip->user_id, $ip->creation_year, $ip->creation_month, $ip->creation_day); $idk = ImportService::getId($ip->user_id, $ip->creation_year, $ip->creation_month, $ip->creation_day);
if(!$idk) {
$ip->skip_missing_media = true;
$ip->save();
continue;
}
if(Storage::exists('imports/' . $id . '/' . $ip->filename) === false) { if(Storage::exists('imports/' . $id . '/' . $ip->filename) === false) {
ImportService::clearAttempts($profile->id); ImportService::clearAttempts($profile->id);

96
app/Console/Kernel.php
Wyświetl plik

@ -7,56 +7,60 @@ use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
class Kernel extends ConsoleKernel class Kernel extends ConsoleKernel
{ {
/** /**
* The Artisan commands provided by your application. * The Artisan commands provided by your application.
* *
* @var array * @var array
*/ */
protected $commands = [ protected $commands = [
// //
]; ];
/** /**
* Define the application's command schedule. * Define the application's command schedule.
* *
* @param \Illuminate\Console\Scheduling\Schedule $schedule * @param \Illuminate\Console\Scheduling\Schedule $schedule
* *
* @return void * @return void
*/ */
protected function schedule(Schedule $schedule) protected function schedule(Schedule $schedule)
{ {
$schedule->command('media:optimize')->hourlyAt(40)->onOneServer(); $schedule->command('media:optimize')->hourlyAt(40)->onOneServer();
$schedule->command('media:gc')->hourlyAt(5)->onOneServer(); $schedule->command('media:gc')->hourlyAt(5)->onOneServer();
$schedule->command('horizon:snapshot')->everyFiveMinutes()->onOneServer(); $schedule->command('horizon:snapshot')->everyFiveMinutes()->onOneServer();
$schedule->command('story:gc')->everyFiveMinutes()->onOneServer(); $schedule->command('story:gc')->everyFiveMinutes()->onOneServer();
$schedule->command('gc:failedjobs')->dailyAt(3)->onOneServer(); $schedule->command('gc:failedjobs')->dailyAt(3)->onOneServer();
$schedule->command('gc:passwordreset')->dailyAt('09:41')->onOneServer(); $schedule->command('gc:passwordreset')->dailyAt('09:41')->onOneServer();
$schedule->command('gc:sessions')->twiceDaily(13, 23)->onOneServer(); $schedule->command('gc:sessions')->twiceDaily(13, 23)->onOneServer();
if (in_array(config_cache('pixelfed.cloud_storage'), ['1', true, 'true']) && config('media.delete_local_after_cloud')) { if (in_array(config_cache('pixelfed.cloud_storage'), ['1', true, 'true']) && config('media.delete_local_after_cloud')) {
$schedule->command('media:s3gc')->hourlyAt(15)->onOneServer(); $schedule->command('media:s3gc')->hourlyAt(15)->onOneServer();
} }
if (config('import.instagram.enabled')) { if (config('import.instagram.enabled')) {
$schedule->command('app:transform-imports')->everyFourMinutes()->onOneServer(); $schedule->command('app:transform-imports')->everyTenMinutes()->onOneServer();
$schedule->command('app:import-upload-garbage-collection')->hourlyAt(51)->onOneServer(); $schedule->command('app:import-upload-garbage-collection')->hourlyAt(51)->onOneServer();
$schedule->command('app:import-remove-deleted-accounts')->hourlyAt(37)->onOneServer(); $schedule->command('app:import-remove-deleted-accounts')->hourlyAt(37)->onOneServer();
$schedule->command('app:import-upload-clean-storage')->twiceDailyAt(1, 13, 32)->onOneServer(); $schedule->command('app:import-upload-clean-storage')->twiceDailyAt(1, 13, 32)->onOneServer();
}
$schedule->command('app:notification-epoch-update')->weeklyOn(1, '2:21'); if (config('import.instagram.storage.cloud.enabled') && (bool) config_cache('pixelfed.cloud_storage')) {
$schedule->command('app:hashtag-cached-count-update')->hourlyAt(25); $schedule->command('app:import-upload-media-to-cloud-storage')->hourlyAt(39)->onOneServer();
} }
}
$schedule->command('app:notification-epoch-update')->weeklyOn(1, '2:21')->onOneServer();
$schedule->command('app:hashtag-cached-count-update')->hourlyAt(25)->onOneServer();
$schedule->command('app:account-post-count-stat-update')->everySixHours(25)->onOneServer();
}
/** /**
* Register the commands for the application. * Register the commands for the application.
* *
* @return void * @return void
*/ */
protected function commands() protected function commands()
{ {
$this->load(__DIR__ . '/Commands'); $this->load(__DIR__ . '/Commands');
require base_path('routes/console.php'); require base_path('routes/console.php');
} }
} }

71
app/Http/Controllers/Api/ApiV1Controller.php
Wyświetl plik

@ -219,6 +219,10 @@ class ApiV1Controller extends Controller
if(!$res) { if(!$res) {
return response()->json(['error' => 'Record not found'], 404); return response()->json(['error' => 'Record not found'], 404);
} }
if($res && strpos($res['acct'], '@') != -1) {
$domain = parse_url($res['url'], PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
return $this->json($res); return $this->json($res);
} }
@ -483,6 +487,11 @@ class ApiV1Controller extends Controller
$limit = $request->input('limit', 10); $limit = $request->input('limit', 10);
$napi = $request->has(self::PF_API_ENTITY_KEY); $napi = $request->has(self::PF_API_ENTITY_KEY);
if($account && strpos($account['acct'], '@') != -1) {
$domain = parse_url($account['url'], PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
if(intval($pid) !== intval($account['id'])) { if(intval($pid) !== intval($account['id'])) {
if($account['locked']) { if($account['locked']) {
if(!FollowerService::follows($pid, $account['id'])) { if(!FollowerService::follows($pid, $account['id'])) {
@ -575,6 +584,11 @@ class ApiV1Controller extends Controller
$limit = $request->input('limit', 10); $limit = $request->input('limit', 10);
$napi = $request->has(self::PF_API_ENTITY_KEY); $napi = $request->has(self::PF_API_ENTITY_KEY);
if($account && strpos($account['acct'], '@') != -1) {
$domain = parse_url($account['url'], PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
if(intval($pid) !== intval($account['id'])) { if(intval($pid) !== intval($account['id'])) {
if($account['locked']) { if($account['locked']) {
if(!FollowerService::follows($pid, $account['id'])) { if(!FollowerService::follows($pid, $account['id'])) {
@ -676,6 +690,11 @@ class ApiV1Controller extends Controller
return $this->json(['error' => 'Account not found'], 404); return $this->json(['error' => 'Account not found'], 404);
} }
if($profile && strpos($profile['acct'], '@') != -1) {
$domain = parse_url($profile['url'], PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
$limit = $request->limit ?? 20; $limit = $request->limit ?? 20;
$max_id = $request->max_id; $max_id = $request->max_id;
$min_id = $request->min_id; $min_id = $request->min_id;
@ -766,6 +785,11 @@ class ApiV1Controller extends Controller
->whereNull('status') ->whereNull('status')
->findOrFail($id); ->findOrFail($id);
if($target && $target->domain) {
$domain = $target->domain;
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
$private = (bool) $target->is_private; $private = (bool) $target->is_private;
$remote = (bool) $target->domain; $remote = (bool) $target->domain;
$blocked = UserFilter::whereUserId($target->id) $blocked = UserFilter::whereUserId($target->id)
@ -1252,14 +1276,19 @@ class ApiV1Controller extends Controller
$user = $request->user(); $user = $request->user();
abort_if($user->has_roles && !UserRoleService::can('can-like', $user->id), 403, 'Invalid permissions for this action'); abort_if($user->has_roles && !UserRoleService::can('can-like', $user->id), 403, 'Invalid permissions for this action');
AccountService::setLastActive($user->id);
$status = StatusService::getMastodon($id, false); $status = StatusService::getMastodon($id, false);
abort_unless($status, 400); abort_unless($status, 404);
if($status && isset($status['account'], $status['account']['acct']) && strpos($status['account']['acct'], '@') != -1) {
$domain = parse_url($status['account']['url'], PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
$spid = $status['account']['id']; $spid = $status['account']['id'];
AccountService::setLastActive($user->id);
if(intval($spid) !== intval($user->profile_id)) { if(intval($spid) !== intval($user->profile_id)) {
if($status['visibility'] == 'private') { if($status['visibility'] == 'private') {
abort_if(!FollowerService::follows($user->profile_id, $spid), 403); abort_if(!FollowerService::follows($user->profile_id, $spid), 403);
@ -1404,6 +1433,11 @@ class ApiV1Controller extends Controller
return response()->json(['error' => 'Record not found'], 404); return response()->json(['error' => 'Record not found'], 404);
} }
if($target && strpos($target['acct'], '@') != -1) {
$domain = parse_url($target['url'], PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
$followRequest = FollowRequest::whereFollowingId($pid)->whereFollowerId($id)->first(); $followRequest = FollowRequest::whereFollowingId($pid)->whereFollowerId($id)->first();
if(!$followRequest) { if(!$followRequest) {
@ -2011,6 +2045,11 @@ class ApiV1Controller extends Controller
$account = Profile::findOrFail($id); $account = Profile::findOrFail($id);
if($account && $account->domain) {
$domain = $account->domain;
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
$count = UserFilterService::muteCount($pid); $count = UserFilterService::muteCount($pid);
$maxLimit = intval(config('instance.user_filters.max_user_mutes')); $maxLimit = intval(config('instance.user_filters.max_user_mutes'));
if($count == 0) { if($count == 0) {
@ -2653,6 +2692,11 @@ class ApiV1Controller extends Controller
abort(404); abort(404);
} }
if($res && isset($res['account'], $res['account']['acct'], $res['account']['url']) && strpos($res['account']['acct'], '@') != -1) {
$domain = parse_url($res['account']['url'], PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
$scope = $res['visibility']; $scope = $res['visibility'];
if(!in_array($scope, ['public', 'unlisted'])) { if(!in_array($scope, ['public', 'unlisted'])) {
if($scope === 'private') { if($scope === 'private') {
@ -2697,6 +2741,11 @@ class ApiV1Controller extends Controller
return response('', 404); return response('', 404);
} }
if($status && isset($status['account'], $status['account']['acct']) && strpos($status['account']['acct'], '@') != -1) {
$domain = parse_url($status['account']['url'], PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
if(intval($status['account']['id']) !== intval($user->profile_id)) { if(intval($status['account']['id']) !== intval($user->profile_id)) {
if($status['visibility'] == 'private') { if($status['visibility'] == 'private') {
if(!FollowerService::follows($user->profile_id, $status['account']['id'])) { if(!FollowerService::follows($user->profile_id, $status['account']['id'])) {
@ -2780,6 +2829,10 @@ class ApiV1Controller extends Controller
$status = Status::findOrFail($id); $status = Status::findOrFail($id);
$account = AccountService::get($status->profile_id, true); $account = AccountService::get($status->profile_id, true);
abort_if(!$account, 404); abort_if(!$account, 404);
if($account && strpos($account['acct'], '@') != -1) {
$domain = parse_url($account['url'], PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
$author = intval($status->profile_id) === intval($pid) || $user->is_admin; $author = intval($status->profile_id) === intval($pid) || $user->is_admin;
$napi = $request->has(self::PF_API_ENTITY_KEY); $napi = $request->has(self::PF_API_ENTITY_KEY);
@ -2871,6 +2924,10 @@ class ApiV1Controller extends Controller
$pid = $user->profile_id; $pid = $user->profile_id;
$status = Status::findOrFail($id); $status = Status::findOrFail($id);
$account = AccountService::get($status->profile_id, true); $account = AccountService::get($status->profile_id, true);
if($account && strpos($account['acct'], '@') != -1) {
$domain = parse_url($account['url'], PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
abort_if(!$account, 404); abort_if(!$account, 404);
$author = intval($status->profile_id) === intval($pid) || $user->is_admin; $author = intval($status->profile_id) === intval($pid) || $user->is_admin;
$napi = $request->has(self::PF_API_ENTITY_KEY); $napi = $request->has(self::PF_API_ENTITY_KEY);
@ -3031,7 +3088,7 @@ class ApiV1Controller extends Controller
$content = strip_tags($request->input('status')); $content = strip_tags($request->input('status'));
$rendered = Autolink::create()->autolink($content); $rendered = Autolink::create()->autolink($content);
$cw = $user->profile->cw == true ? true : $request->input('sensitive', false); $cw = $user->profile->cw == true ? true : $request->boolean('sensitive', false);
$spoilerText = $cw && $request->filled('spoiler_text') ? $request->input('spoiler_text') : null; $spoilerText = $cw && $request->filled('spoiler_text') ? $request->input('spoiler_text') : null;
if($in_reply_to_id) { if($in_reply_to_id) {
@ -3200,7 +3257,11 @@ class ApiV1Controller extends Controller
abort_if($user->has_roles && !UserRoleService::can('can-share', $user->id), 403, 'Invalid permissions for this action'); abort_if($user->has_roles && !UserRoleService::can('can-share', $user->id), 403, 'Invalid permissions for this action');
AccountService::setLastActive($user->id); AccountService::setLastActive($user->id);
$status = Status::whereScope('public')->findOrFail($id); $status = Status::whereScope('public')->findOrFail($id);
if($status && ($status->uri || $status->url || $status->object_url)) {
$url = $status->uri ?? $status->url ?? $status->object_url;
$domain = parse_url($url, PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
if(intval($status->profile_id) !== intval($user->profile_id)) { if(intval($status->profile_id) !== intval($user->profile_id)) {
if($status->scope == 'private') { if($status->scope == 'private') {
abort_if(!FollowerService::follows($user->profile_id, $status->profile_id), 403); abort_if(!FollowerService::follows($user->profile_id, $status->profile_id), 403);

3
app/Http/Controllers/Api/ApiV2Controller.php
Wyświetl plik

@ -96,6 +96,9 @@ class ApiV2Controller extends Controller
'streaming' => 'wss://' . config('pixelfed.domain.app'), 'streaming' => 'wss://' . config('pixelfed.domain.app'),
'status' => null 'status' => null
], ],
'vapid' => [
'public_key' => config('webpush.vapid.public_key'),
],
'accounts' => [ 'accounts' => [
'max_featured_tags' => 0, 'max_featured_tags' => 0,
], ],

10
app/Http/Controllers/PublicApiController.php
Wyświetl plik

@ -42,6 +42,7 @@ use App\Services\{
use App\Jobs\StatusPipeline\NewStatusPipeline; use App\Jobs\StatusPipeline\NewStatusPipeline;
use League\Fractal\Serializer\ArraySerializer; use League\Fractal\Serializer\ArraySerializer;
use League\Fractal\Pagination\IlluminatePaginatorAdapter; use League\Fractal\Pagination\IlluminatePaginatorAdapter;
use App\Services\InstanceService;
class PublicApiController extends Controller class PublicApiController extends Controller
{ {
@ -661,6 +662,10 @@ class PublicApiController extends Controller
public function account(Request $request, $id) public function account(Request $request, $id)
{ {
$res = AccountService::get($id); $res = AccountService::get($id);
if($res && isset($res['local'], $res['url']) && !$res['local']) {
$domain = parse_url($res['url'], PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
return response()->json($res); return response()->json($res);
} }
@ -680,6 +685,11 @@ class PublicApiController extends Controller
$profile = AccountService::get($id); $profile = AccountService::get($id);
abort_if(!$profile, 404); abort_if(!$profile, 404);
if($profile && isset($profile['local'], $profile['url']) && !$profile['local']) {
$domain = parse_url($profile['url'], PHP_URL_HOST);
abort_if(in_array($domain, InstanceService::getBannedDomains()), 404);
}
$limit = $request->limit ?? 9; $limit = $request->limit ?? 9;
$max_id = $request->max_id; $max_id = $request->max_id;
$min_id = $request->min_id; $min_id = $request->min_id;

120
app/Instance.php
Wyświetl plik

@ -6,63 +6,77 @@ use Illuminate\Database\Eloquent\Model;
class Instance extends Model class Instance extends Model
{ {
protected $fillable = ['domain', 'banned', 'auto_cw', 'unlisted', 'notes']; protected $casts = [
'last_crawled_at' => 'datetime',
'actors_last_synced_at' => 'datetime',
'notes' => 'array',
'nodeinfo_last_fetched' => 'datetime',
'delivery_next_after' => 'datetime',
];
public function profiles() protected $fillable = [
{ 'domain',
return $this->hasMany(Profile::class, 'domain', 'domain'); 'banned',
} 'auto_cw',
'unlisted',
'notes'
];
public function statuses() public function profiles()
{ {
return $this->hasManyThrough( return $this->hasMany(Profile::class, 'domain', 'domain');
Status::class, }
Profile::class,
'domain',
'profile_id',
'domain',
'id'
);
}
public function reported() public function statuses()
{ {
return $this->hasManyThrough( return $this->hasManyThrough(
Report::class, Status::class,
Profile::class, Profile::class,
'domain', 'domain',
'reported_profile_id', 'profile_id',
'domain', 'domain',
'id' 'id'
); );
} }
public function reports() public function reported()
{ {
return $this->hasManyThrough( return $this->hasManyThrough(
Report::class, Report::class,
Profile::class, Profile::class,
'domain', 'domain',
'profile_id', 'reported_profile_id',
'domain', 'domain',
'id' 'id'
); );
} }
public function media() public function reports()
{ {
return $this->hasManyThrough( return $this->hasManyThrough(
Media::class, Report::class,
Profile::class, Profile::class,
'domain', 'domain',
'profile_id', 'profile_id',
'domain', 'domain',
'id' 'id'
); );
} }
public function getUrl() public function media()
{ {
return url("/i/admin/instances/show/{$this->id}"); return $this->hasManyThrough(
} Media::class,
Profile::class,
'domain',
'profile_id',
'domain',
'id'
);
}
public function getUrl()
{
return url("/i/admin/instances/show/{$this->id}");
}
} }

26
app/Jobs/CommentPipeline/CommentPipeline.php
Wyświetl plik

@ -91,19 +91,21 @@ class CommentPipeline implements ShouldQueue
return; return;
} }
DB::transaction(function() use($target, $actor, $comment) { if($target->user_id && $target->domain === null) {
$notification = new Notification(); DB::transaction(function() use($target, $actor, $comment) {
$notification->profile_id = $target->id; $notification = new Notification();
$notification->actor_id = $actor->id; $notification->profile_id = $target->id;
$notification->action = 'comment'; $notification->actor_id = $actor->id;
$notification->item_id = $comment->id; $notification->action = 'comment';
$notification->item_type = "App\Status"; $notification->item_id = $comment->id;
$notification->save(); $notification->item_type = "App\Status";
$notification->save();
NotificationService::setNotification($notification); NotificationService::setNotification($notification);
NotificationService::set($notification->profile_id, $notification->id); NotificationService::set($notification->profile_id, $notification->id);
StatusService::del($comment->id); StatusService::del($comment->id);
}); });
}
if($exists = Cache::get('status:replies:all:' . $status->id)) { if($exists = Cache::get('status:replies:all:' . $status->id)) {
if($exists && $exists->count() == 3) { if($exists && $exists->count() == 3) {

7
app/Jobs/DeletePipeline/DeleteRemoteStatusPipeline.php
Wyświetl plik

@ -22,9 +22,9 @@ use App\Notification;
use App\Services\AccountService; use App\Services\AccountService;
use App\Services\NetworkTimelineService; use App\Services\NetworkTimelineService;
use App\Services\StatusService; use App\Services\StatusService;
use App\Jobs\ProfilePipeline\DecrementPostCount;
use App\Jobs\MediaPipeline\MediaDeletePipeline; use App\Jobs\MediaPipeline\MediaDeletePipeline;
use Cache; use Cache;
use App\Services\Account\AccountStatService;
class DeleteRemoteStatusPipeline implements ShouldQueue class DeleteRemoteStatusPipeline implements ShouldQueue
{ {
@ -56,10 +56,7 @@ class DeleteRemoteStatusPipeline implements ShouldQueue
{ {
$status = $this->status; $status = $this->status;
if(AccountService::get($status->profile_id, true)) { AccountStatService::decrementPostCount($status->profile_id);
DecrementPostCount::dispatch($status->profile_id)->onQueue('low');
}
NetworkTimelineService::del($status->id); NetworkTimelineService::del($status->id);
StatusService::del($status->id, true); StatusService::del($status->id, true);
Bookmark::whereStatusId($status->id)->delete(); Bookmark::whereStatusId($status->id)->delete();

22
app/Jobs/FollowPipeline/FollowPipeline.php
Wyświetl plik

@ -72,16 +72,18 @@ class FollowPipeline implements ShouldQueue
$target->save(); $target->save();
AccountService::del($target->id); AccountService::del($target->id);
try { if($target->user_id && $target->domain === null) {
$notification = new Notification(); try {
$notification->profile_id = $target->id; $notification = new Notification();
$notification->actor_id = $actor->id; $notification->profile_id = $target->id;
$notification->action = 'follow'; $notification->actor_id = $actor->id;
$notification->item_id = $target->id; $notification->action = 'follow';
$notification->item_type = "App\Profile"; $notification->item_id = $target->id;
$notification->save(); $notification->item_type = "App\Profile";
} catch (Exception $e) { $notification->save();
Log::error($e); } catch (Exception $e) {
Log::error($e);
}
} }
} }
} }

129
app/Jobs/ImportPipeline/ImportMediaToCloudPipeline.php 100644
Wyświetl plik

@ -0,0 +1,129 @@
<?php
namespace App\Jobs\ImportPipeline;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeUnique;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\Middleware\WithoutOverlapping;
use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
use App\Models\ImportPost;
use App\Media;
use App\Services\MediaStorageService;
use Illuminate\Support\Facades\Storage;
use App\Jobs\VideoPipeline\VideoThumbnailToCloudPipeline;
class ImportMediaToCloudPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
protected $importPost;
public $timeout = 900;
public $tries = 3;
public $maxExceptions = 1;
public $failOnTimeout = true;
/**
* The number of seconds after which the job's unique lock will be released.
*
* @var int
*/
public $uniqueFor = 3600;
/**
* Get the unique ID for the job.
*/
public function uniqueId(): string
{
return 'import-media-to-cloud-pipeline:ip-id:' . $this->importPost->id;
}
/**
* Get the middleware the job should pass through.
*
* @return array<int, object>
*/
public function middleware(): array
{
return [(new WithoutOverlapping("import-media-to-cloud-pipeline:ip-id:{$this->importPost->id}"))->shared()->dontRelease()];
}
/**
* Delete the job if its models no longer exist.
*
* @var bool
*/
public $deleteWhenMissingModels = true;
/**
* Create a new job instance.
*/
public function __construct(ImportPost $importPost)
{
$this->importPost = $importPost;
}
/**
* Execute the job.
*/
public function handle(): void
{
$ip = $this->importPost;
if(
$ip->status_id === null ||
$ip->uploaded_to_s3 === true ||
(bool) config_cache('pixelfed.cloud_storage') === false) {
return;
}
$media = Media::whereStatusId($ip->status_id)->get();
if(!$media || !$media->count()) {
$importPost = ImportPost::find($ip->id);
$importPost->uploaded_to_s3 = true;
$importPost->save();
return;
}
foreach($media as $mediaPart) {
$this->handleMedia($mediaPart);
}
}
protected function handleMedia($media)
{
$ip = $this->importPost;
$importPost = ImportPost::find($ip->id);
if(!$importPost) {
return;
}
$res = MediaStorageService::move($media);
$importPost->uploaded_to_s3 = true;
$importPost->save();
if(!$res) {
return;
}
if($res === 'invalid file') {
return;
}
if($res === 'success') {
if($media->mime === 'video/mp4') {
VideoThumbnailToCloudPipeline::dispatch($media)->onQueue('low');
} else {
Storage::disk('local')->delete($media->media_path);
}
}
}
}

97
app/Jobs/InstancePipeline/FetchNodeinfoPipeline.php
Wyświetl plik

@ -4,6 +4,7 @@ namespace App\Jobs\InstancePipeline;
use Illuminate\Bus\Queueable; use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldBeUnique; use Illuminate\Contracts\Queue\ShouldBeUnique;
use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
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;
@ -12,45 +13,71 @@ use Illuminate\Support\Facades\Http;
use App\Instance; use App\Instance;
use App\Profile; use App\Profile;
use App\Services\NodeinfoService; use App\Services\NodeinfoService;
use Illuminate\Contracts\Cache\Repository;
use Illuminate\Support\Facades\Cache;
class FetchNodeinfoPipeline implements ShouldQueue class FetchNodeinfoPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
protected $instance; protected $instance;
/** /**
* Create a new job instance. * Create a new job instance.
* *
* @return void * @return void
*/ */
public function __construct(Instance $instance) public function __construct(Instance $instance)
{ {
$this->instance = $instance; $this->instance = $instance;
} }
/** /**
* Execute the job. * The number of seconds after which the job's unique lock will be released.
* *
* @return void * @var int
*/ */
public function handle() public $uniqueFor = 14400;
{
$instance = $this->instance;
$ni = NodeinfoService::get($instance->domain); /**
if($ni) { * Get the unique ID for the job.
if(isset($ni['software']) && is_array($ni['software']) && isset($ni['software']['name'])) { */
$software = $ni['software']['name']; public function uniqueId(): string
$instance->software = strtolower(strip_tags($software)); {
$instance->last_crawled_at = now(); return $this->instance->id;
$instance->user_count = Profile::whereDomain($instance->domain)->count(); }
$instance->save();
} /**
} else { * Execute the job.
$instance->user_count = Profile::whereDomain($instance->domain)->count(); *
$instance->last_crawled_at = now(); * @return void
$instance->save(); */
} public function handle()
} {
$instance = $this->instance;
if( $instance->nodeinfo_last_fetched &&
$instance->nodeinfo_last_fetched->gt(now()->subHours(12)) ||
$instance->delivery_timeout &&
$instance->delivery_next_after->gt(now())
) {
return;
}
$ni = NodeinfoService::get($instance->domain);
$instance->last_crawled_at = now();
if($ni) {
if(isset($ni['software']) && is_array($ni['software']) && isset($ni['software']['name'])) {
$software = $ni['software']['name'];
$instance->software = strtolower(strip_tags($software));
$instance->user_count = Profile::whereDomain($instance->domain)->count();
$instance->nodeinfo_last_fetched = now();
$instance->save();
}
} else {
$instance->delivery_timeout = 1;
$instance->delivery_next_after = now()->addHours(14);
$instance->save();
}
}
} }

7
app/Jobs/InternalPipeline/NotificationEpochUpdatePipeline.php
Wyświetl plik

@ -61,7 +61,12 @@ class NotificationEpochUpdatePipeline implements ShouldQueue, ShouldBeUniqueUnti
*/ */
public function handle(): void public function handle(): void
{ {
$rec = Notification::where('created_at', '>', now()->subMonths(6))->first(); $pid = Cache::get(NotificationService::EPOCH_CACHE_KEY . '6');
if($pid && $pid > 1) {
$rec = Notification::where('id', '>', $pid)->whereDate('created_at', now()->subMonths(6)->format('Y-m-d'))->first();
} else {
$rec = Notification::whereDate('created_at', now()->subMonths(6)->format('Y-m-d'))->first();
}
$id = 1; $id = 1;
if($rec) { if($rec) {
$id = $rec->id; $id = $rec->id;

20
app/Jobs/LikePipeline/LikePipeline.php
Wyświetl plik

@ -79,16 +79,18 @@ class LikePipeline implements ShouldQueue
return true; return true;
} }
try { if($status->uri === null && $status->object_url === null && $status->url === null) {
$notification = new Notification(); try {
$notification->profile_id = $status->profile_id; $notification = new Notification();
$notification->actor_id = $actor->id; $notification->profile_id = $status->profile_id;
$notification->action = 'like'; $notification->actor_id = $actor->id;
$notification->item_id = $status->id; $notification->action = 'like';
$notification->item_type = "App\Status"; $notification->item_id = $status->id;
$notification->save(); $notification->item_type = "App\Status";
$notification->save();
} catch (Exception $e) { } catch (Exception $e) {
}
} }
} }

15
app/Jobs/ProfilePipeline/DecrementPostCount.php
Wyświetl plik

@ -35,18 +35,7 @@ class DecrementPostCount implements ShouldQueue
*/ */
public function handle() public function handle()
{ {
$id = $this->id; // deprecated
return;
$profile = Profile::find($id);
if(!$profile) {
return 1;
}
$profile->status_count = $profile->status_count ? $profile->status_count - 1 : 0;
$profile->save();
AccountService::del($id);
return 1;
} }
} }

49
app/Jobs/ProfilePipeline/IncrementPostCount.php
Wyświetl plik

@ -14,42 +14,12 @@ use App\Profile;
use App\Status; use App\Status;
use App\Services\AccountService; use App\Services\AccountService;
class IncrementPostCount implements ShouldQueue, ShouldBeUniqueUntilProcessing class IncrementPostCount implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public $id; public $id;
public $timeout = 900;
public $tries = 3;
public $maxExceptions = 1;
public $failOnTimeout = true;
/**
* The number of seconds after which the job's unique lock will be released.
*
* @var int
*/
public $uniqueFor = 3600;
/**
* Get the unique ID for the job.
*/
public function uniqueId(): string
{
return 'propipe:ipc:' . $this->id;
}
/**
* Get the middleware the job should pass through.
*
* @return array<int, object>
*/
public function middleware(): array
{
return [(new WithoutOverlapping("propipe:ipc:{$this->id}"))->shared()->dontRelease()];
}
/** /**
* Create a new job instance. * Create a new job instance.
* *
@ -67,20 +37,7 @@ class IncrementPostCount implements ShouldQueue, ShouldBeUniqueUntilProcessing
*/ */
public function handle() public function handle()
{ {
$id = $this->id; // deprecated
return;
$profile = Profile::find($id);
if(!$profile) {
return 1;
}
$profile->status_count = $profile->status_count + 1;
$profile->last_status_at = now();
$profile->save();
AccountService::del($id);
AccountService::get($id);
return 1;
} }
} }

6
app/Jobs/StatusPipeline/RemoteStatusDelete.php
Wyświetl plik

@ -39,8 +39,8 @@ use App\Services\AccountService;
use App\Services\CollectionService; use App\Services\CollectionService;
use App\Services\StatusService; use App\Services\StatusService;
use App\Jobs\MediaPipeline\MediaDeletePipeline; use App\Jobs\MediaPipeline\MediaDeletePipeline;
use App\Jobs\ProfilePipeline\DecrementPostCount;
use App\Services\NotificationService; use App\Services\NotificationService;
use App\Services\Account\AccountStatService;
class RemoteStatusDelete implements ShouldQueue, ShouldBeUniqueUntilProcessing class RemoteStatusDelete implements ShouldQueue, ShouldBeUniqueUntilProcessing
{ {
@ -109,9 +109,7 @@ class RemoteStatusDelete implements ShouldQueue, ShouldBeUniqueUntilProcessing
} }
StatusService::del($status->id, true); StatusService::del($status->id, true);
AccountStatService::decrementPostCount($status->profile_id);
DecrementPostCount::dispatch($status->profile_id)->onQueue('inbox');
return $this->unlinkRemoveMedia($status); return $this->unlinkRemoveMedia($status);
} }

24
app/Jobs/StatusPipeline/StatusReplyPipeline.php
Wyświetl plik

@ -87,18 +87,20 @@ class StatusReplyPipeline implements ShouldQueue
Cache::forget('status:replies:all:' . $reply->id); Cache::forget('status:replies:all:' . $reply->id);
Cache::forget('status:replies:all:' . $status->id); Cache::forget('status:replies:all:' . $status->id);
DB::transaction(function() use($target, $actor, $status) { if($target->user_id && $target->domain === null) {
$notification = new Notification(); DB::transaction(function() use($target, $actor, $status) {
$notification->profile_id = $target->id; $notification = new Notification();
$notification->actor_id = $actor->id; $notification->profile_id = $target->id;
$notification->action = 'comment'; $notification->actor_id = $actor->id;
$notification->item_id = $status->id; $notification->action = 'comment';
$notification->item_type = "App\Status"; $notification->item_id = $status->id;
$notification->save(); $notification->item_type = "App\Status";
$notification->save();
NotificationService::setNotification($notification); NotificationService::setNotification($notification);
NotificationService::set($notification->profile_id, $notification->id); NotificationService::set($notification->profile_id, $notification->id);
}); });
}
if($exists = Cache::get('status:replies:all:' . $reply->id)) { if($exists = Cache::get('status:replies:all:' . $reply->id)) {
if($exists && $exists->count() == 3) { if($exists && $exists->count() == 3) {

147
app/Jobs/VideoPipeline/VideoThumbnailToCloudPipeline.php 100644
Wyświetl plik

@ -0,0 +1,147 @@
<?php
namespace App\Jobs\VideoPipeline;
use Illuminate\Bus\Queueable;
use Illuminate\Contracts\Queue\ShouldQueue;
use Illuminate\Foundation\Bus\Dispatchable;
use Illuminate\Queue\InteractsWithQueue;
use Illuminate\Queue\SerializesModels;
use Illuminate\Queue\Middleware\WithoutOverlapping;
use Illuminate\Contracts\Queue\ShouldBeUniqueUntilProcessing;
use Illuminate\Http\File;
use Cache;
use FFMpeg;
use Storage;
use App\Media;
use App\Jobs\MediaPipeline\MediaStoragePipeline;
use App\Util\Media\Blurhash;
use App\Services\MediaService;
use App\Services\StatusService;
use App\Services\ResilientMediaStorageService;
class VideoThumbnailToCloudPipeline implements ShouldQueue, ShouldBeUniqueUntilProcessing
{
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
protected $media;
public $timeout = 900;
public $tries = 3;
public $maxExceptions = 1;
public $failOnTimeout = true;
public $deleteWhenMissingModels = true;
/**
* The number of seconds after which the job's unique lock will be released.
*
* @var int
*/
public $uniqueFor = 3600;
/**
* Get the unique ID for the job.
*/
public function uniqueId(): string
{
return 'media:video-thumb-to-cloud:id-' . $this->media->id;
}
/**
* Get the middleware the job should pass through.
*
* @return array<int, object>
*/
public function middleware(): array
{
return [(new WithoutOverlapping("media:video-thumb-to-cloud:id-{$this->media->id}"))->shared()->dontRelease()];
}
/**
* Create a new job instance.
*/
public function __construct(Media $media)
{
$this->media = $media;
}
/**
* Execute the job.
*/
public function handle(): void
{
if((bool) config_cache('pixelfed.cloud_storage') === false) {
return;
}
$media = $this->media;
if($media->mime != 'video/mp4') {
return;
}
if($media->profile_id === null || $media->status_id === null) {
return;
}
if($media->thumbnail_url) {
return;
}
$base = $media->media_path;
$path = explode('/', $base);
$name = last($path);
try {
$t = explode('.', $name);
$t = $t[0].'_thumb.jpeg';
$i = count($path) - 1;
$path[$i] = $t;
$save = implode('/', $path);
$video = FFMpeg::open($base)
->getFrameFromSeconds(1)
->export()
->toDisk('local')
->save($save);
if(!$save) {
return;
}
$media->thumbnail_path = $save;
$p = explode('/', $media->media_path);
array_pop($p);
$pt = explode('/', $save);
$thumbname = array_pop($pt);
$storagePath = implode('/', $p);
$thumb = storage_path('app/' . $save);
$thumbUrl = ResilientMediaStorageService::store($storagePath, $thumb, $thumbname);
$media->thumbnail_url = $thumbUrl;
$media->save();
$blurhash = Blurhash::generate($media);
if($blurhash) {
$media->blurhash = $blurhash;
$media->save();
}
if(str_starts_with($save, 'public/m/_v2/') && str_ends_with($save, '.jpeg')) {
Storage::delete($save);
}
if(str_starts_with($media->media_path, 'public/m/_v2/') && str_ends_with($media->media_path, '.mp4')) {
Storage::disk('local')->delete($media->media_path);
}
} catch (Exception $e) {
}
if($media->status_id) {
Cache::forget('status:transformer:media:attachments:' . $media->status_id);
MediaService::del($media->status_id);
Cache::forget('status:thumb:nsfw0' . $media->status_id);
Cache::forget('status:thumb:nsfw1' . $media->status_id);
Cache::forget('pf:services:sh:id:' . $media->status_id);
StatusService::del($media->status_id);
}
}
}

31
app/Services/Account/AccountStatService.php 100644
Wyświetl plik

@ -0,0 +1,31 @@
<?php
namespace App\Services\Account;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Redis;
class AccountStatService
{
const REFRESH_CACHE_KEY = 'pf:services:accountstats:refresh:daily';
public static function incrementPostCount($pid)
{
return Redis::zadd(self::REFRESH_CACHE_KEY, $pid, $pid);
}
public static function decrementPostCount($pid)
{
return Redis::zadd(self::REFRESH_CACHE_KEY, $pid, $pid);
}
public static function removeFromPostCount($pid)
{
return Redis::zrem(self::REFRESH_CACHE_KEY, $pid);
}
public static function getAllPostCountIncr($limit = -1)
{
return Redis::zrange(self::REFRESH_CACHE_KEY, 0, $limit);
}
}

445
app/Services/MediaStorageService.php
Wyświetl plik

@ -21,28 +21,40 @@ use App\Jobs\AvatarPipeline\AvatarStorageCleanup;
class MediaStorageService { class MediaStorageService {
public static function store(Media $media) public static function store(Media $media)
{ {
if(config_cache('pixelfed.cloud_storage') == true) { if(config_cache('pixelfed.cloud_storage') == true) {
(new self())->cloudStore($media); (new self())->cloudStore($media);
} }
return; return;
} }
public static function avatar($avatar, $local = false, $skipRecentCheck = false) public static function move(Media $media)
{ {
return (new self())->fetchAvatar($avatar, $local, $skipRecentCheck); if($media->remote_media) {
} return;
}
public static function head($url) if(config_cache('pixelfed.cloud_storage') == true) {
{ return (new self())->cloudMove($media);
$c = new Client(); }
try { return;
$r = $c->request('HEAD', $url); }
} catch (RequestException $e) {
return false; public static function avatar($avatar, $local = false, $skipRecentCheck = false)
} {
return (new self())->fetchAvatar($avatar, $local, $skipRecentCheck);
}
public static function head($url)
{
$c = new Client();
try {
$r = $c->request('HEAD', $url);
} catch (RequestException $e) {
return false;
}
$h = Arr::mapWithKeys($r->getHeaders(), function($item, $key) { $h = Arr::mapWithKeys($r->getHeaders(), function($item, $key) {
return [strtolower($key) => last($item)]; return [strtolower($key) => last($item)];
@ -55,224 +67,261 @@ class MediaStorageService {
$len = (int) $h['content-length']; $len = (int) $h['content-length'];
$mime = $h['content-type']; $mime = $h['content-type'];
if($len < 10 || $len > ((config_cache('pixelfed.max_photo_size') * 1000))) { if($len < 10 || $len > ((config_cache('pixelfed.max_photo_size') * 1000))) {
return false; return false;
} }
return [ return [
'length' => $len, 'length' => $len,
'mime' => $mime 'mime' => $mime
]; ];
} }
protected function cloudStore($media) protected function cloudStore($media)
{ {
if($media->remote_media == true) { if($media->remote_media == true) {
if(config('media.storage.remote.cloud')) { if(config('media.storage.remote.cloud')) {
(new self())->remoteToCloud($media); (new self())->remoteToCloud($media);
} }
} else { } else {
(new self())->localToCloud($media); (new self())->localToCloud($media);
} }
} }
protected function localToCloud($media) protected function localToCloud($media)
{ {
$path = storage_path('app/'.$media->media_path); $path = storage_path('app/'.$media->media_path);
$thumb = storage_path('app/'.$media->thumbnail_path); $thumb = storage_path('app/'.$media->thumbnail_path);
$p = explode('/', $media->media_path); $p = explode('/', $media->media_path);
$name = array_pop($p); $name = array_pop($p);
$pt = explode('/', $media->thumbnail_path); $pt = explode('/', $media->thumbnail_path);
$thumbname = array_pop($pt); $thumbname = array_pop($pt);
$storagePath = implode('/', $p); $storagePath = implode('/', $p);
$url = ResilientMediaStorageService::store($storagePath, $path, $name); $url = ResilientMediaStorageService::store($storagePath, $path, $name);
if($thumb) { if($thumb) {
$thumbUrl = ResilientMediaStorageService::store($storagePath, $thumb, $thumbname); $thumbUrl = ResilientMediaStorageService::store($storagePath, $thumb, $thumbname);
$media->thumbnail_url = $thumbUrl; $media->thumbnail_url = $thumbUrl;
} }
$media->cdn_url = $url; $media->cdn_url = $url;
$media->optimized_url = $url; $media->optimized_url = $url;
$media->replicated_at = now(); $media->replicated_at = now();
$media->save(); $media->save();
if($media->status_id) { if($media->status_id) {
Cache::forget('status:transformer:media:attachments:' . $media->status_id); Cache::forget('status:transformer:media:attachments:' . $media->status_id);
MediaService::del($media->status_id); MediaService::del($media->status_id);
StatusService::del($media->status_id, false); StatusService::del($media->status_id, false);
} }
} }
protected function remoteToCloud($media) protected function remoteToCloud($media)
{ {
$url = $media->remote_url; $url = $media->remote_url;
if(!Helpers::validateUrl($url)) { if(!Helpers::validateUrl($url)) {
return; return;
} }
$head = $this->head($media->remote_url); $head = $this->head($media->remote_url);
if(!$head) { if(!$head) {
return; return;
} }
$mimes = [ $mimes = [
'image/jpeg', 'image/jpeg',
'image/png', 'image/png',
'video/mp4' 'video/mp4'
]; ];
$mime = $head['mime']; $mime = $head['mime'];
$max_size = (int) config_cache('pixelfed.max_photo_size') * 1000; $max_size = (int) config_cache('pixelfed.max_photo_size') * 1000;
$media->size = $head['length']; $media->size = $head['length'];
$media->remote_media = true; $media->remote_media = true;
$media->save(); $media->save();
if(!in_array($mime, $mimes)) { if(!in_array($mime, $mimes)) {
return; return;
} }
if($head['length'] >= $max_size) { if($head['length'] >= $max_size) {
return; return;
} }
switch ($mime) { switch ($mime) {
case 'image/png': case 'image/png':
$ext = '.png'; $ext = '.png';
break; break;
case 'image/gif': case 'image/gif':
$ext = '.gif'; $ext = '.gif';
break; break;
case 'image/jpeg': case 'image/jpeg':
$ext = '.jpg'; $ext = '.jpg';
break; break;
case 'video/mp4': case 'video/mp4':
$ext = '.mp4'; $ext = '.mp4';
break; break;
} }
$base = MediaPathService::get($media->profile); $base = MediaPathService::get($media->profile);
$path = Str::random(40) . $ext; $path = Str::random(40) . $ext;
$tmpBase = storage_path('app/remcache/'); $tmpBase = storage_path('app/remcache/');
$tmpPath = $media->profile_id . '-' . $path; $tmpPath = $media->profile_id . '-' . $path;
$tmpName = $tmpBase . $tmpPath; $tmpName = $tmpBase . $tmpPath;
$data = file_get_contents($url, false, null, 0, $head['length']); $data = file_get_contents($url, false, null, 0, $head['length']);
file_put_contents($tmpName, $data); file_put_contents($tmpName, $data);
$hash = hash_file('sha256', $tmpName); $hash = hash_file('sha256', $tmpName);
$disk = Storage::disk(config('filesystems.cloud')); $disk = Storage::disk(config('filesystems.cloud'));
$file = $disk->putFileAs($base, new File($tmpName), $path, 'public'); $file = $disk->putFileAs($base, new File($tmpName), $path, 'public');
$permalink = $disk->url($file); $permalink = $disk->url($file);
$media->media_path = $file; $media->media_path = $file;
$media->cdn_url = $permalink; $media->cdn_url = $permalink;
$media->original_sha256 = $hash; $media->original_sha256 = $hash;
$media->replicated_at = now(); $media->replicated_at = now();
$media->save(); $media->save();
if($media->status_id) { if($media->status_id) {
Cache::forget('status:transformer:media:attachments:' . $media->status_id); Cache::forget('status:transformer:media:attachments:' . $media->status_id);
} }
unlink($tmpName); unlink($tmpName);
} }
protected function fetchAvatar($avatar, $local = false, $skipRecentCheck = false) protected function fetchAvatar($avatar, $local = false, $skipRecentCheck = false)
{ {
$queue = random_int(1, 15) > 5 ? 'mmo' : 'low'; $queue = random_int(1, 15) > 5 ? 'mmo' : 'low';
$url = $avatar->remote_url; $url = $avatar->remote_url;
$driver = $local ? 'local' : config('filesystems.cloud'); $driver = $local ? 'local' : config('filesystems.cloud');
if(empty($url) || Helpers::validateUrl($url) == false) { if(empty($url) || Helpers::validateUrl($url) == false) {
return; return;
} }
$head = $this->head($url); $head = $this->head($url);
if($head == false) { if($head == false) {
return; return;
} }
$mimes = [ $mimes = [
'application/octet-stream', 'application/octet-stream',
'image/jpeg', 'image/jpeg',
'image/png', 'image/png',
]; ];
$mime = $head['mime']; $mime = $head['mime'];
$max_size = (int) config('pixelfed.max_avatar_size') * 1000; $max_size = (int) config('pixelfed.max_avatar_size') * 1000;
if(!$skipRecentCheck) { if(!$skipRecentCheck) {
if($avatar->last_fetched_at && $avatar->last_fetched_at->gt(now()->subMonths(3))) { if($avatar->last_fetched_at && $avatar->last_fetched_at->gt(now()->subMonths(3))) {
return; return;
} }
} }
Cache::forget('avatar:' . $avatar->profile_id); Cache::forget('avatar:' . $avatar->profile_id);
AccountService::del($avatar->profile_id); AccountService::del($avatar->profile_id);
// handle pleroma edge case // handle pleroma edge case
if(Str::endsWith($mime, '; charset=utf-8')) { if(Str::endsWith($mime, '; charset=utf-8')) {
$mime = str_replace('; charset=utf-8', '', $mime); $mime = str_replace('; charset=utf-8', '', $mime);
} }
if(!in_array($mime, $mimes)) { if(!in_array($mime, $mimes)) {
return; return;
} }
if($head['length'] >= $max_size) { if($head['length'] >= $max_size) {
return; return;
} }
$base = ($local ? 'public/cache/' : 'cache/') . 'avatars/' . $avatar->profile_id; $base = ($local ? 'public/cache/' : 'cache/') . 'avatars/' . $avatar->profile_id;
$ext = $head['mime'] == 'image/jpeg' ? 'jpg' : 'png'; $ext = $head['mime'] == 'image/jpeg' ? 'jpg' : 'png';
$path = 'avatar_' . strtolower(Str::random(random_int(3,6))) . '.' . $ext; $path = 'avatar_' . strtolower(Str::random(random_int(3,6))) . '.' . $ext;
$tmpBase = storage_path('app/remcache/'); $tmpBase = storage_path('app/remcache/');
$tmpPath = 'avatar_' . $avatar->profile_id . '-' . $path; $tmpPath = 'avatar_' . $avatar->profile_id . '-' . $path;
$tmpName = $tmpBase . $tmpPath; $tmpName = $tmpBase . $tmpPath;
$data = @file_get_contents($url, false, null, 0, $head['length']); $data = @file_get_contents($url, false, null, 0, $head['length']);
if(!$data) { if(!$data) {
return; return;
} }
file_put_contents($tmpName, $data); file_put_contents($tmpName, $data);
$mimeCheck = Storage::mimeType('remcache/' . $tmpPath); $mimeCheck = Storage::mimeType('remcache/' . $tmpPath);
if(!$mimeCheck || !in_array($mimeCheck, ['image/png', 'image/jpeg'])) { if(!$mimeCheck || !in_array($mimeCheck, ['image/png', 'image/jpeg'])) {
$avatar->last_fetched_at = now(); $avatar->last_fetched_at = now();
$avatar->save(); $avatar->save();
unlink($tmpName); unlink($tmpName);
return; return;
} }
$disk = Storage::disk($driver); $disk = Storage::disk($driver);
$file = $disk->putFileAs($base, new File($tmpName), $path, 'public'); $file = $disk->putFileAs($base, new File($tmpName), $path, 'public');
$permalink = $disk->url($file); $permalink = $disk->url($file);
$avatar->media_path = $base . '/' . $path; $avatar->media_path = $base . '/' . $path;
$avatar->is_remote = true; $avatar->is_remote = true;
$avatar->cdn_url = $local ? config('app.url') . $permalink : $permalink; $avatar->cdn_url = $local ? config('app.url') . $permalink : $permalink;
$avatar->size = $head['length']; $avatar->size = $head['length'];
$avatar->change_count = $avatar->change_count + 1; $avatar->change_count = $avatar->change_count + 1;
$avatar->last_fetched_at = now(); $avatar->last_fetched_at = now();
$avatar->save(); $avatar->save();
Cache::forget('avatar:' . $avatar->profile_id); Cache::forget('avatar:' . $avatar->profile_id);
AccountService::del($avatar->profile_id); AccountService::del($avatar->profile_id);
AvatarStorageCleanup::dispatch($avatar)->onQueue($queue)->delay(now()->addMinutes(random_int(3, 15))); AvatarStorageCleanup::dispatch($avatar)->onQueue($queue)->delay(now()->addMinutes(random_int(3, 15)));
unlink($tmpName); unlink($tmpName);
} }
public static function delete(Media $media, $confirm = false) public static function delete(Media $media, $confirm = false)
{ {
if(!$confirm) { if(!$confirm) {
return; return;
} }
MediaDeletePipeline::dispatch($media)->onQueue('mmo'); MediaDeletePipeline::dispatch($media)->onQueue('mmo');
} }
protected function cloudMove($media)
{
if(!Storage::exists($media->media_path)) {
return 'invalid file';
}
$path = storage_path('app/'.$media->media_path);
$thumb = false;
if($media->thumbnail_path) {
$thumb = storage_path('app/'.$media->thumbnail_path);
$pt = explode('/', $media->thumbnail_path);
$thumbname = array_pop($pt);
}
$p = explode('/', $media->media_path);
$name = array_pop($p);
$storagePath = implode('/', $p);
$url = ResilientMediaStorageService::store($storagePath, $path, $name);
if($thumb) {
$thumbUrl = ResilientMediaStorageService::store($storagePath, $thumb, $thumbname);
$media->thumbnail_url = $thumbUrl;
}
$media->cdn_url = $url;
$media->optimized_url = $url;
$media->replicated_at = now();
$media->save();
if($media->status_id) {
Cache::forget('status:transformer:media:attachments:' . $media->status_id);
MediaService::del($media->status_id);
StatusService::del($media->status_id, false);
}
return 'success';
}
} }

10
app/Services/NodeinfoService.php
Wyświetl plik

@ -22,7 +22,10 @@ class NodeinfoService
$wk = $url . '/.well-known/nodeinfo'; $wk = $url . '/.well-known/nodeinfo';
try { try {
$res = Http::withHeaders($headers) $res = Http::withOptions([
'allow_redirects' => false,
])
->withHeaders($headers)
->timeout(5) ->timeout(5)
->get($wk); ->get($wk);
} catch (RequestException $e) { } catch (RequestException $e) {
@ -61,7 +64,10 @@ class NodeinfoService
} }
try { try {
$res = Http::withHeaders($headers) $res = Http::withOptions([
'allow_redirects' => false,
])
->withHeaders($headers)
->timeout(5) ->timeout(5)
->get($href); ->get($href);
} catch (RequestException $e) { } catch (RequestException $e) {

12
app/Util/ActivityPub/Helpers.php
Wyświetl plik

@ -39,10 +39,9 @@ use App\Jobs\HomeFeedPipeline\FeedInsertRemotePipeline;
use App\Util\Media\License; use App\Util\Media\License;
use App\Models\Poll; use App\Models\Poll;
use Illuminate\Contracts\Cache\LockTimeoutException; use Illuminate\Contracts\Cache\LockTimeoutException;
use App\Jobs\ProfilePipeline\IncrementPostCount;
use App\Jobs\ProfilePipeline\DecrementPostCount;
use App\Services\DomainService; use App\Services\DomainService;
use App\Services\UserFilterService; use App\Services\UserFilterService;
use App\Services\Account\AccountStatService;
class Helpers { class Helpers {
@ -536,7 +535,7 @@ class Helpers {
} }
} }
IncrementPostCount::dispatch($pid)->onQueue('low'); AccountStatService::incrementPostCount($pid);
if( $status->in_reply_to_id === null && if( $status->in_reply_to_id === null &&
in_array($status->type, ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album']) in_array($status->type, ['photo', 'photo:album', 'video', 'video:album', 'photo:video:album'])
@ -549,10 +548,11 @@ class Helpers {
public static function getSensitive($activity, $url) public static function getSensitive($activity, $url)
{ {
$id = isset($activity['id']) ? self::pluckval($activity['id']) : self::pluckval($url); if(!$url || !strlen($url)) {
$url = isset($activity['url']) ? self::pluckval($activity['url']) : $id; return true;
$urlDomain = parse_url($url, PHP_URL_HOST); }
$urlDomain = parse_url($url, PHP_URL_HOST);
$cw = isset($activity['sensitive']) ? (bool) $activity['sensitive'] : false; $cw = isset($activity['sensitive']) ? (bool) $activity['sensitive'] : false;
if(in_array($urlDomain, InstanceService::getNsfwDomains())) { if(in_array($urlDomain, InstanceService::getNsfwDomains())) {

2
app/Util/ActivityPub/Inbox.php
Wyświetl plik

@ -48,8 +48,6 @@ use App\Services\UserFilterService;
use App\Services\NetworkTimelineService; use App\Services\NetworkTimelineService;
use App\Models\Conversation; use App\Models\Conversation;
use App\Models\RemoteReport; use App\Models\RemoteReport;
use App\Jobs\ProfilePipeline\IncrementPostCount;
use App\Jobs\ProfilePipeline\DecrementPostCount;
use App\Jobs\HomeFeedPipeline\FeedRemoveRemotePipeline; use App\Jobs\HomeFeedPipeline\FeedRemoveRemotePipeline;
class Inbox class Inbox

349
config/horizon.php
Wyświetl plik

@ -2,201 +2,202 @@
return [ return [
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Horizon Domain | Horizon Domain
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This is the subdomain where Horizon will be accessible from. If this | This is the subdomain where Horizon will be accessible from. If this
| setting is null, Horizon will reside under the same domain as the | setting is null, Horizon will reside under the same domain as the
| application. Otherwise, this value will serve as the subdomain. | application. Otherwise, this value will serve as the subdomain.
| |
*/ */
'domain' => null, 'domain' => null,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Horizon Path | Horizon Path
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This is the URI path where Horizon will be accessible from. Feel free | This is the URI path where Horizon will be accessible from. Feel free
| to change this path to anything you like. Note that the URI will not | to change this path to anything you like. Note that the URI will not
| affect the paths of its internal API that aren't exposed to users. | affect the paths of its internal API that aren't exposed to users.
| |
*/ */
'path' => 'horizon', 'path' => 'horizon',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Horizon Redis Connection | Horizon Redis Connection
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This is the name of the Redis connection where Horizon will store the | This is the name of the Redis connection where Horizon will store the
| meta information required for it to function. It includes the list | meta information required for it to function. It includes the list
| of supervisors, failed jobs, job metrics, and other information. | of supervisors, failed jobs, job metrics, and other information.
| |
*/ */
'use' => 'default', 'use' => 'default',
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Horizon Redis Prefix | Horizon Redis Prefix
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This prefix will be used when storing all Horizon data in Redis. You | This prefix will be used when storing all Horizon data in Redis. You
| may modify the prefix when you are running multiple installations | may modify the prefix when you are running multiple installations
| of Horizon on the same server so that they don't have problems. | of Horizon on the same server so that they don't have problems.
| |
*/ */
'prefix' => env('HORIZON_PREFIX', 'horizon-'), 'prefix' => env('HORIZON_PREFIX', 'horizon-'),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Horizon Route Middleware | Horizon Route Middleware
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| These middleware will get attached onto each Horizon route, giving you | These middleware will get attached onto each Horizon route, giving you
| the chance to add your own middleware to this list or change any of | the chance to add your own middleware to this list or change any of
| the existing middleware. Or, you can simply stick with this list. | the existing middleware. Or, you can simply stick with this list.
| |
*/ */
'middleware' => ['web'], 'middleware' => ['web'],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Queue Wait Time Thresholds | Queue Wait Time Thresholds
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This option allows you to configure when the LongWaitDetected event | This option allows you to configure when the LongWaitDetected event
| will be fired. Every connection / queue combination may have its | will be fired. Every connection / queue combination may have its
| own, unique threshold (in seconds) before this event is fired. | own, unique threshold (in seconds) before this event is fired.
| |
*/ */
'waits' => [ 'waits' => [
'redis:feed' => 30, 'redis:feed' => 30,
'redis:follow' => 30, 'redis:follow' => 30,
'redis:shared' => 30, 'redis:shared' => 30,
'redis:default' => 30, 'redis:default' => 30,
'redis:inbox' => 30, 'redis:inbox' => 30,
'redis:low' => 30, 'redis:low' => 30,
'redis:high' => 30, 'redis:high' => 30,
'redis:delete' => 30, 'redis:delete' => 30,
'redis:story' => 30, 'redis:story' => 30,
'redis:mmo' => 30, 'redis:mmo' => 30,
], 'redis:intbg' => 30,
],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Job Trimming Times | Job Trimming Times
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here you can configure for how long (in minutes) you desire Horizon to | Here you can configure for how long (in minutes) you desire Horizon to
| persist the recent and failed jobs. Typically, recent jobs are kept | persist the recent and failed jobs. Typically, recent jobs are kept
| for one hour while all failed jobs are stored for an entire week. | for one hour while all failed jobs are stored for an entire week.
| |
*/ */
'trim' => [ 'trim' => [
'recent' => 60, 'recent' => 60,
'pending' => 60, 'pending' => 60,
'completed' => 60, 'completed' => 60,
'recent_failed' => 10080, 'recent_failed' => 10080,
'failed' => 10080, 'failed' => 10080,
'monitored' => 10080, 'monitored' => 10080,
], ],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Metrics | Metrics
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here you can configure how many snapshots should be kept to display in | Here you can configure how many snapshots should be kept to display in
| the metrics graph. This will get used in combination with Horizon's | the metrics graph. This will get used in combination with Horizon's
| `horizon:snapshot` schedule to define how long to retain metrics. | `horizon:snapshot` schedule to define how long to retain metrics.
| |
*/ */
'metrics' => [ 'metrics' => [
'trim_snapshots' => [ 'trim_snapshots' => [
'job' => 24, 'job' => 24,
'queue' => 24, 'queue' => 24,
], ],
], ],
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Fast Termination | Fast Termination
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| When this option is enabled, Horizon's "terminate" command will not | When this option is enabled, Horizon's "terminate" command will not
| wait on all of the workers to terminate unless the --wait option | wait on all of the workers to terminate unless the --wait option
| is provided. Fast termination can shorten deployment delay by | is provided. Fast termination can shorten deployment delay by
| allowing a new instance of Horizon to start while the last | allowing a new instance of Horizon to start while the last
| instance will continue to terminate each of its workers. | instance will continue to terminate each of its workers.
| |
*/ */
'fast_termination' => false, 'fast_termination' => false,
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Memory Limit (MB) | Memory Limit (MB)
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| This value describes the maximum amount of memory the Horizon worker | This value describes the maximum amount of memory the Horizon worker
| may consume before it is terminated and restarted. You should set | may consume before it is terminated and restarted. You should set
| this value according to the resources available to your server. | this value according to the resources available to your server.
| |
*/ */
'memory_limit' => env('HORIZON_MEMORY_LIMIT', 64), 'memory_limit' => env('HORIZON_MEMORY_LIMIT', 64),
/* /*
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| Queue Worker Configuration | Queue Worker Configuration
|-------------------------------------------------------------------------- |--------------------------------------------------------------------------
| |
| Here you may define the queue worker settings used by your application | Here you may define the queue worker settings used by your application
| in all environments. These supervisors and settings handle all your | in all environments. These supervisors and settings handle all your
| queued jobs and will be provisioned by Horizon during deployment. | queued jobs and will be provisioned by Horizon during deployment.
| |
*/ */
'environments' => [ 'environments' => [
'production' => [ 'production' => [
'supervisor-1' => [ 'supervisor-1' => [
'connection' => 'redis', 'connection' => 'redis',
'queue' => ['high', 'default', 'follow', 'shared', 'inbox', 'feed', 'low', 'story', 'delete', 'mmo'], 'queue' => ['high', 'default', 'follow', 'shared', 'inbox', 'feed', 'low', 'story', 'delete', 'mmo', 'intbg'],
'balance' => env('HORIZON_BALANCE_STRATEGY', 'auto'), 'balance' => env('HORIZON_BALANCE_STRATEGY', 'auto'),
'minProcesses' => env('HORIZON_MIN_PROCESSES', 1), 'minProcesses' => env('HORIZON_MIN_PROCESSES', 1),
'maxProcesses' => env('HORIZON_MAX_PROCESSES', 20), 'maxProcesses' => env('HORIZON_MAX_PROCESSES', 20),
'memory' => env('HORIZON_SUPERVISOR_MEMORY', 64), 'memory' => env('HORIZON_SUPERVISOR_MEMORY', 64),
'tries' => env('HORIZON_SUPERVISOR_TRIES', 3), 'tries' => env('HORIZON_SUPERVISOR_TRIES', 3),
'nice' => env('HORIZON_SUPERVISOR_NICE', 0), 'nice' => env('HORIZON_SUPERVISOR_NICE', 0),
'timeout' => env('HORIZON_SUPERVISOR_TIMEOUT', 300), 'timeout' => env('HORIZON_SUPERVISOR_TIMEOUT', 300),
], ],
], ],
'local' => [ 'local' => [
'supervisor-1' => [ 'supervisor-1' => [
'connection' => 'redis', 'connection' => 'redis',
'queue' => ['high', 'default', 'follow', 'shared', 'inbox', 'feed', 'low', 'story', 'delete', 'mmo'], 'queue' => ['high', 'default', 'follow', 'shared', 'inbox', 'feed', 'low', 'story', 'delete', 'mmo', 'intbg'],
'balance' => 'auto', 'balance' => 'auto',
'minProcesses' => 1, 'minProcesses' => 1,
'maxProcesses' => 20, 'maxProcesses' => 20,
'memory' => 128, 'memory' => 128,
'tries' => 3, 'tries' => 3,
'nice' => 0, 'nice' => 0,
'timeout' => 300 'timeout' => 300
], ],
], ],
], ],
'darkmode' => env('HORIZON_DARKMODE', false), 'darkmode' => env('HORIZON_DARKMODE', false),
]; ];

6
config/import.php
Wyświetl plik

@ -39,6 +39,12 @@ return [
// Limit to specific user ids, in comma separated format // Limit to specific user ids, in comma separated format
'user_ids' => env('PF_IMPORT_IG_PERM_ONLY_USER_IDS', null), 'user_ids' => env('PF_IMPORT_IG_PERM_ONLY_USER_IDS', null),
],
'storage' => [
'cloud' => [
'enabled' => env('PF_IMPORT_IG_CLOUD_STORAGE', env('PF_ENABLE_CLOUD', false)),
]
] ]
] ]
]; ];

14
database/migrations/2018_12_22_055940_add_account_status_to_profiles_table.php
Wyświetl plik

@ -54,12 +54,14 @@ class AddAccountStatusToProfilesTable extends Migration
$table->string('hub_url')->nullable(); $table->string('hub_url')->nullable();
}); });
Schema::table('stories', function (Blueprint $table) { if (Schema::hasTable('stories')) {
$table->dropColumn('id'); Schema::table('stories', function (Blueprint $table) {
}); $table->dropColumn('id');
Schema::table('stories', function (Blueprint $table) { });
$table->bigIncrements('bigIncrements')->first(); Schema::table('stories', function (Blueprint $table) {
}); $table->bigIncrements('bigIncrements')->first();
});
}
Schema::table('profiles', function (Blueprint $table) { Schema::table('profiles', function (Blueprint $table) {
$table->dropColumn('status'); $table->dropColumn('status');

10
database/migrations/2019_01_12_054413_stories.php
Wyświetl plik

@ -60,13 +60,7 @@ class Stories extends Migration
{ {
Schema::dropIfExists('story_items'); Schema::dropIfExists('story_items');
Schema::dropIfExists('story_views'); Schema::dropIfExists('story_views');
Schema::dropIfExists('story_reactions');
Schema::table('stories', function (Blueprint $table) { Schema::dropIfExists('stories');
$table->dropColumn(['title','preview_photo','local_only','is_live','broadcast_url','broadcast_key']);
});
Schema::table('story_reactions', function (Blueprint $table) {
$table->dropColumn('story_id');
});
} }
} }

2
database/migrations/2019_12_10_023604_create_newsroom_table.php
Wyświetl plik

@ -40,6 +40,6 @@ class CreateNewsroomTable extends Migration
*/ */
public function down() public function down()
{ {
Schema::dropIfExists('site_news'); Schema::dropIfExists('newsroom');
} }
} }

2
database/migrations/2021_01_14_034521_add_cache_locks_table.php
Wyświetl plik

@ -27,6 +27,6 @@ class AddCacheLocksTable extends Migration
*/ */
public function down() public function down()
{ {
Schema::dropTable('cache_locks'); Schema::dropIfExists('cache_locks');
} }
} }

19
database/migrations/2021_07_23_062326_add_compose_settings_to_user_settings_table.php
Wyświetl plik

@ -33,14 +33,25 @@ class AddComposeSettingsToUserSettingsTable extends Migration
public function down() public function down()
{ {
Schema::table('user_settings', function (Blueprint $table) { Schema::table('user_settings', function (Blueprint $table) {
$table->dropColumn('compose_settings'); if (Schema::hasColumn('user_settings', 'compose_settings')) {
$table->dropColumn('compose_settings');
}
}); });
Schema::table('media', function (Blueprint $table) { Schema::table('media', function (Blueprint $table) {
$table->string('caption')->change(); $table->string('caption')->change();
$table->dropIndex('profile_id');
$table->dropIndex('mime'); $schemaManager = Schema::getConnection()->getDoctrineSchemaManager();
$table->dropIndex('license'); $indexesFound = $schemaManager->listTableIndexes('media');
if (array_key_exists('media_profile_id_index', $indexesFound)) {
$table->dropIndex('media_profile_id_index');
}
if (array_key_exists('media_mime_index', $indexesFound)) {
$table->dropIndex('media_mime_index');
}
if (array_key_exists('media_license_index', $indexesFound)) {
$table->dropIndex('media_license_index');
}
}); });
} }
} }

36
database/migrations/2023_12_05_092152_add_active_deliver_to_instances_table.php 100644
Wyświetl plik

@ -0,0 +1,36 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('instances', function (Blueprint $table) {
$table->boolean('active_deliver')->nullable()->index()->after('domain');
$table->boolean('valid_nodeinfo')->nullable();
$table->timestamp('nodeinfo_last_fetched')->nullable();
$table->boolean('delivery_timeout')->default(false);
$table->timestamp('delivery_next_after')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('instances', function (Blueprint $table) {
$table->dropColumn('active_deliver');
$table->dropColumn('valid_nodeinfo');
$table->dropColumn('nodeinfo_last_fetched');
$table->dropColumn('delivery_timeout');
$table->dropColumn('delivery_next_after');
});
}
};

8
database/migrations/2024_01_09_052419_create_parental_controls_table.php
Wyświetl plik

@ -28,7 +28,7 @@ return new class extends Migration
$schemaManager = Schema::getConnection()->getDoctrineSchemaManager(); $schemaManager = Schema::getConnection()->getDoctrineSchemaManager();
$indexesFound = $schemaManager->listTableIndexes('user_roles'); $indexesFound = $schemaManager->listTableIndexes('user_roles');
if (array_key_exists('user_roles_profile_id_unique', $indexesFound)) { if (array_key_exists('user_roles_profile_id_unique', $indexesFound)) {
$table->dropIndex('user_roles_profile_id_unique'); $table->dropUnique('user_roles_profile_id_unique');
} }
$table->unsignedBigInteger('profile_id')->unique()->nullable()->index()->change(); $table->unsignedBigInteger('profile_id')->unique()->nullable()->index()->change();
}); });
@ -42,7 +42,11 @@ return new class extends Migration
Schema::dropIfExists('parental_controls'); Schema::dropIfExists('parental_controls');
Schema::table('user_roles', function (Blueprint $table) { Schema::table('user_roles', function (Blueprint $table) {
$table->dropIndex('user_roles_profile_id_unique'); $schemaManager = Schema::getConnection()->getDoctrineSchemaManager();
$indexesFound = $schemaManager->listTableIndexes('user_roles');
if (array_key_exists('user_roles_profile_id_unique', $indexesFound)) {
$table->dropUnique('user_roles_profile_id_unique');
}
$table->unsignedBigInteger('profile_id')->unique()->index()->change(); $table->unsignedBigInteger('profile_id')->unique()->index()->change();
}); });
} }

2
public/js/account-import.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/admin.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/collectioncompose.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/collections.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

1
public/js/compose.chunk.10e7f993dcc726f9.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

1
public/js/compose.chunk.1ac292c93b524406.js vendored 100644
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/compose.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/daci.chunk.b17a0b11877389d7.js → public/js/daci.chunk.8d4acc1db3f27a51.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/discover.chunk.9606885dad3c8a99.js → public/js/discover.chunk.b1846efb6bd1e43c.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/discover~findfriends.chunk.02be60ab26503531.js → public/js/discover~findfriends.chunk.941b524eee8b8d63.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

1
public/js/discover~hashtag.bundle.6c2ff384b17ea58d.js vendored 100644
Wyświetl plik

File diff suppressed because one or more lines are too long

1
public/js/discover~hashtag.bundle.9cfffc517f35044e.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/discover~memories.chunk.ce9cc6446020e9b3.js → public/js/discover~memories.chunk.7d917826c3e9f17b.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/discover~myhashtags.chunk.6eab2414b2b16e19.js → public/js/discover~myhashtags.chunk.a72fc4882db8afd3.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/discover~serverfeed.chunk.0f2dcc473fdce17e.js → public/js/discover~serverfeed.chunk.8365948d1867de3a.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/discover~settings.chunk.732c1f76a00d9204.js → public/js/discover~settings.chunk.be88dc5ba1a24a7d.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/dms~message.chunk.15157ff4a6c17cc7.js → public/js/dms~message.chunk.76edeafda3d92320.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/home.chunk.351f55e9d09b6482.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/home.chunk.f3f4f632025b560f.js vendored 100644
Wyświetl plik

File diff suppressed because one or more lines are too long

0
public/js/home.chunk.351f55e9d09b6482.js.LICENSE.txt → public/js/home.chunk.f3f4f632025b560f.js.LICENSE.txt
Wyświetl plik

2
public/js/landing.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/manifest.js vendored
Wyświetl plik

@ -1 +1 @@
(()=>{"use strict";var e,r,n,o={},t={};function d(e){var r=t[e];if(void 0!==r)return r.exports;var n=t[e]={id:e,loaded:!1,exports:{}};return o[e].call(n.exports,n,n.exports,d),n.loaded=!0,n.exports}d.m=o,e=[],d.O=(r,n,o,t)=>{if(!n){var c=1/0;for(l=0;l<e.length;l++){for(var[n,o,t]=e[l],a=!0,i=0;i<n.length;i++)(!1&t||c>=t)&&Object.keys(d.O).every((e=>d.O[e](n[i])))?n.splice(i--,1):(a=!1,t<c&&(c=t));if(a){e.splice(l--,1);var s=o();void 0!==s&&(r=s)}}return r}t=t||0;for(var l=e.length;l>0&&e[l-1][2]>t;l--)e[l]=e[l-1];e[l]=[n,o,t]},d.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return d.d(r,{a:r}),r},d.d=(e,r)=>{for(var n in r)d.o(r,n)&&!d.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:r[n]})},d.f={},d.e=e=>Promise.all(Object.keys(d.f).reduce(((r,n)=>(d.f[n](e,r),r)),[])),d.u=e=>"js/"+{1084:"profile~followers.bundle",2470:"home.chunk",2530:"discover~myhashtags.chunk",2586:"compose.chunk",2732:"dms~message.chunk",3351:"discover~settings.chunk",3365:"dms.chunk",3623:"discover~findfriends.chunk",4028:"error404.bundle",4958:"discover.chunk",4965:"discover~memories.chunk",5865:"post.chunk",6053:"notifications.chunk",6869:"profile.chunk",7019:"discover~hashtag.bundle",8250:"i18n.bundle",8517:"daci.chunk",8600:"changelog.bundle",8625:"profile~following.bundle",8900:"discover~serverfeed.chunk"}[e]+"."+{1084:"731f680cfb96563d",2470:"351f55e9d09b6482",2530:"6eab2414b2b16e19",2586:"10e7f993dcc726f9",2732:"15157ff4a6c17cc7",3351:"732c1f76a00d9204",3365:"53a951c5de2d95ac",3623:"02be60ab26503531",4028:"3bbc118159460db6",4958:"9606885dad3c8a99",4965:"ce9cc6446020e9b3",5865:"23fc9e82d4fadc83",6053:"3b92cf46da469de1",6869:"0e5bd852054d6355",7019:"9cfffc517f35044e",8250:"47cbf9f04d955267",8517:"b17a0b11877389d7",8600:"742a06ba0a547120",8625:"3d95796c9f1678dd",8900:"0f2dcc473fdce17e"}[e]+".js",d.miniCssF=e=>({138:"css/spa",703:"css/admin",1242:"css/appdark",6170:"css/app",8737:"css/portfolio",9994:"css/landing"}[e]+".css"),d.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),d.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},n="pixelfed:",d.l=(e,o,t,c)=>{if(r[e])r[e].push(o);else{var a,i;if(void 0!==t)for(var s=document.getElementsByTagName("script"),l=0;l<s.length;l++){var f=s[l];if(f.getAttribute("src")==e||f.getAttribute("data-webpack")==n+t){a=f;break}}a||(i=!0,(a=document.createElement("script")).charset="utf-8",a.timeout=120,d.nc&&a.setAttribute("nonce",d.nc),a.setAttribute("data-webpack",n+t),a.src=e),r[e]=[o];var u=(n,o)=>{a.onerror=a.onload=null,clearTimeout(b);var t=r[e];if(delete r[e],a.parentNode&&a.parentNode.removeChild(a),t&&t.forEach((e=>e(o))),n)return n(o)},b=setTimeout(u.bind(null,void 0,{type:"timeout",target:a}),12e4);a.onerror=u.bind(null,a.onerror),a.onload=u.bind(null,a.onload),i&&document.head.appendChild(a)}},d.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},d.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),d.p="/",(()=>{var e={8929:0,1242:0,6170:0,8737:0,703:0,9994:0,138:0};d.f.j=(r,n)=>{var o=d.o(e,r)?e[r]:void 0;if(0!==o)if(o)n.push(o[2]);else if(/^(1242|138|6170|703|8737|8929|9994)$/.test(r))e[r]=0;else{var t=new Promise(((n,t)=>o=e[r]=[n,t]));n.push(o[2]=t);var c=d.p+d.u(r),a=new Error;d.l(c,(n=>{if(d.o(e,r)&&(0!==(o=e[r])&&(e[r]=void 0),o)){var t=n&&("load"===n.type?"missing":n.type),c=n&&n.target&&n.target.src;a.message="Loading chunk "+r+" failed.\n("+t+": "+c+")",a.name="ChunkLoadError",a.type=t,a.request=c,o[1](a)}}),"chunk-"+r,r)}},d.O.j=r=>0===e[r];var r=(r,n)=>{var o,t,[c,a,i]=n,s=0;if(c.some((r=>0!==e[r]))){for(o in a)d.o(a,o)&&(d.m[o]=a[o]);if(i)var l=i(d)}for(r&&r(n);s<c.length;s++)t=c[s],d.o(e,t)&&e[t]&&e[t][0](),e[t]=0;return d.O(l)},n=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];n.forEach(r.bind(null,0)),n.push=r.bind(null,n.push.bind(n))})(),d.nc=void 0})(); (()=>{"use strict";var e,r,n,o={},t={};function d(e){var r=t[e];if(void 0!==r)return r.exports;var n=t[e]={id:e,loaded:!1,exports:{}};return o[e].call(n.exports,n,n.exports,d),n.loaded=!0,n.exports}d.m=o,e=[],d.O=(r,n,o,t)=>{if(!n){var a=1/0;for(l=0;l<e.length;l++){for(var[n,o,t]=e[l],i=!0,c=0;c<n.length;c++)(!1&t||a>=t)&&Object.keys(d.O).every((e=>d.O[e](n[c])))?n.splice(c--,1):(i=!1,t<a&&(a=t));if(i){e.splice(l--,1);var s=o();void 0!==s&&(r=s)}}return r}t=t||0;for(var l=e.length;l>0&&e[l-1][2]>t;l--)e[l]=e[l-1];e[l]=[n,o,t]},d.n=e=>{var r=e&&e.__esModule?()=>e.default:()=>e;return d.d(r,{a:r}),r},d.d=(e,r)=>{for(var n in r)d.o(r,n)&&!d.o(e,n)&&Object.defineProperty(e,n,{enumerable:!0,get:r[n]})},d.f={},d.e=e=>Promise.all(Object.keys(d.f).reduce(((r,n)=>(d.f[n](e,r),r)),[])),d.u=e=>"js/"+{1084:"profile~followers.bundle",2470:"home.chunk",2530:"discover~myhashtags.chunk",2586:"compose.chunk",2732:"dms~message.chunk",3351:"discover~settings.chunk",3365:"dms.chunk",3623:"discover~findfriends.chunk",4028:"error404.bundle",4958:"discover.chunk",4965:"discover~memories.chunk",5865:"post.chunk",6053:"notifications.chunk",6869:"profile.chunk",7019:"discover~hashtag.bundle",8250:"i18n.bundle",8517:"daci.chunk",8600:"changelog.bundle",8625:"profile~following.bundle",8900:"discover~serverfeed.chunk"}[e]+"."+{1084:"5deed93248f20662",2470:"f3f4f632025b560f",2530:"a72fc4882db8afd3",2586:"1ac292c93b524406",2732:"76edeafda3d92320",3351:"be88dc5ba1a24a7d",3365:"53a951c5de2d95ac",3623:"941b524eee8b8d63",4028:"3bbc118159460db6",4958:"b1846efb6bd1e43c",4965:"7d917826c3e9f17b",5865:"eb9804ff282909ae",6053:"3b92cf46da469de1",6869:"d52916cb68c9a146",7019:"6c2ff384b17ea58d",8250:"47cbf9f04d955267",8517:"8d4acc1db3f27a51",8600:"742a06ba0a547120",8625:"d2b3b1fc2e05dbd3",8900:"8365948d1867de3a"}[e]+".js",d.miniCssF=e=>({138:"css/spa",703:"css/admin",1242:"css/appdark",6170:"css/app",8737:"css/portfolio",9994:"css/landing"}[e]+".css"),d.g=function(){if("object"==typeof globalThis)return globalThis;try{return this||new Function("return this")()}catch(e){if("object"==typeof window)return window}}(),d.o=(e,r)=>Object.prototype.hasOwnProperty.call(e,r),r={},n="pixelfed:",d.l=(e,o,t,a)=>{if(r[e])r[e].push(o);else{var i,c;if(void 0!==t)for(var s=document.getElementsByTagName("script"),l=0;l<s.length;l++){var f=s[l];if(f.getAttribute("src")==e||f.getAttribute("data-webpack")==n+t){i=f;break}}i||(c=!0,(i=document.createElement("script")).charset="utf-8",i.timeout=120,d.nc&&i.setAttribute("nonce",d.nc),i.setAttribute("data-webpack",n+t),i.src=e),r[e]=[o];var u=(n,o)=>{i.onerror=i.onload=null,clearTimeout(b);var t=r[e];if(delete r[e],i.parentNode&&i.parentNode.removeChild(i),t&&t.forEach((e=>e(o))),n)return n(o)},b=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),c&&document.head.appendChild(i)}},d.r=e=>{"undefined"!=typeof Symbol&&Symbol.toStringTag&&Object.defineProperty(e,Symbol.toStringTag,{value:"Module"}),Object.defineProperty(e,"__esModule",{value:!0})},d.nmd=e=>(e.paths=[],e.children||(e.children=[]),e),d.p="/",(()=>{var e={8929:0,1242:0,6170:0,8737:0,703:0,9994:0,138:0};d.f.j=(r,n)=>{var o=d.o(e,r)?e[r]:void 0;if(0!==o)if(o)n.push(o[2]);else if(/^(1242|138|6170|703|8737|8929|9994)$/.test(r))e[r]=0;else{var t=new Promise(((n,t)=>o=e[r]=[n,t]));n.push(o[2]=t);var a=d.p+d.u(r),i=new Error;d.l(a,(n=>{if(d.o(e,r)&&(0!==(o=e[r])&&(e[r]=void 0),o)){var t=n&&("load"===n.type?"missing":n.type),a=n&&n.target&&n.target.src;i.message="Loading chunk "+r+" failed.\n("+t+": "+a+")",i.name="ChunkLoadError",i.type=t,i.request=a,o[1](i)}}),"chunk-"+r,r)}},d.O.j=r=>0===e[r];var r=(r,n)=>{var o,t,[a,i,c]=n,s=0;if(a.some((r=>0!==e[r]))){for(o in i)d.o(i,o)&&(d.m[o]=i[o]);if(c)var l=c(d)}for(r&&r(n);s<a.length;s++)t=a[s],d.o(e,t)&&e[t]&&e[t][0](),e[t]=0;return d.O(l)},n=self.webpackChunkpixelfed=self.webpackChunkpixelfed||[];n.forEach(r.bind(null,0)),n.push=r.bind(null,n.push.bind(n))})(),d.nc=void 0})();

2
public/js/portfolio.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

4
public/js/post.chunk.23fc9e82d4fadc83.js → public/js/post.chunk.eb9804ff282909ae.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

0
public/js/post.chunk.23fc9e82d4fadc83.js.LICENSE.txt → public/js/post.chunk.eb9804ff282909ae.js.LICENSE.txt
Wyświetl plik

2
public/js/profile.chunk.0e5bd852054d6355.js → public/js/profile.chunk.d52916cb68c9a146.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/profile.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/profile~followers.bundle.731f680cfb96563d.js → public/js/profile~followers.bundle.5deed93248f20662.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/profile~following.bundle.3d95796c9f1678dd.js → public/js/profile~following.bundle.d2b3b1fc2e05dbd3.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/spa.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/status.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/stories.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

2
public/js/timeline.js vendored
Wyświetl plik

File diff suppressed because one or more lines are too long

56
public/mix-manifest.json
Wyświetl plik

@ -3,45 +3,45 @@
"/js/activity.js": "/js/activity.js?id=bab5c110c78fbf44118ba9d43de424e3", "/js/activity.js": "/js/activity.js?id=bab5c110c78fbf44118ba9d43de424e3",
"/js/components.js": "/js/components.js?id=9f8d82f1340d91a3be0910a1ae0557a1", "/js/components.js": "/js/components.js?id=9f8d82f1340d91a3be0910a1ae0557a1",
"/js/discover.js": "/js/discover.js?id=789db642d4214d69b245210243bfddd1", "/js/discover.js": "/js/discover.js?id=789db642d4214d69b245210243bfddd1",
"/js/profile.js": "/js/profile.js?id=ff5ebfe2c05af42a90710184b4a77539", "/js/profile.js": "/js/profile.js?id=96606c2e76979a5cb9a4675c11678d82",
"/js/status.js": "/js/status.js?id=28214c81b6ef1b443735edb12a3e2af3", "/js/status.js": "/js/status.js?id=d66fc614dbcc1d947a93dc6e142112e6",
"/js/timeline.js": "/js/timeline.js?id=6af047689b6d4871c816eb9bbd258d6c", "/js/timeline.js": "/js/timeline.js?id=fa56bf59d1587e728b24e715a8891049",
"/js/compose.js": "/js/compose.js?id=17cac013a117745417d908362686b48f", "/js/compose.js": "/js/compose.js?id=3e3f91673e689cb5ad0ef33f31a454a3",
"/js/compose-classic.js": "/js/compose-classic.js?id=6a1e3218c8d3753687e01aeaad9362c9", "/js/compose-classic.js": "/js/compose-classic.js?id=6a1e3218c8d3753687e01aeaad9362c9",
"/js/search.js": "/js/search.js?id=4c0e6f5e1b7f43de760c28143605a161", "/js/search.js": "/js/search.js?id=4c0e6f5e1b7f43de760c28143605a161",
"/js/developers.js": "/js/developers.js?id=5c04c9c265a39ff23dd395fc56a0eada", "/js/developers.js": "/js/developers.js?id=5c04c9c265a39ff23dd395fc56a0eada",
"/js/hashtag.js": "/js/hashtag.js?id=ede3503b82bd2c3dc031cb1a4f70320d", "/js/hashtag.js": "/js/hashtag.js?id=ede3503b82bd2c3dc031cb1a4f70320d",
"/js/collectioncompose.js": "/js/collectioncompose.js?id=4ce940e158d15205ad480821d3d8cd0c", "/js/collectioncompose.js": "/js/collectioncompose.js?id=a727c163315ee50c3e28fb43fce46d2f",
"/js/collections.js": "/js/collections.js?id=c081a4a410b0e1221ab5d549da906874", "/js/collections.js": "/js/collections.js?id=86db63fcc018f873d8989321996afdfd",
"/js/profile-directory.js": "/js/profile-directory.js?id=9b8a56ca460ece9bcd0dcfc4e5d7fa2b", "/js/profile-directory.js": "/js/profile-directory.js?id=9b8a56ca460ece9bcd0dcfc4e5d7fa2b",
"/js/story-compose.js": "/js/story-compose.js?id=08a03cf5642c4dcfec5ad2ef78f83c00", "/js/story-compose.js": "/js/story-compose.js?id=08a03cf5642c4dcfec5ad2ef78f83c00",
"/js/direct.js": "/js/direct.js?id=74c2962c91cfa3817126b093c3e8112d", "/js/direct.js": "/js/direct.js?id=74c2962c91cfa3817126b093c3e8112d",
"/js/admin.js": "/js/admin.js?id=595d4b9958efa0ddbfde64af285fe365", "/js/admin.js": "/js/admin.js?id=651f030c2077b81722cd9ac870a2f4d7",
"/js/spa.js": "/js/spa.js?id=3d4942f9a9920995110f87454f9a5979", "/js/spa.js": "/js/spa.js?id=e81eb6d446f2a8e67a0eba8c2e2fd136",
"/js/stories.js": "/js/stories.js?id=709b3201264dd2e3776f03ec3393d6b4", "/js/stories.js": "/js/stories.js?id=42cdb37f35edf773bd2737f63c5e0e46",
"/js/portfolio.js": "/js/portfolio.js?id=f44a3a87fee04698b55d91a4231fcb8f", "/js/portfolio.js": "/js/portfolio.js?id=ca5d49097cd9273f3b22ef210bd2930f",
"/js/account-import.js": "/js/account-import.js?id=71ac9c7b86270addf9e05c72ed3d76f5", "/js/account-import.js": "/js/account-import.js?id=2664389c5645f91ad74c99e5871afb86",
"/js/admin_invite.js": "/js/admin_invite.js?id=285b7aab611b66b12e16fb95c5cd6a24", "/js/admin_invite.js": "/js/admin_invite.js?id=285b7aab611b66b12e16fb95c5cd6a24",
"/js/landing.js": "/js/landing.js?id=0b4df98090afe60d42a25fae96b70a69", "/js/landing.js": "/js/landing.js?id=b87dd6bea094176c0eae6efc32dcedd4",
"/js/remote_auth.js": "/js/remote_auth.js?id=8a261c63271e4f126bc259ca94fe691c", "/js/remote_auth.js": "/js/remote_auth.js?id=8a261c63271e4f126bc259ca94fe691c",
"/js/manifest.js": "/js/manifest.js?id=07bf3cac0b7ce275ad1465fff457eebf", "/js/manifest.js": "/js/manifest.js?id=630d979b36a5a9ee6b4ac58192d44c55",
"/js/home.chunk.351f55e9d09b6482.js": "/js/home.chunk.351f55e9d09b6482.js?id=78bec7e00db7fa42970b7fee6ae42fc8", "/js/home.chunk.f3f4f632025b560f.js": "/js/home.chunk.f3f4f632025b560f.js?id=d665e37704110e04c5b26abe37922c54",
"/js/compose.chunk.10e7f993dcc726f9.js": "/js/compose.chunk.10e7f993dcc726f9.js?id=1ff97cb97bbe1ef6405aaf1367111f9d", "/js/compose.chunk.1ac292c93b524406.js": "/js/compose.chunk.1ac292c93b524406.js?id=9f2ed8b63c8ccea71948decd16951945",
"/js/post.chunk.23fc9e82d4fadc83.js": "/js/post.chunk.23fc9e82d4fadc83.js?id=35af81651750a662b0bde9c2e9cd202f", "/js/post.chunk.eb9804ff282909ae.js": "/js/post.chunk.eb9804ff282909ae.js?id=edfea2631b019f79bf694711b313ed69",
"/js/profile.chunk.0e5bd852054d6355.js": "/js/profile.chunk.0e5bd852054d6355.js?id=c79db9a7ed9e593c2565f6fe2647ddaa", "/js/profile.chunk.d52916cb68c9a146.js": "/js/profile.chunk.d52916cb68c9a146.js?id=12cceca2cf40ade55dd52e55beaebcf5",
"/js/discover~memories.chunk.ce9cc6446020e9b3.js": "/js/discover~memories.chunk.ce9cc6446020e9b3.js?id=05823cac888d03c4a02db391f0497207", "/js/discover~memories.chunk.7d917826c3e9f17b.js": "/js/discover~memories.chunk.7d917826c3e9f17b.js?id=3b50240fbfca28317e019ef8e375d865",
"/js/discover~myhashtags.chunk.6eab2414b2b16e19.js": "/js/discover~myhashtags.chunk.6eab2414b2b16e19.js?id=3296235c4dfc2b53ec12fa3efd6b2853", "/js/discover~myhashtags.chunk.a72fc4882db8afd3.js": "/js/discover~myhashtags.chunk.a72fc4882db8afd3.js?id=c0e12b1a3be84c004d1700fb75887581",
"/js/daci.chunk.b17a0b11877389d7.js": "/js/daci.chunk.b17a0b11877389d7.js?id=1c6970aaeedd8cd3fdbaed3f811275d5", "/js/daci.chunk.8d4acc1db3f27a51.js": "/js/daci.chunk.8d4acc1db3f27a51.js?id=0b35553f31b4378434c15a95e2858ff2",
"/js/discover~findfriends.chunk.02be60ab26503531.js": "/js/discover~findfriends.chunk.02be60ab26503531.js?id=9209716c69387daba81d325b8b4036ed", "/js/discover~findfriends.chunk.941b524eee8b8d63.js": "/js/discover~findfriends.chunk.941b524eee8b8d63.js?id=a2950b1a47385297a4043ae43696df7b",
"/js/discover~serverfeed.chunk.0f2dcc473fdce17e.js": "/js/discover~serverfeed.chunk.0f2dcc473fdce17e.js?id=85fb14dec99be1da2253de939d71ac07", "/js/discover~serverfeed.chunk.8365948d1867de3a.js": "/js/discover~serverfeed.chunk.8365948d1867de3a.js?id=89630daaa6bde72cc02f384a2900b1f5",
"/js/discover~settings.chunk.732c1f76a00d9204.js": "/js/discover~settings.chunk.732c1f76a00d9204.js?id=269715e328ff4e8806ae5313141bfba2", "/js/discover~settings.chunk.be88dc5ba1a24a7d.js": "/js/discover~settings.chunk.be88dc5ba1a24a7d.js?id=a3f32fbeda24adb25a8e59635ace31b5",
"/js/discover.chunk.9606885dad3c8a99.js": "/js/discover.chunk.9606885dad3c8a99.js?id=861905f74c741b4ba0adea34a6fd1755", "/js/discover.chunk.b1846efb6bd1e43c.js": "/js/discover.chunk.b1846efb6bd1e43c.js?id=2304806be2805804a9cfc72499899379",
"/js/notifications.chunk.3b92cf46da469de1.js": "/js/notifications.chunk.3b92cf46da469de1.js?id=ce1e415ef9e593daa8fc8ca24c39ae5d", "/js/notifications.chunk.3b92cf46da469de1.js": "/js/notifications.chunk.3b92cf46da469de1.js?id=ce1e415ef9e593daa8fc8ca24c39ae5d",
"/js/dms.chunk.53a951c5de2d95ac.js": "/js/dms.chunk.53a951c5de2d95ac.js?id=533dabb38bd88ce40224b262de5657ca", "/js/dms.chunk.53a951c5de2d95ac.js": "/js/dms.chunk.53a951c5de2d95ac.js?id=533dabb38bd88ce40224b262de5657ca",
"/js/dms~message.chunk.15157ff4a6c17cc7.js": "/js/dms~message.chunk.15157ff4a6c17cc7.js?id=24a896bd3e1ae7ad95eb84ffed03897b", "/js/dms~message.chunk.76edeafda3d92320.js": "/js/dms~message.chunk.76edeafda3d92320.js?id=e4ac7551e891590cd58c0668c83649cc",
"/js/profile~followers.bundle.731f680cfb96563d.js": "/js/profile~followers.bundle.731f680cfb96563d.js?id=51a86ce073dcc37182ad95690d3e4150", "/js/profile~followers.bundle.5deed93248f20662.js": "/js/profile~followers.bundle.5deed93248f20662.js?id=397cafef10eed6b75dd9f54e6266eef4",
"/js/profile~following.bundle.3d95796c9f1678dd.js": "/js/profile~following.bundle.3d95796c9f1678dd.js?id=fab18cec2854cbe0bedeff75a8cd72d7", "/js/profile~following.bundle.d2b3b1fc2e05dbd3.js": "/js/profile~following.bundle.d2b3b1fc2e05dbd3.js?id=a354e771c03b7abdbb84e3c45d5e6ac7",
"/js/discover~hashtag.bundle.9cfffc517f35044e.js": "/js/discover~hashtag.bundle.9cfffc517f35044e.js?id=09cc057075bddf54f6d27a3d1325956e", "/js/discover~hashtag.bundle.6c2ff384b17ea58d.js": "/js/discover~hashtag.bundle.6c2ff384b17ea58d.js?id=a6721eb61d5320e1a6b75091e7bc96cd",
"/js/error404.bundle.3bbc118159460db6.js": "/js/error404.bundle.3bbc118159460db6.js?id=93a2596acb6a7aca829217405e29cf3c", "/js/error404.bundle.3bbc118159460db6.js": "/js/error404.bundle.3bbc118159460db6.js?id=93a2596acb6a7aca829217405e29cf3c",
"/js/i18n.bundle.47cbf9f04d955267.js": "/js/i18n.bundle.47cbf9f04d955267.js?id=6c2e24f203d5b9ff4e21ee7bb614c0d8", "/js/i18n.bundle.47cbf9f04d955267.js": "/js/i18n.bundle.47cbf9f04d955267.js?id=6c2e24f203d5b9ff4e21ee7bb614c0d8",
"/js/changelog.bundle.742a06ba0a547120.js": "/js/changelog.bundle.742a06ba0a547120.js?id=e7fed759d5bb60a805e069b0e628a00e", "/js/changelog.bundle.742a06ba0a547120.js": "/js/changelog.bundle.742a06ba0a547120.js?id=e7fed759d5bb60a805e069b0e628a00e",

4
resources/assets/components/AccountImport.vue
Wyświetl plik

@ -381,7 +381,7 @@
let file = this.$refs.zipInput.files[0]; let file = this.$refs.zipInput.files[0];
let entries = await this.model(file); let entries = await this.model(file);
if (entries && entries.length) { if (entries && entries.length) {
let files = await entries.filter(e => e.filename === 'content/posts_1.json'); let files = await entries.filter(e => e.filename === 'content/posts_1.json' || e.filename === 'your_instagram_activity/content/posts_1.json');
if(!files || !files.length) { if(!files || !files.length) {
this.contactModal( this.contactModal(
@ -402,7 +402,7 @@
let entries = await this.model(file); let entries = await this.model(file);
if (entries && entries.length) { if (entries && entries.length) {
this.zipFiles = entries; this.zipFiles = entries;
let media = await entries.filter(e => e.filename === 'content/posts_1.json')[0].getData(new zip.TextWriter()); let media = await entries.filter(e => e.filename === 'content/posts_1.json' || e.filename === 'your_instagram_activity/content/posts_1.json')[0].getData(new zip.TextWriter());
this.filterPostMeta(media); this.filterPostMeta(media);
let imgs = await Promise.all(entries.filter(entry => { let imgs = await Promise.all(entries.filter(entry => {

9
resources/assets/js/components/ComposeModal.vue
Wyświetl plik

@ -1204,12 +1204,19 @@ export default {
}, 300); }, 300);
}).catch(function(e) { }).catch(function(e) {
switch(e.response.status) { switch(e.response.status) {
case 403:
self.uploading = false;
io.value = null;
swal('Account size limit reached', 'Contact your admin for assistance.', 'error');
self.page = 2;
break;
case 413: case 413:
self.uploading = false; self.uploading = false;
io.value = null; io.value = null;
swal('File is too large', 'The file you uploaded has the size of ' + self.formatBytes(io.size) + '. Unfortunately, only images up to ' + self.formatBytes(self.config.uploader.max_photo_size * 1024) + ' are supported.\nPlease resize the file and try again.', 'error'); swal('File is too large', 'The file you uploaded has the size of ' + self.formatBytes(io.size) + '. Unfortunately, only images up to ' + self.formatBytes(self.config.uploader.max_photo_size * 1024) + ' are supported.\nPlease resize the file and try again.', 'error');
self.page = 2; self.page = 2;
break; break;
case 451: case 451:
self.uploading = false; self.uploading = false;

2
resources/lang/vendor/backup/ja/notifications.php vendored
Wyświetl plik

@ -31,5 +31,5 @@ return [
'unhealthy_backup_found_empty' => 'このアプリケーションのバックアップはありません。', 'unhealthy_backup_found_empty' => 'このアプリケーションのバックアップはありません。',
'unhealthy_backup_found_old' => ':date に作成されたバックアップは古すぎます。', 'unhealthy_backup_found_old' => ':date に作成されたバックアップは古すぎます。',
'unhealthy_backup_found_unknown' => '正確な原因が特定できませんでした。', 'unhealthy_backup_found_unknown' => '正確な原因が特定できませんでした。',
'unhealthy_backup_found_full' => 'バックアップが使用できる容量(:disk_limit)を超えています。(現在の使用量 :disk_usage), 'unhealthy_backup_found_full' => 'バックアップが使用できる容量(:disk_limit)を超えています。(現在の使用量 :disk_usage)',
]; ];