[O] Return user on checkUser
This commit is contained in:
+10
-10
@@ -31,42 +31,42 @@ def start(update, context):
|
|||||||
|
|
||||||
def ls(update, context):
|
def ls(update, context):
|
||||||
chat = update.effective_chat
|
chat = update.effective_chat
|
||||||
database.checkUser(chat.id)
|
user = database.checkUser(chat.id)
|
||||||
requests = database.userRequests[chat.id]
|
requests = database.userRequests[user]
|
||||||
|
|
||||||
return "Your requests: " + toJson(requests)
|
return "Your requests: %s" % toJson(requests)
|
||||||
|
|
||||||
|
|
||||||
def touch(update, context):
|
def touch(update, context):
|
||||||
chat = update.effective_chat
|
chat = update.effective_chat
|
||||||
database.checkUser(chat.id)
|
user = database.checkUser(chat.id)
|
||||||
|
|
||||||
|
|
||||||
def rm(update, context):
|
def rm(update, context):
|
||||||
chat = update.effective_chat
|
chat = update.effective_chat
|
||||||
database.checkUser(chat.id)
|
user = database.checkUser(chat.id)
|
||||||
|
|
||||||
|
|
||||||
def mv(update, context):
|
def mv(update, context):
|
||||||
chat = update.effective_chat
|
chat = update.effective_chat
|
||||||
database.checkUser(chat.id)
|
user = database.checkUser(chat.id)
|
||||||
|
|
||||||
|
|
||||||
def nano(update, context):
|
def nano(update, context):
|
||||||
chat = update.effective_chat
|
chat = update.effective_chat
|
||||||
database.checkUser(chat.id)
|
user = database.checkUser(chat.id)
|
||||||
|
|
||||||
|
|
||||||
def interval(update, context):
|
def interval(update, context):
|
||||||
chat = update.effective_chat
|
chat = update.effective_chat
|
||||||
database.checkUser(chat.id)
|
user = database.checkUser(chat.id)
|
||||||
|
|
||||||
|
|
||||||
def enable(update, context):
|
def enable(update, context):
|
||||||
chat = update.effective_chat
|
chat = update.effective_chat
|
||||||
database.checkUser(chat.id)
|
user = database.checkUser(chat.id)
|
||||||
|
|
||||||
|
|
||||||
def disable(update, context):
|
def disable(update, context):
|
||||||
chat = update.effective_chat
|
chat = update.effective_chat
|
||||||
database.checkUser(chat.id)
|
user = database.checkUser(chat.id)
|
||||||
|
|||||||
+3
-2
@@ -17,5 +17,6 @@ class Database:
|
|||||||
def checkUser(self, user):
|
def checkUser(self, user):
|
||||||
if user not in self.users:
|
if user not in self.users:
|
||||||
self.users.append(user)
|
self.users.append(user)
|
||||||
self.userRequests[user] = []
|
self.userRequests[user] = {}
|
||||||
self.userStatus[user] = []
|
self.userStatus[user] = {}
|
||||||
|
return user
|
||||||
|
|||||||
Reference in New Issue
Block a user