Merge branch 'master' into cb-bootstrap

Author: championswimmer

.gitignore

@@ -48,6 +48,7 @@ fabric.properties
 .idea
 secrets.json
 audit/*.json
+public_static/
 
 # IDE
 /.vscode/

bot/index.js

@@ -1,8 +1,13 @@
 module.exports = app => {
-  app.log('Yay, the boss bot was loaded!')
+  const adminUsernames = ['championswimmer','abhishek97','himankbhalla','jatinkatyal13','tathagat2006','hereisnaman','TdevM']
 
+  app.log('Yay, the boss bot was loaded!')
   app.on('issues.opened', async context => {
     const issue = context.payload.issue
+    if(adminUsernames.includes(issue.user.login)){
+      app.log(`Ignoring new issue ${issue.id} created by admin ${issue.user.login}`)
+      return
+    }
     if (!issue.closed_at) {
       app.log(`Issue Opened: ${issue.id}`)
 
@@ -20,6 +25,10 @@ Star ⭐ this project and [tweet](https://twitter.com/intent/tweet?text=I%20am%2
 
   app.on('pull_request.opened', async context => {
     const pr = context.payload.pull_request
+    if(adminUsernames.includes(issue.user.login)){
+      app.log(`Ignoring new pr ${pr.id} opened by admin ${pr.user.login}`)
+      return
+    }
     if (!pr.closed_at) {
       app.log(`Pull Request Opened: ${pr.id}`)
 
@@ -37,6 +46,10 @@ Star ⭐ this project and [tweet](https://twitter.com/intent/tweet?text=I%20am%2
 
   app.on('pull_request.closed', async context => {
     const pr = context.payload.pull_request
+    if(adminUsernames.includes(pr.user.login)){
+      app.log(`Ignoring pr ${issue.id} closing by admin ${pr.user.login}`)
+      return
+    }
     if (!!pr.merged_at) {
       app.log(`Pull Request Closed: ${pr.id}`)
 

routes/root.js

@@ -39,10 +39,10 @@ route.get('/logout', (req, res) => {
   res.redirect('/')
 })
 
-route.get('/leaderboard/:year?', (req, res) => {
-    let { year } = req.params
+route.get('/leaderboard/:year?', async (req, res) => {
+    let { year = '2020'} = req.params
     const validYears = ['2020', '2019', '2018']
-  
+    
     if (!validYears.includes(year)) {
         return res.status(404).render('pages/404');
     } else {
@@ -57,14 +57,38 @@ route.get('/leaderboard/:year?', (req, res) => {
 
   options.page = parseInt(options.page)
 
+  let loggedInUser = {};
+  const githubDetails = req.user && req.user.usergithub
+  if (githubDetails) {
+    const result = await du.getLoggedInUserStats(options, githubDetails.username)
+    if (result[0][0]) {
+        loggedInUser = result[0][0]
+    }
+  }
+
   du.getLeaderboard(options)
     .then(data => {
       const pagination = []
       const count = data[0]
       const rows = data[1][0]
       const lastPage = Math.ceil(count / options.size)
+      const showUserAtTop = loggedInUser.user && !rows.some(row => row.user === loggedInUser.user)
+      rows.forEach((row) => {
+          if(githubDetails && githubDetails.username === row.user){
+              row.isColored = true
+          }
+      })
+      for (var i = 1; i <= lastPage; i++) pagination.push({link: `?page=${i}&size=${options.size}`, index: i})
 
-      for (var i = 1; i <= lastPage; i++) pagination.push(`?page=${i}&size=${options.size}`)
+      let newPagination = pagination.slice(Math.max(0, options.page - 3), Math.min(options.page + 2, pagination.length));
+      if(newPagination[0].index != 1){
+        newPagination.unshift({link: "#", index: ". . ."});
+        newPagination.unshift({link: `?page=${1}&size=${options.size}`, index: 1})
+      }
+      if(newPagination[newPagination.length -1].index != lastPage){
+        newPagination.push({link: "#", index: ". . ."});
+        newPagination.push({link: `?page=${lastPage}&size=${options.size}`, index: lastPage});
+      }
 
       res.render('pages/leaderboard', {
         prevPage: options.page - 1,
@@ -73,8 +97,10 @@ route.get('/leaderboard/:year?', (req, res) => {
         isLastPage: options.page == lastPage,
         size: options.size,
         page: options.page,
-        pagination: pagination,
+        pagination: newPagination,
         userstats: rows,
+        loggedInUser,
+        showUserAtTop,
         menu: {
           leaderboard: 'active',
           leaderboard2020: (year === '2020' || !year) && 'active',

server.js

@@ -21,7 +21,7 @@ const sess = {
   secret: secrets.secret,
   resave: true,
   saveUninitialized: true,
-  cookie: { maxAge: 360000, secure: false, httpOnly: false }
+  cookie: { maxAge: 86400000, secure: false, httpOnly: false }
 }
 
 const app = express()

utils/datautils.js

@@ -104,6 +104,23 @@ function createClaim(user, issueUrl, pullUrl, bounty, status) {
   })
 }
 
+async function getLoggedInUserStats(options = {}, username) {
+  const period = getContestPeriod(options.year)
+
+  const result = await db.Database.query(`with RankTable as (
+        SELECT "user",
+              SUM(CASE WHEN "claim"."status" = 'accepted' THEN "bounty" ELSE 0 END) as "bounty",
+              COUNT("bounty") as "pulls",
+              ROW_NUMBER() OVER(ORDER BY SUM(CASE WHEN "claim"."status" = 'accepted' THEN "bounty" ELSE 0 END) DESC, COUNT("bounty") DESC) as rank
+              FROM "claims" AS "claim"
+              where "createdAt" between '${period.start_date}' and '${period.end_date}'
+              GROUP BY "user"
+              ORDER BY "bounty" DESC, "pulls" DESC
+            )
+        SELECT RankTable.* from RankTable where RankTable.user = '${username}'`)
+
+  return result
+}
 function getLeaderboard(options = {}) {
   options.size = parseInt(options.size || 0)
   const offset = (options.page - 1) * options.size
@@ -120,11 +137,12 @@ function getLeaderboard(options = {}) {
 
   const results = db.Database.query(`SELECT "user",
         SUM(CASE WHEN "claim"."status" = 'accepted' THEN "bounty" ELSE 0 END) as "bounty",
-        COUNT("bounty") as "pulls"
+        COUNT("bounty") as "pulls",
+        ROW_NUMBER() OVER(ORDER BY SUM(CASE WHEN "claim"."status" = 'accepted' THEN "bounty" ELSE 0 END) DESC, COUNT("bounty") DESC) as rank
         FROM "claims" AS "claim"
         where "createdAt" between '${period.start_date}' and '${period.end_date}'
         GROUP BY "user"
-        ORDER BY SUM(CASE WHEN "claim"."status" = 'accepted' THEN "bounty" ELSE 0 END) DESC, COUNT("bounty") DESC
+        ORDER BY "bounty" DESC, "pulls" DESC
         LIMIT ${options.size} OFFSET ${offset}`)
 
   return Promise.all([userCount, results])
@@ -159,6 +177,7 @@ module.exports = {
   delClaim,
   createClaim,
   getLeaderboard,
+  getLoggedInUserStats,
   getClaimById,
   updateClaim,
   getCounts