GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge branch '0.8.x' of git@gitorious.org:+laconica-developers/laconica/dev into 0.8.x

Browse Source
This commit is contained in:
Evan Prodromou 2009-06-14 14:54:20 -07:00
commit daf2e7ef47
2 changed files with 28 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

55
db/laconica.sql
View File

@ -427,49 +427,50 @@ create table group_inbox (
create table file ( create table file (
id integer primary key auto_increment, id integer primary key auto_increment,
url varchar(255), mimetype varchar(50), url varchar(255) comment 'destination URL after following redirections',
size integer, mimetype varchar(50) comment 'mime type of resource',
title varchar(255), size integer comment 'size of resource when available',
date integer(11), title varchar(255) comment 'title of resource when available',
protected integer(1), date integer(11) comment 'date of resource according to http query',
protected integer(1) comment 'true when URL is private (needs login)',
unique(url) unique(url)
) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci; ) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci;
create table file_oembed ( create table file_oembed (
id integer primary key auto_increment, id integer primary key auto_increment,
file_id integer, file_id integer comment 'oEmbed for that URL/file' references file (id),
version varchar(20), version varchar(20) comment 'oEmbed spec. version',
type varchar(20), type varchar(20) comment 'oEmbed type: photo, video, link, rich',
provider varchar(50), provider varchar(50) comment 'name of this oEmbed provider',
provider_url varchar(255), provider_url varchar(255) comment 'URL of this oEmbed provider',
width integer, width integer comment 'width of oEmbed resource when available',
height integer, height integer comment 'height of oEmbed resource when available',
html text, html text comment 'html representation of this oEmbed resource when applicable',
title varchar(255), title varchar(255) comment 'title of oEmbed resource when available',
author_name varchar(50), author_name varchar(50) comment 'author name for this oEmbed resource',
author_url varchar(255), author_url varchar(255) comment 'author URL for this oEmbed resource',
url varchar(255), url varchar(255) comment 'URL for this oEmbed resource when applicable (photo, link)',
unique(file_id) unique(file_id)
) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci; ) ENGINE=MyISAM CHARACTER SET utf8 COLLATE utf8_general_ci;
create table file_redirection ( create table file_redirection (
id integer primary key auto_increment, id integer primary key auto_increment,
url varchar(255), url varchar(255) comment 'short URL (or any other kind of redirect) for file (id)',
file_id integer, file_id integer comment 'short URL for what URL/file' references file (id),
redirections integer, redirections integer comment 'redirect count',
httpcode integer, httpcode integer comment 'HTTP status code (20x, 30x, etc.)',
unique(url) unique(url)
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;
create table file_thumbnail ( create table file_thumbnail (
id integer primary key auto_increment, id integer primary key auto_increment,
file_id integer, file_id integer comment 'thumbnail for what URL/file' references file (id),
url varchar(255), url varchar(255) comment 'URL of thumbnail',
width integer, width integer comment 'width of thumbnail',
height integer, height integer comment 'height of thumbnail',
unique(file_id), unique(file_id),
unique(url) unique(url)
@ -477,8 +478,8 @@ create table file_thumbnail (
create table file_to_post ( create table file_to_post (
id integer primary key auto_increment, id integer primary key auto_increment,
file_id integer, file_id integer comment 'id of URL/file' references file (id),
post_id integer, post_id integer comment 'id of the notice it belongs to' references notice (id),
unique(file_id, post_id) unique(file_id, post_id)
) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin; ) ENGINE=InnoDB CHARACTER SET utf8 COLLATE utf8_bin;

14
lib/noticelist.php
View File

@ -206,24 +206,10 @@ class NoticeListItem extends Widget
return 'shownotice' !== $this->out->args['action']; return 'shownotice' !== $this->out->args['action'];
} }
/*
function attachmentCount($discriminant = true) {
$file_oembed = new File_oembed;
$query = "select count(*) as c from file_oembed join file_to_post on file_oembed.file_id = file_to_post.file_id where post_id=" . $this->notice->id;
$file_oembed->query($query);
$file_oembed->fetch();
return intval($file_oembed->c);
}
*/
function showWithAttachment() {
}
function showNoticeInfo() function showNoticeInfo()
{ {
$this->out->elementStart('div', 'entry-content'); $this->out->elementStart('div', 'entry-content');
$this->showNoticeLink(); $this->showNoticeLink();
// $this->showWithAttachment();
$this->showNoticeSource(); $this->showNoticeSource();
$this->showContext(); $this->showContext();
$this->out->elementEnd('div'); $this->out->elementEnd('div');