Merge branch '0.8.x' of git://gitorious.org/laconica/dev into 0.8.x

Conflicts:

	lib/util.php

1 files changed, 30 insertions, 29 deletions

diff --git a/db/laconica_pg.sql b/db/laconica_pg.sql
index 9882d091a..2d83f784a 100644
--- a/db/laconica_pg.sql
+++ b/db/laconica_pg.sql
@@ -8,7 +8,7 @@ create table profile (
     homepage varchar(255) /* comment 'identifying URL' */,

     bio varchar(140) /* comment 'descriptive biography' */,

     location varchar(255) /* comment 'physical location' */,

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */,

 

     textsearch tsvector

@@ -23,7 +23,7 @@ create table avatar (
     mediatype varchar(32) not null /* comment 'file type' */,

     filename varchar(255) null /* comment 'local filename, if local' */,

     url varchar(255) unique /* comment 'avatar location' */,

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */,

 

     primary key(profile_id, width, height)

@@ -34,7 +34,7 @@ create table sms_carrier (
     id serial primary key /* comment 'primary key for SMS carrier' */,

     name varchar(64) unique /* comment 'name of the carrier' */,

     email_pattern varchar(255) not null /* comment 'sprintf pattern for making an email address from a phone number' */,

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified ' */

 );

 

@@ -50,6 +50,7 @@ create table "user" (
     emailnotifyfav integer default 1 /* comment 'Notify by email of favorites' */,

     emailnotifynudge integer default 1 /* comment 'Notify by email of nudges' */,

     emailnotifymsg integer default 1 /* comment 'Notify by email of direct messages' */,

+    emailnotifyattn integer default 1 /* command 'Notify by email of @-replies' */, 

     emailmicroid integer default 1 /* comment 'whether to publish email microid' */,

     language varchar(50) /* comment 'preferred language' */,

     timezone varchar(50) /* comment 'timezone' */,

@@ -68,7 +69,7 @@ create table "user" (
     autosubscribe integer 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 integer default 0 /* comment 'has an inbox been created for this user?' */, 

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */

 

 );

@@ -81,7 +82,7 @@ create table remote_profile (
     uri varchar(255) unique /* comment 'universally unique identifier, usually a tag URI' */,

     postnoticeurl varchar(255) /* comment 'URL we use for posting notices' */,

     updateprofileurl varchar(255) /* comment 'URL we use for updates to this profile' */,

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */

 );

 

@@ -92,7 +93,7 @@ create table subscription (
     sms integer default 1 /* comment 'deliver sms messages' */,

     token varchar(255) /* comment 'authorization token' */,

     secret varchar(255) /* comment 'token secret' */,

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */,

 

     primary key (subscriber, subscribed)

@@ -108,7 +109,7 @@ create table notice (
     content varchar(140) /* comment 'update content' */,

     rendered text /* comment 'HTML version of the content' */,

     url varchar(255) /* comment 'URL of any attachment (image, video, bookmark, whatever)' */,

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */,

     reply_to integer /* comment 'notice replied to (usually a guess)' */ references notice (id) ,

     is_local integer default 0 /* comment 'notice was generated by a user' */,

@@ -123,7 +124,7 @@ create table notice_source (
      code varchar(32) primary key not null /* comment 'source code' */,

      name varchar(255) not null /* comment 'name of the source' */,

      url varchar(255) not null /* comment 'url to link to' */,

-     created timestamp not null /* comment 'date this record was created' */,

+     created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

      modified timestamp /* comment 'date this record was modified' */

 );

 

@@ -131,7 +132,7 @@ create table reply (
 

     notice_id integer not null /* comment 'notice that is the reply' */ references notice (id) ,

     profile_id integer not null /* comment 'profile replied to' */ references profile (id) ,

-    modified timestamp not null default 'now' /* comment 'date this record was modified' */,

+    modified timestamp /* comment 'date this record was modified' */,

     replied_id integer /* comment 'notice replied to (not used, see notice.reply_to)' */,

 

     primary key (notice_id, profile_id)

@@ -145,7 +146,7 @@ create table fave (
 

     notice_id integer not null /* comment 'notice that is the favorite' */ references notice (id),

     user_id integer not null /* comment 'user who likes this notice' */ references "user" (id) ,

-    modified timestamp not null /* comment 'date this record was modified' */,

+    modified timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was modified' */,

     primary key (notice_id, user_id)

 

 );

@@ -159,7 +160,7 @@ create table consumer (
     consumer_key varchar(255) primary key /* comment 'unique identifier, root URL' */,

     seed char(32) not null /* comment 'seed for new tokens by this consumer' */,

 

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */

 );

 

@@ -170,7 +171,7 @@ create table token (
     type integer not null default 0 /* comment 'request or access' */,

     state integer default 0 /* comment 'for requests; 0 = initial, 1 = authorized, 2 = used' */,

 

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */,

 

     primary key (consumer_key, tok)

@@ -180,9 +181,9 @@ create table nonce (
     consumer_key varchar(255) not null /* comment 'unique identifier, root URL' */,

     tok char(32) not null /* comment 'identifying value' */,

     nonce char(32) not null /* comment 'nonce' */,

-    ts timestamp not null /* comment 'timestamp sent' */,

+    ts integer not null /* comment 'timestamp sent' values are epoch, and only used internally */,

 

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */,

 

     primary key (consumer_key, tok, nonce),

@@ -195,7 +196,7 @@ create table user_openid (
     canonical varchar(255) primary key /* comment 'Canonical true URL' */,

     display varchar(255) not null unique /* comment 'URL for viewing, may be different from canonical' */,

     user_id integer not null /* comment 'user owning this URL' */ references "user" (id) ,

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */

 

 );

@@ -241,7 +242,7 @@ create table queue_item (
 

     notice_id integer not null /* comment 'notice queued' */ references notice (id) ,

     transport varchar(8) not null /* comment 'queue for what? "email", "jabber", "sms", "irc", ...' */,

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     claimed timestamp /* comment 'date this item was claimed' */,

 

     primary key (notice_id, transport)

@@ -253,7 +254,7 @@ create index queue_item_created_idx on queue_item using btree(created);
 create table notice_tag (

     tag varchar( 64 ) not null /* comment 'hash tag associated with this notice' */,

     notice_id integer not null /* comment 'notice tagged' */ references notice (id) ,

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

 

     primary key (tag, notice_id)

 );

@@ -265,7 +266,7 @@ create table foreign_service (
      id int not null primary key /* comment 'numeric key for service' */,

      name varchar(32) not null unique /* comment 'name of the service' */,

      description varchar(255) /* comment 'description' */,

-     created timestamp not null /* comment 'date this record was created' */,

+     created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

      modified timestamp /* comment 'date this record was modified' */

 );

 

@@ -274,7 +275,7 @@ create table foreign_user (
      service int not null /* comment 'foreign key to service' */ references foreign_service(id) ,

      uri varchar(255) not null unique /* comment 'identifying URI' */,

      nickname varchar(255) /* comment 'nickname on foreign service' */,

-     created timestamp not null /* comment 'date this record was created' */,

+     created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

      modified timestamp /* comment 'date this record was modified' */,

      

      primary key (id, service)

@@ -288,8 +289,8 @@ create table foreign_link (
      noticesync int not null default 1 /* comment 'notice synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming, bit 3 = filter local replies' */,

      friendsync int not null default 2 /* comment 'friend synchronisation, bit 1 = sync outgoing, bit 2 = sync incoming */, 

      profilesync int not null default 1 /* comment 'profile synchronization, bit 1 = sync outgoing, bit 2 = sync incoming' */,

-     created timestamp not null /* comment 'date this record was created' */,

-     modified timestamp not null /* comment 'date this record was modified' */,

+     created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

+     modified timestamp /* comment 'date this record was modified' */,

 

      primary key (user_id,foreign_id,service)

 );

@@ -299,7 +300,7 @@ create table foreign_subscription (
      service int not null /* comment 'service where relationship happens' */ references foreign_service(id) ,

      subscriber int not null /* comment 'subscriber on foreign service' */ ,

      subscribed int not null /* comment 'subscribed user' */ ,

-     created timestamp not null /* comment 'date this record was created' */,

+     created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

      

      primary key (service, subscriber, subscribed)

 );

@@ -311,7 +312,7 @@ create table invitation (
      user_id int not null /* comment 'who sent the invitation' */ references "user" (id),

      address varchar(255) not null /* comment 'invitation sent to' */,

      address_type varchar(8) not null /* comment 'address type ("email", "jabber", "sms") '*/,

-     created timestamp not null /* comment 'date this record was created' */

+     created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */

 

 );

 create index invitation_address_idx on invitation using btree(address,address_type);

@@ -326,7 +327,7 @@ create table message (
     content varchar(140) /* comment 'message content' */,

     rendered text /* comment 'HTML version of the content' */,

     url varchar(255) /* comment 'URL of any attachment (image, video, bookmark, whatever)' */,

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */,

     source varchar(32) /* comment 'source of comment, like "web", "im", or "clientname"' */

     

@@ -339,7 +340,7 @@ create table notice_inbox (
 

     user_id integer not null /* comment 'user receiving the message' */ references "user" (id),

     notice_id integer not null /* comment 'notice received' */ references notice (id),

-    created timestamp not null /* comment 'date the notice was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date the notice was created' */,

     source integer default 1 /* comment 'reason it is in the inbox; 1=subscription' */,

 

     primary key (user_id, notice_id)

@@ -382,7 +383,7 @@ create table user_group (
     stream_logo varchar(255) /* comment 'stream-sized logo' */,

     mini_logo varchar(255) /* comment 'mini logo' */,

 

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */

 

 );

@@ -394,7 +395,7 @@ create table group_member (
     profile_id integer not null /* comment 'foreign key to profile table' */ references profile (id),

     is_admin integer default 0 /* comment 'is this user an admin?' */,

 

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

     modified timestamp /* comment 'date this record was modified' */,

 

     primary key (group_id, profile_id)

@@ -405,7 +406,7 @@ create table related_group (
     group_id integer not null /* comment 'foreign key to user_group' */ references user_group (id) ,

     related_group_id integer not null /* comment 'foreign key to user_group' */ references user_group (id),

 

-    created timestamp not null /* comment 'date this record was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date this record was created' */,

 

     primary key (group_id, related_group_id)

 

@@ -414,7 +415,7 @@ create table related_group (
 create table group_inbox (

     group_id integer not null /* comment 'group receiving the message' references user_group (id) */,

     notice_id integer not null /* comment 'notice received' references notice (id) */,

-    created timestamp not null /* comment 'date the notice was created' */,

+    created timestamp not null default CURRENT_TIMESTAMP /* comment 'date the notice was created' */,

 

     primary key (group_id, notice_id)

 );