add inboxed and regenerate data objects

darcs-hash:20081113210209-84dde-56052bac5ce490d54f3220baaa13f5bfc0e7618d.gz

diff --git a/classes/Notice_inbox.php b/classes/Notice_inbox.php
index cc482bd194fc07fe052350f5d2a6568db2367b4f..93b1f113d91b7c4d1f93e849db374e195764ef7d 100644 (file)
--- a/classes/Notice_inbox.php
+++ b/classes/Notice_inbox.php
@@ -29,8 +29,8 @@ class Notice_inbox extends Memcached_DataObject
     public $__table = 'notice_inbox';                    // table name
     public $user_id;                         // int(4)  primary_key not_null
     public $notice_id;                       // int(4)  primary_key not_null
-    public $created;                         // datetime()   not_null
     public $source;                          // tinyint(1)   default_1
+    public $created;                         // datetime()   not_null
 
     /* Static get */
     function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('Notice_inbox',$k,$v); }

diff --git a/classes/User.php b/classes/User.php
index e3fa93395e322f7ad7f68ff0fa1a6f43f4f02c41..e4a8663c3c48913a9b4e8c9d9f73be84bb5eaec4 100644 (file)
--- a/classes/User.php
+++ b/classes/User.php
@@ -55,9 +55,10 @@ class User extends Memcached_DataObject
     public $smsemail;                        // varchar(255)  
     public $uri;                             // varchar(255)  unique_key
     public $autosubscribe;                   // tinyint(1)  
-       public $urlshorteningservice;                    // varchar(50)
     public $created;                         // datetime()   not_null
     public $modified;                        // timestamp()   not_null default_CURRENT_TIMESTAMP
+    public $inboxed;                         // tinyint(1)  
+    public $urlshorteningservice;            // varchar(50)   default_ur1.ca
 
     /* Static get */
     function staticGet($k,$v=NULL) { return Memcached_DataObject::staticGet('User',$k,$v); }

diff --git a/classes/laconica.ini b/classes/laconica.ini
index aa0225739e6632e34f0b679eeb1a956c3ad36161..f6b8e5615f719df9aec23af8de7fc0405c17b40c 100644 (file)
--- a/classes/laconica.ini
+++ b/classes/laconica.ini
@@ -155,8 +155,8 @@ id = N
 [notice_inbox]
 user_id = 129
 notice_id = 129
-created = 142
 source = 17
+created = 142
 
 [notice_inbox__keys]
 user_id = K
@@ -295,9 +295,10 @@ smsreplies = 17
 smsemail = 2
 uri = 2
 autosubscribe = 17
-urlshorteningservice = 2
 created = 142
 modified = 384
+inboxed = 17
+urlshorteningservice = 2
 
 [user__keys]
 id = K

diff --git a/db/laconica.sql b/db/laconica.sql
index d1e5a76a52cc3bea7350d31aec326bbf48b0ecc1..87ac6e26db686f98194c0d8267a1be03157acebc 100644 (file)
--- a/db/laconica.sql
+++ b/db/laconica.sql
@@ -66,6 +66,7 @@ create table user (
     uri varchar(255) unique key comment 'universally unique identifier, usually a tag URI',
     autosubscribe tinyint default 0 comment 'automatically subscribe to users who subscribe to us',
     urlshorteningservice varchar(50) default 'ur1.ca' comment 'service to use for auto-shortening URLs',
+    inboxed tinyint default 0 comment 'has an inbox been created for this user?',
     created datetime not null comment 'date this record was created',
     modified timestamp comment 'date this record was modified',