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

Progress on chat conversation search, scrolling

Browse Source
This commit is contained in:
mgabdev
2020-12-22 13:38:52 -05:00
parent 15df66b234
commit 7a62adea3e
13 changed files with 96 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/controllers/api/v1/chat_conversation_accounts_controller.rb
View File

@@ -7,7 +7,7 @@ class Api::V1::ChatConversationAccountsController < Api::BaseController
before_action :require_user!
before_action :set_account, only: [:block_messenger, :unblock_messenger, :messenger_block_relationships]
before_action :check_account_suspension, only: [:block_messenger, :unblock_messenger, :messenger_block_relationships]
before_action :set_chat_conversation, except: [:block_messenger, :unblock_messenger, :messenger_block_relationships]
before_action :set_chat_conversation, except: [:block_messenger, :unblock_messenger, :messenger_block_relationships, :search]
def block_messenger
@block = BlockChatMessengerService.new.call(current_user.account, @account)
@@ -42,6 +42,13 @@ class Api::V1::ChatConversationAccountsController < Api::BaseController
render json: @chat_conversation_account, serializer: REST::ChatConversationAccountSerializer
end
def search
# : todo :
search_conversations = [] #ChatConversationAccount.where(account: current_account, is_hidden: false, is_approved: true).map(&:participant_account_ids)
# .joins(:account).where("accounts.display_name ILIKE ?", "%#{params[:q]}%")
render json: search_conversations, each_serializer: REST::ChatConversationAccountSerializer
end
private
def set_account

9
app/controllers/api/v1/chat_conversation_controller.rb
View File

@@ -34,13 +34,8 @@ class Api::V1::ChatConversationController < Api::BaseController
end
def mark_chat_conversation_approved
approved_conversation_count = ChatConversationAccount.where(account: @account, is_hidden: false, is_approved: true).count
if approved_conversation_count >= ChatConversationAccount::PER_ACCOUNT_APPROVED_LIMIT
render json: { error: true, message: "You have #{approved_conversation_count} active chat conversations. The limit is #{ChatConversationAccount::PER_ACCOUNT_APPROVED_LIMIT}. Delete some conversations first before approving any more requests." }
else
@chat_conversation_account.update!(is_approved: true)
render json: @chat_conversation_account, serializer: REST::ChatConversationAccountSerializer
end
@chat_conversation_account.update!(is_approved: true)
render json: @chat_conversation_account, serializer: REST::ChatConversationAccountSerializer
end
def set_expiration_policy