This commit is contained in:
SuperSonic 2019-08-25 14:23:34 +08:00
parent 244251c531
commit 0c2cd84d90
2 changed files with 10 additions and 8 deletions

View file

@ -17,7 +17,7 @@ class English:
i18nText = { i18nText = {
"Helllo^^\nMy name is Yuuki ><\nNice to meet you OwO": "Helllo^^\nMy name is Yuuki ><\nNice to meet you OwO", "Helllo^^\nMy name is Yuuki ><\nNice to meet you OwO": "Helllo^^\nMy name is Yuuki ><\nNice to meet you OwO",
"Admin of the Group\n%s": "Admin of the Group\n%s", "Type:\n\tYuuki/Help\nto get more information\nAdmin of the Group\n%s": "Type:\n\tYuuki/Help\nto get more information\nAdmin of the Group\n%s",
"URL:%s\nInvite:%s\nJoin:%s\nMembers:%s\n\nAdmin of the Group\n%s": "URL:%s\nInvite:%s\nJoin:%s\nMembers:%s\n\nAdmin of the Group\n%s", "URL:%s\nInvite:%s\nJoin:%s\nMembers:%s\n\nAdmin of the Group\n%s": "URL:%s\nInvite:%s\nJoin:%s\nMembers:%s\n\nAdmin of the Group\n%s",
"Wrong UserID or the guy is not in Group": "Wrong UserID or the guy is not in Group", "Wrong UserID or the guy is not in Group": "Wrong UserID or the guy is not in Group",
"Disable without Initialize\nAdmin of the Group\n%s": "Disable without Initialize\nAdmin of the Group\n%s", "Disable without Initialize\nAdmin of the Group\n%s": "Disable without Initialize\nAdmin of the Group\n%s",
@ -28,7 +28,7 @@ class English:
"Do not invite anyone...thanks": "Do not invite anyone...thanks", "Do not invite anyone...thanks": "Do not invite anyone...thanks",
"The User(s) was in our blacklist database.": "The User(s) was in our blacklist database.", "The User(s) was in our blacklist database.": "The User(s) was in our blacklist database.",
"You are our blacklist. Bye~": "You are our blacklist. Bye~", "You are our blacklist. Bye~": "You are our blacklist. Bye~",
"You has been blocked by our database.": "You has been blocked by our database.", "You had been blocked by our database.": "You had been blocked by our database.",
"Kick Limit.": "Kick Limit.", "Kick Limit.": "Kick Limit.",
"Testing...": "Testing...", "Testing...": "Testing...",
"Speed:\n%ss": "Speed:\n%ss", "Speed:\n%ss": "Speed:\n%ss",

View file

@ -289,7 +289,7 @@ class Yuuki:
self.client.acceptGroupInvitation(self.Seq, GroupID) self.client.acceptGroupInvitation(self.Seq, GroupID)
if len(GroupMember) >= self.YuukiConfigs["GroupMebers_Demand"]: if len(GroupMember) >= self.YuukiConfigs["GroupMebers_Demand"]:
self.sendText(GroupID, _("Helllo^^\nMy name is Yuuki ><\nNice to meet you OwO")) self.sendText(GroupID, _("Helllo^^\nMy name is Yuuki ><\nNice to meet you OwO"))
self.sendText(GroupID, _("Admin of the Group\n%s") % self.sendText(GroupID, _("Type:\n\tYuuki/Help\nto get more information\nAdmin of the Group\n%s") %
(self.sybGetGroupCreator(GroupInfo).displayName,)) (self.sybGetGroupCreator(GroupInfo).displayName,))
# Log # Log
self.data.updateLog("JoinGroup", (self.data.getTime(), GroupInfo.name, GroupID, Inviter)) self.data.updateLog("JoinGroup", (self.data.getTime(), GroupInfo.name, GroupID, Inviter))
@ -319,7 +319,9 @@ class Yuuki:
self.client.leaveRoom(self.Seq, ncMessage.message.to) self.client.leaveRoom(self.Seq, ncMessage.message.to)
elif ncMessage.message.contentType == ContentType.NONE: elif ncMessage.message.contentType == ContentType.NONE:
msgSep = ncMessage.message.text.split(" ") msgSep = ncMessage.message.text.split(" ")
if 'Yuuki/UserID' == ncMessage.message.text: if 'Yuuki/Help' == ncMessage.message.text:
self.sendText(self.sendToWho(ncMessage), "v6.5.0-alpha")
elif 'Yuuki/UserID' == ncMessage.message.text:
self.sendText(self.sendToWho(ncMessage), _("LINE System UserID\n") + ncMessage.message.from_) self.sendText(self.sendToWho(ncMessage), _("LINE System UserID\n") + ncMessage.message.from_)
elif 'Yuuki/Speed' == ncMessage.message.text: elif 'Yuuki/Speed' == ncMessage.message.text:
Time1 = time.time() Time1 = time.time()
@ -366,7 +368,7 @@ class Yuuki:
if ncMessage.message.toType == MIDType.GROUP: if ncMessage.message.toType == MIDType.GROUP:
GroupInfo = self.client.getGroup(ncMessage.message.to) GroupInfo = self.client.getGroup(ncMessage.message.to)
GroupPrivilege = self.Admin + [self.sybGetGroupCreator(GroupInfo).mid] GroupPrivilege = self.Admin + [self.sybGetGroupCreator(GroupInfo).mid]
if ncMessage.message.from_ in GroupPrivilege: if ncMessage.message.from_ in GroupPrivilege and len(msgSep) == 3:
if msgSep[1] == "add": if msgSep[1] == "add":
if msgSep[2] in [Member.mid for Member in GroupInfo.members]: if msgSep[2] in [Member.mid for Member in GroupInfo.members]:
self.data.updateData(self.data.getData("Group")[GroupInfo.id], "Ext_Admin", msgSep[2]) self.data.updateData(self.data.getData("Group")[GroupInfo.id], "Ext_Admin", msgSep[2])
@ -477,7 +479,7 @@ class Yuuki:
self.data.updateData(self.data.getData("BlackList"), True, Action) self.data.updateData(self.data.getData("BlackList"), True, Action)
# Log # Log
self.data.updateLog("BlackList", (self.data.getTime(), Action, GroupID)) self.data.updateLog("BlackList", (self.data.getTime(), Action, GroupID))
self.sendText(Action, _("You has been blocked by our database.")) self.sendText(Action, _("You had been blocked by our database."))
else: else:
self.sendText(GroupID, _("DO NOT KICK, thank you ^^")) self.sendText(GroupID, _("DO NOT KICK, thank you ^^"))
Kicker = self.kickSomeone(GroupID, ncMessage.param2) Kicker = self.kickSomeone(GroupID, ncMessage.param2)