Merge pull request #13838 from MrPetovan/task/refactor-throwaway-fulltext-search

Refactor user-defined channel match

.gitignore

@@ -83,8 +83,9 @@ venv/
 #Ignore temporary installed phpunit
 /bin/phpunit
 
-#Ignore cache file
+#Ignore cache files
 .php_cs.cache
+.php-cs-fixer.cache
 
 #ignore avatar picture cache path
 /avatar

.php-cs-fixer.dist.php

@@ -0,0 +1,93 @@
+<?php
+/**
+ * @copyright Copyright (C) 2010-2024, the Friendica project
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU Affero General Public License for more details.
+ *
+ * You should have received a copy of the GNU Affero General Public License
+ * along with this program.  If not, see <https://www.gnu.org/licenses/>.
+ */
+
+declare(strict_types=1);
+
+$finder = PhpCsFixer\Finder::create()
+	->in(__DIR__)
+	->notPath('addon')
+	->notPath('bin/dev')
+	->notPath('config')
+	->notPath('doc')
+	->notPath('images')
+	->notPath('mods')
+	->notPath('spec')
+	->notPath('vendor')
+	->notPath('view/asset')
+	->notPath('lang')
+	->notPath('view/smarty3/compiled');
+
+$config = new PhpCsFixer\Config();
+return $config
+	->setRules([
+		'@PSR1'                   => true,
+		'@PSR2'                   => true,
+		'@PSR12'                  => true,
+		'align_multiline_comment' => true,
+		'array_indentation'       => true,
+		'array_syntax'            => [
+			'syntax' => 'short',
+		],
+		'binary_operator_spaces' => [
+			'default'   => 'single_space',
+			'operators' => [
+				'=>' => 'align_single_space_minimal',
+				'='  => 'align_single_space_minimal',
+				'??' => 'align_single_space_minimal',
+			],
+		],
+		'blank_line_after_namespace'   => true,
+		'braces'                       => [
+			'position_after_anonymous_constructs'         => 'same',
+			'position_after_control_structures'           => 'same',
+			'position_after_functions_and_oop_constructs' => 'next',
+		],
+		'elseif'               => true,
+		'encoding'             => true,
+		'full_opening_tag'     => true,
+		'function_declaration' => [
+			'closure_function_spacing' => 'one',
+		],
+		'indentation_type' => true,
+		'line_ending'      => true,
+		'list_syntax'      => [
+			'syntax' => 'long',
+		],
+		'lowercase_keywords'                 => true,
+		'method_argument_space'              => [],
+		'no_closing_tag'                     => true,
+		'no_spaces_after_function_name'      => true,
+		'no_spaces_inside_parenthesis'       => true,
+		'no_trailing_whitespace'             => true,
+		'no_trailing_whitespace_in_comment'  => true,
+		'no_unused_imports'                  => true,
+		'single_blank_line_at_eof'           => true,
+		'single_class_element_per_statement' => true,
+		'single_import_per_statement'        => true,
+		'single_line_after_imports'          => true,
+		'switch_case_space'                  => true,
+		'ternary_operator_spaces'            => false,
+		'visibility_required'                => [
+			'elements' => ['property', 'method']
+		],
+		'new_with_braces' => true,
+	])
+	->setFinder($finder)
+	->setIndent("\t");

.php_cs.dist

@@ -6,6 +6,7 @@ require_once __DIR__ . '/bin/dev/php-cs-fixer/vendor/autoload.php';
 
 $finder = PhpCsFixer\Finder::create()
 	->in(__DIR__)
+	->notPath('addon')
 	->notPath('bin/dev')
 	->notPath('config')
 	->notPath('doc')

CHANGELOG

@@ -1,10 +1,129 @@
-Version 2023.09 (unreleased)
+Version 2024.03 (unreleased)
   Friendica Core
 
   Friendica Addons
 
   Closed Issues
 
