star-inc/yuuki
1
1
Fork 0
mirror of https://github.com/star-inc/yuuki.git synced 2024-09-20 07:16:30 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update

Browse source
This commit is contained in:
SuperSonic 2019-08-27 15:22:35 +08:00
parent cfcf22c5b7
commit 6ca98f1fe0
2 changed files with 26 additions and 26 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
libs/data.py
View file

@ -130,18 +130,18 @@ class Yuuki_Data:
Time = time.localtime(time.time())
return time.strftime(format, Time)
def getData(self, Type, Query=None, Level=2):
if Query != None:
if Level == 2:
def getData(self, Type, Query=None):
if type(Query) == list:
if len(Query) == 1:
if Query not in self.Data[Type]:
self.Data[Type][Query] = self.initType[Query]
else:
return self.Data[Type][Query]
elif Level == 3 and type(Query) == list:
if Query[1] not in self.Data[Type]:
self.Data[Type][Query[0]][Query[1]] = self.initType[Query[1]]
else:
return self.Data[Type][Query[0]][Query[1]]
self.Data[Type][Query] = self.initType[Type]
return self.Data[Type][Query]
elif len(Query) == 2:
if Query[0] not in self.Data[Type]:
self.Data[Type][Query[0]] = self.initType[Type]
if Query[1] not in self.Data[Type][Query]:
self.Data[Type][Query[0]][Query[1]] = self.initType[Query[0]]
return self.Data[Type][Query[0]][Query[1]]
else:
assert "Error Query Level"
else:
@ -150,12 +150,12 @@ class Yuuki_Data:
def getLimit(self, Type):
if Type == "Kick":
Limit = {}
for Mode in self.getData("LimitInfo", "KickLimit"):
Limit[Mode] = int(self.getData("LimitInfo", ["KickLimit", Mode], 3))
for userId in self.getData("LimitInfo", "KickLimit"):
Limit[userId] = int(self.getData("LimitInfo", ["KickLimit", userId], 3))
elif Type == "Cancel":
Limit = {}
for Mode in self.getData("LimitInfo", "CancelLimit"):
Limit[Mode] = int(self.getData("LimitInfo", ["CancelLimit", Mode], 3))
for userId in self.getData("LimitInfo", "CancelLimit"):
Limit[userId] = int(self.getData("LimitInfo", ["CancelLimit", userId], 3))
else:
Limit = None
return Limit

22
libs/yuuki.py
View file

