From 937f36f754bc71d4607361e60696daf6a729261a Mon Sep 17 00:00:00 2001 From: Michael Date: Thu, 2 Nov 2017 21:25:20 +0000 Subject: [PATCH] @posts to only the forum should be treated like !posts --- mod/item.php | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/mod/item.php b/mod/item.php index 883e0290db..1033521948 100644 --- a/mod/item.php +++ b/mod/item.php @@ -613,6 +613,12 @@ function item_post(App $a) { $only_to_forum = ($tag_type == '!'); $private_id = $success['contact']['id']; $forum_contact = $success['contact']; + } elseif (is_array($success['contact']) && $success['contact']['forum'] && + ($str_contact_allow == '<' . $success['contact']['id'] . '>')) { + $private_forum = false; + $only_to_forum = true; + $private_id = $success['contact']['id']; + $forum_contact = $success['contact']; } } } @@ -1186,7 +1192,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n // Is it in format @user@domain.tld or @http://domain.tld/...? // First check the contact table for the address - $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `contact` + $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify`, `forum`, `prv` FROM `contact` WHERE `addr` = '%s' AND `uid` = %d AND (`network` != '%s' OR (`notify` != '' AND `alias` != '')) LIMIT 1", @@ -1197,7 +1203,7 @@ function handle_tag(App $a, &$body, &$inform, &$str_tags, $profile_uid, $tag, $n // Then check in the contact table for the url if (!dbm::is_result($r)) { - $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify` FROM `contact` + $r = q("SELECT `id`, `url`, `nick`, `name`, `alias`, `network`, `notify`, `forum`, `prv` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d AND (`network` != '%s' OR (`notify` != '' AND `alias` != '')) LIMIT 1",