Merge ~emmabrostrom/ols-jenkaas:pre-merge-bot-comment into ols-jenkaas:main

[Emma Brostrom]

Revert!

[Maximiliano Bertacchini (maxiberta)]

LGTM

review: Approve

diff --git a/olsjenkaas/commands.py b/olsjenkaas/commands.py
index 8cace19..9db0a23 100644
--- a/olsjenkaas/commands.py
+++ b/olsjenkaas/commands.py
@@ -816,26 +816,22 @@ class PreMergeGitProposals(Command):
         return most_recent_commit
 
     @staticmethod
-    def is_pre_merge_ci_comment_match(comment_body):
-        matches = re.findall(
-            r".*[pre-merge ci\w].*revision [0-9a-z]{40}",
-            comment_body,
-        )
-        return bool(matches)
-
-    @staticmethod
     def get_most_recent_commit_seen_by_bot(proposal):
         comment_collection = proposal.all_comments
         bot_author_link = "https://api.launchpad.net/devel/~otto-copilot"
         bot_comments = [
-            comment.message_body
+            comment
             for comment in comment_collection
             if comment.author_link == bot_author_link
-            and PreMergeGitProposals.is_pre_merge_ci_comment_match(comment.message_body)
         ]
         try:
             most_recent_bot_comment = bot_comments[-1]
-            commit_hash = most_recent_bot_comment.split()[-1]
+            # Find revision number in last bot comment
+            matches = re.findall(
+                r".*[pre-merge ci\w].*revision [0-9a-z]{40}",
+                most_recent_bot_comment.message_body,
+            )
+            commit_hash = str(matches[0]).split()[-1]
             return commit_hash
         # If no bot comment or revision number found
         except IndexError: