Merge pull request #1558 from NNTmux/laravel11

Laravel11
This commit is contained in:
DariusIII
2024-04-28 14:18:01 +02:00
committed by GitHub
263 changed files with 5204 additions and 2920 deletions
+15 -4
View File
@@ -45,14 +45,24 @@ ADMIN_EMAIL=
APP_NAME=NNTmux
APP_ENV=production
APP_DEBUG=false
APP_TIMEZONE=UTC
APP_URL=
APP_TZ=Europe/Paris
APP_LOCALE=en
APP_FALLBACK_LOCALE=en
APP_FAKER_LOCALE=en_US
APP_MAINTENANCE_DRIVER=file
APP_MAINTENANCE_STORE=database
BCRYPT_ROUNDS=12
APP_KEY=
LOG_CHANNEL=stack
LOG_STACK=single
PASSWORD_HASH=argon2id
BROADCAST_DRIVER=log
CACHE_DRIVER=redis
BROADCAST_CONNECTION=log
CACHE_STORE=redis
QUEUE_CONNECTION=sync
REDIS_HOST=127.0.0.1
@@ -61,10 +71,11 @@ REDIS_PORT=6379
REDIS_CLIENT=phpredis
SESSION_DRIVER=redis
SESSION_DOMAIN=
SESSION_DOMAIN=null
SESSION_SECURE_COOKIE=false
SESSION_ENCRYPT=false
SESSION_COOKIE=nntmux
SESSION_PATH=/
MAIL_DRIVER=smtp
MAIL_HOST=smtp.mailtrap.io
+14 -9
View File
@@ -4,8 +4,14 @@ on: [push]
jobs:
tests:
name: Run tests
runs-on: ubuntu-latest
strategy:
fail-fast: true
matrix:
php: [ 8.2, 8.3 ]
name: PHP ${{ matrix.php }}
services:
mysql:
image: mariadb:10
@@ -18,13 +24,13 @@ jobs:
- 3306:3306
options: --health-cmd="mysqladmin ping" --health-interval=10s --health-timeout=5s --health-retries=3
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- name: Setup PHP
uses: shivammathur/setup-php@v2
with:
php-version: '8.2'
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, bcmath, soap, intl, gd, exif, iconv
php-version: ${{ matrix.php }}
extensions: dom, curl, libxml, mbstring, zip, pcntl, pdo, sqlite, pdo_sqlite
coverage: none
- name: Copy env file
@@ -32,11 +38,10 @@ jobs:
cp .env.test .env
- name: Run composer install
run: composer install -n --prefer-dist
run: composer install --prefer-dist --no-interaction --no-progress
- name: Prepare Laravel Application
run:
php artisan key:generate
- name: Generate app key
run: php artisan key:generate
- name: Run tests
run: php artisan test
run: vendor/bin/phpunit
+1 -1
View File
@@ -10,7 +10,7 @@ return (new \Jubeki\LaravelCodeStyle\Config())
->in(config_path())
->in(database_path())
->notPath(database_path('migrations'))
->in(resource_path('lang'))
->in(base_path('lang'))
->in(base_path('routes'))
->in(base_path('tests'))
->in(base_path('Blacklight'))
+1 -1
View File
@@ -103,7 +103,7 @@ class Backfill
$counter++;
}
$dMessage = 'Backfilling completed in '.now()->diffInSeconds($allTime).' seconds.';
$dMessage = 'Backfilling completed in '.now()->diffInSeconds($allTime, true).' seconds.';
if ($this->_echoCLI) {
$this->colorCli->primary($dMessage);
+8 -8
View File
@@ -227,7 +227,7 @@ class Binaries
$counter++;
}
$endTime = now()->diffInSeconds($allTime);
$endTime = now()->diffInSeconds($allTime, true);
$this->log(
'Updating completed in '.$endTime.Str::plural(' second', $endTime),
__FUNCTION__,
@@ -458,7 +458,7 @@ class Binaries
}
if ($this->_echoCLI) {
$endGroup = now()->diffInSeconds($startGroup);
$endGroup = now()->diffInSeconds($startGroup, true);
$this->colorCli->primary(
PHP_EOL.'Group '.$groupMySQL['name'].' processed in '.
$endGroup.Str::plural(' second', $endGroup)
@@ -547,7 +547,7 @@ class Binaries
$this->startCleaning = now();
// End of the getting data from usenet.
$this->timeHeaders = $this->startCleaning->diffInSeconds($this->startLoop);
$this->timeHeaders = $this->startCleaning->diffInSeconds($this->startLoop, true);
// Check if we got headers.
$msgCount = \count($headers);
@@ -636,7 +636,7 @@ class Binaries
$this->startPR = now();
// End of inserting.
$this->timeInsert = $this->startPR->diffInSeconds($this->startUpdate);
$this->timeInsert = $this->startPR->diffInSeconds($this->startUpdate, true);
if ($partRepair && \count($headersRepaired) > 0) {
$this->removeRepairedParts($headersRepaired, $this->groupMySQL['id']);
@@ -853,7 +853,7 @@ class Binaries
$this->startUpdate = now();
// End of processing headers.
$this->timeCleaning = $this->startUpdate->diffInSeconds($this->startCleaning);
$this->timeCleaning = $this->startUpdate->diffInSeconds($this->startCleaning, true);
$binariesQuery = $binariesCheck = 'INSERT INTO binaries (id, partsize, currentparts) VALUES ';
foreach ($binariesUpdate as $binaryID => $binary) {
$binariesQuery .= '('.$binaryID.','.$binary['Size'].','.$binary['Parts'].'),';
@@ -944,9 +944,9 @@ class Binaries
$this->colorCli->primaryOver(' to process collections, ').
$this->colorCli->alternateOver($this->timeInsert.'s').
$this->colorCli->primaryOver(' to insert binaries/parts, ').
$this->colorCli->alternateOver($currentMicroTime->diffInSeconds($this->startPR).'s').
$this->colorCli->alternateOver($currentMicroTime->diffInSeconds($this->startPR, true).'s').
$this->colorCli->primaryOver(' for part repair, ').
$this->colorCli->alternateOver($currentMicroTime->diffInSeconds($this->startLoop).'s').
$this->colorCli->alternateOver($currentMicroTime->diffInSeconds($this->startLoop, true).'s').
$this->colorCli->primary(' total.');
}
}
@@ -1236,7 +1236,7 @@ class Binaries
if ($this->_echoCLI) {
$this->colorCli->primary(
PHP_EOL.'Found article #'.$wantedArticle.' which has a date of '.date('r', $articleTime).
', vs wanted date of '.date('r', $goalTime).'. Difference from goal is '.Carbon::createFromTimestamp($goalTime)->diffInDays(Carbon::createFromTimestamp($articleTime)).'days.'
', vs wanted date of '.date('r', $goalTime).'. Difference from goal is '.Carbon::createFromTimestamp($goalTime)->diffInDays(Carbon::createFromTimestamp($articleTime), true).'days.'
);
}
+1 -1
View File
@@ -452,7 +452,7 @@ class Music
// Sleep to not flood amazon.
$sleeptime = $this->sleeptime / 1000;
$diff = now()->diffInSeconds($startTime);
$diff = now()->diffInSeconds($startTime, true);
if ($sleeptime - $diff > 0 && $usedAmazon === true) {
sleep($sleeptime - $diff);
}
+1 -1
View File
@@ -1125,7 +1125,7 @@ class NameFixer
$this->colorCLI->climate()->info('Renamed Releases: ['.number_format($counted).'] '.(new ConsoleTools())->percentString(++$counter, $total));
}
}
$this->colorCLI->climate()->info(PHP_EOL.'Renamed '.number_format($counted).' releases in '.now()->diffInSeconds($timeStart).' seconds'.'.');
$this->colorCLI->climate()->info(PHP_EOL.'Renamed '.number_format($counted).' releases in '.now()->diffInSeconds($timeStart, true).' seconds'.'.');
} else {
$this->colorCLI->climate()->info('Nothing to do.');
}
+2 -2
View File
@@ -119,7 +119,7 @@ class ReleaseRemover
if ($this->echoCLI) {
$this->colorCLI->headerOver(($this->delete ? 'Deleted ' : 'Would have deleted ').$this->deletedCount.' release(s). This script ran for ');
$this->colorCLI->header(now()->diffInSeconds($timeStart).' seconds', true);
$this->colorCLI->header(now()->diffInSeconds($timeStart, true).' seconds', true);
}
return true;
@@ -239,7 +239,7 @@ class ReleaseRemover
if ($this->echoCLI) {
$this->colorCLI->headerOver(($this->delete ? 'Deleted ' : 'Would have deleted ').$this->deletedCount.' release(s). This script ran for ');
$this->colorCLI->header(now()->diffInSeconds($timeStart).' seconds', true);
$this->colorCLI->header(now()->diffInSeconds($timeStart, true).' seconds', true);
}
return true;
+1 -1
View File
@@ -323,7 +323,7 @@ class Forking
if ($backfill_days === 1) {
$backfilldays = 'g.backfill_target';
} elseif ($backfill_days === 2) {
$backfilldays = now()->diffInDays(Carbon::createFromFormat('Y-m-d', Settings::settingValue('..safebackfilldate')));
$backfilldays = now()->diffInDays(Carbon::createFromFormat('Y-m-d', Settings::settingValue('..safebackfilldate')), true);
}
$data = DB::select(
+9 -9
View File
@@ -236,7 +236,7 @@ class ProcessReleases
}
$count = $countQuery->count('id');
$totalTime = now()->diffInSeconds($startTime);
$totalTime = now()->diffInSeconds($startTime, true);
$this->colorCLI->primary(
($count ?? 0).' collections were found to be complete. Time: '.
@@ -282,7 +282,7 @@ class ProcessReleases
$checked.' collections set to filecheck = 3(size calculated)',
true
);
$totalTime = now()->diffInSeconds($startTime);
$totalTime = now()->diffInSeconds($startTime, true);
$this->colorCLI->primary($totalTime.Str::plural(' second', $totalTime), true);
}
}, 10);
@@ -366,7 +366,7 @@ class ProcessReleases
}
}
$totalTime = now()->diffInSeconds($startTime);
$totalTime = now()->diffInSeconds($startTime, true);
if ($this->echoCLI) {
$this->colorCLI->primary('Deleted '.($minSizeDeleted + $maxSizeDeleted + $minFilesDeleted).' collections: '.PHP_EOL.$minSizeDeleted.' smaller than, '.$maxSizeDeleted.' bigger than, '.$minFilesDeleted.' with less files than site/group settings in: '.$totalTime.Str::plural(' second', $totalTime), true);
@@ -535,7 +535,7 @@ class ProcessReleases
}
}
$totalTime = now()->diffInSeconds($startTime);
$totalTime = now()->diffInSeconds($startTime, true);
if ($this->echoCLI) {
$this->colorCLI->primary(
@@ -587,7 +587,7 @@ class ProcessReleases
}
}
$totalTime = now()->diffInSeconds($startTime);
$totalTime = now()->diffInSeconds($startTime, true);
if ($this->echoCLI) {
$this->colorCLI->primary(
@@ -625,7 +625,7 @@ class ProcessReleases
$groupID
);
$totalTime = now()->diffInSeconds($startTime);
$totalTime = now()->diffInSeconds($startTime, true);
if ($this->echoCLI) {
$this->colorCLI->primary($totalTime.Str::plural(' second', $totalTime));
@@ -682,7 +682,7 @@ class ProcessReleases
}
$firstQuery = $fourthQuery = now();
$totalTime = $firstQuery->diffInSeconds($startTime);
$totalTime = $firstQuery->diffInSeconds($startTime, true);
if ($this->echoCLI) {
$this->colorCLI->primary(
@@ -729,8 +729,8 @@ class ProcessReleases
}
$deletedCount += $deleted;
$colDelTime = now()->diffInSeconds($fourthQuery);
$totalTime = $fourthQuery->diffInSeconds($startTime);
$colDelTime = now()->diffInSeconds($fourthQuery, true);
$totalTime = $fourthQuery->diffInSeconds($startTime, true);
if ($this->echoCLI) {
$this->colorCLI->primary('Finished deleting '.$deleted.' collections missed after NZB creation in '.$colDelTime.Str::plural(' second', $colDelTime).PHP_EOL.'Removed '.number_format($deletedCount).' parts/binaries/collection rows in '.$totalTime.Str::plural(' second', $totalTime), true);
+1 -1
View File
@@ -34,7 +34,7 @@ class CleanNZB extends Command
/**
* Execute the console command.
*/
public function handle()
public function handle(): void
{
// Check if any options are false
if (! $this->option('notindb') && ! $this->option('notondisk')) {
+1 -1
View File
@@ -30,7 +30,7 @@ class ImportNzbs extends Command
/**
* Execute the console command.
*/
public function handle()
public function handle(): void
{
if ($this->option('folder')) {
if ($this->option('filename')) {
@@ -34,7 +34,7 @@ class RecategorizeReleases extends Command
/**
* Execute the console command.
*/
public function handle()
public function handle(): void
{
$countQuery = Release::query();
if ($this->option('misc')) {
-48
View File
@@ -1,48 +0,0 @@
<?php
namespace App\Console;
use App\Jobs\RemoveInactiveAccounts;
use Illuminate\Console\Scheduling\Schedule;
use Illuminate\Foundation\Console\Kernel as ConsoleKernel;
class Kernel extends ConsoleKernel
{
/**
* The Artisan commands provided by your application.
*
* @var array
*/
protected $commands = [
//
];
/**
* Define the application's command schedule.
*/
protected function schedule(Schedule $schedule): void
{
$schedule->command('disposable:update')->weekly();
$schedule->command('clean:directories')->hourly()->withoutOverlapping();
$schedule->command('nntmux:delete-unverified-users')->twiceDaily(1, 13);
$schedule->command('nntmux:update-expired-roles')->daily();
$schedule->command('nntmux:remove-bad')->hourly()->withoutOverlapping();
$schedule->command('telescope:prune')->daily();
$schedule->command('horizon:snapshot')->everyFiveMinutes()->withoutOverlapping();
$schedule->command('cloudflare:reload')->daily();
$schedule->command('cache:prune-stale-tags')->hourly();
if (config('nntmux.purge_inactive_users') === true) {
$schedule->job(new RemoveInactiveAccounts())->daily();
}
}
/**
* Register the commands for the application.
*/
protected function commands(): void
{
$this->load(__DIR__.'/Commands');
require base_path('routes/console.php');
}
}
@@ -0,0 +1,27 @@
<?php
namespace App\Http\Controllers\Auth;
use App\Http\Controllers\Controller;
use Illuminate\Auth\Events\Verified;
use Illuminate\Foundation\Auth\EmailVerificationRequest;
use Illuminate\Http\RedirectResponse;
class VerifyEmailController extends Controller
{
/**
* Mark the authenticated user's email address as verified.
*/
public function __invoke(EmailVerificationRequest $request): RedirectResponse
{
if ($request->user()->hasVerifiedEmail()) {
return redirect()->intended(route('dashboard', absolute: false).'?verified=1');
}
if ($request->user()->markEmailAsVerified()) {
event(new Verified($request->user()));
}
return redirect()->intended(route('dashboard', absolute: false).'?verified=1');
}
}
+1 -1
View File
@@ -7,7 +7,7 @@ use Illuminate\Foundation\Bus\DispatchesJobs;
use Illuminate\Foundation\Validation\ValidatesRequests;
use Illuminate\Routing\Controller as BaseController;
class Controller extends BaseController
abstract class Controller extends BaseController
{
use AuthorizesRequests, DispatchesJobs, ValidatesRequests;
}
-69
View File
@@ -1,69 +0,0 @@
<?php
namespace App\Http;
use Illuminate\Foundation\Http\Kernel as HttpKernel;
class Kernel extends HttpKernel
{
/**
* The application's global HTTP middleware stack.
*
* These middleware are run during every request to your application.
*
* @var array
*/
protected $middleware = [
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\Illuminate\Foundation\Http\Middleware\ValidatePostSize::class,
Middleware\TrimStrings::class,
\Illuminate\Foundation\Http\Middleware\ConvertEmptyStringsToNull::class,
\Monicahq\Cloudflare\Http\Middleware\TrustProxies::class,
Middleware\ForceJsonOnAPI::class,
];
/**
* The application's route middleware groups.
*
* @var array
*/
protected $middlewareGroups = [
'web' => [
Middleware\EncryptCookies::class,
\Illuminate\Cookie\Middleware\AddQueuedCookiesToResponse::class,
\Illuminate\Session\Middleware\StartSession::class,
\Illuminate\Session\Middleware\AuthenticateSession::class,
\Illuminate\View\Middleware\ShareErrorsFromSession::class,
Middleware\VerifyCsrfToken::class,
\Illuminate\Routing\Middleware\SubstituteBindings::class,
],
'api' => [
'throttle:60,1',
'bindings',
],
];
/**
* The application's route middleware.
*
* These middleware may be assigned to groups or used individually.
*
* @var array
*/
protected $middlewareAliases = [
'auth' => \Illuminate\Auth\Middleware\Authenticate::class,
'auth.basic' => \Illuminate\Auth\Middleware\AuthenticateWithBasicAuth::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'cache.headers' => \Illuminate\Http\Middleware\SetCacheHeaders::class,
'can' => \Illuminate\Auth\Middleware\Authorize::class,
'guest' => Middleware\RedirectIfAuthenticated::class,
'throttle' => \Illuminate\Routing\Middleware\ThrottleRequests::class,
'isVerified' => \Jrean\UserVerification\Middleware\IsVerified::class,
'role' => \Spatie\Permission\Middleware\RoleMiddleware::class,
'permission' => \Spatie\Permission\Middleware\PermissionMiddleware::class,
'role_or_permission' => \Spatie\Permission\Middleware\RoleOrPermissionMiddleware::class,
'clearance' => Middleware\ClearanceMiddleware::class,
'2fa' => Middleware\Google2FAMiddleware::class,
];
}
-19
View File
@@ -1,19 +0,0 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Auth\Middleware\Authenticate as Middleware;
use Illuminate\Http\Request;
class Authenticate extends Middleware
{
/**
* Get the path the user should be redirected to when they are not authenticated.
*/
protected function redirectTo(Request $request): string
{
if (! $request->expectsJson()) {
return route('login');
}
}
}
-17
View File
@@ -1,17 +0,0 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Cookie\Middleware\EncryptCookies as Middleware;
class EncryptCookies extends Middleware
{
/**
* The names of the cookies that should not be encrypted.
*
* @var array
*/
protected $except = [
//
];
}
@@ -1,23 +0,0 @@
<?php
namespace App\Http\Middleware;
use Closure;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use Symfony\Component\HttpFoundation\Response;
class RedirectIfAuthenticated
{
/**
* Handle an incoming request.
*/
public function handle(Request $request, Closure $next, ?string $guard = null): Response
{
if (Auth::guard($guard)->check()) {
return redirect()->to('/');
}
return $next($request);
}
}
-18
View File
@@ -1,18 +0,0 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\TrimStrings as Middleware;
class TrimStrings extends Middleware
{
/**
* The names of the attributes that should not be trimmed.
*
* @var array
*/
protected $except = [
'password',
'password_confirmation',
];
}
-28
View File
@@ -1,28 +0,0 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Http\Middleware\TrustProxies as Middleware;
use Illuminate\Http\Request;
class TrustProxies extends Middleware
{
/**
* The trusted proxies for this application.
*
* @var array
*/
protected $proxies;
/**
* The headers that should be used to detect proxies.
*
* @var int
*/
protected $headers =
Request::HEADER_X_FORWARDED_FOR |
Request::HEADER_X_FORWARDED_HOST |
Request::HEADER_X_FORWARDED_PORT |
Request::HEADER_X_FORWARDED_PROTO |
Request::HEADER_X_FORWARDED_AWS_ELB;
}
-26
View File
@@ -1,26 +0,0 @@
<?php
namespace App\Http\Middleware;
use Illuminate\Foundation\Http\Middleware\VerifyCsrfToken as Middleware;
class VerifyCsrfToken extends Middleware
{
/**
* Indicates whether the XSRF-TOKEN cookie should be set on the response.
*
* @var bool
*/
protected $addHttpCookie = true;
/**
* The URIs that should be excluded from CSRF verification.
*
* @var array
*/
protected $except = [
'failed',
'admin/*',
'btcpay/webhook',
];
}
+20
View File
@@ -0,0 +1,20 @@
<?php
namespace App\Livewire\Actions;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\Session;
class Logout
{
/**
* Log the current user out of the application.
*/
public function __invoke(): void
{
Auth::guard('web')->logout();
Session::invalidate();
Session::regenerateToken();
}
}
+72
View File
@@ -0,0 +1,72 @@
<?php
namespace App\Livewire\Forms;
use Illuminate\Auth\Events\Lockout;
use Illuminate\Support\Facades\Auth;
use Illuminate\Support\Facades\RateLimiter;
use Illuminate\Support\Str;
use Illuminate\Validation\ValidationException;
use Livewire\Attributes\Validate;
use Livewire\Form;
class LoginForm extends Form
{
#[Validate('required|string|email')]
public string $email = '';
#[Validate('required|string')]
public string $password = '';
#[Validate('boolean')]
public bool $remember = false;
/**
* Attempt to authenticate the request's credentials.
*
* @throws \Illuminate\Validation\ValidationException
*/
public function authenticate(): void
{
$this->ensureIsNotRateLimited();
if (! Auth::attempt($this->only(['email', 'password']), $this->remember)) {
RateLimiter::hit($this->throttleKey());
throw ValidationException::withMessages([
'form.email' => trans('auth.failed'),
]);
}
RateLimiter::clear($this->throttleKey());
}
/**
* Ensure the authentication request is not rate limited.
*/
protected function ensureIsNotRateLimited(): void
{
if (! RateLimiter::tooManyAttempts($this->throttleKey(), 5)) {
return;
}
event(new Lockout(request()));
$seconds = RateLimiter::availableIn($this->throttleKey());
throw ValidationException::withMessages([
'form.email' => trans('auth.throttle', [
'seconds' => $seconds,
'minutes' => ceil($seconds / 60),
]),
]);
}
/**
* Get the authentication rate limiting throttle key.
*/
protected function throttleKey(): string
{
return Str::transliterate(Str::lower($this->email).'|'.request()->ip());
}
}
+4 -2
View File
@@ -3,6 +3,8 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
/**
* App\Models\AnidbEpisode.
@@ -54,12 +56,12 @@ class AnidbEpisode extends Model
*/
protected $guarded = [];
public function title()
public function title(): BelongsTo
{
return $this->belongsTo(AnidbTitle::class, 'anidbid');
}
public function info()
public function info(): HasMany
{
return $this->hasMany(AnidbInfo::class, 'anidbid');
}
+3 -2
View File
@@ -3,6 +3,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
/**
* App\Models\AnidbTitle.
@@ -52,12 +53,12 @@ class AnidbTitle extends Model
*/
protected $guarded = [];
public function episode()
public function episode(): HasMany
{
return $this->hasMany(AnidbEpisode::class, 'anidbid');
}
public function info()
public function info(): HasMany
{
return $this->hasMany(AnidbInfo::class, 'anidbid');
}
+3 -2
View File
@@ -3,6 +3,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
/**
* App\Models\DnzbFailure.
@@ -49,12 +50,12 @@ class DnzbFailure extends Model
*/
protected $guarded = [];
public function release()
public function release(): BelongsTo
{
return $this->belongsTo(Release::class, 'release_id');
}
public function user()
public function user(): BelongsTo
{
return $this->belongsTo(User::class, 'users_id');
}
+2 -1
View File
@@ -3,6 +3,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
/**
* App\Models\Genre.
@@ -41,7 +42,7 @@ class Genre extends Model
*/
protected $guarded = [];
public function music()
public function music(): HasMany
{
return $this->hasMany(MusicInfo::class, 'genres_id');
}
+2 -1
View File
@@ -3,6 +3,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
/**
* App\Models\Invitation.
@@ -47,7 +48,7 @@ class Invitation extends Model
*/
protected $guarded = ['id'];
public function user()
public function user(): BelongsTo
{
return $this->belongsTo(User::class, 'users_id');
}
+2 -1
View File
@@ -3,6 +3,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Laravel\Scout\Searchable;
/**
@@ -71,7 +72,7 @@ class MusicInfo extends Model
*/
protected $guarded = [];
public function genre()
public function genre(): BelongsTo
{
return $this->belongsTo(Genre::class, 'genres_id');
}
+3 -2
View File
@@ -7,6 +7,7 @@ use Blacklight\ConsoleTools;
use Blacklight\ElasticSearchSiteSearch;
use Blacklight\ManticoreSearch;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\HasMany;
use Illuminate\Support\Arr;
use Illuminate\Support\Facades\Cache;
use Laravel\Scout\Searchable;
@@ -89,12 +90,12 @@ class Predb extends Model
*/
protected $guarded = [];
public function hash()
public function hash(): HasMany
{
return $this->hasMany(PredbHash::class, 'predb_id');
}
public function release()
public function release(): HasMany
{
return $this->hasMany(Release::class, 'predb_id');
}
+1 -1
View File
@@ -180,7 +180,7 @@ class Release extends Model
return $this->hasMany(UsersRelease::class, 'releases_id');
}
public function file()
public function file(): HasMany
{
return $this->hasMany(ReleaseFile::class, 'releases_id');
}
+2 -1
View File
@@ -3,6 +3,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
/**
* App\Models\ReleaseNfo.
@@ -39,7 +40,7 @@ class ReleaseNfo extends Model
*/
protected $guarded = [];
public function release()
public function release(): BelongsTo
{
return $this->belongsTo(Release::class, 'releases_id');
}
+2 -1
View File
@@ -21,6 +21,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
/**
* App\Models\ReleasesGroups.
@@ -69,7 +70,7 @@ class ReleasesGroups extends Model
*/
protected $guarded = [];
public function release()
public function release(): BelongsTo
{
return $this->belongsTo(Release::class, 'releases_id');
}
+2 -1
View File
@@ -3,6 +3,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
use Illuminate\Database\Eloquent\Relations\HasMany;
/**
@@ -51,7 +52,7 @@ class TvEpisode extends Model
*/
public $timestamps = false;
public function video()
public function video(): BelongsTo
{
return $this->belongsTo(Video::class, 'videos_id');
}
+1 -1
View File
@@ -363,7 +363,7 @@ class User extends Authenticatable
foreach ($period as $value) {
$users = self::query()->whereDate('rolechangedate', '=', $value)->get();
$days = $now->diffInDays($value);
$days = $now->diffInDays($value, true);
foreach ($users as $user) {
SendAccountWillExpireEmail::dispatch($user, $days)->onQueue('emails');
}
+3 -2
View File
@@ -3,6 +3,7 @@
namespace App\Models;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Database\Eloquent\Relations\BelongsTo;
/**
* App\Models\UsersRelease.
@@ -39,12 +40,12 @@ class UsersRelease extends Model
*/
protected $guarded = ['id'];
public function user()
public function user(): BelongsTo
{
return $this->belongsTo(User::class, 'users_id');
}
public function release()
public function release(): BelongsTo
{
return $this->belongsTo(Release::class, 'releases_id');
}
+6
View File
@@ -2,6 +2,7 @@
namespace App\Policies;
use Illuminate\Foundation\Auth\User;
use TeamTeaTime\Forum\Models\Category;
class CategoryPolicy extends \TeamTeaTime\Forum\Policies\CategoryPolicy
@@ -63,4 +64,9 @@ class CategoryPolicy extends \TeamTeaTime\Forum\Policies\CategoryPolicy
{
return $user->hasRole('Admin');
}
public function edit(User $user, Category $category): bool
{
return $user->hasRole('Admin');
}
}
-24
View File
@@ -1,24 +0,0 @@
<?php
namespace App\Providers;
use Illuminate\Foundation\Support\Providers\AuthServiceProvider as ServiceProvider;
class AuthServiceProvider extends ServiceProvider
{
/**
* The policy mappings for the application.
*
* @var array
*/
protected $policies = [
//'App\Model' => 'App\Policies\ModelPolicy',
];
/**
* Register any authentication / authorization services.
*/
public function boot(): void
{
}
}
@@ -1,19 +0,0 @@
<?php
namespace App\Providers;
use Illuminate\Support\Facades\Broadcast;
use Illuminate\Support\ServiceProvider;
class BroadcastServiceProvider extends ServiceProvider
{
/**
* Bootstrap any application services.
*/
public function boot(): void
{
Broadcast::routes();
require base_path('routes/channels.php');
}
}
-43
View File
@@ -1,43 +0,0 @@
<?php
namespace App\Providers;
use App\Events\UserAccessedApi;
use App\Events\UserLoggedIn;
use App\Listeners\UpdateUserAccessedApi;
use App\Listeners\UpdateUserLoggedIn;
use Illuminate\Auth\Events\Registered;
use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
class EventServiceProvider extends ServiceProvider
{
/**
* The event listener mappings for the application.
*
* @var array
*/
protected $listen = [
Registered::class => [
SendEmailVerificationNotification::class,
],
UserLoggedIn::class => [
UpdateUserLoggedIn::class,
],
UserAccessedApi::class => [
UpdateUserAccessedApi::class,
],
];
/**
* Register any events for your application.
*/
public function boot(): void
{
parent::boot();
//
}
}
+28
View File
@@ -0,0 +1,28 @@
<?php
namespace App\Providers;
use Illuminate\Support\ServiceProvider;
use Livewire\Volt\Volt;
class VoltServiceProvider extends ServiceProvider
{
/**
* Register services.
*/
public function register(): void
{
//
}
/**
* Bootstrap services.
*/
public function boot(): void
{
Volt::mount([
config('livewire.view_path', resource_path('views/livewire')),
resource_path('views/pages'),
]);
}
}
+17
View File
@@ -0,0 +1,17 @@
<?php
namespace App\View\Components;
use Illuminate\View\Component;
use Illuminate\View\View;
class AppLayout extends Component
{
/**
* Get the view / contents that represents the component.
*/
public function render(): View
{
return view('layouts.app');
}
}
+17
View File
@@ -0,0 +1,17 @@
<?php
namespace App\View\Components;
use Illuminate\View\Component;
use Illuminate\View\View;
class GuestLayout extends Component
{
/**
* Get the view / contents that represents the component.
*/
public function render(): View
{
return view('layouts.guest');
}
}
+8 -46
View File
@@ -1,53 +1,15 @@
#!/usr/bin/env php
<?php
define('LARAVEL_START', microtime(true));
use Symfony\Component\Console\Input\ArgvInput;
/*
|--------------------------------------------------------------------------
| Register The Auto Loader
|--------------------------------------------------------------------------
|
| Composer provides a convenient, automatically generated class loader
| for our application. We just need to utilize it! We'll require it
| into the script here so that we do not have to worry about the
| loading of any of our classes manually. It's great to relax.
|
*/
define('LARAVEL_START', microtime(true));
require __DIR__.'/vendor/autoload.php';
// Register the Composer autoloader...
require __DIR__.'/vendor/autoload.php';
$app = require_once __DIR__.'/bootstrap/app.php';
// Bootstrap Laravel and handle the command...
$status = (require_once __DIR__.'/bootstrap/app.php')
->handleCommand(new ArgvInput);
/*
|--------------------------------------------------------------------------
| Run The Artisan Application
|--------------------------------------------------------------------------
|
| When we run the console application, the current CLI command will be
| executed in this console and the response sent back to a terminal
| or another output device for the developers. Here goes nothing!
|
*/
$kernel = $app->make(Illuminate\Contracts\Console\Kernel::class);
$status = $kernel->handle(
$input = new Symfony\Component\Console\Input\ArgvInput,
new Symfony\Component\Console\Output\ConsoleOutput
);
/*
|--------------------------------------------------------------------------
| Shutdown The Application
|--------------------------------------------------------------------------
|
| Once Artisan has finished running, we will fire off the shutdown events
| so that any final work may be done by the application before we shut
| down the process. This is the last thing to happen to the request.
|
*/
$kernel->terminate($input, $status);
exit($status);
exit($status);
+43 -47
View File
@@ -1,55 +1,51 @@
<?php
/*
|--------------------------------------------------------------------------
| Create The Application
|--------------------------------------------------------------------------
|
| The first thing we will do is create a new Laravel application instance
| which serves as the "glue" for all the components of Laravel, and is
| the IoC container for the system binding all of the various parts.
|
*/
use Illuminate\Foundation\Application;
use Illuminate\Foundation\Configuration\Exceptions;
use Illuminate\Foundation\Configuration\Middleware;
$app = new Illuminate\Foundation\Application(
$_ENV['APP_BASE_PATH'] ?? dirname(__DIR__)
);
return Application::configure(basePath: dirname(__DIR__))
->withProviders([
\Laravel\Tinker\TinkerServiceProvider::class,
\Jrean\UserVerification\UserVerificationServiceProvider::class,
])
->withRouting(
web: __DIR__.'/../routes/web.php',
api: __DIR__.'/../routes/api.php',
commands: __DIR__.'/../routes/console.php',
channels: __DIR__.'/../routes/channels.php',
health: '/up',
)
->withMiddleware(function (Middleware $middleware) {
$middleware->redirectGuestsTo(fn () => route('login'));
$middleware->redirectUsersTo('/');
/*
|--------------------------------------------------------------------------
| Bind Important Interfaces
|--------------------------------------------------------------------------
|
| Next, we need to bind some important interfaces into the container so
| we will be able to resolve them when needed. The kernels serve the
| incoming requests to this application from both the web and CLI.
|
*/
$middleware->validateCsrfTokens(except: [
'failed',
'admin/*',
'btcpay/webhook',
]);
$app->singleton(
Illuminate\Contracts\Http\Kernel::class,
App\Http\Kernel::class
);
$middleware->append([
\Illuminate\Foundation\Http\Middleware\CheckForMaintenanceMode::class,
\Monicahq\Cloudflare\Http\Middleware\TrustProxies::class,
\App\Http\Middleware\ForceJsonOnAPI::class,
]);
$app->singleton(
Illuminate\Contracts\Console\Kernel::class,
App\Console\Kernel::class
);
$middleware->web(\Illuminate\Session\Middleware\AuthenticateSession::class);
$app->singleton(
Illuminate\Contracts\Debug\ExceptionHandler::class,
App\Exceptions\Handler::class
);
$middleware->throttleApi('60,1');
/*
|--------------------------------------------------------------------------
| Return The Application
|--------------------------------------------------------------------------
|
| This script returns the application instance. The instance is given to
| the calling script so we can separate the building of the instances
| from the actual running of the application and sending responses.
|
*/
return $app;
$middleware->alias([
'2fa' => \App\Http\Middleware\Google2FAMiddleware::class,
'bindings' => \Illuminate\Routing\Middleware\SubstituteBindings::class,
'clearance' => \App\Http\Middleware\ClearanceMiddleware::class,
'isVerified' => \Jrean\UserVerification\Middleware\IsVerified::class,
'permission' => \Spatie\Permission\Middleware\PermissionMiddleware::class,
'role' => \Spatie\Permission\Middleware\RoleMiddleware::class,
'role_or_permission' => \Spatie\Permission\Middleware\RoleOrPermissionMiddleware::class,
]);
})
->withExceptions(function (Exceptions $exceptions) {
//
})->create();
+10
View File
@@ -0,0 +1,10 @@
<?php
return [
App\Providers\AppServiceProvider::class,
App\Providers\HorizonServiceProvider::class,
App\Providers\RouteServiceProvider::class,
App\Providers\TelescopeServiceProvider::class,
App\Providers\UserServiceProvider::class,
App\Providers\VoltServiceProvider::class,
];
+38 -31
View File
@@ -46,7 +46,7 @@
"anhskohbo/no-captcha": "dev-master",
"b3rs3rk/steamfront": "dev-master",
"bacon/bacon-qr-code": "^3.0",
"bhuvidya/laravel-countries": "^10.0",
"bhuvidya/laravel-countries": "dev-master",
"brick/math": "^0.11",
"canihavesomecoffee/thetvdbapi": "^2.0",
"dariusiii/php-itunes-api": "^1.0",
@@ -54,7 +54,7 @@
"dariusiii/tmdb-laravel": "^7.0",
"dborsatto/php-giantbomb": "^2.2",
"divineomega/php-cli-progress-bar": "^2.1",
"fakerphp/faker": "^1.12",
"fakerphp/faker": "^1.23",
"genealabs/laravel-caffeine": "^11.0",
"geoip2/geoip2": "^3.0",
"google/recaptcha": "^1.3",
@@ -62,71 +62,74 @@
"imdbphp/imdbphp": "^8.1",
"intervention/image": "^3.3",
"joshpinkney/tv-maze-php-api": "dev-master",
"jrean/laravel-user-verification": "^11.0",
"jrean/laravel-user-verification": "^12.0",
"junaidnasir/larainvite": "^7.0",
"kevinlebrun/colors.php": "^1.0",
"laravel/framework": "^10.45",
"laravel/framework": "^11.5",
"laravel/horizon": "^5.23",
"laravel/pulse": "^1.0@beta",
"laravel/sanctum": "^3.3",
"laravel/scout": "^10.0",
"laravel/pulse": "dev-validation-errors",
"laravel/sanctum": "^4.0",
"laravel/scout": "^10.8",
"laravel/telescope": "^5.0",
"laravel/tinker": "^2.8",
"laravel/tinker": "^2.9",
"laravel/ui": "^4.4",
"laravelcollective/html": "^6.4",
"league/climate": "^3.8",
"mailerlite/laravel-elasticsearch": "^11.0",
"livewire/livewire": "^3.4",
"livewire/volt": "^1.0",
"mailerlite/laravel-elasticsearch": "^11.1",
"manticoresoftware/manticoresearch-php": "^3.0",
"marcreichel/igdb-laravel": "^4.1",
"marcreichel/igdb-laravel": "^4.2",
"mhor/php-mediainfo": "^5.6",
"monicahq/laravel-cloudflare": "^3.5",
"monicahq/laravel-cloudflare": "^3.6",
"monolog/monolog": "^3.5",
"mtownsend/xml-to-array": "^2.0",
"nesbot/carbon": "^2.71",
"nesbot/carbon": "^3.3",
"opis/closure": "^3.6",
"pear/net_nntp": "^1.6.0",
"php-ffmpeg/php-ffmpeg": "^1.2",
"php-http/guzzle7-adapter": "^1.0",
"php-http/message": "^1.16",
"pragmarx/google2fa-laravel": "^2.1",
"pragmarx/google2fa-laravel": "^2.2",
"predis/predis": "^2.2",
"propaganistas/laravel-disposable-email": "^2.2",
"propaganistas/laravel-disposable-email": "^2.3",
"ramsey/uuid": "^4.7",
"riari/laravel-forum": "^5.6",
"sentry/sentry-laravel": "^4.2",
"riari/laravel-forum": "^6.0",
"sentry/sentry-laravel": "^4.3",
"smarty/smarty": "^4.3",
"spatie/async": "^1.6",
"spatie/laravel-backup": "^8.6",
"spatie/laravel-directory-cleanup": "^1.9",
"spatie/laravel-fractal": "^6.0",
"spatie/laravel-directory-cleanup": "^1.10",
"spatie/laravel-fractal": "^6.1",
"spatie/laravel-ignition": "^2.4",
"spatie/laravel-image-optimizer": "^1.7",
"spatie/laravel-image-optimizer": "^1.8",
"spatie/laravel-permission": "^6.3",
"sspat/es-query-sanitizer": "^1.0",
"stechstudio/laravel-zipstream": "^4.13",
"stechstudio/laravel-zipstream": "^4.14",
"symfony/http-client": "^7.0",
"symfony/postmark-mailer": "^7.0",
"symfony/process": "^6.0",
"symfony/process": "^7.0",
"vlucas/phpdotenv": "^5.6",
"voku/simple_html_dom": "^4.8",
"ytake/laravel-smarty": "^8.0"
},
"require-dev": {
"barryvdh/laravel-ide-helper": "^3.0",
"beyondcode/laravel-dump-server": "^1.9",
"captainhook/captainhook": "^5.1",
"captainhook/plugin-composer": "^5.1",
"beyondcode/laravel-dump-server": "^2.0",
"captainhook/captainhook": "^5.4",
"captainhook/plugin-composer": "^5.2",
"driftingly/rector-laravel": "^0.29",
"ergebnis/composer-normalize": "^2.30",
"friendsofphp/php-cs-fixer": "^3.49",
"jubeki/laravel-code-style": "^2.0",
"larastan/larastan": "^2.7",
"laravel/pint": "^1.6",
"laravel/sail": "^1.21",
"mockery/mockery": "^1.4.4",
"nunomaduro/collision": "^7.0",
"php-coveralls/php-coveralls": "^2.0",
"phpunit/phpunit": "^10.1",
"larastan/larastan": "^2.8",
"laravel/breeze": "^2.0",
"laravel/pint": "^1.13",
"laravel/sail": "^1.26",
"mockery/mockery": "^1.6",
"nunomaduro/collision": "^8.0",
"php-coveralls/php-coveralls": "^2.4",
"phpunit/phpunit": "^11.0",
"rector/rector": "^0.18.13"
},
"suggest": {
@@ -146,6 +149,10 @@
{
"type": "vcs",
"url": "https://github.com/DariusIII/html"
},
{
"type": "vcs",
"url": "https://github.com/DariusIII/laravel-user-verification"
}
],
"minimum-stability": "dev",
Generated
+864 -849
View File
File diff suppressed because it is too large Load Diff
+4 -216
View File
@@ -1,224 +1,12 @@
<?php
use Illuminate\Support\Facades\Facade;
return [
/*
|--------------------------------------------------------------------------
| Application Name
|--------------------------------------------------------------------------
|
| This value is the name of your application. This value is used when the
| framework needs to place the application's name in a notification or
| any other location as required by the application or its packages.
*/
'name' => env('APP_NAME', 'NNTmux'),
/*
|--------------------------------------------------------------------------
| Application Environment
|--------------------------------------------------------------------------
|
| This value determines the "environment" your application is currently
| running in. This may determine how you prefer to configure various
| services your application utilizes. Set this in your ".env" file.
|
*/
'env' => env('APP_ENV', 'production'),
/*
|--------------------------------------------------------------------------
| Application Debug Mode
|--------------------------------------------------------------------------
|
| When your application is in debug mode, detailed error messages with
| stack traces will be shown on every error that occurs within your
| application. If disabled, a simple generic error page is shown.
|
*/
'debug' => env('APP_DEBUG', false),
/*
|--------------------------------------------------------------------------
| Application URL
|--------------------------------------------------------------------------
|
| This URL is used by the console to properly generate URLs when using
| the Artisan command line tool. You should set this to the root of
| your application so that it is used when running Artisan tasks.
|
*/
'url' => env('APP_URL', 'http://localhost'),
'asset_url' => env('ASSET_URL', null),
/*
|--------------------------------------------------------------------------
| Application Timezone
|--------------------------------------------------------------------------
|
| Here you may specify the default timezone for your application, which
| will be used by the PHP date and date-time functions. We have gone
| ahead and set this to a sensible default for you out of the box.
|
*/
'timezone' => env('APP_TZ', 'UTC'),
/*
|--------------------------------------------------------------------------
| Application Locale Configuration
|--------------------------------------------------------------------------
|
| The application locale determines the default locale that will be used
| by the translation service provider. You are free to set this value
| to any of the locales which will be supported by the application.
|
*/
'locale' => 'en',
/*
|--------------------------------------------------------------------------
| Application Fallback Locale
|--------------------------------------------------------------------------
|
| The fallback locale determines the locale to use when the current one
| is not available. You may change the value to correspond to any of
| the language folders that are provided through your application.
|
*/
'fallback_locale' => 'en',
/*
|--------------------------------------------------------------------------
| Encryption Key
|--------------------------------------------------------------------------
|
| This key is used by the Illuminate encrypter service and should be set
| to a random, 32 character string, otherwise these encrypted strings
| will not be safe. Please do this before deploying an application!
|
*/
'key' => env('APP_KEY'),
'cipher' => 'AES-256-CBC',
/*
|--------------------------------------------------------------------------
| Autoloaded Service Providers
|--------------------------------------------------------------------------
|
| The service providers listed here will be automatically loaded on the
| request to your application. Feel free to add your own services to
| this array to grant expanded functionality to your applications.
|
*/
'providers' => [
/*
* Laravel Framework Service Providers...
*/
Illuminate\Auth\AuthServiceProvider::class,
Illuminate\Broadcasting\BroadcastServiceProvider::class,
Illuminate\Bus\BusServiceProvider::class,
Illuminate\Cache\CacheServiceProvider::class,
Illuminate\Foundation\Providers\ConsoleSupportServiceProvider::class,
Illuminate\Cookie\CookieServiceProvider::class,
Illuminate\Database\DatabaseServiceProvider::class,
Illuminate\Encryption\EncryptionServiceProvider::class,
Illuminate\Filesystem\FilesystemServiceProvider::class,
Illuminate\Foundation\Providers\FoundationServiceProvider::class,
Illuminate\Hashing\HashServiceProvider::class,
Illuminate\Mail\MailServiceProvider::class,
Illuminate\Notifications\NotificationServiceProvider::class,
Illuminate\Pagination\PaginationServiceProvider::class,
Illuminate\Pipeline\PipelineServiceProvider::class,
Illuminate\Queue\QueueServiceProvider::class,
Illuminate\Redis\RedisServiceProvider::class,
Illuminate\Auth\Passwords\PasswordResetServiceProvider::class,
Illuminate\Session\SessionServiceProvider::class,
Illuminate\Translation\TranslationServiceProvider::class,
Illuminate\Validation\ValidationServiceProvider::class,
Illuminate\View\ViewServiceProvider::class,
/*
* Package Service Providers...
*/
Laravel\Tinker\TinkerServiceProvider::class,
/*
* Application Service Providers...
*/
App\Providers\AppServiceProvider::class,
App\Providers\AuthServiceProvider::class,
// App\Providers\BroadcastServiceProvider::class,
App\Providers\EventServiceProvider::class,
App\Providers\HorizonServiceProvider::class,
App\Providers\TelescopeServiceProvider::class,
Jrean\UserVerification\UserVerificationServiceProvider::class,
App\Providers\RouteServiceProvider::class,
App\Providers\UserServiceProvider::class,
],
/*
|--------------------------------------------------------------------------
| Class Aliases
|--------------------------------------------------------------------------
|
| This array of class aliases will be registered when this application
| is started. However, feel free to register as many as you wish as
| the aliases are "lazy" loaded so they don't hinder performance.
|
*/
'aliases' => [
'App' => Illuminate\Support\Facades\App::class,
'Arr' => Illuminate\Support\Arr::class,
'Artisan' => Illuminate\Support\Facades\Artisan::class,
'Auth' => Illuminate\Support\Facades\Auth::class,
'Blade' => Illuminate\Support\Facades\Blade::class,
'Broadcast' => Illuminate\Support\Facades\Broadcast::class,
'Bus' => Illuminate\Support\Facades\Bus::class,
'Cache' => Illuminate\Support\Facades\Cache::class,
'Config' => Illuminate\Support\Facades\Config::class,
'Cookie' => Illuminate\Support\Facades\Cookie::class,
'Crypt' => Illuminate\Support\Facades\Crypt::class,
'DB' => Illuminate\Support\Facades\DB::class,
'Eloquent' => Illuminate\Database\Eloquent\Model::class,
'Event' => Illuminate\Support\Facades\Event::class,
'File' => Illuminate\Support\Facades\File::class,
'Gate' => Illuminate\Support\Facades\Gate::class,
'Hash' => Illuminate\Support\Facades\Hash::class,
'Http' => Illuminate\Support\Facades\Http::class,
'Js' => Illuminate\Support\Js::class,
'Lang' => Illuminate\Support\Facades\Lang::class,
'Log' => Illuminate\Support\Facades\Log::class,
'Mail' => Illuminate\Support\Facades\Mail::class,
'Notification' => Illuminate\Support\Facades\Notification::class,
'Password' => Illuminate\Support\Facades\Password::class,
'Queue' => Illuminate\Support\Facades\Queue::class,
'Redirect' => Illuminate\Support\Facades\Redirect::class,
'aliases' => Facade::defaultAliases()->merge([
'RedisManager' => Illuminate\Support\Facades\Redis::class,
'Request' => Illuminate\Support\Facades\Request::class,
'Response' => Illuminate\Support\Facades\Response::class,
'Route' => Illuminate\Support\Facades\Route::class,
'Schema' => Illuminate\Support\Facades\Schema::class,
'Session' => Illuminate\Support\Facades\Session::class,
'Storage' => Illuminate\Support\Facades\Storage::class,
'Str' => Illuminate\Support\Str::class,
'URL' => Illuminate\Support\Facades\URL::class,
'Validator' => Illuminate\Support\Facades\Validator::class,
'View' => Illuminate\Support\Facades\View::class,
'UserVerification' => Jrean\UserVerification\Facades\UserVerification::class,
],
])->toArray(),
];
+1 -90
View File
@@ -2,106 +2,17 @@
return [
/*
|--------------------------------------------------------------------------
| Authentication Defaults
|--------------------------------------------------------------------------
|
| This option controls the default authentication "guard" and password
| reset options for your application. You may change these defaults
| as required, but they're a perfect start for most applications.
|
*/
'defaults' => [
'guard' => 'web',
'passwords' => 'users',
],
/*
|--------------------------------------------------------------------------
| Authentication Guards
|--------------------------------------------------------------------------
|
| Next, you may define every authentication guard for your application.
| Of course, a great default configuration has been defined for you
| here which uses session storage and the Eloquent user provider.
|
| All authentication drivers have a user provider. This defines how the
| users are actually retrieved out of your database or other storage
| mechanisms used by this application to persist your user's data.
|
| Supported: "session", "token"
|
*/
'guards' => [
'web' => [
'driver' => 'session',
'provider' => 'users',
],
'api' => [
'driver' => 'token',
'provider' => 'users',
'hash' => false,
],
'rss' => [
'driver' => 'token',
'provider' => 'users',
],
],
/*
|--------------------------------------------------------------------------
| User Providers
|--------------------------------------------------------------------------
|
| All authentication drivers have a user provider. This defines how the
| users are actually retrieved out of your database or other storage
| mechanisms used by this application to persist your user's data.
|
| If you have multiple user tables or models you may configure multiple
| sources which represent each model / table. These sources may then
| be assigned to any extra authentication guards you have defined.
|
| Supported: "database", "eloquent"
|
*/
'providers' => [
'users' => [
'driver' => 'eloquent',
'model' => App\Models\User::class,
],
// 'users' => [
// 'driver' => 'database',
// 'table' => 'users',
// ],
],
/*
|--------------------------------------------------------------------------
| Resetting Passwords
|--------------------------------------------------------------------------
|
| You may specify multiple password reset configurations if you have more
| than one user table or model in the application and you want to have
| separate password reset settings based on the specific user types.
|
| The expire time is the number of minutes that the reset token should be
| considered valid. This security feature keeps tokens short-lived so
| they have less time to be guessed. You may change this as needed.
|
*/
'passwords' => [
'users' => [
'provider' => 'users',
'table' => 'password_resets',
'expire' => 60,
],
],
];
-58
View File
@@ -1,58 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Broadcaster
|--------------------------------------------------------------------------
|
| This option controls the default broadcaster that will be used by the
| framework when an event needs to be broadcast. You may set this to
| any of the connections defined in the "connections" array below.
|
| Supported: "pusher", "redis", "log", "null"
|
*/
'default' => env('BROADCAST_DRIVER', 'null'),
/*
|--------------------------------------------------------------------------
| Broadcast Connections
|--------------------------------------------------------------------------
|
| Here you may define all of the broadcast connections that will be used
| to broadcast events to other systems or over websockets. Samples of
| each available type of connection are provided inside this array.
|
*/
'connections' => [
'pusher' => [
'driver' => 'pusher',
'key' => env('PUSHER_APP_KEY'),
'secret' => env('PUSHER_APP_SECRET'),
'app_id' => env('PUSHER_APP_ID'),
'options' => [
//
],
],
'redis' => [
'driver' => 'redis',
'connection' => 'default',
],
'log' => [
'driver' => 'log',
],
'null' => [
'driver' => 'null',
],
],
];
-87
View File
@@ -1,87 +0,0 @@
<?php
use Illuminate\Support\Str;
return [
/*
|--------------------------------------------------------------------------
| Default Cache Store
|--------------------------------------------------------------------------
|
| This option controls the default cache connection that gets used while
| using this caching library. This connection is used when another is
| not explicitly specified when executing a given caching function.
|
| Supported: "apc", "array", "database", "file",
| "memcached", "redis", "dynamodb"
|
*/
'default' => env('CACHE_DRIVER', 'file'),
/*
|--------------------------------------------------------------------------
| Cache Stores
|--------------------------------------------------------------------------
|
| Here you may define all of the cache "stores" for your application as
| well as their drivers. You may even define multiple stores for the
| same cache driver to group types of items stored in your caches.
|
*/
'stores' => [
'apc' => [
'driver' => 'apc',
],
'array' => [
'driver' => 'array',
],
'database' => [
'driver' => 'database',
'table' => 'cache',
'connection' => null,
],
'file' => [
'driver' => 'file',
'path' => storage_path('framework/cache/data'),
],
'memcached' => [
'driver' => 'memcached',
'persistent_id' => env('MEMCACHED_PERSISTENT_ID'),
'sasl' => [
env('MEMCACHED_USERNAME'),
env('MEMCACHED_PASSWORD'),
],
'options' => [
// Memcached::OPT_CONNECT_TIMEOUT => 2000,
],
'servers' => [
[
'host' => env('MEMCACHED_HOST', '127.0.0.1'),
'port' => env('MEMCACHED_PORT', 11211),
'weight' => 100,
],
],
],
'redis' => [
'driver' => 'redis',
'connection' => 'cache',
],
'dynamodb' => [
'driver' => 'dynamodb',
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'region' => env('AWS_REGION', 'us-east-1'),
'table' => env('DYNAMODB_CACHE_TABLE', 'cache'),
],
],
/*
|--------------------------------------------------------------------------
| Cache Key Prefix
|--------------------------------------------------------------------------
|
| When utilizing a RAM based store such as APC or Memcached, there might
| be other applications utilizing the same cache. So, we'll specify a
| value to get prefixed to all our keys so we can avoid collisions.
|
*/
'prefix' => env('CACHE_PREFIX', Str::slug(env('APP_NAME', 'laravel'), '_').'_cache'),
];
+27 -55
View File
@@ -4,47 +4,10 @@ use Illuminate\Support\Str;
return [
/*
|--------------------------------------------------------------------------
| Default Database Connection Name
|--------------------------------------------------------------------------
|
| Here you may specify which of the database connections below you wish
| to use as your default connection for all database work. Of course
| you may use many connections at once using the Database library.
|
*/
'default' => env('DB_CONNECTION', 'mysql'),
/*
|--------------------------------------------------------------------------
| Database Connections
|--------------------------------------------------------------------------
|
| Here are each of the database connections setup for your application.
| Of course, examples of configuring each database platform that is
| supported by Laravel is shown below to make development simple.
|
|
| All database work in Laravel is done through the PHP PDO facilities
| so make sure you have the driver for your particular database of
| choice installed on your machine before you begin development.
|
*/
'connections' => [
'sqlite' => [
'driver' => 'sqlite',
'url' => env('DATABASE_URL'),
'database' => env('DB_DATABASE', database_path('database.sqlite')),
'prefix' => '',
],
'mysql' => [
'driver' => 'mysql',
'url' => env('DATABASE_URL'),
'url' => env('DB_URL'),
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'nntmux'),
@@ -63,7 +26,7 @@ return [
'pgsql' => [
'driver' => 'pgsql',
'url' => env('DATABASE_URL'),
'url' => env('DB_URL'),
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '5432'),
'database' => env('DB_DATABASE', 'nntmux'),
@@ -75,18 +38,6 @@ return [
'sslmode' => 'prefer',
],
'sqlsrv' => [
'driver' => 'sqlsrv',
'url' => env('DATABASE_URL'),
'host' => env('DB_HOST', 'localhost'),
'port' => env('DB_PORT', '1433'),
'database' => env('DB_DATABASE', 'nntmux'),
'username' => env('DB_USERNAME', 'nntmux'),
'password' => env('DB_PASSWORD', ''),
'charset' => 'utf8',
'prefix' => '',
],
'sphinx' => [
'driver' => 'mysql',
'host' => env('MANTICORESEARCH_HOST', '127.0.0.1'),
@@ -96,6 +47,24 @@ return [
'charset' => 'utf8',
],
'mariadb' => [
'driver' => 'mariadb',
'url' => env('DB_URL'),
'host' => env('DB_HOST', '127.0.0.1'),
'port' => env('DB_PORT', '3306'),
'database' => env('DB_DATABASE', 'nntmux'),
'username' => env('DB_USERNAME', 'nntmux'),
'password' => env('DB_PASSWORD', ''),
'unix_socket' => env('DB_SOCKET', ''),
'charset' => 'utf8',
'collation' => 'utf8_unicode_ci',
'strict' => false,
'engine' => 'InnoDB ROW_FORMAT=DYNAMIC',
'options' => extension_loaded('pdo_mysql') ? array_filter([
PDO::MYSQL_ATTR_SSL_CA => env('MYSQL_ATTR_SSL_CA'),
PDO::MYSQL_ATTR_LOCAL_INFILE => true,
]) : [],
],
],
/*
@@ -105,11 +74,14 @@ return [
|
| This table keeps track of all the migrations that have already run for
| your application. Using this information, we can determine which of
| the migrations on disk haven't actually been run in the database.
| the migrations on disk haven't actually been run on the database.
|
*/
'migrations' => 'migrations',
'migrations' => [
'table' => 'migrations',
'update_date_on_publish' => true,
],
/*
|--------------------------------------------------------------------------
@@ -117,8 +89,8 @@ return [
|--------------------------------------------------------------------------
|
| Redis is an open source, fast, and advanced key-value store that also
| provides a richer set of commands than a typical key-value systems
| such as APC or Memcached. Laravel makes it easy to dig right in.
| provides a richer body of commands than a typical key-value system
| such as Memcached. You may define your connection settings here.
|
*/
-61
View File
@@ -2,67 +2,6 @@
return [
/*
|--------------------------------------------------------------------------
| Default Filesystem Disk
|--------------------------------------------------------------------------
|
| Here you may specify the default filesystem disk that should be used
| by the framework. The "local" disk, as well as a variety of cloud
| based disks are available to your application. Just store away!
|
*/
'default' => env('FILESYSTEM_DRIVER', 'local'),
/*
|--------------------------------------------------------------------------
| Default Cloud Filesystem Disk
|--------------------------------------------------------------------------
|
| Many applications store files both locally and in the cloud. For this
| reason, you may specify a default "cloud" driver here. This driver
| will be bound as the Cloud disk implementation in the container.
|
*/
'cloud' => env('FILESYSTEM_CLOUD', 's3'),
/*
|--------------------------------------------------------------------------
| Filesystem Disks
|--------------------------------------------------------------------------
|
| Here you may configure as many filesystem "disks" as you wish, and you
| may even configure multiple disks of the same driver. Defaults have
| been setup for each driver as an example of the required options.
|
| Supported Drivers: "local", "ftp", "s3", "rackspace"
|
*/
'disks' => [
'local' => [
'driver' => 'local',
'root' => storage_path('app'),
],
'public' => [
'driver' => 'local',
'root' => storage_path('app/public'),
'url' => env('APP_URL').'/storage',
'visibility' => 'public',
],
's3' => [
'driver' => 's3',
'key' => env('AWS_KEY'),
'secret' => env('AWS_SECRET'),
'region' => env('AWS_REGION'),
'bucket' => env('AWS_BUCKET'),
],
],
];
+18 -18
View File
@@ -4,10 +4,10 @@ return [
/*
|--------------------------------------------------------------------------
| Enable/disable
| Enable/disable feature
|--------------------------------------------------------------------------
|
| Set to false if you want to effectively disable the API.
| Whether or not to enable the API feature.
|
*/
@@ -24,21 +24,6 @@ return [
'enable_search' => true,
/*
|--------------------------------------------------------------------------
| Resources
|--------------------------------------------------------------------------
|
| Override to return your own resources for API responses
|
*/
'resources' => [
'category' => TeamTeaTime\Forum\Http\Resources\CategoryResource::class,
'thread' => TeamTeaTime\Forum\Http\Resources\ThreadResource::class,
'post' => TeamTeaTime\Forum\Http\Resources\PostResource::class,
],
/*
|--------------------------------------------------------------------------
| Router
@@ -51,9 +36,24 @@ return [
'router' => [
'prefix' => '/forum/api',
'as' => 'forum.api.',
'namespace' => '\TeamTeaTime\Forum\Http\Controllers\Api',
'namespace' => '\\TeamTeaTime\\Forum\\Http\\Controllers\\Api',
'middleware' => ['api', 'auth:api'],
'auth_middleware' => ['auth:api'],
],
/*
|--------------------------------------------------------------------------
| Resources
|--------------------------------------------------------------------------
|
| Override to return your own resources for API responses.
|
*/
'resources' => [
'category' => TeamTeaTime\Forum\Http\Resources\CategoryResource::class,
'thread' => TeamTeaTime\Forum\Http\Resources\ThreadResource::class,
'post' => TeamTeaTime\Forum\Http\Resources\PostResource::class,
],
];
@@ -4,28 +4,39 @@ return [
/*
|--------------------------------------------------------------------------
| Enable/disable
| Enable/disable feature
|--------------------------------------------------------------------------
|
| Set to false if you want to effectively disable the frontend.
| Whether or not to enable the frontend feature.
|
*/
'enable' => true,
/*
|--------------------------------------------------------------------------
| Preset
|--------------------------------------------------------------------------
|
| The frontend preset to use. Must be installed with the
| forum:preset-install command.
|
*/
'preset' => 'livewire-tailwind',
/*
|--------------------------------------------------------------------------
| Router
|--------------------------------------------------------------------------
|
| Web router config.
| Router config for the frontend routes.
|
*/
'router' => [
'prefix' => '/forum',
'as' => 'forum.',
'namespace' => '\TeamTeaTime\Forum\Http\Controllers\Web',
'middleware' => ['web'],
'auth_middleware' => ['auth'],
],
@@ -35,7 +46,7 @@ return [
| Route Prefixes
|--------------------------------------------------------------------------
|
| Prefixes to use for each model.
| Prefixes to use for each model in frontend routes.
|
*/
@@ -61,11 +72,11 @@ return [
| Utility Class
|--------------------------------------------------------------------------
|
| Here we specify the class to use for various web utility methods.
| Here we specify the class to use for various frontend utility methods.
| This is automatically aliased to 'Forum' for ease of use in views.
|
*/
'utility_class' => TeamTeaTime\Forum\Support\Web\Forum::class,
'utility_class' => TeamTeaTime\Forum\Support\Frontend\Forum::class,
];
@@ -16,7 +16,7 @@ return [
|
*/
'old_thread_threshold' => '30 days',
'old_thread_threshold' => '7 days',
/*
|--------------------------------------------------------------------------
@@ -16,8 +16,8 @@ return [
'forum' => App\Policies\ForumPolicy::class,
'model' => [
TeamTeaTime\Forum\Models\Category::class => \App\Policies\CategoryPolicy::class,
TeamTeaTime\Forum\Models\Thread::class => TeamTeaTime\Forum\Policies\ThreadPolicy::class,
TeamTeaTime\Forum\Models\Post::class => TeamTeaTime\Forum\Policies\PostPolicy::class,
TeamTeaTime\Forum\Models\Thread::class => \TeamTeaTime\Forum\Policies\ThreadPolicy::class,
TeamTeaTime\Forum\Models\Post::class => \TeamTeaTime\Forum\Policies\PostPolicy::class,
],
],
-24
View File
@@ -1,24 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| MyceliumGear authorization configuration
|--------------------------------------------------------------------------
*/
'gateway_id' => env('MYCELIUM_GATEWAY_ID', ''),
'gateway_secret' => env('MYCELIUM_GATEWAY_SECRET', ''),
/*
|--------------------------------------------------------------------------
| Default configuration
|--------------------------------------------------------------------------
|
| Define default callback data that will be used before any custom data are set
*/
'defaults' => [
'callback_data' => [
//'foo' => 'bar'
],
],
];
+27 -5
View File
@@ -1,6 +1,7 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Hash Driver
@@ -13,7 +14,9 @@ return [
| Supported: "bcrypt", "argon", "argon2id"
|
*/
'driver' => env('PASSWORD_HASH', 'argon'),
'driver' => env('HASH_DRIVER', 'bcrypt'),
/*
|--------------------------------------------------------------------------
| Bcrypt Options
@@ -24,9 +27,12 @@ return [
| to control the amount of time it takes to hash the given password.
|
*/
'bcrypt' => [
'rounds' => env('BCRYPT_ROUNDS', 10),
'rounds' => env('BCRYPT_ROUNDS', 12),
'verify' => env('HASH_VERIFY', true),
],
/*
|--------------------------------------------------------------------------
| Argon Options
@@ -37,9 +43,25 @@ return [
| to control the amount of time it takes to hash the given password.
|
*/
'argon' => [
'memory' => 1024,
'threads' => 2,
'time' => 2,
'memory' => env('ARGON_MEMORY', 65536),
'threads' => env('ARGON_THREADS', 1),
'time' => env('ARGON_TIME', 4),
'verify' => env('HASH_VERIFY', true),
],
/*
|--------------------------------------------------------------------------
| Rehash On Login
|--------------------------------------------------------------------------
|
| Setting this option to true will tell Laravel to automatically rehash
| the user's password during login if the configured work factor for
| the algorithm has changed, allowing graceful upgrades of hashes.
|
*/
'rehash_on_login' => true,
];
+4 -61
View File
@@ -1,35 +1,6 @@
<?php
use Monolog\Handler\StreamHandler;
use Monolog\Handler\SyslogUdpHandler;
return [
/*
|--------------------------------------------------------------------------
| Default Log Channel
|--------------------------------------------------------------------------
|
| This option defines the default log channel that gets used when writing
| messages to the logs. The name specified in this option should match
| one of the channels defined in the "channels" configuration array.
|
*/
'default' => env('LOG_CHANNEL', 'stack'),
/*
|--------------------------------------------------------------------------
| Log Channels
|--------------------------------------------------------------------------
|
| Here you may configure the log channels for your application. Out of
| the box, Laravel uses the Monolog PHP logging library. This gives
| you a variety of powerful log handlers / formatters to utilize.
|
| Available Drivers: "single", "daily", "slack", "syslog",
| "errorlog", "monolog",
| "custom", "stack"
|
*/
'channels' => [
'stack' => [
@@ -38,6 +9,7 @@ return [
'channels' => ['daily', 'flare'],
'ignore_exceptions' => false,
],
'single' => [
'driver' => 'single',
'path' => storage_path('logs/laravel.log'),
@@ -46,6 +18,7 @@ return [
'permission' => 0775,
'locking' => false,
],
'daily' => [
'driver' => 'daily',
'path' => storage_path('logs/laravel.log'),
@@ -55,40 +28,10 @@ return [
'permission' => 0775,
'locking' => false,
],
'slack' => [
'driver' => 'slack',
'url' => env('LOG_SLACK_WEBHOOK_URL'),
'username' => 'Laravel Log',
'emoji' => ':boom:',
'level' => 'critical',
],
'papertrail' => [
'driver' => 'monolog',
'level' => 'debug',
'handler' => SyslogUdpHandler::class,
'handler_with' => [
'host' => env('PAPERTRAIL_URL'),
'port' => env('PAPERTRAIL_PORT'),
],
],
'stderr' => [
'driver' => 'monolog',
'handler' => StreamHandler::class,
'formatter' => env('LOG_STDERR_FORMATTER'),
'with' => [
'stream' => 'php://stderr',
],
],
'syslog' => [
'driver' => 'syslog',
'level' => 'debug',
],
'errorlog' => [
'driver' => 'errorlog',
'level' => 'debug',
],
'flare' => [
'driver' => 'flare',
],
],
];
-104
View File
@@ -2,122 +2,18 @@
return [
/*
|--------------------------------------------------------------------------
| Mail Driver
|--------------------------------------------------------------------------
|
| Laravel supports both SMTP and PHP's "mail" function as drivers for the
| sending of e-mail. You may specify which one you're using throughout
| your application here. By default, Laravel is setup for SMTP mail.
|
| Supported: "smtp", "sendmail", "mailgun", "mandrill", "ses",
| "sparkpost", "postmark", "log", "array"
|
*/
'driver' => env('MAIL_DRIVER', 'smtp'),
/*
|--------------------------------------------------------------------------
| SMTP Host Address
|--------------------------------------------------------------------------
|
| Here you may provide the host address of the SMTP server used by your
| applications. A default option is provided that is compatible with
| the Mailgun mail service which will provide reliable deliveries.
|
*/
'host' => env('MAIL_HOST', 'smtp.mailgun.org'),
/*
|--------------------------------------------------------------------------
| SMTP Host Port
|--------------------------------------------------------------------------
|
| This is the SMTP port used by your application to deliver e-mails to
| users of the application. Like the host we have set this value to
| stay compatible with the Mailgun e-mail application by default.
|
*/
'port' => env('MAIL_PORT', 587),
/*
|--------------------------------------------------------------------------
| Global "From" Address
|--------------------------------------------------------------------------
|
| You may wish for all e-mails sent by your application to be sent from
| the same address. Here, you may specify a name and address that is
| used globally for all e-mails that are sent by your application.
|
*/
'from' => [
'address' => env('MAIL_FROM_ADDRESS', 'hello@example.com'),
'name' => env('MAIL_FROM_NAME', 'Example'),
],
/*
|--------------------------------------------------------------------------
| E-Mail Encryption Protocol
|--------------------------------------------------------------------------
|
| Here you may specify the encryption protocol that should be used when
| the application send e-mail messages. A sensible default using the
| transport layer security protocol should provide great security.
|
*/
'encryption' => env('MAIL_ENCRYPTION', 'tls'),
/*
|--------------------------------------------------------------------------
| SMTP Server Username
|--------------------------------------------------------------------------
|
| If your SMTP server requires a username for authentication, you should
| set it here. This will get used to authenticate with your server on
| connection. You may also set the "password" value below this one.
|
*/
'username' => env('MAIL_USERNAME'),
'password' => env('MAIL_PASSWORD'),
/*
|--------------------------------------------------------------------------
| Sendmail System Path
|--------------------------------------------------------------------------
|
| When using the "sendmail" driver to send e-mails, we will need to know
| the path to where Sendmail lives on this server. A default path has
| been provided here, which will work well on most of your systems.
|
*/
'sendmail' => '/usr/sbin/sendmail -bs',
/*
|--------------------------------------------------------------------------
| Markdown Mail Settings
|--------------------------------------------------------------------------
|
| If you are using Markdown based email rendering, you may configure your
| theme and component paths here, allowing you to customize the design
| of the emails. Or, you may simply stick with the Laravel defaults!
|
*/
'markdown' => [
'theme' => 'default',
'paths' => [
resource_path('views/vendor/mail'),
],
],
];
+3 -3
View File
@@ -8,9 +8,9 @@ return [
'echocli' => env('ECHOCLI', true),
'rename_par2' => env('RENAME_PAR2', true),
'rename_music_mediainfo' => env('RENAME_MUSIC_MEDIAINFO', true),
'cache_expiry_short' => env('CACHE_EXPIRY_SHORT', 5),
'cache_expiry_medium' => env('CACHE_EXPIRY_MEDIUM', 10),
'cache_expiry_long' => env('CACHE_EXPIRY_LONG', 15),
'cache_expiry_short' => (int) env('CACHE_EXPIRY_SHORT', 5),
'cache_expiry_medium' => (int) env('CACHE_EXPIRY_MEDIUM', 10),
'cache_expiry_long' => (int) env('CACHE_EXPIRY_LONG', 15),
'admin_username' => env('ADMIN_USER', 'admin'),
'admin_password' => env('ADMIN_PASS', 'admin'),
'admin_email' => env('ADMIN_EMAIL', 'admin@example.com'),
-79
View File
@@ -1,79 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Default Queue Driver
|--------------------------------------------------------------------------
|
| Laravel's queue API supports an assortment of back-ends via a single
| API, giving you convenient access to each back-end using the same
| syntax for each one. Here you may set the default queue driver.
|
| Supported: "sync", "database", "beanstalkd", "sqs", "redis", "null"
|
*/
'default' => env('QUEUE_CONNECTION', 'sync'),
/*
|--------------------------------------------------------------------------
| Queue Connections
|--------------------------------------------------------------------------
|
| Here you may configure the connection information for each server that
| is used by your application. A default configuration has been added
| for each back-end shipped with Laravel. You are free to add more.
|
*/
'connections' => [
'sync' => [
'driver' => 'sync',
],
'database' => [
'driver' => 'database',
'table' => 'jobs',
'queue' => 'default',
'retry_after' => 90,
],
'beanstalkd' => [
'driver' => 'beanstalkd',
'host' => 'localhost',
'queue' => 'default',
'retry_after' => 90,
'block_for' => 0,
],
'sqs' => [
'driver' => 'sqs',
'key' => env('AWS_ACCESS_KEY_ID'),
'secret' => env('AWS_SECRET_ACCESS_KEY'),
'prefix' => env('SQS_PREFIX', 'https://sqs.us-east-1.amazonaws.com/your-account-id'),
'queue' => env('SQS_QUEUE', 'your-queue-name'),
'region' => env('AWS_REGION', 'us-east-1'),
],
'redis' => [
'driver' => 'redis',
'connection' => 'default',
'queue' => env('REDIS_QUEUE', 'default'),
'retry_after' => 90,
'block_for' => null,
],
],
/*
|--------------------------------------------------------------------------
| Failed Queue Jobs
|--------------------------------------------------------------------------
|
| These options configure the behavior of failed queue job logging so you
| can control which database and table are used to store the jobs that
| have failed. You may change them to any database / table you wish.
|
*/
'failed' => [
'database' => env('DB_CONNECTION', 'mysql'),
'table' => 'failed_jobs',
],
];
-22
View File
@@ -2,34 +2,12 @@
return [
/*
|--------------------------------------------------------------------------
| Third Party Services
|--------------------------------------------------------------------------
|
| This file is for storing the credentials for third party services such
| as Stripe, Mailgun, SparkPost and others. This file provides a sane
| default location for this type of information, allowing packages
| to have a conventional place to find your various credentials.
|
*/
'mailgun' => [
'domain' => env('MAILGUN_DOMAIN'),
'secret' => env('MAILGUN_SECRET'),
'endpoint' => env('MAILGUN_ENDPOINT', 'api.mailgun.net'),
],
'postmark' => [
'token' => env('POSTMARK_TOKEN'),
],
'ses' => [
'key' => env('SES_KEY'),
'secret' => env('SES_SECRET'),
'region' => env('SES_REGION', 'us-east-1'),
],
'sparkpost' => [
'secret' => env('SPARKPOST_SECRET'),
],
-196
View File
@@ -1,196 +0,0 @@
<?php
use Illuminate\Support\Str;
return [
/*
|--------------------------------------------------------------------------
| Default Session Driver
|--------------------------------------------------------------------------
|
| This option controls the default session "driver" that will be used on
| requests. By default, we will use the lightweight native driver but
| you may specify any of the other wonderful drivers provided here.
|
| Supported: "file", "cookie", "database", "apc",
| "memcached", "redis", "dynamodb", "array"
|
*/
'driver' => env('SESSION_DRIVER', 'cookie'),
/*
|--------------------------------------------------------------------------
| Session Lifetime
|--------------------------------------------------------------------------
|
| Here you may specify the number of minutes that you wish the session
| to be allowed to remain idle before it expires. If you want them
| to immediately expire on the browser closing, set that option.
|
*/
'lifetime' => 120,
'expire_on_close' => false,
/*
|--------------------------------------------------------------------------
| Session Encryption
|--------------------------------------------------------------------------
|
| This option allows you to easily specify that all of your session data
| should be encrypted before it is stored. All encryption will be run
| automatically by Laravel and you can use the Session like normal.
|
*/
'encrypt' => env('SESSION_ENCRYPT', false),
/*
|--------------------------------------------------------------------------
| Session File Location
|--------------------------------------------------------------------------
|
| When using the native session driver, we need a location where session
| files may be stored. A default has been set for you but a different
| location may be specified. This is only needed for file sessions.
|
*/
'files' => storage_path('framework/sessions'),
/*
|--------------------------------------------------------------------------
| Session Database Connection
|--------------------------------------------------------------------------
|
| When using the "database" or "redis" session drivers, you may specify a
| connection that should be used to manage these sessions. This should
| correspond to a connection in your database configuration options.
|
*/
'connection' => 'session',
/*
|--------------------------------------------------------------------------
| Session Database Table
|--------------------------------------------------------------------------
|
| When using the "database" session driver, you may specify the table we
| should use to manage the sessions. Of course, a sensible default is
| provided for you; however, you are free to change this as needed.
|
*/
'table' => 'sessions',
/*
|--------------------------------------------------------------------------
| Session Cache Store
|--------------------------------------------------------------------------
|
| When using the "apc", "memcached", or "dynamodb" session drivers you may
| list a cache store that should be used for these sessions. This value
| must match with one of the application's configured cache "stores".
|
*/
'store' => env('SESSION_STORE', null),
/*
|--------------------------------------------------------------------------
| Session Sweeping Lottery
|--------------------------------------------------------------------------
|
| Some session drivers must manually sweep their storage location to get
| rid of old sessions from storage. Here are the chances that it will
| happen on a given request. By default, the odds are 2 out of 100.
|
*/
'lottery' => [2, 100],
/*
|--------------------------------------------------------------------------
| Session Cookie Name
|--------------------------------------------------------------------------
|
| Here you may change the name of the cookie used to identify a session
| instance by ID. The name specified here will get used every time a
| new session cookie is created by the framework for every driver.
|
*/
'cookie' => env(
'SESSION_COOKIE',
Str::slug(env('APP_NAME', 'laravel'), '_').'_session'
),
/*
|--------------------------------------------------------------------------
| Session Cookie Path
|--------------------------------------------------------------------------
|
| The session cookie path determines the path for which the cookie will
| be regarded as available. Typically, this will be the root path of
| your application but you are free to change this when necessary.
|
*/
'path' => '/',
/*
|--------------------------------------------------------------------------
| Session Cookie Domain
|--------------------------------------------------------------------------
|
| Here you may change the domain of the cookie used to identify a session
| in your application. This will determine which domains the cookie is
| available to in your application. A sensible default has been set.
|
*/
'domain' => env('SESSION_DOMAIN', null),
/*
|--------------------------------------------------------------------------
| HTTPS Only Cookies
|--------------------------------------------------------------------------
|
| By setting this option to true, session cookies will only be sent back
| to the server if the browser has a HTTPS connection. This will keep
| the cookie from being sent to you if it can not be done securely.
|
*/
'secure' => env('SESSION_SECURE_COOKIE', false),
/*
|--------------------------------------------------------------------------
| HTTP Access Only
|--------------------------------------------------------------------------
|
| Setting this value to true will prevent JavaScript from accessing the
| value of the cookie and the cookie will only be accessible through
| the HTTP protocol. You are free to modify this option if needed.
|
*/
'http_only' => false,
/*
|--------------------------------------------------------------------------
| Same-Site Cookies
|--------------------------------------------------------------------------
|
| This option determines how your cookies behave when cross-site requests
| take place, and can be used to mitigate CSRF attacks. By default, we
| do not enable this as other CSRF protection services are in place.
|
| Supported: "lax", "strict", "none"
|
*/
'same_site' => null,
];
-36
View File
@@ -1,36 +0,0 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| View Storage Paths
|--------------------------------------------------------------------------
|
| Most templating systems load templates from disk. Here you may specify
| an array of paths that should be checked for your views. Of course
| the usual Laravel view path has already been registered for you.
|
*/
'paths' => [
resource_path('views'),
],
/*
|--------------------------------------------------------------------------
| Compiled View Path
|--------------------------------------------------------------------------
|
| This option determines where all the compiled Blade templates will be
| stored for your application. Typically, this is within the storage
| directory. However, as usual, you are free to change this value.
|
*/
'compiled' => env(
'VIEW_COMPILED_PATH',
realpath(storage_path('framework/views'))
),
];
+2 -2
View File
@@ -20,8 +20,8 @@ $factory->define(App\User::class, function (Faker\Generator $faker) {
static $password;
return [
'name' => $faker->name,
'email' => $faker->unique()->safeEmail,
'name' => $faker->name(),
'email' => $faker->unique()->safeEmail(),
'password' => $password ?: $password = bcrypt('secret'),
'remember_token' => Str::random(10),
];
+1 -9
View File
@@ -2,25 +2,17 @@
namespace Database\Factories;
use App\Models\Release;
use Illuminate\Database\Eloquent\Factories\Factory;
class ReleaseFactory extends Factory
{
/**
* The name of the factory's corresponding model.
*
* @var string
*/
protected $model = Release::class;
/**
* Define the model's default state.
*/
public function definition(): array
{
return [
'name' => $this->faker->name,
'name' => $this->faker->name(),
'searchname' => $this->faker->unique()->name(),
'fromname' => $this->faker->unique()->safeEmail(),
'postdate' => $this->faker->date(),
@@ -0,0 +1,30 @@
<?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('forum_categories', function (Blueprint $table) {
$table->renameColumn('color', 'color_light_mode');
$table->string('color_dark_mode')->nullable();
});
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::table('forum_categories', function (Blueprint $table) {
$table->renameColumn('color_light_mode', 'color');
$table->dropColumn('color_dark_mode');
});
}
};
@@ -0,0 +1,34 @@
<?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
{
// Check if table exists
if (! Schema::hasTable('media_infos')) {
Schema::create('media_infos', function (Blueprint $table) {
$table->id();
$table->bigInteger('releases_id')->unsigned();
$table->string('movie_name')->nullable();
$table->string('file_name')->nullable();
$table->string('unique_id')->nullable();
$table->timestamps();
});
}
}
/**
* Reverse the migrations.
*/
public function down(): void
{
Schema::dropIfExists('media_infos');
}
};
+5 -5
View File
@@ -13,7 +13,7 @@ services:
- '${APP_PORT:-80}:80'
- '${VITE_PORT:-5173}:${VITE_PORT:-5173}'
environment:
TZ: ${APP_TZ}
TZ: ${APP_TIMEZONE}
COMPOSER_AUTH: ${COMPOSER_AUTH}
WWWUSER: '${WWWUSER}'
LARAVEL_SAIL: 1
@@ -33,7 +33,7 @@ services:
ports:
- '${FORWARD_DB_PORT:-3306}:3306'
environment:
TZ: ${APP_TZ}
TZ: ${APP_TIMEZONE}
MYSQL_ROOT_PASSWORD: '${DB_PASSWORD}'
MYSQL_ROOT_HOST: '%'
MYSQL_DATABASE: '${DB_DATABASE}'
@@ -62,7 +62,7 @@ services:
ports:
- '${FORWARD_REDIS_PORT:-6379}:6379'
environment:
TZ: ${APP_TZ}
TZ: ${APP_TIMEZONE}
volumes:
- 'sail-redis:/data'
networks:
@@ -84,7 +84,7 @@ services:
manticore:
image: manticoresearch/manticore
environment:
TZ: ${APP_TZ}
TZ: ${APP_TIMEZONE}
EXTRA: 1 # Activates extra features
restart: always
ports:
@@ -106,7 +106,7 @@ services:
elasticsearch:
image: docker.elastic.co/elasticsearch/elasticsearch:8.6.2
environment:
- TZ=${APP_TZ}
- TZ=${APP_TIMEZONE}
- discovery.type=single-node
- xpack.security.enabled=false
- "ES_JAVA_OPTS=-Xms512m -Xmx512m"
+192
View File
@@ -0,0 +1,192 @@
<?php
return [
/*
|--------------------------------------------------------------------------
| Validation Language Lines
|--------------------------------------------------------------------------
|
| The following language lines contain the default error messages used by
| the validator class. Some of these rules have multiple versions such
| as the size rules. Feel free to tweak each of these messages here.
|
*/
'accepted' => 'The :attribute field must be accepted.',
'accepted_if' => 'The :attribute field must be accepted when :other is :value.',
'active_url' => 'The :attribute field must be a valid URL.',
'after' => 'The :attribute field must be a date after :date.',
'after_or_equal' => 'The :attribute field must be a date after or equal to :date.',
'alpha' => 'The :attribute field must only contain letters.',
'alpha_dash' => 'The :attribute field must only contain letters, numbers, dashes, and underscores.',
'alpha_num' => 'The :attribute field must only contain letters and numbers.',
'array' => 'The :attribute field must be an array.',
'ascii' => 'The :attribute field must only contain single-byte alphanumeric characters and symbols.',
'before' => 'The :attribute field must be a date before :date.',
'before_or_equal' => 'The :attribute field must be a date before or equal to :date.',
'between' => [
'array' => 'The :attribute field must have between :min and :max items.',
'file' => 'The :attribute field must be between :min and :max kilobytes.',
'numeric' => 'The :attribute field must be between :min and :max.',
'string' => 'The :attribute field must be between :min and :max characters.',
],
'boolean' => 'The :attribute field must be true or false.',
'can' => 'The :attribute field contains an unauthorized value.',
'confirmed' => 'The :attribute field confirmation does not match.',
'current_password' => 'The password is incorrect.',
'date' => 'The :attribute field must be a valid date.',
'date_equals' => 'The :attribute field must be a date equal to :date.',
'date_format' => 'The :attribute field must match the format :format.',
'decimal' => 'The :attribute field must have :decimal decimal places.',
'declined' => 'The :attribute field must be declined.',
'declined_if' => 'The :attribute field must be declined when :other is :value.',
'different' => 'The :attribute field and :other must be different.',
'digits' => 'The :attribute field must be :digits digits.',
'digits_between' => 'The :attribute field must be between :min and :max digits.',
'dimensions' => 'The :attribute field has invalid image dimensions.',
'distinct' => 'The :attribute field has a duplicate value.',
'doesnt_end_with' => 'The :attribute field must not end with one of the following: :values.',
'doesnt_start_with' => 'The :attribute field must not start with one of the following: :values.',
'email' => 'The :attribute field must be a valid email address.',
'ends_with' => 'The :attribute field must end with one of the following: :values.',
'enum' => 'The selected :attribute is invalid.',
'exists' => 'The selected :attribute is invalid.',
'extensions' => 'The :attribute field must have one of the following extensions: :values.',
'file' => 'The :attribute field must be a file.',
'filled' => 'The :attribute field must have a value.',
'gt' => [
'array' => 'The :attribute field must have more than :value items.',
'file' => 'The :attribute field must be greater than :value kilobytes.',
'numeric' => 'The :attribute field must be greater than :value.',
'string' => 'The :attribute field must be greater than :value characters.',
],
'gte' => [
'array' => 'The :attribute field must have :value items or more.',
'file' => 'The :attribute field must be greater than or equal to :value kilobytes.',
'numeric' => 'The :attribute field must be greater than or equal to :value.',
'string' => 'The :attribute field must be greater than or equal to :value characters.',
],
'hex_color' => 'The :attribute field must be a valid hexadecimal color.',
'image' => 'The :attribute field must be an image.',
'in' => 'The selected :attribute is invalid.',
'in_array' => 'The :attribute field must exist in :other.',
'integer' => 'The :attribute field must be an integer.',
'ip' => 'The :attribute field must be a valid IP address.',
'ipv4' => 'The :attribute field must be a valid IPv4 address.',
'ipv6' => 'The :attribute field must be a valid IPv6 address.',
'json' => 'The :attribute field must be a valid JSON string.',
'list' => 'The :attribute field must be a list.',
'lowercase' => 'The :attribute field must be lowercase.',
'lt' => [
'array' => 'The :attribute field must have less than :value items.',
'file' => 'The :attribute field must be less than :value kilobytes.',
'numeric' => 'The :attribute field must be less than :value.',
'string' => 'The :attribute field must be less than :value characters.',
],
'lte' => [
'array' => 'The :attribute field must not have more than :value items.',
'file' => 'The :attribute field must be less than or equal to :value kilobytes.',
'numeric' => 'The :attribute field must be less than or equal to :value.',
'string' => 'The :attribute field must be less than or equal to :value characters.',
],
'mac_address' => 'The :attribute field must be a valid MAC address.',
'max' => [
'array' => 'The :attribute field must not have more than :max items.',
'file' => 'The :attribute field must not be greater than :max kilobytes.',
'numeric' => 'The :attribute field must not be greater than :max.',
'string' => 'The :attribute field must not be greater than :max characters.',
],
'max_digits' => 'The :attribute field must not have more than :max digits.',
'mimes' => 'The :attribute field must be a file of type: :values.',
'mimetypes' => 'The :attribute field must be a file of type: :values.',
'min' => [
'array' => 'The :attribute field must have at least :min items.',
'file' => 'The :attribute field must be at least :min kilobytes.',
'numeric' => 'The :attribute field must be at least :min.',
'string' => 'The :attribute field must be at least :min characters.',
],
'min_digits' => 'The :attribute field must have at least :min digits.',
'missing' => 'The :attribute field must be missing.',
'missing_if' => 'The :attribute field must be missing when :other is :value.',
'missing_unless' => 'The :attribute field must be missing unless :other is :value.',
'missing_with' => 'The :attribute field must be missing when :values is present.',
'missing_with_all' => 'The :attribute field must be missing when :values are present.',
'multiple_of' => 'The :attribute field must be a multiple of :value.',
'not_in' => 'The selected :attribute is invalid.',
'not_regex' => 'The :attribute field format is invalid.',
'numeric' => 'The :attribute field must be a number.',
'password' => [
'letters' => 'The :attribute field must contain at least one letter.',
'mixed' => 'The :attribute field must contain at least one uppercase and one lowercase letter.',
'numbers' => 'The :attribute field must contain at least one number.',
'symbols' => 'The :attribute field must contain at least one symbol.',
'uncompromised' => 'The given :attribute has appeared in a data leak. Please choose a different :attribute.',
],
'present' => 'The :attribute field must be present.',
'present_if' => 'The :attribute field must be present when :other is :value.',
'present_unless' => 'The :attribute field must be present unless :other is :value.',
'present_with' => 'The :attribute field must be present when :values is present.',
'present_with_all' => 'The :attribute field must be present when :values are present.',
'prohibited' => 'The :attribute field is prohibited.',
'prohibited_if' => 'The :attribute field is prohibited when :other is :value.',
'prohibited_unless' => 'The :attribute field is prohibited unless :other is in :values.',
'prohibits' => 'The :attribute field prohibits :other from being present.',
'regex' => 'The :attribute field format is invalid.',
'required' => 'The :attribute field is required.',
'required_array_keys' => 'The :attribute field must contain entries for: :values.',
'required_if' => 'The :attribute field is required when :other is :value.',
'required_if_accepted' => 'The :attribute field is required when :other is accepted.',
'required_unless' => 'The :attribute field is required unless :other is in :values.',
'required_with' => 'The :attribute field is required when :values is present.',
'required_with_all' => 'The :attribute field is required when :values are present.',
'required_without' => 'The :attribute field is required when :values is not present.',
'required_without_all' => 'The :attribute field is required when none of :values are present.',
'same' => 'The :attribute field must match :other.',
'size' => [
'array' => 'The :attribute field must contain :size items.',
'file' => 'The :attribute field must be :size kilobytes.',
'numeric' => 'The :attribute field must be :size.',
'string' => 'The :attribute field must be :size characters.',
],
'starts_with' => 'The :attribute field must start with one of the following: :values.',
'string' => 'The :attribute field must be a string.',
'timezone' => 'The :attribute field must be a valid timezone.',
'unique' => 'The :attribute has already been taken.',
'uploaded' => 'The :attribute failed to upload.',
'uppercase' => 'The :attribute field must be uppercase.',
'url' => 'The :attribute field must be a valid URL.',
'ulid' => 'The :attribute field must be a valid ULID.',
'uuid' => 'The :attribute field must be a valid UUID.',
/*
|--------------------------------------------------------------------------
| Custom Validation Language Lines
|--------------------------------------------------------------------------
|
| Here you may specify custom validation messages for attributes using the
| convention "attribute.rule" to name the lines. This makes it quick to
| specify a specific custom language line for a given attribute rule.
|
*/
'custom' => [
'attribute-name' => [
'rule-name' => 'custom-message',
],
],
/*
|--------------------------------------------------------------------------
| Custom Validation Attributes
|--------------------------------------------------------------------------
|
| The following language lines are used to swap our attribute placeholder
| with something more reader friendly such as "E-Mail Address" instead
| of "email". This simply helps us make our message more expressive.
|
*/
'attributes' => [],
];
View File

Some files were not shown because too many files have changed in this diff Show More