AnimeThemes/animethemes-server
1
0
Fork 0
mirror of https://github.com/AnimeThemes/animethemes-server.git synced 2026-07-11 01:24:46 +02:00
Code Issues Packages Projects Releases Wiki Activity

chore: bump dependencies (#438)

Browse Source
This commit is contained in:
paranarimasu
2022-08-16 16:16:13 -05:00
committed by GitHub
parent 298c4b31d8
commit 146833338d
54 changed files with 1173 additions and 1769 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitattributes
+1
View File
@@ -8,3 +8,4 @@
/.github export-ignore
CHANGELOG.md export-ignore
.styleci.yml export-ignore
.github/workflows/static-analysis.yml
+1 -1
View File
@@ -12,7 +12,7 @@ jobs:
with:
php-version: '8.1'
tools: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, phpunit
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Copy .env
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
- name: Install Dependencies
.github/workflows/test.yml
+1 -1
View File
@@ -12,7 +12,7 @@ jobs:
with:
php-version: '8.1'
tools: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite, phpunit
- uses: actions/checkout@v2
- uses: actions/checkout@v3
- name: Copy .env
run: php -r "file_exists('.env') || copy('.env.example', '.env');"
- name: Install Dependencies
app/Models/Wiki/Anime.php
+1 -1
View File
@@ -20,7 +20,7 @@ use App\Pivots\AnimeStudio;
use App\Pivots\BasePivot;
use BenSampo\Enum\Enum;
use Database\Factories\Wiki\AnimeFactory;
use ElasticScoutDriverPlus\Searchable;
use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
app/Models/Wiki/Anime/AnimeSynonym.php
+1 -1
View File
@@ -11,7 +11,7 @@ use App\Events\Wiki\Anime\Synonym\SynonymUpdated;
use App\Models\BaseModel;
use App\Models\Wiki\Anime;
use Database\Factories\Wiki\Anime\AnimeSynonymFactory;
use ElasticScoutDriverPlus\Searchable;
use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Laravel\Nova\Actions\Actionable;
app/Models/Wiki/Anime/AnimeTheme.php
+1 -1
View File
@@ -16,7 +16,7 @@ use App\Models\Wiki\Anime\Theme\AnimeThemeEntry;
use App\Models\Wiki\Song;
use BenSampo\Enum\Enum;
use Database\Factories\Wiki\Anime\AnimeThemeFactory;
use ElasticScoutDriverPlus\Searchable;
use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
app/Models/Wiki/Anime/Theme/AnimeThemeEntry.php
+1 -1
View File
@@ -15,7 +15,7 @@ use App\Models\Wiki\Anime\AnimeTheme;
use App\Models\Wiki\Video;
use App\Pivots\AnimeThemeEntryVideo;
use Database\Factories\Wiki\Anime\Theme\AnimeThemeEntryFactory;
use ElasticScoutDriverPlus\Searchable;
use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
app/Models/Wiki/Artist.php
+1 -1
View File
@@ -15,7 +15,7 @@ use App\Pivots\ArtistResource;
use App\Pivots\ArtistSong;
use App\Pivots\BasePivot;
use Database\Factories\Wiki\ArtistFactory;
use ElasticScoutDriverPlus\Searchable;
use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Support\Collection;
app/Models/Wiki/Series.php
+1 -1
View File
@@ -11,7 +11,7 @@ use App\Events\Wiki\Series\SeriesUpdated;
use App\Models\BaseModel;
use App\Pivots\AnimeSeries;
use Database\Factories\Wiki\SeriesFactory;
use ElasticScoutDriverPlus\Searchable;
use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Support\Collection;
use Laravel\Nova\Actions\Actionable;
app/Models/Wiki/Song.php
+1 -1
View File
@@ -14,7 +14,7 @@ use App\Models\Wiki\Anime\AnimeTheme;
use App\Pivots\ArtistSong;
use App\Pivots\BasePivot;
use Database\Factories\Wiki\SongFactory;
use ElasticScoutDriverPlus\Searchable;
use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Collection;
app/Models/Wiki/Studio.php
+1 -1
View File
@@ -14,7 +14,7 @@ use App\Pivots\BasePivot;
use App\Pivots\StudioImage;
use App\Pivots\StudioResource;
use Database\Factories\Wiki\StudioFactory;
use ElasticScoutDriverPlus\Searchable;
use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
use Illuminate\Support\Collection;
use Laravel\Nova\Actions\Actionable;
app/Models/Wiki/Video.php
+1 -1
View File
@@ -19,7 +19,7 @@ use BenSampo\Enum\Enum;
use CyrildeWit\EloquentViewable\Contracts\Viewable;
use CyrildeWit\EloquentViewable\InteractsWithViews;
use Database\Factories\Wiki\VideoFactory;
use ElasticScoutDriverPlus\Searchable;
use Elastic\ScoutDriverPlus\Searchable;
use Illuminate\Database\Eloquent\Builder;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\BelongsToMany;
app/Nova/Actions/Wiki/Video/UploadVideoAction.php
+1 -1
View File
@@ -123,7 +123,7 @@ class UploadVideoAction extends Action
Text::make(__('nova.path'), 'path')
->required()
->rules(['required', 'string', 'doesnt_start_with:/', new StorageDirectoryExistsRule($fs)])
->rules(['required', 'string', 'doesnt_start_with:/', 'doesnt_end_with:/', new StorageDirectoryExistsRule($fs)])
->help(__('nova.upload_video_path_help')),
];
}
app/Providers/AppServiceProvider.php
+51
View File
@@ -4,7 +4,11 @@ declare(strict_types=1);
namespace App\Providers;
use App\Models\Wiki\Anime\Theme\AnimeThemeEntry;
use App\Models\Wiki\Video;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Foundation\Console\AboutCommand;
use Illuminate\Support\Facades\Config;
use Illuminate\Support\Facades\Log;
use Illuminate\Support\ServiceProvider;
@@ -27,5 +31,52 @@ class AppServiceProvider extends ServiceProvider
Log::info("Attempted to lazy load [$relation] on model [$class]");
});
AboutCommand::add('Audios', [
'Disk' => fn () => Config::get('audio.disk'),
'Nginx Redirect' => fn () => Config::get('audio.nginx_redirect'),
'Streaming Method' => fn () => Config::get('audio.streaming_method'),
]);
AboutCommand::add('FFmpeg', [
'FFmpeg Binary' => fn () => Config::get('laravel-ffmpeg.ffmpeg.binaries'),
'FFprobe Binary' => fn () => Config::get('laravel-ffmpeg.ffprobe.binaries'),
]);
AboutCommand::add('Flags', [
'Allow Audio Streams' => fn () => Config::get('flags.allow_audio_streams') ? 'true' : 'false',
'Allow Discord Notifications' => fn () => Config::get('flags.allow_discord_notifications') ? 'true' : 'false',
'Allow Video Streams' => fn () => Config::get('flags.allow_video_streams') ? 'true' : 'false',
'Allow View Recording' => fn () => Config::get('flags.allow_view_recording') ? 'true' : 'false',
]);
AboutCommand::add('Images', [
'Disk' => fn () => Config::get('image.disk'),
]);
AboutCommand::add('Videos', [
'Disk' => fn () => Config::get('video.disk'),
'Encoder Version' => fn () => Config::get('video.encoder_version'),
'Nginx Redirect' => fn () => Config::get('video.nginx_redirect'),
'Streaming Method' => fn () => Config::get('video.streaming_method'),
'Upload Disks' => fn () => implode(',', Config::get('video.upload_disks')),
]);
AboutCommand::add('Wiki', [
'Donate' => fn () => Config::get('wiki.donate'),
'FAQ' => fn () => Config::get('wiki.faq'),
'Featured Entry' => function () {
/** @var AnimeThemeEntry|null $entry */
$entry = AnimeThemeEntry::query()->find(Config::get('wiki.featured_entry'));
return $entry?->getName();
},
'Featured Video' => function () {
/** @var Video|null $video */
$video = Video::query()->find(Config::get('wiki.featured_video'));
return $video?->getName();
},
]);
}
}
app/Scout/Elasticsearch/Api/Criteria/Filter/Criteria.php
+1 -1
View File
@@ -7,7 +7,7 @@ namespace App\Scout\Elasticsearch\Api\Criteria\Filter;
use App\Http\Api\Criteria\Filter\Criteria as BaseCriteria;
use App\Http\Api\Filter\Filter;
use App\Http\Api\Query\ReadQuery;
use ElasticScoutDriverPlus\Builders\BoolQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\BoolQueryBuilder;
/**
* Class Criteria.
app/Scout/Elasticsearch/Api/Criteria/Filter/WhereCriteria.php
+3 -3
View File
@@ -9,9 +9,9 @@ use App\Enums\Http\Api\Filter\ComparisonOperator;
use App\Http\Api\Criteria\Filter\WhereCriteria as BaseCriteria;
use App\Http\Api\Filter\Filter;
use App\Http\Api\Query\ReadQuery;
use ElasticScoutDriverPlus\Builders\BoolQueryBuilder;
use ElasticScoutDriverPlus\Builders\QueryBuilderInterface;
use ElasticScoutDriverPlus\Support\Query as ElasticQuery;
use Elastic\ScoutDriverPlus\Builders\BoolQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\QueryBuilderInterface;
use Elastic\ScoutDriverPlus\Support\Query as ElasticQuery;
use Illuminate\Support\Arr;
use Illuminate\Support\Str;
app/Scout/Elasticsearch/Api/Criteria/Filter/WhereInCriteria.php
+2 -2
View File
@@ -8,8 +8,8 @@ use App\Enums\Http\Api\Filter\BinaryLogicalOperator;
use App\Http\Api\Criteria\Filter\WhereInCriteria as BaseCriteria;
use App\Http\Api\Filter\Filter;
use App\Http\Api\Query\ReadQuery;
use ElasticScoutDriverPlus\Builders\BoolQueryBuilder;
use ElasticScoutDriverPlus\Support\Query as ElasticQuery;
use Elastic\ScoutDriverPlus\Builders\BoolQueryBuilder;
use Elastic\ScoutDriverPlus\Support\Query as ElasticQuery;
/**
* Class WhereInCriteria.
app/Scout/Elasticsearch/Api/Criteria/Paging/Criteria.php
+4 -4
View File
@@ -6,8 +6,8 @@ namespace App\Scout\Elasticsearch\Api\Criteria\Paging;
use App\Enums\Http\Api\Paging\PaginationStrategy;
use App\Http\Api\Criteria\Paging\Criteria as BaseCriteria;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use ElasticScoutDriverPlus\Paginator;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
use Elastic\ScoutDriverPlus\Paginator;
use Illuminate\Support\Collection;
/**
@@ -37,8 +37,8 @@ abstract class Criteria
/**
* Paginate the search query.
*
* @param SearchRequestBuilder $builder
* @param SearchParametersBuilder $builder
* @return Collection|Paginator
*/
abstract public function paginate(SearchRequestBuilder $builder): Collection|Paginator;
abstract public function paginate(SearchParametersBuilder $builder): Collection|Paginator;
}
app/Scout/Elasticsearch/Api/Criteria/Paging/LimitCriteria.php
+4 -4
View File
@@ -5,8 +5,8 @@ declare(strict_types=1);
namespace App\Scout\Elasticsearch\Api\Criteria\Paging;
use App\Http\Api\Criteria\Paging\LimitCriteria as BaseCriteria;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use ElasticScoutDriverPlus\Paginator;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
use Elastic\ScoutDriverPlus\Paginator;
use Illuminate\Support\Collection;
/**
@@ -27,10 +27,10 @@ class LimitCriteria extends Criteria
/**
* Paginate the search query.
*
* @param SearchRequestBuilder $builder
* @param SearchParametersBuilder $builder
* @return Collection|Paginator
*/
public function paginate(SearchRequestBuilder $builder): Collection|Paginator
public function paginate(SearchParametersBuilder $builder): Collection|Paginator
{
return $builder
->size($this->criteria->getResultSize())
app/Scout/Elasticsearch/Api/Criteria/Paging/OffsetCriteria.php
+4 -4
View File
@@ -6,8 +6,8 @@ namespace App\Scout\Elasticsearch\Api\Criteria\Paging;
use App\Http\Api\Criteria\Paging\OffsetCriteria as BaseCriteria;
use App\Http\Api\Parser\PagingParser;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use ElasticScoutDriverPlus\Paginator;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
use Elastic\ScoutDriverPlus\Paginator;
use Illuminate\Support\Collection;
use Illuminate\Support\Facades\Request;
use Illuminate\Support\Str;
@@ -30,10 +30,10 @@ class OffsetCriteria extends Criteria
/**
* Paginate the search query.
*
* @param SearchRequestBuilder $builder
* @param SearchParametersBuilder $builder
* @return Collection|Paginator
*/
public function paginate(SearchRequestBuilder $builder): Collection|Paginator
public function paginate(SearchParametersBuilder $builder): Collection|Paginator
{
$pageNameQuery = Str::of(PagingParser::param())
->append('.')
app/Scout/Elasticsearch/Api/Query/Anime/SynonymQueryPayload.php
+6 -6
View File
@@ -8,10 +8,10 @@ use App\Models\Wiki\Anime\AnimeSynonym;
use App\Scout\Elasticsearch\Api\Query\ElasticQueryPayload;
use App\Scout\Elasticsearch\Api\Schema\Schema;
use App\Scout\Elasticsearch\Api\Schema\Wiki\Anime\SynonymSchema;
use ElasticScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use ElasticScoutDriverPlus\Builders\MatchQueryBuilder;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use ElasticScoutDriverPlus\Support\Query;
use Elastic\ScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\MatchQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
use Elastic\ScoutDriverPlus\Support\Query;
/**
* Class SynonymQueryPayload.
@@ -41,9 +41,9 @@ class SynonymQueryPayload extends ElasticQueryPayload
/**
* Build Elasticsearch query.
*
* @return SearchRequestBuilder
* @return SearchParametersBuilder
*/
public function buildQuery(): SearchRequestBuilder
public function buildQuery(): SearchParametersBuilder
{
$query = Query::bool()
->should(
app/Scout/Elasticsearch/Api/Query/Anime/Theme/EntryQueryPayload.php
+7 -7
View File
@@ -8,11 +8,11 @@ use App\Models\Wiki\Anime\Theme\AnimeThemeEntry;
use App\Scout\Elasticsearch\Api\Query\ElasticQueryPayload;
use App\Scout\Elasticsearch\Api\Schema\Schema;
use App\Scout\Elasticsearch\Api\Schema\Wiki\Anime\Theme\EntrySchema;
use ElasticScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use ElasticScoutDriverPlus\Builders\MatchQueryBuilder;
use ElasticScoutDriverPlus\Builders\NestedQueryBuilder;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use ElasticScoutDriverPlus\Support\Query;
use Elastic\ScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\MatchQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\NestedQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
use Elastic\ScoutDriverPlus\Support\Query;
/**
* Class EntryQueryPayload.
@@ -42,9 +42,9 @@ class EntryQueryPayload extends ElasticQueryPayload
/**
* Build Elasticsearch query.
*
* @return SearchRequestBuilder
* @return SearchParametersBuilder
*/
public function buildQuery(): SearchRequestBuilder
public function buildQuery(): SearchParametersBuilder
{
$query = Query::bool()
->should(
app/Scout/Elasticsearch/Api/Query/Anime/ThemeQueryPayload.php
+7 -7
View File
@@ -8,11 +8,11 @@ use App\Models\Wiki\Anime\AnimeTheme;
use App\Scout\Elasticsearch\Api\Query\ElasticQueryPayload;
use App\Scout\Elasticsearch\Api\Schema\Schema;
use App\Scout\Elasticsearch\Api\Schema\Wiki\Anime\ThemeSchema;
use ElasticScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use ElasticScoutDriverPlus\Builders\MatchQueryBuilder;
use ElasticScoutDriverPlus\Builders\NestedQueryBuilder;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use ElasticScoutDriverPlus\Support\Query;
use Elastic\ScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\MatchQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\NestedQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
use Elastic\ScoutDriverPlus\Support\Query;
/**
* Class ThemeQueryPayload.
@@ -42,9 +42,9 @@ class ThemeQueryPayload extends ElasticQueryPayload
/**
* Build Elasticsearch query.
*
* @return SearchRequestBuilder
* @return SearchParametersBuilder
*/
public function buildQuery(): SearchRequestBuilder
public function buildQuery(): SearchParametersBuilder
{
$query = Query::bool()
->should(
app/Scout/Elasticsearch/Api/Query/AnimeQueryPayload.php
+4 -4
View File
@@ -7,8 +7,8 @@ namespace App\Scout\Elasticsearch\Api\Query;
use App\Models\Wiki\Anime;
use App\Scout\Elasticsearch\Api\Schema\Schema;
use App\Scout\Elasticsearch\Api\Schema\Wiki\AnimeSchema;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use ElasticScoutDriverPlus\Support\Query;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
use Elastic\ScoutDriverPlus\Support\Query;
/**
* Class AnimeQueryPayload.
@@ -38,9 +38,9 @@ class AnimeQueryPayload extends ElasticQueryPayload
/**
* Build Elasticsearch query.
*
* @return SearchRequestBuilder
* @return SearchParametersBuilder
*/
public function buildQuery(): SearchRequestBuilder
public function buildQuery(): SearchParametersBuilder
{
$query = Query::bool()
->mustRaw([
app/Scout/Elasticsearch/Api/Query/ArtistQueryPayload.php
+7 -7
View File
@@ -7,11 +7,11 @@ namespace App\Scout\Elasticsearch\Api\Query;
use App\Models\Wiki\Artist;
use App\Scout\Elasticsearch\Api\Schema\Schema;
use App\Scout\Elasticsearch\Api\Schema\Wiki\ArtistSchema;
use ElasticScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use ElasticScoutDriverPlus\Builders\MatchQueryBuilder;
use ElasticScoutDriverPlus\Builders\NestedQueryBuilder;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use ElasticScoutDriverPlus\Support\Query;
use Elastic\ScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\MatchQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\NestedQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
use Elastic\ScoutDriverPlus\Support\Query;
/**
* Class ArtistQueryPayload.
@@ -41,9 +41,9 @@ class ArtistQueryPayload extends ElasticQueryPayload
/**
* Build Elasticsearch query.
*
* @return SearchRequestBuilder
* @return SearchParametersBuilder
*/
public function buildQuery(): SearchRequestBuilder
public function buildQuery(): SearchParametersBuilder
{
$query = Query::bool()
->should(
app/Scout/Elasticsearch/Api/Query/ElasticQueryPayload.php
+3 -3
View File
@@ -6,7 +6,7 @@ namespace App\Scout\Elasticsearch\Api\Query;
use App\Http\Api\Criteria\Search\Criteria;
use App\Scout\Elasticsearch\Api\Schema\Schema;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
/**
* Class ElasticQueryPayload.
@@ -39,7 +39,7 @@ abstract class ElasticQueryPayload
/**
* Build Elasticsearch query.
*
* @return SearchRequestBuilder
* @return SearchParametersBuilder
*/
abstract public function buildQuery(): SearchRequestBuilder;
abstract public function buildQuery(): SearchParametersBuilder;
}
app/Scout/Elasticsearch/Api/Query/SeriesQueryPayload.php
+6 -6
View File
@@ -7,10 +7,10 @@ namespace App\Scout\Elasticsearch\Api\Query;
use App\Models\Wiki\Series;
use App\Scout\Elasticsearch\Api\Schema\Schema;
use App\Scout\Elasticsearch\Api\Schema\Wiki\SeriesSchema;
use ElasticScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use ElasticScoutDriverPlus\Builders\MatchQueryBuilder;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use ElasticScoutDriverPlus\Support\Query;
use Elastic\ScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\MatchQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
use Elastic\ScoutDriverPlus\Support\Query;
/**
* Class SeriesQueryPayload.
@@ -40,9 +40,9 @@ class SeriesQueryPayload extends ElasticQueryPayload
/**
* Build Elasticsearch query.
*
* @return SearchRequestBuilder
* @return SearchParametersBuilder
*/
public function buildQuery(): SearchRequestBuilder
public function buildQuery(): SearchParametersBuilder
{
$query = Query::bool()
->should(
app/Scout/Elasticsearch/Api/Query/SongQueryPayload.php
+6 -6
View File
@@ -7,10 +7,10 @@ namespace App\Scout\Elasticsearch\Api\Query;
use App\Models\Wiki\Song;
use App\Scout\Elasticsearch\Api\Schema\Schema;
use App\Scout\Elasticsearch\Api\Schema\Wiki\SongSchema;
use ElasticScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use ElasticScoutDriverPlus\Builders\MatchQueryBuilder;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use ElasticScoutDriverPlus\Support\Query;
use Elastic\ScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\MatchQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
use Elastic\ScoutDriverPlus\Support\Query;
/**
* Class SongQueryPayload.
@@ -40,9 +40,9 @@ class SongQueryPayload extends ElasticQueryPayload
/**
* Build Elasticsearch query.
*
* @return SearchRequestBuilder
* @return SearchParametersBuilder
*/
public function buildQuery(): SearchRequestBuilder
public function buildQuery(): SearchParametersBuilder
{
$query = Query::bool()
->should(
app/Scout/Elasticsearch/Api/Query/StudioQueryPayload.php
+6 -6
View File
@@ -7,10 +7,10 @@ namespace App\Scout\Elasticsearch\Api\Query;
use App\Models\Wiki\Studio;
use App\Scout\Elasticsearch\Api\Schema\Schema;
use App\Scout\Elasticsearch\Api\Schema\Wiki\StudioSchema;
use ElasticScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use ElasticScoutDriverPlus\Builders\MatchQueryBuilder;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use ElasticScoutDriverPlus\Support\Query;
use Elastic\ScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\MatchQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
use Elastic\ScoutDriverPlus\Support\Query;
/**
* Class StudioQueryPayload.
@@ -40,9 +40,9 @@ class StudioQueryPayload extends ElasticQueryPayload
/**
* Build Elasticsearch query.
*
* @return SearchRequestBuilder
* @return SearchParametersBuilder
*/
public function buildQuery(): SearchRequestBuilder
public function buildQuery(): SearchParametersBuilder
{
$query = Query::bool()
->should(
app/Scout/Elasticsearch/Api/Query/VideoQueryPayload.php
+7 -7
View File
@@ -7,11 +7,11 @@ namespace App\Scout\Elasticsearch\Api\Query;
use App\Models\Wiki\Video;
use App\Scout\Elasticsearch\Api\Schema\Schema;
use App\Scout\Elasticsearch\Api\Schema\Wiki\VideoSchema;
use ElasticScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use ElasticScoutDriverPlus\Builders\MatchQueryBuilder;
use ElasticScoutDriverPlus\Builders\NestedQueryBuilder;
use ElasticScoutDriverPlus\Builders\SearchRequestBuilder;
use ElasticScoutDriverPlus\Support\Query;
use Elastic\ScoutDriverPlus\Builders\MatchPhraseQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\MatchQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\NestedQueryBuilder;
use Elastic\ScoutDriverPlus\Builders\SearchParametersBuilder;
use Elastic\ScoutDriverPlus\Support\Query;
/**
* Class VideoQueryPayload.
@@ -41,9 +41,9 @@ class VideoQueryPayload extends ElasticQueryPayload
/**
* Build Elasticsearch query.
*
* @return SearchRequestBuilder
* @return SearchParametersBuilder
*/
public function buildQuery(): SearchRequestBuilder
public function buildQuery(): SearchParametersBuilder
{
$query = Query::bool()
->should(
app/Scout/Elasticsearch/Elasticsearch.php
+5 -5
View File
@@ -13,9 +13,9 @@ use App\Scout\Elasticsearch\Api\Parser\PagingParser;
use App\Scout\Elasticsearch\Api\Parser\SortParser;
use App\Scout\Elasticsearch\Api\Query\ElasticQueryPayload;
use App\Scout\Search;
use ElasticScoutDriverPlus\Builders\BoolQueryBuilder;
use ElasticScoutDriverPlus\Exceptions\QueryBuilderException;
use Elasticsearch\Client;
use Elastic\Elasticsearch\Client;
use Elastic\ScoutDriverPlus\Builders\BoolQueryBuilder;
use Elastic\ScoutDriverPlus\Exceptions\QueryBuilderValidationException;
use Exception;
use Illuminate\Support\Facades\Log;
use RuntimeException;
@@ -40,7 +40,7 @@ class Elasticsearch extends Search
public function __construct(Client $client)
{
try {
$this->alive = $client->ping();
$this->alive = $client->ping()->asBool();
} catch (Exception $exception) {
Log::error($exception->getMessage());
$this->alive = false;
@@ -109,7 +109,7 @@ class Elasticsearch extends Search
}
try {
$builder->postFilter($filterBuilder);
} catch (QueryBuilderException) {
} catch (QueryBuilderValidationException) {
// There doesn't appear to be a way to check if any filters have been set in the filter builder
}
composer.json
+6 -5
View File
@@ -28,19 +28,19 @@
"ext-gd": "*",
"ext-intl": "*",
"ext-pdo": "*",
"babenkoivan/elastic-migrations": "^2.0",
"babenkoivan/elastic-scout-driver-plus": "^3.5",
"bensampo/laravel-enum": "^5.0",
"babenkoivan/elastic-migrations": "^3.0",
"babenkoivan/elastic-scout-driver-plus": "^4.0",
"bensampo/laravel-enum": "^6.0",
"bepsvpt/secure-headers": "^7.2",
"cyrildewit/eloquent-viewable": "^6.1",
"fakerphp/faker": "^1.17",
"guzzlehttp/guzzle": "^7.4",
"laravel-notification-channels/discord": "^1.3",
"laravel/framework": "^9.19",
"laravel/framework": "^9.24",
"laravel/horizon": "^5.8",
"laravel/jetstream": "^2.8",
"laravel/nova": "^4.7",
"laravel/sanctum": "^2.15",
"laravel/sanctum": "^3.0",
"laravel/scout": "^9.4",
"laravel/telescope": "^4.7",
"laravel/tinker": "^2.7",
@@ -59,6 +59,7 @@
},
"require-dev": {
"brianium/paratest": "^6.4",
"laravel/pint": "^1.0",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^6.1",
"nunomaduro/larastan": "^2.0",
composer.lock
Generated
+673 -1356
View File
File diff suppressed because it is too large Load Diff
database/migrations/2019_12_14_000001_create_personal_access_tokens_table.php
+1
View File
@@ -23,6 +23,7 @@ return new class extends Migration
$table->string('token', 64)->unique();
$table->text('abilities')->nullable();
$table->timestamp('last_used_at')->nullable();
$table->timestamp('expires_at')->nullable();
$table->timestamps(6);
});
}
elastic/migrations/2020_12_21_225415_create_anime_index.php
+3 -3
View File
@@ -2,9 +2,9 @@
declare(strict_types=1);
use ElasticAdapter\Indices\Mapping;
use ElasticMigrations\Facades\Index;
use ElasticMigrations\MigrationInterface;
use Elastic\Adapter\Indices\Mapping;
use Elastic\Migrations\Facades\Index;
use Elastic\Migrations\MigrationInterface;
/**
* Class CreateAnimeIndex.
elastic/migrations/2020_12_22_033019_create_artist_index.php
+3 -3
View File
@@ -2,9 +2,9 @@
declare(strict_types=1);
use ElasticAdapter\Indices\Mapping;
use ElasticMigrations\Facades\Index;
use ElasticMigrations\MigrationInterface;
use Elastic\Adapter\Indices\Mapping;
use Elastic\Migrations\Facades\Index;
use Elastic\Migrations\MigrationInterface;
/**
* Class CreateArtistIndex.
elastic/migrations/2020_12_22_034505_create_entry_index.php
+3 -3
View File
@@ -2,9 +2,9 @@
declare(strict_types=1);
use ElasticAdapter\Indices\Mapping;
use ElasticMigrations\Facades\Index;
use ElasticMigrations\MigrationInterface;
use Elastic\Adapter\Indices\Mapping;
use Elastic\Migrations\Facades\Index;
use Elastic\Migrations\MigrationInterface;
/**
* Class CreateEntryIndex.
elastic/migrations/2020_12_22_034544_create_series_index.php
+3 -3
View File
@@ -2,9 +2,9 @@
declare(strict_types=1);
use ElasticAdapter\Indices\Mapping;
use ElasticMigrations\Facades\Index;
use ElasticMigrations\MigrationInterface;
use Elastic\Adapter\Indices\Mapping;
use Elastic\Migrations\Facades\Index;
use Elastic\Migrations\MigrationInterface;
/**
* Class CreateSeriesIndex.
elastic/migrations/2020_12_22_034549_create_song_index.php
+3 -3
View File
@@ -2,9 +2,9 @@
declare(strict_types=1);
use ElasticAdapter\Indices\Mapping;
use ElasticMigrations\Facades\Index;
use ElasticMigrations\MigrationInterface;
use Elastic\Adapter\Indices\Mapping;
use Elastic\Migrations\Facades\Index;
use Elastic\Migrations\MigrationInterface;
/**
* Class CreateSongIndex.
elastic/migrations/2020_12_22_034553_create_synonym_index.php
+3 -3
View File
@@ -2,9 +2,9 @@
declare(strict_types=1);
use ElasticAdapter\Indices\Mapping;
use ElasticMigrations\Facades\Index;
use ElasticMigrations\MigrationInterface;
use Elastic\Adapter\Indices\Mapping;
use Elastic\Migrations\Facades\Index;
use Elastic\Migrations\MigrationInterface;
/**
* Class CreateSynonymIndex.
elastic/migrations/2020_12_22_034557_create_theme_index.php
+3 -3
View File
@@ -2,9 +2,9 @@
declare(strict_types=1);
use ElasticAdapter\Indices\Mapping;
use ElasticMigrations\Facades\Index;
use ElasticMigrations\MigrationInterface;
use Elastic\Adapter\Indices\Mapping;
use Elastic\Migrations\Facades\Index;
use Elastic\Migrations\MigrationInterface;
/**
* Class CreateThemeIndex.
elastic/migrations/2020_12_22_034601_create_video_index.php
+3 -3
View File
@@ -2,9 +2,9 @@
declare(strict_types=1);
use ElasticAdapter\Indices\Mapping;
use ElasticMigrations\Facades\Index;
use ElasticMigrations\MigrationInterface;
use Elastic\Adapter\Indices\Mapping;
use Elastic\Migrations\Facades\Index;
use Elastic\Migrations\MigrationInterface;
/**
* Class CreateVideoIndex.
elastic/migrations/2021_08_20_213637_create_studio_index.php
+3 -3
View File
@@ -2,9 +2,9 @@
declare(strict_types=1);
use ElasticAdapter\Indices\Mapping;
use ElasticMigrations\Facades\Index;
use ElasticMigrations\MigrationInterface;
use Elastic\Adapter\Indices\Mapping;
use Elastic\Migrations\Facades\Index;
use Elastic\Migrations\MigrationInterface;
/**
* Class CreateStudioIndex.
package-lock.json
Generated
+305 -273
View File
File diff suppressed because it is too large Load Diff
package.json
+6 -6
View File
@@ -7,13 +7,13 @@
"devDependencies": {
"@tailwindcss/forms": "^0.5.2",
"@tailwindcss/typography": "^0.5.4",
"alpinejs": "^3.10.2",
"autoprefixer": "^10.4.7",
"alpinejs": "^3.10.3",
"autoprefixer": "^10.4.8",
"axios": "^0.27.2",
"laravel-vite-plugin": "^0.4.0",
"laravel-vite-plugin": "^0.5.4",
"lodash": "^4.17.21",
"postcss": "8.4.14",
"tailwindcss": "^3.1.6",
"vite": "^2.9.14"
"postcss": "8.4.16",
"tailwindcss": "^3.1.8",
"vite": "^3.0.8"
}
}
public/vendor/nova/app.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/vendor/nova/app.js.map
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/vendor/nova/mix-manifest.json
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
{
"/app.js": "/app.js?id=1048a2bf18b290f7522f2ae6600d919d",
"/app.js": "/app.js?id=03251e11a67ea0ed2dba40e6d17604c9",
"/manifest.js": "/manifest.js?id=669e239ee3cb6def5a270efd47770096",
"/app.css": "/app.css?id=33808f855556949ca4cb15715f93aa13",
"/vendor.js": "/vendor.js?id=1022f944315618af71c2c6064f122234",
public/vendor/telescope/app.js
Vendored
+1 -1
View File
File diff suppressed because one or more lines are too long
public/vendor/telescope/mix-manifest.json
Vendored
+1 -1
View File
@@ -1,5 +1,5 @@
{
"/app.js": "/app.js?id=5f787308b3b997866bf782d64c70c6c3",
"/app.js": "/app.js?id=9475bf9d042b390be64cdee0abb33817",
"/app-dark.css": "/app-dark.css?id=3ae28ef5f7b987d68dc611118c646308",
"/app.css": "/app.css?id=7c970f699ed9cf60d80b273b4ad2ad61"
}
resources/lang/en/validation.php
+1
View File
@@ -45,6 +45,7 @@ return [
'dimensions' => 'The :attribute has invalid image dimensions.',
'directory_exists' => 'The directory does not exist in the filesystem.',
'distinct' => 'The :attribute field has a duplicate value.',
'doesnt_end_with' => 'The :attribute may not end with one of the following: :values.',
'doesnt_start_with' => 'The :attribute may not start with one of the following: :values.',
'email' => 'The :attribute must be a valid email address.',
'ends_with' => 'The :attribute must end with one of the following: :values.',
resources/views/layouts/app.blade.php
+1 -1
View File
@@ -8,7 +8,7 @@
<title>{{ config('app.name', 'Laravel') }}</title>
<!-- Fonts -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">
<link rel="stylesheet" href="https://fonts.bunny.net/css2?family=Nunito:wght@400;600;700&display=swap">
<!-- Scripts -->
@vite(['resources/css/app.css', 'resources/js/app.js'])
resources/views/layouts/guest.blade.php
+1 -1
View File
@@ -8,7 +8,7 @@
<title>{{ config('app.name', 'Laravel') }}</title>
<!-- Fonts -->
<link rel="stylesheet" href="https://fonts.googleapis.com/css2?family=Nunito:wght@400;600;700&display=swap">
<link rel="stylesheet" href="https://fonts.bunny.net/css2?family=Nunito:wght@400;600;700&display=swap">
</head>
<body>
<div class="font-sans text-gray-900 antialiased">
tests/Feature/Actions/Models/Wiki/Anime/Resource/BackfillAnilistResourceTest.php
+1 -1
View File
@@ -320,7 +320,7 @@ class BackfillAnilistResourceTest extends TestCase
],
]),
'https://relations.yuna.moe/api/ids*' => Http::response([
'anilist' => $this->faker->randomDigitNotNull(),
'anilist' => $anilistId,
]),
]);