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

mastodon · Jul 6, 2023 · 4c6c790 · 4c6c790
1 parent 036ac5b
commit 4c6c790
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 10 deletions.
diff --git a/app/models/account_conversation.rb b/app/models/account_conversation.rb
@@ -31,14 +31,8 @@ def participant_account_ids=(arr)
   end
 
   def participant_accounts
-    @participant_accounts ||= begin
-      if participant_account_ids.empty?
-        [account]
-      else
-        participants = Account.where(id: participant_account_ids).to_a
-        participants.empty? ? [account] : participants
-      end
-    end
+    @participant_accounts ||= Account.where(id: participant_account_ids).to_a
+    @participant_accounts.presence || [account]
   end
 
   class << self

diff --git a/spec/controllers/api/v1/conversations_controller_spec.rb b/spec/controllers/api/v1/conversations_controller_spec.rb
@@ -16,6 +16,7 @@
 
     before do
       PostStatusService.new.call(other.account, text: 'Hey @alice', visibility: 'direct')
+      PostStatusService.new.call(user.account, text: 'Hey, nobody here', visibility: 'direct')
     end
 
     it 'returns http success' do
@@ -31,15 +32,16 @@
     it 'returns conversations' do
       get :index
       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
 
     context 'with since_id' do
       context 'when requesting old posts' do
         it 'returns conversations' do
           get :index, params: { since_id: Mastodon::Snowflake.id_at(1.hour.ago, with_random: false) }
           json = body_as_json
-          expect(json.size).to eq 1
+          expect(json.size).to eq 2
         end
       end