增加discord相关任务和基础任务

docs/uaw.md

@@ -39,7 +39,8 @@
 #### 20240411
 
 1. 宝箱助力状态查询(26) 增加返回宝箱所有者信息
-2. 
+2. 社交任务活动信息(3) 增加返回基础任务id列表
+3. 获取任务奖励(7)增加返回ticket
 
 ### 1. 钱包预登录
 
@@ -124,6 +125,7 @@ SiweMessage的nonce说明(具体参考例子):
     "_id": "TwitterConnect", // 任务id	
     "name": "活动名称",
     "description": "活动描述",
+    "baseTasks": ["taskid"], // 基础任务id
     "tasks": [	// 该活动需要完成的任务
       {
         "id": "任务id",
@@ -255,9 +257,8 @@ body:
 ```json
 {
     "status": 1, // 任务状态, 0: 未开始, 1: 进行中, 2: 成功, 3: 已领取 9: 失败
-    "id": "TwitterFollow", // 任务id
+    "score": 1,
-    "timeStart": 1703150294051, // 任务开始时间
+  	"ticket": 3, // 获得的ticket, 可能没这个字段
-    "timeFinish": 1703151338598
   }
 ```
 
@@ -283,7 +284,7 @@ body:
 
 ```js
 {
-  "score": 10 // 获得的积分
+  "score": 10, // 获得的积分
 } 
 ```
 

initdatas/activity_info.json

@@ -3,6 +3,7 @@
     "_id": "uaw_activity",
     "name": "UAW Activity",
     "description": "UAW",
+    "baseTasks": ["e2yhq2lj30vwcpedv7p", "e2fclylj30vwcpe0szl", "e2far3lj30vwcpe0mf8"],
     "tasks": [
       {
       "id": "e2yhq2lj30vwcpedv7p",
@@ -17,7 +18,6 @@
       "start": "2024-01-01 00:00",
       "end": "2025-01-01 00:00",
       "checkChain": true,
-      "base": true,
       "params": {}
     }, {
       "id": "e2fclylj30vwcpe0szl",
@@ -29,12 +29,25 @@
       "score": 100,
       "autoclaim": false,
       "pretasks": ["e2yhq2lj30vwcpedv7p"],
-      "cfg": {"account": "@_CounterFire", "icon": "twitter"},
+      "cfg": {"account": "playCounterFire", "icon": "twitter"},
       "start": "2024-01-01 00:00",
       "end": "2025-01-01 00:00",
       "checkChain": true,
-      "base": true,
       "params": {"time": 6, "failRate": 0}
+    }, {
+      "id": "e2far3lj30vwcpe0mh7",
+      "task": "DiscordConnect",
+      "title": "Connect discord",
+      "type": 1,
+      "desc": "Connect your discord account",
+      "category": "",
+      "score": 100,
+      "autoclaim": false,
+      "pretasks": [],
+      "cfg": {"icon": "discord"},
+      "start": "2024-01-01 00:00",
+      "end": "2025-01-01 00:00",
+      "params": {}
     },{
       "id": "e2far3lj30vwcpe0mf8",
       "task": "DiscordJoin",
@@ -44,12 +57,11 @@
       "category": "Social Tasks",
       "score": 100,
       "autoclaim": false,
-      "pretasks": [],
+      "pretasks": ["e2far3lj30vwcpe0mh7"],
-      "cfg": {"icon": "discord"},
+      "cfg": {"icon": "discord", "account": "counterfire"},
       "start": "2024-01-01 00:00",
       "end": "2025-01-01 00:00",
       "checkChain": true,
-      "base": true,
       "params": {"time": 6, "failRate": 0}
     }, {
       "id": "e2feyflj30vwcpe0sjy",
@@ -61,7 +73,7 @@
       "score": 100,
       "autoclaim": false,
       "pretasks": ["e2yhq2lj30vwcpedv7p"],
-      "cfg": {"icon": "twitter"},
+      "cfg": {"icon": "twitter", "account": "account2"},
       "start": "2024-01-01 00:00",
       "end": "2025-01-01 00:00",
       "checkChain": true,

src/controllers/tasks.controller.ts

@@ -206,6 +206,6 @@ export default class TasksController extends BaseController {
     const Task = require('../tasks/' + currentTask.task)
     const taskInstance = new Task.default({ user, activity })
     const { score } = await taskInstance.claimReward(currentTask)
-    return { status: currentTask.status, score }
+    return { status: currentTask.status, score, ticket: 0 }
   }
 }

src/models/ActivityInfo.ts

@@ -83,6 +83,9 @@ export class ActivityInfoClass extends BaseModule {
   @prop({ type: () => [TaskCfg], default: [] })
   public tasks: TaskCfg[]
 
+  @prop({ type: () => [String], default: [] })
+  baseTasks: string[]
+
   @prop({ required: false })
   public pause: boolean