erik/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-08-20 21:08:15 -07:00
Code Issues Projects Releases Wiki Activity

Fix /api/v1/conversations sometimes returning empty accounts (#25499)

Browse source
This commit is contained in:
Claire 2023-06-20 18:32:26 +02:00 committed by GitHub
parent ec91ea4457
commit ebfeaebedb
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/models/account_conversation.rb
View file

@ -32,14 +32,8 @@ class AccountConversation < ApplicationRecord
end end
def participant_accounts def participant_accounts
@participant_accounts ||= begin @participant_accounts ||= Account.where(id: participant_account_ids).to_a
if participant_account_ids.empty? @participant_accounts.presence || [account]
[account]
else
participants = Account.where(id: participant_account_ids).to_a
participants.empty? ? [account] : participants
end
end
end end
class << self class << self

6
spec/controllers/api/v1/conversations_controller_spec.rb
View file

@ -18,6 +18,7 @@ RSpec.describe Api::V1::ConversationsController do
before do before do
PostStatusService.new.call(other.account, text: 'Hey @alice', visibility: 'direct') PostStatusService.new.call(other.account, text: 'Hey @alice', visibility: 'direct')
PostStatusService.new.call(user.account, text: 'Hey, nobody here', visibility: 'direct')
end end
it 'returns http success' do it 'returns http success' do
@ -33,7 +34,8 @@ RSpec.describe Api::V1::ConversationsController do
it 'returns conversations' do it 'returns conversations' do
get :index get :index
json = body_as_json json = body_as_json
expect(json.size).to eq 1 expect(json.size).to eq 2
expect(json[0][:accounts].size).to eq 1
end end
context 'with since_id' do context 'with since_id' do
@ -41,7 +43,7 @@ RSpec.describe Api::V1::ConversationsController do
it 'returns conversations' do it 'returns conversations' do
get :index, params: { since_id: Mastodon::Snowflake.id_at(1.hour.ago, with_random: false) } get :index, params: { since_id: Mastodon::Snowflake.id_at(1.hour.ago, with_random: false) }
json = body_as_json json = body_as_json
expect(json.size).to eq 1 expect(json.size).to eq 2
end end
end end