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

change find() to staticGet() to use cache

This commit is contained in:
Evan Prodromou 2010-02-16 09:58:33 -05:00
parent f414544d0d
commit 5a357d5399
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
plugins/OStatus/classes/Ostatus_profile.php
View File

@ -29,15 +29,15 @@ PuSH subscription flow:
generate random verification token generate random verification token
save to verify_token save to verify_token
sends a sub request to the hub... sends a sub request to the hub...
main/push/callback main/push/callback
hub sends confirmation back to us via GET hub sends confirmation back to us via GET
We verify the request, then echo back the challenge. We verify the request, then echo back the challenge.
On our end, we save the time we subscribed and the lease expiration On our end, we save the time we subscribed and the lease expiration
main/push/callback main/push/callback
hub sends us updates via POST hub sends us updates via POST
*/ */
class FeedDBException extends FeedSubException class FeedDBException extends FeedSubException
@ -75,7 +75,6 @@ class Ostatus_profile extends Memcached_DataObject
public $created; public $created;
public $lastupdate; public $lastupdate;
public /*static*/ function staticGet($k, $v=null) public /*static*/ function staticGet($k, $v=null)
{ {
return parent::staticGet(__CLASS__, $k, $v); return parent::staticGet(__CLASS__, $k, $v);
@ -107,7 +106,7 @@ class Ostatus_profile extends Memcached_DataObject
'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL, 'created' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL,
'lastupdate' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL); 'lastupdate' => DB_DATAOBJECT_STR + DB_DATAOBJECT_DATE + DB_DATAOBJECT_TIME + DB_DATAOBJECT_NOTNULL);
} }
static function schemaDef() static function schemaDef()
{ {
return array(new ColumnDef('id', 'integer', return array(new ColumnDef('id', 'integer',
@ -486,7 +485,7 @@ class Ostatus_profile extends Memcached_DataObject
} }
if ($this->salmonuri) { if ($this->salmonuri) {
$text = 'update'; // @fixme $text = 'update'; // @fixme
$id = 'tag:' . common_config('site', 'server') . $id = 'tag:' . common_config('site', 'server') .
':' . $verb . ':' . $verb .
':' . $actor->id . ':' . $actor->id .
':' . time(); // @fixme ':' . time(); // @fixme
@ -589,7 +588,7 @@ class Ostatus_profile extends Memcached_DataObject
require_once "XML/Feed/Parser.php"; require_once "XML/Feed/Parser.php";
$feed = new XML_Feed_Parser($xml, false, false, true); $feed = new XML_Feed_Parser($xml, false, false, true);
$munger = new FeedMunger($feed); $munger = new FeedMunger($feed);
$hits = 0; $hits = 0;
foreach ($feed as $index => $entry) { foreach ($feed as $index => $entry) {
// @fixme this might sort in wrong order if we get multiple updates // @fixme this might sort in wrong order if we get multiple updates
@ -598,9 +597,10 @@ class Ostatus_profile extends Memcached_DataObject
// Double-check for oldies // Double-check for oldies
// @fixme this could explode horribly for multiple feeds on a blog. sigh // @fixme this could explode horribly for multiple feeds on a blog. sigh
$dupe = new Notice();
$dupe->uri = $notice->uri; $dupe = Notice::staticGet('uri', $notice->uri);
if ($dupe->find(true)) {
if (!empty($dupe)) {
common_log(LOG_WARNING, __METHOD__ . ": tried to save dupe notice for entry {$notice->uri} of feed {$this->feeduri}"); common_log(LOG_WARNING, __METHOD__ . ": tried to save dupe notice for entry {$notice->uri} of feed {$this->feeduri}");
continue; continue;
} }