diff --git a/app/models/group.rb b/app/models/group.rb index 441fbb63..70def81e 100644 --- a/app/models/group.rb +++ b/app/models/group.rb @@ -61,12 +61,12 @@ class Group < ApplicationRecord after_create :add_owner_to_accounts class << self - def search_for(term, limit = 25, offset = 0) + def search_for(term, offset = 0) pattern = sanitize_sql_like(term.strip) + '%' Group.where('lower(title) like lower(?) AND is_archived=false AND is_visible=true', pattern) .order('member_count DESC') - .limit(limit) + .limit(25) .offset(offset) end end diff --git a/app/models/preview_card.rb b/app/models/preview_card.rb index 485cfb64..36f9de5d 100644 --- a/app/models/preview_card.rb +++ b/app/models/preview_card.rb @@ -57,12 +57,12 @@ class PreviewCard < ApplicationRecord end class << self - def search_for(term, limit = 25, offset = 0) + def search_for(term, offset = 0) pattern = '%' + sanitize_sql_like(term.strip) + '%' PreviewCard.where( "lower(title) LIKE lower('#{pattern}') OR lower(description) LIKE lower('#{pattern}') OR lower(url) LIKE lower('#{pattern}')" - ).order('updated_at DESC').limit(limit).offset(offset) + ).order('updated_at DESC').limit(25).offset(offset) end private diff --git a/app/models/tag.rb b/app/models/tag.rb index 3505146f..88d65426 100644 --- a/app/models/tag.rb +++ b/app/models/tag.rb @@ -65,12 +65,12 @@ class Tag < ApplicationRecord end class << self - def search_for(term, limit = 5, offset = 0) + def search_for(term, offset = 0) pattern = sanitize_sql_like(term.strip) + '%' Tag.where('lower(name) like lower(?)', pattern) .order(:name) - .limit(limit) + .limit(25) .offset(offset) end diff --git a/app/services/search_service.rb b/app/services/search_service.rb index 181b26a9..66c1823e 100644 --- a/app/services/search_service.rb +++ b/app/services/search_service.rb @@ -41,7 +41,6 @@ class SearchService < BaseService def perform_groups_search! Group.search_for( @query.gsub(/\A#/, ''), - @limit, @offset ) end @@ -49,7 +48,6 @@ class SearchService < BaseService def perform_links_search! PreviewCard.search_for( @query.gsub(/\A#/, ''), - @limit, @offset ) end @@ -82,7 +80,6 @@ class SearchService < BaseService def perform_hashtags_search! Tag.search_for( @query.gsub(/\A#/, ''), - @limit, @offset ) end