studio-neptune/yuuki
1
1
Fork 0
mirror of https://github.com/studio-neptune/yuuki.git synced 2024-09-21 00:45:57 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

v6.5.0-alpha_RC2

Browse source
This commit is contained in:
SuperSonic 2019-08-27 16:41:36 +08:00
parent f94293c9fe
commit 03a85fc59f
2 changed files with 44 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libs/data.py
View file

@ -139,24 +139,29 @@ class Yuuki_Data:
else:
assert "Unknown DataType"
return self.Data[Type][Query]
elif type(Query) == list:
if len(Query) >= 2:
elif type(Query) == list and len(Query) > 1:
# Level 2
if Query[0] not in self.Data[Type]:
if Type in self.initType:
self.Data[Type][Query[0]] = self.initType[Type]
else:
assert "Unknown DataType"
if Query[1] not in self.Data[Type][Query[0]]:
if Type in self.initType:
if Query[0] in self.initType:
self.Data[Type][Query[0]][Query[1]] = self.initType[Query[0]]
elif Query[0] in self.DataType:
self.Data[Type][Query[0]][Query[1]] = self.DataType[Query[0]]
else:
assert "Unknown DataType"
if len(Query) == 2:
return self.Data[Type][Query[0]][Query[1]]
# Level 3
if len(Query) >= 3:
if Query[2] not in self.Data[Type][Query[0]][Query[1]]:
if Type in self.initType:
self.Data[Type][Query[0]][Query[1]][Query[2]] = self.initType[Query[0]]
if Query[1] in self.initType:
self.Data[Type][Query[0]][Query[1]][Query[2]] = self.initType[Query[1]]
elif Query[1] in self.DataType:
self.Data[Type][Query[0]][Query[1]][Query[2]] = self.DataType[Query[0]][Query[1]]
else:
assert "Unknown DataType"
if len(Query) == 3:

5
libs/yuuki.py
View file

@ -514,8 +514,7 @@ class Yuuki:
if Action in self.Connect.helper_ids:
# Log
self.data.updateLog("KickEvent", (self.data.getTime(), GroupInfo.name, GroupID, Action, Action, Another, ncMessage.type*10+1))
else:
if Another in [self.MyMID] + self.Connect.helper_ids:
elif Another in [self.MyMID] + self.Connect.helper_ids:
Kicker = "None"
try:
Kicker = self.kickSomeone(GroupID, Action, Another)
@ -523,7 +522,7 @@ class Yuuki:
self.data.updateLog("KickEvent", (self.data.getTime(), GroupInfo.name, GroupID, Kicker, Action, Another, ncMessage.type*10+2))
if GroupInfo.preventJoinByTicket:
self.changeGroupUrlStatus(GroupInfo, True, Kicker)
GroupTicket = self.getGroupTicket(GroupID)
GroupTicket = self.getGroupTicket(GroupID, Kicker)
if GroupInfo.preventJoinByTicket:
self.changeGroupUrlStatus(GroupInfo, False, Kicker)
self.getClientByMid(Another).acceptGroupInvitationByTicket(self.Seq, GroupID, GroupTicket)