From e2476307baa8753dc866c7a1aed485d9f6d3fcd0 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 12 Jun 2009 15:41:45 +0000 Subject: [PATCH 01/12] Updated Creative Commons namespace to current. Thanks to Toby Inkster for the patch. --- lib/rssaction.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/rssaction.php b/lib/rssaction.php index 2f25ed7e47..0678b8982c 100644 --- a/lib/rssaction.php +++ b/lib/rssaction.php @@ -239,7 +239,7 @@ class Rss10Action extends Action 'xmlns:dc' => 'http://purl.org/dc/elements/1.1/', 'xmlns:cc' => - 'http://web.resource.org/cc/', + 'http://creativecommons.org/ns#', 'xmlns:content' => 'http://purl.org/rss/1.0/modules/content/', 'xmlns:foaf' => From 1627fe8f336d435e328dcc3a58e9e08cd4ef1bfe Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 12 Jun 2009 15:42:53 +0000 Subject: [PATCH 02/12] http://laconi.ca/trac/ticket/1368 Site is the space that Container sits in. Thanks to Toby Inkster for the patch. --- lib/rssaction.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/rssaction.php b/lib/rssaction.php index 0678b8982c..cfb5ca44a6 100644 --- a/lib/rssaction.php +++ b/lib/rssaction.php @@ -253,10 +253,10 @@ class Rss10Action extends Action 'xmlns' => 'http://purl.org/rss/1.0/')); $this->elementStart('sioc:Site', array('rdf:about' => common_root_url())); $this->element('sioc:name', null, common_config('site', 'name')); - $this->elementStart('sioc:container_of'); + $this->elementStart('sioc:space_of'); $this->element('sioc:Container', array('rdf:about' => $channel['url'])); - $this->elementEnd('sioc:container_of'); + $this->elementEnd('sioc:space_of'); $this->elementEnd('sioc:Site'); } From 392c8d4a967f01533fd7458298e79c82486dc914 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 12 Jun 2009 16:13:45 +0000 Subject: [PATCH 03/12] http://laconi.ca/trac/ticket/863 Thanks to Toby Inkster for the patch. --- lib/rssaction.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/rssaction.php b/lib/rssaction.php index cfb5ca44a6..6f30a02f21 100644 --- a/lib/rssaction.php +++ b/lib/rssaction.php @@ -202,6 +202,9 @@ class Rss10Action extends Action $this->element('title', null, $title); $this->element('link', null, $nurl); $this->element('description', null, $profile->nickname."'s status on ".common_exact_date($notice->created)); + if ($notice->rendered) { + $this->element('content:encoded', null, common_xml_safe_str($notice->rendered)); + } $this->element('dc:date', null, common_date_w3dtf($notice->created)); $this->element('dc:creator', null, ($profile->fullname) ? $profile->fullname : $profile->nickname); $this->element('sioc:has_creator', array('rdf:resource' => $creator_uri)); From 4532babb6f3a7c8d2b155483a4a651f83cfc6c8a Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 12 Jun 2009 16:15:30 +0000 Subject: [PATCH 04/12] http://laconi.ca/trac/ticket/1370 Thanks to Toby Inkster for the patch. --- lib/rssaction.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/lib/rssaction.php b/lib/rssaction.php index 6f30a02f21..a3a7623172 100644 --- a/lib/rssaction.php +++ b/lib/rssaction.php @@ -170,7 +170,7 @@ class Rss10Action extends Action $this->elementStart('rdf:Seq'); foreach ($this->notices as $notice) { - $this->element('sioct:MicroblogPost', array('rdf:resource' => $notice->uri)); + $this->element('rdf:li', array('rdf:resource' => $notice->uri)); } $this->elementEnd('rdf:Seq'); @@ -197,7 +197,8 @@ class Rss10Action extends Action $profile = Profile::staticGet($notice->profile_id); $nurl = common_local_url('shownotice', array('notice' => $notice->id)); $creator_uri = common_profile_uri($profile); - $this->elementStart('item', array('rdf:about' => $notice->uri)); + $this->elementStart('item', array('rdf:about' => $notice->uri, + 'rdf:type' => 'http://rdfs.org/sioc/types#MicroblogPost')); $title = $profile->nickname . ': ' . common_xml_safe_str(trim($notice->content)); $this->element('title', null, $title); $this->element('link', null, $nurl); From 8524990512d41e9aa7114b6a3b5af073eeb9aabb Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 12 Jun 2009 16:18:58 +0000 Subject: [PATCH 05/12] http://laconi.ca/trac/ticket/1367 Thanks to Toby Inkster for the patch. --- lib/rssaction.php | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/lib/rssaction.php b/lib/rssaction.php index a3a7623172..eafdbf131d 100644 --- a/lib/rssaction.php +++ b/lib/rssaction.php @@ -208,7 +208,8 @@ class Rss10Action extends Action } $this->element('dc:date', null, common_date_w3dtf($notice->created)); $this->element('dc:creator', null, ($profile->fullname) ? $profile->fullname : $profile->nickname); - $this->element('sioc:has_creator', array('rdf:resource' => $creator_uri)); + $this->element('foaf:maker', array('rdf:resource' => $creator_uri)); + $this->element('sioc:has_creator', array('rdf:resource' => $creator_uri.'#acct')); $this->element('laconica:postIcon', array('rdf:resource' => $profile->avatarUrl())); $this->element('cc:licence', array('rdf:resource' => common_config('license', 'url'))); $this->elementEnd('item'); @@ -220,15 +221,15 @@ class Rss10Action extends Action foreach ($this->creators as $uri => $profile) { $id = $profile->id; $nickname = $profile->nickname; - $this->elementStart('sioc:User', array('rdf:about' => $uri)); + $this->elementStart('foaf:Agent', array('rdf:about' => $uri)); $this->element('foaf:nick', null, $nickname); if ($profile->fullname) { $this->element('foaf:name', null, $profile->fullname); } - $this->element('sioc:id', null, $id); + $this->element('foaf:holdsAccount', array('rdf:resource' => $uri.'#acct')); $avatar = $profile->avatarUrl(); - $this->element('sioc:avatar', array('rdf:resource' => $avatar)); - $this->elementEnd('sioc:User'); + $this->element('foaf:depiction', array('rdf:resource' => $avatar)); + $this->elementEnd('foaf:Agent'); } } From 4c61f98cd027df2ed45ed250840405bebc232e1a Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Fri, 12 Jun 2009 17:24:18 +0000 Subject: [PATCH 06/12] Takes care of http://laconi.ca/trac/ticket/1372 and a minor part of http://laconi.ca/trac/ticket/1367 One of the bugs was to replace foaf:knows with the weaker sioc:follows. This is done, but foaf:knows is also retained when the subscription is bidirectional. Primary topic of the file is an Agent rather than a Person. rdfs:comment replaced by bio:olb which is a fairly popular RDF property for one-line biographies rdf:about attribute to the elements in a manner consistent with the RSS 1.0 feed. Changed the OnlineAccount's homepage property to an accountProfilePage property. Will be added to FOAF spec soon (already widely used). Added a property from the Agent to their profile page. Thanks to Toby Inkster for the patch. http://buzzword.org.uk/2009/laconica-0.7.3-foafsioc.patch --- actions/foaf.php | 127 +++++++++++++++++++++++++++++------------------ 1 file changed, 79 insertions(+), 48 deletions(-) diff --git a/actions/foaf.php b/actions/foaf.php index 2d5b78d123..fb0172eb90 100644 --- a/actions/foaf.php +++ b/actions/foaf.php @@ -82,14 +82,18 @@ class FoafAction extends Action 'http://www.w3.org/2000/01/rdf-schema#', 'xmlns:geo' => 'http://www.w3.org/2003/01/geo/wgs84_pos#', + 'xmlns:bio' => + 'http://purl.org/vocab/bio/0.1/', + 'xmlns:sioc' => + 'http://rdfs.org/sioc/ns#', 'xmlns' => 'http://xmlns.com/foaf/0.1/')); // This is the document about the user $this->showPpd('', $this->user->uri); - // XXX: might not be a person - $this->elementStart('Person', array('rdf:about' => + // Would be nice to tell if they were a Person or not (e.g. a #person usertag?) + $this->elementStart('Agent', array('rdf:about' => $this->user->uri)); $this->element('mbox_sha1sum', null, sha1('mailto:' . $this->user->email)); if ($this->profile->fullname) { @@ -98,8 +102,11 @@ class FoafAction extends Action if ($this->profile->homepage) { $this->element('homepage', array('rdf:resource' => $this->profile->homepage)); } + if ($this->profile->profileurl) { + $this->element('weblog', array('rdf:resource' => $this->profile->profileurl)); + } if ($this->profile->bio) { - $this->element('rdfs:comment', null, $this->profile->bio); + $this->element('bio:olb', null, $this->profile->bio); } // XXX: more structured location data if ($this->profile->location) { @@ -110,10 +117,7 @@ class FoafAction extends Action $this->elementEnd('based_near'); } - $this->showMicrobloggingAccount($this->profile, common_root_url()); - $avatar = $this->profile->getOriginalAvatar(); - if ($avatar) { $this->elementStart('img'); $this->elementStart('Image', array('rdf:about' => $avatar->url)); @@ -129,39 +133,8 @@ class FoafAction extends Action $this->elementEnd('img'); } - // Get people user is subscribed to - - $person = array(); - - $sub = new Subscription(); - $sub->subscriber = $this->profile->id; - $sub->whereAdd('subscriber != subscribed'); - - if ($sub->find()) { - while ($sub->fetch()) { - if (!empty($sub->token)) { - $other = Remote_profile::staticGet('id', $sub->subscribed); - } else { - $other = User::staticGet('id', $sub->subscribed); - } - if (empty($other)) { - common_debug('Got a bad subscription: '.print_r($sub,true)); - continue; - } - $this->element('knows', array('rdf:resource' => $other->uri)); - $person[$other->uri] = array(LISTENEE, - $other->id, - $other->nickname, - (empty($sub->token)) ? 'User' : 'Remote_profile'); - $other->free(); - $other = null; - unset($other); - } - } - - $sub->free(); - $sub = null; - unset($sub); + $person = $this->showMicrobloggingAccount($this->profile, + common_root_url(), $this->user->uri, false); // Get people who subscribe to user @@ -198,7 +171,15 @@ class FoafAction extends Action $sub = null; unset($sub); - $this->elementEnd('Person'); + foreach ($person as $uri => $p) { + list($type, $id, $nickname, $cls) = $p; + if ($type == BOTH) { + $this->element('knows', array('rdf:resource' => $uri)); + } + } + + $this->elementEnd('Agent'); + foreach ($person as $uri => $p) { $foaf_url = null; @@ -207,16 +188,18 @@ class FoafAction extends Action $foaf_url = common_local_url('foaf', array('nickname' => $nickname)); } $profile = Profile::staticGet($id); - $this->elementStart('Person', array('rdf:about' => $uri)); - if ($type == LISTENER || $type == BOTH) { + $this->elementStart('Agent', array('rdf:about' => $uri)); + if ($type == BOTH) { $this->element('knows', array('rdf:resource' => $this->user->uri)); } - $this->showMicrobloggingAccount($profile, ($cls == 'User') ? - common_root_url() : null); + $this->showMicrobloggingAccount($profile, + ($cls == 'User') ? common_root_url() : null, + $uri, + true); if ($foaf_url) { $this->element('rdfs:seeAlso', array('rdf:resource' => $foaf_url)); } - $this->elementEnd('Person'); + $this->elementEnd('Agent'); if ($foaf_url) { $this->showPpd($foaf_url, $uri); } @@ -237,18 +220,66 @@ class FoafAction extends Action $this->elementEnd('PersonalProfileDocument'); } - function showMicrobloggingAccount($profile, $service=null) + function showMicrobloggingAccount($profile, $service=null, $useruri=null, $isSubscriber=false) { + $attr = array(); + if ($useruri) { + $attr['rdf:about'] = $useruri . '#acct'; + } + // Their account $this->elementStart('holdsAccount'); - $this->elementStart('OnlineAccount'); + $this->elementStart('OnlineAccount', $attr); if ($service) { $this->element('accountServiceHomepage', array('rdf:resource' => $service)); } $this->element('accountName', null, $profile->nickname); - $this->element('homepage', array('rdf:resource' => $profile->profileurl)); + $this->element('accountProfilePage', array('rdf:resource' => $profile->profileurl)); + if ($useruri) { + $this->element('sioc:account_of', array('rdf:resource'=>$useruri)); + } + + $person = array(); + + if ($isSubscriber) { + $this->element('sioc:follows', array('rdf:resource'=>$this->user->uri . '#acct')); + } else { + // Get people user is subscribed to + $sub = new Subscription(); + $sub->subscriber = $profile->id; + $sub->whereAdd('subscriber != subscribed'); + + if ($sub->find()) { + while ($sub->fetch()) { + if (!empty($sub->token)) { + $other = Remote_profile::staticGet('id', $sub->subscribed); + } else { + $other = User::staticGet('id', $sub->subscribed); + } + if (empty($other)) { + common_debug('Got a bad subscription: '.print_r($sub,true)); + continue; + } + $this->element('sioc:follows', array('rdf:resource' => $other->uri.'#acct')); + $person[$other->uri] = array(LISTENEE, + $other->id, + $other->nickname, + (empty($sub->token)) ? 'User' : 'Remote_profile'); + $other->free(); + $other = null; + unset($other); + } + } + + $sub->free(); + $sub = null; + unset($sub); + } + $this->elementEnd('OnlineAccount'); $this->elementEnd('holdsAccount'); + + return $person; } } From fc6154fe4dc093780d610f97c0d9213bb26060fe Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 12 Jun 2009 16:56:43 -0700 Subject: [PATCH 07/12] Add a method to check for registered event handlers --- lib/event.php | 28 ++++++++++++++++++++++++++++ 1 file changed, 28 insertions(+) diff --git a/lib/event.php b/lib/event.php index d815ae54ba..4ccee17e66 100644 --- a/lib/event.php +++ b/lib/event.php @@ -110,4 +110,32 @@ class Event { } return ($result !== false); } + + /** + * Check to see if an event handler exists + * + * Look to see if there's any handler for a given event, or narrow + * by providing the name of a specific plugin class. + * + * @param string $name Name of the event to look for + * @param string $plugin Optional name of the plugin class to look for + * + * @return boolean flag saying whether such a handler exists + * + */ + + public static function hasHandler($name, $plugin=null) { + if (array_key_exists($name, Event::$_handlers)) { + if (isset($plugin)) { + foreach (Event::$_handlers[$name] as $handler) { + if (get_class($handler[0]) == $plugin) { + return true; + } + } + } else { + return true; + } + } + return false; + } } From 79fa050125971625229a586f1ffed1a0ea504510 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 12 Jun 2009 17:05:31 -0700 Subject: [PATCH 08/12] Remove useless method --- actions/tag.php | 5 ----- 1 file changed, 5 deletions(-) diff --git a/actions/tag.php b/actions/tag.php index f5ca06f055..d0ad797ebc 100644 --- a/actions/tag.php +++ b/actions/tag.php @@ -76,11 +76,6 @@ class TagAction extends Action sprintf(_('Feed for tag %s'), $this->tag))); } - function showPageNotice() - { - return sprintf(_('Messages tagged "%s", most recent first'), $this->tag); - } - function showContent() { $notice = Notice_tag::getStream($this->tag, (($this->page-1)*NOTICES_PER_PAGE), NOTICES_PER_PAGE + 1); From 89d0583b91a237448b9f7ea3b0ae303072631447 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 12 Jun 2009 17:06:42 -0700 Subject: [PATCH 09/12] Fixes Ticket #1607 - empty 'page-notice' definition lists were being output in a bunch of places. --- lib/action.php | 30 +++++++++++++++++++++--------- 1 file changed, 21 insertions(+), 9 deletions(-) diff --git a/lib/action.php b/lib/action.php index 7643e5afb8..89a8c8f4d3 100644 --- a/lib/action.php +++ b/lib/action.php @@ -575,20 +575,32 @@ class Action extends HTMLOutputter // lawsuit /** * Show page notice block. * + * Only show the block if a subclassed action has overrided + * Action::showPageNotice(), or an event handler is registered for + * the StartShowPageNotice event, in which case we assume the + * 'page_notice' definition list is desired. This is to prevent + * empty 'page_notice' definition lists from being output everywhere. + * * @return nothing */ function showPageNoticeBlock() { - $this->elementStart('dl', array('id' => 'page_notice', - 'class' => 'system_notice')); - $this->element('dt', null, _('Page notice')); - $this->elementStart('dd'); - if (Event::handle('StartShowPageNotice', array($this))) { - $this->showPageNotice(); - Event::handle('EndShowPageNotice', array($this)); + $rmethod = new ReflectionMethod($this, 'showPageNotice'); + $dclass = $rmethod->getDeclaringClass()->getName(); + + if ($dclass != 'Action' || Event::hasHandler('StartShowPageNotice')) { + + $this->elementStart('dl', array('id' => 'page_notice', + 'class' => 'system_notice')); + $this->element('dt', null, _('Page notice')); + $this->elementStart('dd'); + if (Event::handle('StartShowPageNotice', array($this))) { + $this->showPageNotice(); + Event::handle('EndShowPageNotice', array($this)); + } + $this->elementEnd('dd'); + $this->elementEnd('dl'); } - $this->elementEnd('dd'); - $this->elementEnd('dl'); } /** From c594d99167c51f9525721e90fc865adad70e2b03 Mon Sep 17 00:00:00 2001 From: Zach Copley Date: Fri, 12 Jun 2009 19:02:13 -0700 Subject: [PATCH 10/12] Child notices should have thier own ID on their LIs, not the parent's --- actions/conversation.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/actions/conversation.php b/actions/conversation.php index 0d7cb9a874..20c68986cb 100644 --- a/actions/conversation.php +++ b/actions/conversation.php @@ -207,7 +207,7 @@ class ConversationTree extends NoticeList // We take responsibility for doing the li $this->out->elementStart('li', array('class' => 'hentry notice', - 'id' => 'notice-' . $this->notice->id)); + 'id' => 'notice-' . $id)); $item = $this->newListItem($notice); $item->show(); From dbbb3a4fb558ee4372e157612f3e053a87a53a8e Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sat, 13 Jun 2009 00:53:23 -0400 Subject: [PATCH 11/12] Dynamic notice item insertion for conversation page. --- js/util.js | 19 ++++++++++++++----- 1 file changed, 14 insertions(+), 5 deletions(-) diff --git a/js/util.js b/js/util.js index 786b763eee..fd2500d447 100644 --- a/js/util.js +++ b/js/util.js @@ -203,10 +203,20 @@ $(document).ready(function(){ else { li = $("li", xml).get(0); if ($("#"+li.id).length == 0) { - $("#notices_primary .notices").prepend(document._importNode(li, true)); - $("#notices_primary .notice:first").css({display:"none"}); - $("#notices_primary .notice:first").fadeIn(2500); - NoticeReply(); + var notice_irt_value = $('#notice_in-reply-to').val(); + var notice_irt = '#notices_primary #notice-'+notice_irt_value; + if($('body')[0].id == 'conversation') { + if(notice_irt_value.length > 0 && $(notice_irt+' .notices').length < 1) { + $(notice_irt).append('
    '); + } + $($(notice_irt+' .notices')[0]).append(document._importNode(li, true)); + } + else { + $("#notices_primary .notices").prepend(document._importNode(li, true)); + } + $('#'+li.id).css({display:'none'}); + $('#'+li.id).fadeIn(2500); + NoticeReply(); } } $("#notice_data-text").val(""); @@ -310,4 +320,3 @@ function NoticeAttachments() { } ); } - From 77c94c44a622052366dcc03fee522232672d71d9 Mon Sep 17 00:00:00 2001 From: Sarven Capadisli Date: Sun, 14 Jun 2009 05:57:59 +0000 Subject: [PATCH 12/12] Removed hanging skin crapola --- lib/common.php | 1 - lib/theme.php | 27 --------------------------- 2 files changed, 28 deletions(-) diff --git a/lib/common.php b/lib/common.php index 5aafdfe0ee..6bf4ad21f5 100644 --- a/lib/common.php +++ b/lib/common.php @@ -71,7 +71,6 @@ $config = array('name' => 'Just another Laconica microblog', 'server' => $_server, 'theme' => 'default', - 'skin' => 'default', 'path' => $_path, 'logfile' => null, 'logo' => null, diff --git a/lib/theme.php b/lib/theme.php index bef660cbf5..0d88248227 100644 --- a/lib/theme.php +++ b/lib/theme.php @@ -70,30 +70,3 @@ function theme_path($relative, $theme=null) return common_path('theme/'.$theme.'/'.$relative); } } - -/** - * Gets the full URL of a file in a skin dir based on its relative name - * - * @param string $relative relative path within the theme, skin directory - * @param string $theme name of the theme; defaults to current theme - * @param string $skin name of the skin; defaults to current theme - * - * @return string URL of the file - */ - -function skin_path($relative, $theme=null, $skin=null) -{ - if (!$theme) { - $theme = common_config('site', 'theme'); - } - if (!$skin) { - $skin = common_config('site', 'skin'); - } - $server = common_config('theme', 'server'); - if ($server) { - return 'http://'.$server.'/'.$theme.'/skin/'.$skin.'/'.$relative; - } else { - return common_path('theme/'.$theme.'/skin/'.$skin.'/'.$relative); - } -} -