Progress on dms, code cleanup
Progress on dms, code cleanup
This commit is contained in:
@@ -0,0 +1,71 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class Api::V1::ChatConversations::ApprovedConversationsController < Api::BaseController
|
||||
before_action -> { authorize_if_got_token! :read, :'read:chats' }
|
||||
|
||||
before_action :require_user!
|
||||
after_action :insert_pagination_headers
|
||||
|
||||
def index
|
||||
puts "tilly ApprovedConversationsController-0"
|
||||
@chat_conversations = load_chat_conversations
|
||||
render json: @chat_conversations, each_serializer: REST::ChatConversationAccountSerializer
|
||||
end
|
||||
|
||||
def show
|
||||
puts "tilly ApprovedConversationsController-1"
|
||||
@chat_conversations = load_chat_conversations
|
||||
render json: @chat_conversations, each_serializer: REST::ChatConversationAccountSerializer
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def load_chat_conversations
|
||||
paginated_chat_conversations
|
||||
end
|
||||
|
||||
def paginated_chat_conversations
|
||||
ChatConversationAccount.where(
|
||||
account: current_account,
|
||||
is_hidden: false,
|
||||
is_approved: true
|
||||
).paginate_by_max_id(
|
||||
limit_param(DEFAULT_CHAT_CONVERSATION_LIMIT),
|
||||
params[:max_id],
|
||||
params[:since_id]
|
||||
)
|
||||
end
|
||||
|
||||
def insert_pagination_headers
|
||||
set_pagination_headers(next_path, prev_path)
|
||||
end
|
||||
|
||||
def next_path
|
||||
if records_continue?
|
||||
api_v1_chat_conversations_approved_conversations_url pagination_params(max_id: pagination_max_id)
|
||||
end
|
||||
end
|
||||
|
||||
def prev_path
|
||||
unless paginated_chat_conversations.empty?
|
||||
api_v1_chat_conversations_approved_conversations_url pagination_params(since_id: pagination_since_id)
|
||||
end
|
||||
end
|
||||
|
||||
def pagination_max_id
|
||||
paginated_chat_conversations.last.id
|
||||
end
|
||||
|
||||
def pagination_since_id
|
||||
paginated_chat_conversations.first.id
|
||||
end
|
||||
|
||||
def records_continue?
|
||||
paginated_chat_conversations.size == limit_param(DEFAULT_CHAT_CONVERSATION_LIMIT)
|
||||
end
|
||||
|
||||
def pagination_params(core_params)
|
||||
params.slice(:limit).permit(:limit).merge(core_params)
|
||||
end
|
||||
|
||||
end
|
||||
@@ -0,0 +1,56 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class Api::V1::ChatConversations::MessagesController < Api::BaseController
|
||||
before_action -> { authorize_if_got_token! :read, :'read:chats' }
|
||||
before_action -> { doorkeeper_authorize! :write, :'write:chats' }
|
||||
|
||||
before_action :require_user!
|
||||
before_action :set_chat_conversation
|
||||
before_action :set_chat_messages
|
||||
|
||||
after_action :insert_pagination_headers, unless: -> { @chats.empty? }
|
||||
|
||||
def show
|
||||
puts "tilly chat_message_conversations - 1: " + @chats.count.inspect
|
||||
render json: @chats, each_serializer: REST::ChatMessageSerializer
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def set_chat_conversation
|
||||
@chat_conversation = ChatConversation.find(params[:id])
|
||||
end
|
||||
|
||||
def set_chat_messages
|
||||
@chats = cached_conversation_chats
|
||||
end
|
||||
|
||||
def cached_conversation_chats
|
||||
cache_collection conversation_chats, ChatMessage
|
||||
end
|
||||
|
||||
def conversation_chats
|
||||
chats = ChatMessage.where(
|
||||
chat_conversation: @chat_conversation
|
||||
).paginate_by_id(
|
||||
limit_param(DEFAULT_CHAT_CONVERSATION_MESSAGE_LIMIT),
|
||||
params_slice(:max_id, :since_id, :min_id)
|
||||
)
|
||||
end
|
||||
|
||||
def insert_pagination_headers
|
||||
set_pagination_headers(next_path, nil)
|
||||
end
|
||||
|
||||
def pagination_params(core_params)
|
||||
params.slice(:limit).permit(:limit).merge(core_params)
|
||||
end
|
||||
|
||||
def next_path
|
||||
api_v1_chat_conversations_message_url params[:id], pagination_params(since_id: pagination_since_id)
|
||||
end
|
||||
|
||||
def pagination_since_id
|
||||
@chats.first.id
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,69 @@
|
||||
# frozen_string_literal: true
|
||||
|
||||
class Api::V1::ChatConversations::RequestedConversationsController < Api::BaseController
|
||||
before_action -> { authorize_if_got_token! :read, :'read:chats' }
|
||||
|
||||
before_action :require_user!
|
||||
after_action :insert_pagination_headers
|
||||
|
||||
def index
|
||||
@chat_conversations = load_chat_conversations
|
||||
render json: @chat_conversations, each_serializer: REST::ChatConversationAccountSerializer
|
||||
end
|
||||
|
||||
def count
|
||||
count = ChatConversationAccount.where(account: current_account, is_hidden: false, is_approved: false).count
|
||||
render json: count
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
def load_chat_conversations
|
||||
paginated_chat_conversations
|
||||
end
|
||||
|
||||
def paginated_chat_conversations
|
||||
ChatConversationAccount.where(
|
||||
account: current_account,
|
||||
is_hidden: false,
|
||||
is_approved: false
|
||||
).paginate_by_max_id(
|
||||
limit_param(DEFAULT_CHAT_CONVERSATION_LIMIT),
|
||||
params[:max_id],
|
||||
params[:since_id]
|
||||
)
|
||||
end
|
||||
|
||||
def insert_pagination_headers
|
||||
set_pagination_headers(next_path, prev_path)
|
||||
end
|
||||
|
||||
def next_path
|
||||
if records_continue?
|
||||
api_v1_chat_conversations_requested_conversations_url pagination_params(max_id: pagination_max_id)
|
||||
end
|
||||
end
|
||||
|
||||
def prev_path
|
||||
unless paginated_chat_conversations.empty?
|
||||
api_v1_chat_conversations_requested_conversations_url pagination_params(since_id: pagination_since_id)
|
||||
end
|
||||
end
|
||||
|
||||
def pagination_max_id
|
||||
paginated_chat_conversations.last.id
|
||||
end
|
||||
|
||||
def pagination_since_id
|
||||
paginated_chat_conversations.first.id
|
||||
end
|
||||
|
||||
def records_continue?
|
||||
paginated_chat_conversations.size == limit_param(DEFAULT_CHAT_CONVERSATION_LIMIT)
|
||||
end
|
||||
|
||||
def pagination_params(core_params)
|
||||
params.slice(:limit).permit(:limit).merge(core_params)
|
||||
end
|
||||
|
||||
end
|
||||
Reference in New Issue
Block a user