aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
Diffstat (limited to 'include')
-rw-r--r--include/items.php12
-rw-r--r--include/main.js5
2 files changed, 16 insertions, 1 deletions
diff --git a/include/items.php b/include/items.php
index 0c055f571..61bc0c5d7 100644
--- a/include/items.php
+++ b/include/items.php
@@ -420,9 +420,19 @@ function get_atom_elements($feed,$item) {
$rawverb = $item->get_item_tags(NAMESPACE_ACTIVITY, 'verb');
+
// select between supported verbs
- if($rawverb)
+
+ if($rawverb) {
$res['verb'] = unxmlify($rawverb[0]['data']);
+ }
+
+ // translate OStatus unfollow to activity streams if it happened to get selected
+
+ if((x($res,'verb')) && ($res['verb'] === 'http://ostatus.org/schema/1.0/unfollow'))
+ $res['verb'] = ACTIVITY_UNFOLLOW;
+
+
$rawobj = $item->get_item_tags(NAMESPACE_ACTIVITY, 'object');
diff --git a/include/main.js b/include/main.js
index ef6b059cc..d137d4c9c 100644
--- a/include/main.js
+++ b/include/main.js
@@ -44,6 +44,11 @@
$('#pause').html('');
}
}
+ if(event.keyCode == '36') {
+ event.preventDefault();
+ if(homebase)
+ document.location = homebase;
+ }
});
});