Added pull request handling

gitea/webhook.py

@@ -19,19 +19,19 @@ class GiteaHandler(BaseHookHandler):
         # We only care about regular heads or tags
         match = re.match(r"^refs/(heads|tags)/(.+)$", refname)
         if not match:
-            log.msg("Ignoring refname `%s': Not a branch" % refname)
+            log.msg("Ignoring refname '{}': Not a branch".format(refname))
             return changes
 
         branch = match.group(2)
 
-        repository = payload["repository"]
+        repository = payload['repository']
-        repo_url = repository["html_url"]
+        repo_url = repository['ssh_url']
-        project = repository["full_name"]
+        project = repository['full_name']
 
-        for commit in payload["commits"]:
+        for commit in payload['commits']:
-            timestamp = dateparse(commit["timestamp"])
+            timestamp = dateparse(commit['timestamp'])
             change = {
-                'author': '%s <%s>'.format((commit['author']['name'],
+                'author': '{} <{}>'.format((commit['author']['name'],
                                             commit['author']['email'])),
                 'comments': commit['message'],
                 'revision': commit['id'],
@@ -45,36 +45,84 @@ class GiteaHandler(BaseHookHandler):
                     'event': event_type,
                 },
             }
-            log.msg("Adding commit: {}".format(str(change)))
             if codebase is not None:
                 change['codebase'] = codebase
             changes.append(change)
         return changes
 
+    def processPullRequestEvent(self, payload, event_type, codebase):
+        action = payload['action']
+
+        # Only handle potential new stuff, ignore close/.
+        # Merge itself is handled by the regular branch push message
+        if action not in ['opened', 'synchronized', 'edited', 'reopened']:
+            log.msg("Gitea Pull Request event '{}' ignored".format(action))
+            return []
+        pull_request = payload['pull_request']
+        timestamp = dateparse(pull_request['updated_at'])
+        base = pull_request['base']
+        head = pull_request['head']
+        repository = pull_request['repository']
+        change = {
+            'author': '{} <{}>'.format((pull_request['user']['full_name'],
+                                        pull_request['user']['email'])),
+            'comments': pull_request['body'],
+            'revision': pull_request['merge_base'],
+            'when_timestamp': timestamp,
+            'branch': head['ref'],
+            'revlink': pull_request['html_url'],
+            'repository': repository['ssh_url'],
+            'project': repository['full_name'],
+            'category': event_type,
+            'properties': {
+                'event': event_type,
+                'base_branch': base['ref'],
+                'base_sha': base['sha'],
+                'base_repo_id': base['repo_id'],
+                'base_repository': base['clone_url'],
+                'base_git_ssh_url': base['ssh_url'],
+                'head_branch': head['ref'],
+                'head_sha': head['sha'],
+                'head_repo_id': head['repo_id'],
+                'head_repository': head['clone_url'],
+                'head_git_ssh_url': head['ssh_url'],
+                'pr_id': pull_request['id'],
+                'pr_number': pull_request['number'],
+            },
+        }
+        if codebase is not None:
+            change['codebase'] = codebase
+        return [change]
+
     def getChanges(self, request):
         secret = None
         if self.options is dict:
-            secret = self.options.get("secret")
+            secret = self.options.get('secret')
 
         try:
             content = request.content.read()
             payload = json.loads(bytes2unicode(content))
-            log.msg("Payload:")
-            log.msg(payload)
         except Exception as e:
-            raise ValueError("Error loading JSON: " + str(e))
+            raise ValueError('Error loading JSON: ' + str(e))
-        if secret is not None and secret != payload["secret"]:
+        if secret is not None and secret != payload['secret']:
-            raise ValueError("Invalid secret")
+            raise ValueError('Invalid secret')
 
         event_type = bytes2unicode(request.getHeader(_HEADER_EVENT_TYPE))
-        log.msg("Received event_type: {}".format(event_type))
+        log.msg("Received event '{}' from gitea".format(event_type))
 
-        codebases = request.args.get("codebase", [None])
+        codebases = request.args.get('codebase', [None])
         codebase = bytes2unicode(codebases[0])
+        changes = []
+        if event_type == 'push':
+            changes = self.processPushEvent(
+                payload, event_type, codebase)
+        elif event_type == 'pull_request':
+            changes = self.processPullRequestEvent(
+                payload, event_type, codebase)
+        else:
+            log.msg("Ignoring gitea event '{}'".format(event_type))
 
-        changes = self.processPushEvent(payload, event_type, codebase)
+        return (changes, 'git')
-
-        return (changes, "git")
 
 
 # Plugin name