diff --git a/database/migrations/2021_06_08_113437_create_agent_allowed_exception_table.php b/database/migrations/2021_06_08_113437_create_agent_allowed_exception_table.php index e87ad270..3b9bb254 100644 --- a/database/migrations/2021_06_08_113437_create_agent_allowed_exception_table.php +++ b/database/migrations/2021_06_08_113437_create_agent_allowed_exception_table.php @@ -17,7 +17,7 @@ class CreateAgentAllowedExceptionTable extends Migration return; } Schema::create('agent_allowed_exception', function (Blueprint $table) { - $table->unsignedTinyInteger('family_id')->default(0)->index('family_id'); + $table->unsignedTinyInteger('family_id')->default(0)->index(); $table->string('name', 100)->default(''); $table->string('peer_id', 20)->default(''); $table->string('agent', 100)->default(''); diff --git a/database/migrations/2021_06_08_113437_create_attachments_table.php b/database/migrations/2021_06_08_113437_create_attachments_table.php index bcd82b02..9485dd95 100644 --- a/database/migrations/2021_06_08_113437_create_attachments_table.php +++ b/database/migrations/2021_06_08_113437_create_attachments_table.php @@ -22,7 +22,7 @@ class CreateAttachmentsTable extends Migration $table->unsignedSmallInteger('width')->default(0); $table->dateTime('added')->nullable(); $table->string('filename')->default(''); - $table->char('dlkey', 32)->index('idx_delkey'); + $table->char('dlkey', 32)->index(); $table->string('filetype', 50)->default(''); $table->unsignedBigInteger('filesize')->default(0); $table->string('location')->default(''); @@ -30,7 +30,7 @@ class CreateAttachmentsTable extends Migration $table->smallInteger('isimage')->unsigned()->default(0); $table->smallInteger('thumb')->unsigned()->default(0); $table->index(['userid', 'id'], 'pid'); - $table->index(['added', 'isimage', 'downloads'], 'dateline'); + $table->index(['added', 'isimage', 'downloads'], ); }); } diff --git a/database/migrations/2021_06_08_113437_create_attendance_table.php b/database/migrations/2021_06_08_113437_create_attendance_table.php index 0926f278..f64245d9 100644 --- a/database/migrations/2021_06_08_113437_create_attendance_table.php +++ b/database/migrations/2021_06_08_113437_create_attendance_table.php @@ -18,7 +18,7 @@ class CreateAttendanceTable extends Migration } Schema::create('attendance', function (Blueprint $table) { $table->bigIncrements('id'); - $table->unsignedInteger('uid')->default(0)->index('idx_uid'); + $table->unsignedInteger('uid')->default(0)->index(); $table->dateTime('added')->index(); $table->unsignedInteger('points')->default(0); $table->unsignedInteger('days')->default(1); diff --git a/database/migrations/2021_06_08_113437_create_bans_table.php b/database/migrations/2021_06_08_113437_create_bans_table.php index 7919e7b3..8c0ad233 100644 --- a/database/migrations/2021_06_08_113437_create_bans_table.php +++ b/database/migrations/2021_06_08_113437_create_bans_table.php @@ -23,7 +23,7 @@ class CreateBansTable extends Migration $table->string('comment')->default(''); $table->bigInteger('first')->default(0); $table->bigInteger('last')->default(0); - $table->index(['first', 'last'], 'first_last'); + $table->index(['first', 'last'], ); }); } diff --git a/database/migrations/2021_06_08_113437_create_blocks_table.php b/database/migrations/2021_06_08_113437_create_blocks_table.php index 1ea0c51d..e7043393 100644 --- a/database/migrations/2021_06_08_113437_create_blocks_table.php +++ b/database/migrations/2021_06_08_113437_create_blocks_table.php @@ -20,7 +20,7 @@ class CreateBlocksTable extends Migration $table->increments('id'); $table->unsignedMediumInteger('userid')->default(0); $table->unsignedMediumInteger('blockid')->default(0); - $table->unique(['userid', 'blockid'], 'userfriend'); + $table->unique(['userid', 'blockid'],); }); } diff --git a/database/migrations/2021_06_08_113437_create_bookmarks_table.php b/database/migrations/2021_06_08_113437_create_bookmarks_table.php index 823dd5c7..9bfcca6b 100644 --- a/database/migrations/2021_06_08_113437_create_bookmarks_table.php +++ b/database/migrations/2021_06_08_113437_create_bookmarks_table.php @@ -20,7 +20,7 @@ class CreateBookmarksTable extends Migration $table->increments('id'); $table->unsignedMediumInteger('torrentid')->default(0); $table->unsignedMediumInteger('userid')->default(0); - $table->index(['userid', 'torrentid'], 'userid_torrentid'); + $table->index(['userid', 'torrentid'], ); }); } diff --git a/database/migrations/2021_06_08_113437_create_categories_table.php b/database/migrations/2021_06_08_113437_create_categories_table.php index 58869ee8..abc04759 100644 --- a/database/migrations/2021_06_08_113437_create_categories_table.php +++ b/database/migrations/2021_06_08_113437_create_categories_table.php @@ -24,7 +24,7 @@ class CreateCategoriesTable extends Migration $table->string('image')->default(''); $table->unsignedSmallInteger('sort_index')->default(0); $table->integer('icon_id')->default(0); - $table->index(['mode', 'sort_index'], 'mode_sort'); + $table->index(['mode', 'sort_index'], ); }); } diff --git a/database/migrations/2021_06_08_113437_create_chronicle_table.php b/database/migrations/2021_06_08_113437_create_chronicle_table.php index bfa67b39..bce82ea9 100644 --- a/database/migrations/2021_06_08_113437_create_chronicle_table.php +++ b/database/migrations/2021_06_08_113437_create_chronicle_table.php @@ -19,7 +19,7 @@ class CreateChronicleTable extends Migration Schema::create('chronicle', function (Blueprint $table) { $table->mediumIncrements('id'); $table->unsignedMediumInteger('userid')->default(0); - $table->dateTime('added')->nullable()->index('added'); + $table->dateTime('added')->nullable()->index(); $table->text('txt')->nullable(); }); } diff --git a/database/migrations/2021_06_08_113437_create_comments_table.php b/database/migrations/2021_06_08_113437_create_comments_table.php index 4ad2e000..c12d70c6 100644 --- a/database/migrations/2021_06_08_113437_create_comments_table.php +++ b/database/migrations/2021_06_08_113437_create_comments_table.php @@ -18,7 +18,7 @@ class CreateCommentsTable extends Migration } Schema::create('comments', function (Blueprint $table) { $table->increments('id'); - $table->unsignedMediumInteger('user')->default(0)->index('user'); + $table->unsignedMediumInteger('user')->default(0)->index(); $table->unsignedMediumInteger('torrent')->default(0); $table->dateTime('added')->nullable(); $table->text('text')->nullable(); @@ -28,8 +28,8 @@ class CreateCommentsTable extends Migration $table->unsignedMediumInteger('offer')->default(0); $table->integer('request')->default(0); $table->enum('anonymous', ['yes', 'no'])->default('no'); - $table->index(['torrent', 'id'], 'torrent_id'); - $table->index(['offer', 'id'], 'offer_id'); + $table->index(['torrent', 'id'], ); + $table->index(['offer', 'id'], ); }); } diff --git a/database/migrations/2021_06_08_113437_create_files_table.php b/database/migrations/2021_06_08_113437_create_files_table.php index 9c8181ce..78280c3f 100644 --- a/database/migrations/2021_06_08_113437_create_files_table.php +++ b/database/migrations/2021_06_08_113437_create_files_table.php @@ -18,7 +18,7 @@ class CreateFilesTable extends Migration } Schema::create('files', function (Blueprint $table) { $table->increments('id'); - $table->unsignedMediumInteger('torrent')->default(0)->index('torrent'); + $table->unsignedMediumInteger('torrent')->default(0)->index(); $table->string('filename')->default(''); $table->unsignedBigInteger('size')->default(0); }); diff --git a/database/migrations/2021_06_08_113437_create_forummods_table.php b/database/migrations/2021_06_08_113437_create_forummods_table.php index 0a4835b3..8025681a 100644 --- a/database/migrations/2021_06_08_113437_create_forummods_table.php +++ b/database/migrations/2021_06_08_113437_create_forummods_table.php @@ -18,7 +18,7 @@ class CreateForummodsTable extends Migration } Schema::create('forummods', function (Blueprint $table) { $table->smallIncrements('id'); - $table->unsignedSmallInteger('forumid')->default(0)->index('forumid'); + $table->unsignedSmallInteger('forumid')->default(0)->index(); $table->unsignedMediumInteger('userid')->default(0); }); } diff --git a/database/migrations/2021_06_08_113437_create_invites_table.php b/database/migrations/2021_06_08_113437_create_invites_table.php index eab743c3..3d52bc7f 100644 --- a/database/migrations/2021_06_08_113437_create_invites_table.php +++ b/database/migrations/2021_06_08_113437_create_invites_table.php @@ -20,7 +20,7 @@ class CreateInvitesTable extends Migration $table->increments('id'); $table->unsignedMediumInteger('inviter')->default(0); $table->string('invitee', 80)->default(''); - $table->char('hash', 32)->index('hash'); + $table->char('hash', 32)->index(); $table->dateTime('time_invited')->nullable(); $table->tinyInteger('valid')->default(1); $table->integer('invitee_register_uid')->nullable(); diff --git a/database/migrations/2021_06_08_113437_create_iplog_table.php b/database/migrations/2021_06_08_113437_create_iplog_table.php index 624b947b..c47dc092 100644 --- a/database/migrations/2021_06_08_113437_create_iplog_table.php +++ b/database/migrations/2021_06_08_113437_create_iplog_table.php @@ -19,7 +19,7 @@ class CreateIplogTable extends Migration Schema::create('iplog', function (Blueprint $table) { $table->bigIncrements('id'); $table->string('ip', 64)->default(''); - $table->unsignedMediumInteger('userid')->default(0)->index('userid'); + $table->unsignedMediumInteger('userid')->default(0)->index(); $table->dateTime('access')->nullable(); }); } diff --git a/database/migrations/2021_06_08_113437_create_magic_table.php b/database/migrations/2021_06_08_113437_create_magic_table.php index 27cce0b6..f0c6156a 100644 --- a/database/migrations/2021_06_08_113437_create_magic_table.php +++ b/database/migrations/2021_06_08_113437_create_magic_table.php @@ -18,8 +18,8 @@ class CreateMagicTable extends Migration } Schema::create('magic', function (Blueprint $table) { $table->bigIncrements('id'); - $table->integer('torrentid')->default(0)->index('idx_torrentid'); - $table->integer('userid')->default(0)->index('idx_userid'); + $table->integer('torrentid')->default(0)->index(); + $table->integer('userid')->default(0)->index(); $table->integer('value')->default(0); $table->timestamp('created_at')->useCurrent(); $table->timestamp('updated_at')->useCurrent(); diff --git a/database/migrations/2021_06_08_113437_create_messages_table.php b/database/migrations/2021_06_08_113437_create_messages_table.php index f91490e9..88fbf676 100644 --- a/database/migrations/2021_06_08_113437_create_messages_table.php +++ b/database/migrations/2021_06_08_113437_create_messages_table.php @@ -18,8 +18,8 @@ class CreateMessagesTable extends Migration } Schema::create('messages', function (Blueprint $table) { $table->increments('id'); - $table->unsignedMediumInteger('sender')->default(0)->index('sender'); - $table->unsignedMediumInteger('receiver')->default(0)->index('receiver'); + $table->unsignedMediumInteger('sender')->default(0)->index(); + $table->unsignedMediumInteger('receiver')->default(0)->index(); $table->dateTime('added')->nullable(); $table->string('subject', 128)->default(''); $table->text('msg')->nullable(); diff --git a/database/migrations/2021_06_08_113437_create_resreq_table.php b/database/migrations/2021_06_08_113437_create_resreq_table.php index 79bc683b..6ff973ce 100644 --- a/database/migrations/2021_06_08_113437_create_resreq_table.php +++ b/database/migrations/2021_06_08_113437_create_resreq_table.php @@ -18,7 +18,7 @@ class CreateResreqTable extends Migration } Schema::create('resreq', function (Blueprint $table) { $table->integer('id', true); - $table->integer('reqid')->default(0)->index('reqid'); + $table->integer('reqid')->default(0)->index(); $table->integer('torrentid')->default(0); $table->enum('chosen', ['yes', 'no'])->default('no'); }); diff --git a/database/migrations/2021_06_08_113437_create_settings_table.php b/database/migrations/2021_06_08_113437_create_settings_table.php index c6baac35..4f7faca5 100644 --- a/database/migrations/2021_06_08_113437_create_settings_table.php +++ b/database/migrations/2021_06_08_113437_create_settings_table.php @@ -18,7 +18,7 @@ class CreateSettingsTable extends Migration } Schema::create('settings', function (Blueprint $table) { $table->integer('id', true); - $table->string('name')->default('')->unique('uniqe_name'); + $table->string('name')->default('')->unique(); $table->mediumText('value')->nullable(); $table->timestamp('created_at')->useCurrent(); $table->timestamp('updated_at')->useCurrent(); diff --git a/database/migrations/2021_06_08_113437_create_subs_table.php b/database/migrations/2021_06_08_113437_create_subs_table.php index 460c4989..201f8800 100644 --- a/database/migrations/2021_06_08_113437_create_subs_table.php +++ b/database/migrations/2021_06_08_113437_create_subs_table.php @@ -28,7 +28,7 @@ class CreateSubsTable extends Migration $table->enum('anonymous', ['yes', 'no'])->default('no'); $table->unsignedMediumInteger('hits')->default(0); $table->string('ext', 10)->default(''); - $table->index(['torrent_id', 'lang_id'], 'torrentid_langid'); + $table->index(['torrent_id', 'lang_id'],); }); } diff --git a/database/migrations/2021_06_08_113437_create_suggest_table.php b/database/migrations/2021_06_08_113437_create_suggest_table.php index 7ca30a4d..950f7e51 100644 --- a/database/migrations/2021_06_08_113437_create_suggest_table.php +++ b/database/migrations/2021_06_08_113437_create_suggest_table.php @@ -18,9 +18,9 @@ class CreateSuggestTable extends Migration } Schema::create('suggest', function (Blueprint $table) { $table->increments('id'); - $table->string('keywords')->default('')->index('keywords'); + $table->string('keywords')->default('')->index(); $table->unsignedMediumInteger('userid')->default(0); - $table->dateTime('adddate')->nullable()->index('adddate'); + $table->dateTime('adddate')->nullable()->index(); }); } diff --git a/database/migrations/2021_06_08_113437_create_torrents_table.php b/database/migrations/2021_06_08_113437_create_torrents_table.php index 48f90059..5c30b7d0 100644 --- a/database/migrations/2021_06_08_113437_create_torrents_table.php +++ b/database/migrations/2021_06_08_113437_create_torrents_table.php @@ -19,7 +19,7 @@ class CreateTorrentsTable extends Migration Schema::create('torrents', function (Blueprint $table) { $table->mediumIncrements('id'); $table->binary('info_hash', 20)->nullable()->unique(); - $table->string('name')->default('')->index('name'); + $table->string('name')->default('')->index(); $table->string('filename')->default(''); $table->string('save_as')->default(''); $table->text('descr')->nullable(); @@ -46,13 +46,13 @@ class CreateTorrentsTable extends Migration $table->dateTime('last_action')->nullable(); $table->enum('visible', ['yes', 'no'])->default('yes'); $table->enum('banned', ['yes', 'no'])->default('no'); - $table->unsignedMediumInteger('owner')->default(0)->index('owner'); + $table->unsignedMediumInteger('owner')->default(0)->index(); $table->binary('nfo')->nullable(); $table->unsignedTinyInteger('sp_state')->default(1); $table->unsignedTinyInteger('promotion_time_type')->default(0); $table->dateTime('promotion_until')->nullable(); $table->enum('anonymous', ['yes', 'no'])->default('no'); - $table->unsignedInteger('url')->nullable()->index('url'); + $table->unsignedInteger('url')->nullable()->index(); $table->string('pos_state', 32)->default('normal'); $table->unsignedTinyInteger('cache_stamp')->default(0); $table->enum('picktype', ['hot', 'classic', 'recommended', 'normal'])->default('normal'); @@ -60,9 +60,9 @@ class CreateTorrentsTable extends Migration $table->dateTime('last_reseed')->nullable(); $table->mediumText('pt_gen')->nullable(); $table->text('technical_info')->nullable(); - $table->index(['visible', 'pos_state', 'id'], 'visible_pos_id'); - $table->index(['category', 'visible', 'banned'], 'category_visible_banned'); - $table->index(['visible', 'banned', 'pos_state', 'id'], 'visible_banned_pos_id'); + $table->index(['visible', 'pos_state', 'id'] ); + $table->index(['category', 'visible', 'banned']); + $table->index(['visible', 'banned', 'pos_state', 'id']); }); // $sql = 'alter table torrents add column `info_hash` binary(20) NOT NULL after id, add unique info_hash(`info_hash`)'; // \Illuminate\Support\Facades\DB::statement($sql); diff --git a/database/migrations/2022_12_10_034926_add_expired_at_to_invites_table.php b/database/migrations/2022_12_10_034926_add_expired_at_to_invites_table.php index 5f10cded..70b2525f 100644 --- a/database/migrations/2022_12_10_034926_add_expired_at_to_invites_table.php +++ b/database/migrations/2022_12_10_034926_add_expired_at_to_invites_table.php @@ -16,7 +16,7 @@ return new class extends Migration Schema::table('invites', function (Blueprint $table) { $table->dateTime('expired_at')->nullable(true)->index(); $table->dateTime('created_at')->useCurrent(); - $table->index(['inviter'], 'idx_inviter'); + $table->index(['inviter'], ); }); } diff --git a/database/migrations/2023_07_05_005825_add_index_to_field_created_at_of_claims_table.php b/database/migrations/2023_07_05_005825_add_index_to_field_created_at_of_claims_table.php index 35459019..435c5f73 100644 --- a/database/migrations/2023_07_05_005825_add_index_to_field_created_at_of_claims_table.php +++ b/database/migrations/2023_07_05_005825_add_index_to_field_created_at_of_claims_table.php @@ -14,7 +14,7 @@ return new class extends Migration public function up() { Schema::table('claims', function (Blueprint $table) { - $table->index("created_at", "idx_created_at"); + $table->index("created_at", ); }); } diff --git a/public/viewpeerlist.php b/public/viewpeerlist.php index 446e9d67..3eff1db0 100644 --- a/public/viewpeerlist.php +++ b/public/viewpeerlist.php @@ -178,7 +178,9 @@ function dltable($name, $arr, $torrent, &$isSeedBoxCaseWhens) $downloaders = $seedersAndLeechers['leechers']; do_log("SEEDER_LEECHER_FROM_FILTER: torrent_seeder_leecher_list"); } else { - $subres = sql_query("SELECT id, seeder, finishedat, downloadoffset, uploadoffset, ip, ipv4, ipv6, port, uploaded, downloaded, to_go, UNIX_TIMESTAMP(started) AS st, connectable, agent, peer_id, UNIX_TIMESTAMP(last_action) AS la, userid FROM peers WHERE torrent = $id") or sqlerr(); + $startedField = \Nexus\Database\NexusDB::unixTimestampField('started'); + $lastActionField = \Nexus\Database\NexusDB::unixTimestampField('last_action'); + $subres = sql_query("SELECT id, seeder, finishedat, downloadoffset, uploadoffset, ip, ipv4, ipv6, port, uploaded, downloaded, to_go, $startedField AS st, connectable, agent, peer_id, $lastActionField AS la, userid FROM peers WHERE torrent = $id") or sqlerr(); while ($subrow = mysql_fetch_array($subres)) { if ($subrow["seeder"] == "yes") $seeders[] = $subrow;