Skip to content

Commit 6861229

Browse files
committed
refactor(db): use early exit to improve code
1 parent f1d7e69 commit 6861229

File tree

1 file changed

+12
-11
lines changed

1 file changed

+12
-11
lines changed

database/database.py

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -155,11 +155,12 @@ def get_admins(self):
155155
def get_lang_id(self, chat_id):
156156
self.cursor.execute("SELECT lang_id FROM chats WHERE chat_id=?;", [str(chat_id)])
157157
result = self.cursor.fetchone()
158-
if result:
159-
if result[0]:
160-
# Make sure that the database stored an actual value and not "None"
161-
return result[0]
162-
return "en"
158+
159+
if not result or not result["lang_id"]:
160+
# Make sure that the database stored an actual value and not "None"
161+
return "en"
162+
163+
return result["lang_id"]
163164

164165
def set_lang_id(self, chat_id, lang_id):
165166
if lang_id is None:
@@ -207,17 +208,17 @@ def is_user_saved(self, user_id):
207208

208209
def user_data_changed(self, user_id, first_name, last_name, username):
209210
self.cursor.execute("SELECT * FROM users WHERE user_id=?;", [str(user_id)])
210-
211211
result = self.cursor.fetchone()
212212

213213
# check if user is saved
214-
if result:
215-
if result[2] == first_name and result[3] == last_name and result[4] == username:
216-
return False
217-
return True
218-
else:
214+
if not result:
219215
return True
220216

217+
if result["first_name"] == first_name and result["last_name"] == last_name and result["username"] == username:
218+
return False
219+
220+
return True
221+
221222
def update_user_data(self, user_id, first_name, last_name, username):
222223
self.cursor.execute("UPDATE users SET first_name=?, last_name=?, username=? WHERE user_id=?;", [first_name, last_name, username, str(user_id)])
223224
self.connection.commit()

0 commit comments

Comments
 (0)