summaryrefslogtreecommitdiff
path: root/sql/func.sql
diff options
context:
space:
mode:
Diffstat (limited to 'sql/func.sql')
-rw-r--r--sql/func.sql6
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/func.sql b/sql/func.sql
index 0d86dcd9..7728873a 100644
--- a/sql/func.sql
+++ b/sql/func.sql
@@ -170,8 +170,10 @@ BEGIN
ELSE 0 END AS weight
FROM (
SELECT i.id, count(iv.id) AS votecount
- , avg(sexual) FILTER(WHERE NOT iv.ignore) AS sexual_avg, stddev_pop(sexual) FILTER(WHERE NOT iv.ignore) AS sexual_stddev
- , avg(violence) FILTER(WHERE NOT iv.ignore) AS violence_avg, stddev_pop(violence) FILTER(WHERE NOT iv.ignore) AS violence_stddev
+ , greatest(avg(sexual) FILTER(WHERE NOT iv.ignore), max(sexual) FILTER(WHERE u.perm_imgmod)) AS sexual_avg
+ , greatest(avg(violence) FILTER(WHERE NOT iv.ignore), max(violence) FILTER(WHERE u.perm_imgmod)) AS violence_avg
+ , stddev_pop(sexual) FILTER(WHERE NOT iv.ignore) AS sexual_stddev
+ , stddev_pop(violence) FILTER(WHERE NOT iv.ignore) AS violence_stddev
FROM images i
LEFT JOIN image_votes iv ON iv.id = i.id
LEFT JOIN users u ON u.id = iv.uid