Pārlūkot izejas kodu

支持重新发送 Telegram 频道消息

doge 1 dienu atpakaļ
vecāks
revīzija
b30bde17a2

+ 5 - 0
app/Http/Controllers/admin/TelegramChannel.php

@@ -31,6 +31,11 @@ class TelegramChannel extends Controller
         return $this->respond(fn () => $messages->create($request->all()));
     }
 
+    public function resendMessage(Request $request, TelegramChannelMessageService $messages): JsonResponse
+    {
+        return $this->respond(fn () => $messages->resend($this->id($request)));
+    }
+
     public function cancelMessage(Request $request, TelegramChannelMessageService $messages): JsonResponse
     {
         return $this->respond(function () use ($request, $messages) {

+ 23 - 1
app/Services/TelegramChannelMessageService.php

@@ -20,6 +20,24 @@ class TelegramChannelMessageService
     }
 
     public function create(array $input): array
+    {
+        return $this->createMessage($input);
+    }
+
+    public function resend(int $id): array
+    {
+        $original = DB::table(self::TABLE)->find($id);
+        if ($original === null || !in_array($original->status, ['sent', 'failed', 'unknown', 'cancelled'], true)) {
+            throw ValidationException::withMessages(['id' => '该记录无法重新发送']);
+        }
+
+        return $this->createMessage([
+            'channel_id' => $original->channel_id,
+            'is_top' => (bool) $original->is_top,
+        ] + json_decode($original->message, true, 512, JSON_THROW_ON_ERROR), $original->target);
+    }
+
+    private function createMessage(array $input, ?string $originalTarget = null): array
     {
         $fields = Validator::make($input, [
             'channel_id' => 'required|integer|min:1',
@@ -28,6 +46,10 @@ class TelegramChannelMessageService
         ])->validate();
         $message = TelegramChannelService::message($input);
         $channel = $this->channels->detail((int) $fields['channel_id']);
+        $target = $channel['telegram_chat_id'] ?? $channel['chatId'];
+        if ($originalTarget !== null && $target !== $originalTarget) {
+            throw ValidationException::withMessages(['channel_id' => '频道标识已变更,请重新创建发送记录']);
+        }
         if (!$channel['enabled']) {
             throw ValidationException::withMessages(['channel_id' => '请先启用频道']);
         }
@@ -42,7 +64,7 @@ class TelegramChannelMessageService
         $id = (int) DB::table(self::TABLE)->insertGetId([
             'channel_id' => $channel['id'],
             'channel_name' => $channel['name'],
-            'target' => $channel['telegram_chat_id'] ?? $channel['chatId'],
+            'target' => $target,
             'message' => json_encode($message, JSON_THROW_ON_ERROR | JSON_UNESCAPED_UNICODE),
             'is_top' => $fields['is_top'] ?? false,
             'status' => 'scheduled',

+ 2 - 1
docs/前端交付/bot-28/后台/Telegram频道管理-前端接入.md

@@ -21,9 +21,10 @@
 | --- | --- |
 | `GET /admin/telegramChannelMessage/list?page=1` | 返回 `data.list` 和 `data.total`,每页 20 条 |
 | `POST /admin/telegramChannelMessage/create` | 新增立即或定时发送记录,返回该记录 |
+| `POST /admin/telegramChannelMessage/resend` | 提交 `{ "id": 42 }`,确认后立即再次发送并返回新记录。支持已发送、失败、结果未知和已取消的记录,保留原频道、正文、按钮和置顶设置 |
 | `POST /admin/telegramChannelMessage/cancel` | 提交 `{ "id": 42 }`,仅待发送记录可取消 |
 
-读取权限为 `admin/telegramChannel/list`,新增和取消使用 `admin/telegramChannel/publish`。新增时从已启用且已绑定机器人的频道中选择 `channel_id`。立即发送时省略 `scheduled_at`,定时时传带时区的 ISO 8601 时间。图片通过 `POST /admin/upload/uploadFile`(字段 `image`)上传,视频通过 `POST /admin/upload/uploadVideo`(字段 `file`)上传。用返回的 `data.path` 填入 `image` 或 `video`。
+读取权限为 `admin/telegramChannel/list`,新增、重新发送和取消使用 `admin/telegramChannel/publish`。新增时从已启用且已绑定机器人的频道中选择 `channel_id`。立即发送时省略 `scheduled_at`,定时时传带时区的 ISO 8601 时间。图片通过 `POST /admin/upload/uploadFile`(字段 `image`)上传,视频通过 `POST /admin/upload/uploadVideo`(字段 `file`)上传。用返回的 `data.path` 填入 `image` 或 `video`。
 
 ```json
 {

+ 2 - 0
routes/admin.php

@@ -366,6 +366,8 @@ Route::middleware(['admin.jwt'])->group(function () {
                 ->defaults('permission_uri', TelegramChannelService::VIEW)->defaults('require_active_button', true);
             Route::post('/create', [TelegramChannel::class, 'createMessage'])
                 ->defaults('permission_uri', TelegramChannelService::PUBLISH)->defaults('require_active_button', true);
+            Route::post('/resend', [TelegramChannel::class, 'resendMessage'])
+                ->defaults('permission_uri', TelegramChannelService::PUBLISH)->defaults('require_active_button', true);
             Route::post('/cancel', [TelegramChannel::class, 'cancelMessage'])
                 ->defaults('permission_uri', TelegramChannelService::PUBLISH)->defaults('require_active_button', true);
         });

+ 31 - 0
tests/Integration/TelegramChannelTest.php

@@ -471,6 +471,37 @@ class TelegramChannelTest extends TestCase
         $this->assertNull($this->service->detail($channel['id'])['type']);
     }
 
+    public function test_resend_copies_a_completed_record_and_keeps_the_original(): void
+    {
+        $this->migrate();
+        $this->telegramResult(['id' => 111, 'is_bot' => true, 'username' => 'first_bot']);
+        $bot = $this->service->saveBot(['bot_token' => '111:fixture_first']);
+        $this->telegramChannel(-1001000000001, 'first_channel');
+        $channel = $this->service->save(['chatId' => '@first_channel', 'bot_id' => $bot['id']]);
+        $messages = new TelegramChannelMessageService($this->service);
+        $record = $messages->create([
+            'channel_id' => $channel['id'], 'type' => 'text', 'text' => '原消息',
+            'scheduled_at' => now('UTC')->addHour()->toIso8601String(), 'is_top' => true,
+        ]);
+        $request = $this->request(['id' => $record['id']]);
+        $controller = new TelegramChannel();
+        $this->assertSame(-3, $controller->resendMessage($request, $messages)->getData(true)['code']);
+        $messages->cancel($record['id']);
+
+        $this->telegramResult(['message_id' => 26]);
+        $this->telegramResult(true);
+        $result = $controller->resendMessage($request, $messages)->getData(true)['data'];
+        $this->assertSame('sent', $result['status']);
+        $this->assertNotSame($record['id'], $result['id']);
+        $this->assertSame($record['message'], $result['message']);
+        $this->assertTrue($result['pinned']);
+        $this->assertSame('cancelled', DB::table('telegram_channel_messages')->find($record['id'])->status);
+
+        DB::table('telegram_channels')->where('id', $channel['id'])->update(['telegram_chat_id' => '-1001000000002']);
+        $this->assertSame(-3, $controller->resendMessage($request, $messages)->getData(true)['code']);
+        $this->assertCount(4, $this->requests);
+    }
+
     public function test_wrong_bot_username_does_not_replace_existing_token(): void
     {
         $this->migrate();