tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make storing and displaying application used to toot opt-in

Browse Source
This commit is contained in:
Thibaut Girka
2019-01-21 19:36:33 +01:00
committed by ThibG
parent 64cb9b6913
commit 05415fa5d3
10 changed files with 25 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, :favourite_modal, :delete_modal,
:reduce_motion, :system_font_ui, :noindex, :flavour, :skin, :display_media, :hide_network, :hide_followers_count,
: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