+Version 2023.12 (2023-12-24)
+  Friendica Core
+    Raised minimal PHP version to 7.4
+    Updates to the translations AR, BG, CA, CS, DE, EN GB, EN US, EO, ES, ET, FI, FR, GD, HU, IS, IT, JA, NL, PL, RO, RU, SV
+    Updates to the themes (frio, vier) [AlfredSK, annando, anubis2814, haheute, foss-, MrPetovan, Raroun, xundeenergie]
+    Updates to the documentation [AndyHee, BirdboyBolu, foss-, MrPetovan]
+    Fixed a bug in notification links [annando,  keithhacks]
+    Fixed a bug in content negotiation [GidiKroon]
+    Fixed the link in invitations [Raroun]
+    Fixed 0Auth connection with Buffer and redirection problems [annando, HankG]
+    Fixed a visibility bug with Calendar entries [MrPetovan]
+    Fixed a JsonLD parsing issue [annando]
+    Fixed confusion about nickname and username [MrPetovan, Raroun]
+    Fixed a problem with viewing remote contact profiles [MrPetovan]
+    Fixed a bug with previewing linked postings [annando]
+    Fixed a problem parsing Mastodon WebFingers [MrPetovan]
+    Fixed a bug that could lead to deleting your own account unintended [MrPetovan]
+    Fixed redirection in 2FA settings page [MrPetovan]
+    Fixed a problem with distributing some comments [annando]
+    Fixed a bug that caused public groups not being able to hide members [annando]
+    Fixed RSS/Atom feed of group accounts [MrPetovan]
+    Fixed a bug that prevented bi-directional delivery of DMs [annando]
+    Fixed a bug in privacy settings for remote-self [annando]
+    Fixed a bug that prevented the selection of photos with captions [Raroun]
+    Fixed a bug in Magic Auth [git-marijus]
+    Fixed a bug convertig local tags to external on receiving updates to the post [annando]
+    Improved Bluesky connector core [annando]
+    Improved SSL handling of reverse http proxies [MrPetovan]
+    Improved performance [annando]
+    Improved language detection [annando]
+    Improved display of contact relationships [annando]
+    Improved display of notifications [annando, MrPetovan]
+    Improved Mastodon compatible API [annando, gudzpoz, HankG, MrPetovan, Quix0r]
+    Improved federation with Diaspora, Firefish, GoToSocial, Lemmy, Pixelfed, Threads [annando]
+    Improved display of quoted posts [annando]
+    Improved BBCode conversion [annando]
+    Improved addon hook loading [annando, nupplaphil]
+    Improved handling of relay servers [annando]
+    Improved blocked users feature [MrPetovan]
+    Improved robots.txt to include ChatGPT and Google Extended [annando, haheute]
+    Improved handling of resizing images [annando]
+    Improved the image grid at the end of postings [MrPetovan]
+    Improved raw content output [annando]
+    Improved handling of smileys [gudzpoz]
+    Improved the admin panel [annando]
+    Improved handling of the background worker [annando]
+    Improved the processing of relayed posts [annando]
+    Improved compatibility with Mastodon Clients [annando]
+    Improved nodeinfo [MrPetovan]
+    Improved the federation statistics in the admin panel [annando]
+    General code cleanup [AlfredSK, annando, jlamothe, mexon, MrPetovan, nupplaphil, Quix0r, toddy15]
+    Renamed "group" to "circle"
+    Renamed "forum" to "group"
+    Added possibility to hide the server block list [MrPetovan, Quix0r]
+    Added creation of moderation reports [AlfredSK, annando, MrPetovan]
+    Added user controlled ignore server functionality [MrPetovan]
+    Added support for Unix domain sockets to Redis [MrPetovan]
+    Added user controlled channels for the network stream [annando]
+    Added support of MacOS emoji picker in text fields [MrPetovan]
+    Added lazy loading for images [FarisKarim, xundeenergie]
+    Added image caption display in Fancybox gallery [MrPetovan]
+    Added shortcut (ctrl+enter) to send postings using Frio theme [xundeenergie]
+    Added support for CORS requests to nodeinfo [palant]
+    Added setting for servers that should only receive limited profile information [annando]
+
+  Friendica Addons
+    Updates to the translation AR, CS, DE, ES, ET, FR, HU, IT, JA, NL, PL, RU, SV, ZH CN
+    Advancedcontentfilter
+      General code cleanup [MrPetovan]
+    Audon
+      Added audon addon [loma-one]
+    Blockem
+      Deprecated the addon [AndyHee]
+    Bluesky
+      Added bidirectional communication to the Bluesky connector [annando]
+      Added support for pinned postings [annando]
+      Added support for transmitted language [annando]
+      Improved thread handling [annando]
+      Improved handling of hashtags [annando]
+      Improved image uploading [annando]
+    CLD
+      Added addon for detection of the language of postings using CLD2 library [annando]
+    invidious
+      Added addon [loma-one]
+    langfilter
+      Use two letter codes for detected languages [annando]
+    Mailstream
+      Improved error handling [mexon]
+    Monolog
+      General code cleanup [nupplaphil]
+    NSFW
+      General code cleanup [MrPetovan]
+    pageheader
+      Improved styling of message box [loma-one]
+    s3_storage
+      Bumped library version [MrPetovan]
+    Showmore Dyn
+      Improved styling on mobile devices [csolisr]
+    Smileybutton
+      Improved conversation from float to int [MrPetovan]
+    Tumblr
+      Improved the import of feeds [annando]
+    Twitter
+      Improved image uploading [annando]
+      Removed the import of postings from Twitter [annando]
+
+  Closed Issues
+     8542, 10369, 12530, 12743, 12815, 13020, 13039, 13114, 13129,
+    13173, 13174, 13180, 13182, 13184, 13195, 13201, 13209, 13216,
+    13217, 13221, 13228, 13240, 13288, 13232, 13240, 13265, 13277,
+    13286, 13287, 13289, 13304, 13311, 13312, 13316, 13318, 13332,
+    13333, 13334, 13343, 13352, 13353, 13355, 13359, 13363, 13365,
+    13367, 13369, 13370, 13378, 13389, 13398, 13403, 13439, 13440,
+    13455, 13457, 13462, 13467, 13471, 13478, 13486, 13506, 13511,
+    13515, 13520, 13524, 13534, 13535, 13542, 13554, 13556, 13560,
+    13566, 13573, 13577, 13588, 13603, 13607, 13615, 13617, 13621,
+    13624, 13625, 13627, 13637, 13639, 13649, 13662, 13665, 13673,
+    13693, 13699, 13719, 13720, 13731, 13748
+
 Version 2023.05 (2023-05-23)
   Friendica Core
     Updates to the translations HU, PL

CREDITS.txt

@@ -31,6 +31,7 @@ Angristan
 Anthronaut
 Anton
 Antron Samurai
+Anubis2814
 Arian - Cazare Muncitori
 Asher Pen
 atjn
@@ -51,6 +52,7 @@ BinkaDroid
 Bjoessi
 bkil
 bob lebonche
