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

Merge branch 'feature/rich_text_editor' of https://code.gab.com/gab/social/gab-social into develop

Browse Source
This commit is contained in:
mgabdev
2020-06-17 16:45:45 -04:00
parent 9d61659604 13eb1764ec
commit f7e0528d3b
23 changed files with 1181 additions and 293 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/api/v1/statuses_controller.rb
View File

@@ -52,9 +52,10 @@ class Api::V1::StatusesController < Api::BaseController
end
def create
markdown = status_params[:markdown] unless status_params[:markdown] === status_params[:status]
@status = PostStatusService.new.call(current_user.account,
text: status_params[:status],
markdown: status_params[:markdown],
markdown: markdown,
thread: status_params[:in_reply_to_id].blank? ? nil : Status.find(status_params[:in_reply_to_id]),
media_ids: status_params[:media_ids],
sensitive: status_params[:sensitive],
@@ -72,9 +73,10 @@ class Api::V1::StatusesController < Api::BaseController
def update
authorize @status, :update?
markdown = status_params[:markdown] unless status_params[:markdown] === status_params[:status]
@status = EditStatusService.new.call(@status,
text: status_params[:status],
markdown: markdown,
media_ids: status_params[:media_ids],
sensitive: status_params[:sensitive],
spoiler_text: status_params[:spoiler_text],