From 894f0156afdb605883af4c3419ead4aec09617da Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 21 Aug 2017 15:00:45 -0700 Subject: more work on oembed from /display --- Zotlabs/Module/Display.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) (limited to 'Zotlabs/Module/Display.php') diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index d82ff2a55..5e03f91a9 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -174,6 +174,8 @@ class Display extends \Zotlabs\Web\Controller { '$verb' => '', '$mid' => $item_hash )); + + \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n"; } @@ -218,13 +220,13 @@ class Display extends \Zotlabs\Web\Controller { if(! perm_is_allowed($sysid,$observer_hash,'view_stream')) $sysid = 0; - +dbg(1); $r = q("SELECT item.id as item_id from item WHERE mid = '%s' AND (((( item.allow_cid = '' AND item.allow_gid = '' AND item.deny_cid = '' AND item.deny_gid = '' AND item_private = 0 ) - and owner_xchan in ( " . stream_perms_xchans(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) + and uid in ( " . stream_perms_api_uids(($observer_hash) ? (PERMS_NETWORK|PERMS_PUBLIC) : PERMS_PUBLIC) . " )) OR uid = %d ) $sql_extra ) $item_normal @@ -232,7 +234,7 @@ class Display extends \Zotlabs\Web\Controller { dbesc($target_item['parent_mid']), intval($sysid) ); - +dbg(0); } } } -- cgit v1.2.3 From 33528c616ae976891df7a778ce9360ceb56571f4 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Mon, 21 Aug 2017 18:52:22 -0700 Subject: remove debugging --- Zotlabs/Module/Display.php | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'Zotlabs/Module/Display.php') diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 5e03f91a9..1077cbdb9 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -39,7 +39,7 @@ class Display extends \Zotlabs\Web\Controller { $observer_is_owner = false; $updateable = false; - + if(local_channel() && (! $update)) { $channel = \App::get_channel(); @@ -216,11 +216,11 @@ class Display extends \Zotlabs\Web\Controller { if($r === null) { // in case somebody turned off public access to sys channel content using permissions - // make that content unsearchable by ensuring the owner_xchan can't match + // make that content unsearchable by ensuring the owner uid can't match if(! perm_is_allowed($sysid,$observer_hash,'view_stream')) $sysid = 0; -dbg(1); + $r = q("SELECT item.id as item_id from item WHERE mid = '%s' @@ -234,7 +234,7 @@ dbg(1); dbesc($target_item['parent_mid']), intval($sysid) ); -dbg(0); + } } } -- cgit v1.2.3 From 66b032823b4fd941f613b0194bb8412b216cc748 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Wed, 23 Aug 2017 20:47:08 -0700 Subject: oembed provider cleanup, add oembed to cards --- Zotlabs/Module/Display.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Zotlabs/Module/Display.php') diff --git a/Zotlabs/Module/Display.php b/Zotlabs/Module/Display.php index 1077cbdb9..b698513ba 100644 --- a/Zotlabs/Module/Display.php +++ b/Zotlabs/Module/Display.php @@ -175,9 +175,12 @@ class Display extends \Zotlabs\Web\Controller { '$mid' => $item_hash )); - \App::$page['htmlhead'] .= "\r\n" . '' . "\r\n"; - - + head_add_link([ + 'rel' => 'alternate', + 'type' => 'application/json+oembed', + 'href' => z_root() . '/oep?f=&url=' . urlencode(z_root() . '/' . \App::$query_string), + 'title' => 'oembed' + ]); } $observer_hash = get_observer_hash(); -- cgit v1.2.3