diff options
author | Robin Jarry <robin@jarry.cc> | 2023-07-28 21:06:31 +0200 |
---|---|---|
committer | Robin Jarry <robin@jarry.cc> | 2023-07-28 21:08:35 +0200 |
commit | 8971f6edaeb5a6f3c08a3b00354ea15eb0707359 (patch) | |
tree | cef189e3c11853cabfad893e739c1a47afe9b0ec | |
parent | 81f523791c0e9bdb3b20b50eefaf5c96c94128bb (diff) | |
download | aerc-8971f6edaeb5a6f3c08a3b00354ea15eb0707359.tar.gz |
contrib: actually fix irc patchset hook when author is not registered
When the author is not registered in sr.ht, the schema object is
different.
Fixes: 3a73ffb40ed1 ("contrib: fix irc patchset hook when author is not registered")
Signed-off-by: Robin Jarry <robin@jarry.cc>
-rw-r--r-- | contrib/ircbot/Sourcehut/plugin.py | 4 | ||||
-rwxr-xr-x | contrib/ircbot/install-webhook.sh | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/contrib/ircbot/Sourcehut/plugin.py b/contrib/ircbot/Sourcehut/plugin.py index 50128d79..33026ee1 100644 --- a/contrib/ircbot/Sourcehut/plugin.py +++ b/contrib/ircbot/Sourcehut/plugin.py @@ -62,9 +62,9 @@ class SourcehutServerCallback(httpserver.SupyHTTPServerCallback): submitter = patchset["submitter"]["canonicalName"] except KeyError: try: - submitter = patchset["submitter"]["username"] + submitter = patchset["submitter"]["name"] except KeyError: - submitter = patchset["submitter"]["email"] + submitter = patchset["submitter"]["address"] msg = f"received {bold(subject)} from {italic(submitter)}: {underline(url)}" self.plugin.announce(channel, msg) handler.send_response(200) diff --git a/contrib/ircbot/install-webhook.sh b/contrib/ircbot/install-webhook.sh index 3c0c5bcb..1f8f12dd 100755 --- a/contrib/ircbot/install-webhook.sh +++ b/contrib/ircbot/install-webhook.sh @@ -27,8 +27,10 @@ query { submitter { ... on User { canonicalName - username - email + } + ... on Mailbox { + name + address } } } |