Merge pull request #2111 from sspanel-uim/dev

Dev 20230811
Anankke · Aug 10, 2023 · c4130a1 · c4130a1
2 parents 60068a8 + 9079900
commit c4130a1
Show file tree

Hide file tree

Showing 25 changed files with 525 additions and 410 deletions.
diff --git a/app/routes.php b/app/routes.php
@@ -17,8 +17,11 @@
     $app->get('/404', App\Controllers\HomeController::class . ':notFound');
     $app->get('/405', App\Controllers\HomeController::class . ':methodNotAllowed');
     $app->get('/500', App\Controllers\HomeController::class . ':internalServerError');
-    // Telegram
-    $app->post('/telegram_callback', App\Controllers\HomeController::class . ':telegram');
+    // Bot Callback
+    $app->post('/callback/{type}', App\Controllers\CallbackController::class . ':index');
+    // OAuth
+    $app->post('/oauth/{type}', App\Controllers\OAuthController::class . ':index');
+    $app->get('/oauth/{type}', App\Controllers\OAuthController::class . ':index');
     // User Center
     $app->group('/user', static function (RouteCollectorProxy $group): void {
         $group->get('', App\Controllers\UserController::class . ':index');
@@ -49,15 +52,15 @@
         $group->get('/edit', App\Controllers\User\InfoController::class . ':index');
         $group->post('/email', App\Controllers\User\InfoController::class . ':updateEmail');
         $group->post('/username', App\Controllers\User\InfoController::class . ':updateUsername');
+        $group->post('/unbind_im', App\Controllers\User\InfoController::class . ':unbindIM');
         $group->post('/password', App\Controllers\User\InfoController::class . ':updatePassword');
-        $group->post('/contact_update', App\Controllers\User\InfoController::class . ':updateContact');
         $group->post('/theme', App\Controllers\User\InfoController::class . ':updateTheme');
         $group->post('/daily_mail', App\Controllers\User\InfoController::class . ':updateDailyMail');
         $group->post('/passwd_reset', App\Controllers\User\InfoController::class . ':resetPasswd');
         $group->post('/apitoken_reset', App\Controllers\User\InfoController::class . ':resetApiToken');
         $group->post('/method', App\Controllers\User\InfoController::class . ':updateMethod');
         $group->post('/url_reset', App\Controllers\User\InfoController::class . ':resetURL');
-        $group->put('/invite', App\Controllers\User\InfoController::class . ':resetInviteURL');
+        $group->post('/invite_reset', App\Controllers\User\InfoController::class . ':resetInviteURL');
         $group->post('/kill', App\Controllers\User\InfoController::class . ':sendToGulag');
         // 发送验证邮件
         $group->post('/send', App\Controllers\AuthController::class . ':sendVerify');
@@ -67,8 +70,6 @@
         $group->post('/ga_check', App\Controllers\User\MFAController::class . ':checkGa');
         $group->post('/ga_set', App\Controllers\User\MFAController::class . ':setGa');
         $group->post('/ga_reset', App\Controllers\User\MFAController::class . ':resetGa');
-        // Telegram
-        $group->post('/telegram_reset', App\Controllers\UserController::class . ':resetTelegram');
         // 深色模式切换
         $group->post('/switch_theme_mode', App\Controllers\UserController::class . ':switchThemeMode');
         // 记录

diff --git a/composer.lock b/composer.lock
diff --git a/config/settings.json b/config/settings.json
@@ -959,6 +959,36 @@
         "default": "",
         "mark": "Discord Bot Token"
     },
+    {
+        "id": null,
+        "item": "discord_client_id",
+        "value": "0",
+        "class": "discord",
+        "is_public": 0,
+        "type": "int",
+        "default": "0",
+        "mark": "Discord Client ID"
+    },
+    {
+        "id": null,
+        "item": "discord_client_secret",
+        "value": "",
+        "class": "discord",
+        "is_public": 0,
+        "type": "string",
+        "default": "",
+        "mark": "Discord Client Secret"
+    },
+    {
+        "id": null,
+        "item": "discord_guild_id",
+        "value": "0",
+        "class": "discord",
+        "is_public": 0,
+        "type": "int",
+        "default": "0",
+        "mark": "Discord Guild ID"
+    },
     {
         "id": null,
         "item": "slack_token",

diff --git a/db/migrations/2023020100-init.php b/db/migrations/2023020100-init.php
@@ -285,7 +285,7 @@ public function up(): int
                 `node_speedlimit` double NOT NULL DEFAULT 0 COMMENT '用户限速',
                 `node_iplimit` smallint(6) unsigned NOT NULL DEFAULT 0 COMMENT '同时可连接IP数',
                 `is_admin` tinyint(1) unsigned NOT NULL DEFAULT 0 COMMENT '是否管理员',
-                `im_type` smallint(6) unsigned NOT NULL DEFAULT 1 COMMENT '联系方式类型',
+                `im_type` smallint(6) unsigned NOT NULL DEFAULT 0 COMMENT '联系方式类型',
                 `im_value` varchar(255) NOT NULL DEFAULT '' COMMENT '联系方式',
                 `daily_mail_enable` tinyint(1) NOT NULL DEFAULT 0 COMMENT '每日报告开关',
                 `class` smallint(5) unsigned NOT NULL DEFAULT 0 COMMENT '等级',

diff --git a/db/migrations/2023080900-update_user_im_type.php b/db/migrations/2023080900-update_user_im_type.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+use App\Interfaces\MigrationInterface;
+use App\Services\DB;
+
+return new class() implements MigrationInterface {
+    public function up(): int
+    {
+        DB::getPdo()->exec("
+            ALTER TABLE user MODIFY COLUMN `im_type` smallint(6) unsigned NOT NULL DEFAULT 0 COMMENT '联系方式类型';
+            UPDATE user SET `im_value` = `telegram_id` WHERE `im_type` = 4;
+            UPDATE user SET `im_value` = '' WHERE `im_value` = '0';
+        ");
+
+        return 2023080900;
+    }
+
+    public function down(): int
+    {
+        DB::getPdo()->exec("
+            ALTER TABLE user MODIFY COLUMN `im_type` smallint(6) unsigned NOT NULL DEFAULT 1 COMMENT '联系方式类型';
+        ");
+
+        return 2023072000;
+    }
+};
diff --git a/resources/views/tabler/admin/setting/im.tpl b/resources/views/tabler/admin/setting/im.tpl
@@ -305,6 +305,24 @@
                                         <input id="discord_bot_token" type="text" class="form-control" value="{$settings['discord_bot_token']}">
                                     </div>
                                 </div>
+                                <div class="form-group mb-3 row">
+                                    <label class="form-label col-3 col-form-label">Client ID</label>
+                                    <div class="col">
+                                        <input id="discord_client_id" type="text" class="form-control" value="{$settings['discord_client_id']}">
+                                    </div>
+                                </div>
+                                <div class="form-group mb-3 row">
+                                    <label class="form-label col-3 col-form-label">Client Secret</label>
+                                    <div class="col">
+                                        <input id="discord_client_secret" type="text" class="form-control" value="{$settings['discord_client_secret']}">
+                                    </div>
+                                </div>
+                                <div class="form-group mb-3 row">
+                                    <label class="form-label col-3 col-form-label">Guild ID</label>
+                                    <div class="col">
+                                        <input id="discord_guild_id" type="text" class="form-control" value="{$settings['discord_guild_id']}">
+                                    </div>
+                                </div>
                                 <div class="form-group mb-3 row">
                                     <label class="form-label col-3 col-form-label">Discord 用户 ID</label>
                                     <input type="text" class="form-control" id="discord_user_id" value="">
@@ -426,4 +444,4 @@
     });
 </script>
 
-{include file='admin/footer.tpl'}
+{include file='admin/footer.tpl'}