studio-neptune/yuuki
1
1
Fork 0
mirror of https://github.com/studio-neptune/yuuki.git synced 2024-11-10 17:14:06 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

Update

Browse source
This commit is contained in:
SuperSonic 2019-08-25 02:04:49 +08:00
parent 8e0e13ea5f
commit ec3f70249e
2 changed files with 23 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
libs/data.py
View file

@ -25,9 +25,9 @@ class Yuuki_Data:
"Ext_Admin":[] "Ext_Admin":[]
} }
self.Limittype = { self.LimitType = {
"Kick":{}, "KickLimit":{},
"Cancel":{} "CancelLimit":{}
} }
self.SEGrouptype = { self.SEGrouptype = {
@ -123,6 +123,15 @@ class Yuuki_Data:
def getData(self, Type): def getData(self, Type):
return self.Data[Type] return self.Data[Type]
def getLimit(self, Type):
LimitInfo = self.getData("LimitInfo")
if len(LimitInfo) != 2:
LimitInfo = self.LimitType
if Type == "Kick":
return LimitInfo["KickLimit"]
elif Type == "Cancel":
return LimitInfo["CancelLimit"]
def getGroup(self, GroupID): def getGroup(self, GroupID):
Groups = self.getData("Group") Groups = self.getData("Group")
if len(Groups) > 0: if len(Groups) > 0:

22
libs/yuuki.py
View file

@ -53,8 +53,8 @@ class Yuuki:
for client in [self.client] + self.Connect.helper: for client in [self.client] + self.Connect.helper:
if len(self.data.getData("LimitInfo")) != 2: if len(self.data.getData("LimitInfo")) != 2:
self.data.updateData(self.data.getData("LimitInfo")["KickLimit"], client, self.KickLimit) self.data.updateData(self.data.getLimit("Kick"), client, self.KickLimit)
self.data.updateData(self.data.getData("LimitInfo")["CancelLimit"], client, self.CancelLimit) self.data.updateData(self.data.getLimit("Cancel"), client, self.CancelLimit)
self.MyMID = self.client.getProfile().mid self.MyMID = self.client.getProfile().mid
@ -141,7 +141,7 @@ class Yuuki:
self.client.leaveGroup(self.Seq, cleanInvitations) self.client.leaveGroup(self.Seq, cleanInvitations)
def getContact(self, userId): def getContact(self, userId):
if len(userId) == len(self.userId) and userId[0] == "u": if len(userId) == len(self.MyMID) and userId[0] == "u":
try: try:
contactInfo = self.getContact(userId) contactInfo = self.getContact(userId)
except: except:
@ -171,37 +171,37 @@ class Yuuki:
def limitReset(self): def limitReset(self):
for client in [self.client] + self.Connect.helper: for client in [self.client] + self.Connect.helper:
if len(self.data.getData("LimitInfo")) != 2: if len(self.data.getData("LimitInfo")) != 2:
self.data.updateData(self.data.getData("LimitInfo")["KickLimit"], client, self.KickLimit) self.data.updateData(self.data.getLimit("Kick"), client, self.KickLimit)
self.data.updateData(self.data.getData("LimitInfo")["CancelLimit"], client, self.CancelLimit) self.data.updateData(self.data.getLimit("Cancel"), client, self.CancelLimit)
def cancelSomeone(self, groupId, userId, exceptAccount=None): def cancelSomeone(self, groupId, userId, exceptAccount=None):
if len(self.Connect.helper) >= 1: if len(self.Connect.helper) >= 1:
accounts = self.data.getData("LimitInfo")["CancelLimit"] accounts = self.data.getLimit("Cancel")
if exceptAccount: if exceptAccount:
accounts[exceptAccount] = -1 accounts[exceptAccount] = -1
helper = max(accounts, key=accounts.get) helper = max(accounts, key=accounts.get)
else: else:
helper = self.client helper = self.client
if self.data.getData("LimitInfo")["CancelLimit"][helper] > 0: if self.data.getLimit("Cancel")[helper] > 0:
helper.cancelGroupInvitation(self.Seq, groupId, [userId]) helper.cancelGroupInvitation(self.Seq, groupId, [userId])
self.data.getData("LimitInfo")["CancelLimit"][helper] -= 1 self.data.getLimit("Cancel")[helper] -= 1
self.data.syncData() self.data.syncData()
else: else:
self.sendText(groupId, _("Cancel Limit.")) self.sendText(groupId, _("Cancel Limit."))
def kickSomeone(self, groupId, userId, exceptAccount=None): def kickSomeone(self, groupId, userId, exceptAccount=None):
if len(self.Connect.helper) >= 1: if len(self.Connect.helper) >= 1:
accounts = self.data.getData("LimitInfo")["KickLimit"] accounts = self.data.getLimit("Kick")
if exceptAccount: if exceptAccount:
accounts[exceptAccount] = -1 accounts[exceptAccount] = -1
helper = max(accounts, key=accounts.get) helper = max(accounts, key=accounts.get)
else: else:
helper = self.client helper = self.client
if self.data.getData("LimitInfo")["KickLimit"][helper] > 0: if self.data.getLimit("Kick")[helper] > 0:
helper.kickoutFromGroup(self.Seq, groupId, [userId]) helper.kickoutFromGroup(self.Seq, groupId, [userId])
self.data.getData("LimitInfo")["KickLimit"][helper] -= 1 self.data.getLimit("Kick")[helper] -= 1
self.data.syncData() self.data.syncData()
else: else:
self.sendText(groupId, _("Kick Limit.")) self.sendText(groupId, _("Kick Limit."))