public/once-campfire
1
0
Fork 0
mirror of https://github.com/basecamp/once-campfire.git synced 2026-05-08 11:51:01 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #192 from ESH13/fix-negative-limit-direct-placeholders

Browse Source 
Fix crash when user has 20+ direct conversations
This commit is contained in:
Stanko Krtalić
2026-04-13 16:47:16 +02:00
committed by GitHub
parent 3fada3d997 8c7f49e003
commit ba11a0a67f
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/users/sidebars_controller.rb
View File

@@ -16,7 +16,7 @@ class Users::SidebarsController < ApplicationController
def find_direct_placeholder_users
exclude_user_ids = user_ids_already_in_direct_rooms_with_current_user.including(Current.user.id)
User.active.where.not(id: exclude_user_ids).order(:created_at).limit(DIRECT_PLACEHOLDERS - exclude_user_ids.count)
User.active.where.not(id: exclude_user_ids).order(:created_at).limit([DIRECT_PLACEHOLDERS - exclude_user_ids.count, 0].max)
end
def user_ids_already_in_direct_rooms_with_current_user