UA-Fediland/pixelfed
2
0
Fork 0
mirror of https://github.com/pixelfed/pixelfed.git synced 2024-12-24 14:03:16 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'staging' of https://github.com/pixelfed/pixelfed into translation-coverage-extension

Browse source
This commit is contained in:
Jeff Poirier 2024-07-01 08:05:47 -04:00
commit fa9bd9b050
30 changed files with 1847 additions and 2702 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
CHANGELOG.md
View file

@ -1,6 +1,17 @@
# Release Notes
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.12.1...dev)
## [Unreleased](https://github.com/pixelfed/pixelfed/compare/v0.12.3...dev)
- ([](https://github.com/pixelfed/pixelfed/commit/))
## [v0.12.3 (2024-07-01)](https://github.com/pixelfed/pixelfed/compare/v0.12.2...v0.12.3)
### Updates
- Fix migrations bug ([4d1180b1](https://github.com/pixelfed/pixelfed/commit/4d1180b1))
## [v0.12.2 (2024-07-01)](https://github.com/pixelfed/pixelfed/compare/v0.12.1...v0.12.2)
### Framework
- Updated to Laravel 11 (requires php 8.2+)
### Added
- New api/v1/instance/peers API endpoint, disabled by default ([4aad1c22](https://github.com/pixelfed/pixelfed/commit/4aad1c22))
@ -33,7 +44,7 @@
- Update and refactor total local post count logic, cache value and schedule updates twice daily to eliminate the perf issue on larger instances ([4f2b8ed2](https://github.com/pixelfed/pixelfed/commit/4f2b8ed2))
- Update Media model, fix broken thumbnail/gray thumbnail bug ([e33643c2](https://github.com/pixelfed/pixelfed/commit/e33643c2))
- Update StatusController, fix unlisted post guest/ap access bug ([83098428](https://github.com/pixelfed/pixelfed/commit/83098428))
- ([](https://github.com/pixelfed/pixelfed/commit/))
- Update discover, add network trending using Beagle API ([2cae8b48](https://github.com/pixelfed/pixelfed/commit/2cae8b48))
## [v0.12.1 (2024-05-07)](https://github.com/pixelfed/pixelfed/compare/v0.12.0...v0.12.1)

1017
app/Http/Controllers/AdminController.php
View file

File diff suppressed because it is too large Load diff

8
app/Http/Controllers/DiscoverController.php
View file

@ -11,6 +11,7 @@ use App\Services\BookmarkService;
use App\Services\ConfigCacheService;
use App\Services\FollowerService;
use App\Services\HashtagService;
use App\Services\Internal\BeagleService;
use App\Services\LikeService;
use App\Services\ReblogService;
use App\Services\SnowflakeService;
@ -420,4 +421,11 @@ class DiscoverController extends Controller
return response()->json($ids, 200, [], JSON_UNESCAPED_SLASHES);
}
public function discoverNetworkTrending(Request $request)
{
abort_if(! $request->user(), 404);
return BeagleService::getDiscoverPosts();
}
}

85
app/Services/Internal/BeagleService.php
View file

@ -2,18 +2,25 @@
namespace App\Services\Internal;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Http;
use App\Services\InstanceService;
use App\Services\StatusService;
use App\Util\ActivityPub\Helpers;
use Illuminate\Http\Client\ConnectionException;
use Illuminate\Http\Client\RequestException;
use Illuminate\Support\Facades\Cache;
use Illuminate\Support\Facades\Http;
class BeagleService
{
const DEFAULT_RULES_CACHE_KEY = 'pf:services:beagle:default_rules:v1';
const DISCOVER_CACHE_KEY = 'pf:services:beagle:discover:v1';
const DISCOVER_POSTS_CACHE_KEY = 'pf:services:beagle:discover-posts:v1';
public static function getDefaultRules()
{
return Cache::remember(self::DEFAULT_RULES_CACHE_KEY, now()->addDays(7), function() {
return Cache::remember(self::DEFAULT_RULES_CACHE_KEY, now()->addDays(7), function () {
try {
$res = Http::withOptions(['allow_redirects' => false])
->timeout(5)
@ -28,17 +35,85 @@ class BeagleService
return;
}
if(!$res->ok()) {
if (! $res->ok()) {
return;
}
$json = $res->json();
if(!isset($json['rule_suggestions']) || !count($json['rule_suggestions'])) {
if (! isset($json['rule_suggestions']) || ! count($json['rule_suggestions'])) {
return [];
}
return $json['rule_suggestions'];
});
}
public static function getDiscover()
{
return Cache::remember(self::DISCOVER_CACHE_KEY, now()->addHours(6), function () {
try {
$res = Http::withOptions(['allow_redirects' => false])
->withHeaders([
'X-Pixelfed-Api' => 1,
])->timeout(5)
->connectTimeout(5)
->retry(2, 500)
->get('https://beagle.pixelfed.net/api/v1/discover');
} catch (RequestException $e) {
return;
} catch (ConnectionException $e) {
return;
} catch (Exception $e) {
return;
}
if (! $res->ok()) {
return;
}
$json = $res->json();
if (! isset($json['statuses']) || ! count($json['statuses'])) {
return [];
}
return $json['statuses'];
});
}
public static function getDiscoverPosts()
{
return Cache::remember(self::DISCOVER_POSTS_CACHE_KEY, now()->addHours(1), function () {
$posts = collect(self::getDiscover())
->filter(function ($post) {
$bannedInstances = InstanceService::getBannedDomains();
$domain = parse_url($post['id'], PHP_URL_HOST);
return ! in_array($domain, $bannedInstances);
})
->map(function ($post) {
$domain = parse_url($post['id'], PHP_URL_HOST);
if ($domain === config_cache('pixelfed.domain.app')) {
$parts = explode('/', $post['id']);
$id = array_last($parts);
return StatusService::get($id);
}
$post = Helpers::statusFetch($post['id']);
if (! $post) {
return;
}
$id = $post->id;
return StatusService::get($id);
})
->filter()
->values()
->toArray();
return $posts;
});
}
}

34
composer.json
View file

@ -5,7 +5,7 @@
"license": "AGPL-3.0-only",
"type": "project",
"require": {
"php": "^8.1|^8.2|^8.3",
"php": "^8.2|^8.3",
"ext-bcmath": "*",
"ext-ctype": "*",
"ext-curl": "*",
@ -14,18 +14,17 @@
"ext-mbstring": "*",
"ext-openssl": "*",
"bacon/bacon-qr-code": "^2.0.3",
"beyondcode/laravel-websockets": "^1.13",
"brick/math": "^0.9.3",
"buzz/laravel-h-captcha": "^1.0.4",
"doctrine/dbal": "^3.0",
"intervention/image": "^2.4",
"jenssegers/agent": "^2.6",
"laravel-notification-channels/webpush": "^7.1",
"laravel/framework": "^10.0",
"laravel-notification-channels/webpush": "^8.0",
"laravel/framework": "^11.0",
"laravel/helpers": "^1.1",
"laravel/horizon": "^5.0",
"laravel/passport": "^11.0",
"laravel/tinker": "^2.0",
"laravel/passport": "^12.0",
"laravel/tinker": "^2.9",
"laravel/ui": "^4.2",
"league/flysystem-aws-s3-v3": "^3.0",
"league/iso3166": "^2.1|^4.0",
@ -33,24 +32,22 @@
"phpseclib/phpseclib": "~2.0",
"pixelfed/fractal": "^0.18.0",
"pixelfed/laravel-snowflake": "^2.0",
"pixelfed/zttp": "^0.5",
"pragmarx/google2fa": "^8.0",
"predis/predis": "^2.0",
"pusher/pusher-php-server": "^7.2",
"spatie/laravel-backup": "^8.0.0",
"spatie/laravel-image-optimizer": "^1.7",
"stevebauman/purify": "6.0.*",
"spatie/laravel-image-optimizer": "^1.8.0",
"stevebauman/purify": "^6.2.0",
"symfony/http-client": "^6.1",
"symfony/http-kernel": "^6.0.0",
"symfony/mailgun-mailer": "^6.1"
},
"require-dev": {
"brianium/paratest": "^6.1",
"fakerphp/faker": "^1.20",
"laravel/pint": "^1.14",
"laravel/telescope": "^4.14",
"mockery/mockery": "^1.0",
"nunomaduro/collision": "^6.1",
"phpunit/phpunit": "^9.0"
"fakerphp/faker": "^1.23",
"laravel/pint": "^1.13",
"laravel/telescope": "^5.0",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^8.1",
"phpunit/phpunit": "^11.0.1"
},
"autoload": {
"classmap": [
@ -86,6 +83,9 @@
"post-create-project-cmd": [
"@php artisan key:generate --ansi"
],
"post-update-cmd": [
"@php artisan vendor:publish --tag=laravel-assets --ansi --force"
],
"post-autoload-dump": [
"Illuminate\\Foundation\\ComposerScripts::postAutoloadDump",
"@php artisan package:discover --ansi"

2999
composer.lock generated
View file

File diff suppressed because it is too large Load diff

2
config/pixelfed.php
View file

@ -23,7 +23,7 @@ return [
| This value is the version of your Pixelfed instance.
|
*/
'version' => '0.12.1',
'version' => '0.12.3',
/*
|--------------------------------------------------------------------------

31
database/migrations/2016_06_01_000001_create_oauth_auth_codes_table.php Normal file
View file

@ -0,0 +1,31 @@
<?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::create('oauth_auth_codes', function (Blueprint $table) {
$table->string('id', 100)->primary();
$table->unsignedBigInteger('user_id')->index();
$table->unsignedBigInteger('client_id');
$table->text('scopes')->nullable();
$table->boolean('revoked');
$table->dateTime('expires_at')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('oauth_auth_codes');
}
};

33
database/migrations/2016_06_01_000002_create_oauth_access_tokens_table.php Normal file
View file

@ -0,0 +1,33 @@
<?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::create('oauth_access_tokens', function (Blueprint $table) {
$table->string('id', 100)->primary();
$table->unsignedBigInteger('user_id')->nullable()->index();
$table->unsignedBigInteger('client_id');
$table->string('name')->nullable();
$table->text('scopes')->nullable();
$table->boolean('revoked');
$table->timestamps();
$table->dateTime('expires_at')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('oauth_access_tokens');
}
};

29
database/migrations/2016_06_01_000003_create_oauth_refresh_tokens_table.php Normal file
View file

@ -0,0 +1,29 @@
<?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::create('oauth_refresh_tokens', function (Blueprint $table) {
$table->string('id', 100)->primary();
$table->string('access_token_id', 100)->index();
$table->boolean('revoked');
$table->dateTime('expires_at')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('oauth_refresh_tokens');
}
};

35
database/migrations/2016_06_01_000004_create_oauth_clients_table.php Normal file
View file

@ -0,0 +1,35 @@
<?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::create('oauth_clients', function (Blueprint $table) {
$table->bigIncrements('id');
$table->unsignedBigInteger('user_id')->nullable()->index();
$table->string('name');
$table->string('secret', 100)->nullable();
$table->string('provider')->nullable();
$table->text('redirect');
$table->boolean('personal_access_client');
$table->boolean('password_client');
$table->boolean('revoked');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('oauth_clients');
}
};

28
database/migrations/2016_06_01_000005_create_oauth_personal_access_clients_table.php Normal file
View file

@ -0,0 +1,28 @@
<?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::create('oauth_personal_access_clients', function (Blueprint $table) {
$table->bigIncrements('id');
$table->unsignedBigInteger('client_id');
$table->timestamps();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('oauth_personal_access_clients');
}
};

70
database/migrations/2018_08_08_100000_create_telescope_entries_table.php Normal file
View file

@ -0,0 +1,70 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Get the migration connection name.
*/
public function getConnection(): ?string
{
return config('telescope.storage.database.connection');
}
/**
* Run the migrations.
*/
public function up(): void
{
$schema = Schema::connection($this->getConnection());
$schema->create('telescope_entries', function (Blueprint $table) {
$table->bigIncrements('sequence');
$table->uuid('uuid');
$table->uuid('batch_id');
$table->string('family_hash')->nullable();
$table->boolean('should_display_on_index')->default(true);
$table->string('type', 20);
$table->longText('content');
$table->dateTime('created_at')->nullable();
$table->unique('uuid');
$table->index('batch_id');
$table->index('family_hash');
$table->index('created_at');
$table->index(['type', 'should_display_on_index']);
});
$schema->create('telescope_entries_tags', function (Blueprint $table) {
$table->uuid('entry_uuid');
$table->string('tag');
$table->primary(['entry_uuid', 'tag']);
$table->index('tag');
$table->foreign('entry_uuid')
->references('uuid')
->on('telescope_entries')
->onDelete('cascade');
});
$schema->create('telescope_monitoring', function (Blueprint $table) {
$table->string('tag')->primary();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
$schema = Schema::connection($this->getConnection());
$schema->dropIfExists('telescope_entries_tags');
$schema->dropIfExists('telescope_entries');
$schema->dropIfExists('telescope_monitoring');
}
};

7
database/migrations/2018_08_12_042648_update_status_table_change_caption_to_text.php
View file

@ -5,13 +5,6 @@ use Illuminate\Support\Facades\Schema;
class UpdateStatusTableChangeCaptionToText extends Migration
{
public function __construct()
{
DB::getDoctrineSchemaManager()
->getDatabasePlatform()
->registerDoctrineTypeMapping('enum', 'string');
}
/**
* Run the migrations.
*

5
database/migrations/2019_03_12_043935_add_snowflakeids_to_users_table.php
View file

@ -6,11 +6,6 @@ use Illuminate\Database\Migrations\Migration;
class AddSnowflakeidsToUsersTable extends Migration
{
public function __construct()
{
DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
}
/**
* Run the migrations.
*

5
database/migrations/2019_04_16_184644_add_layout_to_profiles_table.php
View file

@ -6,11 +6,6 @@ use Illuminate\Database\Migrations\Migration;
class AddLayoutToProfilesTable extends Migration
{
public function __construct()
{
DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
}
/**
* Run the migrations.
*

5
database/migrations/2019_04_25_200411_add_snowflake_ids_to_collections_table.php
View file

@ -6,11 +6,6 @@ use Illuminate\Database\Migrations\Migration;
class AddSnowflakeIdsToCollectionsTable extends Migration
{
public function __construct()
{
DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
}
/**
* Run the migrations.
*

5
database/migrations/2019_08_12_074612_add_unique_to_statuses_table.php
View file

@ -6,11 +6,6 @@ use Illuminate\Database\Migrations\Migration;
class AddUniqueToStatusesTable extends Migration
{
public function __construct()
{
DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
}
/**
* Run the migrations.
*

5
database/migrations/2019_09_09_032757_add_object_id_to_statuses_table.php
View file

@ -6,11 +6,6 @@ use Illuminate\Database\Migrations\Migration;
class AddObjectIdToStatusesTable extends Migration
{
public function __construct()
{
DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
}
/**
* Run the migrations.
*

4
database/migrations/2019_12_25_042317_update_stories_table.php
View file

@ -6,10 +6,6 @@ use Illuminate\Support\Facades\Schema;
class UpdateStoriesTable extends Migration
{
public function __construct()
{
DB::getDoctrineSchemaManager()->getDatabasePlatform()->registerDoctrineTypeMapping('enum', 'string');
}
/**
* Run the migrations.
*

10
database/migrations/2021_07_23_062326_add_compose_settings_to_user_settings_table.php
View file

@ -41,15 +41,15 @@ class AddComposeSettingsToUserSettingsTable extends Migration
Schema::table('media', function (Blueprint $table) {
$table->string('caption')->change();
$schemaManager = Schema::getConnection()->getDoctrineSchemaManager();
$indexesFound = $schemaManager->listTableIndexes('media');
if (array_key_exists('media_profile_id_index', $indexesFound)) {
$indexes = Schema::getIndexes('media');
$indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
if (in_array('media_profile_id_index', $indexesFound)) {
$table->dropIndex('media_profile_id_index');
}
if (array_key_exists('media_mime_index', $indexesFound)) {
if (in_array('media_mime_index', $indexesFound)) {
$table->dropIndex('media_mime_index');
}
if (array_key_exists('media_license_index', $indexesFound)) {
if (in_array('media_license_index', $indexesFound)) {
$table->dropIndex('media_license_index');
}
});

22
database/migrations/2021_08_23_062246_update_stories_table_fix_expires_at_column.php
View file

@ -14,12 +14,11 @@ class UpdateStoriesTableFixExpiresAtColumn extends Migration
public function up()
{
Schema::table('stories', function (Blueprint $table) {
$sm = Schema::getConnection()->getDoctrineSchemaManager();
$doctrineTable = $sm->listTableDetails('stories');
if($doctrineTable->hasIndex('stories_expires_at_index')) {
$table->dropIndex('stories_expires_at_index');
}
$indexes = Schema::getIndexes('stories');
$indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
if (in_array('stories_expires_at_index', $indexesFound)) {
$table->dropIndex('stories_expires_at_index');
}
$table->timestamp('expires_at')->default(null)->index()->nullable()->change();
$table->boolean('can_reply')->default(true);
$table->boolean('can_react')->default(true);
@ -37,12 +36,11 @@ class UpdateStoriesTableFixExpiresAtColumn extends Migration
public function down()
{
Schema::table('stories', function (Blueprint $table) {
$sm = Schema::getConnection()->getDoctrineSchemaManager();
$doctrineTable = $sm->listTableDetails('stories');
if($doctrineTable->hasIndex('stories_expires_at_index')) {
$table->dropIndex('stories_expires_at_index');
}
$indexes = Schema::getIndexes('stories');
$indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
if (in_array('stories_expires_at_index', $indexesFound)) {
$table->dropIndex('stories_expires_at_index');
}
$table->timestamp('expires_at')->default(null)->index()->nullable()->change();
$table->dropColumn('can_reply');
$table->dropColumn('can_react');

5
database/migrations/2022_10_07_055133_remove_old_compound_index_from_statuses_table.php
View file

@ -14,8 +14,9 @@ class RemoveOldCompoundIndexFromStatusesTable extends Migration
public function up()
{
Schema::table('statuses', function (Blueprint $table) {
$sc = Schema::getConnection()->getDoctrineSchemaManager();
if(array_key_exists('statuses_in_reply_to_id_reblog_of_id_index', $sc->listTableIndexes('statuses'))) {
$indexes = Schema::getIndexes('statuses');
$indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
if (in_array('statuses_in_reply_to_id_reblog_of_id_index', $indexesFound)) {
$table->dropIndex('statuses_in_reply_to_id_reblog_of_id_index');
}
});

6
database/migrations/2022_11_30_123940_update_avatars_table_remove_cdn_url_unique_constraint.php
View file

@ -14,9 +14,9 @@ return new class extends Migration
public function up()
{
Schema::table('avatars', function (Blueprint $table) {
$sm = Schema::getConnection()->getDoctrineSchemaManager();
$indexesFound = $sm->listTableIndexes('avatars');
if(array_key_exists("avatars_cdn_url_unique", $indexesFound)) {
$indexes = Schema::getIndexes('avatars');
$indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
if (in_array('avatars_cdn_url_unique', $indexesFound)) {
$table->dropUnique('avatars_cdn_url_unique');
}
});

12
database/migrations/2024_01_09_052419_create_parental_controls_table.php
View file

@ -25,9 +25,9 @@ return new class extends Migration
});
Schema::table('user_roles', function (Blueprint $table) {
$schemaManager = Schema::getConnection()->getDoctrineSchemaManager();
$indexesFound = $schemaManager->listTableIndexes('user_roles');
if (array_key_exists('user_roles_profile_id_unique', $indexesFound)) {
$indexes = Schema::getIndexes('user_roles');
$indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
if (in_array('user_roles_profile_id_unique', $indexesFound)) {
$table->dropUnique('user_roles_profile_id_unique');
}
$table->unsignedBigInteger('profile_id')->unique()->nullable()->index()->change();
@ -42,9 +42,9 @@ return new class extends Migration
Schema::dropIfExists('parental_controls');
Schema::table('user_roles', function (Blueprint $table) {
$schemaManager = Schema::getConnection()->getDoctrineSchemaManager();
$indexesFound = $schemaManager->listTableIndexes('user_roles');
if (array_key_exists('user_roles_profile_id_unique', $indexesFound)) {
$indexes = Schema::getIndexes('user_roles');
$indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
if (in_array('user_roles_profile_id_unique', $indexesFound)) {
$table->dropUnique('user_roles_profile_id_unique');
}
$table->unsignedBigInteger('profile_id')->unique()->index()->change();

12
database/migrations/2024_05_31_090555_update_instances_table_add_index_to_nodeinfo_last_fetched_at.php
View file

@ -12,9 +12,9 @@ return new class extends Migration
public function up(): void
{
Schema::table('instances', function (Blueprint $table) {
$schemaManager = Schema::getConnection()->getDoctrineSchemaManager();
$indexesFound = $schemaManager->listTableIndexes('instances');
if (! array_key_exists('instances_nodeinfo_last_fetched_index', $indexesFound)) {
$indexes = Schema::getIndexes('instances');
$indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
if (!in_array('instances_nodeinfo_last_fetched_index', $indexesFound)) {
$table->index('nodeinfo_last_fetched');
}
});
@ -26,9 +26,9 @@ return new class extends Migration
public function down(): void
{
Schema::table('instances', function (Blueprint $table) {
$schemaManager = Schema::getConnection()->getDoctrineSchemaManager();
$indexesFound = $schemaManager->listTableIndexes('instances');
if (array_key_exists('instances_nodeinfo_last_fetched_index', $indexesFound)) {
$indexes = Schema::getIndexes('instances');
$indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
if (in_array('instances_nodeinfo_last_fetched_index', $indexesFound)) {
$table->dropIndex('instances_nodeinfo_last_fetched_index');
}
});

12
database/migrations/2024_06_03_232204_add_url_index_to_statuses_table.php
View file

@ -12,9 +12,9 @@ return new class extends Migration
public function up(): void
{
Schema::table('statuses', function (Blueprint $table) {
$schemaManager = Schema::getConnection()->getDoctrineSchemaManager();
$indexesFound = $schemaManager->listTableIndexes('statuses');
if (! array_key_exists('statuses_url_index', $indexesFound)) {
$indexes = Schema::getIndexes('statuses');
$indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
if (!in_array('statuses_url_index', $indexesFound)) {
$table->index('url');
}
});
@ -26,9 +26,9 @@ return new class extends Migration
public function down(): void
{
Schema::table('statuses', function (Blueprint $table) {
$schemaManager = Schema::getConnection()->getDoctrineSchemaManager();
$indexesFound = $schemaManager->listTableIndexes('statuses');
if (array_key_exists('statuses_url_index', $indexesFound)) {
$indexes = Schema::getIndexes('statuses');
$indexesFound = collect($indexes)->map(function($i) { return $i['name']; })->toArray();
if (in_array('statuses_url_index', $indexesFound)) {
$table->dropIndex('statuses_url_index');
}
});

45
resources/views/admin/settings/customcss.blade.php Normal file
View file

@ -0,0 +1,45 @@
@extends('admin.partial.template-full')
@section('section')
</div>
<div class="header bg-primary pb-3 mt-n4">
<div class="container-fluid">
<div class="header-body">
<div class="row align-items-center py-4">
<div class="col-lg-6 col-7">
<p class="display-1 text-white d-inline-block mb-0">Custom CSS</p>
<p class="lead mb-0 text-white">Customize your instance with custom css.</p>
</div>
</div>
</div>
</div>
</div>
<div class="container-fluid mt-4">
<div class="col-12 col-md-6">
<form method="post">
@csrf
<div class="form-group">
<div class="custom-control custom-checkbox">
<input
type="checkbox"
name="show"
class="custom-control-input"
id="customCheck1"
{{ (bool) config_cache('uikit.show_custom.css') ? 'checked' : null}}
>
<label class="custom-control-label" for="customCheck1">Enable Custom CSS</label>
</div>
</div>
<div class="form-group">
<label for="css" class="font-weight-bold">Custom CSS</label>
<textarea
class="form-control"
id="css"
name="css"
rows="5">{!!config_cache('uikit.custom.css')!!}</textarea>
</div>
<button class="btn btn-primary">Save</button>
</form>
</div>
</div>
@endsection

1
routes/api.php
View file

@ -177,6 +177,7 @@ Route::group(['prefix' => 'api'], function() use($middleware) {
Route::get('accounts/popular', 'Api\ApiV1Controller@discoverAccountsPopular')->middleware($middleware);
Route::get('posts/trending', 'DiscoverController@trendingApi')->middleware($middleware);
Route::get('posts/hashtags', 'DiscoverController@trendingHashtags')->middleware($middleware);
Route::get('posts/network/trending', 'DiscoverController@discoverNetworkTrending')->middleware($middleware);
});
Route::group(['prefix' => 'directory'], function () use($middleware) {

2
routes/web-admin.php
View file

@ -3,6 +3,8 @@
Route::domain(config('pixelfed.domain.admin'))->prefix('i/admin')->group(function () {
Route::redirect('/', '/dashboard');
Route::redirect('timeline', config('app.url').'/timeline');
Route::get('settings/custom-css', 'AdminController@customCss')->name('admin.custom-css');
Route::post('settings/custom-css', 'AdminController@saveCustomCss');
Route::get('dashboard', 'AdminController@home')->name('admin.home');
Route::get('stats', 'AdminController@stats')->name('admin.stats');
Route::get('reports', 'AdminController@reports')->name('admin.reports');