wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

OStatus: Salmon notifications now being generated moderately correctly. :) Needs to be an <entry> not a <feed>.

Browse Source
This commit is contained in:
Brion Vibber 2010-02-19 17:01:38 -08:00
parent 557df3d3f7
commit 50db2d5d69
2 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/OStatus/actions/salmon.php
View File

@ -62,15 +62,13 @@ class SalmonAction extends Action
$dom = DOMDocument::loadXML($xml); $dom = DOMDocument::loadXML($xml);
// XXX: check that document element is Atom entry if ($dom->documentElement->namespaceURI != Activity::ATOM ||
$dom->documentElement->localName != 'entry') {
$this->clientError(_m('Salmon post must be an Atom entry.'));
}
// XXX: check the signature // XXX: check the signature
// We need to run an entry into Activity, so get the first one $this->act = new Activity($dom->documentElement);
$entries = $dom->getElementsByTagNameNS(Activity::ATOM, 'entry');
if ($entries && $entries->length) {
// @fixme is it legit to have multiple entries?
$this->act = new Activity($entries->item(0), $dom->documentElement);
}
return true; return true;
} }

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

@ -329,9 +329,15 @@ class Ostatus_profile extends Memcached_DataObject
':' . $actor->id . ':' . $actor->id .
':' . time(); // @fixme ':' . time(); // @fixme
//$entry = new Atom10Entry(); // @fixme consolidate all these NS settings somewhere
$attributes = array('xmlns' => Activity::ATOM,
'xmlns:activity' => 'http://activitystrea.ms/spec/1.0/',
'xmlns:thr' => 'http://purl.org/syndication/thread/1.0',
'xmlns:georss' => 'http://www.georss.org/georss',
'xmlns:ostatus' => 'http://ostatus.org/schema/1.0');
$entry = new XMLStringer(); $entry = new XMLStringer();
$entry->elementStart('entry'); $entry->elementStart('entry', $attributes);
$entry->element('id', null, $id); $entry->element('id', null, $id);
$entry->element('title', null, $text); $entry->element('title', null, $text);
$entry->element('summary', null, $text); $entry->element('summary', null, $text);
@ -343,10 +349,7 @@ class Ostatus_profile extends Memcached_DataObject
$entry->raw($object->asActivityNoun('object')); $entry->raw($object->asActivityNoun('object'));
$entry->elementEnd('entry'); $entry->elementEnd('entry');
$feed = $this->atomFeed($actor); $xml = $entry->getString();
$feed->addEntry($entry);
$xml = $feed->getString();
common_log(LOG_INFO, "Posting to Salmon endpoint $this->salmonuri: $xml"); common_log(LOG_INFO, "Posting to Salmon endpoint $this->salmonuri: $xml");
$salmon = new Salmon(); // ? $salmon = new Salmon(); // ?