Revert "Rename contact table column to ffi_keyword_denylist"

This reverts commit 34463f37e4a3226709853bd3e35e6c22da45502c.

Signed-off-by: Roland Häder <roland@mxchange.org>

diff --git a/database.sql b/database.sql
index b59a3fc0d244eb7694d293f6510381548be8a759..7203839882e897a76a0fd68533303373e367a164 100644 (file)
--- a/database.sql
+++ b/database.sql
@@ -194,7 +194,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
        `info` mediumtext COMMENT '',
        `notify_new_posts` boolean NOT NULL DEFAULT '0' COMMENT '',
        `fetch_further_information` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
-       `ffi_keyword_denylist` text COMMENT '',
+       `ffi_keyword_blacklist` text COMMENT '',
        `photo` varbinary(383) DEFAULT '' COMMENT 'Link to the profile photo of the contact',
        `thumb` varbinary(383) DEFAULT '' COMMENT 'Link to the profile photo (thumb size)',
        `micro` varbinary(383) DEFAULT '' COMMENT 'Link to the profile photo (micro size)',
@@ -1991,7 +1991,7 @@ CREATE TABLE IF NOT EXISTS `user-contact` (
        `notify_new_posts` boolean COMMENT '',
        `remote_self` tinyint unsigned COMMENT '0 => No mirroring, 1-2 => Mirror as own post, 3 => Mirror as reshare',
        `fetch_further_information` tinyint unsigned COMMENT '0 => None, 1 => Fetch information, 3 => Fetch keywords, 2 => Fetch both',
-       `ffi_keyword_denylist` text COMMENT '',
+       `ffi_keyword_blacklist` text COMMENT '',
        `hub-verify` varbinary(383) COMMENT '',
        `protocol` char(4) COMMENT 'Protocol of the contact',
        `rating` tinyint COMMENT 'Automatically detected feed poll frequency',
@@ -3547,7 +3547,7 @@ CREATE VIEW `owner-view` AS SELECT
        `contact`.`bd` AS `bd`,
        `contact`.`notify_new_posts` AS `notify_new_posts`,
        `contact`.`fetch_further_information` AS `fetch_further_information`,
-       `contact`.`ffi_keyword_denylist` AS `ffi_keyword_denylist`,
+       `contact`.`ffi_keyword_blacklist` AS `ffi_keyword_blacklist`,
        `user`.`parent-uid` AS `parent-uid`,
        `user`.`guid` AS `guid`,
        `user`.`nickname` AS `nickname`,
@@ -3754,7 +3754,7 @@ CREATE VIEW `account-user-view` AS SELECT
        `ucontact`.`deleted` AS `deleted`,
        `ucontact`.`notify_new_posts` AS `notify_new_posts`,
        `ucontact`.`fetch_further_information` AS `fetch_further_information`,
-       `ucontact`.`ffi_keyword_denylist` AS `ffi_keyword_denylist`,
+       `ucontact`.`ffi_keyword_blacklist` AS `ffi_keyword_blacklist`,
        `ucontact`.`rating` AS `rating`,
        `ucontact`.`readonly` AS `readonly`,
        `ucontact`.`blocked` AS `blocked`,

diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md
index cd66ce12de7ed1f09fda446578139daadd8246f3..d6924d9ddf2e6b82bd41010c7b233d56a8137f24 100644 (file)
--- a/doc/database/db_contact.md
+++ b/doc/database/db_contact.md
@@ -69,7 +69,7 @@ Fields
 | info                      |                                                                                                                | mediumtext         | YES  |     | NULL                |                |
 | notify_new_posts          |                                                                                                                | boolean            | NO   |     | 0                   |                |
 | fetch_further_information |                                                                                                                | tinyint unsigned   | NO   |     | 0                   |                |
-| ffi_keyword_denylist      |                                                                                                                | text               | YES  |     | NULL                |                |
+| ffi_keyword_blacklist      |                                                                                                                | text               | YES  |     | NULL                |                |
 | photo                     | Link to the profile photo of the contact                                                                       | varbinary(383)     | YES  |     |                     |                |
 | thumb                     | Link to the profile photo (thumb size)                                                                         | varbinary(383)     | YES  |     |                     |                |
 | micro                     | Link to the profile photo (micro size)                                                                         | varbinary(383)     | YES  |     |                     |                |
@@ -95,7 +95,7 @@ Fields
 | profile-id                | Deprecated                                                                                                     | int unsigned       | YES  |     | NULL                |                |
 
 Indexes
-------------
+-------
 
 | Name                        | Fields                               |
 | --------------------------- | ------------------------------------ |

diff --git a/doc/database/db_user-contact.md b/doc/database/db_user-contact.md
index e52d8d495c4343a1cbb3ec9265e75aa0250ddac2..c53d8b971466b5df5ef81a42f1451c84c3f17672 100644 (file)
--- a/doc/database/db_user-contact.md
+++ b/doc/database/db_user-contact.md
@@ -24,7 +24,7 @@ Fields
 | notify_new_posts          |                                                                            | boolean            | YES  |     | NULL    |       |
 | remote_self               | 0 => No mirroring, 1-2 => Mirror as own post, 3 => Mirror as reshare       | tinyint unsigned   | YES  |     | NULL    |       |
 | fetch_further_information | 0 => None, 1 => Fetch information, 3 => Fetch keywords, 2 => Fetch both    | tinyint unsigned   | YES  |     | NULL    |       |
-| ffi_keyword_denylist      |                                                                            | text               | YES  |     | NULL    |       |
+| ffi_keyword_blacklist     |                                                                            | text               | YES  |     | NULL    |       |
 | hub-verify                |                                                                            | varbinary(383)     | YES  |     | NULL    |       |
 | protocol                  | Protocol of the contact                                                    | char(4)            | YES  |     | NULL    |       |
 | rating                    | Automatically detected feed poll frequency                                 | tinyint            | YES  |     | NULL    |       |

diff --git a/src/Contact/LocalRelationship/Entity/LocalRelationship.php b/src/Contact/LocalRelationship/Entity/LocalRelationship.php
index 2fa51e0085b4a108569c2ecb585a5e0fbfbc96bb..229529923338f90f2016675e9d7271f95db56df0 100644 (file)
--- a/src/Contact/LocalRelationship/Entity/LocalRelationship.php
+++ b/src/Contact/LocalRelationship/Entity/LocalRelationship.php
@@ -24,7 +24,7 @@ use Friendica\Model\Contact;
  * @property-read bool   $notifyNewPosts
  * @property-read int    $remoteSelf
  * @property-read int    $fetchFurtherInformation
- * @property-read string $ffiKeywordDenylist
+ * @property-read string $ffiKeywordblacklist
  * @property-read string $hubVerify
  * @property-read string $protocol
  * @property-read int    $rating
@@ -67,7 +67,7 @@ class LocalRelationship extends \Friendica\BaseEntity
        /** @var int One of FFI_* */
        protected $fetchFurtherInformation;
        /** @var string */
-       protected $ffiKeywordDenylist;
+       protected $ffiKeywordblacklist;
        /** @var string */
        protected $hubVerify;
        /** @var string */
@@ -77,7 +77,7 @@ class LocalRelationship extends \Friendica\BaseEntity
        /** @var int */
        protected $priority;
 
-       public function __construct(int $userId, int $contactId, bool $blocked = false, bool $ignored = false, bool $collapsed = false, bool $hidden = false, bool $pending = false, int $rel = Contact::NOTHING, string $info = '', bool $notifyNewPosts = false, int $remoteSelf = self::MIRROR_DEACTIVATED, int $fetchFurtherInformation = self::FFI_NONE, string $ffiKeywordDenylist = '', string $hubVerify = '', string $protocol = Protocol::PHANTOM, ?int $rating = null, ?int $priority = null)
+       public function __construct(int $userId, int $contactId, bool $blocked = false, bool $ignored = false, bool $collapsed = false, bool $hidden = false, bool $pending = false, int $rel = Contact::NOTHING, string $info = '', bool $notifyNewPosts = false, int $remoteSelf = self::MIRROR_DEACTIVATED, int $fetchFurtherInformation = self::FFI_NONE, string $ffiKeywordblacklist = '', string $hubVerify = '', string $protocol = Protocol::PHANTOM, ?int $rating = null, ?int $priority = null)
        {
                $this->userId                  = $userId;
                $this->contactId               = $contactId;
@@ -91,7 +91,7 @@ class LocalRelationship extends \Friendica\BaseEntity
                $this->notifyNewPosts          = $notifyNewPosts;
                $this->remoteSelf              = $remoteSelf;
                $this->fetchFurtherInformation = $fetchFurtherInformation;
-               $this->ffiKeywordDenylist      = $ffiKeywordDenylist;
+               $this->ffiKeywordblacklist      = $ffiKeywordblacklist;
                $this->hubVerify               = $hubVerify;
                $this->protocol                = $protocol;
                $this->rating                  = $rating;

diff --git a/src/Contact/LocalRelationship/Factory/LocalRelationship.php b/src/Contact/LocalRelationship/Factory/LocalRelationship.php
index 1cdc308ed4ae719216c0ef916ce768842d23fef0..01a446f242f7790206bffe3dbfcfbfac60217f9f 100644 (file)
--- a/src/Contact/LocalRelationship/Factory/LocalRelationship.php
+++ b/src/Contact/LocalRelationship/Factory/LocalRelationship.php
@@ -33,7 +33,7 @@ class LocalRelationship extends BaseFactory implements ICanCreateFromTableRow
                        $row['notify_new_posts'] ?? false,
                        $row['remote_self'] ?? Entity\LocalRelationship::MIRROR_DEACTIVATED,
                        $row['fetch_further_information'] ?? Entity\LocalRelationship::FFI_NONE,
-                       $row['ffi_keyword_denylist'] ?? '',
+                       $row['ffi_keyword_blacklist'] ?? '',
                        $row['hub-verify'] ?? '',
                        $row['protocol'] ?? Protocol::PHANTOM,
                        $row['rating'] ?? null,

diff --git a/src/Contact/LocalRelationship/Repository/LocalRelationship.php b/src/Contact/LocalRelationship/Repository/LocalRelationship.php
index d1a87d5569a680b285308189d32ececff8355fdf..77852e6f3a502138722e39f61c71f46d22b532a7 100644 (file)
--- a/src/Contact/LocalRelationship/Repository/LocalRelationship.php
+++ b/src/Contact/LocalRelationship/Repository/LocalRelationship.php
@@ -79,7 +79,7 @@ class LocalRelationship extends BaseRepository
                        'notify_new_posts'          => $localRelationship->notifyNewPosts,
                        'remote_self'               => $localRelationship->remoteSelf,
                        'fetch_further_information' => $localRelationship->fetchFurtherInformation,
-                       'ffi_keyword_denylist'      => $localRelationship->ffiKeywordDenylist,
+                       'ffi_keyword_blacklist'     => $localRelationship->ffiKeywordblacklist,
                        'hub-verify'                => $localRelationship->hubVerify,
                        'protocol'                  => $localRelationship->protocol,
                        'rating'                    => $localRelationship->rating,

diff --git a/src/Content/PageInfo.php b/src/Content/PageInfo.php
index a53c36b68c1aa38b5ea3d221536c71c3997050af..b49eec87d0f623c26ef9e279cb66ad8b0cc193e6 100644 (file)
--- a/src/Content/PageInfo.php
+++ b/src/Content/PageInfo.php
@@ -71,13 +71,13 @@ class PageInfo
         * @param bool $no_photos
         * @param string $photo
         * @param bool $keywords
-        * @param string $keyword_denylist
+        * @param string $keyword_blacklist
         * @return string
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function getFooterFromUrl(string $url, bool $no_photos = false, string $photo = '', bool $keywords = false, string $keyword_denylist = ''): string
+       public static function getFooterFromUrl(string $url, bool $no_photos = false, string $photo = '', bool $keywords = false, string $keyword_blacklist = ''): string
        {
-               $data = self::queryUrl($url, $photo, $keywords, $keyword_denylist);
+               $data = self::queryUrl($url, $photo, $keywords, $keyword_blacklist);
 
                return self::getFooterFromData($data, $no_photos);
        }
@@ -171,11 +171,11 @@ class PageInfo
         * @param string  $url
         * @param string $photo
         * @param bool $keywords
-        * @param string $keyword_denylist
+        * @param string $keyword_blacklist
         * @return array|bool
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function queryUrl(string $url, string $photo = '', bool $keywords = false, string $keyword_denylist = '')
+       public static function queryUrl(string $url, string $photo = '', bool $keywords = false, string $keyword_blacklist = '')
        {
                $data = ParseUrl::getSiteinfoCached($url);
 
@@ -185,8 +185,8 @@ class PageInfo
 
                if (!$keywords) {
                        unset($data['keywords']);
-               } elseif ($keyword_denylist && !empty($data['keywords'])) {
-                       $list = explode(', ', $keyword_denylist);
+               } elseif ($keyword_blacklist && !empty($data['keywords'])) {
+                       $list = explode(', ', $keyword_blacklist);
 
                        foreach ($list as $keyword) {
                                $keyword = trim($keyword);
@@ -206,13 +206,13 @@ class PageInfo
        /**
         * @param string $url
         * @param string $photo
-        * @param string $keyword_denylist
+        * @param string $keyword_blacklist
         * @return array
         * @throws HTTPException\InternalServerErrorException
         */
-       public static function getTagsFromUrl(string $url, string $photo = '', string $keyword_denylist = ''): array
+       public static function getTagsFromUrl(string $url, string $photo = '', string $keyword_blacklist = ''): array
        {
-               $data = self::queryUrl($url, $photo, true, $keyword_denylist);
+               $data = self::queryUrl($url, $photo, true, $keyword_blacklist);
 
                if (empty($data['keywords'])) {
                        return [];

diff --git a/src/Database/Database.php b/src/Database/Database.php
index c037a3198bf32ba603f745fdbd3bf0dac06c6a5b..bad8d36c3c4f3c13096f8b3a5a29ff956771a385 100644 (file)
--- a/src/Database/Database.php
+++ b/src/Database/Database.php
@@ -321,22 +321,22 @@ class Database
                }
 
                // Don't explain an explain statement
-               if (strtolower(substr($query, 0, 7)) == "explain") {
+               if (strtolower(substr($query, 0, 7)) == 'explain') {
                        return;
                }
 
                // Only do the explain on "select", "update" and "delete"
-               if (!in_array(strtolower(substr($query, 0, 6)), ["select", "update", "delete"])) {
+               if (!in_array(strtolower(substr($query, 0, 6)), ['select', 'update', 'delete'])) {
                        return;
                }
 
-               $r = $this->p("EXPLAIN " . $query);
+               $r = $this->p('EXPLAIN ' . $query);
                if (!$this->isResult($r)) {
                        return;
                }
 
                $watchlist = explode(',', $this->config->get('system', 'db_log_index_watch'));
-               $denylist  = explode(',', $this->config->get('system', 'db_log_index_denylist'));
+               $blacklist = explode(',', $this->config->get('system', 'db_log_index_blacklist'));
 
                while ($row = $this->fetch($r)) {
                        if ((intval($this->config->get('system', 'db_loglimit_index')) > 0)) {
@@ -350,7 +350,7 @@ class Database
                                $log = true;
                        }
 
-                       if (in_array($row['key'], $denylist) || ($row['key'] == "")) {
+                       if (in_array($row['key'], $blacklist) || ($row['key'] == '')) {
                                $log = false;
                        }
 
@@ -360,8 +360,8 @@ class Database
                                        $this->config->get('system', 'db_log_index'),
                                        DateTimeFormat::utcNow() . "\t" .
                                        $row['key'] . "\t" . $row['rows'] . "\t" . $row['Extra'] . "\t" .
-                                       basename($backtrace[1]["file"]) . "\t" .
-                                       $backtrace[1]["line"] . "\t" . $backtrace[2]["function"] . "\t" .
+                                       basename($backtrace[1]['file']) . "\t" .
+                                       $backtrace[1]['line'] . "\t" . $backtrace[2]['function'] . "\t" .
                                        substr($query, 0, 4000) . "\n",
                                        FILE_APPEND
                                );
@@ -370,7 +370,7 @@ class Database
        }
 
        /**
-        * Removes every not allowlisted character from the identifier string
+        * Removes every not whitelisted character from the identifier string
         *
         * @param string $identifier
         * @return string sanitized identifier

diff --git a/src/Module/Contact/Profile.php b/src/Module/Contact/Profile.php
index dd7288e58ce3363c81350b5b70eb0ec812bdcd74..d77bdef99c4af7b269bef53d6a730a88bb9a6111 100644 (file)
--- a/src/Module/Contact/Profile.php
+++ b/src/Module/Contact/Profile.php
@@ -128,8 +128,8 @@ class Profile extends BaseModule
                        $fields['remote_self'] = intval($request['remote_self']);
                }
 
-               if (isset($request['ffi_keyword_denylist'])) {
-                       $fields['ffi_keyword_denylist'] = $request['ffi_keyword_denylist'];
+               if (isset($request['ffi_keyword_blacklist'])) {
+                       $fields['ffi_keyword_blacklist'] = $request['ffi_keyword_blacklist'];
                }
 
                if (isset($request['poll'])) {
@@ -437,7 +437,7 @@ class Profile extends BaseModule
                        '$hidden'                    => ['hidden', $this->t('Hide this contact from others'), $localRelationship->hidden, $this->t('Replies/likes to your public posts <strong>may</strong> still be visible')],
                        '$notify_new_posts'          => ['notify_new_posts', $this->t('Notification for new posts'), ($localRelationship->notifyNewPosts), $this->t('Send a notification of every new post of this contact')],
                        '$fetch_further_information' => $fetch_further_information,
-                       '$ffi_keyword_denylist'      => ['ffi_keyword_denylist', $this->t('Keyword Deny List'), $localRelationship->ffiKeywordDenylist, $this->t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')],
+                       '$ffi_keyword_blacklist'     => ['ffi_keyword_blacklist', $this->t('Keyword Deny List'), $localRelationship->ffiKeywordblacklist, $this->t('Comma separated list of keywords that should not be converted to hashtags, when "Fetch information and keywords" is selected')],
                        '$photo'                     => ContactModel::getPhoto($contact),
                        '$name'                      => $contact['name'],
                        '$sparkle'                   => $sparkle,

diff --git a/src/Protocol/Feed.php b/src/Protocol/Feed.php
index 48780e6181d99171c50adb55e69de9f4be375ab7..2659a964a69e45a80583b1aad388117c6322714c 100644 (file)
--- a/src/Protocol/Feed.php
+++ b/src/Protocol/Feed.php
@@ -661,8 +661,9 @@ class Feed
                                $data = PageInfo::queryUrl(
                                        $item['plink'],
                                        false,
-                                       $fetch_further_information == LocalRelationship::FFI_BOTH,
-                                       $contact['ffi_keyword_denylist'] ?? ''
+                                       $preview,
+                                       ($contact['fetch_further_information'] == 2),
+                                       $contact['ffi_keyword_blacklist'] ?? ''
                                );
 
                                if (!empty($data)) {
@@ -682,7 +683,7 @@ class Feed
                                        // We always strip the title since it will be added in the page information
                                        $item['title']       = '';
                                        $item['body']        = $item['body'] . "\n" . PageInfo::getFooterFromData($data, false);
-                                       $taglist             = $fetch_further_information == LocalRelationship::FFI_BOTH ? PageInfo::getTagsFromUrl($item['plink'], $preview, $contact['ffi_keyword_denylist'] ?? '') : [];
+                                       $taglist             = $fetch_further_information == LocalRelationship::FFI_BOTH ? PageInfo::getTagsFromUrl($item['plink'], $preview, $contact['ffi_keyword_blacklist'] ?? '') : [];
                                        $item['object-type'] = Activity\ObjectType::BOOKMARK;
                                        $attachments         = [];
 
@@ -712,7 +713,7 @@ class Feed
                        } else {
                                if ($fetch_further_information == LocalRelationship::FFI_KEYWORD) {
                                        if (empty($taglist)) {
-                                               $taglist = PageInfo::getTagsFromUrl($item['plink'], $preview, $contact['ffi_keyword_denylist'] ?? '');
+                                               $taglist = PageInfo::getTagsFromUrl($item['plink'], $preview, $contact['ffi_keyword_blacklist'] ?? '');
                                        }
                                        $item['body'] .= "\n" . self::tagToString($taglist);
                                } else {

diff --git a/src/Worker/MergeContact.php b/src/Worker/MergeContact.php
index cdb464211b8237117a45186526b96cd6dbc0fd38..d060f1177f7ca11e37452d63825f2e0a001b94d4 100644 (file)
--- a/src/Worker/MergeContact.php
+++ b/src/Worker/MergeContact.php
@@ -72,7 +72,7 @@ class MergeContact
        private static function mergePersonalContacts(int $first, int $duplicate)
        {
                $fields = ['self', 'remote_self', 'rel', 'prvkey', 'hub-verify', 'priority', 'writable', 'archive', 'pending',
-                       'rating', 'notify_new_posts', 'fetch_further_information', 'ffi_keyword_denylist', 'block_reason'];
+                       'rating', 'notify_new_posts', 'fetch_further_information', 'ffi_keyword_blacklist', 'block_reason'];
                $c1 = Contact::getById($first, $fields);
                $c2 = Contact::getById($duplicate, $fields);
 
@@ -83,7 +83,7 @@ class MergeContact
                }
 
                $ctarget['rel'] = $c1['rel'] | $c2['rel'];
-               foreach (['prvkey', 'hub-verify', 'priority', 'rating', 'fetch_further_information', 'ffi_keyword_denylist', 'block_reason'] as $field) {
+               foreach (['prvkey', 'hub-verify', 'priority', 'rating', 'fetch_further_information', 'ffi_keyword_blacklist', 'block_reason'] as $field) {
                        $ctarget[$field] = $c1[$field] ?: $c2[$field];
                }
 

diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php
index 183b2281d38d330f719664c51f3b5eb488a5a06b..c63fdb3af2d8d21bcbc8c487ac96290ab16aea8d 100644 (file)
--- a/static/dbstructure.config.php
+++ b/static/dbstructure.config.php
@@ -239,7 +239,7 @@ return [
                        "info" => ["type" => "mediumtext", "comment" => ""],
                        "notify_new_posts" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
                        "fetch_further_information" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
-                       "ffi_keyword_denylist" => ["type" => "text", "comment" => ""],
+                       "ffi_keyword_blacklist" => ["type" => "text", "comment" => ""],
                        // Deprecated, but still in use
                        "photo" => ["type" => "varbinary(383)", "default" => "", "comment" => "Link to the profile photo of the contact"],
                        "thumb" => ["type" => "varbinary(383)", "default" => "", "comment" => "Link to the profile photo (thumb size)"],
@@ -1958,7 +1958,7 @@ return [
                        "notify_new_posts" => ["type" => "boolean", "comment" => ""],
                        "remote_self" => ["type" => "tinyint unsigned", "comment" => "0 => No mirroring, 1-2 => Mirror as own post, 3 => Mirror as reshare"],
                        "fetch_further_information" => ["type" => "tinyint unsigned", "comment" => "0 => None, 1 => Fetch information, 3 => Fetch keywords, 2 => Fetch both"],
-                       "ffi_keyword_denylist" => ["type" => "text", "comment" => ""],
+                       "ffi_keyword_blacklist" => ["type" => "text", "comment" => ""],
                        "hub-verify" => ["type" => "varbinary(383)", "comment" => ""],
                        "protocol" => ["type" => "char(4)", "comment" => "Protocol of the contact"],
                        "rating" => ["type" => "tinyint", "comment" => "Automatically detected feed poll frequency"],

diff --git a/static/dbview.config.php b/static/dbview.config.php
index 3437dcb22d4a20196959886fe7528f69bfcd1ac8..cd2567c95693fffef1a05075ab84ad9ca21d0964 100644 (file)
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -1500,7 +1500,7 @@ return [
                        "bd" => ["contact", "bd"],
                        "notify_new_posts" => ["contact", "notify_new_posts"],
                        "fetch_further_information" => ["contact", "fetch_further_information"],
-                       "ffi_keyword_denylist" => ["contact", "ffi_keyword_denylist"],
+                       "ffi_keyword_blacklist" => ["contact", "ffi_keyword_blacklist"],
                        "parent-uid" => ["user", "parent-uid"],
                        "guid" => ["user", "guid"],
                        "nickname" => ["user", "nickname"], /// @todo Replaces all uses of "nickname" with "nick"
@@ -1703,7 +1703,7 @@ return [
                        "deleted" => ["ucontact", "deleted"],
                        "notify_new_posts" => ["ucontact", "notify_new_posts"],
                        "fetch_further_information" => ["ucontact", "fetch_further_information"],
-                       "ffi_keyword_denylist" => ["ucontact", "ffi_keyword_denylist"],
+                       "ffi_keyword_blacklist" => ["ucontact", "ffi_keyword_blacklist"],
                        "rating" => ["ucontact", "rating"],
                        "readonly" => ["ucontact", "readonly"],
                        "blocked" => ["ucontact", "blocked"],

diff --git a/static/defaults.config.php b/static/defaults.config.php
index ada2aa3eac98f730afd731b4a0f7896b86f758ce..ef7b7273dc6cf034da821563d6aeb75437856038 100644 (file)
--- a/static/defaults.config.php
+++ b/static/defaults.config.php
@@ -176,9 +176,9 @@ return [
                // Watchlist of indexes to watch.
                'db_log_index_watch' => '',
 
-               // db_log_index_denylist (Comma-separated list)
+               // db_log_index_blacklist (Comma-separated list)
                // Deny list of indexes that shouldn't be watched.
-               'db_log_index_denylist' => '',
+               'db_log_index_blacklist' => '',
 
                // db_loglimit (Integer)
                // If a database call lasts longer than this value in seconds it is logged.

diff --git a/update.php b/update.php
index d9cd656f8d1f8745447728b697d94a0c05ad6fb6..6368119b0d5814b72a15b78e326b7b0e081d8c16 100644 (file)
--- a/update.php
+++ b/update.php
@@ -37,7 +37,6 @@ use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\Database\Database;
 use Friendica\Database\DBA;
-use Friendica\Database\DBStructure;
 use Friendica\DI;
 use Friendica\Model\Attach;
 use Friendica\Model\Contact;
@@ -306,33 +305,6 @@ function update_1351()
 
        return Update::SUCCESS;
 }
-
-function pre_update_1354()
-{
-       if (DBStructure::existsColumn('contact', ['ffi_keyword_blacklist'])
-               && !DBStructure::existsColumn('contact', ['ffi_keyword_denylist'])
-               && !DBA::e("ALTER TABLE `contact` CHANGE `ffi_keyword_blacklist` `ffi_keyword_denylist` text null")) {
-               return Update::FAILED;
-       }
-       return Update::SUCCESS;
-}
-
-function update_1354()
-{
-       if (DBStructure::existsColumn('contact', ['ffi_keyword_blacklist'])
-               && DBStructure::existsColumn('contact', ['ffi_keyword_denylist'])) {
-               if (!DBA::e("UPDATE `contact` SET `ffi_keyword_denylist` = `ffi_keyword_blacklist`")) {
-                       return Update::FAILED;
-               }
-
-               // When the data had been copied then the main task is done.
-               // Having the old field removed is only beauty but not crucial.
-               // So we don't care if this was successful or not.
-               DBA::e("ALTER TABLE `contact` DROP `ffi_keyword_blacklist`");
-       }
-       return Update::SUCCESS;
-}
-
 function update_1357()
 {
        if (!DBA::e("UPDATE `contact` SET `failed` = true WHERE `success_update` < `failure_update` AND `failed` IS NULL")) {

diff --git a/view/templates/contact_edit.tpl b/view/templates/contact_edit.tpl
index 6200fe83dd41166b8af481adc01aafe64cc0d27a..0490d540d3b40e3f50bccf35ce376e44284d20c8 100644 (file)
--- a/view/templates/contact_edit.tpl
+++ b/view/templates/contact_edit.tpl
@@ -79,7 +79,7 @@
 
                        {{if $fetch_further_information}}
                                {{include file="field_select.tpl" field=$fetch_further_information}}
-                               {{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_denylist}} {{/if}}
+                               {{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}}
                        {{/if}}
 
                        {{if $allow_remote_self}}

diff --git a/view/theme/frio/templates/contact_edit.tpl b/view/theme/frio/templates/contact_edit.tpl
index 5753a1e229b4aa9abf6eccae2ec844011a03b641..b06f4f08b54df7124d166421a0592cdd9bb8db29 100644 (file)
--- a/view/theme/frio/templates/contact_edit.tpl
+++ b/view/theme/frio/templates/contact_edit.tpl
@@ -151,7 +151,7 @@
                                                                {{include file="field_checkbox.tpl" field=$notify_new_posts}}
                                                                {{if $fetch_further_information}}
                                                                        {{include file="field_select.tpl" field=$fetch_further_information}}
-                                                                       {{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_denylist}} {{/if}}
+                                                                       {{if $fetch_further_information.2 == 2 || $fetch_further_information.2 == 3}} {{include file="field_textarea.tpl" field=$ffi_keyword_blacklist}} {{/if}}
                                                                {{/if}}
                                                                {{if $allow_remote_self}}
                                                                        {{include file="field_select.tpl" field=$remote_self}}