@ -173,10 +173,10 @@ class Yuuki:
return Accounts[count]
def getGroupTicket(self, GroupID, userId):
GroupTicket = self.data.getData("Group", [GroupID, "GroupTicket"], 3)
GroupTicket = self.data.getData("Group", [GroupID, "GroupTicket"])
if GroupTicket == "":
GroupTicket = self.getClientByMid(userId).reissueGroupTicket(GroupID)
self.data.updateData(self.data.getData("Group", [GroupID, "GroupTicket"], 3), userId, GroupTicket)
self.data.updateData(self.data.getData("Group", [GroupID, "GroupTicket"]), userId, GroupTicket)
return GroupTicket
def limitReset(self, reconnect=False):
@ -361,7 +361,7 @@ class Yuuki:
elif self.YuukiConfigs["name"] + '/Enable' == msgSep[0]:
if ncMessage.message.toType == MIDType.GROUP:
GroupInfo = self.client.getGroup(ncMessage.message.to)
GroupPrivilege = self.Admin + [self.sybGetGroupCreator(GroupInfo).mid] + self.data.getData("Group", GroupInfo.id)["Ext_Admin"]
GroupPrivilege = self.Admin + [self.sybGetGroupCreator(GroupInfo).mid] + self.data.getData("Group", [GroupInfo.id, "Ext_Admin"])
if ncMessage.message.from_ in GroupPrivilege:
status = []
for code in msgSep:
@ -374,7 +374,7 @@ class Yuuki:
elif self.YuukiConfigs["name"] + '/Disable' == msgSep[0]:
if ncMessage.message.toType == MIDType.GROUP:
GroupInfo = self.client.getGroup(ncMessage.message.to)
GroupPrivilege = self.Admin + [self.sybGetGroupCreator(GroupInfo).mid] + self.data.getData("Group", GroupInfo.id)["Ext_Admin"]
GroupPrivilege = self.Admin + [self.sybGetGroupCreator(GroupInfo).mid] + self.data.getData("Group", [GroupInfo.id, "Ext_Admin"])
if ncMessage.message.from_ in GroupPrivilege:
status = []
for code in msgSep:
@ -391,23 +391,23 @@ class Yuuki:
if ncMessage.message.from_ in GroupPrivilege and len(msgSep) == 3:
if msgSep[1] == "add":
if msgSep[2] in [Member.mid for Member in GroupInfo.members]:
if msgSep[2] in self.data.getData("Group", GroupInfo.id)["Ext_Admin"]:
if msgSep[2] in self.data.getData("Group", [GroupInfo.id, "Ext_Admin"]):
self.sendText(self.sendToWho(ncMessage), _("Added"))
elif msgSep[2] not in self.data.getData("BlackList"):
self.data.updateData(self.data.getData("Group", GroupInfo.id)["Ext_Admin"], True, msgSep[2])
self.data.updateData(self.data.getData("Group", [GroupInfo.id, "Ext_Admin"]), True, msgSep[2])
self.sendText(self.sendToWho(ncMessage), _("Okay"))
else:
self.sendText(self.sendToWho(ncMessage), _("The User(s) was in our blacklist database."))
else:
self.sendText(self.sendToWho(ncMessage), _("Wrong UserID or the guy is not in Group"))
elif msgSep[1] == "delete":
if msgSep[2] in self.data.getData("Group", GroupInfo.id)["Ext_Admin"]:
self.data.updateData(self.data.getData("Group", GroupInfo.id)["Ext_Admin"], False, msgSep[2])
if msgSep[2] in self.data.getData("Group", [GroupInfo.id, "Ext_Admin"]):
self.data.updateData(self.data.getData("Group", [GroupInfo.id, "Ext_Admin"]), False, msgSep[2])
self.sendText(self.sendToWho(ncMessage), _("Okay"))
else:
self.sendText(self.sendToWho(ncMessage), _("Not Found"))
else:
self.sendText(self.sendToWho(ncMessage), str(self.data.getData("Group", GroupInfo.id)["Ext_Admin"]))
self.sendText(self.sendToWho(ncMessage), str(self.data.getData("Group", [GroupInfo.id, "Ext_Admin"])))
elif self.YuukiConfigs["name"] + '/Status' == ncMessage.message.text:
if ncMessage.message.toType == MIDType.GROUP:
GroupInfo = self.client.getGroup(ncMessage.message.to)
@ -428,7 +428,7 @@ class Yuuki:
elif self.YuukiConfigs["name"] + '/Quit' == ncMessage.message.text:
if ncMessage.message.toType == MIDType.GROUP:
GroupInfo = self.client.getGroup(ncMessage.message.to)
GroupPrivilege = self.Admin + [self.sybGetGroupCreator(GroupInfo).mid] + self.data.getData("Group", GroupInfo.id)["Ext_Admin"]
GroupPrivilege = self.Admin + [self.sybGetGroupCreator(GroupInfo).mid] + self.data.getData("Group", [GroupInfo.id, "Ext_Admin"])
if ncMessage.message.from_ in GroupPrivilege:
self.sendText(self.sendToWho(ncMessage), _("Bye Bye"))
self.client.leaveGroup(self.Seq, GroupInfo.id)
@ -470,7 +470,7 @@ class Yuuki:
SEGroup = self.data.getSEGroup(GroupID)
GroupInfo = self.client.getGroup(GroupID)
GroupPrivilege = self.Admin + [self.sybGetGroupCreator(GroupInfo).mid] + self.data.getData("Group", GroupInfo.id)["Ext_Admin"]
GroupPrivilege = self.Admin + [self.sybGetGroupCreator(GroupInfo).mid] + self.data.getData("Group", [GroupInfo.id, "Ext_Admin"])
if Action in GroupPrivilege or Another in GroupPrivilege:
return