Ensure new claims have clean urls, Fixes: #390

coding-blocks · May 30, 2020 · 395403d · 395403d
1 parent e630916
commit 395403d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 4 deletions.
diff --git a/routes/api.js b/routes/api.js
@@ -69,8 +69,8 @@ route.post('/claims/add', auth.ensureLoggedInGithub, (req, res) => {
 
   du.createClaim(
     req.user.usergithub.username,
-    req.body.issue_url,
-    req.body.pull_url,
+    du.generateGenericUrl(req.body.issue_url),
+    du.generateGenericUrl(req.body.pull_url),
     req.body.bounty,
     config.CLAIM_STATUS.CLAIMED
   )

diff --git a/routes/root.js b/routes/root.js
@@ -248,8 +248,8 @@ route.post('/claims/add', auth.ensureLoggedInGithub, (req, res) => {
 
   du.createClaim(
     req.user.usergithub.username, // github username already valid
-    req.body.issue_url,
-    req.body.pull_url,
+    du.generateGenericUrl(req.body.issue_url),
+    du.generateGenericUrl(req.body.pull_url),
     req.body.bounty,
     config.CLAIM_STATUS.CLAIMED
   )

diff --git a/utils/datautils.js b/utils/datautils.js
@@ -5,6 +5,12 @@ const db = require('./db')
 const fs = require('fs')
 const consts = require('./consts')
 
+function generateGenericUrl(url) {
+    const extractSingleUrl = url.trim().split(' ')[0].split('#')[0]
+    const genericUrl = new URL(extractSingleUrl).pathname.replace(/\/+$/, '')
+    return `https://github.com${genericUrl}`
+}
+
 function getContestPeriod(year) {
   if (year)
     return {
@@ -180,5 +186,6 @@ module.exports = {
   getLoggedInUserStats,
   getClaimById,
   updateClaim,
+  generateGenericUrl,
   getCounts
 }