aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs/Lib
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2020-01-30 15:56:33 -0800
committerzotlabs <mike@macgirvin.com>2020-01-30 15:56:33 -0800
commit989443a5698adf5e7a93f874048699526aa103a7 (patch)
treef5db527455879b0d39b63a4356c25bb260858a1a /Zotlabs/Lib
parente9b2dacb61ad5a4c81a8b0a19db92adecb51b2f5 (diff)
downloadvolse-hubzilla-989443a5698adf5e7a93f874048699526aa103a7.tar.gz
volse-hubzilla-989443a5698adf5e7a93f874048699526aa103a7.tar.bz2
volse-hubzilla-989443a5698adf5e7a93f874048699526aa103a7.zip
basic poll support and patch to not call System::get_platform_name() within t() unless needed. Polls probably need refining and have not yet been fully tested after porting
Diffstat (limited to 'Zotlabs/Lib')
-rw-r--r--Zotlabs/Lib/Activity.php45
1 files changed, 41 insertions, 4 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 43315a87f..66b1ee4b8 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -813,6 +813,10 @@ class Activity {
static function activity_mapper($verb) {
+ if ($verb === 'Answer') {
+ return 'Note';
+ }
+
if(strpos($verb,'/') === false) {
return $verb;
}
@@ -932,10 +936,6 @@ class Activity {
static function activity_obj_mapper($obj) {
- if(strpos($obj,'/') === false) {
- return $obj;
- }
-
$objs = [
'http://activitystrea.ms/schema/1.0/note' => 'Note',
'http://activitystrea.ms/schema/1.0/comment' => 'Note',
@@ -956,6 +956,15 @@ class Activity {
call_hooks('activity_obj_mapper',$objs);
+ if ($obj === 'Answer') {
+ return 'Note';
+ }
+
+ if (strpos($obj,'/') === false) {
+ return $obj;
+ }
+
+
if(array_key_exists($obj,$objs)) {
return $objs[$obj];
}
@@ -1644,6 +1653,13 @@ class Activity {
$s['expires'] = datetime_convert('UTC','UTC',$act->obj['expires']);
}
+ if ($act->type === 'Note' && $act->obj['type'] === 'Question' && $act->data['name']) {
+ $s['mid'] = $act->id;
+ $s['parent_mid'] = $act->obj['id'];
+ $s['replyto'] = $act->replyto;
+ $s['verb'] = 'Answer';
+ $content['content'] = EMPTY_STR;
+ }
if(in_array($act->type, [ 'Like', 'Dislike', 'Flag', 'Block', 'Announce', 'Accept', 'Reject', 'TentativeAccept', 'emojiReaction' ])) {
@@ -1711,6 +1727,15 @@ class Activity {
$s['verb'] = self::activity_decode_mapper($act->type);
+ if ($act->type === 'Note' && $act->obj['type'] === 'Question' && $act->data['name'] && ! $content['content']) {
+ $s['verb'] = 'Answer';
+ $s['title'] = purify_html($act->data['name']);
+ }
+
+ // Mastodon does not provide update timestamps when updating poll tallies which means race conditions may occur here.
+ if ($act->type === 'Update' && $act->obj['type'] === 'Question' && $s['edited'] === $s['created']) {
+ $s['edited'] = datetime_convert();
+ }
if($act->type === 'Tombstone' || $act->type === 'Delete' || ($act->type === 'Create' && $act->obj['type'] === 'Tombstone')) {
$s['item_deleted'] = 1;
@@ -1798,6 +1823,18 @@ class Activity {
}
+ if ($act->obj['type'] === 'Question' && in_array($act->type,['Create','Update'])) {
+ if ($act->obj['endTime']) {
+ $s['comments_closed'] = datetime_convert('UTC','UTC', $act->obj['endTime']);
+ }
+ }
+
+ if ($act->obj['closed']) {
+ $s['comments_closed'] = datetime_convert('UTC','UTC', $act->obj['closed']);
+ }
+
+
+
// we will need a hook here to extract magnet links e.g. peertube
// right now just link to the largest mp4 we find that will fit in our
// standard content region