Combined public and private chan archive

Author: Grazfather

handlers/challenge_handler.py

@@ -406,7 +406,7 @@ def execute(cls, slack_wrapper, args, timestamp, channel_id, user_id, user_is_ad
             raise InvalidCommand("This challenge does not exist.")
 
         # Remove the challenge channel and ctf challenge entry
-        slack_wrapper.archive_private_channel(challenge.channel_id)
+        slack_wrapper.archive_channel(challenge.channel_id)
         remove_challenge_by_channel_id(ChallengeHandler.DB, challenge.channel_id, ctf.channel_id)
 
         # Show confirmation message

tests/slackwrapper_mock.py

@@ -116,8 +116,8 @@ def get_private_channels(self):
         """Fetch all private channels in which the user participates."""
         return json.loads(self.get_private_channels_response)
 
-    def archive_private_channel(self, channel_id):
-        """Archive a private channel"""
+    def archive_channel(self, channel_id):
+        """Archive a public or private channel."""
         # TODO: The git handler must be mocked before testing archive command to avoid uploading test cases
         pass
 

util/slack_wrapper.py

@@ -182,13 +182,8 @@ def get_private_channels(self) -> List[Dict]:
 
         return self.get_channels(types="private_channel")
 
-    def archive_private_channel(self, channel_id: str) -> Dict:
-        """Archive a private channel"""
-
-        return self.client.conversations_archive(channel=channel_id).data
-
-    def archive_public_channel(self, channel_id: str) -> Dict:
-        """Archive a public channel"""
+    def archive_channel(self, channel_id: str) -> Dict:
+        """Archive a public or private channel."""
 
         return self.client.conversations_archive(channel=channel_id).data