Miroslavsckaya/tg_rss_bot
1
1
Fork 0
Code Issues 7 Pull requests Projects 1 Releases Activity

Fixing notification error when date is None. #48

Merged
Miroslavsckaya merged 1 commit from fix_47 into master 2023-06-26 15:58:26 +00:00
Conversation 0 Commits 1 Files changed 2 +8 -2
2 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
rss.py
View file

@ -10,7 +10,9 @@ class FeedItem:
self.title = item.get('title', '') self.title = item.get('title', '')
self.description = item.get('summary', '') self.description = item.get('summary', '')
self.guid = item.get('id', '') self.guid = item.get('id', '')
if 'published' in item: if 'updated' in item:
self.date = datetime.fromtimestamp(mktime(item.updated_parsed))
elif 'published' in item:
self.date = datetime.fromtimestamp(mktime(item.published_parsed)) self.date = datetime.fromtimestamp(mktime(item.published_parsed))
else: else:
self.date = None self.date = None

6
telegram.py
View file

@ -163,9 +163,13 @@ class Notifier:
self.sent_counter += 1 self.sent_counter += 1
def __format_message(self, item: FeedItem) -> str: def __format_message(self, item: FeedItem) -> str:
date_string = ''
if item.date is not None:
date_string = item.date.strftime('%m.%d.%Y %H:%M')
return ( return (
f"<strong><a href=\"{item.url}\">{item.title}</a></strong>\n" f"<strong><a href=\"{item.url}\">{item.title}</a></strong>\n"
f"{item.date.strftime('%m.%d.%Y %H:%M')}\n\n" f"{date_string}\n\n"
f"{self.__sanitize_html(item.description)}" f"{self.__sanitize_html(item.description)}"
) )