Firepup650/bitbot-3.11-fork
2
0
Fork 0
Code Issues Pull requests Activity Actions

remove use of _short_url in gitea.py

Browse source
This commit is contained in:
jesopo 2019-06-24 17:47:14 +01:00
parent 75e8a64ff9
commit f66dd83551
1 changed files with 3 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
modules/git_webhooks/gitea.py
View file

@ -95,15 +95,6 @@ class Gitea(object):
return self.fork(full_name, data) return self.fork(full_name, data)
elif event == "ping": elif event == "ping":
return self.ping(data) return self.ping(data)
def _short_url(self, url):
try:
page = utils.http.request("https://git.io", method="POST",
post_data={"url": url})
return page.headers["Location"]
except utils.http.HTTPTimeoutException:
self.log.warn(
"HTTPTimeoutException while waiting for github short URL", [])
return url
def _iso8601(self, s): def _iso8601(self, s):
return datetime.datetime.strptime(s, utils.ISO8601_PARSE) return datetime.datetime.strptime(s, utils.ISO8601_PARSE)
@ -178,7 +169,7 @@ class Gitea(object):
pr_title = data["pull_request"]["title"] pr_title = data["pull_request"]["title"]
author = utils.irc.bold(data["sender"]["login"]) author = utils.irc.bold(data["sender"]["login"])
url = self._short_url(data["pull_request"]["html_url"]) url = data["pull_request"]["html_url"]
return ["[PR] %s %s: %s - %s" % ( return ["[PR] %s %s: %s - %s" % (
author, action_desc, pr_title, url)] author, action_desc, pr_title, url)]
@ -205,7 +196,7 @@ class Gitea(object):
issue_title = data["issue"]["title"] issue_title = data["issue"]["title"]
type = "PR" if data["issue"]["pull_request"] else "issue" type = "PR" if data["issue"]["pull_request"] else "issue"
commenter = utils.irc.bold(data["sender"]["login"]) commenter = utils.irc.bold(data["sender"]["login"])
url = self._short_url(data["comment"]["html_url"]) url = data["comment"]["html_url"]
return ["[%s] %s %s on %s: %s - %s" % return ["[%s] %s %s on %s: %s - %s" %
(type, commenter, COMMENT_ACTIONS[action], number, issue_title, (type, commenter, COMMENT_ACTIONS[action], number, issue_title,
url)] url)]
@ -240,6 +231,6 @@ class Gitea(object):
forker = utils.irc.bold(data["sender"]["login"]) forker = utils.irc.bold(data["sender"]["login"])
fork_full_name = utils.irc.color(data["repository"]["full_name"], fork_full_name = utils.irc.color(data["repository"]["full_name"],
utils.consts.LIGHTBLUE) utils.consts.LIGHTBLUE)
url = self._short_url(data["repository"]["html_url"]) url = data["repository"]["html_url"]
return ["%s forked into %s - %s" % return ["%s forked into %s - %s" %
(forker, fork_full_name, url)] (forker, fork_full_name, url)]