+Boluwatife Victor
 Boris Daniel Martinez Millàn
 bufalo1973
 ButterflyOfFire
@@ -69,8 +71,8 @@ Christian Wiwie
 Cohan Robinson
 Colby Sollars
 Copiis
-Copiis Praeesse
 CrystalStiletto
+csolisr
 Cyboulette
 Cyryl Sochacki
 czarnystokrotek
@@ -98,6 +100,7 @@ Eelco Maljaars
 effex7
 Elena
 emilia.krawczyk
+Entropy Engineer
 Eric Côté
 Erich
 erik
@@ -108,10 +111,12 @@ F1per 3y
 Fabian Dost
 Fabio Comuni
 Farida Khalaf
+Faris
 felixgilles
 Filip Bugaj
 Filip H.F. "FiXato" Slagter
 Finn Dean
+Florent C.
 FlxAlbroscheit
 foss-
 Francesco Apruzzese
@@ -121,10 +126,12 @@ Gerhard Seeber
 gerhard6380
 Gert Cauwenberg
 Gidi Kroon
+git-marijus
 GLComo
 greeneyedred
 Gregory Smith
 Grischa Brockhaus
+groen
 gudzpoz
 GunChleoc
 guzzisti
@@ -134,6 +141,7 @@ Hannes Heute
 Hans Meine
 Hauke
 Hauke Altmann
+Henrik Härkönen
 Herbert Thielen
 hlad
 hoergen
@@ -156,6 +164,7 @@ Johannes Schwab
 John Brazil
 John Mortensen
 Jonatan Nyberg
+Jonathan Lamothe
 Jonny Tischbein
 Josef Moravek
 Josh Soref
@@ -168,11 +177,13 @@ Karolina
 Kastal András
 Keenan Pepper
 Keith Fernie
+keithhacks
 Klaus Weidenbach
 Koyu Berteon
 kPherox
 Kris
 Kristoffer Grundström
+ktlinux
 KulikAlex
 Lea1995polish
 Leberwurscht
@@ -254,6 +265,7 @@ Rain Hawk
 Rainulf Pineda
 Ralf Thees
 ralph van der honing
+Raroun
 Ratten
 rcmaniac
 RealKinetix
@@ -269,6 +281,7 @@ Roland Häder
 Ruud Schilders
 rwa
 Ryan Voots
+S. Brusch
 S.Krumbholz
 Sakałoŭ Alaksiej
 Sam
@@ -314,6 +327,7 @@ TiMESPLiNTER
 Tino
 Tobias Diekershoff
 Tobias Hößl
+Tobias Quathamer
 Tom
 Tom Aurlund
 Tom Hu
@@ -324,6 +338,7 @@ Torbjörn Andersson
 TORminator
 trebor
 tschlotfeldt
+tslmuun
 Tubuntu
 Tupambae.org
 U-SOUND\mike
@@ -345,6 +360,7 @@ Waldemar Stoczkowski
 Walter Bulbazor
 Wanting Chen
 Wil Tur
+Wladimir Palant
 Wouter Broers
 Xiaofei Xu
 XMPPはいいぞ

README.md

@@ -3,27 +3,28 @@ Friendica - your open and free social network
 
 Welcome to the free social web. Friendica is a platform for decentralised social communication linking to other independent social and corporate services.
 
