fixing team display

Author: Paul Philion

netbot/cog_scn.py

@@ -304,14 +304,13 @@ async def teams(self, ctx:discord.ApplicationContext, teamname:str=None):
                 await ctx.respond(self.formatter.format_team(ctx, team))
                 return
             else:
-                all_teams = [team.name for team in ctx.guild.roles]
+                all_teams = ", ".join([team.name for team in ctx.guild.roles if team.name.endswith("-team")])
                 await ctx.respond(f"Unknown team name: {teamname}\nTeams: {all_teams}") # error
         else:
             # all teams
-            #teams = "\n- ".join([team.name for team in ctx.guild.roles])
             buff = ""
             for team in ctx.guild.roles:
-                buff += self.formatter.format_team(ctx, team)
+                buff += self.formatter.format_team(ctx, team, inc_users=False)
             await ctx.respond(buff)
 
 
@@ -330,6 +329,7 @@ async def epics(self, ctx:discord.ApplicationContext):
         # format the epics and respond
         await ctx.respond(embeds=self.bot.formatter.epics_embed(ctx, epics))
 
+
     @scn.command(description="list blocked email")
     async def blocked(self, ctx:discord.ApplicationContext):
         team = self.redmine.user_mgr.cache.get_team_by_name(BLOCKED_TEAM_NAME)

netbot/formatting.py

@@ -526,22 +526,23 @@ def help_embed(self, _: discord.ApplicationContext) -> discord.Embed:
         return embed
 
 
-    async def print_team(self, ctx, team):
-        msg = f"> **{team.name}**\n"
-        for user_rec in team.users:
-            #user = self.redmine.get_user(user_rec.id)
-            #discord_user = user.custom_fields[0].value or ""  # FIXME cf_* lookup
-            msg += f"{user_rec.name}, "
-            #msg += f"[{user.id}] **{user_rec.name}** {user.login} {user.mail} {user.custom_fields[0].value}\n"
-        msg = msg[:-2] + '\n\n'
-        await ctx.channel.send(msg)
-
-
-    def format_team(self, ctx: discord.ApplicationContext, team: discord.Role) -> str:
+    # async def print_team(self, ctx, team):
+    #     msg = f"> **{team.name}**\n"
+    #     for user_rec in team.users:
+    #         #user = self.redmine.get_user(user_rec.id)
+    #         #discord_user = user.custom_fields[0].value or ""  # FIXME cf_* lookup
+    #         msg += f"{user_rec.name}, "
+    #         #msg += f"[{user.id}] **{user_rec.name}** {user.login} {user.mail} {user.custom_fields[0].value}\n"
+    #     msg = msg[:-2] + '\n\n'
+    #     await ctx.channel.send(msg)
+
+
+    def format_team(self, ctx: discord.ApplicationContext, team: discord.Role, inc_users:bool = True) -> str:
         # single line format: teamname: member1, member2
-        skip_teams = ["blocked", "users", "@everyone", ctx.me.name]
+        #skip_teams = ["blocked", "users", "@everyone", ctx.me.name]
+        team_postfix = "-team"
 
-        if team and team.name not in skip_teams:
+        if team and team.name.endswith(team_postfix):
             team_channel = ctx.bot.channel_for_team(team.name)
             if team_channel:
                 is_private = False
@@ -554,6 +555,9 @@ def format_team(self, ctx: discord.ApplicationContext, team: discord.Role) -> st
             else:
                 team_name = "**" + team.name + "**"
 
-            return f"{team_name}: {', '.join([user.display_name for user in team.members])}\n"
+            if inc_users:
+                return f"{team_name}: {', '.join([user.display_name for user in team.members])}\n"
+            else:
+                return f"- {team_name}\n"
         else:
             return ""