From 9147d128afc733a5b79947691acb2aaeb0b28c12 Mon Sep 17 00:00:00 2001 From: aikaterna <20862007+aikaterna@users.noreply.github.com> Date: Sat, 16 Oct 2021 14:05:09 -0700 Subject: [PATCH] [RSS] Black format @ 120 --- rss/rss.py | 72 ++++++++++++++++++++++++++++++++++++++---------------- 1 file changed, 51 insertions(+), 21 deletions(-) diff --git a/rss/rss.py b/rss/rss.py index 1fd2838..44f7063 100644 --- a/rss/rss.py +++ b/rss/rss.py @@ -47,7 +47,7 @@ class RSS(commands.Cog): self._read_feeds_loop = None - self._headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0'} + self._headers = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:83.0) Gecko/20100101 Firefox/83.0"} def initialize(self): self._read_feeds_loop = self.bot.loop.create_task(self.read_feeds()) @@ -589,7 +589,7 @@ class RSS(commands.Cog): except NoFeedContent as e: await ctx.send(str(e)) return - + if valid_url: await self._add_feed(ctx, feed_name.lower(), channel, url) else: @@ -601,7 +601,9 @@ class RSS(commands.Cog): pass @_rss_embed.command(name="color", aliases=["colour"]) - async def _rss_embed_color(self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, *, color: str = None): + async def _rss_embed_color( + self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, *, color: str = None + ): """ Set an embed color for a feed. @@ -657,7 +659,9 @@ class RSS(commands.Cog): await ctx.send(f"Embed color for {bold(feed_name)} set to {user_facing_hex} ({color_name}).") @_rss_embed.command(name="image") - async def _rss_embed_image(self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, image_tag_name: str = None): + async def _rss_embed_image( + self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, image_tag_name: str = None + ): """ Set a tag to be a large embed image. @@ -689,7 +693,9 @@ class RSS(commands.Cog): msg += "will be in tags named `$content_image02`, `$content_image03`, etc. Not every feed entry " msg += "will have the same amount of scraped image tags. Images can also be found under tags named " msg += "`$media_content_plaintext`, if present.\nExperiment with tags by setting them as your " - msg += f"template with `{ctx.prefix}rss template` and using `{ctx.prefix}rss force` to view the content." + msg += ( + f"template with `{ctx.prefix}rss template` and using `{ctx.prefix}rss force` to view the content." + ) await ctx.send(msg) return @@ -704,7 +710,9 @@ class RSS(commands.Cog): ) @_rss_embed.command(name="thumbnail") - async def _rss_embed_thumbnail(self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, thumbnail_tag_name: str = None): + async def _rss_embed_thumbnail( + self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, thumbnail_tag_name: str = None + ): """ Set a tag to be a thumbnail image. @@ -736,7 +744,9 @@ class RSS(commands.Cog): msg += "will be in tags named `$content_image02`, `$content_image03`, etc. Not every feed entry " msg += "will have the same amount of scraped image tags. Images can also be found under tags named " msg += "`$media_content_plaintext`, if present.\nExperiment with tags by setting them as your " - msg += f"template with `{ctx.prefix}rss template` and using `{ctx.prefix}rss force` to view the content." + msg += ( + f"template with `{ctx.prefix}rss template` and using `{ctx.prefix}rss force` to view the content." + ) await ctx.send(msg) return @@ -791,7 +801,9 @@ class RSS(commands.Cog): await ctx.send("I can't reach that website.") return except aiohttp.client_exceptions.InvalidURL: - await ctx.send("That seems to be an invalid URL. Use a full website URL like `https://www.site.com/`.") + await ctx.send( + "That seems to be an invalid URL. Use a full website URL like `https://www.site.com/`." + ) return except asyncio.exceptions.TimeoutError: await ctx.send("The site didn't respond in time or there was no response.") @@ -818,7 +830,7 @@ class RSS(commands.Cog): continue if feed_url.startswith("//"): final_url = f"{url_scheme}:{feed_url}" - elif ((not ls_feed_url.startswith(url_scheme)) and (not ls_feed_url.startswith(base_url))): + elif (not ls_feed_url.startswith(url_scheme)) and (not ls_feed_url.startswith(base_url)): final_url = f"{url_scheme}://{base_url}/{ls_feed_url}" elif ls_feed_url.startswith(base_url): final_url = f"{url_scheme}://{base_url}" @@ -854,7 +866,9 @@ class RSS(commands.Cog): await self.get_current_feed(channel, feed_name, rss_feed, force=True) @rss.command(name="limit") - async def _rss_limit(self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, character_limit: int = None): + async def _rss_limit( + self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, character_limit: int = None + ): """ Set a character limit for feed posts. Use 0 for unlimited. @@ -1011,7 +1025,7 @@ class RSS(commands.Cog): if not override_list: msg = "No site overrides saved." else: - msg = "Active for:\n" + '\n'.join(override_list) + msg = "Active for:\n" + "\n".join(override_list) await ctx.send(box(msg)) @_rss_parse.command(name="remove", aliases=["delete", "del"]) @@ -1112,7 +1126,9 @@ class RSS(commands.Cog): pass @_rss_tag.command(name="allow") - async def _rss_tag_allow(self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, *, tag: str = None): + async def _rss_tag_allow( + self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, *, tag: str = None + ): """ Set an allowed tag for a feed to be posted. The tag must match exactly (without regard to title casing). No regex or placeholder qualification. @@ -1128,12 +1144,16 @@ class RSS(commands.Cog): async with self.config.channel(channel).feeds() as feed_data: allowed_tags = feed_data[feed_name].get("allowed_tags", []) if tag.lower() in [x.lower() for x in allowed_tags]: - return await ctx.send(f"{bold(await self._title_case(tag))} is already in the allowed list for {bold(feed_name)}.") + return await ctx.send( + f"{bold(await self._title_case(tag))} is already in the allowed list for {bold(feed_name)}." + ) allowed_tags.append(tag.lower()) feed_data[feed_name]["allowed_tags"] = allowed_tags - await ctx.send(f"{bold(await self._title_case(tag))} was added to the list of allowed tags for {bold(feed_name)}. " - "If a feed post's `$tags` does not include this value, the feed will not post.") + await ctx.send( + f"{bold(await self._title_case(tag))} was added to the list of allowed tags for {bold(feed_name)}. " + "If a feed post's `$tags` does not include this value, the feed will not post." + ) @_rss_tag.command(name="allowlist") async def _rss_tag_allowlist(self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None): @@ -1157,7 +1177,9 @@ class RSS(commands.Cog): await ctx.send(box(msg, lang="ini")) @_rss_tag.command(name="remove", aliases=["delete"]) - async def _rss_tag_remove(self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, *, tag: str = None): + async def _rss_tag_remove( + self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, *, tag: str = None + ): """ Remove a tag from the allow list. The tag must match exactly (without regard to title casing). No regex or placeholder qualification. @@ -1173,12 +1195,18 @@ class RSS(commands.Cog): try: allowed_tags.remove(tag.lower()) feed_data[feed_name]["allowed_tags"] = allowed_tags - await ctx.send(f"{bold(await self._title_case(tag))} was removed from the list of allowed tags for {bold(feed_name)}.") + await ctx.send( + f"{bold(await self._title_case(tag))} was removed from the list of allowed tags for {bold(feed_name)}." + ) except ValueError: - await ctx.send(f"{bold(await self._title_case(tag))} was not found in the allow list for {bold(feed_name)}.") + await ctx.send( + f"{bold(await self._title_case(tag))} was not found in the allow list for {bold(feed_name)}." + ) @rss.command(name="template") - async def _rss_template(self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, *, template: str = None): + async def _rss_template( + self, ctx, feed_name: str, channel: Optional[discord.TextChannel] = None, *, template: str = None + ): """ Set a template for the feed alert. @@ -1336,7 +1364,9 @@ class RSS(commands.Cog): feed_tag_list = [x.lower() for x in feedparser_plus_obj.get("tags_list", [])] intersection = list(set(feed_tag_list).intersection(allowed_post_tags)) if len(intersection) == 0: - log.debug(f"{name} feed post in {channel.name} ({channel.id}) was denied because of an allowed tag mismatch.") + log.debug( + f"{name} feed post in {channel.name} ({channel.id}) was denied because of an allowed tag mismatch." + ) continue # starting to fill out the template for feeds that passed tag verification (if present) @@ -1565,6 +1595,6 @@ class RSS(commands.Cog): class NoFeedContent(Exception): def __init__(self, m): self.message = m - + def __str__(self): return self.message