From 29e586b38cba7567970babb2ab4c20e075786267 Mon Sep 17 00:00:00 2001
From: CounterFire2023 <136581895+CounterFire2023@users.noreply.github.com>
Date: Wed, 27 Mar 2024 10:38:00 +0800
Subject: [PATCH] add social score for user state api

---
 docs/uaw.md                        |  1 +
 initdatas/activity_info.json       |  6 +++---
 src/controllers/sign.controller.ts | 13 ++++++-------
 src/tasks/base/ITask.ts            |  2 +-
 4 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/docs/uaw.md b/docs/uaw.md
index 368e3ce..2b18e97 100644
--- a/docs/uaw.md
+++ b/docs/uaw.md
@@ -313,6 +313,7 @@ body:
     "invite": "邀请人address",
   	"inviteCount": 0, // 我邀请的用户总数
   	"inviteScore": 0, // 我邀请用户总数获得的分数
+  	"scoreSocial": 0, // 社交任务获得的分数
     "code": "自己的邀请码",
   	"mapopen": 0, // 地图开启状态, 0: 未开启, 1: 已开启
  }
diff --git a/initdatas/activity_info.json b/initdatas/activity_info.json
index 7d34f9d..8c08620 100644
--- a/initdatas/activity_info.json
+++ b/initdatas/activity_info.json
@@ -11,7 +11,7 @@
       "type": 1,
       "desc": "",
       "score": 0,
-      "category": "",
+      "category": "Social Tasks",
       "autoclaim": false,
       "cfg": {"icon": "twitter"},
       "start": "2024-01-01 00:00",
@@ -79,7 +79,7 @@
       "title": "",
       "type": 1,
       "desc": "",
-      "category": "",
+      "category": "Social Tasks",
       "score": 0,
       "autoclaim": false,
       "pretasks": [],
@@ -163,7 +163,7 @@
       "title": "",
       "type": 1,
       "desc": "Post to confess your 💕 for @_CounterFire",
-      "category": "Referral to Earn",
+      "category": "Social Tasks",
       "score": 100,
       "autoclaim": false,
       "pretasks": ["e2yhq2lj30vwcpedv7p"],
diff --git a/src/controllers/sign.controller.ts b/src/controllers/sign.controller.ts
index cad0d13..9378628 100644
--- a/src/controllers/sign.controller.ts
+++ b/src/controllers/sign.controller.ts
@@ -4,8 +4,7 @@ import { ActivityUser } from 'models/ActivityUser'
 import { DEFAULT_EXPIRED, NonceRecord } from 'models/NonceRecord'
 import { ScoreRecord } from 'models/ScoreRecord'
 import { LoginRecordQueue } from 'queue/loginrecord.queue'
-import { queryCheckInList } from 'services/chain.svr'
-import { rankKey, updateRankScore } from 'services/rank.svr'
+import { rankKey } from 'services/rank.svr'
 import { SiweMessage } from 'siwe'
 import { nextday } from 'zutils/utils/date.util'
 import { checkParamsNeeded } from 'zutils/utils/net.util'
@@ -114,10 +113,9 @@ class SignController extends BaseController {
     }
     const records = await ScoreRecord.find({ user: user.id, activity: user.activity, type: 'invite' })
     const gameRecord = await ActivityGame.insertOrUpdate({ user: user.id, activity: user.activity }, {})
-    let score = 0
-    for (let record of records) {
-      score += record.score
-    }
+    let inviteScore = records.reduce((acc, record) => acc + record.score, 0)
+    const recordSocial = await ScoreRecord.find({ user: user.id, activity: user.activity, type: 'Social Tasks' })
+    let scoreSocial = recordSocial.reduce((acc, record) => acc + record.score, 0)
     let result = {
       address: user.address.toLowerCase(),
       boost: user.boost || 1,
@@ -131,7 +129,8 @@ class SignController extends BaseController {
       rankTotal: totalRank ? totalRank : '-',
       invite,
       inviteCount: records.length,
-      inviteScore: score,
+      inviteScore,
+      scoreSocial,
       code: user.inviteCode,
       mapopen: gameRecord.status,
     }
diff --git a/src/tasks/base/ITask.ts b/src/tasks/base/ITask.ts
index 8ba8b83..8bf2726 100644
--- a/src/tasks/base/ITask.ts
+++ b/src/tasks/base/ITask.ts
@@ -43,7 +43,7 @@ export abstract class ITask {
         user: user.id,
         score: score,
         activity: user.activity,
-        scoreType: cfg.task,
+        scoreType: cfg.category,
         scoreParams: {
           date: dateTag,
           taskId: task.id,