3.2.1

Merge pull request #35 from 67P/bugfix/33-gitea_issue_id
Fix wrong Gitea issue IDs/URLs
2019-04-30 10:41:50 +01:00 · 2019-04-30 10:26:21 +02:00 · 2019-04-28 13:01:33 +01:00 · 2019-04-28 13:01:09 +01:00 · 2019-04-24 14:25:51 +01:00 · 2019-04-24 14:25:06 +01:00
5 changed files with 27 additions and 6 deletions
--- a/README.md
+++ b/README.md
@@ -46,6 +46,25 @@ Point a GitHub organization webhook to the following URL:
 | --- | --- |
 | `KREDITS_GITHUB_REPO_BLACKLIST` | Repos which you do not want to issue kredits for. Format: `orgname/reponame`, e.g. `67P/test-one-two` |

+### Gitea
+
+The Gitea integration will watch for closed issues and merged pull requests,
+which carry a kredits label: `kredits-1`, `kredits-2`, `kredits-3` for small,
+medium and large contributions. If there are multiple people assigned, it will
+issue contribution tokens for all of them.
+
+#### Setup
+
+Point a Gitea organization webhook to the following URL:
+
+    https://your-hubot.example.com/incoming/kredits/gitea/{webhook_token}
+
+#### Config
+
+| Key | Description |
+| --- | --- |
+| `KREDITS_GITEA_REPO_BLACKLIST` | Repos which you do not want to issue kredits for. Format: `orgname/reponame`, e.g. `kosmos/test-one-two` |
+
 ### MediaWiki

 The MediaWiki integration will periodically check for wiki page creations and
--- a/index.js
+++ b/index.js
@@ -53,6 +53,7 @@ module.exports = async function(robot) {
    kredits = await new Kredits(signer.provider, signer, {
      // TODO support local devchain custom address
      apm: 'open.aragonpm.eth',
+      // addresses: { Kernel: '0x93aa4531329e4bf3efcd1ec0b74adb6f66d9d10e' }
      ipfsConfig
    }).init();
  } catch(error) {
--- a/integrations/gitea.js
+++ b/integrations/gitea.js
@@ -85,7 +85,7 @@ module.exports = async function(robot, kredits) {
  async function handleGiteaIssueClosed(data) {
    const issue       = data.issue;
    const repoName    = data.repository.full_name;
-    const web_url     = `${data.repository.html_url}/issues/${issue.id}`;
+    const web_url     = `${data.repository.html_url}/issues/${issue.number}`;
    const description = `${repoName}: ${issue.title}`;
    const amount      = amountFromLabels(issue.labels);
    const assignees   = issue.assignees ? issue.assignees.map(a => a.login) : [];
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
  "name": "hubot-kredits",
-  "version": "3.1.2",
+  "version": "3.2.1",
  "lockfileVersion": 1,
  "requires": true,
  "dependencies": {
@@ -1175,8 +1175,9 @@
      }
    },
    "kredits-contracts": {
-      "version": "github:67P/kredits-contracts#09b78e1e8f0e9a458324e95dcdf1e7eb1d662eee",
-      "from": "github:67P/kredits-contracts#feature/gitea_site",
+      "version": "5.3.0",
+      "resolved": "https://registry.npmjs.org/kredits-contracts/-/kredits-contracts-5.3.0.tgz",
+      "integrity": "sha512-Wz4zuA6yo0Q4WbVEO61fvFin+6VTNjkBqHPhHCqq6dIoGdFSjUZ3BCKan1ei0axIAda7ZDP+eebe2vCr+eqcHg==",
      "requires": {
        "ethers": "^4.0.27",
        "ipfs-http-client": "^30.1.1",
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
  "name": "hubot-kredits",
-  "version": "3.1.2",
+  "version": "3.2.1",
  "description": "Kosmos Kredits functionality for chat bots",
  "main": "index.js",
  "scripts": {
@@ -14,7 +14,7 @@
    "ethers": "^4.0.27",
    "group-array": "^0.3.3",
    "kosmos-schemas": "^1.1.2",
-    "kredits-contracts": "github:67P/kredits-contracts#feature/gitea_site",
+    "kredits-contracts": "^5.3.0",
    "node-cron": "^2.0.3",
    "node-fetch": "^2.3.0",
    "prompt": "^1.0.0"
Author	SHA1	Message	Date
Sebastian Kippe	a5acf466a4	3.2.1	2019-04-30 10:41:50 +01:00
Greg Karékinian	f1bb5b391d	Merge pull request #35 from 67P/bugfix/33-gitea_issue_id Fix wrong Gitea issue IDs/URLs	2019-04-30 10:26:21 +02:00
Sebastian Kippe	840fcf9d25	Add commented setting for custom local DAO address	2019-04-28 13:01:33 +01:00
Sebastian Kippe	c390fc9ce7	Fix Gitea issue ID/URL being wrong Internal issue IDs are different from the public ones in Gitea. The one used in URLs etc. is called "number" instead of "id" in hook payloads. fixes #33	2019-04-28 13:01:09 +01:00
Sebastian Kippe	23033b3813	3.2.0	2019-04-24 14:25:51 +01:00
Sebastian Kippe	fb1b10d2a3	Merge pull request #31 from 67P/feature/24-gitea Add Gitea integration	2019-04-24 14:25:06 +01:00
Sebastian Kippe	d3b97d9129	Update kredits-contracts Includes the Gitea accounts in profiles	2019-04-24 14:24:21 +01:00
Michael Bumann	d2f487b379	Merge pull request #32 from 67P/chore/remove_network_id_config Remove network ID setting	2019-04-24 13:06:39 +00:00
Sebastian Kippe	ca9732c333	Add Gitea info to README	2019-04-24 13:38:16 +01:00
Sebastian Kippe	c03da5659f	Remove network ID setting Not needed anymore.	2019-04-24 13:34:00 +01:00