From 1ea4f7186275c8270fa045b3e777f1dd4ef4b80c Mon Sep 17 00:00:00 2001 From: Tulir Asokan Date: Wed, 28 Nov 2018 15:29:23 +0200 Subject: [PATCH] Use maubot's send_markdown method instead of manually using commonmark --- rss/bot.py | 16 +++++----------- 1 file changed, 5 insertions(+), 11 deletions(-) diff --git a/rss/bot.py b/rss/bot.py index c5f0f71..a9b8bdf 100644 --- a/rss/bot.py +++ b/rss/bot.py @@ -20,13 +20,11 @@ from string import Template import asyncio import aiohttp -import commonmark import feedparser from maubot import Plugin, MessageEvent from mautrix.util.config import BaseProxyConfig, ConfigUpdateHelper -from mautrix.types import (EventType, MessageType, RoomID, EventID, PowerLevelStateEventContent, - TextMessageEventContent, Format) +from mautrix.types import EventType, MessageType, RoomID, EventID, PowerLevelStateEventContent from .db import Database, Feed, Entry, Subscription @@ -67,19 +65,15 @@ class RSSBot(Plugin): except Exception: self.log.exception("Fatal error while polling feeds") - def _send(self, feed: Feed, entry: Entry, template: Template, room_id: RoomID) -> Awaitable[EventID]: - message = template.safe_substitute({ + def _send(self, feed: Feed, entry: Entry, template: Template, room_id: RoomID + ) -> Awaitable[EventID]: + return self.client.send_markdown(room_id, template.safe_substitute({ "feed_url": feed.url, "feed_title": feed.title, "feed_subtitle": feed.subtitle, "feed_link": feed.link, **entry._asdict(), - }) - content = TextMessageEventContent(msgtype=MessageType.NOTICE, - body=message, - format=Format.HTML, - formatted_body=commonmark.commonmark(message)) - return self.client.send_message(room_id, content) + }), msgtype=MessageType.NOTICE) async def _broadcast(self, feed: Feed, entry: Entry, subscriptions: List[Subscription]) -> None: spam_sleep = self.config["spam_sleep"]