diff options
| author |  jesopo | 2019-06-27 10:04:52 +0100 |
|---|---|---|
| committer | jesopo | 2019-06-27 10:04:52 +0100 |
| commit | 13f7ae682c118ad516a0cacda7abb005559954cd (patch) | |
| tree | 5857b8e2705b5f71a044a88e57f0ca3bcb6de0b2 | |
| parent | `format._tweet()` takes a `server` param now (diff) | |
| signature | ||
Revert "Show commit message, not PR title, for PR pushes"
This reverts commit 24df8c996e3718825fed5c5df77a5b21c7222fab.
| -rw-r--r-- | modules/git_webhooks/github.py | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/modules/git_webhooks/github.py b/modules/git_webhooks/github.py index 73a6b11a..a5fd32ed 100644 --- a/modules/git_webhooks/github.py +++ b/modules/git_webhooks/github.py @@ -175,9 +175,6 @@ class GitHub(object): def _flat_unique(self, commits, key): return set(itertools.chain(*(commit[key] for commit in commits))) - def _commit_message(self, message): - return message.split("\n")[0].strip() - def push(self, full_name, data): outputs = [] branch = data["ref"].split("/", 2)[2] @@ -195,7 +192,7 @@ class GitHub(object): for commit in data["commits"]: hash = commit["id"] hash_colored = utils.irc.color(self._short_hash(hash), colors.COLOR_ID) - message = self._commit_message(commit["message"]) + message = commit["message"].split("\n")[0].strip() url = self._short_url(COMMIT_URL % (full_name, hash)) outputs.append( @@ -228,8 +225,6 @@ class GitHub(object): branch = data["pull_request"]["base"]["ref"] colored_branch = utils.irc.color(branch, colors.COLOR_BRANCH) - title = data["pull_request"]["title"] - if action == "opened": action_desc = "requested %s merge into %s" % (number, colored_branch) @@ -245,12 +240,12 @@ class GitHub(object): action_desc = "marked %s ready for review" % number elif action == "synchronize": action_desc = "committed to %s" % number - title = self._commit_message(data["commit"]["message"]) + pr_title = data["pull_request"]["title"] author = utils.irc.bold(data["sender"]["login"]) url = self._short_url(data["pull_request"]["html_url"]) return ["[PR] %s %s: %s - %s" % ( - author, action_desc, title, url)] + author, action_desc, pr_title, url)] def pull_request_review(self, full_name, data): if not data["action"] == "submitted": |