From 6297ff86381dd9c079c9a70ccc7a8733f525a034 Mon Sep 17 00:00:00 2001 From: r888888888 Date: Wed, 16 Sep 2015 14:02:02 -0700 Subject: [PATCH] reduce factor of comic uploads --- app/models/user.rb | 3 ++- app/presenters/user_presenter.rb | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index a7b4b49a9..7b004c342 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -532,7 +532,8 @@ class User < ActiveRecord::Base dcon = [deletion_confidence(120), 15].min max_count = [(base_upload_limit * (1 - (dcon / 15.0))).ceil, 10].max uploaded_count = Post.for_user(id).where("created_at >= ?", 24.hours.ago).count - limit = max_count - uploaded_count + uploaded_comic_count = Post.for_user(id).tag_match("comic").where("created_at >= ?", 24.hours.ago).count / 3 + limit = max_count - (uploaded_count - uploaded_comic_count) if limit < 0 limit = 0 diff --git a/app/presenters/user_presenter.rb b/app/presenters/user_presenter.rb index 42a56d854..17d775f4b 100644 --- a/app/presenters/user_presenter.rb +++ b/app/presenters/user_presenter.rb @@ -58,8 +58,9 @@ class UserPresenter multiplier = (1 - (dcon / 15.0)) max_count = [(user.base_upload_limit * multiplier).ceil, 5].max uploaded_count = Post.for_user(user.id).where("created_at >= ?", 24.hours.ago).count + uploaded_comic_count = Post.for_user(id).tag_match("comic").where("created_at >= ?", 24.hours.ago).count / 3 - "(#{user.base_upload_limit} * #{'%0.2f' % multiplier}) - #{uploaded_count} = #{user.upload_limit}" + "(#{user.base_upload_limit} * #{'%0.2f' % multiplier}) - #{uploaded_count - uploaded_comic_count} = #{user.upload_limit}" end def uploads