sch/BukuBot
1
0
Fork 0
mirror of https://codeberg.org/sch/BukuBot synced 2024-10-05 19:55:48 +02:00
Code Issues 3 Projects Releases Packages Wiki Activity Actions

Fix error upon an attempt to display information from an id which does not exist; Allow a deletion of multiple bookmarks.

Browse source
This commit is contained in:
Schimon Jehudah, Adv. 2024-06-02 18:51:00 +03:00
parent b1891f33ac
commit e27e87c43b
1 changed files with 22 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
bukubot/xmpp/chat.py
View file

@ -48,7 +48,7 @@ class Chat:
case _ if message_lowercase.startswith('id'): case _ if message_lowercase.startswith('id'):
idx = message_lowercase[2:] idx = message_lowercase[2:]
result = bookmarks_db.get_rec_by_id(idx) result = bookmarks_db.get_rec_by_id(idx)
message_body = Chat.format_message(result, extended=True) message_body = Chat.format_message(result, extended=True) if result else 'Index{} does not exist.'.format(idx)
case 'last': case 'last':
idx = bookmarks_db.get_max_id() idx = bookmarks_db.get_max_id()
result = bookmarks_db.get_rec_by_id(idx) result = bookmarks_db.get_rec_by_id(idx)
@ -79,17 +79,26 @@ class Chat:
# message_body = bookmark_regexp(message[7:]) # message_body = bookmark_regexp(message[7:])
case _ if message_lowercase.startswith('del '): case _ if message_lowercase.startswith('del '):
val = message_lowercase[4:] val = message_lowercase[4:]
ixs = message_lowercase[4:].split(',')
message_body = ''
ixs_accepted = []
ixs_rejected = []
for ix in ixs:
try: try:
idx = int(val) ixs_accepted.append(int(ix))
except: except:
idx = bookmarks_db.get_rec_id(val) ixs_rejected.append(ix)
bookmark = bookmarks_db.get_rec_by_id(idx) ixs_accepted.sort(reverse=True)
message_body = Chat.format_message(bookmark, extended=True) if bookmark else '' for ix in ixs_accepted:
result = bookmarks_db.delete_rec(idx) bookmark = bookmarks_db.get_rec_by_id(ix)
if bookmark: message_body += Chat.format_message(bookmark, extended=True)
result = bookmarks_db.delete_rec(ix)
if result: if result:
message_body += '\n*Bookmark has been deleted.*' message_body += '\n*Bookmark has been deleted.*\n'
else: else:
message_body += '\n*No action has been taken for index {}*'.format(idx) message_body += '*Index {} does not exist.*\n'.format(ix)
message_body += '\n'
message_body += '*Rejected indexes:* {} (ID must be a number)'.format(', '.join(ixs_rejected))
case _ if message_lowercase.startswith('mod '): case _ if message_lowercase.startswith('mod '):
message_lowercase_split = message_lowercase[4:].split(' ') message_lowercase_split = message_lowercase[4:].split(' ')
if len(message_lowercase_split) > 2: if len(message_lowercase_split) > 2:
@ -126,14 +135,9 @@ class Chat:
message_lowercase.startswith('tag -')): message_lowercase.startswith('tag -')):
message_lowercase_split = message_lowercase[4:].split(' ') message_lowercase_split = message_lowercase[4:].split(' ')
try: try:
int(message_lowercase_split[1])
if len(message_lowercase_split) > 2: if len(message_lowercase_split) > 2:
arg = message_lowercase_split[0] arg = message_lowercase_split[0]
val = message_lowercase_split[1] idx = int(message_lowercase_split[1])
try:
idx = int(val)
except:
idx = bookmarks_db.get_rec_id(val)
# tag = ',' + ' '.join(message_lowercase_split[2:]) + ',' # tag = ',' + ' '.join(message_lowercase_split[2:]) + ','
# tag = ' '.join(message_lowercase_split[2:]) # tag = ' '.join(message_lowercase_split[2:])
tag = arg + ',' + ' '.join(message_lowercase_split[2:]) tag = arg + ',' + ' '.join(message_lowercase_split[2:])