Commit 877ca096 authored by 陈家荣's avatar 陈家荣

222

parent 6ee6cf1b
......@@ -36,8 +36,8 @@ function countAll(conditions,callback) {
}
//获取单个行为限制
function getLimitActionRef(mid,callback){
ForumLimitActionRef.findOne({mid:mid}, function(err, role) {
function getLimitActionRef(userId,callback){
ForumLimitActionRef.findOne({userId:userId}, function(err, role) {
if (err) {
console.error(err);
callback(err,null);
......@@ -90,8 +90,8 @@ exports.createLimitActionRef=function(entity,callback){
};
//根据MID和EntCode获取
exports.getLimitActionRefByMIdAndEntCode=function(mid,ent_code,callback){
ForumLimitActionRef.findOne({mid:mid,ent_code:ent_code}, function(err, role) {
exports.getLimitActionRefByMIdAndEntCode=function(userId,ent_code,callback){
ForumLimitActionRef.findOne({userId:userId,ent_code:ent_code}, function(err, role) {
if (err) {
console.error(err);
callback(err,null);
......@@ -102,8 +102,8 @@ exports.getLimitActionRefByMIdAndEntCode=function(mid,ent_code,callback){
};
//根据MID获取
exports.getLimitActionRefByMid=function(mid,callback){
getLimitActionRef(mid, function(err, role) {
exports.getLimitActionRefByMid=function(userId,callback){
getLimitActionRef(userId, function(err, role) {
if (err) {
console.error(err);
callback(err,null);
......@@ -165,10 +165,10 @@ exports.getAllLimitActionRef= function(conditions,callback) {
//检查用户是否被禁言
exports.checkLimitActionProhibitionOfSpeech = function(mid,callback) {
if(mid){
exports.checkLimitActionProhibitionOfSpeech = function(userId,callback) {
if(userId){
var isProhibition = false;
getLimitActionRef(mid,function(err,forumLimitActionRef){
getLimitActionRef(userId,function(err,forumLimitActionRef){
if (err) {
console.error(err);
callback(err, null);
......@@ -179,8 +179,15 @@ exports.checkLimitActionProhibitionOfSpeech = function(mid,callback) {
for (var i = 0; i < limit_actions.length; i += 1) {
var limit_action = limit_actions[i];
if(limit_action.limit_action_type == 'forum_prohibition_of_speech'){
isProhibition = compareTime(new Date(), limit_action.begin_time, limit_action.end_time);
break;
if(limit_action.begin_time && limit_action.end_time){
var begin_time = new Date(limit_action.begin_time).getTime(),
ent_time = new Date(limit_action.end_time).getTime(),
now = new Date().getTime();
if(now >= begin_time && now <=ent_time){
isProhibition = true;
break;
}
}
}
}
callback(null, isProhibition);
......@@ -196,10 +203,10 @@ exports.checkLimitActionProhibitionOfSpeech = function(mid,callback) {
//检查用户是否被禁加积分
exports.checkLimitActionProhibitionAddIntegral = function(mid,callback) {
if(mid){
exports.checkLimitActionProhibitionAddIntegral = function(userId,callback) {
if(userId){
var isProhibition = false;
getLimitActionRef(mid,function(err,forumLimitActionRef){
getLimitActionRef(userId,function(err,forumLimitActionRef){
if (err) {
console.error(err);
callback(err, null);
......@@ -210,12 +217,21 @@ exports.checkLimitActionProhibitionAddIntegral = function(mid,callback) {
for (var i = 0; i < limit_actions.length; i += 1) {
var limit_action = limit_actions[i];
if(limit_action.limit_action_type == 'forum_not_add_integral'){
isProhibition = compareTime(new Date(), limit_action.begin_time, limit_action.end_time);
break;
if(limit_action.begin_time && limit_action.end_time){
var begin_time = new Date(limit_action.begin_time).getTime(),
ent_time = new Date(limit_action.end_time).getTime(),
now = new Date().getTime();
if(now >= begin_time && now <=ent_time){
isProhibition = true;
break;
}
}
}
}
if(isProhibition){
console.log('送积分');
console.log('Integral:!送积分');
}else{
console.log('Integral:送积分');
}
callback(null, isProhibition);
}else{
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment