aboutsummaryrefslogtreecommitdiffstats
path: root/Zotlabs
diff options
context:
space:
mode:
Diffstat (limited to 'Zotlabs')
-rw-r--r--Zotlabs/Lib/Activity.php12
-rw-r--r--Zotlabs/Module/Thing.php18
2 files changed, 18 insertions, 12 deletions
diff --git a/Zotlabs/Lib/Activity.php b/Zotlabs/Lib/Activity.php
index 0275c87ac..4c89e22bd 100644
--- a/Zotlabs/Lib/Activity.php
+++ b/Zotlabs/Lib/Activity.php
@@ -3535,21 +3535,17 @@ class Activity {
'schema' => 'http://schema.org#',
'ostatus' => 'http://ostatus.org#',
'diaspora' => 'https://diasporafoundation.org/ns/',
+ 'litepub' => 'http://litepub.social/ns#',
'commentPolicy' => 'zot:commentPolicy',
- 'locationAddress' => 'zot:locationAddress',
- 'locationPrimary' => 'zot:locationPrimary',
- 'locationDeleted' => 'zot:locationDeleted',
- 'nomadicLocation' => 'zot:nomadicLocation',
- 'nomadicHubs' => 'zot:nomadicHubs',
- 'emojiReaction' => 'zot:emojiReaction',
- 'expires' => 'zot:expires',
- 'directMessage' => 'zot:directMessage',
'Bookmark' => 'zot:Bookmark',
'Category' => 'zot:Category',
+ 'directMessage' => 'litepub:directMessage',
+
'PropertyValue' => 'schema:PropertyValue',
'value' => 'schema:value',
+ 'uuid' => 'schema:identifier',
'conversation' => 'ostatus:conversation',
diff --git a/Zotlabs/Module/Thing.php b/Zotlabs/Module/Thing.php
index 8a1591442..2038db8c0 100644
--- a/Zotlabs/Module/Thing.php
+++ b/Zotlabs/Module/Thing.php
@@ -21,10 +21,12 @@ class Thing extends \Zotlabs\Web\Controller {
dbesc(argv(1))
);
- if($r) {
- $sql_extra = permissions_sql($r[0]['obj_channel']);
+ if (!$r) {
+ http_status_exit(404, 'Not found');
}
+ $sql_extra = permissions_sql($r[0]['obj_channel']);
+
$r = q("select * from obj where obj_type = %d and obj_obj = '%s' $sql_extra limit 1",
intval(TERM_OBJ_THING),
dbesc(argv(1))
@@ -36,6 +38,7 @@ class Thing extends \Zotlabs\Web\Controller {
}
http_status_exit(404, 'Not found');
+
}
}
@@ -269,8 +272,13 @@ class Thing extends \Zotlabs\Web\Controller {
intval(TERM_OBJ_THING),
dbesc(argv(1))
);
- if($r)
- $sql_extra = permissions_sql($r[0]['obj_channel']);
+
+ if (!$r) {
+ notice( t('item not found.') . EOL);
+ return;
+ }
+
+ $sql_extra = permissions_sql($r[0]['obj_channel']);
$r = q("select * from obj where obj_type = %d and obj_obj = '%s' $sql_extra limit 1",
intval(TERM_OBJ_THING),
@@ -302,6 +310,8 @@ class Thing extends \Zotlabs\Web\Controller {
return;
}
+ profile_load($channel['channel_address']);
+
$acl = new \Zotlabs\Access\AccessList($channel);
$channel_acl = $acl->get();