hopefully fix statusnet bug by altering our feed format slightly
This commit is contained in:
parent
e1db136966
commit
e15e18e0d1
4 changed files with 35 additions and 5 deletions
2
boot.php
2
boot.php
|
@ -7,7 +7,7 @@ require_once('include/text.php');
|
|||
require_once("include/pgettext.php");
|
||||
|
||||
|
||||
define ( 'FRIENDIKA_VERSION', '2.2.1069' );
|
||||
define ( 'FRIENDIKA_VERSION', '2.2.1070' );
|
||||
define ( 'DFRN_PROTOCOL_VERSION', '2.21' );
|
||||
define ( 'DB_UPDATE_VERSION', 1079 );
|
||||
|
||||
|
|
|
@ -112,7 +112,7 @@ function get_feed_for(&$a, $dfrn_id, $owner_nick, $last_update, $direction = 0)
|
|||
|
||||
$items = $r;
|
||||
|
||||
$feed_template = get_markup_template('atom_feed.tpl');
|
||||
$feed_template = get_markup_template(($dfrn_id) ? 'atom_feed_dfrn.tpl' : 'atom_feed.tpl');
|
||||
|
||||
$atom = '';
|
||||
|
||||
|
@ -1038,6 +1038,8 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $secure_fee
|
|||
if(count($hubs))
|
||||
$hub = implode(',', $hubs);
|
||||
|
||||
$rawtags = $feed->get_feed_tags( NAMESPACE_DFRN, 'owner');
|
||||
if(! $rawtags)
|
||||
$rawtags = $feed->get_feed_tags( SIMPLEPIE_NAMESPACE_ATOM_10, 'author');
|
||||
if($rawtags) {
|
||||
$elems = $rawtags[0]['child'][SIMPLEPIE_NAMESPACE_ATOM_10];
|
||||
|
|
|
@ -19,10 +19,10 @@
|
|||
|
||||
<updated>$feed_updated</updated>
|
||||
|
||||
<author>
|
||||
<dfrn:owner>
|
||||
<name dfrn:updated="$namdate" >$name</name>
|
||||
<uri dfrn:updated="$uridate" >$profile_page</uri>
|
||||
<link rel="photo" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
|
||||
<link rel="avatar" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
|
||||
$birthday
|
||||
</author>
|
||||
</dfrn:owner>
|
||||
|
|
28
view/atom_feed_dfrn.tpl
Normal file
28
view/atom_feed_dfrn.tpl
Normal file
|
@ -0,0 +1,28 @@
|
|||
<?xml version="1.0" encoding="utf-8" ?>
|
||||
<feed xmlns="http://www.w3.org/2005/Atom"
|
||||
xmlns:thr="http://purl.org/syndication/thread/1.0"
|
||||
xmlns:at="http://purl.org/atompub/tombstones/1.0"
|
||||
xmlns:media="http://purl.org/syndication/atommedia"
|
||||
xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
|
||||
xmlns:as="http://activitystrea.ms/spec/1.0/"
|
||||
xmlns:georss="http://www.georss.org/georss"
|
||||
xmlns:poco="http://portablecontacts.net/spec/1.0"
|
||||
xmlns:ostatus="http://ostatus.org/schema/1.0"
|
||||
xmlns:statusnet="http://status.net/schema/api/1/" >
|
||||
|
||||
<id>$feed_id</id>
|
||||
<title>$feed_title</title>
|
||||
<generator uri="http://friendika.com" version="$version">Friendika</generator>
|
||||
<link rel="license" href="http://creativecommons.org/licenses/by/3.0/" />
|
||||
$hub
|
||||
$salmon
|
||||
|
||||
<updated>$feed_updated</updated>
|
||||
|
||||
<author>
|
||||
<name dfrn:updated="$namdate" >$name</name>
|
||||
<uri dfrn:updated="$uridate" >$profile_page</uri>
|
||||
<link rel="photo" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
|
||||
<link rel="avatar" type="image/jpeg" dfrn:updated="$picdate" media:width="175" media:height="175" href="$photo" />
|
||||
$birthday
|
||||
</author>
|
Loading…
Reference in a new issue