]> git.mxchange.org Git - friendica.git/commitdiff
Rearranged fields
authorMichael <heluecht@pirati.ca>
Mon, 13 Sep 2021 08:22:11 +0000 (08:22 +0000)
committerMichael <heluecht@pirati.ca>
Mon, 13 Sep 2021 08:22:11 +0000 (08:22 +0000)
database.sql
doc/database/db_contact.md
static/dbstructure.config.php
static/dbview.config.php

index cbdbe226601cfff6db198734ec771bc5dbe256ed..02b01e25c69ec8f07a3756468a83eaea2f852038 100644 (file)
@@ -114,29 +114,16 @@ CREATE TABLE IF NOT EXISTS `contact` (
        `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
        `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
        `updated` datetime DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of last contact update',
-       `self` boolean NOT NULL DEFAULT '0' COMMENT '1 if the contact is the user him/her self',
-       `remote_self` boolean NOT NULL DEFAULT '0' COMMENT '',
-       `rel` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'The kind of the relation between the user and the contact',
-       `duplex` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated',
        `network` char(4) NOT NULL DEFAULT '' COMMENT 'Network of the contact',
-       `protocol` char(4) NOT NULL DEFAULT '' COMMENT 'Protocol of the contact',
        `name` varchar(255) NOT NULL DEFAULT '' COMMENT 'Name that this contact is known by',
        `nick` varchar(255) NOT NULL DEFAULT '' COMMENT 'Nick- and user name of the contact',
        `location` varchar(255) DEFAULT '' COMMENT '',
        `about` text COMMENT '',
        `keywords` text COMMENT 'public keywords (interests) of the contact',
-       `gender` varchar(32) NOT NULL DEFAULT '' COMMENT 'Deprecated',
        `xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT 'XMPP address',
        `matrix` varchar(255) NOT NULL DEFAULT '' COMMENT 'Matrix address',
-       `attag` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-       `photo` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo of the contact',
-       `thumb` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo (thumb size)',
-       `micro` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo (micro size)',
        `header` varchar(255) COMMENT 'Header picture',
-       `site-pubkey` text COMMENT 'Deprecated',
-       `issued-id` varchar(255) NOT NULL DEFAULT '' COMMENT 'Deprecated',
-       `dfrn-id` varchar(255) NOT NULL DEFAULT '' COMMENT 'Deprecated',
        `url` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the contact url',
@@ -145,54 +132,67 @@ CREATE TABLE IF NOT EXISTS `contact` (
        `pubkey` text COMMENT 'RSA public key 4096 bit',
        `prvkey` text COMMENT 'RSA private key 4096 bit',
        `batch` varchar(255) NOT NULL DEFAULT '' COMMENT '',
-       `request` varchar(255) COMMENT '',
        `notify` varchar(255) COMMENT '',
        `poll` varchar(255) COMMENT '',
-       `confirm` varchar(255) COMMENT '',
        `subscribe` varchar(255) COMMENT '',
-       `poco` varchar(255) COMMENT '',
-       `aes_allow` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated',
-       `ret-aes` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated',
-       `usehub` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated',
-       `subhub` boolean NOT NULL DEFAULT '0' COMMENT '',
-       `hub-verify` varchar(255) NOT NULL DEFAULT '' COMMENT '',
        `last-update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last try to update the contact info',
        `success_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last successful contact update',
        `failure_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last failed update',
        `failed` boolean COMMENT 'Connection failed',
-       `name-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-       `uri-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-       `avatar-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
        `term-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
        `last-item` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'date of the last post',
        `last-discovery` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'date of the last follower discovery',
-       `priority` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
        `blocked` boolean NOT NULL DEFAULT '1' COMMENT 'Node-wide block status',
        `block_reason` text COMMENT 'Node-wide block reason',
        `readonly` boolean NOT NULL DEFAULT '0' COMMENT 'posts of the contact are readonly',
-       `writable` boolean NOT NULL DEFAULT '0' COMMENT '',
-       `forum` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a forum',
-       `prv` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a private group',
-       `contact-type` tinyint NOT NULL DEFAULT 0 COMMENT '',
-       `manually-approve` boolean COMMENT '',
-       `hidden` boolean NOT NULL DEFAULT '0' COMMENT '',
+       `contact-type` tinyint NOT NULL DEFAULT 0 COMMENT 'Person, organisation, news, community, relay',
+       `manually-approve` boolean COMMENT 'Contact requests have to be approved manually',
        `archive` boolean NOT NULL DEFAULT '0' COMMENT '',
-       `pending` boolean NOT NULL DEFAULT '1' COMMENT '',
-       `deleted` boolean NOT NULL DEFAULT '0' COMMENT 'Contact has been deleted',
-       `rating` tinyint NOT NULL DEFAULT 0 COMMENT '',
        `unsearchable` boolean NOT NULL DEFAULT '0' COMMENT 'Contact prefers to not be searchable',
        `sensitive` boolean NOT NULL DEFAULT '0' COMMENT 'Contact posts sensitive content',
        `baseurl` varchar(255) DEFAULT '' COMMENT 'baseurl of the contact',
        `gsid` int unsigned COMMENT 'Global Server ID',
+       `bd` date NOT NULL DEFAULT '0001-01-01' COMMENT '',
        `reason` text COMMENT '',
-       `closeness` tinyint unsigned NOT NULL DEFAULT 99 COMMENT 'Deprecated',
+       `self` boolean NOT NULL DEFAULT '0' COMMENT '1 if the contact is the user him/her self',
+       `remote_self` boolean NOT NULL DEFAULT '0' COMMENT '',
+       `rel` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'The kind of the relation between the user and the contact',
+       `protocol` char(4) NOT NULL DEFAULT '' COMMENT 'Protocol of the contact',
+       `subhub` boolean NOT NULL DEFAULT '0' COMMENT '',
+       `hub-verify` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+       `rating` tinyint NOT NULL DEFAULT 0 COMMENT 'Automatically detected feed poll frequency',
+       `priority` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'Feed poll priority',
+       `attag` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+       `hidden` boolean NOT NULL DEFAULT '0' COMMENT '',
+       `pending` boolean NOT NULL DEFAULT '1' COMMENT 'Contact request is pending',
+       `deleted` boolean NOT NULL DEFAULT '0' COMMENT 'Contact has been deleted',
        `info` mediumtext COMMENT '',
-       `profile-id` int unsigned COMMENT 'Deprecated',
-       `bdyear` varchar(4) NOT NULL DEFAULT '' COMMENT '',
-       `bd` date NOT NULL DEFAULT '0001-01-01' 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 '',
+       `photo` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo of the contact',
+       `thumb` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo (thumb size)',
+       `micro` varchar(255) DEFAULT '' COMMENT 'Link to the profile photo (micro size)',
+       `name-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+       `uri-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+       `avatar-date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
+       `request` varchar(255) COMMENT '',
+       `confirm` varchar(255) COMMENT '',
+       `poco` varchar(255) COMMENT '',
+       `writable` boolean NOT NULL DEFAULT '0' COMMENT '',
+       `forum` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a forum. Deprecated, use \'contact-type\' = \'community\' and \'manually-approve\' = false instead',
+       `prv` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a private group. Deprecated, use \'contact-type\' = \'community\' and \'manually-approve\' = true instead',
+       `bdyear` varchar(4) NOT NULL DEFAULT '' COMMENT '',
+       `site-pubkey` text COMMENT 'Deprecated',
+       `gender` varchar(32) NOT NULL DEFAULT '' COMMENT 'Deprecated',
+       `duplex` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated',
+       `issued-id` varchar(255) NOT NULL DEFAULT '' COMMENT 'Deprecated',
+       `dfrn-id` varchar(255) NOT NULL DEFAULT '' COMMENT 'Deprecated',
+       `aes_allow` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated',
+       `ret-aes` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated',
+       `usehub` boolean NOT NULL DEFAULT '0' COMMENT 'Deprecated',
+       `closeness` tinyint unsigned NOT NULL DEFAULT 99 COMMENT 'Deprecated',
+       `profile-id` int unsigned COMMENT 'Deprecated',
         PRIMARY KEY(`id`),
         INDEX `uid_name` (`uid`,`name`(190)),
         INDEX `self_uid` (`self`,`uid`),
@@ -2461,7 +2461,7 @@ CREATE VIEW `account-user-view` AS SELECT
        `contact`.`network` AS `network`,
        `ucontact`.`protocol` AS `protocol`,
        `contact`.`location` AS `location`,
-       `contact`.`attag` AS `attag`,
+       `ucontact`.`attag` AS `attag`,
        `contact`.`pubkey` AS `pubkey`,
        `contact`.`prvkey` AS `prvkey`,
        `contact`.`subscribe` AS `subscribe`,
@@ -2477,7 +2477,7 @@ CREATE VIEW `account-user-view` AS SELECT
        `contact`.`sensitive` AS `sensitive`,
        `contact`.`baseurl` AS `baseurl`,
        `contact`.`gsid` AS `gsid`,
-       `contact`.`info` AS `info`,
+       `ucontact`.`info` AS `info`,
        `contact`.`bdyear` AS `bdyear`,
        `contact`.`bd` AS `bd`,
        `contact`.`poco` AS `poco`,
index ab4e016db4afeedeb5072d3823ef2f74d2cb041e..ae12217589700c2e8067f2189a92b003550c8435 100644 (file)
@@ -6,91 +6,91 @@ contact table
 Fields
 ------
 
-| Field                     | Description                                                  | Type               | Null | Key | Default             | Extra          |
-| ------------------------- | ------------------------------------------------------------ | ------------------ | ---- | --- | ------------------- | -------------- |
-| id                        | sequential ID                                                | int unsigned       | NO   | PRI | NULL                | auto_increment |
-| uid                       | Owner User id                                                | mediumint unsigned | NO   |     | 0                   |                |
-| created                   |                                                              | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| updated                   | Date of last contact update                                  | datetime           | YES  |     | 0001-01-01 00:00:00 |                |
-| self                      | 1 if the contact is the user him/her self                    | boolean            | NO   |     | 0                   |                |
-| remote_self               |                                                              | boolean            | NO   |     | 0                   |                |
-| rel                       | The kind of the relation between the user and the contact    | tinyint unsigned   | NO   |     | 0                   |                |
-| duplex                    | Deprecated                                                   | boolean            | NO   |     | 0                   |                |
-| network                   | Network of the contact                                       | char(4)            | NO   |     |                     |                |
-| protocol                  | Protocol of the contact                                      | char(4)            | NO   |     |                     |                |
-| name                      | Name that this contact is known by                           | varchar(255)       | NO   |     |                     |                |
-| nick                      | Nick- and user name of the contact                           | varchar(255)       | NO   |     |                     |                |
-| location                  |                                                              | varchar(255)       | YES  |     |                     |                |
-| about                     |                                                              | text               | YES  |     | NULL                |                |
-| keywords                  | public keywords (interests) of the contact                   | text               | YES  |     | NULL                |                |
-| gender                    | Deprecated                                                   | varchar(32)        | NO   |     |                     |                |
-| xmpp                      | XMPP address                                                 | varchar(255)       | NO   |     |                     |                |
-| matrix                    | Matrix address                                               | varchar(255)       | NO   |     |                     |                |
-| attag                     |                                                              | varchar(255)       | NO   |     |                     |                |
-| avatar                    |                                                              | varchar(255)       | NO   |     |                     |                |
-| photo                     | Link to the profile photo of the contact                     | varchar(255)       | YES  |     |                     |                |
-| thumb                     | Link to the profile photo (thumb size)                       | varchar(255)       | YES  |     |                     |                |
-| micro                     | Link to the profile photo (micro size)                       | varchar(255)       | YES  |     |                     |                |
-| header                    | Header picture                                               | varchar(255)       | YES  |     | NULL                |                |
-| site-pubkey               | Deprecated                                                   | text               | YES  |     | NULL                |                |
-| issued-id                 | Deprecated                                                   | varchar(255)       | NO   |     |                     |                |
-| dfrn-id                   | Deprecated                                                   | varchar(255)       | NO   |     |                     |                |
-| url                       |                                                              | varchar(255)       | NO   |     |                     |                |
-| nurl                      |                                                              | varchar(255)       | NO   |     |                     |                |
-| uri-id                    | Id of the item-uri table entry that contains the contact url | int unsigned       | YES  |     | NULL                |                |
-| addr                      |                                                              | varchar(255)       | NO   |     |                     |                |
-| alias                     |                                                              | varchar(255)       | NO   |     |                     |                |
-| pubkey                    | RSA public key 4096 bit                                      | text               | YES  |     | NULL                |                |
-| prvkey                    | RSA private key 4096 bit                                     | text               | YES  |     | NULL                |                |
-| batch                     |                                                              | varchar(255)       | NO   |     |                     |                |
-| request                   |                                                              | varchar(255)       | YES  |     | NULL                |                |
-| notify                    |                                                              | varchar(255)       | YES  |     | NULL                |                |
-| poll                      |                                                              | varchar(255)       | YES  |     | NULL                |                |
-| confirm                   |                                                              | varchar(255)       | YES  |     | NULL                |                |
-| subscribe                 |                                                              | varchar(255)       | YES  |     | NULL                |                |
-| poco                      |                                                              | varchar(255)       | YES  |     | NULL                |                |
-| aes_allow                 | Deprecated                                                   | boolean            | NO   |     | 0                   |                |
-| ret-aes                   | Deprecated                                                   | boolean            | NO   |     | 0                   |                |
-| usehub                    | Deprecated                                                   | boolean            | NO   |     | 0                   |                |
-| subhub                    |                                                              | boolean            | NO   |     | 0                   |                |
-| hub-verify                |                                                              | varchar(255)       | NO   |     |                     |                |
-| last-update               | Date of the last try to update the contact info              | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| success_update            | Date of the last successful contact update                   | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| failure_update            | Date of the last failed update                               | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| failed                    | Connection failed                                            | boolean            | YES  |     | NULL                |                |
-| name-date                 |                                                              | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| uri-date                  |                                                              | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| avatar-date               |                                                              | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| term-date                 |                                                              | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| last-item                 | date of the last post                                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| last-discovery            | date of the last follower discovery                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| priority                  |                                                              | tinyint unsigned   | NO   |     | 0                   |                |
-| blocked                   | Node-wide block status                                       | boolean            | NO   |     | 1                   |                |
-| block_reason              | Node-wide block reason                                       | text               | YES  |     | NULL                |                |
-| readonly                  | posts of the contact are readonly                            | boolean            | NO   |     | 0                   |                |
-| writable                  |                                                              | boolean            | NO   |     | 0                   |                |
-| forum                     | contact is a forum                                           | boolean            | NO   |     | 0                   |                |
-| prv                       | contact is a private group                                   | boolean            | NO   |     | 0                   |                |
-| contact-type              |                                                              | tinyint            | NO   |     | 0                   |                |
-| manually-approve          |                                                              | boolean            | YES  |     | NULL                |                |
-| hidden                    |                                                              | boolean            | NO   |     | 0                   |                |
-| archive                   |                                                              | boolean            | NO   |     | 0                   |                |
-| pending                   |                                                              | boolean            | NO   |     | 1                   |                |
-| deleted                   | Contact has been deleted                                     | boolean            | NO   |     | 0                   |                |
-| rating                    |                                                              | tinyint            | NO   |     | 0                   |                |
-| unsearchable              | Contact prefers to not be searchable                         | boolean            | NO   |     | 0                   |                |
-| sensitive                 | Contact posts sensitive content                              | boolean            | NO   |     | 0                   |                |
-| baseurl                   | baseurl of the contact                                       | varchar(255)       | YES  |     |                     |                |
-| gsid                      | Global Server ID                                             | int unsigned       | YES  |     | NULL                |                |
-| reason                    |                                                              | text               | YES  |     | NULL                |                |
-| closeness                 | Deprecated                                                   | tinyint unsigned   | NO   |     | 99                  |                |
-| info                      |                                                              | mediumtext         | YES  |     | NULL                |                |
-| profile-id                | Deprecated                                                   | int unsigned       | YES  |     | NULL                |                |
-| bdyear                    |                                                              | varchar(4)         | NO   |     |                     |                |
-| bd                        |                                                              | date               | NO   |     | 0001-01-01          |                |
-| notify_new_posts          |                                                              | boolean            | NO   |     | 0                   |                |
-| fetch_further_information |                                                              | tinyint unsigned   | NO   |     | 0                   |                |
-| ffi_keyword_denylist      |                                                              | text               | YES  |     | NULL                |                |
+| Field                     | Description                                                                                                    | Type               | Null | Key | Default             | Extra          |
+| ------------------------- | -------------------------------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| id                        | sequential ID                                                                                                  | int unsigned       | NO   | PRI | NULL                | auto_increment |
+| uid                       | Owner User id                                                                                                  | mediumint unsigned | NO   |     | 0                   |                |
+| created                   |                                                                                                                | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| updated                   | Date of last contact update                                                                                    | datetime           | YES  |     | 0001-01-01 00:00:00 |                |
+| network                   | Network of the contact                                                                                         | char(4)            | NO   |     |                     |                |
+| name                      | Name that this contact is known by                                                                             | varchar(255)       | NO   |     |                     |                |
+| nick                      | Nick- and user name of the contact                                                                             | varchar(255)       | NO   |     |                     |                |
+| location                  |                                                                                                                | varchar(255)       | YES  |     |                     |                |
+| about                     |                                                                                                                | text               | YES  |     | NULL                |                |
+| keywords                  | public keywords (interests) of the contact                                                                     | text               | YES  |     | NULL                |                |
+| xmpp                      | XMPP address                                                                                                   | varchar(255)       | NO   |     |                     |                |
+| matrix                    | Matrix address                                                                                                 | varchar(255)       | NO   |     |                     |                |
+| avatar                    |                                                                                                                | varchar(255)       | NO   |     |                     |                |
+| header                    | Header picture                                                                                                 | varchar(255)       | YES  |     | NULL                |                |
+| url                       |                                                                                                                | varchar(255)       | NO   |     |                     |                |
+| nurl                      |                                                                                                                | varchar(255)       | NO   |     |                     |                |
+| uri-id                    | Id of the item-uri table entry that contains the contact url                                                   | int unsigned       | YES  |     | NULL                |                |
+| addr                      |                                                                                                                | varchar(255)       | NO   |     |                     |                |
+| alias                     |                                                                                                                | varchar(255)       | NO   |     |                     |                |
+| pubkey                    | RSA public key 4096 bit                                                                                        | text               | YES  |     | NULL                |                |
+| prvkey                    | RSA private key 4096 bit                                                                                       | text               | YES  |     | NULL                |                |
+| batch                     |                                                                                                                | varchar(255)       | NO   |     |                     |                |
+| notify                    |                                                                                                                | varchar(255)       | YES  |     | NULL                |                |
+| poll                      |                                                                                                                | varchar(255)       | YES  |     | NULL                |                |
+| subscribe                 |                                                                                                                | varchar(255)       | YES  |     | NULL                |                |
+| last-update               | Date of the last try to update the contact info                                                                | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| success_update            | Date of the last successful contact update                                                                     | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| failure_update            | Date of the last failed update                                                                                 | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| failed                    | Connection failed                                                                                              | boolean            | YES  |     | NULL                |                |
+| term-date                 |                                                                                                                | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| last-item                 | date of the last post                                                                                          | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| last-discovery            | date of the last follower discovery                                                                            | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| blocked                   | Node-wide block status                                                                                         | boolean            | NO   |     | 1                   |                |
+| block_reason              | Node-wide block reason                                                                                         | text               | YES  |     | NULL                |                |
+| readonly                  | posts of the contact are readonly                                                                              | boolean            | NO   |     | 0                   |                |
+| contact-type              | Person, organisation, news, community, relay                                                                   | tinyint            | NO   |     | 0                   |                |
+| manually-approve          | Contact requests have to be approved manually                                                                  | boolean            | YES  |     | NULL                |                |
+| archive                   |                                                                                                                | boolean            | NO   |     | 0                   |                |
+| unsearchable              | Contact prefers to not be searchable                                                                           | boolean            | NO   |     | 0                   |                |
+| sensitive                 | Contact posts sensitive content                                                                                | boolean            | NO   |     | 0                   |                |
+| baseurl                   | baseurl of the contact                                                                                         | varchar(255)       | YES  |     |                     |                |
+| gsid                      | Global Server ID                                                                                               | int unsigned       | YES  |     | NULL                |                |
+| bd                        |                                                                                                                | date               | NO   |     | 0001-01-01          |                |
+| reason                    |                                                                                                                | text               | YES  |     | NULL                |                |
+| self                      | 1 if the contact is the user him/her self                                                                      | boolean            | NO   |     | 0                   |                |
+| remote_self               |                                                                                                                | boolean            | NO   |     | 0                   |                |
+| rel                       | The kind of the relation between the user and the contact                                                      | tinyint unsigned   | NO   |     | 0                   |                |
+| protocol                  | Protocol of the contact                                                                                        | char(4)            | NO   |     |                     |                |
+| subhub                    |                                                                                                                | boolean            | NO   |     | 0                   |                |
+| hub-verify                |                                                                                                                | varchar(255)       | NO   |     |                     |                |
+| rating                    | Automatically detected feed poll frequency                                                                     | tinyint            | NO   |     | 0                   |                |
+| priority                  | Feed poll priority                                                                                             | tinyint unsigned   | NO   |     | 0                   |                |
+| attag                     |                                                                                                                | varchar(255)       | NO   |     |                     |                |
+| hidden                    |                                                                                                                | boolean            | NO   |     | 0                   |                |
+| pending                   | Contact request is pending                                                                                     | boolean            | NO   |     | 1                   |                |
+| deleted                   | Contact has been deleted                                                                                       | boolean            | NO   |     | 0                   |                |
+| info                      |                                                                                                                | mediumtext         | YES  |     | NULL                |                |
+| notify_new_posts          |                                                                                                                | boolean            | NO   |     | 0                   |                |
+| fetch_further_information |                                                                                                                | tinyint unsigned   | NO   |     | 0                   |                |
+| ffi_keyword_denylist      |                                                                                                                | text               | YES  |     | NULL                |                |
+| photo                     | Link to the profile photo of the contact                                                                       | varchar(255)       | YES  |     |                     |                |
+| thumb                     | Link to the profile photo (thumb size)                                                                         | varchar(255)       | YES  |     |                     |                |
+| micro                     | Link to the profile photo (micro size)                                                                         | varchar(255)       | YES  |     |                     |                |
+| name-date                 |                                                                                                                | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| uri-date                  |                                                                                                                | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| avatar-date               |                                                                                                                | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
+| request                   |                                                                                                                | varchar(255)       | YES  |     | NULL                |                |
+| confirm                   |                                                                                                                | varchar(255)       | YES  |     | NULL                |                |
+| poco                      |                                                                                                                | varchar(255)       | YES  |     | NULL                |                |
+| writable                  |                                                                                                                | boolean            | NO   |     | 0                   |                |
+| forum                     | contact is a forum. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = false instead        | boolean            | NO   |     | 0                   |                |
+| prv                       | contact is a private group. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = true instead | boolean            | NO   |     | 0                   |                |
+| bdyear                    |                                                                                                                | varchar(4)         | NO   |     |                     |                |
+| site-pubkey               | Deprecated                                                                                                     | text               | YES  |     | NULL                |                |
+| gender                    | Deprecated                                                                                                     | varchar(32)        | NO   |     |                     |                |
+| duplex                    | Deprecated                                                                                                     | boolean            | NO   |     | 0                   |                |
+| issued-id                 | Deprecated                                                                                                     | varchar(255)       | NO   |     |                     |                |
+| dfrn-id                   | Deprecated                                                                                                     | varchar(255)       | NO   |     |                     |                |
+| aes_allow                 | Deprecated                                                                                                     | boolean            | NO   |     | 0                   |                |
+| ret-aes                   | Deprecated                                                                                                     | boolean            | NO   |     | 0                   |                |
+| usehub                    | Deprecated                                                                                                     | boolean            | NO   |     | 0                   |                |
+| closeness                 | Deprecated                                                                                                     | tinyint unsigned   | NO   |     | 99                  |                |
+| profile-id                | Deprecated                                                                                                     | int unsigned       | YES  |     | NULL                |                |
 
 Indexes
 ------------
index 16143607feafb0a24e3810fa28fbeaf39fc1ad6d..b94df41cea6db0eeb4cca60b7c04e014b557bed4 100644 (file)
@@ -172,29 +172,16 @@ return [
                        "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"],
                        "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
                        "updated" => ["type" => "datetime", "default" => DBA::NULL_DATETIME, "comment" => "Date of last contact update"],
-                       "self" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 if the contact is the user him/her self"],
-                       "remote_self" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-                       "rel" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "The kind of the relation between the user and the contact"],
-                       "duplex" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Deprecated"],
                        "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Network of the contact"],
-                       "protocol" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Protocol of the contact"],
                        "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Name that this contact is known by"],
                        "nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Nick- and user name of the contact"],
                        "location" => ["type" => "varchar(255)", "default" => "", "comment" => ""],
                        "about" => ["type" => "text", "comment" => ""],
                        "keywords" => ["type" => "text", "comment" => "public keywords (interests) of the contact"],
-                       "gender" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => "Deprecated"],
                        "xmpp" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "XMPP address"],
                        "matrix" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Matrix address"],
-                       "attag" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                        "avatar" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-                       "photo" => ["type" => "varchar(255)", "default" => "", "comment" => "Link to the profile photo of the contact"],
-                       "thumb" => ["type" => "varchar(255)", "default" => "", "comment" => "Link to the profile photo (thumb size)"],
-                       "micro" => ["type" => "varchar(255)", "default" => "", "comment" => "Link to the profile photo (micro size)"],
                        "header" => ["type" => "varchar(255)", "comment" => "Header picture"],
-                       "site-pubkey" => ["type" => "text", "comment" => "Deprecated"],
-                       "issued-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Deprecated"],
-                       "dfrn-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Deprecated"],
                        "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                        "nurl" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                        "uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the contact url"],
@@ -203,54 +190,70 @@ return [
                        "pubkey" => ["type" => "text", "comment" => "RSA public key 4096 bit"],
                        "prvkey" => ["type" => "text", "comment" => "RSA private key 4096 bit"],
                        "batch" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
-                       "request" => ["type" => "varchar(255)", "comment" => ""],
                        "notify" => ["type" => "varchar(255)", "comment" => ""],
                        "poll" => ["type" => "varchar(255)", "comment" => ""],
-                       "confirm" => ["type" => "varchar(255)", "comment" => ""],
                        "subscribe" => ["type" => "varchar(255)", "comment" => ""],
-                       "poco" => ["type" => "varchar(255)", "comment" => ""],
-                       "aes_allow" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Deprecated"],
-                       "ret-aes" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Deprecated"],
-                       "usehub" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Deprecated"],
-                       "subhub" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-                       "hub-verify" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
                        "last-update" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of the last try to update the contact info"],
                        "success_update" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of the last successful contact update"],
                        "failure_update" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of the last failed update"],
                        "failed" => ["type" => "boolean", "comment" => "Connection failed"],
-                       "name-date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
-                       "uri-date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
-                       "avatar-date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
                        "term-date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
                        "last-item" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "date of the last post"],
                        "last-discovery" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "date of the last follower discovery"],
-                       "priority" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""],
                        "blocked" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => "Node-wide block status"],
                        "block_reason" => ["type" => "text", "comment" => "Node-wide block reason"],
                        "readonly" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "posts of the contact are readonly"],
-                       "writable" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-                       "forum" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "contact is a forum"],
-                       "prv" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "contact is a private group"],
-                       "contact-type" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => ""],
-                       "manually-approve" => ["type" => "boolean", "comment" => ""],
-                       "hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "contact-type" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => "Person, organisation, news, community, relay"],
+                       "manually-approve" => ["type" => "boolean", "comment" => "Contact requests have to be approved manually"],
                        "archive" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
-                       "pending" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => ""],
-                       "deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Contact has been deleted"],
-                       "rating" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => ""],
                        "unsearchable" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Contact prefers to not be searchable"],
                        "sensitive" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Contact posts sensitive content"],
                        "baseurl" => ["type" => "varchar(255)", "default" => "", "comment" => "baseurl of the contact"],
                        "gsid" => ["type" => "int unsigned", "foreign" => ["gserver" => "id", "on delete" => "restrict"], "comment" => "Global Server ID"],
+                       "bd" => ["type" => "date", "not null" => "1", "default" => DBA::NULL_DATE, "comment" => ""],
+                       // User depending fields
                        "reason" => ["type" => "text", "comment" => ""],
-                       "closeness" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "99", "comment" => "Deprecated"],
+                       "self" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "1 if the contact is the user him/her self"],
+                       "remote_self" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "rel" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "The kind of the relation between the user and the contact"],
+                       "protocol" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => "Protocol of the contact"],
+                       "subhub" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "hub-verify" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "rating" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => "Automatically detected feed poll frequency"],
+                       "priority" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => "Feed poll priority"],
+                       "attag" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""],
+                       "hidden" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "pending" => ["type" => "boolean", "not null" => "1", "default" => "1", "comment" => "Contact request is pending"],
+                       "deleted" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Contact has been deleted"],
                        "info" => ["type" => "mediumtext", "comment" => ""],
-                       "profile-id" => ["type" => "int unsigned", "comment" => "Deprecated"],
-                       "bdyear" => ["type" => "varchar(4)", "not null" => "1", "default" => "", "comment" => ""],
-                       "bd" => ["type" => "date", "not null" => "1", "default" => DBA::NULL_DATE, "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" => ""],
+                       // Deprecated, but still in use
+                       "photo" => ["type" => "varchar(255)", "default" => "", "comment" => "Link to the profile photo of the contact"],
+                       "thumb" => ["type" => "varchar(255)", "default" => "", "comment" => "Link to the profile photo (thumb size)"],
+                       "micro" => ["type" => "varchar(255)", "default" => "", "comment" => "Link to the profile photo (micro size)"],
+                       "name-date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "uri-date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "avatar-date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""],
+                       "request" => ["type" => "varchar(255)", "comment" => ""],
+                       "confirm" => ["type" => "varchar(255)", "comment" => ""],
+                       "poco" => ["type" => "varchar(255)", "comment" => ""],
+                       "writable" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""],
+                       "forum" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "contact is a forum. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = false instead"],
+                       "prv" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "contact is a private group. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = true instead"],
+                       "bdyear" => ["type" => "varchar(4)", "not null" => "1", "default" => "", "comment" => ""],
+                       // Deprecated fields that aren't in use anymore
+                       "site-pubkey" => ["type" => "text", "comment" => "Deprecated"],
+                       "gender" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => "Deprecated"],
+                       "duplex" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Deprecated"],
+                       "issued-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Deprecated"],
+                       "dfrn-id" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Deprecated"],
+                       "aes_allow" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Deprecated"],
+                       "ret-aes" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Deprecated"],
+                       "usehub" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "Deprecated"],
+                       "closeness" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "99", "comment" => "Deprecated"],
+                       "profile-id" => ["type" => "int unsigned", "comment" => "Deprecated"],
                ],
                "indexes" => [
                        "PRIMARY" => ["id"],
index 6e353718d002e04434ee1a68cd830a7bfe113663..5b3e8b5826b9e6aadfd5ec3077d6328f5f332068 100644 (file)
                        "network" => ["contact", "network"],
                        "protocol" => ["ucontact", "protocol"],
                        "location" => ["contact", "location"],
-                       "attag" => ["contact", "attag"],
+                       "attag" => ["ucontact", "attag"],
                        "pubkey" => ["contact", "pubkey"],
                        "prvkey" => ["contact", "prvkey"],
                        "subscribe" => ["contact", "subscribe"],
                        "sensitive" => ["contact", "sensitive"],
                        "baseurl" => ["contact", "baseurl"],
                        "gsid" => ["contact", "gsid"],
-                       "info" => ["contact", "info"],
+                       "info" => ["ucontact", "info"],
                        "bdyear" => ["contact", "bdyear"],
                        "bd" => ["contact", "bd"],
                        "poco" => ["contact", "poco"],