From 144547009b7a52a02a7b2881e164fd4cf7953fa2 Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 4 Sep 2022 07:54:01 +0000 Subject: [PATCH 1/2] All URL fields are now binary and longer --- database.sql | 184 ++++++------ doc/database/db_apcontact.md | 28 +- doc/database/db_application-marker.md | 2 +- doc/database/db_application.md | 26 +- doc/database/db_arrived-activity.md | 2 +- doc/database/db_contact.md | 38 +-- doc/database/db_conv.md | 2 +- doc/database/db_delayed-post.md | 2 +- doc/database/db_endpoint.md | 2 +- doc/database/db_event.md | 4 +- doc/database/db_fcontact.md | 18 +- doc/database/db_fetch-entry.md | 2 +- doc/database/db_fetched-activity.md | 2 +- doc/database/db_fsuggest.md | 6 +- doc/database/db_gserver.md | 8 +- doc/database/db_inbox-entry.md | 8 +- doc/database/db_inbox-status.md | 2 +- doc/database/db_intro.md | 2 +- doc/database/db_item-uri.md | 2 +- doc/database/db_mail.md | 14 +- doc/database/db_notify.md | 6 +- doc/database/db_oembed.md | 2 +- doc/database/db_post-content.md | 38 +-- doc/database/db_post-history.md | 40 +-- doc/database/db_post-media.md | 8 +- doc/database/db_profile.md | 4 +- doc/database/db_push_subscriber.md | 2 +- doc/database/db_register.md | 2 +- doc/database/db_tag.md | 2 +- doc/database/db_user-contact.md | 2 +- src/Model/ItemURI.php | 13 +- static/dbstructure.config.php | 182 ++++++------ view/lang/C/messages.po | 395 +++++++++++++------------- 33 files changed, 523 insertions(+), 527 deletions(-) diff --git a/database.sql b/database.sql index e363dd57dd..b76a4e0206 100644 --- a/database.sql +++ b/database.sql @@ -1,6 +1,6 @@ -- ------------------------------------------ --- Friendica 2022.09-dev (Giant Rhubarb) --- DB_UPDATE_VERSION 1481 +-- Friendica 2022.09-rc (Giant Rhubarb) +-- DB_UPDATE_VERSION 1482 -- ------------------------------------------ @@ -9,8 +9,8 @@ -- CREATE TABLE IF NOT EXISTS `gserver` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `url` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `nurl` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `version` varchar(255) NOT NULL DEFAULT '' COMMENT '', `site_name` varchar(255) NOT NULL DEFAULT '' COMMENT '', `info` text COMMENT '', @@ -22,8 +22,8 @@ CREATE TABLE IF NOT EXISTS `gserver` ( `local-posts` int unsigned COMMENT 'Number of local posts', `local-comments` int unsigned COMMENT 'Number of local comments', `directory-type` tinyint DEFAULT 0 COMMENT 'Type of directory service (Poco, Mastodon)', - `poco` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `noscrape` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `poco` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `noscrape` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `network` char(4) NOT NULL DEFAULT '' COMMENT '', `protocol` tinyint unsigned COMMENT 'The protocol of the server', `platform` varchar(255) NOT NULL DEFAULT '' COMMENT '', @@ -104,7 +104,7 @@ CREATE TABLE IF NOT EXISTS `user` ( -- CREATE TABLE IF NOT EXISTS `item-uri` ( `id` int unsigned NOT NULL auto_increment, - `uri` varbinary(255) NOT NULL COMMENT 'URI of an item', + `uri` varbinary(383) NOT NULL COMMENT 'URI of an item', `guid` varbinary(255) COMMENT 'A unique identifier for an item', PRIMARY KEY(`id`), UNIQUE INDEX `uri` (`uri`), @@ -127,19 +127,19 @@ CREATE TABLE IF NOT EXISTS `contact` ( `keywords` text COMMENT 'public keywords (interests) of the contact', `xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT 'XMPP address', `matrix` varchar(255) NOT NULL DEFAULT '' COMMENT 'Matrix address', - `avatar` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `header` varchar(255) COMMENT 'Header picture', - `url` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `nurl` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `avatar` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `header` varbinary(383) COMMENT 'Header picture', + `url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `nurl` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the contact url', `addr` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `alias` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `alias` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `pubkey` text COMMENT 'RSA public key 4096 bit', `prvkey` text COMMENT 'RSA private key 4096 bit', - `batch` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `notify` varchar(255) COMMENT '', - `poll` varchar(255) COMMENT '', - `subscribe` varchar(255) COMMENT '', + `batch` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `notify` varbinary(383) COMMENT '', + `poll` varbinary(383) COMMENT '', + `subscribe` varbinary(383) COMMENT '', `last-update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last try to update the contact info', `next-update` datetime COMMENT 'Next connection request', `success_update` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last successful contact update', @@ -157,7 +157,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( `archive` boolean 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', + `baseurl` varbinary(383) 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 '', @@ -166,7 +166,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( `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 '', + `hub-verify` varbinary(383) 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 '', @@ -177,15 +177,15 @@ CREATE TABLE IF NOT EXISTS `contact` ( `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)', + `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)', `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 '', + `request` varbinary(383) COMMENT '', + `confirm` varbinary(383) COMMENT '', + `poco` varbinary(383) 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', @@ -193,8 +193,8 @@ CREATE TABLE IF NOT EXISTS `contact` ( `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', + `issued-id` varbinary(383) NOT NULL DEFAULT '' COMMENT 'Deprecated', + `dfrn-id` varbinary(383) 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', @@ -235,7 +235,7 @@ CREATE TABLE IF NOT EXISTS `contact` ( CREATE TABLE IF NOT EXISTS `tag` ( `id` int unsigned NOT NULL auto_increment COMMENT '', `name` varchar(96) NOT NULL DEFAULT '' COMMENT '', - `url` varbinary(255) NOT NULL DEFAULT '' COMMENT '', + `url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `type` tinyint unsigned COMMENT 'Type of the tag (Unknown, General Collection, Follower Collection or Account)', PRIMARY KEY(`id`), UNIQUE INDEX `type_name_url` (`name`,`url`), @@ -329,17 +329,17 @@ CREATE TABLE IF NOT EXISTS `addon` ( -- TABLE apcontact -- CREATE TABLE IF NOT EXISTS `apcontact` ( - `url` varbinary(255) NOT NULL COMMENT 'URL of the contact', + `url` varbinary(383) NOT NULL COMMENT 'URL of the contact', `uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the apcontact url', - `uuid` varchar(255) COMMENT '', + `uuid` varbinary(255) COMMENT '', `type` varchar(20) NOT NULL COMMENT '', - `following` varchar(255) COMMENT '', - `followers` varchar(255) COMMENT '', - `inbox` varchar(255) NOT NULL COMMENT '', - `outbox` varchar(255) COMMENT '', - `sharedinbox` varchar(255) COMMENT '', - `featured` varchar(255) COMMENT 'Address for the collection of featured posts', - `featured-tags` varchar(255) COMMENT 'Address for the collection of featured tags', + `following` varbinary(383) COMMENT '', + `followers` varbinary(383) COMMENT '', + `inbox` varbinary(383) NOT NULL COMMENT '', + `outbox` varbinary(383) COMMENT '', + `sharedinbox` varbinary(383) COMMENT '', + `featured` varbinary(383) COMMENT 'Address for the collection of featured posts', + `featured-tags` varbinary(383) COMMENT 'Address for the collection of featured tags', `manually-approve` boolean COMMENT '', `discoverable` boolean COMMENT 'Mastodon extension: true if profile is published in their directory', `suspended` boolean COMMENT 'Mastodon extension: true if profile is suspended', @@ -348,13 +348,13 @@ CREATE TABLE IF NOT EXISTS `apcontact` ( `about` text COMMENT '', `xmpp` varchar(255) COMMENT 'XMPP address', `matrix` varchar(255) COMMENT 'Matrix address', - `photo` varchar(255) COMMENT '', - `header` varchar(255) COMMENT 'Header picture', + `photo` varbinary(383) COMMENT '', + `header` varbinary(383) COMMENT 'Header picture', `addr` varchar(255) COMMENT '', - `alias` varchar(255) COMMENT '', + `alias` varbinary(383) COMMENT '', `pubkey` text COMMENT '', - `subscribe` varchar(255) COMMENT '', - `baseurl` varchar(255) COMMENT 'baseurl of the ap contact', + `subscribe` varbinary(383) COMMENT '', + `baseurl` varbinary(383) COMMENT 'baseurl of the ap contact', `gsid` int unsigned COMMENT 'Global Server ID', `generator` varchar(255) COMMENT 'Name of the contact\'s system', `following_count` int unsigned DEFAULT 0 COMMENT 'Number of following contacts', @@ -381,8 +381,8 @@ CREATE TABLE IF NOT EXISTS `application` ( `client_id` varchar(64) NOT NULL COMMENT '', `client_secret` varchar(64) NOT NULL COMMENT '', `name` varchar(255) NOT NULL COMMENT '', - `redirect_uri` varchar(255) NOT NULL COMMENT '', - `website` varchar(255) COMMENT '', + `redirect_uri` varbinary(383) NOT NULL COMMENT '', + `website` varbinary(383) COMMENT '', `scopes` varchar(255) COMMENT '', `read` boolean COMMENT 'Read scope', `write` boolean COMMENT 'Write scope', @@ -399,7 +399,7 @@ CREATE TABLE IF NOT EXISTS `application-marker` ( `application-id` int unsigned NOT NULL COMMENT '', `uid` mediumint unsigned NOT NULL COMMENT 'Owner User id', `timeline` varchar(64) NOT NULL COMMENT 'Marker (home, notifications)', - `last_read_id` varchar(255) COMMENT 'Marker id for the timeline', + `last_read_id` varbinary(383) COMMENT 'Marker id for the timeline', `version` smallint unsigned COMMENT 'Version number', `updated_at` datetime COMMENT 'creation time', PRIMARY KEY(`application-id`,`uid`,`timeline`), @@ -496,7 +496,7 @@ CREATE TABLE IF NOT EXISTS `contact-relation` ( -- CREATE TABLE IF NOT EXISTS `conv` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this conversation', + `guid` varbinary(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this conversation', `recips` text COMMENT 'sender_handle;recipient_handle', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id', `creator` varchar(255) NOT NULL DEFAULT '' COMMENT 'handle of creator', @@ -538,7 +538,7 @@ CREATE TABLE IF NOT EXISTS `workerqueue` ( -- CREATE TABLE IF NOT EXISTS `delayed-post` ( `id` int unsigned NOT NULL auto_increment, - `uri` varchar(255) COMMENT 'URI of the post that will be distributed later', + `uri` varbinary(383) COMMENT 'URI of the post that will be distributed later', `uid` mediumint unsigned COMMENT 'Owner User id', `delayed` datetime COMMENT 'delay time', `wid` int unsigned COMMENT 'Workerqueue id', @@ -563,7 +563,7 @@ CREATE TABLE IF NOT EXISTS `diaspora-interaction` ( -- TABLE endpoint -- CREATE TABLE IF NOT EXISTS `endpoint` ( - `url` varbinary(255) NOT NULL COMMENT 'URL of the contact', + `url` varbinary(383) NOT NULL COMMENT 'URL of the contact', `type` varchar(20) NOT NULL COMMENT '', `owner-uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the apcontact url', PRIMARY KEY(`url`), @@ -576,10 +576,10 @@ CREATE TABLE IF NOT EXISTS `endpoint` ( -- CREATE TABLE IF NOT EXISTS `event` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `guid` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `guid` varbinary(255) NOT NULL DEFAULT '' COMMENT '', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id', `cid` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact_id (ID of the contact in contact table)', - `uri` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `uri` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the event uri', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'creation time', `edited` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'last edit time', @@ -609,21 +609,21 @@ CREATE TABLE IF NOT EXISTS `event` ( -- CREATE TABLE IF NOT EXISTS `fcontact` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'unique id', - `url` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `guid` varbinary(255) NOT NULL DEFAULT '' COMMENT 'unique id', + `url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `uri-id` int unsigned COMMENT 'Id of the item-uri table entry that contains the fcontact url', `name` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `photo` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `request` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `photo` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `request` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `nick` varchar(255) NOT NULL DEFAULT '' COMMENT '', `addr` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `batch` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `notify` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `poll` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `confirm` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `batch` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `notify` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `poll` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `confirm` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `priority` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '', `network` char(4) NOT NULL DEFAULT '' COMMENT '', - `alias` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `alias` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `pubkey` text COMMENT '', `updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `interacting_count` int unsigned DEFAULT 0 COMMENT 'Number of contacts this contact interactes with', @@ -641,7 +641,7 @@ CREATE TABLE IF NOT EXISTS `fcontact` ( -- CREATE TABLE IF NOT EXISTS `fetch-entry` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `url` varbinary(255) COMMENT 'url that awaiting to be fetched', + `url` varbinary(383) COMMENT 'url that awaiting to be fetched', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date of the fetch request', `wid` int unsigned COMMENT 'Workerqueue id', PRIMARY KEY(`id`), @@ -659,9 +659,9 @@ CREATE TABLE IF NOT EXISTS `fsuggest` ( `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id', `cid` int unsigned NOT NULL DEFAULT 0 COMMENT '', `name` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `url` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `request` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `photo` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `request` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `photo` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `note` text COMMENT '', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', PRIMARY KEY(`id`), @@ -732,10 +732,10 @@ CREATE TABLE IF NOT EXISTS `hook` ( -- CREATE TABLE IF NOT EXISTS `inbox-entry` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `activity-id` varbinary(255) COMMENT 'id of the incoming activity', - `object-id` varbinary(255) COMMENT '', - `in-reply-to-id` varbinary(255) COMMENT '', - `conversation` varbinary(255) COMMENT '', + `activity-id` varbinary(383) COMMENT 'id of the incoming activity', + `object-id` varbinary(383) COMMENT '', + `in-reply-to-id` varbinary(383) COMMENT '', + `conversation` varbinary(383) COMMENT '', `type` varchar(64) COMMENT 'Type of the activity', `object-type` varchar(64) COMMENT 'Type of the object activity', `object-object-type` varchar(64) COMMENT 'Type of the object\'s object activity', @@ -769,7 +769,7 @@ CREATE TABLE IF NOT EXISTS `inbox-entry-receiver` ( -- TABLE inbox-status -- CREATE TABLE IF NOT EXISTS `inbox-status` ( - `url` varbinary(255) NOT NULL COMMENT 'URL of the inbox', + `url` varbinary(383) NOT NULL COMMENT 'URL of the inbox', `uri-id` int unsigned COMMENT 'Item-uri id of inbox url', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Creation date of this entry', `success` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last successful delivery', @@ -794,7 +794,7 @@ CREATE TABLE IF NOT EXISTS `intro` ( `knowyou` boolean NOT NULL DEFAULT '0' COMMENT '', `duplex` boolean NOT NULL DEFAULT '0' COMMENT 'deprecated', `note` text COMMENT '', - `hash` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `hash` varbinary(255) NOT NULL DEFAULT '' COMMENT '', `datetime` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `blocked` boolean NOT NULL DEFAULT '0' COMMENT 'deprecated', `ignore` boolean NOT NULL DEFAULT '0' COMMENT '', @@ -826,11 +826,11 @@ CREATE TABLE IF NOT EXISTS `locks` ( CREATE TABLE IF NOT EXISTS `mail` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id', - `guid` varchar(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this private message', + `guid` varbinary(255) NOT NULL DEFAULT '' COMMENT 'A unique identifier for this private message', `from-name` varchar(255) NOT NULL DEFAULT '' COMMENT 'name of the sender', - `from-photo` varchar(255) NOT NULL DEFAULT '' COMMENT 'contact photo link of the sender', - `from-url` varchar(255) NOT NULL DEFAULT '' COMMENT 'profile linke of the sender', - `contact-id` varchar(255) COMMENT 'contact.id', + `from-photo` varbinary(383) NOT NULL DEFAULT '' COMMENT 'contact photo link of the sender', + `from-url` varbinary(383) NOT NULL DEFAULT '' COMMENT 'profile linke of the sender', + `contact-id` varbinary(255) COMMENT 'contact.id', `author-id` int unsigned COMMENT 'Link to the contact table with uid=0 of the author of the mail', `convid` int unsigned COMMENT 'conv.id', `title` varchar(255) NOT NULL DEFAULT '' COMMENT '', @@ -839,11 +839,11 @@ CREATE TABLE IF NOT EXISTS `mail` ( `reply` boolean NOT NULL DEFAULT '0' COMMENT '', `replied` boolean NOT NULL DEFAULT '0' COMMENT '', `unknown` boolean NOT NULL DEFAULT '0' COMMENT 'if sender not in the contact table this is 1', - `uri` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `uri` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `uri-id` int unsigned COMMENT 'Item-uri id of the related mail', - `parent-uri` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `parent-uri` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `parent-uri-id` int unsigned COMMENT 'Item-uri id of the parent of the related mail', - `thr-parent` varchar(255) COMMENT '', + `thr-parent` varbinary(383) COMMENT '', `thr-parent-id` int unsigned COMMENT 'Id of the item-uri table that contains the thread parent uri', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'creation time of the private message', PRIMARY KEY(`id`), @@ -935,12 +935,12 @@ CREATE TABLE IF NOT EXISTS `notify` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `type` smallint unsigned NOT NULL DEFAULT 0 COMMENT '', `name` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `url` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `photo` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `photo` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `date` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `msg` mediumtext COMMENT '', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id', - `link` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `link` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `iid` int unsigned COMMENT '', `parent` int unsigned COMMENT '', `uri-id` int unsigned COMMENT 'Item-uri id of the related post', @@ -984,7 +984,7 @@ CREATE TABLE IF NOT EXISTS `notify-threads` ( -- TABLE oembed -- CREATE TABLE IF NOT EXISTS `oembed` ( - `url` varbinary(255) NOT NULL COMMENT 'page url', + `url` varbinary(383) NOT NULL COMMENT 'page url', `maxwidth` mediumint unsigned NOT NULL COMMENT 'Maximum width passed to Oembed', `content` mediumtext COMMENT 'OEmbed data of the page', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'datetime of creation', @@ -1182,7 +1182,7 @@ CREATE TABLE IF NOT EXISTS `post-content` ( `target-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams target type if applicable (URI)', `target` text COMMENT 'JSON encoded target structure if used', `resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type', - `plink` varchar(255) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source', + `plink` varbinary(383) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source', PRIMARY KEY(`uri-id`), INDEX `plink` (`plink`(191)), INDEX `resource-id` (`resource-id`), @@ -1249,7 +1249,7 @@ CREATE TABLE IF NOT EXISTS `post-history` ( `target-type` varchar(100) NOT NULL DEFAULT '' COMMENT 'ActivityStreams target type if applicable (URI)', `target` text COMMENT 'JSON encoded target structure if used', `resource-id` varchar(32) NOT NULL DEFAULT '' COMMENT 'Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type', - `plink` varchar(255) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source', + `plink` varbinary(383) NOT NULL DEFAULT '' COMMENT 'permalink or URL to a displayable copy of the message at its source', PRIMARY KEY(`uri-id`,`edited`), FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Post history'; @@ -1284,12 +1284,12 @@ CREATE TABLE IF NOT EXISTS `post-media` ( `preview-width` smallint unsigned COMMENT 'Width of the preview picture', `description` text COMMENT '', `name` varchar(255) COMMENT 'Name of the media', - `author-url` varbinary(255) COMMENT 'URL of the author of the media', + `author-url` varbinary(383) COMMENT 'URL of the author of the media', `author-name` varchar(255) COMMENT 'Name of the author of the media', - `author-image` varbinary(255) COMMENT 'Image of the author of the media', - `publisher-url` varbinary(255) COMMENT 'URL of the publisher of the media', + `author-image` varbinary(383) COMMENT 'Image of the author of the media', + `publisher-url` varbinary(383) COMMENT 'URL of the publisher of the media', `publisher-name` varchar(255) COMMENT 'Name of the publisher of the media', - `publisher-image` varbinary(255) COMMENT 'Image of the publisher of the media', + `publisher-image` varbinary(383) COMMENT 'Image of the publisher of the media', PRIMARY KEY(`id`), UNIQUE INDEX `uri-id-url` (`uri-id`,`url`(512)), INDEX `uri-id-id` (`uri-id`,`id`), @@ -1558,8 +1558,8 @@ CREATE TABLE IF NOT EXISTS `profile` ( `homepage` varchar(255) NOT NULL DEFAULT '' COMMENT '', `xmpp` varchar(255) NOT NULL DEFAULT '' COMMENT 'XMPP address', `matrix` varchar(255) NOT NULL DEFAULT '' COMMENT 'Matrix address', - `photo` varchar(255) NOT NULL DEFAULT '' COMMENT '', - `thumb` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `photo` varbinary(383) NOT NULL DEFAULT '' COMMENT '', + `thumb` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `publish` boolean NOT NULL DEFAULT '0' COMMENT 'publish default profile in local directory', `net-publish` boolean NOT NULL DEFAULT '0' COMMENT 'publish profile in global directory', PRIMARY KEY(`id`), @@ -1594,7 +1594,7 @@ CREATE TABLE IF NOT EXISTS `profile_field` ( CREATE TABLE IF NOT EXISTS `push_subscriber` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id', - `callback_url` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `callback_url` varbinary(383) NOT NULL DEFAULT '' COMMENT '', `topic` varchar(255) NOT NULL DEFAULT '' COMMENT '', `nickname` varchar(255) NOT NULL DEFAULT '' COMMENT '', `push` tinyint NOT NULL DEFAULT 0 COMMENT 'Retrial counter', @@ -1613,7 +1613,7 @@ CREATE TABLE IF NOT EXISTS `push_subscriber` ( -- CREATE TABLE IF NOT EXISTS `register` ( `id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID', - `hash` varchar(255) NOT NULL DEFAULT '' COMMENT '', + `hash` varbinary(255) NOT NULL DEFAULT '' COMMENT '', `created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '', `uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'User id', `password` varchar(255) NOT NULL DEFAULT '' COMMENT '', @@ -1713,7 +1713,7 @@ CREATE TABLE IF NOT EXISTS `user-contact` ( `fetch_further_information` tinyint unsigned COMMENT '', `ffi_keyword_denylist` text COMMENT '', `subhub` boolean COMMENT '', - `hub-verify` varchar(255) COMMENT '', + `hub-verify` varbinary(383) COMMENT '', `protocol` char(4) COMMENT 'Protocol of the contact', `rating` tinyint COMMENT 'Automatically detected feed poll frequency', `priority` tinyint unsigned COMMENT 'Feed poll priority', @@ -1729,7 +1729,7 @@ CREATE TABLE IF NOT EXISTS `user-contact` ( -- TABLE arrived-activity -- CREATE TABLE IF NOT EXISTS `arrived-activity` ( - `object-id` varbinary(255) NOT NULL COMMENT 'object id of the incoming activity', + `object-id` varbinary(383) NOT NULL COMMENT 'object id of the incoming activity', `received` datetime COMMENT 'Receiving date', PRIMARY KEY(`object-id`) ) ENGINE=MEMORY DEFAULT COLLATE utf8mb4_general_ci COMMENT='Id of arrived activities'; @@ -1738,7 +1738,7 @@ CREATE TABLE IF NOT EXISTS `arrived-activity` ( -- TABLE fetched-activity -- CREATE TABLE IF NOT EXISTS `fetched-activity` ( - `object-id` varbinary(255) NOT NULL COMMENT 'object id of fetched activity', + `object-id` varbinary(383) NOT NULL COMMENT 'object id of fetched activity', `received` datetime COMMENT 'Receiving date', PRIMARY KEY(`object-id`) ) ENGINE=MEMORY DEFAULT COLLATE utf8mb4_general_ci COMMENT='Id of fetched activities'; diff --git a/doc/database/db_apcontact.md b/doc/database/db_apcontact.md index 578df57bfd..1632378ea8 100644 --- a/doc/database/db_apcontact.md +++ b/doc/database/db_apcontact.md @@ -8,17 +8,17 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | ---------------- | ------------------------------------------------------------------- | -------------- | ---- | --- | ------------------- | ----- | -| url | URL of the contact | varbinary(255) | NO | PRI | NULL | | +| url | URL of the contact | varbinary(383) | NO | PRI | NULL | | | uri-id | Id of the item-uri table entry that contains the apcontact url | int unsigned | YES | | NULL | | -| uuid | | varchar(255) | YES | | NULL | | +| uuid | | varbinary(255) | YES | | NULL | | | type | | varchar(20) | NO | | NULL | | -| following | | varchar(255) | YES | | NULL | | -| followers | | varchar(255) | YES | | NULL | | -| inbox | | varchar(255) | NO | | NULL | | -| outbox | | varchar(255) | YES | | NULL | | -| sharedinbox | | varchar(255) | YES | | NULL | | -| featured | Address for the collection of featured posts | varchar(255) | YES | | NULL | | -| featured-tags | Address for the collection of featured tags | varchar(255) | YES | | NULL | | +| following | | varbinary(383) | YES | | NULL | | +| followers | | varbinary(383) | YES | | NULL | | +| inbox | | varbinary(383) | NO | | NULL | | +| outbox | | varbinary(383) | YES | | NULL | | +| sharedinbox | | varbinary(383) | YES | | NULL | | +| featured | Address for the collection of featured posts | varbinary(383) | YES | | NULL | | +| featured-tags | Address for the collection of featured tags | varbinary(383) | YES | | NULL | | | manually-approve | | boolean | YES | | NULL | | | discoverable | Mastodon extension: true if profile is published in their directory | boolean | YES | | NULL | | | suspended | Mastodon extension: true if profile is suspended | boolean | YES | | NULL | | @@ -27,13 +27,13 @@ Fields | about | | text | YES | | NULL | | | xmpp | XMPP address | varchar(255) | YES | | NULL | | | matrix | Matrix address | varchar(255) | YES | | NULL | | -| photo | | varchar(255) | YES | | NULL | | -| header | Header picture | varchar(255) | YES | | NULL | | +| photo | | varbinary(383) | YES | | NULL | | +| header | Header picture | varbinary(383) | YES | | NULL | | | addr | | varchar(255) | YES | | NULL | | -| alias | | varchar(255) | YES | | NULL | | +| alias | | varbinary(383) | YES | | NULL | | | pubkey | | text | YES | | NULL | | -| subscribe | | varchar(255) | YES | | NULL | | -| baseurl | baseurl of the ap contact | varchar(255) | YES | | NULL | | +| subscribe | | varbinary(383) | YES | | NULL | | +| baseurl | baseurl of the ap contact | varbinary(383) | YES | | NULL | | | gsid | Global Server ID | int unsigned | YES | | NULL | | | generator | Name of the contact's system | varchar(255) | YES | | NULL | | | following_count | Number of following contacts | int unsigned | YES | | 0 | | diff --git a/doc/database/db_application-marker.md b/doc/database/db_application-marker.md index fa83bf58c6..313ddd05ba 100644 --- a/doc/database/db_application-marker.md +++ b/doc/database/db_application-marker.md @@ -11,7 +11,7 @@ Fields | application-id | | int unsigned | NO | PRI | NULL | | | uid | Owner User id | mediumint unsigned | NO | PRI | NULL | | | timeline | Marker (home, notifications) | varchar(64) | NO | PRI | NULL | | -| last_read_id | Marker id for the timeline | varchar(255) | YES | | NULL | | +| last_read_id | Marker id for the timeline | varbinary(383) | YES | | NULL | | | version | Version number | smallint unsigned | YES | | NULL | | | updated_at | creation time | datetime | YES | | NULL | | diff --git a/doc/database/db_application.md b/doc/database/db_application.md index 0a91e703ad..d5d59b5ba6 100644 --- a/doc/database/db_application.md +++ b/doc/database/db_application.md @@ -6,19 +6,19 @@ OAuth application Fields ------ -| Field | Description | Type | Null | Key | Default | Extra | -| ------------- | --------------- | ------------ | ---- | --- | ------- | -------------- | -| id | generated index | int unsigned | NO | PRI | NULL | auto_increment | -| client_id | | varchar(64) | NO | | NULL | | -| client_secret | | varchar(64) | NO | | NULL | | -| name | | varchar(255) | NO | | NULL | | -| redirect_uri | | varchar(255) | NO | | NULL | | -| website | | varchar(255) | YES | | NULL | | -| scopes | | varchar(255) | YES | | NULL | | -| read | Read scope | boolean | YES | | NULL | | -| write | Write scope | boolean | YES | | NULL | | -| follow | Follow scope | boolean | YES | | NULL | | -| push | Push scope | boolean | YES | | NULL | | +| Field | Description | Type | Null | Key | Default | Extra | +| ------------- | --------------- | -------------- | ---- | --- | ------- | -------------- | +| id | generated index | int unsigned | NO | PRI | NULL | auto_increment | +| client_id | | varchar(64) | NO | | NULL | | +| client_secret | | varchar(64) | NO | | NULL | | +| name | | varchar(255) | NO | | NULL | | +| redirect_uri | | varbinary(383) | NO | | NULL | | +| website | | varbinary(383) | YES | | NULL | | +| scopes | | varchar(255) | YES | | NULL | | +| read | Read scope | boolean | YES | | NULL | | +| write | Write scope | boolean | YES | | NULL | | +| follow | Follow scope | boolean | YES | | NULL | | +| push | Push scope | boolean | YES | | NULL | | Indexes ------------ diff --git a/doc/database/db_arrived-activity.md b/doc/database/db_arrived-activity.md index 1587c6e312..d657a3eed6 100644 --- a/doc/database/db_arrived-activity.md +++ b/doc/database/db_arrived-activity.md @@ -8,7 +8,7 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | --------- | ---------------------------------- | -------------- | ---- | --- | ------- | ----- | -| object-id | object id of the incoming activity | varbinary(255) | NO | PRI | NULL | | +| object-id | object id of the incoming activity | varbinary(383) | NO | PRI | NULL | | | received | Receiving date | datetime | YES | | NULL | | Indexes diff --git a/doc/database/db_contact.md b/doc/database/db_contact.md index ad3991f307..6f5a395366 100644 --- a/doc/database/db_contact.md +++ b/doc/database/db_contact.md @@ -20,19 +20,19 @@ Fields | 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 | | | | +| avatar | | varbinary(383) | NO | | | | +| header | Header picture | varbinary(383) | YES | | NULL | | +| url | | varbinary(383) | NO | | | | +| nurl | | varbinary(383) | 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 | | | | +| alias | | varbinary(383) | 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 | | +| batch | | varbinary(383) | NO | | | | +| notify | | varbinary(383) | YES | | NULL | | +| poll | | varbinary(383) | YES | | NULL | | +| subscribe | | varbinary(383) | YES | | NULL | | | last-update | Date of the last try to update the contact info | datetime | NO | | 0001-01-01 00:00:00 | | | next-update | Next connection request | datetime | YES | | NULL | | | success_update | Date of the last successful contact update | datetime | NO | | 0001-01-01 00:00:00 | | @@ -50,7 +50,7 @@ Fields | 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 | | | | +| baseurl | baseurl of the contact | varbinary(383) | YES | | | | | gsid | Global Server ID | int unsigned | YES | | NULL | | | bd | | date | NO | | 0001-01-01 | | | reason | | text | YES | | NULL | | @@ -59,7 +59,7 @@ Fields | 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 | | | | +| hub-verify | | varbinary(383) | NO | | | | | rating | Automatically detected feed poll frequency | tinyint | NO | | 0 | | | priority | Feed poll priority | tinyint unsigned | NO | | 0 | | | attag | | varchar(255) | NO | | | | @@ -70,15 +70,15 @@ Fields | 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 | | | | +| 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 | | | | | 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 | | +| request | | varbinary(383) | YES | | NULL | | +| confirm | | varbinary(383) | YES | | NULL | | +| poco | | varbinary(383) | 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 | | @@ -86,8 +86,8 @@ Fields | 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 | | | | +| issued-id | Deprecated | varbinary(383) | NO | | | | +| dfrn-id | Deprecated | varbinary(383) | NO | | | | | aes_allow | Deprecated | boolean | NO | | 0 | | | ret-aes | Deprecated | boolean | NO | | 0 | | | usehub | Deprecated | boolean | NO | | 0 | | diff --git a/doc/database/db_conv.md b/doc/database/db_conv.md index c1d50b5de5..69815fae7d 100644 --- a/doc/database/db_conv.md +++ b/doc/database/db_conv.md @@ -9,7 +9,7 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | ------- | ----------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- | | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | -| guid | A unique identifier for this conversation | varchar(255) | NO | | | | +| guid | A unique identifier for this conversation | varbinary(255) | NO | | | | | recips | sender_handle;recipient_handle | text | YES | | NULL | | | uid | Owner User id | mediumint unsigned | NO | | 0 | | | creator | handle of creator | varchar(255) | NO | | | | diff --git a/doc/database/db_delayed-post.md b/doc/database/db_delayed-post.md index b792f2f005..8ab3ff08e4 100644 --- a/doc/database/db_delayed-post.md +++ b/doc/database/db_delayed-post.md @@ -9,7 +9,7 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | ------- | ---------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- | | id | | int unsigned | NO | PRI | NULL | auto_increment | -| uri | URI of the post that will be distributed later | varchar(255) | YES | | NULL | | +| uri | URI of the post that will be distributed later | varbinary(383) | YES | | NULL | | | uid | Owner User id | mediumint unsigned | YES | | NULL | | | delayed | delay time | datetime | YES | | NULL | | | wid | Workerqueue id | int unsigned | YES | | NULL | | diff --git a/doc/database/db_endpoint.md b/doc/database/db_endpoint.md index f025d33717..890a9f1bb9 100644 --- a/doc/database/db_endpoint.md +++ b/doc/database/db_endpoint.md @@ -8,7 +8,7 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | ------------ | -------------------------------------------------------------- | -------------- | ---- | --- | ------- | ----- | -| url | URL of the contact | varbinary(255) | NO | PRI | NULL | | +| url | URL of the contact | varbinary(383) | NO | PRI | NULL | | | type | | varchar(20) | NO | | NULL | | | owner-uri-id | Id of the item-uri table entry that contains the apcontact url | int unsigned | YES | | NULL | | diff --git a/doc/database/db_event.md b/doc/database/db_event.md index ff89b6ba2a..499e550c44 100644 --- a/doc/database/db_event.md +++ b/doc/database/db_event.md @@ -9,10 +9,10 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | --------- | ---------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- | | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | -| guid | | varchar(255) | NO | | | | +| guid | | varbinary(255) | NO | | | | | uid | Owner User id | mediumint unsigned | NO | | 0 | | | cid | contact_id (ID of the contact in contact table) | int unsigned | NO | | 0 | | -| uri | | varchar(255) | NO | | | | +| uri | | varbinary(383) | NO | | | | | uri-id | Id of the item-uri table entry that contains the event uri | int unsigned | YES | | NULL | | | created | creation time | datetime | NO | | 0001-01-01 00:00:00 | | | edited | last edit time | datetime | NO | | 0001-01-01 00:00:00 | | diff --git a/doc/database/db_fcontact.md b/doc/database/db_fcontact.md index 77f8e0b85b..d082b17174 100644 --- a/doc/database/db_fcontact.md +++ b/doc/database/db_fcontact.md @@ -9,21 +9,21 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | ----------------- | ------------------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- | | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | -| guid | unique id | varchar(255) | NO | | | | -| url | | varchar(255) | NO | | | | +| guid | unique id | varbinary(255) | NO | | | | +| url | | varbinary(383) | NO | | | | | uri-id | Id of the item-uri table entry that contains the fcontact url | int unsigned | YES | | NULL | | | name | | varchar(255) | NO | | | | -| photo | | varchar(255) | NO | | | | -| request | | varchar(255) | NO | | | | +| photo | | varbinary(383) | NO | | | | +| request | | varbinary(383) | NO | | | | | nick | | varchar(255) | NO | | | | | addr | | varchar(255) | NO | | | | -| batch | | varchar(255) | NO | | | | -| notify | | varchar(255) | NO | | | | -| poll | | varchar(255) | NO | | | | -| confirm | | varchar(255) | NO | | | | +| batch | | varbinary(383) | NO | | | | +| notify | | varbinary(383) | NO | | | | +| poll | | varbinary(383) | NO | | | | +| confirm | | varbinary(383) | NO | | | | | priority | | tinyint unsigned | NO | | 0 | | | network | | char(4) | NO | | | | -| alias | | varchar(255) | NO | | | | +| alias | | varbinary(383) | NO | | | | | pubkey | | text | YES | | NULL | | | updated | | datetime | NO | | 0001-01-01 00:00:00 | | | interacting_count | Number of contacts this contact interactes with | int unsigned | YES | | 0 | | diff --git a/doc/database/db_fetch-entry.md b/doc/database/db_fetch-entry.md index 4b3cba1042..e7485f212a 100644 --- a/doc/database/db_fetch-entry.md +++ b/doc/database/db_fetch-entry.md @@ -9,7 +9,7 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | ------- | ---------------------------------- | -------------- | ---- | --- | ------------------- | -------------- | | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | -| url | url that awaiting to be fetched | varbinary(255) | YES | | NULL | | +| url | url that awaiting to be fetched | varbinary(383) | YES | | NULL | | | created | Creation date of the fetch request | datetime | NO | | 0001-01-01 00:00:00 | | | wid | Workerqueue id | int unsigned | YES | | NULL | | diff --git a/doc/database/db_fetched-activity.md b/doc/database/db_fetched-activity.md index 0a3ae7f89a..076d8c2e87 100644 --- a/doc/database/db_fetched-activity.md +++ b/doc/database/db_fetched-activity.md @@ -8,7 +8,7 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | --------- | ----------------------------- | -------------- | ---- | --- | ------- | ----- | -| object-id | object id of fetched activity | varbinary(255) | NO | PRI | NULL | | +| object-id | object id of fetched activity | varbinary(383) | NO | PRI | NULL | | | received | Receiving date | datetime | YES | | NULL | | Indexes diff --git a/doc/database/db_fsuggest.md b/doc/database/db_fsuggest.md index 6ccf732971..b602567cee 100644 --- a/doc/database/db_fsuggest.md +++ b/doc/database/db_fsuggest.md @@ -12,9 +12,9 @@ Fields | uid | User id | mediumint unsigned | NO | | 0 | | | cid | | int unsigned | NO | | 0 | | | name | | varchar(255) | NO | | | | -| url | | varchar(255) | NO | | | | -| request | | varchar(255) | NO | | | | -| photo | | varchar(255) | NO | | | | +| url | | varbinary(383) | NO | | | | +| request | | varbinary(383) | NO | | | | +| photo | | varbinary(383) | NO | | | | | note | | text | YES | | NULL | | | created | | datetime | NO | | 0001-01-01 00:00:00 | | diff --git a/doc/database/db_gserver.md b/doc/database/db_gserver.md index d75c7335b3..b75ac0f3bf 100644 --- a/doc/database/db_gserver.md +++ b/doc/database/db_gserver.md @@ -9,8 +9,8 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | --------------------- | -------------------------------------------------- | ---------------- | ---- | --- | ------------------- | -------------- | | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | -| url | | varchar(255) | NO | | | | -| nurl | | varchar(255) | NO | | | | +| url | | varbinary(383) | NO | | | | +| nurl | | varbinary(383) | NO | | | | | version | | varchar(255) | NO | | | | | site_name | | varchar(255) | NO | | | | | info | | text | YES | | NULL | | @@ -22,8 +22,8 @@ Fields | local-posts | Number of local posts | int unsigned | YES | | NULL | | | local-comments | Number of local comments | int unsigned | YES | | NULL | | | directory-type | Type of directory service (Poco, Mastodon) | tinyint | YES | | 0 | | -| poco | | varchar(255) | NO | | | | -| noscrape | | varchar(255) | NO | | | | +| poco | | varbinary(383) | NO | | | | +| noscrape | | varbinary(383) | NO | | | | | network | | char(4) | NO | | | | | protocol | The protocol of the server | tinyint unsigned | YES | | NULL | | | platform | | varchar(255) | NO | | | | diff --git a/doc/database/db_inbox-entry.md b/doc/database/db_inbox-entry.md index d10d3f242b..834d4bfd64 100644 --- a/doc/database/db_inbox-entry.md +++ b/doc/database/db_inbox-entry.md @@ -9,10 +9,10 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | ------------------ | -------------------------------------- | -------------- | ---- | --- | ------- | -------------- | | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | -| activity-id | id of the incoming activity | varbinary(255) | YES | | NULL | | -| object-id | | varbinary(255) | YES | | NULL | | -| in-reply-to-id | | varbinary(255) | YES | | NULL | | -| conversation | | varbinary(255) | YES | | NULL | | +| activity-id | id of the incoming activity | varbinary(383) | YES | | NULL | | +| object-id | | varbinary(383) | YES | | NULL | | +| in-reply-to-id | | varbinary(383) | YES | | NULL | | +| conversation | | varbinary(383) | YES | | NULL | | | type | Type of the activity | varchar(64) | YES | | NULL | | | object-type | Type of the object activity | varchar(64) | YES | | NULL | | | object-object-type | Type of the object's object activity | varchar(64) | YES | | NULL | | diff --git a/doc/database/db_inbox-status.md b/doc/database/db_inbox-status.md index 79df149a59..abcb33da4d 100644 --- a/doc/database/db_inbox-status.md +++ b/doc/database/db_inbox-status.md @@ -8,7 +8,7 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | -------- | ------------------------------------ | -------------- | ---- | --- | ------------------- | ----- | -| url | URL of the inbox | varbinary(255) | NO | PRI | NULL | | +| url | URL of the inbox | varbinary(383) | NO | PRI | NULL | | | uri-id | Item-uri id of inbox url | int unsigned | YES | | NULL | | | created | Creation date of this entry | datetime | NO | | 0001-01-01 00:00:00 | | | success | Date of the last successful delivery | datetime | NO | | 0001-01-01 00:00:00 | | diff --git a/doc/database/db_intro.md b/doc/database/db_intro.md index 3db6240d03..da6dc849ea 100644 --- a/doc/database/db_intro.md +++ b/doc/database/db_intro.md @@ -16,7 +16,7 @@ Fields | knowyou | | boolean | NO | | 0 | | | duplex | deprecated | boolean | NO | | 0 | | | note | | text | YES | | NULL | | -| hash | | varchar(255) | NO | | | | +| hash | | varbinary(255) | NO | | | | | datetime | | datetime | NO | | 0001-01-01 00:00:00 | | | blocked | deprecated | boolean | NO | | 0 | | | ignore | | boolean | NO | | 0 | | diff --git a/doc/database/db_item-uri.md b/doc/database/db_item-uri.md index c6d1c4c376..a6b006ec79 100644 --- a/doc/database/db_item-uri.md +++ b/doc/database/db_item-uri.md @@ -9,7 +9,7 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | ----- | ------------------------------- | -------------- | ---- | --- | ------- | -------------- | | id | | int unsigned | NO | PRI | NULL | auto_increment | -| uri | URI of an item | varbinary(255) | NO | | NULL | | +| uri | URI of an item | varbinary(383) | NO | | NULL | | | guid | A unique identifier for an item | varbinary(255) | YES | | NULL | | Indexes diff --git a/doc/database/db_mail.md b/doc/database/db_mail.md index 460c03bf6a..2b588b4d74 100644 --- a/doc/database/db_mail.md +++ b/doc/database/db_mail.md @@ -10,11 +10,11 @@ Fields | ------------- | -------------------------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- | | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | | uid | Owner User id | mediumint unsigned | NO | | 0 | | -| guid | A unique identifier for this private message | varchar(255) | NO | | | | +| guid | A unique identifier for this private message | varbinary(255) | NO | | | | | from-name | name of the sender | varchar(255) | NO | | | | -| from-photo | contact photo link of the sender | varchar(255) | NO | | | | -| from-url | profile linke of the sender | varchar(255) | NO | | | | -| contact-id | contact.id | varchar(255) | YES | | NULL | | +| from-photo | contact photo link of the sender | varbinary(383) | NO | | | | +| from-url | profile linke of the sender | varbinary(383) | NO | | | | +| contact-id | contact.id | varbinary(255) | YES | | NULL | | | author-id | Link to the contact table with uid=0 of the author of the mail | int unsigned | YES | | NULL | | | convid | conv.id | int unsigned | YES | | NULL | | | title | | varchar(255) | NO | | | | @@ -23,11 +23,11 @@ Fields | reply | | boolean | NO | | 0 | | | replied | | boolean | NO | | 0 | | | unknown | if sender not in the contact table this is 1 | boolean | NO | | 0 | | -| uri | | varchar(255) | NO | | | | +| uri | | varbinary(383) | NO | | | | | uri-id | Item-uri id of the related mail | int unsigned | YES | | NULL | | -| parent-uri | | varchar(255) | NO | | | | +| parent-uri | | varbinary(383) | NO | | | | | parent-uri-id | Item-uri id of the parent of the related mail | int unsigned | YES | | NULL | | -| thr-parent | | varchar(255) | YES | | NULL | | +| thr-parent | | varbinary(383) | YES | | NULL | | | thr-parent-id | Id of the item-uri table that contains the thread parent uri | int unsigned | YES | | NULL | | | created | creation time of the private message | datetime | NO | | 0001-01-01 00:00:00 | | diff --git a/doc/database/db_notify.md b/doc/database/db_notify.md index 88d814c040..bad3fe1d39 100644 --- a/doc/database/db_notify.md +++ b/doc/database/db_notify.md @@ -11,12 +11,12 @@ Fields | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | | type | | smallint unsigned | NO | | 0 | | | name | | varchar(255) | NO | | | | -| url | | varchar(255) | NO | | | | -| photo | | varchar(255) | NO | | | | +| url | | varbinary(383) | NO | | | | +| photo | | varbinary(383) | NO | | | | | date | | datetime | NO | | 0001-01-01 00:00:00 | | | msg | | mediumtext | YES | | NULL | | | uid | Owner User id | mediumint unsigned | NO | | 0 | | -| link | | varchar(255) | NO | | | | +| link | | varbinary(383) | NO | | | | | iid | | int unsigned | YES | | NULL | | | parent | | int unsigned | YES | | NULL | | | uri-id | Item-uri id of the related post | int unsigned | YES | | NULL | | diff --git a/doc/database/db_oembed.md b/doc/database/db_oembed.md index 8304a32f4b..bdcbbcc2bf 100644 --- a/doc/database/db_oembed.md +++ b/doc/database/db_oembed.md @@ -8,7 +8,7 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | -------- | ------------------------------ | ------------------ | ---- | --- | ------------------- | ----- | -| url | page url | varbinary(255) | NO | PRI | NULL | | +| url | page url | varbinary(383) | NO | PRI | NULL | | | maxwidth | Maximum width passed to Oembed | mediumint unsigned | NO | PRI | NULL | | | content | OEmbed data of the page | mediumtext | YES | | NULL | | | created | datetime of creation | datetime | NO | | 0001-01-01 00:00:00 | | diff --git a/doc/database/db_post-content.md b/doc/database/db_post-content.md index 0addf43a31..86714c5ec9 100644 --- a/doc/database/db_post-content.md +++ b/doc/database/db_post-content.md @@ -6,25 +6,25 @@ Content for all posts Fields ------ -| Field | Description | Type | Null | Key | Default | Extra | -| --------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- | -| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | | -| title | item title | varchar(255) | NO | | | | -| content-warning | | varchar(255) | NO | | | | -| body | item body content | mediumtext | YES | | NULL | | -| raw-body | Body without embedded media links | mediumtext | YES | | NULL | | -| location | text location where this item originated | varchar(255) | NO | | | | -| coord | longitude/latitude pair representing location where this item originated | varchar(255) | NO | | | | -| language | Language information about this post | text | YES | | NULL | | -| app | application which generated this item | varchar(255) | NO | | | | -| rendered-hash | | varchar(32) | NO | | | | -| rendered-html | item.body converted to html | mediumtext | YES | | NULL | | -| object-type | ActivityStreams object type | varchar(100) | NO | | | | -| object | JSON encoded object structure unless it is an implied object (normal post) | text | YES | | NULL | | -| target-type | ActivityStreams target type if applicable (URI) | varchar(100) | NO | | | | -| target | JSON encoded target structure if used | text | YES | | NULL | | -| resource-id | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32) | NO | | | | -| plink | permalink or URL to a displayable copy of the message at its source | varchar(255) | NO | | | | +| Field | Description | Type | Null | Key | Default | Extra | +| --------------- | ------------------------------------------------------------------------------------------------------------------------- | -------------- | ---- | --- | ------- | ----- | +| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | | +| title | item title | varchar(255) | NO | | | | +| content-warning | | varchar(255) | NO | | | | +| body | item body content | mediumtext | YES | | NULL | | +| raw-body | Body without embedded media links | mediumtext | YES | | NULL | | +| location | text location where this item originated | varchar(255) | NO | | | | +| coord | longitude/latitude pair representing location where this item originated | varchar(255) | NO | | | | +| language | Language information about this post | text | YES | | NULL | | +| app | application which generated this item | varchar(255) | NO | | | | +| rendered-hash | | varchar(32) | NO | | | | +| rendered-html | item.body converted to html | mediumtext | YES | | NULL | | +| object-type | ActivityStreams object type | varchar(100) | NO | | | | +| object | JSON encoded object structure unless it is an implied object (normal post) | text | YES | | NULL | | +| target-type | ActivityStreams target type if applicable (URI) | varchar(100) | NO | | | | +| target | JSON encoded target structure if used | text | YES | | NULL | | +| resource-id | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32) | NO | | | | +| plink | permalink or URL to a displayable copy of the message at its source | varbinary(383) | NO | | | | Indexes ------------ diff --git a/doc/database/db_post-history.md b/doc/database/db_post-history.md index 007dcb7f91..d3e967411e 100644 --- a/doc/database/db_post-history.md +++ b/doc/database/db_post-history.md @@ -6,26 +6,26 @@ Post history Fields ------ -| Field | Description | Type | Null | Key | Default | Extra | -| --------------- | ------------------------------------------------------------------------------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- | -| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | | -| edited | Date of edit | datetime | NO | PRI | 0001-01-01 00:00:00 | | -| title | item title | varchar(255) | NO | | | | -| content-warning | | varchar(255) | NO | | | | -| body | item body content | mediumtext | YES | | NULL | | -| raw-body | Body without embedded media links | mediumtext | YES | | NULL | | -| location | text location where this item originated | varchar(255) | NO | | | | -| coord | longitude/latitude pair representing location where this item originated | varchar(255) | NO | | | | -| language | Language information about this post | text | YES | | NULL | | -| app | application which generated this item | varchar(255) | NO | | | | -| rendered-hash | | varchar(32) | NO | | | | -| rendered-html | item.body converted to html | mediumtext | YES | | NULL | | -| object-type | ActivityStreams object type | varchar(100) | NO | | | | -| object | JSON encoded object structure unless it is an implied object (normal post) | text | YES | | NULL | | -| target-type | ActivityStreams target type if applicable (URI) | varchar(100) | NO | | | | -| target | JSON encoded target structure if used | text | YES | | NULL | | -| resource-id | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32) | NO | | | | -| plink | permalink or URL to a displayable copy of the message at its source | varchar(255) | NO | | | | +| Field | Description | Type | Null | Key | Default | Extra | +| --------------- | ------------------------------------------------------------------------------------------------------------------------- | -------------- | ---- | --- | ------------------- | ----- | +| uri-id | Id of the item-uri table entry that contains the item uri | int unsigned | NO | PRI | NULL | | +| edited | Date of edit | datetime | NO | PRI | 0001-01-01 00:00:00 | | +| title | item title | varchar(255) | NO | | | | +| content-warning | | varchar(255) | NO | | | | +| body | item body content | mediumtext | YES | | NULL | | +| raw-body | Body without embedded media links | mediumtext | YES | | NULL | | +| location | text location where this item originated | varchar(255) | NO | | | | +| coord | longitude/latitude pair representing location where this item originated | varchar(255) | NO | | | | +| language | Language information about this post | text | YES | | NULL | | +| app | application which generated this item | varchar(255) | NO | | | | +| rendered-hash | | varchar(32) | NO | | | | +| rendered-html | item.body converted to html | mediumtext | YES | | NULL | | +| object-type | ActivityStreams object type | varchar(100) | NO | | | | +| object | JSON encoded object structure unless it is an implied object (normal post) | text | YES | | NULL | | +| target-type | ActivityStreams target type if applicable (URI) | varchar(100) | NO | | | | +| target | JSON encoded target structure if used | text | YES | | NULL | | +| resource-id | Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type | varchar(32) | NO | | | | +| plink | permalink or URL to a displayable copy of the message at its source | varbinary(383) | NO | | | | Indexes ------------ diff --git a/doc/database/db_post-media.md b/doc/database/db_post-media.md index 61a74b6987..59c87cd369 100644 --- a/doc/database/db_post-media.md +++ b/doc/database/db_post-media.md @@ -21,12 +21,12 @@ Fields | preview-width | Width of the preview picture | smallint unsigned | YES | | NULL | | | description | | text | YES | | NULL | | | name | Name of the media | varchar(255) | YES | | NULL | | -| author-url | URL of the author of the media | varbinary(255) | YES | | NULL | | +| author-url | URL of the author of the media | varbinary(383) | YES | | NULL | | | author-name | Name of the author of the media | varchar(255) | YES | | NULL | | -| author-image | Image of the author of the media | varbinary(255) | YES | | NULL | | -| publisher-url | URL of the publisher of the media | varbinary(255) | YES | | NULL | | +| author-image | Image of the author of the media | varbinary(383) | YES | | NULL | | +| publisher-url | URL of the publisher of the media | varbinary(383) | YES | | NULL | | | publisher-name | Name of the publisher of the media | varchar(255) | YES | | NULL | | -| publisher-image | Image of the publisher of the media | varbinary(255) | YES | | NULL | | +| publisher-image | Image of the publisher of the media | varbinary(383) | YES | | NULL | | Indexes ------------ diff --git a/doc/database/db_profile.md b/doc/database/db_profile.md index a8c7f2a210..c180332c5b 100644 --- a/doc/database/db_profile.md +++ b/doc/database/db_profile.md @@ -47,8 +47,8 @@ Fields | homepage | | varchar(255) | NO | | | | | xmpp | XMPP address | varchar(255) | NO | | | | | matrix | Matrix address | varchar(255) | NO | | | | -| photo | | varchar(255) | NO | | | | -| thumb | | varchar(255) | NO | | | | +| photo | | varbinary(383) | NO | | | | +| thumb | | varbinary(383) | NO | | | | | publish | publish default profile in local directory | boolean | NO | | 0 | | | net-publish | publish profile in global directory | boolean | NO | | 0 | | diff --git a/doc/database/db_push_subscriber.md b/doc/database/db_push_subscriber.md index 4ba50a4d1d..fbb2ebba47 100644 --- a/doc/database/db_push_subscriber.md +++ b/doc/database/db_push_subscriber.md @@ -10,7 +10,7 @@ Fields | ------------ | --------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- | | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | | uid | User id | mediumint unsigned | NO | | 0 | | -| callback_url | | varchar(255) | NO | | | | +| callback_url | | varbinary(383) | NO | | | | | topic | | varchar(255) | NO | | | | | nickname | | varchar(255) | NO | | | | | push | Retrial counter | tinyint | NO | | 0 | | diff --git a/doc/database/db_register.md b/doc/database/db_register.md index 8ace3c199b..15d7c03dc3 100644 --- a/doc/database/db_register.md +++ b/doc/database/db_register.md @@ -9,7 +9,7 @@ Fields | Field | Description | Type | Null | Key | Default | Extra | | -------- | ------------- | ------------------ | ---- | --- | ------------------- | -------------- | | id | sequential ID | int unsigned | NO | PRI | NULL | auto_increment | -| hash | | varchar(255) | NO | | | | +| hash | | varbinary(255) | NO | | | | | created | | datetime | NO | | 0001-01-01 00:00:00 | | | uid | User id | mediumint unsigned | NO | | 0 | | | password | | varchar(255) | NO | | | | diff --git a/doc/database/db_tag.md b/doc/database/db_tag.md index 5716398012..5b50cdf902 100644 --- a/doc/database/db_tag.md +++ b/doc/database/db_tag.md @@ -10,7 +10,7 @@ Fields | ----- | ----------------------------------------------------------------------------- | ---------------- | ---- | --- | ------- | -------------- | | id | | int unsigned | NO | PRI | NULL | auto_increment | | name | | varchar(96) | NO | | | | -| url | | varbinary(255) | NO | | | | +| url | | varbinary(383) | NO | | | | | type | Type of the tag (Unknown, General Collection, Follower Collection or Account) | tinyint unsigned | YES | | NULL | | Indexes diff --git a/doc/database/db_user-contact.md b/doc/database/db_user-contact.md index 30c80c5261..71fdc14e40 100644 --- a/doc/database/db_user-contact.md +++ b/doc/database/db_user-contact.md @@ -24,7 +24,7 @@ Fields | fetch_further_information | | tinyint unsigned | YES | | NULL | | | ffi_keyword_denylist | | text | YES | | NULL | | | subhub | | boolean | YES | | NULL | | -| hub-verify | | varchar(255) | 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 | | | priority | Feed poll priority | tinyint unsigned | YES | | NULL | | diff --git a/src/Model/ItemURI.php b/src/Model/ItemURI.php index 86d23ed541..75d9cdc700 100644 --- a/src/Model/ItemURI.php +++ b/src/Model/ItemURI.php @@ -35,14 +35,11 @@ class ItemURI */ public static function insert(array $fields) { - // If the URI gets too long we only take the first parts and hope for best - $uri = substr($fields['uri'], 0, 255); - - if (!DBA::exists('item-uri', ['uri' => $uri])) { + if (!DBA::exists('item-uri', ['uri' => $fields['uri']])) { DBA::insert('item-uri', $fields, Database::INSERT_UPDATE); } - $itemuri = DBA::selectFirst('item-uri', ['id', 'guid'], ['uri' => $uri]); + $itemuri = DBA::selectFirst('item-uri', ['id', 'guid'], ['uri' => $fields['uri']]); if (!DBA::isResult($itemuri)) { // This shouldn't happen @@ -72,9 +69,6 @@ class ItemURI return 0; } - // If the URI gets too long we only take the first parts and hope for best - $uri = substr($uri, 0, 255); - $itemuri = DBA::selectFirst('item-uri', ['id'], ['uri' => $uri]); if (!DBA::isResult($itemuri) && $insert) { @@ -93,9 +87,6 @@ class ItemURI */ public static function getIdByGUID(string $guid): int { - // If the GUID gets too long we only take the first parts and hope for best - $guid = substr($guid, 0, 255); - $itemuri = DBA::selectFirst('item-uri', ['id'], ['guid' => $guid]); if (!DBA::isResult($itemuri)) { diff --git a/static/dbstructure.config.php b/static/dbstructure.config.php index aedb444667..bd5cdd93e8 100644 --- a/static/dbstructure.config.php +++ b/static/dbstructure.config.php @@ -55,7 +55,7 @@ use Friendica\Database\DBA; if (!defined('DB_UPDATE_VERSION')) { - define('DB_UPDATE_VERSION', 1481); + define('DB_UPDATE_VERSION', 1482); } return [ @@ -64,8 +64,8 @@ return [ "comment" => "Global servers", "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], - "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "nurl" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "url" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "nurl" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "version" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "site_name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "info" => ["type" => "text", "comment" => ""], @@ -77,8 +77,8 @@ return [ "local-posts" => ["type" => "int unsigned", "comment" => "Number of local posts"], "local-comments" => ["type" => "int unsigned", "comment" => "Number of local comments"], "directory-type" => ["type" => "tinyint", "default" => "0", "comment" => "Type of directory service (Poco, Mastodon)"], - "poco" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "noscrape" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "poco" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "noscrape" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""], "protocol" => ["type" => "tinyint unsigned", "comment" => "The protocol of the server"], "platform" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], @@ -160,7 +160,7 @@ return [ "comment" => "URI and GUID for items", "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"], - "uri" => ["type" => "varbinary(255)", "not null" => "1", "comment" => "URI of an item"], + "uri" => ["type" => "varbinary(383)", "not null" => "1", "comment" => "URI of an item"], "guid" => ["type" => "varbinary(255)", "comment" => "A unique identifier for an item"] ], "indexes" => [ @@ -184,19 +184,19 @@ return [ "keywords" => ["type" => "text", "comment" => "public keywords (interests) of the contact"], "xmpp" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "XMPP address"], "matrix" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Matrix address"], - "avatar" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "header" => ["type" => "varchar(255)", "comment" => "Header picture"], - "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "nurl" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "avatar" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "header" => ["type" => "varbinary(383)", "comment" => "Header picture"], + "url" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "nurl" => ["type" => "varbinary(383)", "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"], "addr" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "alias" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "alias" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "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" => ""], - "notify" => ["type" => "varchar(255)", "comment" => ""], - "poll" => ["type" => "varchar(255)", "comment" => ""], - "subscribe" => ["type" => "varchar(255)", "comment" => ""], + "batch" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "notify" => ["type" => "varbinary(383)", "comment" => ""], + "poll" => ["type" => "varbinary(383)", "comment" => ""], + "subscribe" => ["type" => "varbinary(383)", "comment" => ""], "last-update" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of the last try to update the contact info"], "next-update" => ["type" => "datetime", "comment" => "Next connection request"], "success_update" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of the last successful contact update"], @@ -214,7 +214,7 @@ return [ "archive" => ["type" => "boolean", "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"], + "baseurl" => ["type" => "varbinary(383)", "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 @@ -224,7 +224,7 @@ return [ "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" => ""], + "hub-verify" => ["type" => "varbinary(383)", "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" => ""], @@ -236,15 +236,15 @@ return [ "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)"], + "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)"], + "micro" => ["type" => "varbinary(383)", "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" => ""], + "request" => ["type" => "varbinary(383)", "comment" => ""], + "confirm" => ["type" => "varbinary(383)", "comment" => ""], + "poco" => ["type" => "varbinary(383)", "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"], @@ -253,8 +253,8 @@ return [ "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"], + "issued-id" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => "Deprecated"], + "dfrn-id" => ["type" => "varbinary(383)", "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"], @@ -293,7 +293,7 @@ return [ "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => ""], "name" => ["type" => "varchar(96)", "not null" => "1", "default" => "", "comment" => ""], - "url" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => ""], + "url" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "type" => ["type" => "tinyint unsigned", "comment" => "Type of the tag (Unknown, General Collection, Follower Collection or Account)"], ], "indexes" => [ @@ -391,17 +391,17 @@ return [ "apcontact" => [ "comment" => "ActivityPub compatible contacts - used in the ActivityPub implementation", "fields" => [ - "url" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "URL of the contact"], + "url" => ["type" => "varbinary(383)", "not null" => "1", "primary" => "1", "comment" => "URL of the contact"], "uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the apcontact url"], - "uuid" => ["type" => "varchar(255)", "comment" => ""], + "uuid" => ["type" => "varbinary(255)", "comment" => ""], "type" => ["type" => "varchar(20)", "not null" => "1", "comment" => ""], - "following" => ["type" => "varchar(255)", "comment" => ""], - "followers" => ["type" => "varchar(255)", "comment" => ""], - "inbox" => ["type" => "varchar(255)", "not null" => "1", "comment" => ""], - "outbox" => ["type" => "varchar(255)", "comment" => ""], - "sharedinbox" => ["type" => "varchar(255)", "comment" => ""], - "featured" => ["type" => "varchar(255)", "comment" => "Address for the collection of featured posts"], - "featured-tags" => ["type" => "varchar(255)", "comment" => "Address for the collection of featured tags"], + "following" => ["type" => "varbinary(383)", "comment" => ""], + "followers" => ["type" => "varbinary(383)", "comment" => ""], + "inbox" => ["type" => "varbinary(383)", "not null" => "1", "comment" => ""], + "outbox" => ["type" => "varbinary(383)", "comment" => ""], + "sharedinbox" => ["type" => "varbinary(383)", "comment" => ""], + "featured" => ["type" => "varbinary(383)", "comment" => "Address for the collection of featured posts"], + "featured-tags" => ["type" => "varbinary(383)", "comment" => "Address for the collection of featured tags"], "manually-approve" => ["type" => "boolean", "comment" => ""], "discoverable" => ["type" => "boolean", "comment" => "Mastodon extension: true if profile is published in their directory"], "suspended" => ["type" => "boolean", "comment" => "Mastodon extension: true if profile is suspended"], @@ -410,13 +410,13 @@ return [ "about" => ["type" => "text", "comment" => ""], "xmpp" => ["type" => "varchar(255)", "comment" => "XMPP address"], "matrix" => ["type" => "varchar(255)", "comment" => "Matrix address"], - "photo" => ["type" => "varchar(255)", "comment" => ""], - "header" => ["type" => "varchar(255)", "comment" => "Header picture"], + "photo" => ["type" => "varbinary(383)", "comment" => ""], + "header" => ["type" => "varbinary(383)", "comment" => "Header picture"], "addr" => ["type" => "varchar(255)", "comment" => ""], - "alias" => ["type" => "varchar(255)", "comment" => ""], + "alias" => ["type" => "varbinary(383)", "comment" => ""], "pubkey" => ["type" => "text", "comment" => ""], - "subscribe" => ["type" => "varchar(255)", "comment" => ""], - "baseurl" => ["type" => "varchar(255)", "comment" => "baseurl of the ap contact"], + "subscribe" => ["type" => "varbinary(383)", "comment" => ""], + "baseurl" => ["type" => "varbinary(383)", "comment" => "baseurl of the ap contact"], "gsid" => ["type" => "int unsigned", "foreign" => ["gserver" => "id", "on delete" => "restrict"], "comment" => "Global Server ID"], "generator" => ["type" => "varchar(255)", "comment" => "Name of the contact's system"], "following_count" => ["type" => "int unsigned", "default" => 0, "comment" => "Number of following contacts"], @@ -442,8 +442,8 @@ return [ "client_id" => ["type" => "varchar(64)", "not null" => "1", "comment" => ""], "client_secret" => ["type" => "varchar(64)", "not null" => "1", "comment" => ""], "name" => ["type" => "varchar(255)", "not null" => "1", "comment" => ""], - "redirect_uri" => ["type" => "varchar(255)", "not null" => "1", "comment" => ""], - "website" => ["type" => "varchar(255)", "comment" => ""], + "redirect_uri" => ["type" => "varbinary(383)", "not null" => "1", "comment" => ""], + "website" => ["type" => "varbinary(383)", "comment" => ""], "scopes" => ["type" => "varchar(255)", "comment" => ""], "read" => ["type" => "boolean", "comment" => "Read scope"], "write" => ["type" => "boolean", "comment" => "Write scope"], @@ -461,7 +461,7 @@ return [ "application-id" => ["type" => "int unsigned", "not null" => "1", "primary" => "1", "foreign" => ["application" => "id"], "comment" => ""], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "primary" => "1", "foreign" => ["user" => "uid"], "comment" => "Owner User id"], "timeline" => ["type" => "varchar(64)", "not null" => "1", "primary" => "1", "comment" => "Marker (home, notifications)"], - "last_read_id" => ["type" => "varchar(255)", "comment" => "Marker id for the timeline"], + "last_read_id" => ["type" => "varbinary(383)", "comment" => "Marker id for the timeline"], "version" => ["type" => "smallint unsigned", "comment" => "Version number"], "updated_at" => ["type" => "datetime", "comment" => "creation time"], ], @@ -557,7 +557,7 @@ return [ "comment" => "private messages", "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], - "guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this conversation"], + "guid" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this conversation"], "recips" => ["type" => "text", "comment" => "sender_handle;recipient_handle"], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"], "creator" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "handle of creator"], @@ -600,7 +600,7 @@ return [ "comment" => "Posts that are about to be distributed at a later time", "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1"], - "uri" => ["type" => "varchar(255)", "comment" => "URI of the post that will be distributed later"], + "uri" => ["type" => "varbinary(383)", "comment" => "URI of the post that will be distributed later"], "uid" => ["type" => "mediumint unsigned", "foreign" => ["user" => "uid"], "comment" => "Owner User id"], "delayed" => ["type" => "datetime", "comment" => "delay time"], "wid" => ["type" => "int unsigned", "foreign" => ["workerqueue" => "id"], "comment" => "Workerqueue id"], @@ -624,7 +624,7 @@ return [ "endpoint" => [ "comment" => "ActivityPub endpoints - used in the ActivityPub implementation", "fields" => [ - "url" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "URL of the contact"], + "url" => ["type" => "varbinary(383)", "not null" => "1", "primary" => "1", "comment" => "URL of the contact"], "type" => ["type" => "varchar(20)", "not null" => "1", "comment" => ""], "owner-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table entry that contains the apcontact url"], ], @@ -637,10 +637,10 @@ return [ "comment" => "Events", "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], - "guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "guid" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => ""], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"], "cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => "contact_id (ID of the contact in contact table)"], - "uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "uri" => ["type" => "varbinary(383)", "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 event uri"], "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "creation time"], "edited" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "last edit time"], @@ -668,21 +668,21 @@ return [ "comment" => "Diaspora compatible contacts - used in the Diaspora implementation", "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], - "guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "unique id"], - "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "guid" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => "unique id"], + "url" => ["type" => "varbinary(383)", "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 fcontact url"], "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "request" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "photo" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "request" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "nick" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "addr" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "batch" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "notify" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "poll" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "confirm" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "batch" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "notify" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "poll" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "confirm" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "priority" => ["type" => "tinyint unsigned", "not null" => "1", "default" => "0", "comment" => ""], "network" => ["type" => "char(4)", "not null" => "1", "default" => "", "comment" => ""], - "alias" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "alias" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "pubkey" => ["type" => "text", "comment" => ""], "updated" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""], "interacting_count" => ["type" => "int unsigned", "default" => 0, "comment" => "Number of contacts this contact interactes with"], @@ -700,7 +700,7 @@ return [ "comment" => "", "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], - "url" => ["type" => "varbinary(255)", "comment" => "url that awaiting to be fetched"], + "url" => ["type" => "varbinary(383)", "comment" => "url that awaiting to be fetched"], "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation date of the fetch request"], "wid" => ["type" => "int unsigned", "foreign" => ["workerqueue" => "id"], "comment" => "Workerqueue id"], ], "indexes" => [ @@ -717,9 +717,9 @@ return [ "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "User id"], "cid" => ["type" => "int unsigned", "not null" => "1", "default" => "0", "foreign" => ["contact" => "id"], "comment" => ""], "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "request" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "url" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "request" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "photo" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "note" => ["type" => "text", "comment" => ""], "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""], ], @@ -789,10 +789,10 @@ return [ "comment" => "Incoming activity", "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], - "activity-id" => ["type" => "varbinary(255)", "comment" => "id of the incoming activity"], - "object-id" => ["type" => "varbinary(255)", "comment" => ""], - "in-reply-to-id" => ["type" => "varbinary(255)", "comment" => ""], - "conversation" => ["type" => "varbinary(255)", "comment" => ""], + "activity-id" => ["type" => "varbinary(383)", "comment" => "id of the incoming activity"], + "object-id" => ["type" => "varbinary(383)", "comment" => ""], + "in-reply-to-id" => ["type" => "varbinary(383)", "comment" => ""], + "conversation" => ["type" => "varbinary(383)", "comment" => ""], "type" => ["type" => "varchar(64)", "comment" => "Type of the activity"], "object-type" => ["type" => "varchar(64)", "comment" => "Type of the object activity"], "object-object-type" => ["type" => "varchar(64)", "comment" => "Type of the object's object activity"], @@ -824,7 +824,7 @@ return [ "inbox-status" => [ "comment" => "Status of ActivityPub inboxes", "fields" => [ - "url" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "URL of the inbox"], + "url" => ["type" => "varbinary(383)", "not null" => "1", "primary" => "1", "comment" => "URL of the inbox"], "uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Item-uri id of inbox url"], "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Creation date of this entry"], "success" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "Date of the last successful delivery"], @@ -849,7 +849,7 @@ return [ "knowyou" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], "duplex" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "deprecated"], "note" => ["type" => "text", "comment" => ""], - "hash" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "hash" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => ""], "datetime" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""], "blocked" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "deprecated"], "ignore" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], @@ -880,11 +880,11 @@ return [ "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"], - "guid" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this private message"], + "guid" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => "A unique identifier for this private message"], "from-name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "name of the sender"], - "from-photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "contact photo link of the sender"], - "from-url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "profile linke of the sender"], - "contact-id" => ["type" => "varchar(255)", "relation" => ["contact" => "id"], "comment" => "contact.id"], + "from-photo" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => "contact photo link of the sender"], + "from-url" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => "profile linke of the sender"], + "contact-id" => ["type" => "varbinary(255)", "relation" => ["contact" => "id"], "comment" => "contact.id"], "author-id" => ["type" => "int unsigned", "foreign" => ["contact" => "id", "on delete" => "restrict"], "comment" => "Link to the contact table with uid=0 of the author of the mail"], "convid" => ["type" => "int unsigned", "relation" => ["conv" => "id"], "comment" => "conv.id"], "title" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], @@ -893,11 +893,11 @@ return [ "reply" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], "replied" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => ""], "unknown" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "if sender not in the contact table this is 1"], - "uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "uri" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Item-uri id of the related mail"], - "parent-uri" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "parent-uri" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "parent-uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Item-uri id of the parent of the related mail"], - "thr-parent" => ["type" => "varchar(255)", "comment" => ""], + "thr-parent" => ["type" => "varbinary(383)", "comment" => ""], "thr-parent-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Id of the item-uri table that contains the thread parent uri"], "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "creation time of the private message"], ], @@ -980,12 +980,12 @@ return [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], "type" => ["type" => "smallint unsigned", "not null" => "1", "default" => "0", "comment" => ""], "name" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "url" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "photo" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "date" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""], "msg" => ["type" => "mediumtext", "comment" => ""], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "Owner User id"], - "link" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "link" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "iid" => ["type" => "int unsigned", "comment" => ""], "parent" => ["type" => "int unsigned", "comment" => ""], "uri-id" => ["type" => "int unsigned", "foreign" => ["item-uri" => "id"], "comment" => "Item-uri id of the related post"], @@ -1026,7 +1026,7 @@ return [ "oembed" => [ "comment" => "cache for OEmbed queries", "fields" => [ - "url" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "page url"], + "url" => ["type" => "varbinary(383)", "not null" => "1", "primary" => "1", "comment" => "page url"], "maxwidth" => ["type" => "mediumint unsigned", "not null" => "1", "primary" => "1", "comment" => "Maximum width passed to Oembed"], "content" => ["type" => "mediumtext", "comment" => "OEmbed data of the page"], "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => "datetime of creation"], @@ -1215,7 +1215,7 @@ return [ "target-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams target type if applicable (URI)"], "target" => ["type" => "text", "comment" => "JSON encoded target structure if used"], "resource-id" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => "Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type"], - "plink" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "permalink or URL to a displayable copy of the message at its source"] + "plink" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => "permalink or URL to a displayable copy of the message at its source"] ], "indexes" => [ "PRIMARY" => ["uri-id"], @@ -1280,7 +1280,7 @@ return [ "target-type" => ["type" => "varchar(100)", "not null" => "1", "default" => "", "comment" => "ActivityStreams target type if applicable (URI)"], "target" => ["type" => "text", "comment" => "JSON encoded target structure if used"], "resource-id" => ["type" => "varchar(32)", "not null" => "1", "default" => "", "comment" => "Used to link other tables to items, it identifies the linked resource (e.g. photo) and if set must also set resource_type"], - "plink" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "permalink or URL to a displayable copy of the message at its source"] + "plink" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => "permalink or URL to a displayable copy of the message at its source"] ], "indexes" => [ "PRIMARY" => ["uri-id", "edited"], @@ -1315,12 +1315,12 @@ return [ "preview-width" => ["type" => "smallint unsigned", "comment" => "Width of the preview picture"], "description" => ["type" => "text", "comment" => ""], "name" => ["type" => "varchar(255)", "comment" => "Name of the media"], - "author-url" => ["type" => "varbinary(255)", "comment" => "URL of the author of the media"], + "author-url" => ["type" => "varbinary(383)", "comment" => "URL of the author of the media"], "author-name" => ["type" => "varchar(255)", "comment" => "Name of the author of the media"], - "author-image" => ["type" => "varbinary(255)", "comment" => "Image of the author of the media"], - "publisher-url" => ["type" => "varbinary(255)", "comment" => "URL of the publisher of the media"], + "author-image" => ["type" => "varbinary(383)", "comment" => "Image of the author of the media"], + "publisher-url" => ["type" => "varbinary(383)", "comment" => "URL of the publisher of the media"], "publisher-name" => ["type" => "varchar(255)", "comment" => "Name of the publisher of the media"], - "publisher-image" => ["type" => "varbinary(255)", "comment" => "Image of the publisher of the media"], + "publisher-image" => ["type" => "varbinary(383)", "comment" => "Image of the publisher of the media"], ], "indexes" => [ "PRIMARY" => ["id"], @@ -1564,8 +1564,8 @@ return [ "homepage" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "xmpp" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "XMPP address"], "matrix" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => "Matrix address"], - "photo" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], - "thumb" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "photo" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], + "thumb" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "publish" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "publish default profile in local directory"], "net-publish" => ["type" => "boolean", "not null" => "1", "default" => "0", "comment" => "publish profile in global directory"], ], @@ -1599,7 +1599,7 @@ return [ "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "User id"], - "callback_url" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "callback_url" => ["type" => "varbinary(383)", "not null" => "1", "default" => "", "comment" => ""], "topic" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "nickname" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], "push" => ["type" => "tinyint", "not null" => "1", "default" => "0", "comment" => "Retrial counter"], @@ -1618,7 +1618,7 @@ return [ "comment" => "registrations requiring admin approval", "fields" => [ "id" => ["type" => "int unsigned", "not null" => "1", "extra" => "auto_increment", "primary" => "1", "comment" => "sequential ID"], - "hash" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], + "hash" => ["type" => "varbinary(255)", "not null" => "1", "default" => "", "comment" => ""], "created" => ["type" => "datetime", "not null" => "1", "default" => DBA::NULL_DATETIME, "comment" => ""], "uid" => ["type" => "mediumint unsigned", "not null" => "1", "default" => "0", "foreign" => ["user" => "uid"], "comment" => "User id"], "password" => ["type" => "varchar(255)", "not null" => "1", "default" => "", "comment" => ""], @@ -1720,7 +1720,7 @@ return [ "fetch_further_information" => ["type" => "tinyint unsigned", "comment" => ""], "ffi_keyword_denylist" => ["type" => "text", "comment" => ""], "subhub" => ["type" => "boolean", "comment" => ""], - "hub-verify" => ["type" => "varchar(255)", "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"], "priority" => ["type" => "tinyint unsigned", "comment" => "Feed poll priority"], @@ -1734,7 +1734,7 @@ return [ "arrived-activity" => [ "comment" => "Id of arrived activities", "fields" => [ - "object-id" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "object id of the incoming activity"], + "object-id" => ["type" => "varbinary(383)", "not null" => "1", "primary" => "1", "comment" => "object id of the incoming activity"], "received" => ["type" => "datetime", "comment" => "Receiving date"], ], "indexes" => [ @@ -1745,7 +1745,7 @@ return [ "fetched-activity" => [ "comment" => "Id of fetched activities", "fields" => [ - "object-id" => ["type" => "varbinary(255)", "not null" => "1", "primary" => "1", "comment" => "object id of fetched activity"], + "object-id" => ["type" => "varbinary(383)", "not null" => "1", "primary" => "1", "comment" => "object id of fetched activity"], "received" => ["type" => "datetime", "comment" => "Receiving date"], ], "indexes" => [ diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po index 8089b80d8f..d2f47e606f 100644 --- a/view/lang/C/messages.po +++ b/view/lang/C/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 2022.09-dev\n" +"Project-Id-Version: 2022.09-rc\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2022-08-09 13:22-0400\n" +"POT-Creation-Date: 2022-09-04 07:52+0000\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -45,8 +45,8 @@ msgstr "" #: mod/cal.php:243 mod/events.php:374 src/Content/Nav.php:196 #: src/Content/Nav.php:260 src/Module/BaseProfile.php:84 -#: src/Module/BaseProfile.php:95 view/theme/frio/theme.php:224 -#: view/theme/frio/theme.php:228 +#: src/Module/BaseProfile.php:95 view/theme/frio/theme.php:240 +#: view/theme/frio/theme.php:244 msgid "Events" msgstr "" @@ -67,17 +67,17 @@ msgid "today" msgstr "" #: mod/cal.php:250 mod/events.php:384 src/Model/Event.php:461 -#: src/Util/Temporal.php:334 +#: src/Util/Temporal.php:338 msgid "month" msgstr "" #: mod/cal.php:251 mod/events.php:385 src/Model/Event.php:462 -#: src/Util/Temporal.php:335 +#: src/Util/Temporal.php:339 msgid "week" msgstr "" #: mod/cal.php:252 mod/events.php:386 src/Model/Event.php:463 -#: src/Util/Temporal.php:336 +#: src/Util/Temporal.php:340 msgid "day" msgstr "" @@ -436,7 +436,7 @@ msgid "Failed to remove event" msgstr "" #: mod/fbrowser.php:61 src/Content/Nav.php:194 src/Module/BaseProfile.php:64 -#: view/theme/frio/theme.php:222 +#: view/theme/frio/theme.php:238 msgid "Photos" msgstr "" @@ -470,7 +470,7 @@ msgid "OStatus support is disabled. Contact can't be added." msgstr "" #: mod/follow.php:138 src/Content/Item.php:397 src/Content/Widget.php:80 -#: src/Model/Contact.php:1109 src/Model/Contact.php:1120 +#: src/Model/Contact.php:1121 src/Model/Contact.php:1132 #: view/theme/vier/theme.php:181 msgid "Connect/Follow" msgstr "" @@ -717,7 +717,7 @@ msgstr "" msgid "Discard" msgstr "" -#: mod/message.php:133 src/Content/Nav.php:285 view/theme/frio/theme.php:229 +#: mod/message.php:133 src/Content/Nav.php:285 view/theme/frio/theme.php:245 msgid "Messages" msgstr "" @@ -1131,7 +1131,7 @@ msgstr "" msgid "Contact not found." msgstr "" -#: mod/removeme.php:65 src/Navigation/Notifications/Repository/Notify.php:464 +#: mod/removeme.php:65 src/Navigation/Notifications/Repository/Notify.php:467 msgid "[Friendica System Notify]" msgstr "" @@ -1208,7 +1208,7 @@ msgstr "" #: src/Module/Admin/Features.php:87 src/Module/Admin/Logs/Settings.php:81 #: src/Module/Admin/Site.php:436 src/Module/Admin/Themes/Index.php:113 #: src/Module/Admin/Tos.php:83 src/Module/Settings/Account.php:562 -#: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:193 +#: src/Module/Settings/Delegation.php:170 src/Module/Settings/Display.php:201 msgid "Save Settings" msgstr "" @@ -1411,7 +1411,7 @@ msgstr "" msgid "Friend Suggestions" msgstr "" -#: mod/tagger.php:78 src/Content/Item.php:297 src/Model/Item.php:2765 +#: mod/tagger.php:78 src/Content/Item.php:297 src/Model/Item.php:2785 msgid "photo" msgstr "" @@ -2292,39 +2292,39 @@ msgstr "" msgid "show more" msgstr "" -#: src/Content/Item.php:288 src/Model/Item.php:2763 +#: src/Content/Item.php:288 src/Model/Item.php:2783 msgid "event" msgstr "" -#: src/Content/Item.php:380 view/theme/frio/theme.php:250 +#: src/Content/Item.php:380 view/theme/frio/theme.php:266 msgid "Follow Thread" msgstr "" -#: src/Content/Item.php:381 src/Model/Contact.php:1114 +#: src/Content/Item.php:381 src/Model/Contact.php:1126 msgid "View Status" msgstr "" -#: src/Content/Item.php:382 src/Content/Item.php:400 src/Model/Contact.php:1052 -#: src/Model/Contact.php:1106 src/Model/Contact.php:1115 +#: src/Content/Item.php:382 src/Content/Item.php:400 src/Model/Contact.php:1064 +#: src/Model/Contact.php:1118 src/Model/Contact.php:1127 #: src/Module/Directory.php:158 src/Module/Settings/Profile/Index.php:225 msgid "View Profile" msgstr "" -#: src/Content/Item.php:383 src/Model/Contact.php:1116 +#: src/Content/Item.php:383 src/Model/Contact.php:1128 msgid "View Photos" msgstr "" -#: src/Content/Item.php:384 src/Model/Contact.php:1107 -#: src/Model/Contact.php:1117 +#: src/Content/Item.php:384 src/Model/Contact.php:1119 +#: src/Model/Contact.php:1129 msgid "Network Posts" msgstr "" -#: src/Content/Item.php:385 src/Model/Contact.php:1108 -#: src/Model/Contact.php:1118 +#: src/Content/Item.php:385 src/Model/Contact.php:1120 +#: src/Model/Contact.php:1130 msgid "View Contact" msgstr "" -#: src/Content/Item.php:386 src/Model/Contact.php:1119 +#: src/Content/Item.php:386 src/Model/Contact.php:1131 msgid "Send PM" msgstr "" @@ -2382,41 +2382,41 @@ msgstr "" #: src/Content/Nav.php:192 src/Module/BaseProfile.php:56 #: src/Module/Contact.php:433 src/Module/Contact/Profile.php:380 -#: src/Module/Settings/TwoFactor/Index.php:120 view/theme/frio/theme.php:220 +#: src/Module/Settings/TwoFactor/Index.php:120 view/theme/frio/theme.php:236 msgid "Status" msgstr "" #: src/Content/Nav.php:192 src/Content/Nav.php:275 -#: view/theme/frio/theme.php:220 +#: view/theme/frio/theme.php:236 msgid "Your posts and conversations" msgstr "" #: src/Content/Nav.php:193 src/Module/BaseProfile.php:48 #: src/Module/BaseSettings.php:55 src/Module/Contact.php:457 #: src/Module/Contact/Profile.php:382 src/Module/Profile/Profile.php:241 -#: src/Module/Welcome.php:57 view/theme/frio/theme.php:221 +#: src/Module/Welcome.php:57 view/theme/frio/theme.php:237 msgid "Profile" msgstr "" -#: src/Content/Nav.php:193 view/theme/frio/theme.php:221 +#: src/Content/Nav.php:193 view/theme/frio/theme.php:237 msgid "Your profile page" msgstr "" -#: src/Content/Nav.php:194 view/theme/frio/theme.php:222 +#: src/Content/Nav.php:194 view/theme/frio/theme.php:238 msgid "Your photos" msgstr "" #: src/Content/Nav.php:195 src/Module/BaseProfile.php:72 #: src/Module/BaseProfile.php:75 src/Module/Contact.php:449 -#: view/theme/frio/theme.php:223 +#: view/theme/frio/theme.php:239 msgid "Media" msgstr "" -#: src/Content/Nav.php:195 view/theme/frio/theme.php:223 +#: src/Content/Nav.php:195 view/theme/frio/theme.php:239 msgid "Your postings with media" msgstr "" -#: src/Content/Nav.php:196 view/theme/frio/theme.php:224 +#: src/Content/Nav.php:196 view/theme/frio/theme.php:240 msgid "Your events" msgstr "" @@ -2482,7 +2482,7 @@ msgstr "" #: src/Content/Nav.php:237 src/Content/Nav.php:296 #: src/Content/Text/HTML.php:899 src/Module/BaseProfile.php:125 #: src/Module/BaseProfile.php:128 src/Module/Contact.php:370 -#: src/Module/Contact.php:464 view/theme/frio/theme.php:231 +#: src/Module/Contact.php:464 view/theme/frio/theme.php:247 msgid "Contacts" msgstr "" @@ -2495,7 +2495,7 @@ msgid "Conversations on this and other servers" msgstr "" #: src/Content/Nav.php:260 src/Module/BaseProfile.php:87 -#: src/Module/BaseProfile.php:98 view/theme/frio/theme.php:228 +#: src/Module/BaseProfile.php:98 view/theme/frio/theme.php:244 msgid "Events and Calendar" msgstr "" @@ -2525,11 +2525,11 @@ msgstr "" msgid "Terms of Service of this Friendica instance" msgstr "" -#: src/Content/Nav.php:273 view/theme/frio/theme.php:227 +#: src/Content/Nav.php:273 view/theme/frio/theme.php:243 msgid "Network" msgstr "" -#: src/Content/Nav.php:273 view/theme/frio/theme.php:227 +#: src/Content/Nav.php:273 view/theme/frio/theme.php:243 msgid "Conversations from your friends" msgstr "" @@ -2554,7 +2554,7 @@ msgstr "" msgid "Mark all system notifications as seen" msgstr "" -#: src/Content/Nav.php:285 view/theme/frio/theme.php:229 +#: src/Content/Nav.php:285 view/theme/frio/theme.php:245 msgid "Private mail" msgstr "" @@ -2576,15 +2576,15 @@ msgstr "" #: src/Content/Nav.php:294 src/Module/Admin/Addons/Details.php:114 #: src/Module/Admin/Themes/Details.php:93 src/Module/BaseSettings.php:122 -#: src/Module/Welcome.php:52 view/theme/frio/theme.php:230 +#: src/Module/Welcome.php:52 view/theme/frio/theme.php:246 msgid "Settings" msgstr "" -#: src/Content/Nav.php:294 view/theme/frio/theme.php:230 +#: src/Content/Nav.php:294 view/theme/frio/theme.php:246 msgid "Account settings" msgstr "" -#: src/Content/Nav.php:296 view/theme/frio/theme.php:231 +#: src/Content/Nav.php:296 view/theme/frio/theme.php:247 msgid "Manage/edit friends and contacts" msgstr "" @@ -2639,8 +2639,8 @@ msgid "" "%2$s %3$s" msgstr "" -#: src/Content/Text/BBCode.php:1213 src/Model/Item.php:3339 -#: src/Model/Item.php:3345 src/Model/Item.php:3346 +#: src/Content/Text/BBCode.php:1213 src/Model/Item.php:3359 +#: src/Model/Item.php:3365 src/Model/Item.php:3366 msgid "Link to source" msgstr "" @@ -2795,7 +2795,7 @@ msgstr "" msgid "Organisations" msgstr "" -#: src/Content/Widget.php:523 src/Model/Contact.php:1541 +#: src/Content/Widget.php:523 src/Model/Contact.php:1553 msgid "News" msgstr "" @@ -3238,32 +3238,37 @@ msgid "Could not connect to database." msgstr "" #: src/Core/L10n.php:403 src/Model/Event.php:428 -#: src/Module/Settings/Display.php:182 +#: src/Module/Settings/Display.php:184 msgid "Monday" msgstr "" #: src/Core/L10n.php:403 src/Model/Event.php:429 +#: src/Module/Settings/Display.php:185 msgid "Tuesday" msgstr "" #: src/Core/L10n.php:403 src/Model/Event.php:430 +#: src/Module/Settings/Display.php:186 msgid "Wednesday" msgstr "" #: src/Core/L10n.php:403 src/Model/Event.php:431 +#: src/Module/Settings/Display.php:187 msgid "Thursday" msgstr "" #: src/Core/L10n.php:403 src/Model/Event.php:432 +#: src/Module/Settings/Display.php:188 msgid "Friday" msgstr "" #: src/Core/L10n.php:403 src/Model/Event.php:433 +#: src/Module/Settings/Display.php:189 msgid "Saturday" msgstr "" #: src/Core/L10n.php:403 src/Model/Event.php:427 -#: src/Module/Settings/Display.php:182 +#: src/Module/Settings/Display.php:183 msgid "Sunday" msgstr "" @@ -3583,81 +3588,81 @@ msgstr "" msgid "Legacy module file not found: %s" msgstr "" -#: src/Model/Contact.php:1110 src/Model/Contact.php:1121 +#: src/Model/Contact.php:1122 src/Model/Contact.php:1133 msgid "UnFollow" msgstr "" -#: src/Model/Contact.php:1127 src/Module/Admin/Users/Pending.php:107 +#: src/Model/Contact.php:1139 src/Module/Admin/Users/Pending.php:107 #: src/Module/Notifications/Introductions.php:130 #: src/Module/Notifications/Introductions.php:202 msgid "Approve" msgstr "" -#: src/Model/Contact.php:1537 +#: src/Model/Contact.php:1549 msgid "Organisation" msgstr "" -#: src/Model/Contact.php:1545 +#: src/Model/Contact.php:1557 msgid "Forum" msgstr "" -#: src/Model/Contact.php:2634 +#: src/Model/Contact.php:2710 msgid "Disallowed profile URL." msgstr "" -#: src/Model/Contact.php:2639 src/Module/Friendica.php:81 +#: src/Model/Contact.php:2715 src/Module/Friendica.php:81 msgid "Blocked domain" msgstr "" -#: src/Model/Contact.php:2644 +#: src/Model/Contact.php:2720 msgid "Connect URL missing." msgstr "" -#: src/Model/Contact.php:2653 +#: src/Model/Contact.php:2729 msgid "" "The contact could not be added. Please check the relevant network " "credentials in your Settings -> Social Networks page." msgstr "" -#: src/Model/Contact.php:2695 +#: src/Model/Contact.php:2771 msgid "The profile address specified does not provide adequate information." msgstr "" -#: src/Model/Contact.php:2697 +#: src/Model/Contact.php:2773 msgid "No compatible communication protocols or feeds were discovered." msgstr "" -#: src/Model/Contact.php:2700 +#: src/Model/Contact.php:2776 msgid "An author or name was not found." msgstr "" -#: src/Model/Contact.php:2703 +#: src/Model/Contact.php:2779 msgid "No browser URL could be matched to this address." msgstr "" -#: src/Model/Contact.php:2706 +#: src/Model/Contact.php:2782 msgid "" "Unable to match @-style Identity Address with a known protocol or email " "contact." msgstr "" -#: src/Model/Contact.php:2707 +#: src/Model/Contact.php:2783 msgid "Use mailto: in front of address to force email check." msgstr "" -#: src/Model/Contact.php:2713 +#: src/Model/Contact.php:2789 msgid "" "The profile address specified belongs to a network which has been disabled " "on this site." msgstr "" -#: src/Model/Contact.php:2718 +#: src/Model/Contact.php:2794 msgid "" "Limited profile. This person will be unable to receive direct/personal " "notifications from you." msgstr "" -#: src/Model/Contact.php:2777 +#: src/Model/Contact.php:2853 msgid "Unable to retrieve contact information." msgstr "" @@ -3777,66 +3782,66 @@ msgstr "" msgid "Edit groups" msgstr "" -#: src/Model/Item.php:1861 +#: src/Model/Item.php:1895 #, php-format msgid "Detected languages in this post:\\n%s" msgstr "" -#: src/Model/Item.php:2767 +#: src/Model/Item.php:2787 msgid "activity" msgstr "" -#: src/Model/Item.php:2769 +#: src/Model/Item.php:2789 msgid "comment" msgstr "" -#: src/Model/Item.php:2772 +#: src/Model/Item.php:2792 msgid "post" msgstr "" -#: src/Model/Item.php:2888 +#: src/Model/Item.php:2908 #, php-format msgid "Content warning: %s" msgstr "" -#: src/Model/Item.php:3251 +#: src/Model/Item.php:3271 msgid "bytes" msgstr "" -#: src/Model/Item.php:3282 +#: src/Model/Item.php:3302 #, php-format msgid "%2$s (%3$d%%, %1$d vote)" msgid_plural "%2$s (%3$d%%, %1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3284 +#: src/Model/Item.php:3304 #, php-format msgid "%2$s (%1$d vote)" msgid_plural "%2$s (%1$d votes)" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3289 +#: src/Model/Item.php:3309 #, php-format msgid "%d voter. Poll end: %s" msgid_plural "%d voters. Poll end: %s" msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3291 +#: src/Model/Item.php:3311 #, php-format msgid "%d voter." msgid_plural "%d voters." msgstr[0] "" msgstr[1] "" -#: src/Model/Item.php:3293 +#: src/Model/Item.php:3313 #, php-format msgid "Poll end: %s" msgstr "" -#: src/Model/Item.php:3327 src/Model/Item.php:3328 +#: src/Model/Item.php:3347 src/Model/Item.php:3348 msgid "View on separate page" msgstr "" @@ -4242,12 +4247,12 @@ msgid "" "\t\t\tThank you and welcome to %2$s." msgstr "" -#: src/Moderation/DomainPatternBlocklist.php:218 +#: src/Moderation/DomainPatternBlocklist.php:228 #, php-format msgid "[%s] Notice of remote server domain pattern block list update" msgstr "" -#: src/Moderation/DomainPatternBlocklist.php:220 +#: src/Moderation/DomainPatternBlocklist.php:230 #, php-format msgid "" "Dear %s,\n" @@ -6559,12 +6564,12 @@ msgstr "" msgid "Deny" msgstr "" -#: src/Module/Api/ApiResponse.php:272 +#: src/Module/Api/ApiResponse.php:279 #, php-format msgid "API endpoint %s %s is not implemented" msgstr "" -#: src/Module/Api/ApiResponse.php:273 +#: src/Module/Api/ApiResponse.php:280 msgid "" "The API endpoint is currently not implemented but might be in the future." msgstr "" @@ -8368,17 +8373,17 @@ msgstr "" msgid "j F" msgstr "" -#: src/Module/Profile/Profile.php:164 src/Util/Temporal.php:163 +#: src/Module/Profile/Profile.php:164 src/Util/Temporal.php:166 msgid "Birthday:" msgstr "" #: src/Module/Profile/Profile.php:167 src/Module/Settings/Profile/Index.php:245 -#: src/Util/Temporal.php:165 +#: src/Util/Temporal.php:168 msgid "Age: " msgstr "" #: src/Module/Profile/Profile.php:167 src/Module/Settings/Profile/Index.php:245 -#: src/Util/Temporal.php:165 +#: src/Util/Temporal.php:168 #, php-format msgid "%d year old" msgid_plural "%d years old" @@ -9434,120 +9439,120 @@ msgstr "" msgid "%s - (Unsupported)" msgstr "" -#: src/Module/Settings/Display.php:192 +#: src/Module/Settings/Display.php:200 msgid "Display Settings" msgstr "" -#: src/Module/Settings/Display.php:194 +#: src/Module/Settings/Display.php:202 msgid "General Theme Settings" msgstr "" -#: src/Module/Settings/Display.php:195 +#: src/Module/Settings/Display.php:203 msgid "Custom Theme Settings" msgstr "" -#: src/Module/Settings/Display.php:196 +#: src/Module/Settings/Display.php:204 msgid "Content Settings" msgstr "" -#: src/Module/Settings/Display.php:197 view/theme/duepuntozero/config.php:70 +#: src/Module/Settings/Display.php:205 view/theme/duepuntozero/config.php:70 #: view/theme/frio/config.php:161 view/theme/quattro/config.php:72 #: view/theme/vier/config.php:120 msgid "Theme settings" msgstr "" -#: src/Module/Settings/Display.php:198 +#: src/Module/Settings/Display.php:206 msgid "Calendar" msgstr "" -#: src/Module/Settings/Display.php:204 +#: src/Module/Settings/Display.php:212 msgid "Display Theme:" msgstr "" -#: src/Module/Settings/Display.php:205 +#: src/Module/Settings/Display.php:213 msgid "Mobile Theme:" msgstr "" -#: src/Module/Settings/Display.php:208 +#: src/Module/Settings/Display.php:216 msgid "Number of items to display per page:" msgstr "" -#: src/Module/Settings/Display.php:208 src/Module/Settings/Display.php:209 +#: src/Module/Settings/Display.php:216 src/Module/Settings/Display.php:217 msgid "Maximum of 100 items" msgstr "" -#: src/Module/Settings/Display.php:209 +#: src/Module/Settings/Display.php:217 msgid "Number of items to display per page when viewed from mobile device:" msgstr "" -#: src/Module/Settings/Display.php:210 +#: src/Module/Settings/Display.php:218 msgid "Update browser every xx seconds" msgstr "" -#: src/Module/Settings/Display.php:210 +#: src/Module/Settings/Display.php:218 msgid "Minimum of 10 seconds. Enter -1 to disable it." msgstr "" -#: src/Module/Settings/Display.php:211 +#: src/Module/Settings/Display.php:219 msgid "Automatic updates only at the top of the post stream pages" msgstr "" -#: src/Module/Settings/Display.php:211 +#: src/Module/Settings/Display.php:219 msgid "" "Auto update may add new posts at the top of the post stream pages, which can " "affect the scroll position and perturb normal reading if it happens anywhere " "else the top of the page." msgstr "" -#: src/Module/Settings/Display.php:212 +#: src/Module/Settings/Display.php:220 msgid "Display emoticons" msgstr "" -#: src/Module/Settings/Display.php:212 +#: src/Module/Settings/Display.php:220 msgid "When enabled, emoticons are replaced with matching symbols." msgstr "" -#: src/Module/Settings/Display.php:213 +#: src/Module/Settings/Display.php:221 msgid "Infinite scroll" msgstr "" -#: src/Module/Settings/Display.php:213 +#: src/Module/Settings/Display.php:221 msgid "Automatic fetch new items when reaching the page end." msgstr "" -#: src/Module/Settings/Display.php:214 +#: src/Module/Settings/Display.php:222 msgid "Enable Smart Threading" msgstr "" -#: src/Module/Settings/Display.php:214 +#: src/Module/Settings/Display.php:222 msgid "Enable the automatic suppression of extraneous thread indentation." msgstr "" -#: src/Module/Settings/Display.php:215 +#: src/Module/Settings/Display.php:223 msgid "Display the Dislike feature" msgstr "" -#: src/Module/Settings/Display.php:215 +#: src/Module/Settings/Display.php:223 msgid "Display the Dislike button and dislike reactions on posts and comments." msgstr "" -#: src/Module/Settings/Display.php:216 +#: src/Module/Settings/Display.php:224 msgid "Display the resharer" msgstr "" -#: src/Module/Settings/Display.php:216 +#: src/Module/Settings/Display.php:224 msgid "Display the first resharer as icon and text on a reshared item." msgstr "" -#: src/Module/Settings/Display.php:217 +#: src/Module/Settings/Display.php:225 msgid "Stay local" msgstr "" -#: src/Module/Settings/Display.php:217 +#: src/Module/Settings/Display.php:225 msgid "Don't go to a remote system when following a contact link." msgstr "" -#: src/Module/Settings/Display.php:219 +#: src/Module/Settings/Display.php:227 msgid "Beginning of week:" msgstr "" @@ -9603,8 +9608,8 @@ msgstr "" msgid "Location" msgstr "" -#: src/Module/Settings/Profile/Index.php:230 src/Util/Temporal.php:93 -#: src/Util/Temporal.php:95 +#: src/Module/Settings/Profile/Index.php:230 src/Util/Temporal.php:95 +#: src/Util/Temporal.php:97 msgid "Miscellaneous" msgstr "" @@ -10472,189 +10477,189 @@ msgstr "" msgid "%1$s commented on your thread %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:222 -#: src/Navigation/Notifications/Repository/Notify.php:717 +#: src/Navigation/Notifications/Repository/Notify.php:225 +#: src/Navigation/Notifications/Repository/Notify.php:721 msgid "[Friendica:Notify]" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:286 +#: src/Navigation/Notifications/Repository/Notify.php:289 #, php-format msgid "%s New mail received at %s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:288 +#: src/Navigation/Notifications/Repository/Notify.php:291 #, php-format msgid "%1$s sent you a new private message at %2$s." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:289 +#: src/Navigation/Notifications/Repository/Notify.php:292 msgid "a private message" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:289 +#: src/Navigation/Notifications/Repository/Notify.php:292 #, php-format msgid "%1$s sent you %2$s." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:291 +#: src/Navigation/Notifications/Repository/Notify.php:294 #, php-format msgid "Please visit %s to view and/or reply to your private messages." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:321 +#: src/Navigation/Notifications/Repository/Notify.php:324 #, php-format msgid "%1$s commented on %2$s's %3$s %4$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:326 +#: src/Navigation/Notifications/Repository/Notify.php:329 #, php-format msgid "%1$s commented on your %2$s %3$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:330 +#: src/Navigation/Notifications/Repository/Notify.php:333 #, php-format msgid "%1$s commented on their %2$s %3$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:334 -#: src/Navigation/Notifications/Repository/Notify.php:751 +#: src/Navigation/Notifications/Repository/Notify.php:337 +#: src/Navigation/Notifications/Repository/Notify.php:755 #, php-format msgid "%1$s Comment to conversation #%2$d by %3$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:336 +#: src/Navigation/Notifications/Repository/Notify.php:339 #, php-format msgid "%s commented on an item/conversation you have been following." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:340 -#: src/Navigation/Notifications/Repository/Notify.php:355 -#: src/Navigation/Notifications/Repository/Notify.php:766 +#: src/Navigation/Notifications/Repository/Notify.php:343 +#: src/Navigation/Notifications/Repository/Notify.php:358 +#: src/Navigation/Notifications/Repository/Notify.php:770 #, php-format msgid "Please visit %s to view and/or reply to the conversation." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:347 +#: src/Navigation/Notifications/Repository/Notify.php:350 #, php-format msgid "%s %s posted to your profile wall" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:349 +#: src/Navigation/Notifications/Repository/Notify.php:352 #, php-format msgid "%1$s posted to your profile wall at %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:350 +#: src/Navigation/Notifications/Repository/Notify.php:353 #, php-format msgid "%1$s posted to [url=%2$s]your wall[/url]" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:363 +#: src/Navigation/Notifications/Repository/Notify.php:366 #, php-format msgid "%s Introduction received" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:365 +#: src/Navigation/Notifications/Repository/Notify.php:368 #, php-format msgid "You've received an introduction from '%1$s' at %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:366 +#: src/Navigation/Notifications/Repository/Notify.php:369 #, php-format msgid "You've received [url=%1$s]an introduction[/url] from %2$s." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:371 -#: src/Navigation/Notifications/Repository/Notify.php:417 +#: src/Navigation/Notifications/Repository/Notify.php:374 +#: src/Navigation/Notifications/Repository/Notify.php:420 #, php-format msgid "You may visit their profile at %s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:373 +#: src/Navigation/Notifications/Repository/Notify.php:376 #, php-format msgid "Please visit %s to approve or reject the introduction." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:380 +#: src/Navigation/Notifications/Repository/Notify.php:383 #, php-format msgid "%s A new person is sharing with you" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:382 -#: src/Navigation/Notifications/Repository/Notify.php:383 +#: src/Navigation/Notifications/Repository/Notify.php:385 +#: src/Navigation/Notifications/Repository/Notify.php:386 #, php-format msgid "%1$s is sharing with you at %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:390 +#: src/Navigation/Notifications/Repository/Notify.php:393 #, php-format msgid "%s You have a new follower" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:392 -#: src/Navigation/Notifications/Repository/Notify.php:393 +#: src/Navigation/Notifications/Repository/Notify.php:395 +#: src/Navigation/Notifications/Repository/Notify.php:396 #, php-format msgid "You have a new follower at %2$s : %1$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:406 +#: src/Navigation/Notifications/Repository/Notify.php:409 #, php-format msgid "%s Friend suggestion received" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:408 +#: src/Navigation/Notifications/Repository/Notify.php:411 #, php-format msgid "You've received a friend suggestion from '%1$s' at %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:409 +#: src/Navigation/Notifications/Repository/Notify.php:412 #, php-format msgid "You've received [url=%1$s]a friend suggestion[/url] for %2$s from %3$s." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:415 +#: src/Navigation/Notifications/Repository/Notify.php:418 msgid "Name:" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:416 +#: src/Navigation/Notifications/Repository/Notify.php:419 msgid "Photo:" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:419 +#: src/Navigation/Notifications/Repository/Notify.php:422 #, php-format msgid "Please visit %s to approve or reject the suggestion." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:427 -#: src/Navigation/Notifications/Repository/Notify.php:442 -#, php-format -msgid "%s Connection accepted" -msgstr "" - -#: src/Navigation/Notifications/Repository/Notify.php:429 -#: src/Navigation/Notifications/Repository/Notify.php:444 -#, php-format -msgid "'%1$s' has accepted your connection request at %2$s" -msgstr "" - #: src/Navigation/Notifications/Repository/Notify.php:430 #: src/Navigation/Notifications/Repository/Notify.php:445 #, php-format +msgid "%s Connection accepted" +msgstr "" + +#: src/Navigation/Notifications/Repository/Notify.php:432 +#: src/Navigation/Notifications/Repository/Notify.php:447 +#, php-format +msgid "'%1$s' has accepted your connection request at %2$s" +msgstr "" + +#: src/Navigation/Notifications/Repository/Notify.php:433 +#: src/Navigation/Notifications/Repository/Notify.php:448 +#, php-format msgid "%2$s has accepted your [url=%1$s]connection request[/url]." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:435 +#: src/Navigation/Notifications/Repository/Notify.php:438 msgid "" "You are now mutual friends and may exchange status updates, photos, and " "email without restriction." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:437 +#: src/Navigation/Notifications/Repository/Notify.php:440 #, php-format msgid "Please visit %s if you wish to make any changes to this relationship." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:450 +#: src/Navigation/Notifications/Repository/Notify.php:453 #, php-format msgid "" "'%1$s' has chosen to accept you a fan, which restricts some forms of " @@ -10663,33 +10668,33 @@ msgid "" "automatically." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:452 +#: src/Navigation/Notifications/Repository/Notify.php:455 #, php-format msgid "" "'%1$s' may choose to extend this into a two-way or more permissive " "relationship in the future." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:454 +#: src/Navigation/Notifications/Repository/Notify.php:457 #, php-format msgid "Please visit %s if you wish to make any changes to this relationship." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:464 +#: src/Navigation/Notifications/Repository/Notify.php:467 msgid "registration request" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:466 +#: src/Navigation/Notifications/Repository/Notify.php:469 #, php-format msgid "You've received a registration request from '%1$s' at %2$s" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:467 +#: src/Navigation/Notifications/Repository/Notify.php:470 #, php-format msgid "You've received a [url=%1$s]registration request[/url] from %2$s." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:472 +#: src/Navigation/Notifications/Repository/Notify.php:475 #, php-format msgid "" "Full Name:\t%s\n" @@ -10697,17 +10702,17 @@ msgid "" "Login Name:\t%s (%s)" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:478 +#: src/Navigation/Notifications/Repository/Notify.php:481 #, php-format msgid "Please visit %s to approve or reject the request." msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:745 +#: src/Navigation/Notifications/Repository/Notify.php:749 #, php-format msgid "%s %s tagged you" msgstr "" -#: src/Navigation/Notifications/Repository/Notify.php:748 +#: src/Navigation/Notifications/Repository/Notify.php:752 #, php-format msgid "%s %s shared a new post" msgstr "" @@ -10936,21 +10941,21 @@ msgstr "" msgid "Show fewer" msgstr "" -#: src/Protocol/OStatus.php:1475 +#: src/Protocol/OStatus.php:1471 #, php-format msgid "%s is now following %s." msgstr "" -#: src/Protocol/OStatus.php:1476 +#: src/Protocol/OStatus.php:1472 msgid "following" msgstr "" -#: src/Protocol/OStatus.php:1479 +#: src/Protocol/OStatus.php:1475 #, php-format msgid "%s stopped following %s." msgstr "" -#: src/Protocol/OStatus.php:1480 +#: src/Protocol/OStatus.php:1476 msgid "stopped following" msgstr "" @@ -10999,73 +11004,73 @@ msgstr "" msgid "thanks" msgstr "" -#: src/Util/Temporal.php:167 +#: src/Util/Temporal.php:170 msgid "YYYY-MM-DD or MM-DD" msgstr "" -#: src/Util/Temporal.php:275 +#: src/Util/Temporal.php:278 #, php-format msgid "Time zone: %s Change in Settings" msgstr "" -#: src/Util/Temporal.php:318 +#: src/Util/Temporal.php:321 msgid "never" msgstr "" -#: src/Util/Temporal.php:325 +#: src/Util/Temporal.php:328 msgid "less than a second ago" msgstr "" -#: src/Util/Temporal.php:333 +#: src/Util/Temporal.php:337 msgid "year" msgstr "" -#: src/Util/Temporal.php:333 +#: src/Util/Temporal.php:337 msgid "years" msgstr "" -#: src/Util/Temporal.php:334 +#: src/Util/Temporal.php:338 msgid "months" msgstr "" -#: src/Util/Temporal.php:335 +#: src/Util/Temporal.php:339 msgid "weeks" msgstr "" -#: src/Util/Temporal.php:336 +#: src/Util/Temporal.php:340 msgid "days" msgstr "" -#: src/Util/Temporal.php:337 +#: src/Util/Temporal.php:341 msgid "hour" msgstr "" -#: src/Util/Temporal.php:337 +#: src/Util/Temporal.php:341 msgid "hours" msgstr "" -#: src/Util/Temporal.php:338 +#: src/Util/Temporal.php:342 msgid "minute" msgstr "" -#: src/Util/Temporal.php:338 +#: src/Util/Temporal.php:342 msgid "minutes" msgstr "" -#: src/Util/Temporal.php:339 +#: src/Util/Temporal.php:343 msgid "second" msgstr "" -#: src/Util/Temporal.php:339 +#: src/Util/Temporal.php:343 msgid "seconds" msgstr "" -#: src/Util/Temporal.php:349 +#: src/Util/Temporal.php:353 #, php-format msgid "in %1$d %2$s" msgstr "" -#: src/Util/Temporal.php:352 +#: src/Util/Temporal.php:356 #, php-format msgid "%1$d %2$s ago" msgstr "" @@ -11268,11 +11273,11 @@ msgstr "" msgid "Back to top" msgstr "" -#: view/theme/frio/theme.php:202 +#: view/theme/frio/theme.php:218 msgid "Guest" msgstr "" -#: view/theme/frio/theme.php:205 +#: view/theme/frio/theme.php:221 msgid "Visitor" msgstr "" From c3d478aeedbcfdf7f143a581aac5da3e6876014e Mon Sep 17 00:00:00 2001 From: Michael Date: Sun, 4 Sep 2022 09:22:15 +0000 Subject: [PATCH 2/2] Improved logger calls --- src/Protocol/Diaspora.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index 886e1574dc..9e80c13028 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -734,7 +734,7 @@ class Diaspora } if (!Crypto::rsaVerify($signed_data, $parent_author_signature, $key, 'sha256')) { - Logger::info('No valid parent author signature for parent author ' . $msg['author'] . ' in type ' . $type . ' - signed data: ' . $signed_data . ' - Message: ' . $msg['message'] . ' - Signature ' . $parent_author_signature); + Logger::info('No valid parent author signature', ['author' => $msg['author'], 'type' => $type, 'signed data' => $signed_data, 'message' => $msg['message'], 'signature' => $parent_author_signature]); return false; } } @@ -746,7 +746,7 @@ class Diaspora } if (!Crypto::rsaVerify($signed_data, $author_signature, $key, 'sha256')) { - Logger::info('No valid author signature for author ' . $fields->author . ' in type ' . $type . ' - signed data: ' . $signed_data . ' - Message: ' . $msg['message'] . ' - Signature ' . $author_signature); + Logger::info('No valid author signature for author', ['author' => $fields->author, 'type' => $type, 'signed data' => $signed_data, 'message' => $msg['message'], 'signature' => $author_signature]); return false; } else { return $fields;