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

Fixed issue with Tags timeline

Browse Source 
• Fixed:
- issue with Tags timeline and incorrect number of arguments due to removal of "local" attribute
This commit is contained in:
mgabdev 2020-06-11 15:33:56 -04:00
parent 6f5bd998db
commit eb89d552ce
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/timelines/tag_controller.rb
View File

@ -46,7 +46,7 @@ class Api::V1::Timelines::TagController < Api::BaseController
end end
def tag_timeline_statuses def tag_timeline_statuses
HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none), current_account, truthy_param?(:local)) HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none), current_account)
end end
def insert_pagination_headers def insert_pagination_headers

2
app/controllers/tags_controller.rb
View File

@ -27,7 +27,7 @@ class TagsController < ApplicationController
end end
format.json do format.json do
@statuses = HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none), current_account, params[:local]).paginate_by_max_id(PAGE_SIZE, params[:max_id]) @statuses = HashtagQueryService.new.call(@tag, params.slice(:any, :all, :none), current_account).paginate_by_max_id(PAGE_SIZE, params[:max_id])
@statuses = cache_collection(@statuses, Status) @statuses = cache_collection(@statuses, Status)
render json: collection_presenter, render json: collection_presenter,

4
app/services/hashtag_query_service.rb
View File

@ -3,13 +3,13 @@
class HashtagQueryService < BaseService class HashtagQueryService < BaseService
LIMIT_PER_MODE = 1 LIMIT_PER_MODE = 1
def call(tag, params, account = nil, local = true) def call(tag, params, account = nil)
tags = tags_for(Array(tag.name) | Array(params[:any])).pluck(:id) tags = tags_for(Array(tag.name) | Array(params[:any])).pluck(:id)
all = tags_for(params[:all]) all = tags_for(params[:all])
none = tags_for(params[:none]) none = tags_for(params[:none])
Status.distinct Status.distinct
.as_tag_timeline(tags, account, local) .as_tag_timeline(tags, account)
.tagged_with_all(all) .tagged_with_all(all)
.tagged_with_none(none) .tagged_with_none(none)
end end