random-mirrors/gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Reverting home timeline changes

Browse Source
This commit is contained in:
Fosco Marotto
2021-01-21 18:05:24 -05:00
parent 0369a1b9fb
commit e9cf46b4bc
7 changed files with 26 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/lib/sorting_query_builder.rb
View File

@@ -1,7 +1,7 @@
# frozen_string_literal: true
class SortingQueryBuilder < BaseService
def call(sort_type, group = nil, page = 1, account = nil)
def call(sort_type, group = nil, page = 1)
limit = 20
min_likes = 5
@@ -44,8 +44,6 @@ class SortingQueryBuilder < BaseService
query = query.with_public_visibility if group.nil?
query = query.where('statuses.created_at > ?', date_limit)
query = query.where(group: group) unless group.nil?
query = query.excluding_blocked_reblogs(account) unless account.nil?
query = query.not_excluded_by_account(account) unless account.nil?
query = query.page(page.to_i)
query = query.per(limit)
return query
@@ -57,8 +55,6 @@ class SortingQueryBuilder < BaseService
query = query.where('status_stats.reblogs_count > ?', min_reblogs) unless sort_type == 'recent'
query = query.where('status_stats.favourites_count > ?', min_likes) unless sort_type == 'recent'
query = query.joins(:status)
query = query.excluding_blocked_reblogs(account) unless account.nil?
query = query.not_excluded_by_account(account) unless account.nil?
query = query.where('statuses.reblog_of_id IS NULL')
query = query.where('statuses.in_reply_to_id IS NULL')
query = query.where('statuses.group_id': group) unless group.nil?