Remove non-free score penalisation

diff --git a/app/blueprints/packages/releases.py b/app/blueprints/packages/releases.py
index 669f4b12049d96ddcddb3ae0d0ff42ed48bf40c1..b3a2f835beb2cbe41949159d8e77a51f644b8007 100644 (file)
--- a/app/blueprints/packages/releases.py
+++ b/app/blueprints/packages/releases.py
@@ -134,8 +134,6 @@ def download_release(package, id):
                        set_key(key, "true")
 
                        bonus = 1
-                       if not package.getIsFOSS():
-                               bonus *= 0.1
 
                        PackageRelease.query.filter_by(id=release.id).update({
                                        "downloads": PackageRelease.downloads + 1

diff --git a/app/flatpages/help/non_free.md b/app/flatpages/help/non_free.md
index fab906252c12acd89a5354c3f590ec5891edfa2d..8eb1eb26af61862078e15dc822b7b4a723441b12 100644 (file)
--- a/app/flatpages/help/non_free.md
+++ b/app/flatpages/help/non_free.md
@@ -28,7 +28,7 @@ Limiting the promotion of problematic licenses helps Minetest avoid ending up in
 such a state. Licenses that prohibit redistribution or modification are
 completely banned from ContentDB and the Minetest forums. Other non-free licenses
 will be subject to limited promotion - they won't be shown by default in
-the client, and their [score](/help/top_packages/) will receive a 10x penalty.
+the client.
 
 Not providing full promotion on ContentDB, or not allowing your package at all,
 doesn't mean you can't make such content - it just means we're not going to help

diff --git a/app/flatpages/help/top_packages.md b/app/flatpages/help/top_packages.md
index 8f14090b1f1773768daa905da29f398b3e4f8062..da3f38a22147bdaade0cc125e0336441b7174c59 100644 (file)
--- a/app/flatpages/help/top_packages.md
+++ b/app/flatpages/help/top_packages.md
@@ -7,10 +7,8 @@ In the future, a package will also gain score through reviews.
 
 ## Pseudo rolling average of downloads
 
-Every package loses 5% of its score every day.
-
-An open source package will gain 1 score for each unique download,
-whereas a non-free package will only gain 0.1 score.
+Every package loses 5% of its score every day, and will gain 1 score for each
+unique download.
 
 This metric aims to be roughly equivalent to the average downloads.
 
@@ -27,8 +25,6 @@ This legacy heuristic is as follows:
        multiplier = 1
        if no screenshot:
                multiplier *= 0.8
-       if not foss:
-               multiplier *= 0.1
 
        score = multiplier * (max(downloads, forum_score * 0.6) + forum_bonus)
 

diff --git a/app/models.py b/app/models.py
index 8f00c9583683eaf987bc71f939e25e6680f17b73..aeab995a727a32d56a6732ad307e67dc22c2c65d 100644 (file)
--- a/app/models.py
+++ b/app/models.py
@@ -714,9 +714,6 @@ class Package(db.Model):
                if self.getMainScreenshotURL() is None:
                        self.score *= 0.8
 
-               if not self.license.is_foss or not self.media_license.is_foss:
-                       self.score *= 0.1
-
 
 class MetaPackage(db.Model):
        id           = db.Column(db.Integer, primary_key=True)