-Friendica connects you to a federated communications network of thousands of servers called the Fediverse. Through various protocols you can interact with anyone on [Friendica]( https://friendi.ca), [Mastodon](https://joinmastodon.org), [Lemmy](https://join-lemmy.org/), [Diaspora](https://diasporafoundation.org), [Misskey](https://join.misskey.page), [Peertube](https://joinpeertube.org/), [Pixelfed](https://pixelfed.org/), [Pleroma](https://pleroma.social) and many more. Receiving content from Tumblr, Wordpress and RSS is also possible. Friendica allows to import and mirror your content via add-ons such as ITTT and Buffer. You can customize and control how publicly or privately you want to share your content.
+Friendica connects you to a federated communications network of thousands of servers called the Fediverse.
+Through various protocols you can interact with anyone on [Friendica]( https://friendi.ca), [Mastodon](https://joinmastodon.org), [Lemmy](https://join-lemmy.org/), [Diaspora](https://diasporafoundation.org), [Misskey](https://join.misskey.page), [Peertube](https://joinpeertube.org/), [Pixelfed](https://pixelfed.org/), [Pleroma](https://pleroma.social) and many more.
+Receiving content from Tumblr, WordPress and RSS is also possible.
+Friendica allows to import and mirror your content via add-ons such as ITTT and Buffer.
+You can control the privacy scope of your content.
 
-Being part of the Fediverse allows you to be free from data-harvesting corporations. Enjoy open social communication, independent of any specific provider.
+Being part of the Fediverse allows you to be free from data-harvesting corporations.
+Enjoy open social communication, independent of any specific provider.
 
-[Join Friendica](https://dir.friendica.social/servers) today or setup [your own Friendica instance](doc/Install.md).
+[Join Friendica](https://dir.friendica.social/servers) today or set up [your own Friendica instance](doc/Install.md).
 
 ### Friendica on desktop
 
-![Frio theme in desktop browser](images/screenshots/friendica-2023-10-frio-desktop.png?raw=true "Frio theme in desktop browser")
+![Frio theme in desktop browser](images/screenshots/friendica-2023-12-frio-desktop.png?raw=true "Frio theme in desktop browser")
 
 ### Friendica on mobile
 
 <p float="left">
-<img src ="https://github.com/friendica/friendica/blob/2023.09-rc/images/screenshots/friendica-2023-10-frio-mobile-timeline-dark-blue.png" width="370" alt="frio on mobile, dark color scheme">
-<img src="https://github.com/friendica/friendica/blob/2023.09-rc/images/screenshots/friendica-2023-10-frio-mobile-options-light-blue.png" width="370" alt="frio on mobile, light color scheme">
+<img src="images/screenshots/friendica-2023-10-frio-mobile-timeline-dark-blue.png" width="370" alt="frio on mobile, dark color scheme">
+<img src="images/screenshots/friendica-2023-10-frio-mobile-options-light-blue.png" width="370" alt="frio on mobile, light color scheme">
 </p>
 
-### Alternative Theme "Vier"
-
-![Vier theme in desktop browser](images/screenshots/friendica-vier-community.png?raw=true "Vier theme in desktop browser")
-
 ## Endorsements
 
-- [![Awesome Humane Tech](images/humane-tech-badge.svg)](https://codeberg.org/teaserbot-labs/delightful-humane-design) In August 2020 Friendica was added to the curated delightful humane design resources in the [Fediverse category](https://codeberg.org/teaserbot-labs/delightful-humane-design#fediverse).
+- Friendica is listed on [![Awesome Humane Tech](images/humane-tech-badge.svg)](https://codeberg.org/teaserbot-labs/delightful-humane-design) in the [Fediverse category](https://codeberg.org/teaserbot-labs/delightful-humane-design#fediverse).

VERSION

@@ -1 +1 @@
-2023.09-rc
+2024.03-dev

bin/auth_ejabberd.php

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

bin/console.php

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

bin/daemon.php

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

bin/testargs.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

bin/wait-for-connection

@@ -1,7 +1,7 @@
 #!/usr/bin/php
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

bin/worker.php

@@ -1,7 +1,7 @@
 #!/usr/bin/env php
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

composer.json

@@ -29,12 +29,12 @@
 		"ext-xml": "*",
 		"asika/simple-console": "^1.0",
 		"bacon/bacon-qr-code": "^2.0.0",
-		"divineomega/password_exposed": "^2.8",
+		"divineomega/password_exposed": "^3",
 		"enyo/dropzone": "^5.9",
 		"ezyang/htmlpurifier": "^4.7",
 		"friendica/json-ld": "^1.0",
 		"geekwright/po": "^2.0",
-		"guzzlehttp/guzzle": "^6.5",
+		"guzzlehttp/guzzle": "^7",
 		"guzzlehttp/oauth-subscriber": "^0.6",
 		"kornrunner/blurhash": "^1.2",
 		"league/html-to-markdown": "^4.8",
@@ -135,7 +135,8 @@
 		"mockery/mockery": "^1.3",
 		"mikey179/vfsstream": "^1.6",
 		"phpunit/phpunit": "^9",
-		"dms/phpunit-arraysubset-asserts": "^0.3.1"
+		"dms/phpunit-arraysubset-asserts": "^0.3.1",
+		"friendsofphp/php-cs-fixer": "^3.46"
 	},
 	"scripts": {
 		"test": "phpunit",
@@ -149,6 +150,8 @@
 		"cs:fix": [
 			"@cs:install",
 			"bin/dev/php-cs-fixer/vendor/bin/php-cs-fixer fix"
-		]
+		],
+		"cs:check-v3": "vendor/bin/php-cs-fixer check --diff",
+		"cs:fix-v3": "vendor/bin/php-cs-fixer fix"
 	}
 }

database.sql

@@ -1,6 +1,6 @@
 -- ------------------------------------------
--- Friendica 2023.09-rc (Giant Rhubarb)
--- DB_UPDATE_VERSION 1542
+-- Friendica 2024.03-dev (Yellow Archangel)
+-- DB_UPDATE_VERSION 1548
 -- ------------------------------------------
 
 
@@ -73,8 +73,6 @@ CREATE TABLE IF NOT EXISTS `user` (
 	`blockwall` boolean NOT NULL DEFAULT '0' COMMENT 'Prohibit contacts to post to the profile page of the user',
 	`hidewall` boolean NOT NULL DEFAULT '0' COMMENT 'Hide profile details from unknown viewers',
 	`blocktags` boolean NOT NULL DEFAULT '0' COMMENT 'Prohibit contacts to tag the post of this user',
-	`unkmail` boolean NOT NULL DEFAULT '0' COMMENT 'Permit unknown people to send private mails to this user',
-	`cntunkmail` int unsigned NOT NULL DEFAULT 10 COMMENT '',
 	`notify-flags` smallint unsigned NOT NULL DEFAULT 65535 COMMENT 'email notification options',
 	`page-flags` tinyint unsigned NOT NULL DEFAULT 0 COMMENT 'page/profile type',
 	`account-type` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
@@ -506,6 +504,9 @@ CREATE TABLE IF NOT EXISTS `channel` (
 	`exclude-tags` varchar(1023) COMMENT 'Comma separated list of tags that aren\'t allowed in the channel',
 	`full-text-search` varchar(1023) COMMENT 'Full text search pattern, see https://mariadb.com/kb/en/full-text-index-overview/#in-boolean-mode',
 	`media-type` smallint unsigned COMMENT 'Filtered media types',
+	`languages` mediumtext COMMENT 'Desired languages',
+	`publish` boolean COMMENT 'publish channel content',
+	`valid` boolean COMMENT 'Set, when the full-text-search is valid',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`),
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
@@ -1236,6 +1237,23 @@ CREATE TABLE IF NOT EXISTS `post-category` (
 	FOREIGN KEY (`tid`) REFERENCES `tag` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='post relation to categories';
 
+--
+-- TABLE post-counts
+--
+CREATE TABLE IF NOT EXISTS `post-counts` (
+	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`vid` smallint unsigned NOT NULL COMMENT 'Id of the verb table entry that contains the activity verbs',
+	`reaction` varchar(4) NOT NULL COMMENT 'Emoji Reaction',
+	`parent-uri-id` int unsigned COMMENT 'Id of the item-uri table that contains the parent uri',
+	`count` int unsigned DEFAULT 0 COMMENT 'Number of activities',
+	 PRIMARY KEY(`uri-id`,`vid`,`reaction`),
+	 INDEX `vid` (`vid`),
+	 INDEX `parent-uri-id` (`parent-uri-id`),
+	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`vid`) REFERENCES `verb` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
+	FOREIGN KEY (`parent-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Original remote activity';
+
 --
 -- TABLE post-collection
 --
@@ -1275,7 +1293,6 @@ CREATE TABLE IF NOT EXISTS `post-content` (
 	 PRIMARY KEY(`uri-id`),
 	 INDEX `plink` (`plink`(191)),
 	 INDEX `resource-id` (`resource-id`),
-	 FULLTEXT INDEX `title-content-warning-body` (`title`,`content-warning`,`body`),
 	 INDEX `quote-uri-id` (`quote-uri-id`),
 	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`quote-uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
@@ -1327,7 +1344,7 @@ CREATE TABLE IF NOT EXISTS `post-engagement` (
 	`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item owner',
 	`contact-type` tinyint NOT NULL DEFAULT 0 COMMENT 'Person, organisation, news, community, relay',
 	`media-type` tinyint NOT NULL DEFAULT 0 COMMENT 'Type of media in a bit array (1 = image, 2 = video, 4 = audio',
-	`language` varbinary(128) COMMENT 'Language information about this post',
+	`language` varchar(128) COMMENT 'Language information about this post',
 	`searchtext` mediumtext COMMENT 'Simplified text for the full text search',
 	`created` datetime COMMENT '',
 	`restricted` boolean NOT NULL DEFAULT '0' COMMENT 'If true, this post is either unlisted or not from a federated network',
@@ -1442,6 +1459,21 @@ CREATE TABLE IF NOT EXISTS `post-question-option` (
 	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Question option';
 
+--
+-- TABLE post-searchindex
+--
+CREATE TABLE IF NOT EXISTS `post-searchindex` (
+	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`network` char(4) COMMENT '',
+	`private` tinyint unsigned COMMENT '0=public, 1=private, 2=unlisted',
+	`searchtext` mediumtext COMMENT 'Simplified text for the full text search',
+	`created` datetime COMMENT '',
+	 PRIMARY KEY(`uri-id`),
+	 INDEX `created` (`created`),
+	 FULLTEXT INDEX `searchtext` (`searchtext`),
+	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Content for all posts';
+
 --
 -- TABLE post-tag
 --
@@ -1693,7 +1725,6 @@ CREATE TABLE IF NOT EXISTS `profile` (
 	`net-publish` boolean NOT NULL DEFAULT '0' COMMENT 'publish profile in global directory',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid_is-default` (`uid`,`is-default`),
-	 FULLTEXT INDEX `pub_keywords` (`pub_keywords`),
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='user profiles data';
 
@@ -2008,6 +2039,20 @@ CREATE VIEW `circle-member-view` AS SELECT
 			INNER JOIN `contact` ON `group_member`.`contact-id` = `contact`.`id`
 			INNER JOIN `group` ON `group_member`.`gid` = `group`.`id`;
 
+--
+-- VIEW post-counts-view
+--
+DROP VIEW IF EXISTS `post-counts-view`;
+CREATE VIEW `post-counts-view` AS SELECT 
+	`post-counts`.`uri-id` AS `uri-id`,
+	`post-counts`.`vid` AS `vid`,
+	`verb`.`name` AS `verb`,
+	`post-counts`.`reaction` AS `reaction`,
+	`post-counts`.`parent-uri-id` AS `parent-uri-id`,
+	`post-counts`.`count` AS `count`
+	FROM `post-counts`
+			INNER JOIN `verb` ON `verb`.`id` = `post-counts`.`vid`;
+
 --
 -- VIEW post-timeline-view
 --
@@ -2936,8 +2981,6 @@ CREATE VIEW `owner-view` AS SELECT
 	`user`.`blockwall` AS `blockwall`,
 	`user`.`hidewall` AS `hidewall`,
 	`user`.`blocktags` AS `blocktags`,
-	`user`.`unkmail` AS `unkmail`,
-	`user`.`cntunkmail` AS `cntunkmail`,
 	`user`.`notify-flags` AS `notify-flags`,
 	`user`.`page-flags` AS `page-flags`,
 	`user`.`account-type` AS `account-type`,

doc/Channels.md

@@ -25,6 +25,10 @@ Predefined Channels
     * Posts from people you interact with on a more than average level.
     * Posts from the accounts that you follow with a more than average number of interactions-
     * Posts from accounts where you activated "notify on new posts" or where you have set the channel frequency accordingly.
+* Discover: Posts from contacts you don't follow, but that might be of interest for you to follow. In detail, it consists of:
+    * Posts from people you don't follow but you interact with on a more than average level.
+    * Posts from people you don't follow but that interact with you on a more than average level.
+    * Popular posts from people you don't follow but you interacted with or who interacted with you on any level.
 * What's Hot: Posts with a more than average number of interactions.
 * Language: Posts in your language.
 * Followers: Posts from your followers that you don't follow.
@@ -80,6 +84,7 @@ Additionally to the search for content, there are additional keywords that can b
     * visibility:public
     * visibility:unlisted
     * visibility:private
+* language - Use "language:code" to search for posts with the given language in the [ISO 639-1](https://en.wikipedia.org/wiki/ISO_639-1) format. 
 
 Remember that you can combine these kerywords.
 So for example you can create a channel with all posts that talk about the Fediverse - that aren't posted in the Fediverse with the search terms: "fediverse -network:apub -network:dfrn"

doc/database.md

@@ -61,6 +61,7 @@ Database Tables
 | [post-category](help/database/db_post-category) | post relation to categories |
 | [post-collection](help/database/db_post-collection) | Collection of posts |
 | [post-content](help/database/db_post-content) | Content for all posts |
+| [post-counts](help/database/db_post-counts) | Original remote activity |
 | [post-delivery](help/database/db_post-delivery) | Delivery data for posts for the batch processing |
 | [post-delivery-data](help/database/db_post-delivery-data) | Delivery data for items |
 | [post-engagement](help/database/db_post-engagement) | Engagement data per post |
@@ -69,6 +70,7 @@ Database Tables
 | [post-media](help/database/db_post-media) | Attached media |
 | [post-question](help/database/db_post-question) | Question |
 | [post-question-option](help/database/db_post-question-option) | Question option |
+| [post-searchindex](help/database/db_post-searchindex) | Content for all posts |
 | [post-tag](help/database/db_post-tag) | post relation to tags |
 | [post-thread](help/database/db_post-thread) | Thread related data |
 | [post-thread-user](help/database/db_post-thread-user) | Thread related data per user |

doc/database/db_channel.md

@@ -18,6 +18,9 @@ Fields
 | exclude-tags     | Comma separated list of tags that aren't allowed in the channel                                   | varchar(1023)      | YES  |     | NULL    |                |
 | full-text-search | Full text search pattern, see https://mariadb.com/kb/en/full-text-index-overview/#in-boolean-mode | varchar(1023)      | YES  |     | NULL    |                |
 | media-type       | Filtered media types                                                                              | smallint unsigned  | YES  |     | NULL    |                |
+| languages        | Desired languages                                                                                 | mediumtext         | YES  |     | NULL    |                |
+| publish          | publish channel content                                                                           | boolean            | YES  |     | NULL    |                |
+| valid            | Set, when the full-text-search is valid                                                           | boolean            | YES  |     | NULL    |                |
 
 Indexes
 ------------

doc/database/db_post-content.md

@@ -30,13 +30,12 @@ Fields
 Indexes
 ------------
 
-| Name                       | Fields                                 |
-| -------------------------- | -------------------------------------- |
-| PRIMARY                    | uri-id                                 |
-| plink                      | plink(191)                             |
-| resource-id                | resource-id                            |
-| title-content-warning-body | FULLTEXT, title, content-warning, body |
-| quote-uri-id               | quote-uri-id                           |
+| Name         | Fields       |
+| ------------ | ------------ |
+| PRIMARY      | uri-id       |
+| plink        | plink(191)   |
+| resource-id  | resource-id  |
+| quote-uri-id | quote-uri-id |
 
 Foreign Keys
 ------------

doc/database/db_post-counts.md

@@ -0,0 +1,35 @@
+Table post-counts
+===========
+
+Original remote activity
+
+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    |       |
+| vid           | Id of the verb table entry that contains the activity verbs | smallint unsigned | NO   | PRI | NULL    |       |
+| reaction      | Emoji Reaction                                              | varchar(4)        | NO   | PRI | NULL    |       |
+| parent-uri-id | Id of the item-uri table that contains the parent uri       | int unsigned      | YES  |     | NULL    |       |
+| count         | Number of activities                                        | int unsigned      | YES  |     | 0       |       |
+
+Indexes
+------------
+
+| Name          | Fields                |
+| ------------- | --------------------- |
+| PRIMARY       | uri-id, vid, reaction |
+| vid           | vid                   |
+| parent-uri-id | parent-uri-id         |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| vid | [verb](help/database/db_verb) | id |
+| parent-uri-id | [item-uri](help/database/db_item-uri) | id |
+
+Return to [database documentation](help/database)

doc/database/db_post-engagement.md

@@ -12,7 +12,7 @@ Fields
 | owner-id     | Item owner                                                            | int unsigned       | NO   |     | 0       |       |
 | contact-type | Person, organisation, news, community, relay                          | tinyint            | NO   |     | 0       |       |
 | media-type   | Type of media in a bit array (1 = image, 2 = video, 4 = audio         | tinyint            | NO   |     | 0       |       |
-| language     | Language information about this post                                  | varbinary(128)     | YES  |     | NULL    |       |
+| language     | Language information about this post                                  | varchar(128)       | YES  |     | NULL    |       |
 | searchtext   | Simplified text for the full text search                              | mediumtext         | YES  |     | NULL    |       |
 | created      |                                                                       | datetime           | YES  |     | NULL    |       |
 | restricted   | If true, this post is either unlisted or not from a federated network | boolean            | NO   |     | 0       |       |

doc/database/db_post-searchindex.md

@@ -0,0 +1,33 @@
+Table post-searchindex
+===========
+
+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    |       |
+| network    |                                                           | char(4)          | YES  |     | NULL    |       |
+| private    | 0=public, 1=private, 2=unlisted                           | tinyint unsigned | YES  |     | NULL    |       |
+| searchtext | Simplified text for the full text search                  | mediumtext       | YES  |     | NULL    |       |
+| created    |                                                           | datetime         | YES  |     | NULL    |       |
+
+Indexes
+------------
+
+| Name       | Fields               |
+| ---------- | -------------------- |
+| PRIMARY    | uri-id               |
+| created    | created              |
+| searchtext | FULLTEXT, searchtext |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+
+Return to [database documentation](help/database)

doc/database/db_profile.md

@@ -56,11 +56,10 @@ Fields
 Indexes
 ------------
 
-| Name           | Fields                 |
-| -------------- | ---------------------- |
-| PRIMARY        | id                     |
-| uid_is-default | uid, is-default        |
-| pub_keywords   | FULLTEXT, pub_keywords |
+| Name           | Fields          |
+| -------------- | --------------- |
+| PRIMARY        | id              |
+| uid_is-default | uid, is-default |
 
 Foreign Keys
 ------------

doc/database/db_user.md

@@ -34,8 +34,6 @@ Fields
 | blockwall                | Prohibit contacts to post to the profile page of the user                         | boolean            | NO   |     | 0                   |                |
 | hidewall                 | Hide profile details from unknown viewers                                         | boolean            | NO   |     | 0                   |                |
 | blocktags                | Prohibit contacts to tag the post of this user                                    | boolean            | NO   |     | 0                   |                |
-| unkmail                  | Permit unknown people to send private mails to this user                          | boolean            | NO   |     | 0                   |                |
-| cntunkmail               |                                                                                   | int unsigned       | NO   |     | 10                  |                |
 | notify-flags             | email notification options                                                        | smallint unsigned  | NO   |     | 65535               |                |
 | page-flags               | page/profile type                                                                 | tinyint unsigned   | NO   |     | 0                   |                |
 | account-type             |                                                                                   | tinyint unsigned   | NO   |     | 0                   |                |

index.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

mod/item.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

mod/lostpass.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

mod/message.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

mod/notes.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

mod/photos.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -215,14 +215,14 @@ function photos_post(App $a)
 			// get the list of photos we are about to delete
 			if ($visitor) {
 				$r = DBA::toArray(DBA::p(
-					"SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `contact-id` = ? AND `uid` = ? AND `album` = ?",
+					"SELECT distinct(`resource-id`) AS `rid` FROM `photo` WHERE `contact-id` = ? AND `uid` = ? AND `album` = ?",
 					$visitor,
 					$page_owner_uid,
 					$album
 				));
 			} else {
 				$r = DBA::toArray(DBA::p(
-					"SELECT distinct(`resource-id`) as `rid` FROM `photo` WHERE `uid` = ? AND `album` = ?",
+					"SELECT distinct(`resource-id`) AS `rid` FROM `photo` WHERE `uid` = ? AND `album` = ?",
 					DI::userSession()->getLocalUserId(),
 					$album
 				));
@@ -762,7 +762,7 @@ function photos_content(App $a)
 
 		$total = 0;
 		$r = DBA::toArray(DBA::p(
-			"SELECT `resource-id`, max(`scale`) AS `scale` FROM `photo` WHERE `uid` = ? AND `album` = ?
+			"SELECT `resource-id`, MAX(`scale`) AS `scale` FROM `photo` WHERE `uid` = ? AND `album` = ?
 			AND `scale` <= 4 $sql_extra GROUP BY `resource-id`",
 			$owner_uid,
 			$album
@@ -782,9 +782,9 @@ function photos_content(App $a)
 		}
 
 		$r = DBA::toArray(DBA::p(
-			"SELECT `resource-id`, ANY_VALUE(`id`) AS `id`, ANY_VALUE(`filename`) AS `filename`,
-			ANY_VALUE(`type`) AS `type`, max(`scale`) AS `scale`, ANY_VALUE(`desc`) as `desc`,
-			ANY_VALUE(`created`) as `created`
+			"SELECT `resource-id`, MIN(`id`) AS `id`, MIN(`filename`) AS `filename`,
+			MIN(`type`) AS `type`, MAX(`scale`) AS `scale`, MIN(`desc`) AS `desc`,
+			MIN(`created`) AS `created`
 			FROM `photo` WHERE `uid` = ? AND `album` = ?
 			AND `scale` <= 4 $sql_extra GROUP BY `resource-id` ORDER BY `created` $order LIMIT ? , ?",
 			intval($owner_uid),
@@ -1167,11 +1167,11 @@ function photos_content(App $a)
 				}
 
 				if (!empty($conv_responses['like'][$link_item['uri']])) {
-					$like = DI::conversation()->formatActivity($conv_responses['like'][$link_item['uri']]['links'], 'like', $link_item['id']);
+					$like = DI::conversation()->formatActivity($conv_responses['like'][$link_item['uri']]['links'], 'like', $link_item['id'], '', []);
 				}
 
 				if (!empty($conv_responses['dislike'][$link_item['uri']])) {
-					$dislike = DI::conversation()->formatActivity($conv_responses['dislike'][$link_item['uri']]['links'], 'dislike', $link_item['id']);
+					$dislike = DI::conversation()->formatActivity($conv_responses['dislike'][$link_item['uri']]['links'], 'dislike', $link_item['id'], '', []);
 				}
 
 				if (($can_post || Security::canWriteToUserWall($owner_uid))) {

mod/update_contact.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

mod/update_notes.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

mods/fpostit/fpostit.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

mods/local.config.ci.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

security.txt

@@ -1,6 +1,6 @@
 Contact: mailto:info@friendi.ca
 
-Expires: 2024-04-30T23:59:59Z
+Expires: 2024-10-30T23:59:59Z
 
 Preferred-Languages: en
 

src/App.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -63,8 +63,8 @@ use Psr\Log\LoggerInterface;
 class App
 {
 	const PLATFORM = 'Friendica';
-	const CODENAME = 'Giant Rhubarb';
-	const VERSION  = '2023.09-rc';
+	const CODENAME = 'Yellow Archangel';
+	const VERSION  = '2024.03-dev';
 
 	// Allow themes to control internal parameters
 	// by changing App values in theme.php

src/App/Arguments.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/App/BaseURL.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/App/Mode.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/App/Page.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/App/Request.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/App/Router.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/BaseCollection.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/BaseDataTransferObject.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/BaseEntity.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/BaseFactory.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/BaseModel.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/BaseModule.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/BaseRepository.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Capabilities/ICanCreateFromTableRow.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Capabilities/ICanCreateResponses.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Capabilities/ICanHandleRequests.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Collection/Api/Mastodon/Emojis.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Collection/Api/Mastodon/Fields.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Collection/Api/Mastodon/Mentions.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Collection/Api/Notifications.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/Addon.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/ArchiveContact.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/AutomaticInstallation.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/Cache.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/Config.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/Contact.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/CreateDoxygen.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/DatabaseStructure.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/DocBloxErrorChecker.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/Extract.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/FixAPDeliveryWorkerTaskParameters.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/GlobalCommunityBlock.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/GlobalCommunitySilence.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/Lock.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/Maintenance.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/MergeContacts.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/MoveToAvatarCache.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/PhpToPo.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/PoToPhp.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/PostUpdate.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/Relay.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/Relocate.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/ServerBlock.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/Storage.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/Test.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/Typo.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Console/User.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -58,7 +58,7 @@ class User extends \Asika\SimpleConsole\Console
 console user - Modify user settings per console commands.
 Usage
 	bin/console user password <nickname> [<password>] [-h|--help|-?] [-v]
-	bin/console user add [<name> [<nickname> [<email> [<language>]]]] [-h|--help|-?] [-v]
+	bin/console user add [<name> [<nickname> [<email> [<language> [<avatar_url>]]]]] [-h|--help|-?] [-v]
 	bin/console user delete [<nickname>] [-y] [-h|--help|-?] [-v]
 	bin/console user allow [<nickname>] [-h|--help|-?] [-v]
 	bin/console user deny [<nickname>] [-h|--help|-?] [-v]
@@ -228,10 +228,11 @@ HELP;
 	 */
 	private function addUser()
 	{
-		$name  = $this->getArgument(1);
-		$nick  = $this->getArgument(2);
-		$email = $this->getArgument(3);
-		$lang  = $this->getArgument(4);
+		$name   = $this->getArgument(1);
+		$nick   = $this->getArgument(2);
+		$email  = $this->getArgument(3);
+		$lang   = $this->getArgument(4);
+		$avatar = $this->getArgument(5);
 
 		if (empty($name)) {
 			$this->out($this->l10n->t('Enter user name: '));
@@ -262,10 +263,15 @@ HELP;
 			$lang = CliPrompt::prompt();
 		}
 
+		if (empty($avatar)) {
+			$this->out($this->l10n->t('Enter URL of an image to use as avatar (optional): '));
+			$avatar = CliPrompt::prompt();
+		}
+
 		if (empty($lang)) {
 			return UserModel::createMinimal($name, $email, $nick);
 		} else {
-			return UserModel::createMinimal($name, $email, $nick, $lang);
+			return UserModel::createMinimal($name, $email, $nick, $lang, $avatar);
 		}
 	}
 

src/Contact/Avatar.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -80,7 +80,7 @@ class Avatar
 			return $fields;
 		}
 
-		$img_str = $fetchResult->getBody();
+		$img_str = $fetchResult->getBodyString();
 		if (empty($img_str)) {
 			Logger::debug('Avatar is invalid', ['avatar' => $avatar]);
 			return $fields;

src/Contact/FriendSuggest/Collection/FriendSuggests.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Contact/FriendSuggest/Entity/FriendSuggest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Contact/FriendSuggest/Exception/FriendSuggestNotFoundException.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Contact/FriendSuggest/Exception/FriendSuggestPersistenceException.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Contact/FriendSuggest/Factory/FriendSuggest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Contact/FriendSuggest/Repository/FriendSuggest.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Contact/Header.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Contact/Introduction/Collection/Introductions.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Contact/Introduction/Entity/Introduction.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Contact/Introduction/Exception/IntroductionNotFoundException.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Contact/Introduction/Exception/IntroductionPersistenceException.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Contact/Introduction/Factory/Introduction.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *

src/Contact/Introduction/Repository/Introduction.php

@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2023, the Friendica project
+ * @copyright Copyright (C) 2010-2024, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *