marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow sharekeys to be set via the API.

staging
multiple creatures 2019-04-20 20:57:41 -05:00
parent bb9aa16284
commit 66c640fd38
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -52,6 +52,7 @@ class Api::V1::StatusesController < Api::BaseController
spoiler_text: status_params[:spoiler_text],
visibility: status_params[:visibility],
scheduled_at: status_params[:scheduled_at],
sharekey: status_params[:sharekey],
application: doorkeeper_token.application,
poll: status_params[:poll],
content_type: status_params[:content_type],
@ -85,6 +86,7 @@ class Api::V1::StatusesController < Api::BaseController
:sensitive,
:spoiler_text,
:visibility,
:sharekey,
:scheduled_at,
:content_type,
media_ids: [],

2
app/services/post_status_service.rb
View File

@ -12,6 +12,7 @@ class PostStatusService < BaseService
# @option [Status] :thread Optional status to reply to
# @option [Boolean] :sensitive
# @option [String] :visibility
# @option [String] :sharekey
# @option [String] :spoiler_text
# @option [String] :language
# @option [String] :scheduled_at
@ -166,6 +167,7 @@ class PostStatusService < BaseService
sensitive: (@options[:sensitive].nil? ? @account.user&.setting_default_sensitive : @options[:sensitive]) || @options[:spoiler_text].present?,
spoiler_text: @options[:spoiler_text] || '',
visibility: @visibility,
sharekey: @sharekey,
language: language_from_option(@options[:language]) || @account.user&.setting_default_language&.presence || LanguageDetector.instance.detect(@text, @account),
application: @options[:application],
content_type: @options[:content_type] || @account.user&.setting_default_content_type,