1,添加是否允许机器人发生自定义群通知的开关;2,重构部分代码

This commit is contained in:
heavyrain2012
2021-12-07 13:46:14 +08:00
parent 9858b6060c
commit ef45723043
68 changed files with 230 additions and 107 deletions
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action;
import cn.wildfirechat.proto.ProtoConstants;
import cn.wildfirechat.proto.WFCMessage;
import com.google.protobuf.InvalidProtocolBufferException;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -101,7 +102,7 @@ public class IMAction extends Action {
ctx.executor().execute(command);
};
}
}, false);
}, ProtoConstants.RequestSourceType.Request_From_User);
return false;
}
} catch (InvalidProtocolBufferException e) {
@@ -8,6 +8,7 @@
package com.xiaoleilu.loServer.action;
import cn.wildfirechat.proto.ProtoConstants;
import cn.wildfirechat.proto.WFCMessage;
import com.google.protobuf.InvalidProtocolBufferException;
import com.xiaoleilu.loServer.annotation.HttpMethod;
@@ -134,7 +135,7 @@ public class RouteAction extends Action {
ctx.executor().execute(command);
};
}
}, false);
}, ProtoConstants.RequestSourceType.Request_From_User);
return false;
}
} catch (InvalidProtocolBufferException e) {
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action.admin;
import cn.wildfirechat.common.APIPath;
import cn.wildfirechat.proto.ProtoConstants;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
import com.xiaoleilu.loServer.action.Action;
@@ -132,6 +133,6 @@ abstract public class AdminAction extends Action {
ctx.executor().execute(command);
};
}
}, !noAdmin);
}, noAdmin ? ProtoConstants.RequestSourceType.Request_From_User : ProtoConstants.RequestSourceType.Request_From_Admin);
}
}
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action.channel;
import cn.wildfirechat.common.IMExceptionEvent;
import cn.wildfirechat.proto.ProtoConstants;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
@@ -140,6 +141,6 @@ abstract public class ChannelAction extends Action {
ctx.executor().execute(command);
};
}
}, false, true);
}, ProtoConstants.RequestSourceType.Request_From_Channel);
}
}
@@ -9,6 +9,7 @@
package com.xiaoleilu.loServer.action.robot;
import cn.wildfirechat.common.IMExceptionEvent;
import cn.wildfirechat.proto.ProtoConstants;
import cn.wildfirechat.proto.WFCMessage;
import com.google.gson.Gson;
import com.xiaoleilu.loServer.RestResult;
@@ -146,6 +147,6 @@ abstract public class RobotAction extends Action {
ctx.executor().execute(command);
};
}
}, false, true);
}, ProtoConstants.RequestSourceType.Request_From_Robot);
}
}