From 28ad6a68834a21553e98f16e090ce4c227ac343c Mon Sep 17 00:00:00 2001 From: Mario Date: Sun, 3 Oct 2021 07:18:49 +0000 Subject: remove redundant query and exit with status 410 if channel was removed --- Zotlabs/Module/Channel.php | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'Zotlabs') diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php index a2e23b31e..6261a2f06 100644 --- a/Zotlabs/Module/Channel.php +++ b/Zotlabs/Module/Channel.php @@ -53,13 +53,6 @@ class Channel extends Controller { $profile = argv(1); } - - // Do not use channelx_by_nick() here since it will dismiss deleted channels. - // We need to provide zotinfo for deleted channels so that directories can pick up the info. - $r = q("SELECT * FROM channel left join xchan on channel_hash = xchan_hash WHERE channel_address = '%s' LIMIT 1", - dbesc($which) - ); - $channel = channelx_by_nick($which, true); if (!$channel) { @@ -100,7 +93,7 @@ class Channel extends Controller { } if ($channel['channel_removed']) { - http_status_exit(404, 'Not found'); + http_status_exit(410, 'Gone'); } if (ActivityStreams::is_as_request($channel)) { -- cgit v1.2.3