X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=classes%2FUser.php;h=970e167a3bdd6372e745f2bf38b16c9dd0d51da1;hb=a9f556795b5154fbb2880d816b83bee68b242bdb;hp=47bf8a617731088589fefc9e0e6b2010c70b8129;hpb=3a831ff811daf2911fa4a14e1015d63e4451a2ab;p=quix0rs-gnu-social.git

diff --git a/classes/User.php b/classes/User.php
index 47bf8a6177..970e167a3b 100644
--- a/classes/User.php
+++ b/classes/User.php
@@ -48,11 +48,6 @@ class User extends Memcached_DataObject
     public $language;                        // varchar(50)
     public $timezone;                        // varchar(50)
     public $emailpost;                       // tinyint(1)   default_1
-    public $jabber;                          // varchar(255)  unique_key
-    public $jabbernotify;                    // tinyint(1)
-    public $jabberreplies;                   // tinyint(1)
-    public $jabbermicroid;                   // tinyint(1)   default_1
-    public $updatefrompresence;              // tinyint(1)
     public $sms;                             // varchar(64)  unique_key
     public $carrier;                         // int(4)
     public $smsnotify;                       // tinyint(1)
@@ -94,7 +89,7 @@ class User extends Memcached_DataObject
     {
         $this->_connect();
         $parts = array();
-        foreach (array('nickname', 'email', 'jabber', 'incomingemail', 'sms', 'carrier', 'smsemail', 'language', 'timezone') as $k) {
+        foreach (array('nickname', 'email', 'incomingemail', 'sms', 'carrier', 'smsemail', 'language', 'timezone') as $k) {
             if (strcmp($this->$k, $orig->$k) != 0) {
                 $parts[] = $k . ' = ' . $this->_quote($this->$k);
             }
@@ -476,11 +471,21 @@ class User extends Memcached_DataObject
         return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, false);
     }
 
+    function noticesWithFriendsThreaded($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
+    {
+        return Inbox::streamNoticesThreaded($this->id, $offset, $limit, $since_id, $before_id, false);
+    }
+
     function noticeInbox($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
     {
         return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, true);
     }
 
+    function noticeInboxThreaded($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
+    {
+        return Inbox::streamNoticesThreaded($this->id, $offset, $limit, $since_id, $before_id, true);
+    }
+
     function friendsTimeline($offset=0, $limit=NOTICES_PER_PAGE, $since_id=0, $before_id=0)
     {
         return Inbox::streamNotices($this->id, $offset, $limit, $since_id, $before_id, false);
@@ -975,7 +980,7 @@ class User extends Memcached_DataObject
     }
 
     /*
-     * Get a list of OAuth client application that have access to this
+     * Get a list of OAuth client applications that have access to this
      * user's account.
      */
     function getConnectedApps($offset = 0, $limit = null)