This commit is contained in:
SuperSonic 2019-08-27 14:55:22 +08:00
parent 864f3b1934
commit cfcf22c5b7
2 changed files with 11 additions and 8 deletions

View file

@ -148,21 +148,20 @@ class Yuuki_Data:
return self.Data[Type]
def getLimit(self, Type):
LimitInfo = self.getData("LimitInfo")
if Type == "Kick":
Limit = {}
for Mode in LimitInfo["KickLimit"]:
Limit[Mode] = int(LimitInfo["KickLimit"][Mode])
for Mode in self.getData("LimitInfo", "KickLimit"):
Limit[Mode] = int(self.getData("LimitInfo", ["KickLimit", Mode], 3))
elif Type == "Cancel":
Limit = {}
for Mode in LimitInfo["CancelLimit"]:
Limit[Mode] = int(LimitInfo["CancelLimit"][Mode])
for Mode in self.getData("LimitInfo", "CancelLimit"):
Limit[Mode] = int(self.getData("LimitInfo", ["CancelLimit", Mode], 3))
else:
Limit = None
return Limit
def getSEGroup(self, GroupID):
SEMode = self.getGroup(GroupID)["SEGroup"]
SEMode = self.getData("Group", GroupID)["SEGroup"]
if SEMode == None:
return None
SEMode_ = {}

View file

@ -464,6 +464,8 @@ class Yuuki:
NOTIFIED_ACCEPT_GROUP_INVITATION (17)
NOTIFIED_KICKOUT_FROM_GROUP (19)
"""
Security_Access = False
(GroupID, Action, Another) = self.securityForWhere(ncMessage)
SEGroup = self.data.getSEGroup(GroupID)
@ -474,9 +476,11 @@ class Yuuki:
return
if SEGroup == None:
return
Security_Access = self.SecurityService
elif SEGroup[ncMessage.type]:
Security_Access = SEGroup[ncMessage.type]
if SEGroup[ncMessage.type] and self.SecurityService:
if Security_Access and self.SecurityService:
if ncMessage.type == OpType.NOTIFIED_UPDATE_GROUP:
if Another == '4':
if not GroupInfo.preventJoinByTicket: