Merge pull request #8366 from annando/issue-8321

[friendica.git] / src / Module / NoScrape.php

diff --git a/src/Module/NoScrape.php b/src/Module/NoScrape.php
index 53b3fc4e3ee63b812cb61af32584b3a1ea79a756..a03770d0d4514e6f2a41d693e4307d62705b6e30 100644 (file)
--- a/src/Module/NoScrape.php
+++ b/src/Module/NoScrape.php
@@ -1,4 +1,23 @@
 <?php
+/**
+ * @copyright Copyright (C) 2020, Friendica
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ *
+ */
 
 namespace Friendica\Module;
 
@@ -50,7 +69,7 @@ class NoScrape extends BaseModule
                        $json_info["dfrn-{$dfrn}"] = DI::baseUrl() . "/dfrn_{$dfrn}/{$which}";
                }
 
-               if (!$a->profile['net-publish'] || $a->profile['hidewall']) {
+               if (!$a->profile['net-publish']) {
                        $json_info['hide'] = true;
                        System::jsonExit($json_info);
                }
@@ -112,7 +131,7 @@ class NoScrape extends BaseModule
                $json_info['last-activity'] = date('o-W', $last_active);
 
                //These are optional fields.
-               $profile_fields = ['pdesc', 'locality', 'region', 'postal-code', 'country-name'];
+               $profile_fields = ['about', 'locality', 'region', 'postal-code', 'country-name'];
                foreach ($profile_fields as $field) {
                        if (!empty($a->profile[$field])) {
                                $json_info["$field"] = $a->profile[$field];