Merge remote-tracking branch 'tootsuite/master' into glitchsoc/master

2018-01-15 06:17:15 +00:00
parent 8ee6ed358f 74c1c9ec01
commit 0c7dc6c781
13 changed files with 51 additions and 13 deletions
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -170,6 +170,10 @@ class User < ApplicationRecord
    settings.default_privacy || (account.locked? ? 'private' : 'public')
  end

+  def allows_digest_emails?
+    settings.notification_emails['digest']
+  end
+
  def token_for_app(a)
    return nil if a.nil? || a.owner != self
    Doorkeeper::AccessToken