unique key on a boolean value is not scalable

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

diff --git a/classes/User.php b/classes/User.php
index 370dad82f797e24b43aa8c5f7f8ba652470ceba3..da70a24f0bd5d271a8f990bba44dafdb6d532d92 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -34,8 +34,10 @@ class User extends DB_DataObject
     public $nickname;                        // varchar(64)  unique_key
     public $password;                        // varchar(255)  
     public $email;                           // varchar(255)  unique_key
+    public $emailnotifysub;                  // tinyint(1)  unique_key default_1
     public $jabber;                          // varchar(255)  unique_key
     public $jabbernotify;                    // tinyint(1)  
+    public $jabberreplies;                   // tinyint(1)  
     public $updatefrompresence;              // tinyint(1)  
     public $sms;                             // varchar(64)  unique_key
     public $carrier;                         // int(4)  
@@ -69,7 +71,7 @@ class User extends DB_DataObject
        }
 
        # 'update' won't write key columns, so we have to do it ourselves.
-       
+
        function updateKeys(&$orig) {
                $parts = array();
                foreach (array('nickname', 'email', 'jabber', 'sms', 'carrier') as $k) {
@@ -82,16 +84,25 @@ class User extends DB_DataObject
                        return true;
                }
                $toupdate = implode(', ', $parts);
-               $qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate . 
+               $qry = 'UPDATE ' . $this->tableName() . ' SET ' . $toupdate .
                  ' WHERE id = ' . $this->id;
                return $this->query($qry);
        }
-       
+
        function allowed_nickname($nickname) {
                # XXX: should already be validated for size, content, etc.
                static $blacklist = array('rss', 'xrds', 'doc', 'main',
-                                                                 'settings', 'notice', 'user');
+                                                                 'settings', 'notice', 'user',
+                                                                 'search', 'avatar');
                $merged = array_merge($blacklist, common_config('nickname', 'blacklist'));
                return !in_array($nickname, $merged);
        }
+
+       function getCurrentNotice($dt=NULL) {
+               $profile = $this->getProfile();
+               if (!$profile) {
+                       return NULL;
+               }
+               return $profile->getCurrentNotice($dt);
+       }
 }