fix(medals): fixed medal issue

taobataoma · Jun 28, 2018 · 4b1c354 · 4b1c354
1 parent b638cfd
commit 4b1c354
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 9 deletions.
diff --git a/config/env/torrents.js b/config/env/torrents.js
@@ -407,7 +407,6 @@ module.exports = {
      *        @activeMoreScorePerDay:         idle more than one day need extra score
      *        @activeMoreScorePerLevel:       idle each level need extra score
      *        @notIdleSafeLevel:              safe lavel, more than this level account not to be idle status
-     *        @unIdleMedalName:               if user has these medal, the account do not to be idle status, value must be a Array
      */
     sign: {
       openSignup: true,
@@ -427,8 +426,7 @@ module.exports = {
         activeIdleAccountBasicScore: 50000,
         activeMoreScorePerDay: 100,
         activeMoreScorePerLevel: 1000,
-        notIdleSafeLevel: 30,
-        unIdleMedalName: ['roam']
+        notIdleSafeLevel: 30
       }
     },
 
@@ -1323,7 +1321,6 @@ module.exports = {
      *      @noticeMsg:               notice translate string show at top of home
      *      @noticeShowAt:            notice begin time to show
      *      @timeFormats:             time string format
-     * @exceptExaminationMedalName:   except examination user must have medal name of 'noExamination', value must is a Array
      * @detailUrl:                    detail info of examination, maybe a forum link url
      * ------------------------------------------------------------------------------
      *  !IMPORTANT NOTE:
@@ -1346,7 +1343,6 @@ module.exports = {
         noticeShowAt: '2018-01-28 00:00:00',
         timeFormats: 'YYYY-MM-DD HH:mm:ss'
       },
-      exceptExaminationMedalName: ['noExamination'],
       detailUrl: '/forums/595c4491d5706705f67d93cf/59684780f928f42a9c79c613'
     },
 

diff --git a/config/lib/cron-job.js b/config/lib/cron-job.js
@@ -322,8 +322,7 @@ function checkUserAccountIdleStatus() {
         isOper: false,
         isAdmin: false,
         last_signed: {$lt: Date.now() - signConfig.idle.accountIdleForTime},
-        score: {$lt: safeScore},
-        medal: {$nin: signConfig.idle.unIdleMedalName}
+        score: {$lt: safeScore}
       }).exec(function (err, users) {
         if (users) {
           users.forEach(function (u) {

diff --git a/modules/systems/server/controllers/systems.server.controller.js b/modules/systems/server/controllers/systems.server.controller.js
@@ -208,8 +208,7 @@ exports.initExaminationData = function (req, res) {
               status: 'normal',
               isVip: false,
               isOper: false,
-              isAdmin: false,
-              medals: {$nin: examinationConfig.exceptExaminationMedalName}
+              isAdmin: false
             }, {examinationData: exami}, {multi: true}, function (err, num) {
               if (err) {
                 return res.status(422).send({