hyper-neptune/yuuki
1
1
Fork 0
mirror of https://github.com/hyper-neptune/yuuki.git synced 2024-11-15 19:04:37 +08:00
Code Issues Projects Releases Packages Wiki Activity Actions

v6.5.1_RC4

Browse source
This commit is contained in:
SuperSonic 2019-10-11 20:55:57 +08:00
parent 62e5ab0809
commit 8b7fa7ad01
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libs/yuuki.py
View file

@ -389,9 +389,11 @@ class Yuuki:
GroupID = ncMessage.param1 GroupID = ncMessage.param1
Inviter = ncMessage.param2 Inviter = ncMessage.param2
GroupInfo = self.getClient(self.MyMID).getGroup(GroupID) GroupInfo = self.getClient(self.MyMID).getGroup(GroupID)
GroupMember = [Catched.mid for Catched in GroupInfo.members]
GroupInvite = [Catched.mid for Catched in GroupInfo.invitee]
if GroupInfo.members: if GroupInfo.members:
GroupMember = [Catched.mid for Catched in GroupInfo.members]
GroupInfo.invitee = []
if GroupInfo.invitee:
GroupInvite = [Catched.mid for Catched in GroupInfo.invitee]
self.getClient(self.MyMID).acceptGroupInvitation(self.Seq, GroupID) self.getClient(self.MyMID).acceptGroupInvitation(self.Seq, GroupID)
if len(GroupMember) >= self.YuukiConfigs["GroupMebers_Demand"]: if len(GroupMember) >= self.YuukiConfigs["GroupMebers_Demand"]:
GroupJoined_ = YuukiVariable["GroupJoined"] GroupJoined_ = YuukiVariable["GroupJoined"]
@ -664,7 +666,7 @@ class Yuuki:
if "\x1e" in Another: if "\x1e" in Another:
for userId in Another.split("\x1e"): for userId in Another.split("\x1e"):
if userId not in self.AllAccountIds + GroupPrivilege: if userId not in self.AllAccountIds + GroupPrivilege:
if userId in [user.mid for user in GroupInfo.invitee]: if GroupInfo.invitee and userId in [user.mid for user in GroupInfo.invitee]:
Canceler = self.cancelSomeone(GroupInfo, userId) Canceler = self.cancelSomeone(GroupInfo, userId)
else: else:
Canceler = self.kickSomeone(GroupInfo, userId) Canceler = self.kickSomeone(GroupInfo, userId)
@ -673,7 +675,7 @@ class Yuuki:
# Log # Log
self.data.updateLog("CancelEvent", (self.data.getTime(), GroupInfo.name, GroupID, Canceler, Action, Another.replace("\x1e", ","))) self.data.updateLog("CancelEvent", (self.data.getTime(), GroupInfo.name, GroupID, Canceler, Action, Another.replace("\x1e", ",")))
elif Another not in self.AllAccountIds + GroupPrivilege: elif Another not in self.AllAccountIds + GroupPrivilege:
if Another in [user.mid for user in GroupInfo.invitee]: if GroupInfo.invitee and Another in [user.mid for user in GroupInfo.invitee]:
Canceler = self.cancelSomeone(GroupInfo, Another) Canceler = self.cancelSomeone(GroupInfo, Another)
else: else:
Canceler = self.kickSomeone(GroupInfo, Another) Canceler = self.kickSomeone(GroupInfo, Another)
@ -781,9 +783,7 @@ class Yuuki:
if len(cacheOperations) > 1: if len(cacheOperations) > 1:
self.revision = max(cacheOperations[-1].revision, cacheOperations[-2].revision) self.revision = max(cacheOperations[-1].revision, cacheOperations[-2].revision)
if self.data.Data != YuukiVariable["Sync"]: self.data.syncData()
self.data.Data = YuukiVariable["Sync"]
self.data.syncData()
except KeyboardInterrupt: except KeyboardInterrupt:
self.exit() self.exit()