Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Make displaying application used to toot opt-in (#9897)

Browse source 
* Make storing and displaying application used to toot opt-in

* Revert to storing application info, and display it to the author via API
This commit is contained in:
ThibG 2019-02-02 19:18:15 +01:00 • committed by Eugen Rochko
parent bcfff65195
commit ed30110618
9 changed files with 24 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
app/models/user.rb
View file

@ -100,7 +100,7 @@ class User < ApplicationRecord
delegate :auto_play_gif, :default_sensitive, :unfollow_modal, :boost_modal, :delete_modal,
:reduce_motion, :system_font_ui, :noindex, :theme, :display_media, :hide_network,
:expand_spoilers, :default_language, :aggregate_reblogs, to: :settings, prefix: :setting, allow_nil: false
:expand_spoilers, :default_language, :aggregate_reblogs, :show_application, to: :settings, prefix: :setting, allow_nil: false
attr_reader :invite_code
@ -244,6 +244,10 @@ class User < ApplicationRecord
@aggregates_reblogs ||= settings.aggregate_reblogs
end
def shows_application?
@shows_application ||= settings.shows_application
end
def token_for_app(a)
return nil if a.nil? || a.owner != self
Doorkeeper::AccessToken