Update fork even if not heroku, skip blocked roles

Author: fourjr

CHANGELOG.md

@@ -6,6 +6,16 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/).
 This project mostly adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html);
 however, insignificant breaking changes do not guarantee a major version bump, see the reasoning [here](https://github.com/kyb3r/modmail/issues/319). If you're a plugin developer, note the "BREAKING" section.
 
+# v3.7.7
+
+### Added
+
+- Added updating github fork if GITHUB_TOKEN was provided
+
+### Fixed
+
+- Skip blocked roles check if user is not in main guild
+
 # v3.7.6
 
 ### Fixed

bot.py

@@ -1,4 +1,4 @@
-__version__ = "3.7.6"
+__version__ = "3.7.7"
 
 
 import asyncio
@@ -38,6 +38,7 @@
 from core.models import (
     DMDisabled,
     HostingMethod,
+    InvalidConfigError,
     PermissionLevel,
     SafeFormatter,
     configure_logging,
@@ -633,32 +634,33 @@ def check_guild_age(self, author: discord.Member) -> bool:
         return True
 
     def check_manual_blocked_roles(self, author: discord.Member) -> bool:
-        for r in author.roles:
-            if str(r.id) in self.blocked_roles:
+        if isinstance(author, discord.Member):
+            for r in author.roles:
+                if str(r.id) in self.blocked_roles:
+
+                    blocked_reason = self.blocked_roles.get(str(r.id)) or ""
+                    now = datetime.utcnow()
+
+                    # etc "blah blah blah... until 2019-10-14T21:12:45.559948."
+                    end_time = re.search(r"until ([^`]+?)\.$", blocked_reason)
+                    if end_time is None:
+                        # backwards compat
+                        end_time = re.search(r"%([^%]+?)%", blocked_reason)
+                        if end_time is not None:
+                            logger.warning(
+                                r"Deprecated time message for user %s, block and unblock again to update.",
+                                author.name,
+                            )
 
-                blocked_reason = self.blocked_roles.get(str(r.id)) or ""
-                now = datetime.utcnow()
-
-                # etc "blah blah blah... until 2019-10-14T21:12:45.559948."
-                end_time = re.search(r"until ([^`]+?)\.$", blocked_reason)
-                if end_time is None:
-                    # backwards compat
-                    end_time = re.search(r"%([^%]+?)%", blocked_reason)
                     if end_time is not None:
-                        logger.warning(
-                            r"Deprecated time message for user %s, block and unblock again to update.",
-                            author.name,
-                        )
-
-                if end_time is not None:
-                    after = (datetime.fromisoformat(end_time.group(1)) - now).total_seconds()
-                    if after <= 0:
-                        # No longer blocked
-                        self.blocked_users.pop(str(author.id))
-                        logger.debug("No longer blocked, user %s.", author.name)
-                        return True
-                logger.debug("User blocked, user %s.", author.name)
-                return False
+                        after = (datetime.fromisoformat(end_time.group(1)) - now).total_seconds()
+                        if after <= 0:
+                            # No longer blocked
+                            self.blocked_users.pop(str(author.id))
+                            logger.debug("No longer blocked, user %s.", author.name)
+                            return True
+                    logger.debug("User blocked, user %s.", author.name)
+                    return False
 
         return True
 
@@ -1477,6 +1479,12 @@ async def autoupdate(self):
                     channel = self.log_channel
                     await channel.send(embed=embed)
             else:
+                try:
+                    # update fork if gh_token exists
+                    await self.api.update_repository()
+                except InvalidConfigError:
+                    pass
+
                 command = "git pull"
                 proc = await asyncio.create_subprocess_shell(command, stderr=PIPE, stdout=PIPE,)
                 err = await proc.stderr.read()

cogs/utility.py

@@ -1913,11 +1913,18 @@ async def update(self, ctx, *, flag: str = ""):
                         description="No further updates required",
                         color=self.bot.main_color,
                     )
+                    embed.set_footer(text="Force update")
                     embed.set_author(
                         name=user["username"], icon_url=user["avatar_url"], url=user["url"]
                     )
                 await ctx.send(embed=embed)
             else:
+                # update fork if gh_token exists
+                try:
+                    await self.bot.api.update_repository()
+                except InvalidConfigError:
+                    pass
+
                 command = "git pull"
 
                 proc = await asyncio.create_subprocess_shell(command, stderr=PIPE, stdout=PIPE,)
@@ -1954,6 +1961,7 @@ async def update(self, ctx, *, flag: str = ""):
                     embed = discord.Embed(
                         title="Already up to date", description=desc, color=self.bot.main_color,
                     )
+                    embed.set_footer(text="Force update")
                     await ctx.send(embed=embed)
 
     @commands.command(hidden=True, name="eval")