Merge branch 'master' of gitorious.org:social/mainline

[quix0rs-gnu-social.git] / classes / User.php

diff --git a/classes/User.php b/classes/User.php
index 060a67411d54b68492adf9f229fc2c792ef890a7..7a19ae3a0a04cbf9e39cdb5d724106292078d78b 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -658,6 +658,21 @@ class User extends Managed_DataObject
         return $this->getProfile()->isSilenced();
     }
 
+    function receivesEmailNotifications()
+    {
+        // We could do this in one large if statement, but that's not as easy to read
+        // Don't send notifications if we don't know the user's email address or it is
+        // explicitly undesired by the user's own settings.
+        if (empty($this->email) || !$this->emailnotifyattn) {
+            return false;
+        }
+        // Don't send notifications to a user who is sandboxed or silenced
+        if ($this->isSandboxed() || $this->isSilenced()) {
+            return false;
+        }
+        return true;
+    }
+
     function repeatedByMe($offset=0, $limit=20, $since_id=null, $max_id=null)
     {
         $stream = new RepeatedByMeNoticeStream($this);
@@ -989,6 +1004,11 @@ class User extends Managed_DataObject
         return $this->getProfile()->getPref($namespace, $topic, $default);
     }
 
+    public function getConfigPref($namespace, $topic)
+    {
+        return $this->getProfile()->getConfigPref($namespace, $topic);
+    }
+
     public function setPref($namespace, $topic, $data)
     {
         return $this->getProfile()->setPref($namespace, $topic, $data);