Progress
Report modal style fix, chat updates, statusserializer revert, display name truncation
This commit is contained in:
@@ -9,7 +9,6 @@ class Api::V1::Accounts::StatusesController < Api::BaseController
|
||||
@statuses = load_statuses
|
||||
render json: @statuses,
|
||||
each_serializer: REST::StatusSerializer,
|
||||
account_id: params[:account_id],
|
||||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user&.account_id)
|
||||
end
|
||||
|
||||
|
||||
@@ -25,6 +25,7 @@ class Api::V1::ChatConversationController < Api::BaseController
|
||||
# check if chat blocked
|
||||
# check if allow anyone to message then create with approved:true
|
||||
# unique account id, participants
|
||||
|
||||
chat_conversation_account = find_or_create_conversation
|
||||
render json: chat_conversation_account, each_serializer: REST::ChatConversationAccountSerializer
|
||||
end
|
||||
@@ -67,7 +68,6 @@ class Api::V1::ChatConversationController < Api::BaseController
|
||||
else
|
||||
@expires_at = nil
|
||||
end
|
||||
puts "tilly @expires_at: " + @expires_at.inspect
|
||||
@chat_conversation_account.chat_message_expiration_policy = @expires_at
|
||||
@chat_conversation_account.save!
|
||||
render json: @chat_conversation_account, serializer: REST::ChatConversationAccountSerializer
|
||||
|
||||
@@ -13,7 +13,7 @@ class Api::V1::Timelines::GroupController < Api::BaseController
|
||||
if current_user
|
||||
render json: @statuses,
|
||||
each_serializer: REST::StatusSerializer,
|
||||
group_id: params[:id],
|
||||
group_id: params[:id], # : todo :
|
||||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id, group_id: @group.id)
|
||||
else
|
||||
render json: @statuses, each_serializer: REST::StatusSerializer
|
||||
|
||||
@@ -10,7 +10,7 @@ class Api::V1::Timelines::PreviewCardController < Api::BaseController
|
||||
def show
|
||||
render json: @statuses,
|
||||
each_serializer: REST::StatusSerializer,
|
||||
preview_card_id: params[:id],
|
||||
preview_card_id: params[:id], # : todo :
|
||||
relationships: StatusRelationshipsPresenter.new(@statuses, current_user.account_id)
|
||||
end
|
||||
|
||||
|
||||
Reference in New Issue
Block a user