mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-20 03:25:17 +01:00
Code Issues Projects Releases Wiki Activity

Fix results/query in api/v1/featured_tags/suggestions (#29597)

Browse Source
This commit is contained in:
Matt Jankowski 2024-03-22 11:08:27 -04:00 committed by GitHub
parent 5db5fa879b
commit 34f293475e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 32 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/api/v1/featured_tags/suggestions_controller.rb
View File

@ -12,6 +12,10 @@ class Api::V1::FeaturedTags::SuggestionsController < Api::BaseController
private private
def set_recently_used_tags def set_recently_used_tags
@recently_used_tags = Tag.recently_used(current_account).where.not(id: current_account.featured_tags).limit(10) @recently_used_tags = Tag.recently_used(current_account).where.not(id: featured_tag_ids).limit(10)
end
def featured_tag_ids
current_account.featured_tags.pluck(:tag_id)
end end
end end

2
spec/fabricators/featured_tag_fabricator.rb
View File

@ -2,6 +2,6 @@
Fabricator(:featured_tag) do Fabricator(:featured_tag) do
account { Fabricate.build(:account) } account { Fabricate.build(:account) }
tag { Fabricate.build(:tag) } tag { nil }
name { sequence(:name) { |i| "Tag#{i}" } } name { sequence(:name) { |i| "Tag#{i}" } }
end end

30
spec/requests/api/v1/featured_tags/suggestions_spec.rb
View File

@ -7,13 +7,35 @@ describe 'Featured Tags Suggestions API' do
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) } let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes) }
let(:scopes) { 'read:accounts' } let(:scopes) { 'read:accounts' }
let(:headers) { { 'Authorization' => "Bearer #{token.token}" } } let(:headers) { { 'Authorization' => "Bearer #{token.token}" } }
let(:account) { Fabricate(:account) } let(:account) { Fabricate(:account, user: user) }
describe 'GET /api/v1/featured_tags/suggestions' do describe 'GET /api/v1/featured_tags/suggestions' do
it 'returns http success' do let!(:unused_featured_tag) { Fabricate(:tag, name: 'unused_featured_tag') }
get '/api/v1/featured_tags/suggestions', params: { account_id: account.id, limit: 2 }, headers: headers let!(:used_tag) { Fabricate(:tag, name: 'used_tag') }
let!(:used_featured_tag) { Fabricate(:tag, name: 'used_featured_tag') }
expect(response).to have_http_status(200) before do
_unused_tag = Fabricate(:tag, name: 'unused_tag')
# Make relevant tags used by account
status = Fabricate(:status, account: account)
status.tags << used_tag
status.tags << used_featured_tag
# Feature the relevant tags
Fabricate :featured_tag, account: account, name: unused_featured_tag.name
Fabricate :featured_tag, account: account, name: used_featured_tag.name
end
it 'returns http success and recently used but not featured tags' do
get '/api/v1/featured_tags/suggestions', params: { limit: 2 }, headers: headers
expect(response)
.to have_http_status(200)
expect(body_as_json)
.to contain_exactly(
include(name: used_tag.name)
)
end end
end end
end end