From db3d230ad9a63ac9363fc3f3a658f8b6c3c5eab4 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 8 Nov 2016 17:47:56 -0800 Subject: more api work --- Zotlabs/Module/Wall_upload.php | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'Zotlabs/Module/Wall_upload.php') diff --git a/Zotlabs/Module/Wall_upload.php b/Zotlabs/Module/Wall_upload.php index 3868cb14e..46ebe13b1 100644 --- a/Zotlabs/Module/Wall_upload.php +++ b/Zotlabs/Module/Wall_upload.php @@ -17,16 +17,14 @@ class Wall_upload extends \Zotlabs\Web\Controller { if($using_api) { require_once('include/api.php'); - $user_info = api_get_user($a); - $nick = $user_info['screen_name']; + if(api_user()) + $channel = channelx_by_n(api_user()); } else { if(argc() > 1) - $nick = argv(1); + $channel = get_channel_by_nick(argv(1)); } - $channel = (($nick) ? get_channel_by_nick($nick) : false); - if(! $channel) { if($using_api) return; -- cgit v1.2.3 From 74947d1c1cb7c669ef2a167990066b34d89b5b07 Mon Sep 17 00:00:00 2001 From: zotlabs Date: Tue, 8 Nov 2016 18:15:57 -0800 Subject: deprecate/remove get_channel_by_nick() which is just a less generalised variant of channelx_by_nick() --- Zotlabs/Module/Wall_upload.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Zotlabs/Module/Wall_upload.php') diff --git a/Zotlabs/Module/Wall_upload.php b/Zotlabs/Module/Wall_upload.php index 46ebe13b1..6d58e4032 100644 --- a/Zotlabs/Module/Wall_upload.php +++ b/Zotlabs/Module/Wall_upload.php @@ -22,7 +22,7 @@ class Wall_upload extends \Zotlabs\Web\Controller { } else { if(argc() > 1) - $channel = get_channel_by_nick(argv(1)); + $channel = channelx_by_nick(argv(1)); } if(! $channel) { -- cgit v1.2.3