diff options
| author | 2021-06-12 14:23:39 -0700 | |
|---|---|---|
| committer | 2021-06-12 14:23:39 -0700 | |
| commit | d195418692eb5332fbcbd6412ea7aa72f0ce9f53 (patch) | |
| tree | 451dc89e914551a98e09690b7459453caf722d34 | |
| parent | Merge pull request #773 from CasualCoder99/show-match-draw (diff) | |
| parent | Merge branch 'main' into new-github-emoji (diff) | |
Merge pull request #774 from python-discord/new-github-emoji
Update Github emoji to new icons
| -rw-r--r-- | bot/constants.py | 14 | ||||
| -rw-r--r-- | bot/exts/evergreen/issues.py | 6 | 
2 files changed, 11 insertions, 9 deletions
| diff --git a/bot/constants.py b/bot/constants.py index f7fe216b..7bd10b5f 100644 --- a/bot/constants.py +++ b/bot/constants.py @@ -190,12 +190,14 @@ class Emojis:      dice_5 = "<:dice_5:755891608091885627>"      dice_6 = "<:dice_6:755891607680843838>" -    issue = "<:IssueOpen:629695470327037963>" -    issue_closed = "<:IssueClosed:629695470570307614>" -    pull_request = "<:PROpen:629695470175780875>" -    pull_request_closed = "<:PRClosed:629695470519713818>" -    pull_request_draft = "<:PRDraft:829755345425399848>" -    merge = "<:PRMerged:629695470570176522>" +    # These icons are from Github's repo https://github.com/primer/octicons/ +    issue_open = "<:IssueOpen:852596024777506817>" +    issue_closed = "<:IssueClosed:852596024739758081>" +    issue_draft = "<:IssueDraft:852596025147523102>"  # Not currently used by Github, but here for future. +    pull_request_open = "<:PROpen:852596471505223781>" +    pull_request_closed = "<:PRClosed:852596024732286976>" +    pull_request_draft = "<:PRDraft:852596025045680218>" +    pull_request_merged = "<:PRMerged:852596100301193227>"      number_emojis = {          1: "\u0031\ufe0f\u20e3", diff --git a/bot/exts/evergreen/issues.py b/bot/exts/evergreen/issues.py index b67aa4a6..00810de8 100644 --- a/bot/exts/evergreen/issues.py +++ b/bot/exts/evergreen/issues.py @@ -135,7 +135,7 @@ class Issues(commands.Cog):          # need from the initial API call.          if "issues" in json_data["html_url"]:              if json_data.get("state") == "open": -                emoji = Emojis.issue +                emoji = Emojis.issue_open              else:                  emoji = Emojis.issue_closed @@ -149,10 +149,10 @@ class Issues(commands.Cog):                  if pull_data["draft"]:                      emoji = Emojis.pull_request_draft                  elif pull_data["state"] == "open": -                    emoji = Emojis.pull_request +                    emoji = Emojis.pull_request_open                  # When 'merged_at' is not None, this means that the state of the PR is merged                  elif pull_data["merged_at"] is not None: -                    emoji = Emojis.merge +                    emoji = Emojis.pull_request_merged                  else:                      emoji = Emojis.pull_request_closed | 
