Only reference contributors with a universe

Author: jeroen

routes/cache.js

@@ -34,7 +34,7 @@ export default function(req, res, next){
     res.set('Cache-Control', `public, max-age=60, stale-while-revalidate=${cdn_cache}`);
 
     if(doc){
-      const revision = 12; // bump to invalidate all caches
+      const revision = 13; // bump to invalidate all caches
       const etag = `W/"${doc._id}${revision}"`;
       const date = new Date(doc._published.getTime() + revision * 1000).toUTCString();
       res.set('ETag', etag);

routes/universe.js

@@ -1,6 +1,7 @@
 import express from 'express';
 import url from 'node:url';
-import {get_universe_packages, get_universe_vignettes, get_package_info, get_universe_contributors, get_universe_contributions} from '../src/db.js';
+import {get_universe_packages, get_universe_vignettes, get_package_info,
+        get_universe_contributors, get_universe_contributions, get_all_universes} from '../src/db.js';
 const router = express.Router();
 
 function sort_by_package(x,y){
@@ -94,10 +95,8 @@ function retry_url(x){
 function get_contrib_data(user, max = 20){
   const p1 = get_universe_contributors(user, 1000);
   const p2 = get_universe_contributions(user, 1000);
-  return Promise.all([p1, p2]).then(function([contributors, contributions]){
-    if(contributions.length == 0){
-      return contributors.slice(0,max); //org users dont make contributions themselves
-    }
+  const p3 = get_all_universes();
+  return Promise.all([p1, p2, p3]).then(function([contributors, contributions, universes]){
     var data = contributors.map(function(x){
       x.contributions = 0;
       x.packages = [];
@@ -114,7 +113,11 @@ function get_contrib_data(user, max = 20){
         rec.packages = rec.packages.concat(x.packages);
       });
     });
-    return data.sort(function(x,y){return (x.total + x.contributions > y.total + y.contributions) ? -1 : 1}).filter(x => x.login != user).slice(0,max);
+    return data.filter(function(x){
+      return x.login != user && universes.includes(x.login);
+    }).sort(function(x,y){
+      return (x.total + x.contributions > y.total + y.contributions) ? -1 : 1}
+    ).slice(0, max);
   });
 }
 

src/db.js

@@ -666,6 +666,7 @@ export function get_all_universes(){
   if(production){
     return universes;
   } else {
+    //TODO: this does not include maintainer-only universes, but production does
     return get_json('https://r-universe.dev/api/universes').then(function(data){
       return data.map(x => x.universe);
     });