mirror of
https://github.com/star-inc/star_yuuki_bot.git
synced 2024-09-20 14:56:19 +08:00
v6.5.1_RC3
This commit is contained in:
parent
432404a1fb
commit
e5c40d23c9
|
@ -383,12 +383,14 @@ class Yuuki:
|
||||||
ToDo Type:
|
ToDo Type:
|
||||||
NOTIFIED_INVITE_INTO_GROUP (13)
|
NOTIFIED_INVITE_INTO_GROUP (13)
|
||||||
"""
|
"""
|
||||||
|
GroupInvite = []
|
||||||
BlockedIgnore = ncMessage.param2 in self.data.getData("BlackList")
|
BlockedIgnore = ncMessage.param2 in self.data.getData("BlackList")
|
||||||
if self.checkInInvitationList(ncMessage) and not BlockedIgnore:
|
if self.checkInInvitationList(ncMessage) and not BlockedIgnore:
|
||||||
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]
|
GroupMember = [Catched.mid for Catched in GroupInfo.members]
|
||||||
|
GroupInvite = [Catched.mid for Catched in GroupInfo.invitee]
|
||||||
if GroupInfo.members:
|
if GroupInfo.members:
|
||||||
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"]:
|
||||||
|
@ -409,7 +411,7 @@ class Yuuki:
|
||||||
self.data.updateLog("JoinGroup", (self.data.getTime(), GroupID, "Not Join", Inviter))
|
self.data.updateLog("JoinGroup", (self.data.getTime(), GroupID, "Not Join", Inviter))
|
||||||
if ncMessage.param1 in YuukiVariable["GroupJoined"] and not BlockedIgnore:
|
if ncMessage.param1 in YuukiVariable["GroupJoined"] and not BlockedIgnore:
|
||||||
for userId in self.Connect.helper_ids:
|
for userId in self.Connect.helper_ids:
|
||||||
if self.checkInInvitationList(ncMessage, userId):
|
if self.checkInInvitationList(ncMessage, userId) or userId in GroupInvite:
|
||||||
self.getClient(userId).acceptGroupInvitation(self.Seq, ncMessage.param1)
|
self.getClient(userId).acceptGroupInvitation(self.Seq, ncMessage.param1)
|
||||||
self.getGroupTicket(ncMessage.param1, userId, True)
|
self.getGroupTicket(ncMessage.param1, userId, True)
|
||||||
# Log
|
# Log
|
||||||
|
|
Loading…
Reference in a new issue