summaryrefslogtreecommitdiff
path: root/plugins/OStatus
diff options
context:
space:
mode:
authorBrion Vibber <brion@pobox.com>2010-02-11 20:02:17 +0000
committerBrion Vibber <brion@pobox.com>2010-02-11 20:02:17 +0000
commit21bfbc43ad026afdab4040713805913000fef626 (patch)
tree9dab139d060158be6ffd310d9aaaa1e0d4786f9d /plugins/OStatus
parent20714d1f35305cc29c2b657310c2e0db290fbb48 (diff)
OStatus: fix salmon link on Atom feeds; add a url spec for group feeds as well (endpoint needs impl)
Diffstat (limited to 'plugins/OStatus')
-rw-r--r--plugins/OStatus/OStatusPlugin.php51
1 files changed, 32 insertions, 19 deletions
diff --git a/plugins/OStatus/OStatusPlugin.php b/plugins/OStatus/OStatusPlugin.php
index ce02393e4..c0f9dadc4 100644
--- a/plugins/OStatus/OStatusPlugin.php
+++ b/plugins/OStatus/OStatusPlugin.php
@@ -80,6 +80,9 @@ class OStatusPlugin extends Plugin
$m->connect('main/salmon/user/:id',
array('action' => 'salmon'),
array('id' => '[0-9]+'));
+ $m->connect('main/salmon/group/:id',
+ array('action' => 'salmongroup'),
+ array('id' => '[0-9]+'));
return true;
}
@@ -111,25 +114,31 @@ class OStatusPlugin extends Plugin
*/
function onStartApiAtom(Action $action)
{
- if ($action instanceof ApiTimelineUserAction || $action instanceof ApiTimelineGroupAction) {
- $id = $action->arg('id');
- if (strval(intval($id)) === strval($id)) {
- // Canonical form of id in URL? These are used for OStatus syndication.
+ if ($action instanceof ApiTimelineUserAction) {
+ $salmonAction = 'salmon';
+ } else if ($action instanceof ApiTimelineGroupAction) {
+ $salmonAction = 'salmongroup';
+ } else {
+ return;
+ }
- $hub = common_config('ostatus', 'hub');
- if (empty($hub)) {
- // Updates will be handled through our internal PuSH hub.
- $hub = common_local_url('pushhub');
- }
- $action->element('link', array('rel' => 'hub',
- 'href' => $hub));
+ $id = $action->arg('id');
+ if (strval(intval($id)) === strval($id)) {
+ // Canonical form of id in URL? These are used for OStatus syndication.
- // Also, we'll add in the salmon link
- $action->element('link', array('rel' => 'salmon',
- 'href' => common_local_url('salmon')));
+ $hub = common_config('ostatus', 'hub');
+ if (empty($hub)) {
+ // Updates will be handled through our internal PuSH hub.
+ $hub = common_local_url('pushhub');
}
+ $action->element('link', array('rel' => 'hub',
+ 'href' => $hub));
+
+ // Also, we'll add in the salmon link
+ $salmon = common_local_url($salmonAction, array('id' => $id));
+ $action->element('link', array('rel' => 'salmon',
+ 'href' => $salmon));
}
- return true;
}
/**
@@ -191,14 +200,17 @@ class OStatusPlugin extends Plugin
array('nickname' => $profile->nickname));
$output->element('a', array('href' => $url,
'class' => 'entity_remote_subscribe'),
- _('OStatus'));
+ _m('OStatus'));
$output->elementEnd('li');
}
}
/**
- * Check if we've got some Salmon stuff to send
+ * Check if we've got remote replies to send via Salmon.
+ *
+ * @fixme push webfinger lookup & sending to a background queue
+ * @fixme also detect short-form name for remote subscribees where not ambiguous
*/
function onEndNoticeSave($notice)
{
@@ -233,7 +245,6 @@ class OStatusPlugin extends Plugin
}
}
}
-
/**
* Garbage collect unused feeds on unsubscribe
@@ -253,7 +264,9 @@ class OStatusPlugin extends Plugin
return true;
}
-
+ /**
+ * Make sure necessary tables are filled out.
+ */
function onCheckSchema() {
$schema = Schema::get();
$schema->ensureTable('feedinfo', Feedinfo::schemaDef());