From 0d56b79e97ee362d535d472da9bbd6ebe5034459 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Wikle=20DUBARD?= <loic97429@gmail.com>
Date: Wed, 21 Aug 2019 13:57:29 +0200
Subject: [PATCH] fix remove user and reinvite and rename
---
bot.py | 16 ++++++++++------
1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/bot.py b/bot.py
index 051f1bf..fbc0703 100755
--- a/bot.py
+++ b/bot.py
@@ -71,9 +71,9 @@ class Bot(Client):
'!translate <phrase> ; <lang_source> ; <lang_dest>\n' + \
'!shitpostbot5000 [status|on|off|random <keyword(facultatif)>] ... ne pas utiliser PLEASE\n' + \
'!title <newtitle>\n'\
- '!listuser <newtitle>\n'\
+ '!userlist\n'\
'!about -> vas-y test-moi !\n'
- return 'Hummmm non j\'ai la flemme là'
+ return random.choice('Hummmm non j\'ai la flemme là', help_text)
elif '!translate' in texte:
texte = texte.replace('!translate ', '').split(' ; ')
try:
@@ -103,6 +103,7 @@ class Bot(Client):
for user in self.fetchAllUsersFromThreads([self.fetchThreadInfo(thread_id)[thread_id]]):
if user.name == texte[0]:
self.changeNickname(nickname=texte[1], user_id=user.uid, thread_id=thread_id, thread_type=thread_type)
+ return None
else:
return random.choice(['T\'es sur de ton coup là ?', 'chais pas qui c\'est...'])
@@ -118,7 +119,10 @@ class Bot(Client):
author_name = user.name
if user_to_remove is not None:
log.info("{} will be removed from {} by {}".format(user_to_remove.uid, thread_id, author_id))
- self.removeUserFromGroup(user_to_remove.uid, thread_id=thread_id)
+ try:
+ self.removeUserFromGroup(user_to_remove.uid, thread_id=thread_id)
+ except:
+ return "J'ai pas le droit de faire ça moi"
if thread_id in Bot.kicked:
Bot.kicked[thread_id].append(user_to_remove)
else:
@@ -127,12 +131,12 @@ class Bot(Client):
else:
return random.choice(['T\'es sur de ton coup là ?', 'chais pas qui c\'est...'])
- elif texte == '!userlist':
- return "la liste des gens dans le groupe :\n\n" "".join([user.name for user in self.fetchAllUsersFromThreads([self.fetchThreadInfo(thread_id)[thread_id]])])
+ elif texte == '!userlist' and thread_type == Thread.GROUP:
+ return ", ".join([user.name for user in self.fetchAllUsersFromThreads([self.fetchThreadInfo(thread_id)[thread_id]])])
# réinviter le dernier mec kické du group
# TODO: test reinvite
- elif texte == '!reinvite':
+ elif texte == '!reinvite' and thread_type == Thread.GROUP:
if 'thread_id' in Bot.kicked:
self.addUsersToGroup(Bot.kicked[thread_id][-1].uid, thread_id=thread_id)
elif '!reinvite ' in texte:
--
GitLab