mirror of
https://codeberg.org/sch/BukuBot
synced 2024-12-22 09:55:24 +01:00
Set argument extended as optional (default is False)
This commit is contained in:
parent
6d921ab070
commit
27f843d3b6
1 changed files with 9 additions and 9 deletions
18
slixmark.py
18
slixmark.py
|
@ -220,11 +220,11 @@ class Slixmark(slixmpp.ClientXMPP):
|
|||
case _ if message_lowercase.startswith('id'):
|
||||
idx = message_lowercase[2:]
|
||||
result = bookmarks_db.get_rec_by_id(idx)
|
||||
message_body = self.format_message(result, True)
|
||||
message_body = self.format_message(result, extended=True)
|
||||
case 'last':
|
||||
idx = bookmarks_db.get_max_id()
|
||||
result = bookmarks_db.get_rec_by_id(idx)
|
||||
message_body = self.format_message(result, False)
|
||||
message_body = self.format_message(result)
|
||||
case _ if message_lowercase.startswith('search any '):
|
||||
query = message_lowercase[11:]
|
||||
query = query.split(' ')
|
||||
|
@ -234,7 +234,7 @@ class Slixmark(slixmpp.ClientXMPP):
|
|||
regex=False)
|
||||
message_body = '*Results for query: {}*\n\n'.format(query)
|
||||
for result in results:
|
||||
message_body += self.format_message(result, False) + '\n\n'
|
||||
message_body += self.format_message(result) + '\n\n'
|
||||
message_body += '*Total of {} results*'.format(len(results))
|
||||
case _ if message_lowercase.startswith('search '):
|
||||
query = message_lowercase[7:]
|
||||
|
@ -245,7 +245,7 @@ class Slixmark(slixmpp.ClientXMPP):
|
|||
regex=False)
|
||||
message_body = '*Results for query: {}*\n\n'.format(query)
|
||||
for result in results:
|
||||
message_body += self.format_message(result, False) + '\n\n'
|
||||
message_body += self.format_message(result) + '\n\n'
|
||||
message_body += '*Total of {} results*\n\n'.format(len(results))
|
||||
# elif message.startswith('regex'):
|
||||
# message_body = bookmark_regexp(message[7:])
|
||||
|
@ -256,7 +256,7 @@ class Slixmark(slixmpp.ClientXMPP):
|
|||
except:
|
||||
idx = bookmarks_db.get_rec_id(val)
|
||||
bookmark = bookmarks_db.get_rec_by_id(idx)
|
||||
message_body = self.format_message(bookmark, True) if bookmark else ''
|
||||
message_body = self.format_message(bookmark, extended=True) if bookmark else ''
|
||||
result = bookmarks_db.delete_rec(idx)
|
||||
if result:
|
||||
message_body += '\n*Bookmark has been deleted.*'
|
||||
|
@ -283,7 +283,7 @@ class Slixmark(slixmpp.ClientXMPP):
|
|||
message_body = ('*Invalid argument. '
|
||||
'Must be "name" or "note".*\n')
|
||||
bookmark = bookmarks_db.get_rec_by_id(idx)
|
||||
message_body += self.format_message(bookmark, True) if bookmark else ''
|
||||
message_body += self.format_message(bookmark, extended=True) if bookmark else ''
|
||||
if result:
|
||||
message_body += '\n*Bookmark has been deleted.*'
|
||||
else:
|
||||
|
@ -312,7 +312,7 @@ class Slixmark(slixmpp.ClientXMPP):
|
|||
result = bookmarks_db.update_rec(idx, tags_in=tag)
|
||||
bookmark = bookmarks_db.get_rec_by_id(idx)
|
||||
if result:
|
||||
message_body = self.format_message(bookmark, True) if bookmark else ''
|
||||
message_body = self.format_message(bookmark, extended=True) if bookmark else ''
|
||||
message_body += '\n*Bookmark has been updated.*'
|
||||
else:
|
||||
message_body = '\n*No action has been taken for index {}*'.format(idx)
|
||||
|
@ -327,7 +327,7 @@ class Slixmark(slixmpp.ClientXMPP):
|
|||
results = bookmarks_db.search_by_tag(tag)
|
||||
message_body = '*Results for tag: {}*\n\n'.format(tag)
|
||||
for result in results:
|
||||
message_body += self.format_message(result, False) + '\n\n'
|
||||
message_body += self.format_message(result) + '\n\n'
|
||||
message_body += '*Total of {} results*'.format(len(results))
|
||||
case _:
|
||||
message_body = ('Unknown command. Send "help" for list '
|
||||
|
@ -335,7 +335,7 @@ class Slixmark(slixmpp.ClientXMPP):
|
|||
message.reply(message_body).send()
|
||||
#message.reply("Thanks for sending\n%(body)s" % message).send()
|
||||
|
||||
def format_message(self, bookmark, extended):
|
||||
def format_message(self, bookmark, extended=False):
|
||||
idx = bookmark.id
|
||||
url = bookmark.url
|
||||
name = bookmark.title if bookmark.title else 'Untitled'
|
||||
|
|
Loading…
Reference in a new issue