Tweaked sorting

src/components/PodPicker.vue

@@ -15,15 +15,6 @@
       <div class="meta">
         <span class="metadata">
           <i class="fa fa-users"></i>
-          <translate
-            translate-context="Content/PodPicker/Metadata"
-            :translate-params="{
-              usersCount: pod.lastCheck.usage_users_total || 0
-            }"
-          >%{ usersCount } people</translate>
-        </span>
-        <span class="metadata">
-          <i class="fa fa-refresh"></i>
           <translate
             translate-context="Content/PodPicker/Metadata"
             :translate-params="{
@@ -38,6 +29,10 @@
             :translate-params="{ version: getVersion(pod) }"
           >Running Funkwhale v%{ version }</translate>
         </span>
+        <!-- <span class="metadata">
+          <i class="fa fa-star"></i>
+          {{ scores[pod.name] }}
+        </span>-->
       </div>
     </a>
   </div>
@@ -99,25 +94,29 @@ export default {
       let rules = [
         {
           id: "size",
-          comment: "Pod size (too small or too big have lower scores)",
-          coefficient: 2,
+          comment: "Pod size (too small or too big have lower scores), we use active users because it makes more sense",
+          coefficient: (data) => {return 2},
           compute: data => {
-            if (!data.lastCheck.usage_users_total) {
+            if (!data.lastCheck.usage_users_active_month) {
               return 0;
             }
-            let idealSize = 100;
-            let size = data.lastCheck.usage_users_total;
-            if (size >= idealSize) {
-              return 0;
+            let size = data.lastCheck.usage_users_active_month;
+            let idealSize = 10
+            let dangerousSize = 150
+            let increaseFactor = 1.1
+            let decreaseFactor = 1.1
+            if (size < idealSize) {
+              return Math.min((size / idealSize)**increaseFactor, 1)
+            } else {
+              return Math.max(1 - (size / dangerousSize)**decreaseFactor, 0)
             }
-            return size / idealSize;
           }
         },
         {
           id: "age",
           comment:
             "Pod age (older pods get a higher score, because they are likely more stable)",
-          coefficient: 1,
+          coefficient: (data) => {return 1},
           compute: data => {
             let now = new Date();
             let days = Math.round(
@@ -131,7 +130,22 @@ export default {
           id: "activity",
           comment:
             "User activity (Pods with more active users get a higher score)",
-          coefficient: 1,
+          coefficient: (data) => {
+            if (!data.lastCheck.usage_users_active_month) {
+              return 0
+            }
+            // for really small instances, we reduce the weight of the score
+            // because it's really easy to have a high number of active users
+            let coefficient
+            let smallInstanceThreshold = 20
+            let total = data.lastCheck.usage_users_total
+            if (total <= smallInstanceThreshold) {
+              coefficient = Math.log(total) / Math.log(smallInstanceThreshold)
+            } else {
+              coefficient = 1
+            }
+            return coefficient * 2
+          },
           compute: data => {
             if (
               !data.lastCheck.usage_users_active_month ||
@@ -139,10 +153,11 @@ export default {
             ) {
               return 0;
             }
+            let total = data.lastCheck.usage_users_total
             let activeProportion =
               data.lastCheck.usage_users_active_month /
-              data.lastCheck.usage_users_total;
-            return 1 - Math.exp(-activeProportion * 3);
+              total;
+            return (1 - Math.exp(-activeProportion * 3))
           }
         }
       ];
@@ -152,13 +167,14 @@ export default {
           total: 0
         };
         rules.forEach(rule => {
-          let result = rule.compute(p);
+          let result = rule.compute(p)
+          let coefficient = rule.coefficient(p)
           scoreData.detail.push({
+            coefficient,
             result: result,
-            coefficient: rule.coefficient,
             id: rule.id
           });
-          scoreData.total += rule.coefficient * result;
+          scoreData.total += coefficient * result;
         });
         self.$set(self.scores, p.name, scoreData);
       });