Merge pull request #14028 from nupplaphil/bug/empty_char

[Hotfix][CI] Wrong empty char at database.sql

.ddev/config.yaml

@@ -1,7 +1,7 @@
 name: my-friendica
 type: php
 docroot: ""
-php_version: "7.3"
+php_version: "7.4"
 webserver_type: apache-fpm
 router_http_port: "80"
 router_https_port: "443"
@@ -17,7 +17,7 @@ use_dns_when_possible: true
 composer_version: "1"
 web_environment: []
 nodejs_version: "16"
-webimage_extra_packages: [php7.3-gmp]
+webimage_extra_packages: [php7.4-gmp]
 
 # Key features of ddev's config.yaml:
 

.gitignore

@@ -19,7 +19,7 @@ robots.txt
 /doc/cache
 
 #ignore reports, should be generated with every build
-report/
+/report/
 
 #ignore config files from eclipse, we don't want IDE files in our repository
 .project
@@ -33,7 +33,7 @@ report/
 #ignore NetBeans IDE's private files (at least)
 /nbproject/private/
 
-Ignore config files from VSCode
+#Ignore config files from VSCode
 /.vscode/
 
 #ignore smarty cache
@@ -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')

.woodpecker/.code_standards_check.yml

@@ -1,4 +1,4 @@
-pipeline:
+steps:
   restore_cache:
     image: meltwater/drone-cache:dev
     settings:

.woodpecker/.continuous-deployment.yml

@@ -11,11 +11,11 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone:
     image: alpine/git
     commands:
-      - git clone $CI_REPO_LINK .
+      - git clone $CI_REPO_CLONE_URL .
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF
       - git merge $CI_COMMIT_SHA
@@ -39,7 +39,7 @@ pipeline:
       branch: [ develop, '*-rc' ]
       event: push
   composer_install:
-    image: friendicaci/php7.4:php7.4.33
+    image: friendicaci/php8.2:php8.2.16
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

.woodpecker/.database_checks.yml

@@ -1,12 +1,17 @@
 matrix:
   include:
-    - PHP_MAJOR_VERSION: 7.4
-      PHP_VERSION: 7.4.33
+    - PHP_MAJOR_VERSION: 8.2
+      PHP_VERSION: 8.2.16
 
-branches:
+when:
+  - branch:
       exclude: [ stable ]
 
-pipeline:
+# This forces CI executions at the "opensocial" labeled location (because of much more power...)
+labels:
+  location: opensocial
+
+steps:
   db_version_match:
     image: friendicaci/transifex
     commands:

.woodpecker/.license_check.yml

@@ -1,4 +1,4 @@
-pipeline:
+steps:
   check:
     image: friendicaci/php-cs
     commands:

.woodpecker/.messages.po_check.yml

@@ -1,4 +1,4 @@
-pipeline:
+steps:
   build_xgettext:
     image: friendicaci/transifex
     commands:
@@ -8,5 +8,6 @@ pipeline:
     commands:
       - /check-messages.sh
 
-branches:
+when:
+  - branch:
       exclude: [ stable ]

.woodpecker/.phpunit.yml

@@ -1,24 +1,25 @@
 matrix:
   include:
-    - PHP_MAJOR_VERSION: 7.3
-      PHP_VERSION: 7.3.33
     - PHP_MAJOR_VERSION: 7.4
       PHP_VERSION: 7.4.33
     - PHP_MAJOR_VERSION: 8.0
-      PHP_VERSION: 8.0.25
+      PHP_VERSION: 8.0.30
     - PHP_MAJOR_VERSION: 8.1
-      PHP_VERSION: 8.1.12
+      PHP_VERSION: 8.1.27
+    - PHP_MAJOR_VERSION: 8.2
+      PHP_VERSION: 8.2.16
+    - PHP_MAJOR_VERSION: 8.3
+      PHP_VERSION: 8.3.3
 
 # This forces PHP Unit executions at the "opensocial" labeled location (because of much more power...)
 labels:
   location: opensocial
 
-pipeline:
+steps:
   php-lint:
     image: php:${PHP_MAJOR_VERSION}
-    group: lint
     commands:
-      - ./bin/composer.phar run lint
+      - find . -name \*.php -not -path './vendor/*' -not -path './view/asset/*' -print0 | xargs -0 -n1 php -l
   restore_cache:
     image: meltwater/drone-cache:dev
     settings:
@@ -64,19 +65,19 @@ pipeline:
       - cp config/local-sample.config.php config/local.config.php
       - if ! bin/wait-for-connection $MYSQL_HOST $MYSQL_PORT 300; then echo "[ERROR] Waited 300 seconds, no response" >&2; exit 1; fi
       - mysql -h$MYSQL_HOST -P$MYSQL_PORT -p$MYSQL_PASSWORD -u$MYSQL_USER $MYSQL_DATABASE < database.sql
-      - if [ "${PHP_MAJOR_VERSION}" = "7.4" -a "${CI_REPO}" = "friendica/friendica" ]; then
+      - if [ "${PHP_MAJOR_VERSION}" = "8.2" -a "${CI_REPO}" = "friendica/friendica" ]; then
           phpenmod xdebug;
           export XDEBUG_MODE=coverage;
-          phpunit --configuration tests/phpunit.xml --coverage-clover clover.xml;
+          phpunit --configuration tests/phpunit.xml -d memory_limit=-1 --coverage-clover clover.xml;
         else
-          phpunit --configuration tests/phpunit.xml;
+          phpunit --configuration tests/phpunit.xml -d memory_limit=-1;
         fi
   codecov:
     image: friendicaci/codecov
     when:
       matrix:
-        PHP_MAJOR_VERSION: 7.4
-        PHP_VERSION: 7.4.33
+        PHP_MAJOR_VERSION: 8.2
+        PHP_VERSION: 8.2.16
       repo:
         - friendica/friendica
     commands:

.woodpecker/.releaser.yml

@@ -9,11 +9,11 @@ labels:
 
 skip_clone: true
 
-pipeline:
+steps:
   clone:
     image: alpine/git
     commands:
-      - git clone $CI_REPO_LINK .
+      - git clone $CI_REPO_CLONE_URL .
       - git checkout $CI_COMMIT_BRANCH
       - git fetch origin $CI_COMMIT_REF
       - git merge $CI_COMMIT_SHA
@@ -37,7 +37,7 @@ pipeline:
       branch: stable
       event: tag
   composer_install:
-    image: friendicaci/php7.4:php7.4.33
+    image: friendicaci/php8.2:php8.2.16
     commands:
       - export COMPOSER_HOME=.composer
       - composer validate

CHANGELOG

@@ -1,3 +1,184 @@
+Version 2024.03 (2024-03-21)
+  Friendica Core
+    Updates to the translations AR, BG, CS, DE, EO, ES, FR, GD, HU, IS, IT, JA, PL, RO, RU, SV
+    Updates to the themes (frio, vier) [annando, foss-, haheute, MrPetovan, Raroun, toddy15]
+    Improved the channel feature [annando]
+    Improved the search performance [annando]
+    Improved spam detection [annando]
+    Improved the account overview on the moderation page [annando]
+    Improved account creation via CLI console [mexon]
+    Improved the Mastodon compatible API [annando, MrPetovan]
+    Improved logging of the system load value [annando]
+    Improved image handling [annando]
+    Improved detection of user activity [annando]
+    Improved display of embedded videos [annando]
+    Fixed an issue that could lead to empty URLs in the server block list [annando]
+    Fixed XSS attacks [leoOliver, MrPetovan, snajafov]
+    Fixed an issue when importing emails [annando]
+    Fixed an issue that blocked users could still use the API [annando]
+    Fixed an issue when fetching remote content [annando, arcanicanis]
+    Fixed an issue with unescaped HTML characters for RSS feeds [MrPetovan, r1pu5u]
+    Fixed an issue when showing the post preview [annando]
+    General code cleanup [annando, MrPetovan]
+    Updated the PasswordExposed usage [mexon]
+    Removed fpostit (Friendica post bookmarklet) [MrPetovan]
+    Removed the possibility for users to follow relays directly [annando]
+    Removed unused OEmbed functionality [annando]
+    Removed legacy schemes from frio theme [MrPetovan]
+    Added blur effect to sensitive images and user setting against it [annando]
+    Added account type Channel Relay [annando]
+    Added OCR generated image descriptions via tesseract addon [annando]
+    Added WebP and BMP support [annando]
+    Added blocked email addresses for registration [annando]
+
+  Friendica Addons
+    advancedcontentfilter
+      Updated dependency for PHP8.2 compatibility [MrPetovan]
+    blockbot
+      Fixed an issue preventing the creation of previews on remote systems [annando]
+      Updated block lists [annando]
+    bluesky
+      Overhaul of the Bluesky connector [annando]
+      Fixed problem with empty quoted shares [annando]
+    openstreetmap
+      Fix a config problem [haheute]
+    pnut:
+      Connector addon was added [spacenerdmo]
+    tesseract
+      Added the addon to generate image descriptions from images via OCR [annando]
+	  tumblr
+      Improved handling of quoted shares [annando]
+    url_replace
+      Added addon to replace URLs from Twitter, Youtube and some others using 12ft.io [toddy15]
+      Fixed an issue with empty config vars [MrPetovan]
+
+  Closed Issues
+      903,  7732,  8768, 11142, 13220, 13293, 13765, 13768, 13809,
+    13814, 13814, 13818, 13819, 13822, 13823, 13828, 13837, 13839,
+    13844, 13845, 13859, 13863, 13873, 13877, 13886, 13887, 13897,
+    13899, 13905, 13909, 13922, 13925, 13930, 13939, 13940, 13946,
+    13947, 13949, 13950, 13953, 13955, 13959, 13968, 13969, 13972,
+    13984, 13985, 13986
+
+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

CONTRIBUTING.md

@@ -1,5 +1,5 @@
 # How to Contribute
 
-If you want to contribute to the project, you don’t need to have coding experience. There are a number of tasks listed in the issue tracker with the label “[Junior Jobs](https://github.com/friendica/friendica/issues?q=is%3Aopen+is%3Aissue+label%3A%22Junior+Jobs%22)” we think are good for new contributors. But you are by no means limited to these – if you find a solution to a problem (even a new one) please make a pull request at [github](https://github.com/friendica/friendica) or let us know in the [development forum](https://forum.friendi.ca/profile/developers).
+If you want to contribute to the project, you don’t need to have coding experience. There are a number of tasks listed in the issue tracker with the label “[Junior Jobs](https://github.com/friendica/friendica/issues?q=is%3Aopen+is%3Aissue+label%3A%22Junior+Jobs%22)” we think are good for new contributors. But you are by no means limited to these – if you find a solution to a problem (even a new one) please make a pull request at [github](https://github.com/friendica/friendica) or let us know in the [development group](https://forum.friendi.ca/profile/developers).
 
 Contribution to Friendica is also not limited to coding. Any contribution to the [documentation](https://github.com/friendica/friendica/tree/develop/doc), the [translation](https://app.transifex.com/Friendica/friendica/dashboard/) or advertisement materials is welcome or reporting a problem. You don’t need to deal with Git(Hub) or Transifex if you don’t like to. Just [get in touch](https://forum.friendi.ca/profile/helpers) with us and we will get the materials to the appropriate places.

CREDITS.txt

@@ -31,6 +31,8 @@ Angristan
 Anthronaut
 Anton
 Antron Samurai
+Anubis2814
+arcanicanis
 Arian - Cazare Muncitori
 Asher Pen
 atjn
@@ -51,6 +53,7 @@ BinkaDroid
 Bjoessi
 bkil
 bob lebonche
+Boluwatife Victor
 Boris Daniel Martinez Millàn
 bufalo1973
 ButterflyOfFire
@@ -69,8 +72,8 @@ Christian Wiwie
 Cohan Robinson
 Colby Sollars
 Copiis
-Copiis Praeesse
 CrystalStiletto
+csolisr
 Cyboulette
 Cyryl Sochacki
 czarnystokrotek
@@ -98,6 +101,7 @@ Eelco Maljaars
 effex7
 Elena
 emilia.krawczyk
+Entropy Engineer
 Eric Côté
 Erich
 erik
@@ -108,10 +112,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,24 +127,29 @@ Gerhard Seeber
 gerhard6380
 Gert Cauwenberg
 Gidi Kroon
+git-marijus
 GLComo
 greeneyedred
 Gregory Smith
 Grischa Brockhaus
+groen
 gudzpoz
 GunChleoc
 guzzisti
 Haakon Meland Eriksen
+haheute
 Hank Grabowski
 Hannes Heute
 Hans Meine
 Hauke
 Hauke Altmann
+Henrik Härkönen
 Herbert Thielen
 hlad
 hoergen
 Hubert Kościański
 Hypolite Petovan
+ike
 Ilmari
 ImgBotApp
 irhen
@@ -156,6 +167,7 @@ Johannes Schwab
 John Brazil
 John Mortensen
 Jonatan Nyberg
+Jonathan Lamothe
 Jonny Tischbein
 Josef Moravek
 Josh Soref
@@ -168,11 +180,13 @@ Karolina
 Kastal András
 Keenan Pepper
 Keith Fernie
+keithhacks
 Klaus Weidenbach
 Koyu Berteon
 kPherox
 Kris
 Kristoffer Grundström
+ktlinux
 KulikAlex
 Lea1995polish
 Leberwurscht
@@ -211,6 +225,7 @@ Michal Šupler
 Michalina
 Mike Macgirvin
 miqrogroove
+Morgan McMillian
 mpanhans
 mytbk
 nathilia-peirce
@@ -244,8 +259,10 @@ Pierre Bernardeau
 Pierre Rudloff
 Piotr Blonkowski
 Piotr Strębski
+pixelroot
 pokerazor
 R C
+r1pu5u
 Rabuzarus
 Radek
 Rafael Garau
@@ -254,6 +271,7 @@ Rain Hawk
 Rainulf Pineda
 Ralf Thees
 ralph van der honing
+Raroun
 Ratten
 rcmaniac
 RealKinetix
@@ -269,6 +287,7 @@ Roland Häder
 Ruud Schilders
 rwa
 Ryan Voots
+S. Brusch
 S.Krumbholz
 Sakałoŭ Alaksiej
 Sam
@@ -281,9 +300,11 @@ Senex Petrovic
 Seth
 SickShark X
 Silke Meyer
+Simon
 Simon L'nu
 Simon Rupf
 Simó Albert i Beltran
+snajafov
 softmetz
 soko1
 Spencer Dub
@@ -314,6 +335,7 @@ TiMESPLiNTER
 Tino
 Tobias Diekershoff
 Tobias Hößl
+Tobias Quathamer
 Tom
 Tom Aurlund
 Tom Hu
@@ -324,6 +346,7 @@ Torbjörn Andersson
 TORminator
 trebor
 tschlotfeldt
+tslmuun
 Tubuntu
 Tupambae.org
 U-SOUND\mike
@@ -345,6 +368,7 @@ Waldemar Stoczkowski
 Walter Bulbazor
 Wanting Chen
 Wil Tur
+Wladimir Palant
 Wouter Broers
 Xiaofei Xu
 XMPPはいいぞ

README.md

@@ -1,46 +1,30 @@
-Friendica Social Communications Server
-======================================
+Friendica - your open and free social network
+=============================================
 
-Welcome to the free social web.
+Welcome to the free social web. Friendica is a platform for decentralised social communication linking to other independent social and corporate services.
 
-Friendica is a decentralised communications platform that integrates social communication. Our platform links to independent social projects 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 control the privacy scope of your content.
 
-Our mission is to free friends, family and colleagues from data-harvesting corporations; we aim for social communication to be free and open, while flowing between any provider as easily as email does.
+Being part of the Fediverse allows you to be free from data-harvesting corporations.
+Enjoy open social communication, independent of any specific provider.
 
-Friendica connects you effortlessly to a federated communications network of several thousand servers, with more than half a million user registrations. You can directly connect to anyone on [Friendica]( https://friendi.ca), [Mastodon](https://joinmastodon.org/), [Diaspora](https://diasporafoundation.org/), [GnuSocial](https://gnu.io/social/), [Pleroma](https://pleroma.social/), or [Hubzilla](https://hubzilla.org/), regardless where each user profile is hosted.
+[Join Friendica](https://dir.friendica.social/servers) today or set up [your own Friendica instance](doc/Install.md).
 
-With Friendica, you can also fully interact with anyone on Twitter and receive any content from Tumblr, Wordpress or RSS. Friendica allows you to integrate most things on the web via a range of addons such as ITTT, Buffer; you will be able to easily control your own data as you decide.
+### Friendica on desktop
 
-Join today and [get your Friendica profile!](https://dir.friendica.social/servers 'Join Friendica today!')
+![Frio theme in desktop browser](images/screenshots/friendica-2023-12-frio-desktop.png?raw=true "Frio theme in desktop browser")
 
-Have a look at the [installation documentation](doc/Install.md) for further information about installing and using Friendica.
+### Friendica on mobile
 
-### Friendica Screenshots
-
-| ![Frio theme in mobile browser](images/screenshots/friendica-frio-mobile-profile-1.png?raw=true "Frio theme in mobile browser") ![Frio theme in mobile browser](images/screenshots/friendica-frio-mobile-profile-2.png?raw=true "Frio theme in mobile browser")
-|:--:|
-|*Frio theme, mobile browser. Timeline and composer view.*|
-|![Frio theme in desktop browser](images/screenshots/friendica-frio-green-profile-1.png?raw=true "Frio theme in desktop browser")
-|*Frio theme, desktop browser. Timeline view, contact info popped up, control menu open.*|
-|![Frio theme in desktop browser](images/screenshots/friendica-frio-green-profile-2.png?raw=true "Frio theme in desktop browser")
-|*Frio theme, desktop browser. Menu open for controlling individual posts.*|
-|![Frio theme in desktop browser](images/screenshots/friendica-frio-red-profile-3.png?raw=true "Frio theme in desktop browser")
-|*Frio theme, desktop browser. Profile view, notification menu open.*|
-|![Frio theme in desktop browser](images/screenshots/friendica-frio-red-profile-2.png?raw=true "Frio theme in desktop browser")
-|*Number of new posts, in total and by group.*|
-|![Frio theme in desktop browser](images/screenshots/friendica-frio-red-profile-1.png?raw=true "Frio theme in desktop browser")
-|*Calender with popup of event.*|
-|![Frio theme default colour in standard browser on tablet](images/screenshots/friendica-frio-default-profile-1.png?raw=true "Frio theme default colour in standard browser on tablet")
-|*Notifications menu and private messages counter, standard browser on tablet.*|
-|![Frio theme in desktop browser](images/screenshots/friendica-frio-brown-profile-2.png?raw=true "Frio theme in desktop browser")
-|*Number of visible contacts, standard browser.*|
-|![Frio theme in desktop browser](images/screenshots/friendica-frio-brown-profile-1.png?raw=true "Frio theme in desktop browser")
-|*Network posts chronologically ordered, standard browser.*|
-|![Vier theme in desktop browser](images/screenshots/friendica-vier-profile.png?raw=true "Vier theme in desktop browser")
-|*Vier theme, desktop browser. Public timeline view.*|
-|![Vier theme in desktop browser](images/screenshots/friendica-vier-community.png?raw=true "Vier theme in desktop browser")
-|*Vier theme, desktop browser. Community post displayed.*|
+<p float="left">
+<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>
 
 ## Endorsements
 
-- [![Awesome Humane Tech](images/humane-tech-badge.svg)](https://github.com/humanetech-community/awesome-humane-tech) On August 12th 2020, Friendica was added to [the curated Awesome Humane Tech directory](https://github.com/humanetech-community/awesome-humane-tech) in [the "Fediverse" category](https://github.com/humanetech-community/awesome-humane-tech#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.05
+2024.03

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
  *
@@ -58,6 +58,7 @@ if (php_sapi_name() !== 'cli') {
 
 use Dice\Dice;
 use Friendica\App\Mode;
+use Friendica\Core\Logger\Capability\LogChannel;
 use Friendica\Security\ExAuth;
 use Psr\Log\LoggerInterface;
 
@@ -78,7 +79,10 @@ chdir($directory);
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['auth_ejabberd']]);
+/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
+$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
+$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies'));
+$dice = $dice->addRule(LoggerInterface::class,['constructParams' => [LogChannel::AUTH_JABBERED]]);
 
 \Friendica\DI::init($dice);
 \Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));

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
  *
@@ -26,13 +26,17 @@ if (php_sapi_name() !== 'cli') {
 }
 
 use Dice\Dice;
+use Friendica\Core\Logger\Capability\LogChannel;
 use Friendica\DI;
 use Psr\Log\LoggerInterface;
 
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['console']]);
+/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
+$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
+$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies'));
+$dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [LogChannel::CONSOLE]]);
 
 /// @fixme Necessary until Hooks inside the Logger can get loaded without the DI-class
 DI::init($dice);

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
  *
@@ -60,7 +60,10 @@ if (!file_exists('index.php') && (sizeof($_SERVER['argv']) != 0)) {
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['daemon']]);
+/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
+$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
+$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies'));
+$dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [Logger\Capability\LogChannel::DAEMON]]);
 
 DI::init($dice);
 \Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));
@@ -160,9 +163,14 @@ if (!$foreground) {
 		exit(1);
 	} elseif ($pid) {
 		// The parent process continues here
+		if (!file_put_contents($pidfile, $pid)) {
+			echo "Pid file wasn't written.\n";
+			Logger::warning('Could not store pid file');
+			posix_kill($pid, SIGTERM);
+			exit(1);
+		}
 		echo 'Child process started with pid ' . $pid . ".\n";
 		Logger::notice('Child process started', ['pid' => $pid]);
-		file_put_contents($pidfile, $pid);
 		exit(0);
 	}
 

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
  *
@@ -29,6 +29,7 @@ if (php_sapi_name() !== 'cli') {
 use Dice\Dice;
 use Friendica\App;
 use Friendica\App\Mode;
+use Friendica\Core\Logger\Capability\LogChannel;
 use Friendica\Core\Update;
 use Friendica\Core\Worker;
 use Friendica\DI;
@@ -54,7 +55,10 @@ if (!file_exists("index.php") && (sizeof($_SERVER["argv"]) != 0)) {
 require dirname(__DIR__) . '/vendor/autoload.php';
 
 $dice = (new Dice())->addRules(include __DIR__ . '/../static/dependencies.config.php');
-$dice = $dice->addRule(LoggerInterface::class,['constructParams' => ['worker']]);
+/** @var \Friendica\Core\Addon\Capability\ICanLoadAddons $addonLoader */
+$addonLoader = $dice->create(\Friendica\Core\Addon\Capability\ICanLoadAddons::class);
+$dice = $dice->addRules($addonLoader->getActiveAddonConfig('dependencies'));
+$dice = $dice->addRule(LoggerInterface::class, ['constructParams' => [LogChannel::WORKER]]);
 
 DI::init($dice);
 \Friendica\Core\Logger\Handler\ErrorHandler::register($dice->create(\Psr\Log\LoggerInterface::class));

composer.json

@@ -13,7 +13,7 @@
 		"issues": "https://github.com/friendica/friendica/issues"
 	},
 	"require": {
-		"php": ">=7.3",
+		"php": ">=7.4",
 		"ext-ctype": "*",
 		"ext-curl": "*",
 		"ext-dom": "*",
@@ -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",
@@ -44,7 +44,7 @@
 		"mattwright/urlresolver": "^2.0",
 		"michelf/php-markdown": "^1.7",
 		"minishlink/web-push": "^6.0",
-		"mobiledetect/mobiledetectlib": "^2.8",
+		"mobiledetect/mobiledetectlib": "^3.74",
 		"nikic/fast-route": "^1.3",
 		"paragonie/hidden-string": "^1.0",
 		"patrickschur/language-detection": "^5.0.0",
@@ -53,7 +53,7 @@
 		"pragmarx/google2fa": "^5.0",
 		"pragmarx/recovery": "^0.2",
 		"psr/clock": "^1.0",
-		"psr/container": "^1.0",
+		"psr/container": "^2.0",
 		"psr/log": "^1.1",
 		"seld/cli-prompt": "^1.0",
 		"smarty/smarty": "^4",
@@ -77,6 +77,12 @@
 		"npm-asset/textcomplete": "^0.18.2",
 		"npm-asset/typeahead.js": "^0.11.1"
 	},
+	"suggest": {
+		"ext-imagick": "For faster image processing",
+		"ext-redis": "To use Redis as a locking or caching provider",
+		"ext-pdo": "To use PDO as a database driver, has priority over mysqli unless database.disable_pdo is set",
+		"ext-mysqli": "To use mysqli as a databse driver"
+	},
 	"repositories": [
 		{
 			"type": "vcs",
@@ -96,7 +102,7 @@
 	},
 	"config": {
 		"platform": {
-			"php": "7.3"
+			"php": "7.4"
 		},
 		"autoloader-suffix": "Friendica",
 		"optimize-autoloader": true,
@@ -129,11 +135,13 @@
 		"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",
 		"lint": "find . -name \\*.php -not -path './vendor/*' -not -path './view/asset/*' -print0 | xargs -0 -n1 php -l",
+		"docker:translate": "docker run --rm -v $PWD:/data -w /data friendicaci/transifex bin/run_xgettext.sh",
 		"cs:install": "@composer install --working-dir=bin/dev/php-cs-fixer",
 		"cs:check": [
 			"@cs:install",
@@ -142,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.05 (Giant Rhubarb)
--- DB_UPDATE_VERSION 1518
+-- Friendica 2024.03 (Yellow Archangel)
+-- DB_UPDATE_VERSION 1557
 -- ------------------------------------------
 
 
@@ -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 '',
@@ -101,6 +99,19 @@ CREATE TABLE IF NOT EXISTS `user` (
 	FOREIGN KEY (`parent-uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='The local users';
 
+--
+-- TABLE user-gserver
+--
+CREATE TABLE IF NOT EXISTS `user-gserver` (
+	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
+	`gsid` int unsigned NOT NULL DEFAULT 0 COMMENT 'Gserver id',
+	`ignored` boolean NOT NULL DEFAULT '0' COMMENT 'server accounts are ignored for the user',
+	 PRIMARY KEY(`uid`,`gsid`),
+	 INDEX `gsid` (`gsid`),
+	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`gsid`) REFERENCES `gserver` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User settings about remote servers';
+
 --
 -- TABLE item-uri
 --
@@ -160,8 +171,8 @@ 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` varbinary(383) DEFAULT '' COMMENT 'baseurl of the contact',
-	`gsid` int unsigned COMMENT 'Global Server ID',
+	`baseurl` varbinary(383) DEFAULT '' COMMENT 'baseurl of the contact from the gserver record, can be missing',
+	`gsid` int unsigned COMMENT 'Global Server ID, can be missing',
 	`bd` date NOT NULL DEFAULT '0001-01-01' COMMENT '',
 	`reason` text COMMENT '',
 	`self` boolean NOT NULL DEFAULT '0' COMMENT '1 if the contact is the user him/her self',
@@ -190,7 +201,7 @@ CREATE TABLE IF NOT EXISTS `contact` (
 	`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',
+	`forum` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a group. Deprecated, use \'contact-type\' = \'community\' and \'manually-approve\' = false instead',
 	`prv` boolean NOT NULL DEFAULT '0' COMMENT 'contact is a private group. Deprecated, use \'contact-type\' = \'community\' and \'manually-approve\' = true instead',
 	`bdyear` varchar(4) NOT NULL DEFAULT '' COMMENT '',
 	`site-pubkey` text COMMENT 'Deprecated',
@@ -252,9 +263,9 @@ CREATE TABLE IF NOT EXISTS `permissionset` (
 	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner id of this permission set',
 	`allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'',
-	`allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
+	`allow_gid` mediumtext COMMENT 'Access Control - list of allowed circles',
 	`deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
-	`deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
+	`deny_gid` mediumtext COMMENT 'Access Control - list of denied circles',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid_allow_cid_allow_gid_deny_cid_deny_gid` (`uid`,`allow_cid`(50),`allow_gid`(30),`deny_cid`(50),`deny_gid`(30)),
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
@@ -457,9 +468,9 @@ CREATE TABLE IF NOT EXISTS `attach` (
 	`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',
 	`allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>',
-	`allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
+	`allow_gid` mediumtext COMMENT 'Access Control - list of allowed circles',
 	`deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
-	`deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
+	`deny_gid` mediumtext COMMENT 'Access Control - list of denied circles',
 	`backend-class` tinytext COMMENT 'Storage backend class',
 	`backend-ref` text COMMENT 'Storage backend data reference',
 	 PRIMARY KEY(`id`),
@@ -479,6 +490,30 @@ CREATE TABLE IF NOT EXISTS `cache` (
 	 INDEX `k_expires` (`k`,`expires`)
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Stores temporary data';
 
+--
+-- TABLE channel
+--
+CREATE TABLE IF NOT EXISTS `channel` (
+	`id` int unsigned NOT NULL auto_increment COMMENT '',
+	`uid` mediumint unsigned NOT NULL COMMENT 'User id',
+	`label` varchar(64) NOT NULL COMMENT 'Channel label',
+	`description` varchar(64) COMMENT 'Channel description',
+	`circle` int COMMENT 'Circle or channel that this channel is based on',
+	`access-key` varchar(1) COMMENT 'Access key',
+	`include-tags` varchar(1023) COMMENT 'Comma separated list of tags that will be included in the channel',
+	`exclude-tags` varchar(1023) COMMENT 'Comma separated list of tags that aren\'t allowed in the channel',
+	`min-size` int unsigned COMMENT 'Minimum post size',
+	`max-size` int unsigned COMMENT 'Maximum post size',
+	`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
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='User defined Channels';
+
 --
 -- TABLE config
 --
@@ -497,9 +532,14 @@ CREATE TABLE IF NOT EXISTS `config` (
 CREATE TABLE IF NOT EXISTS `contact-relation` (
 	`cid` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact the related contact had interacted with',
 	`relation-cid` int unsigned NOT NULL DEFAULT 0 COMMENT 'related contact who had interacted with the contact',
-	`last-interaction` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last interaction',
+	`last-interaction` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last interaction by relation-cid on cid',
 	`follow-updated` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT 'Date of the last update of the contact relationship',
-	`follows` boolean NOT NULL DEFAULT '0' COMMENT '',
+	`follows` boolean NOT NULL DEFAULT '0' COMMENT 'if true, relation-cid follows cid',
+	`score` smallint unsigned COMMENT 'score for interactions of cid on relation-cid',
+	`relation-score` smallint unsigned COMMENT 'score for interactions of relation-cid on cid',
+	`thread-score` smallint unsigned COMMENT 'score for interactions of cid on threads of relation-cid',
+	`relation-thread-score` smallint unsigned COMMENT 'score for interactions of relation-cid on threads of cid',
+	`post-score` smallint unsigned COMMENT 'score for the amount of posts from cid that can be seen by relation-cid',
 	 PRIMARY KEY(`cid`,`relation-cid`),
 	 INDEX `relation-cid` (`relation-cid`),
 	FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
@@ -662,9 +702,9 @@ CREATE TABLE IF NOT EXISTS `event` (
 	`nofinish` boolean NOT NULL DEFAULT '0' COMMENT 'if event does have no end this is 1',
 	`ignore` boolean NOT NULL DEFAULT '0' COMMENT '0 or 1',
 	`allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'',
-	`allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
+	`allow_gid` mediumtext COMMENT 'Access Control - list of allowed circles',
 	`deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
-	`deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
+	`deny_gid` mediumtext COMMENT 'Access Control - list of denied circles',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid_start` (`uid`,`start`),
 	 INDEX `cid` (`cid`),
@@ -716,29 +756,29 @@ CREATE TABLE IF NOT EXISTS `group` (
 	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
 	`uid` mediumint unsigned NOT NULL DEFAULT 0 COMMENT 'Owner User id',
 	`visible` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the member list is not private',
-	`deleted` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the group has been deleted',
-	`cid` int unsigned COMMENT 'Contact id of forum. When this field is filled then the members are synced automatically.',
-	`name` varchar(255) NOT NULL DEFAULT '' COMMENT 'human readable name of group',
+	`deleted` boolean NOT NULL DEFAULT '0' COMMENT '1 indicates the circle has been deleted',
+	`cid` int unsigned COMMENT 'Contact id of group. When this field is filled then the members are synced automatically.',
+	`name` varchar(255) NOT NULL DEFAULT '' COMMENT 'human readable name of circle',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`),
 	 INDEX `cid` (`cid`),
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy groups, group info';
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy circles, circle info';
 
 --
 -- TABLE group_member
 --
 CREATE TABLE IF NOT EXISTS `group_member` (
 	`id` int unsigned NOT NULL auto_increment COMMENT 'sequential ID',
-	`gid` int unsigned NOT NULL DEFAULT 0 COMMENT 'groups.id of the associated group',
-	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id of the member assigned to the associated group',
+	`gid` int unsigned NOT NULL DEFAULT 0 COMMENT 'group.id of the associated circle',
+	`contact-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'contact.id of the member assigned to the associated circle',
 	 PRIMARY KEY(`id`),
 	 INDEX `contactid` (`contact-id`),
 	 UNIQUE INDEX `gid_contactid` (`gid`,`contact-id`),
 	FOREIGN KEY (`gid`) REFERENCES `group` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`contact-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy groups, member info';
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='privacy circles, member info';
 
 --
 -- TABLE gserver-tag
@@ -1114,9 +1154,9 @@ CREATE TABLE IF NOT EXISTS `photo` (
 	`scale` tinyint unsigned NOT NULL DEFAULT 0 COMMENT '',
 	`profile` boolean NOT NULL DEFAULT '0' COMMENT '',
 	`allow_cid` mediumtext COMMENT 'Access Control - list of allowed contact.id \'<19><78>\'',
-	`allow_gid` mediumtext COMMENT 'Access Control - list of allowed groups',
+	`allow_gid` mediumtext COMMENT 'Access Control - list of allowed circles',
 	`deny_cid` mediumtext COMMENT 'Access Control - list of denied contact.id',
-	`deny_gid` mediumtext COMMENT 'Access Control - list of denied groups',
+	`deny_gid` mediumtext COMMENT 'Access Control - list of denied circles',
 	`accessible` boolean NOT NULL DEFAULT '0' COMMENT 'Make photo publicly accessible, ignoring permissions',
 	`backend-class` tinytext COMMENT 'Storage backend class',
 	`backend-ref` text COMMENT 'Storage backend data reference',
@@ -1200,6 +1240,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
 --
@@ -1227,6 +1284,7 @@ CREATE TABLE IF NOT EXISTS `post-content` (
 	`location` varchar(255) NOT NULL DEFAULT '' COMMENT 'text location where this item originated',
 	`coord` varchar(255) NOT NULL DEFAULT '' COMMENT 'longitude/latitude pair representing location where this item originated',
 	`language` text COMMENT 'Language information about this post',
+	`sensitive` boolean COMMENT 'If true, this post contains sensitive content',
 	`app` varchar(255) NOT NULL DEFAULT '' COMMENT 'application which generated this item',
 	`rendered-hash` varchar(32) NOT NULL DEFAULT '' COMMENT '',
 	`rendered-html` mediumtext COMMENT 'item.body converted to html',
@@ -1239,7 +1297,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
@@ -1283,6 +1340,30 @@ CREATE TABLE IF NOT EXISTS `post-delivery-data` (
 	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Delivery data for items';
 
+--
+-- TABLE post-engagement
+--
+CREATE TABLE IF NOT EXISTS `post-engagement` (
+	`uri-id` int unsigned NOT NULL COMMENT 'Id of the item-uri table entry that contains the item uri',
+	`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` char(2) COMMENT 'Language information about this post in the ISO 639-1 format',
+	`searchtext` mediumtext COMMENT 'Simplified text for the full text search',
+	`size` int unsigned COMMENT 'Body size',
+	`created` datetime COMMENT '',
+	`network` char(4) COMMENT '',
+	`restricted` boolean NOT NULL DEFAULT '0' COMMENT 'If true, this post is either unlisted or not from a federated network',
+	`comments` mediumint unsigned COMMENT 'Number of comments',
+	`activities` mediumint unsigned COMMENT 'Number of activities (like, dislike, ...)',
+	 PRIMARY KEY(`uri-id`),
+	 INDEX `owner-id` (`owner-id`),
+	 INDEX `created` (`created`),
+	 FULLTEXT INDEX `searchtext` (`searchtext`),
+	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`owner-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Engagement data per post';
+
 --
 -- TABLE post-history
 --
@@ -1384,6 +1465,26 @@ 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',
+	`owner-id` int unsigned NOT NULL DEFAULT 0 COMMENT 'Item owner',
+	`media-type` tinyint NOT NULL DEFAULT 0 COMMENT 'Type of media in a bit array (1 = image, 2 = video, 4 = audio',
+	`language` char(2) COMMENT 'Language information about this post in the ISO 639-1 format',
+	`searchtext` mediumtext COMMENT 'Simplified text for the full text search',
+	`size` int unsigned COMMENT 'Body size',
+	`created` datetime COMMENT '',
+	`restricted` boolean NOT NULL DEFAULT '0' COMMENT 'If true, this post is either unlisted or not from a federated network',
+	 PRIMARY KEY(`uri-id`),
+	 INDEX `owner-id` (`owner-id`),
+	 INDEX `created` (`created`),
+	 FULLTEXT INDEX `searchtext` (`searchtext`),
+	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`owner-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Content for all posts';
+
 --
 -- TABLE post-tag
 --
@@ -1476,7 +1577,8 @@ CREATE TABLE IF NOT EXISTS `post-user` (
 	 INDEX `event-id` (`event-id`),
 	 INDEX `psid` (`psid`),
 	 INDEX `author-id_uid` (`author-id`,`uid`),
-	 INDEX `author-id_received` (`author-id`,`received`),
+	 INDEX `author-id_created` (`author-id`,`created`),
+	 INDEX `owner-id_created` (`owner-id`,`created`),
 	 INDEX `parent-uri-id_uid` (`parent-uri-id`,`uid`),
 	 INDEX `uid_wall_received` (`uid`,`wall`,`received`),
 	 INDEX `uid_contactid` (`uid`,`contact-id`),
@@ -1536,11 +1638,18 @@ CREATE TABLE IF NOT EXISTS `post-thread-user` (
 	 INDEX `psid` (`psid`),
 	 INDEX `post-user-id` (`post-user-id`),
 	 INDEX `commented` (`commented`),
+	 INDEX `received` (`received`),
+	 INDEX `author-id_created` (`author-id`,`created`),
+	 INDEX `owner-id_created` (`owner-id`,`created`),
 	 INDEX `uid_received` (`uid`,`received`),
 	 INDEX `uid_wall_received` (`uid`,`wall`,`received`),
 	 INDEX `uid_commented` (`uid`,`commented`),
+	 INDEX `uid_created` (`uid`,`created`),
 	 INDEX `uid_starred` (`uid`,`starred`),
 	 INDEX `uid_mention` (`uid`,`mention`),
+	 INDEX `contact-id_commented` (`contact-id`,`commented`),
+	 INDEX `contact-id_received` (`contact-id`,`received`),
+	 INDEX `contact-id_created` (`contact-id`,`created`),
 	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`conversation-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`owner-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE RESTRICT,
@@ -1586,7 +1695,7 @@ CREATE TABLE IF NOT EXISTS `profile` (
 	`profile-name` varchar(255) COMMENT 'Deprecated',
 	`is-default` boolean COMMENT 'Deprecated',
 	`hide-friends` boolean NOT NULL DEFAULT '0' COMMENT 'Hide friend list from viewers of this profile',
-	`name` varchar(255) NOT NULL DEFAULT '' COMMENT '',
+	`name` varchar(255) NOT NULL DEFAULT '' COMMENT 'Unused in favor of user.username',
 	`pdesc` varchar(255) COMMENT 'Deprecated',
 	`dob` varchar(32) NOT NULL DEFAULT '0000-00-00' COMMENT 'Day of birth',
 	`address` varchar(255) NOT NULL DEFAULT '' COMMENT '',
@@ -1627,7 +1736,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';
 
@@ -1695,19 +1803,34 @@ CREATE TABLE IF NOT EXISTS `report` (
 	`uid` mediumint unsigned COMMENT 'Reporting user',
 	`reporter-id` int unsigned COMMENT 'Reporting contact',
 	`cid` int unsigned NOT NULL COMMENT 'Reported contact',
+	`gsid` int unsigned COMMENT 'Reported contact server',
 	`comment` text COMMENT 'Report',
-	`category` varchar(20) COMMENT 'Category of the report (spam, violation, other)',
-	`rules` text COMMENT 'Violated rules',
+	`category-id` int unsigned NOT NULL DEFAULT 1 COMMENT 'Report category, one of Entity Report::CATEGORY_*',
 	`forward` boolean COMMENT 'Forward the report to the remote server',
-	`created` datetime NOT NULL DEFAULT '0001-01-01 00:00:00' COMMENT '',
-	`status` tinyint unsigned COMMENT 'Status of the report',
+	`public-remarks` text COMMENT 'Remarks shared with the reporter',
+	`private-remarks` text COMMENT 'Remarks shared with the moderation team',
+	`last-editor-uid` mediumint unsigned COMMENT 'Last editor user',
+	`assigned-uid` mediumint unsigned COMMENT 'Assigned moderator user',
+	`status` tinyint unsigned NOT NULL COMMENT 'Status of the report, one of Entity Report::STATUS_*',
+	`resolution` tinyint unsigned COMMENT 'Resolution of the report, one of Entity Report::RESOLUTION_*',
+	`created` datetime(6) NOT NULL DEFAULT '0001-01-01 00:00:00.000000' COMMENT '',
+	`edited` datetime(6) COMMENT 'Last time the report has been edited',
 	 PRIMARY KEY(`id`),
 	 INDEX `uid` (`uid`),
 	 INDEX `cid` (`cid`),
 	 INDEX `reporter-id` (`reporter-id`),
+	 INDEX `gsid` (`gsid`),
+	 INDEX `last-editor-uid` (`last-editor-uid`),
+	 INDEX `assigned-uid` (`assigned-uid`),
+	 INDEX `status-resolution` (`status`,`resolution`),
+	 INDEX `created` (`created`),
+	 INDEX `edited` (`edited`),
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`reporter-id`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
-	FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+	FOREIGN KEY (`cid`) REFERENCES `contact` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`gsid`) REFERENCES `gserver` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`last-editor-uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE,
+	FOREIGN KEY (`assigned-uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';
 
 --
@@ -1721,7 +1844,18 @@ CREATE TABLE IF NOT EXISTS `report-post` (
 	 INDEX `uri-id` (`uri-id`),
 	FOREIGN KEY (`rid`) REFERENCES `report` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE,
 	FOREIGN KEY (`uri-id`) REFERENCES `item-uri` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
-) DEFAULT COLLATE utf8mb4_general_ci COMMENT='';
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Individual posts attached to a moderation report';
+
+--
+-- TABLE report-rule
+--
+CREATE TABLE IF NOT EXISTS `report-rule` (
+	`rid` int unsigned NOT NULL COMMENT 'Report id',
+	`line-id` int unsigned NOT NULL COMMENT 'Terms of service rule line number, may become invalid after a TOS change.',
+	`text` text NOT NULL COMMENT 'Terms of service rule text recorded at the time of the report',
+	 PRIMARY KEY(`rid`,`line-id`),
+	FOREIGN KEY (`rid`) REFERENCES `report` (`id`) ON UPDATE RESTRICT ON DELETE CASCADE
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Terms of service rule lines relevant to a moderation report';
 
 --
 -- TABLE search
@@ -1782,6 +1916,16 @@ CREATE TABLE IF NOT EXISTS `subscription` (
 	FOREIGN KEY (`uid`) REFERENCES `user` (`uid`) ON UPDATE RESTRICT ON DELETE CASCADE
 ) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Push Subscription for the API';
 
+--
+-- TABLE check-full-text-search
+--
+CREATE TABLE IF NOT EXISTS `check-full-text-search` (
+	`pid` int unsigned NOT NULL COMMENT 'The ID of the process',
+	`searchtext` mediumtext COMMENT 'Simplified text for the full text search',
+	 PRIMARY KEY(`pid`),
+	 FULLTEXT INDEX `searchtext` (`searchtext`)
+) DEFAULT COLLATE utf8mb4_general_ci COMMENT='Check for a full text search match in user defined channels before storing the message in the system';
+
 --
 -- TABLE userd
 --
@@ -1804,12 +1948,13 @@ CREATE TABLE IF NOT EXISTS `user-contact` (
 	`collapsed` boolean COMMENT 'Posts from this contact are collapsed',
 	`hidden` boolean COMMENT 'This contact is hidden from the others',
 	`is-blocked` boolean COMMENT 'User is blocked by this contact',
+	`channel-frequency` tinyint unsigned COMMENT 'Controls the frequency of the appearance of this contact in channels',
 	`pending` boolean COMMENT '',
 	`rel` tinyint unsigned COMMENT 'The kind of the relation between the user and the contact',
 	`info` mediumtext COMMENT '',
 	`notify_new_posts` boolean COMMENT '',
-	`remote_self` boolean COMMENT '',
-	`fetch_further_information` tinyint unsigned COMMENT '',
+	`remote_self` tinyint unsigned COMMENT '0 => No mirroring, 1-2 => Mirror as own post, 3 => Mirror as reshare',
+	`fetch_further_information` tinyint unsigned COMMENT '0 => None, 1 => Fetch information, 3 => Fetch keywords, 2 => Fetch both',
 	`ffi_keyword_denylist` text COMMENT '',
 	`subhub` boolean COMMENT '',
 	`hub-verify` varbinary(383) COMMENT '',
@@ -1872,7 +2017,130 @@ CREATE VIEW `application-view` AS SELECT
 	`application-token`.`follow` AS `follow`,
 	`application-token`.`push` AS `push`
 	FROM `application-token`
-			INNER JOIN `application` ON `application-token`.`application-id` = `application`.`id`;
+			INNER JOIN `application` ON `application-token`.`application-id` = `application`.`id`
+			INNER JOIN `user` ON `user`.`uid` = `application-token`.`uid` AND `user`.`verified` AND NOT `user`.`blocked` AND NOT `user`.`account_removed` AND NOT `user`.`account_expired`;
+
+--
+-- VIEW circle-member-view
+--
+DROP VIEW IF EXISTS `circle-member-view`;
+CREATE VIEW `circle-member-view` AS SELECT 
+	`group_member`.`id` AS `id`,
+	`group`.`uid` AS `uid`,
+	`group_member`.`contact-id` AS `contact-id`,
+	`contact`.`uri-id` AS `contact-uri-id`,
+	`contact`.`url` AS `contact-link`,
+	`contact`.`addr` AS `contact-addr`,
+	`contact`.`name` AS `contact-name`,
+	`contact`.`nick` AS `contact-nick`,
+	`contact`.`thumb` AS `contact-avatar`,
+	`contact`.`network` AS `contact-network`,
+	`contact`.`blocked` AS `contact-blocked`,
+	`contact`.`hidden` AS `contact-hidden`,
+	`contact`.`readonly` AS `contact-readonly`,
+	`contact`.`archive` AS `contact-archive`,
+	`contact`.`pending` AS `contact-pending`,
+	`contact`.`self` AS `contact-self`,
+	`contact`.`rel` AS `contact-rel`,
+	`contact`.`contact-type` AS `contact-contact-type`,
+	`group_member`.`gid` AS `circle-id`,
+	`group`.`visible` AS `circle-visible`,
+	`group`.`deleted` AS `circle-deleted`,
+	`group`.`name` AS `circle-name`
+	FROM `group_member`
+			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
+--
+DROP VIEW IF EXISTS `post-timeline-view`;
+CREATE VIEW `post-timeline-view` AS SELECT 
+	`post-user`.`uid` AS `uid`,
+	`post-user`.`uri-id` AS `uri-id`,
+	`post-user`.`gravity` AS `gravity`,
+	`post-user`.`created` AS `created`,
+	`post-user`.`edited` AS `edited`,
+	`post-thread-user`.`commented` AS `commented`,
+	`post-user`.`received` AS `received`,
+	`post-thread-user`.`changed` AS `changed`,
+	`post-user`.`private` AS `private`,
+	`post-user`.`visible` AS `visible`,
+	`post-user`.`deleted` AS `deleted`,
+	`post-user`.`origin` AS `origin`,
+	`post-user`.`global` AS `global`,
+	`post-user`.`network` AS `network`,
+	`post-user`.`protocol` AS `protocol`,
+	`post-user`.`vid` AS `vid`,
+	`post-user`.`contact-id` AS `contact-id`,
+	`contact`.`blocked` AS `contact-blocked`,
+	`contact`.`readonly` AS `contact-readonly`,
+	`contact`.`pending` AS `contact-pending`,
+	`contact`.`rel` AS `contact-rel`,
+	`contact`.`uid` AS `contact-uid`,
+	`contact`.`self` AS `self`,
+	`post-user`.`author-id` AS `author-id`,
+	`author`.`blocked` AS `author-blocked`,
+	`author`.`hidden` AS `author-hidden`,
+	`author`.`gsid` AS `author-gsid`,
+	`post-user`.`owner-id` AS `owner-id`,
+	`owner`.`blocked` AS `owner-blocked`,
+	`owner`.`gsid` AS `owner-gsid`,
+	`post-user`.`causer-id` AS `causer-id`,
+	`causer`.`blocked` AS `causer-blocked`,
+	`causer`.`gsid` AS `causer-gsid`
+	FROM `post-user`
+			LEFT JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id`
+			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-user`.`author-id`
+			STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `post-user`.`owner-id`
+			LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `post-user`.`causer-id`;
+
+--
+-- VIEW post-searchindex-user-view
+--
+DROP VIEW IF EXISTS `post-searchindex-user-view`;
+CREATE VIEW `post-searchindex-user-view` AS SELECT 
+	`post-thread-user`.`uid` AS `uid`,
+	`post-searchindex`.`uri-id` AS `uri-id`,
+	`post-searchindex`.`owner-id` AS `owner-id`,
+	`post-searchindex`.`media-type` AS `media-type`,
+	`post-searchindex`.`language` AS `language`,
+	`post-searchindex`.`searchtext` AS `searchtext`,
+	`post-searchindex`.`size` AS `size`,
+	`post-thread-user`.`commented` AS `commented`,
+	`post-thread-user`.`received` AS `received`,
+	`post-thread-user`.`created` AS `created`,
+	`post-thread-user`.`network` AS `network`,
+	`post-searchindex`.`language` AS `restricted`,
+	0 AS `comments`,
+	0 AS `activities`
+	FROM `post-thread-user`
+			INNER JOIN `post-searchindex` ON `post-searchindex`.`uri-id` = `post-thread-user`.`uri-id`
+			INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
+			STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id`
+			STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
+			WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
+			AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
+			AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
+			AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked`
+			AND NOT EXISTS(SELECT `cid`  FROM `user-contact` WHERE `uid` = `post-thread-user`.`uid` AND `cid` IN (`authorcontact`.`id`, `ownercontact`.`id`) AND (`blocked` OR `ignored`))
+			AND NOT EXISTS(SELECT `gsid` FROM `user-gserver` WHERE `uid` = `post-thread-user`.`uid` AND `gsid` IN (`authorcontact`.`gsid`, `ownercontact`.`gsid`) AND `ignored`);
 
 --
 -- VIEW post-user-view
@@ -1882,7 +2150,7 @@ CREATE VIEW `post-user-view` AS SELECT
 	`post-user`.`id` AS `id`,
 	`post-user`.`id` AS `post-user-id`,
 	`post-user`.`uid` AS `uid`,
-	`parent-post`.`id` AS `parent`,
+	`post-thread-user`.`post-user-id` AS `parent`,
 	`item-uri`.`uri` AS `uri`,
 	`post-user`.`uri-id` AS `uri-id`,
 	`parent-item-uri`.`uri` AS `parent-uri`,
@@ -1931,6 +2199,7 @@ CREATE VIEW `post-user-view` AS SELECT
 	`post-content`.`plink` AS `plink`,
 	`post-content`.`location` AS `location`,
 	`post-content`.`coord` AS `coord`,
+	`post-content`.`sensitive` AS `sensitive`,
 	`post-content`.`app` AS `app`,
 	`post-content`.`object-type` AS `object-type`,
 	`post-content`.`object` AS `object`,
@@ -1968,23 +2237,28 @@ CREATE VIEW `post-user-view` AS SELECT
 	`author`.`addr` AS `author-addr`,
 	IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`) AS `author-name`,
 	`author`.`nick` AS `author-nick`,
+	`author`.`alias` AS `author-alias`,
 	IF (`contact`.`url` = `author`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `author`.`thumb`) AS `author-avatar`,
 	`author`.`network` AS `author-network`,
 	`author`.`blocked` AS `author-blocked`,
 	`author`.`hidden` AS `author-hidden`,
 	`author`.`updated` AS `author-updated`,
+	`author`.`contact-type` AS `author-contact-type`,
 	`author`.`gsid` AS `author-gsid`,
+	`author`.`baseurl` AS `author-baseurl`,
 	`post-user`.`owner-id` AS `owner-id`,
 	`owner`.`uri-id` AS `owner-uri-id`,
 	`owner`.`url` AS `owner-link`,
 	`owner`.`addr` AS `owner-addr`,
 	IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`) AS `owner-name`,
 	`owner`.`nick` AS `owner-nick`,
+	`owner`.`alias` AS `owner-alias`,
 	IF (`contact`.`url` = `owner`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `owner`.`thumb`) AS `owner-avatar`,
 	`owner`.`network` AS `owner-network`,
 	`owner`.`blocked` AS `owner-blocked`,
 	`owner`.`hidden` AS `owner-hidden`,
 	`owner`.`updated` AS `owner-updated`,
+	`owner`.`gsid` AS `owner-gsid`,
 	`owner`.`contact-type` AS `owner-contact-type`,
 	`post-user`.`causer-id` AS `causer-id`,
 	`causer`.`uri-id` AS `causer-uri-id`,
@@ -1992,10 +2266,12 @@ CREATE VIEW `post-user-view` AS SELECT
 	`causer`.`addr` AS `causer-addr`,
 	`causer`.`name` AS `causer-name`,
 	`causer`.`nick` AS `causer-nick`,
+	`causer`.`alias` AS `causer-alias`,
 	`causer`.`thumb` AS `causer-avatar`,
 	`causer`.`network` AS `causer-network`,
 	`causer`.`blocked` AS `causer-blocked`,
 	`causer`.`hidden` AS `causer-hidden`,
+	`causer`.`gsid` AS `causer-gsid`,
 	`causer`.`contact-type` AS `causer-contact-type`,
 	`post-delivery-data`.`postopts` AS `postopts`,
 	`post-delivery-data`.`inform` AS `inform`,
@@ -2025,14 +2301,14 @@ CREATE VIEW `post-user-view` AS SELECT
 	EXISTS(SELECT `id` FROM `post-media` WHERE `post-media`.`uri-id` = `post-user`.`uri-id`) AS `has-media`,
 	`diaspora-interaction`.`interaction` AS `signed_text`,
 	`parent-item-uri`.`guid` AS `parent-guid`,
-	`parent-post`.`network` AS `parent-network`,
-	`parent-post`.`author-id` AS `parent-author-id`,
+	`post-thread-user`.`network` AS `parent-network`,
+	`post-thread-user`.`author-id` AS `parent-author-id`,
 	`parent-post-author`.`url` AS `parent-author-link`,
 	`parent-post-author`.`name` AS `parent-author-name`,
 	`parent-post-author`.`nick` AS `parent-author-nick`,
 	`parent-post-author`.`network` AS `parent-author-network`
 	FROM `post-user`
-			STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`
+			INNER JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-user`.`contact-id`
 			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-user`.`author-id`
 			STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `post-user`.`owner-id`
@@ -2050,8 +2326,7 @@ CREATE VIEW `post-user-view` AS SELECT
 			LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-user`.`uri-id` AND `post-user`.`origin`
 			LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post-user`.`uri-id`
 			LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-user`.`psid`
-			LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
-			LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`;
+			LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `post-thread-user`.`author-id`;
 
 --
 -- VIEW post-thread-user-view
@@ -2061,7 +2336,7 @@ CREATE VIEW `post-thread-user-view` AS SELECT
 	`post-user`.`id` AS `id`,
 	`post-user`.`id` AS `post-user-id`,
 	`post-thread-user`.`uid` AS `uid`,
-	`parent-post`.`id` AS `parent`,
+	`post-thread-user`.`post-user-id` AS `parent`,
 	`item-uri`.`uri` AS `uri`,
 	`post-thread-user`.`uri-id` AS `uri-id`,
 	`parent-item-uri`.`uri` AS `parent-uri`,
@@ -2109,6 +2384,7 @@ CREATE VIEW `post-thread-user-view` AS SELECT
 	`post-content`.`plink` AS `plink`,
 	`post-content`.`location` AS `location`,
 	`post-content`.`coord` AS `coord`,
+	`post-content`.`sensitive` AS `sensitive`,
 	`post-content`.`app` AS `app`,
 	`post-content`.`object-type` AS `object-type`,
 	`post-content`.`object` AS `object`,
@@ -2130,6 +2406,7 @@ CREATE VIEW `post-thread-user-view` AS SELECT
 	`contact`.`pending` AS `contact-pending`,
 	`contact`.`rel` AS `contact-rel`,
 	`contact`.`uid` AS `contact-uid`,
+	`contact`.`gsid` AS `contact-gsid`,
 	`contact`.`contact-type` AS `contact-contact-type`,
 	IF (`post-user`.`network` IN ('apub', 'dfrn', 'dspr', 'stat'), true, `contact`.`writable`) AS `writable`,
 	`contact`.`self` AS `self`,
@@ -2146,11 +2423,13 @@ CREATE VIEW `post-thread-user-view` AS SELECT
 	`author`.`addr` AS `author-addr`,
 	IF (`contact`.`url` = `author`.`url` AND `contact`.`name` != '', `contact`.`name`, `author`.`name`) AS `author-name`,
 	`author`.`nick` AS `author-nick`,
+	`author`.`alias` AS `author-alias`,
 	IF (`contact`.`url` = `author`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `author`.`thumb`) AS `author-avatar`,
 	`author`.`network` AS `author-network`,
 	`author`.`blocked` AS `author-blocked`,
 	`author`.`hidden` AS `author-hidden`,
 	`author`.`updated` AS `author-updated`,
+	`author`.`contact-type` AS `author-contact-type`,
 	`author`.`gsid` AS `author-gsid`,
 	`post-thread-user`.`owner-id` AS `owner-id`,
 	`owner`.`uri-id` AS `owner-uri-id`,
@@ -2158,11 +2437,13 @@ CREATE VIEW `post-thread-user-view` AS SELECT
 	`owner`.`addr` AS `owner-addr`,
 	IF (`contact`.`url` = `owner`.`url` AND `contact`.`name` != '', `contact`.`name`, `owner`.`name`) AS `owner-name`,
 	`owner`.`nick` AS `owner-nick`,
+	`owner`.`alias` AS `owner-alias`,
 	IF (`contact`.`url` = `owner`.`url` AND `contact`.`thumb` != '', `contact`.`thumb`, `owner`.`thumb`) AS `owner-avatar`,
 	`owner`.`network` AS `owner-network`,
 	`owner`.`blocked` AS `owner-blocked`,
 	`owner`.`hidden` AS `owner-hidden`,
 	`owner`.`updated` AS `owner-updated`,
+	`owner`.`gsid` AS `owner-gsid`,
 	`owner`.`contact-type` AS `owner-contact-type`,
 	`post-thread-user`.`causer-id` AS `causer-id`,
 	`causer`.`uri-id` AS `causer-uri-id`,
@@ -2170,10 +2451,12 @@ CREATE VIEW `post-thread-user-view` AS SELECT
 	`causer`.`addr` AS `causer-addr`,
 	`causer`.`name` AS `causer-name`,
 	`causer`.`nick` AS `causer-nick`,
+	`causer`.`alias` AS `causer-alias`,
 	`causer`.`thumb` AS `causer-avatar`,
 	`causer`.`network` AS `causer-network`,
 	`causer`.`blocked` AS `causer-blocked`,
 	`causer`.`hidden` AS `causer-hidden`,
+	`causer`.`gsid` AS `causer-gsid`,
 	`causer`.`contact-type` AS `causer-contact-type`,
 	`post-delivery-data`.`postopts` AS `postopts`,
 	`post-delivery-data`.`inform` AS `inform`,
@@ -2203,11 +2486,12 @@ CREATE VIEW `post-thread-user-view` AS SELECT
 	EXISTS(SELECT `id` FROM `post-media` WHERE `post-media`.`uri-id` = `post-thread-user`.`uri-id`) AS `has-media`,
 	`diaspora-interaction`.`interaction` AS `signed_text`,
 	`parent-item-uri`.`guid` AS `parent-guid`,
-	`parent-post`.`network` AS `parent-network`,
-	`parent-post`.`author-id` AS `parent-author-id`,
-	`parent-post-author`.`url` AS `parent-author-link`,
-	`parent-post-author`.`name` AS `parent-author-name`,
-	`parent-post-author`.`network` AS `parent-author-network`
+	`post-thread-user`.`network` AS `parent-network`,
+	`post-thread-user`.`author-id` AS `parent-author-id`,
+	`author`.`url` AS `parent-author-link`,
+	`author`.`name` AS `parent-author-name`,
+	`author`.`nick` AS `parent-author-nick`,
+	`author`.`network` AS `parent-author-network`
 	FROM `post-thread-user`
 			INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
@@ -2226,9 +2510,7 @@ CREATE VIEW `post-thread-user-view` AS SELECT
 			LEFT JOIN `item-uri` AS `quote-item-uri` ON `quote-item-uri`.`id` = `post-content`.`quote-uri-id`
 			LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `post-thread-user`.`uri-id` AND `post-thread-user`.`origin`
 			LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post-thread-user`.`uri-id`
-			LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-thread-user`.`psid`
-			LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-thread-user`.`uid`
-			LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`;
+			LEFT JOIN `permissionset` ON `permissionset`.`id` = `post-thread-user`.`psid`;
 
 --
 -- VIEW post-view
@@ -2273,6 +2555,7 @@ CREATE VIEW `post-view` AS SELECT
 	`post-content`.`plink` AS `plink`,
 	`post-content`.`location` AS `location`,
 	`post-content`.`coord` AS `coord`,
+	`post-content`.`sensitive` AS `sensitive`,
 	`post-content`.`app` AS `app`,
 	`post-content`.`object-type` AS `object-type`,
 	`post-content`.`object` AS `object`,
@@ -2310,11 +2593,13 @@ CREATE VIEW `post-view` AS SELECT
 	`author`.`addr` AS `author-addr`,
 	`author`.`name` AS `author-name`,
 	`author`.`nick` AS `author-nick`,
+	`author`.`alias` AS `author-alias`,
 	`author`.`thumb` AS `author-avatar`,
 	`author`.`network` AS `author-network`,
 	`author`.`blocked` AS `author-blocked`,
 	`author`.`hidden` AS `author-hidden`,
 	`author`.`updated` AS `author-updated`,
+	`author`.`contact-type` AS `author-contact-type`,
 	`author`.`gsid` AS `author-gsid`,
 	`post`.`owner-id` AS `owner-id`,
 	`owner`.`uri-id` AS `owner-uri-id`,
@@ -2322,23 +2607,27 @@ CREATE VIEW `post-view` AS SELECT
 	`owner`.`addr` AS `owner-addr`,
 	`owner`.`name` AS `owner-name`,
 	`owner`.`nick` AS `owner-nick`,
+	`owner`.`alias` AS `owner-alias`,
 	`owner`.`thumb` AS `owner-avatar`,
 	`owner`.`network` AS `owner-network`,
 	`owner`.`blocked` AS `owner-blocked`,
 	`owner`.`hidden` AS `owner-hidden`,
 	`owner`.`updated` AS `owner-updated`,
 	`owner`.`contact-type` AS `owner-contact-type`,
+	`owner`.`gsid` AS `owner-gsid`,
 	`post`.`causer-id` AS `causer-id`,
 	`causer`.`uri-id` AS `causer-uri-id`,
 	`causer`.`url` AS `causer-link`,
 	`causer`.`addr` AS `causer-addr`,
 	`causer`.`name` AS `causer-name`,
 	`causer`.`nick` AS `causer-nick`,
+	`causer`.`alias` AS `causer-alias`,
 	`causer`.`thumb` AS `causer-avatar`,
 	`causer`.`network` AS `causer-network`,
 	`causer`.`blocked` AS `causer-blocked`,
 	`causer`.`hidden` AS `causer-hidden`,
 	`causer`.`contact-type` AS `causer-contact-type`,
+	`causer`.`gsid` AS `causer-gsid`,
 	`post-question`.`id` AS `question-id`,
 	`post-question`.`multiple` AS `question-multiple`,
 	`post-question`.`voters` AS `question-voters`,
@@ -2347,10 +2636,11 @@ CREATE VIEW `post-view` AS SELECT
 	EXISTS(SELECT `id` FROM `post-media` WHERE `post-media`.`uri-id` = `post`.`uri-id`) AS `has-media`,
 	`diaspora-interaction`.`interaction` AS `signed_text`,
 	`parent-item-uri`.`guid` AS `parent-guid`,
-	`parent-post`.`network` AS `parent-network`,
-	`parent-post`.`author-id` AS `parent-author-id`,
+	`post-thread`.`network` AS `parent-network`,
+	`post-thread`.`author-id` AS `parent-author-id`,
 	`parent-post-author`.`url` AS `parent-author-link`,
 	`parent-post-author`.`name` AS `parent-author-name`,
+	`parent-post-author`.`nick` AS `parent-author-nick`,
 	`parent-post-author`.`network` AS `parent-author-network`
 	FROM `post`
 			STRAIGHT_JOIN `post-thread` ON `post-thread`.`uri-id` = `post`.`parent-uri-id`
@@ -2367,8 +2657,7 @@ CREATE VIEW `post-view` AS SELECT
 			LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post`.`uri-id`
 			LEFT JOIN `item-uri` AS `quote-item-uri` ON `quote-item-uri`.`id` = `post-content`.`quote-uri-id`
 			LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post`.`uri-id`
-			LEFT JOIN `post` AS `parent-post` ON `parent-post`.`uri-id` = `post`.`parent-uri-id`
-			LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`;
+			LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `post-thread`.`author-id`;
 
 --
 -- VIEW post-thread-view
@@ -2413,6 +2702,7 @@ CREATE VIEW `post-thread-view` AS SELECT
 	`post-content`.`plink` AS `plink`,
 	`post-content`.`location` AS `location`,
 	`post-content`.`coord` AS `coord`,
+	`post-content`.`sensitive` AS `sensitive`,
 	`post-content`.`app` AS `app`,
 	`post-content`.`object-type` AS `object-type`,
 	`post-content`.`object` AS `object`,
@@ -2450,11 +2740,13 @@ CREATE VIEW `post-thread-view` AS SELECT
 	`author`.`addr` AS `author-addr`,
 	`author`.`name` AS `author-name`,
 	`author`.`nick` AS `author-nick`,
+	`author`.`alias` AS `author-alias`,
 	`author`.`thumb` AS `author-avatar`,
 	`author`.`network` AS `author-network`,
 	`author`.`blocked` AS `author-blocked`,
 	`author`.`hidden` AS `author-hidden`,
 	`author`.`updated` AS `author-updated`,
+	`author`.`contact-type` AS `author-contact-type`,
 	`author`.`gsid` AS `author-gsid`,
 	`post-thread`.`owner-id` AS `owner-id`,
 	`owner`.`uri-id` AS `owner-uri-id`,
@@ -2462,11 +2754,13 @@ CREATE VIEW `post-thread-view` AS SELECT
 	`owner`.`addr` AS `owner-addr`,
 	`owner`.`name` AS `owner-name`,
 	`owner`.`nick` AS `owner-nick`,
+	`owner`.`alias` AS `owner-alias`,
 	`owner`.`thumb` AS `owner-avatar`,
 	`owner`.`network` AS `owner-network`,
 	`owner`.`blocked` AS `owner-blocked`,
 	`owner`.`hidden` AS `owner-hidden`,
 	`owner`.`updated` AS `owner-updated`,
+	`owner`.`gsid` AS `owner-gsid`,
 	`owner`.`contact-type` AS `owner-contact-type`,
 	`post-thread`.`causer-id` AS `causer-id`,
 	`causer`.`uri-id` AS `causer-uri-id`,
@@ -2474,10 +2768,12 @@ CREATE VIEW `post-thread-view` AS SELECT
 	`causer`.`addr` AS `causer-addr`,
 	`causer`.`name` AS `causer-name`,
 	`causer`.`nick` AS `causer-nick`,
+	`causer`.`alias` AS `causer-alias`,
 	`causer`.`thumb` AS `causer-avatar`,
 	`causer`.`network` AS `causer-network`,
 	`causer`.`blocked` AS `causer-blocked`,
 	`causer`.`hidden` AS `causer-hidden`,
+	`causer`.`gsid` AS `causer-gsid`,
 	`causer`.`contact-type` AS `causer-contact-type`,
 	`post-question`.`id` AS `question-id`,
 	`post-question`.`multiple` AS `question-multiple`,
@@ -2489,11 +2785,12 @@ CREATE VIEW `post-thread-view` AS SELECT
 	(SELECT COUNT(DISTINCT(`author-id`)) FROM `post` WHERE `parent-uri-id` = `post-thread`.`uri-id` AND `gravity` = 6) AS `total-actors`,
 	`diaspora-interaction`.`interaction` AS `signed_text`,
 	`parent-item-uri`.`guid` AS `parent-guid`,
-	`parent-post`.`network` AS `parent-network`,
-	`parent-post`.`author-id` AS `parent-author-id`,
-	`parent-post-author`.`url` AS `parent-author-link`,
-	`parent-post-author`.`name` AS `parent-author-name`,
-	`parent-post-author`.`network` AS `parent-author-network`
+	`post-thread`.`network` AS `parent-network`,
+	`post-thread`.`author-id` AS `parent-author-id`,
+	`author`.`url` AS `parent-author-link`,
+	`author`.`name` AS `parent-author-name`,
+	`author`.`nick` AS `parent-author-nick`,
+	`author`.`network` AS `parent-author-network`
 	FROM `post-thread`
 			INNER JOIN `post` ON `post`.`uri-id` = `post-thread`.`uri-id`
 			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `post-thread`.`author-id`
@@ -2508,9 +2805,7 @@ CREATE VIEW `post-thread-view` AS SELECT
 			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `post-thread`.`uri-id`
 			LEFT JOIN `post-content` ON `post-content`.`uri-id` = `post-thread`.`uri-id`
 			LEFT JOIN `item-uri` AS `quote-item-uri` ON `quote-item-uri`.`id` = `post-content`.`quote-uri-id`
-			LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post-thread`.`uri-id`
-			LEFT JOIN `post` AS `parent-post` ON `parent-post`.`uri-id` = `post`.`parent-uri-id`
-			LEFT JOIN `contact` AS `parent-post-author` ON `parent-post-author`.`id` = `parent-post`.`author-id`;
+			LEFT JOIN `post-question` ON `post-question`.`uri-id` = `post-thread`.`uri-id`;
 
 --
 -- VIEW category-view
@@ -2587,7 +2882,7 @@ CREATE VIEW `tag-view` AS SELECT
 DROP VIEW IF EXISTS `network-item-view`;
 CREATE VIEW `network-item-view` AS SELECT 
 	`post-user`.`uri-id` AS `uri-id`,
-	`parent-post`.`id` AS `parent`,
+	`post-thread-user`.`post-user-id` AS `parent`,
 	`post-user`.`received` AS `received`,
 	`post-thread-user`.`commented` AS `commented`,
 	`post-user`.`created` AS `created`,
@@ -2600,17 +2895,16 @@ CREATE VIEW `network-item-view` AS SELECT
 	`post-user`.`contact-id` AS `contact-id`,
 	`ownercontact`.`contact-type` AS `contact-type`
 	FROM `post-user`
-			STRAIGHT_JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`			
-			INNER JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
-			LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
-			LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
-			INNER JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
-			LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
+			INNER JOIN `post-thread-user` ON `post-thread-user`.`uri-id` = `post-user`.`parent-uri-id` AND `post-thread-user`.`uid` = `post-user`.`uid`
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
+			STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id`
+			STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
 			WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
 			AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
 			AND (`post-user`.`hidden` IS NULL OR NOT `post-user`.`hidden`)
-			AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
-			AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
+			AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked`
+			AND NOT EXISTS(SELECT `cid`    FROM `user-contact` WHERE `uid` = `post-thread-user`.`uid` AND `cid` IN (`authorcontact`.`id`, `ownercontact`.`id`) AND (`blocked` OR `ignored`))
+			AND NOT EXISTS(SELECT `gsid`   FROM `user-gserver` WHERE `uid` = `post-thread-user`.`uid` AND `gsid` IN (`authorcontact`.`gsid`, `ownercontact`.`gsid`) AND `ignored`);
 
 --
 -- VIEW network-thread-view
@@ -2618,7 +2912,7 @@ CREATE VIEW `network-item-view` AS SELECT
 DROP VIEW IF EXISTS `network-thread-view`;
 CREATE VIEW `network-thread-view` AS SELECT 
 	`post-thread-user`.`uri-id` AS `uri-id`,
-	`parent-post`.`id` AS `parent`,
+	`post-thread-user`.`post-user-id` AS `parent`,
 	`post-thread-user`.`received` AS `received`,
 	`post-thread-user`.`commented` AS `commented`,
 	`post-thread-user`.`created` AS `created`,
@@ -2631,15 +2925,14 @@ CREATE VIEW `network-thread-view` AS SELECT
 	FROM `post-thread-user`
 			INNER JOIN `post-user` ON `post-user`.`id` = `post-thread-user`.`post-user-id`
 			STRAIGHT_JOIN `contact` ON `contact`.`id` = `post-thread-user`.`contact-id`
-			LEFT JOIN `user-contact` AS `author` ON `author`.`uid` = `post-thread-user`.`uid` AND `author`.`cid` = `post-thread-user`.`author-id`
-			LEFT JOIN `user-contact` AS `owner` ON `owner`.`uid` = `post-thread-user`.`uid` AND `owner`.`cid` = `post-thread-user`.`owner-id`
-			LEFT JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
-			LEFT JOIN `post-user` AS `parent-post` ON `parent-post`.`uri-id` = `post-user`.`parent-uri-id` AND `parent-post`.`uid` = `post-user`.`uid`
+			STRAIGHT_JOIN `contact` AS `authorcontact` ON `authorcontact`.`id` = `post-thread-user`.`author-id`
+			STRAIGHT_JOIN `contact` AS `ownercontact` ON `ownercontact`.`id` = `post-thread-user`.`owner-id`
 			WHERE `post-user`.`visible` AND NOT `post-user`.`deleted`
 			AND (NOT `contact`.`readonly` AND NOT `contact`.`blocked` AND NOT `contact`.`pending`)
 			AND (`post-thread-user`.`hidden` IS NULL OR NOT `post-thread-user`.`hidden`)
-			AND (`author`.`blocked` IS NULL OR NOT `author`.`blocked`)
-			AND (`owner`.`blocked` IS NULL OR NOT `owner`.`blocked`);
+			AND NOT `authorcontact`.`blocked` AND NOT `ownercontact`.`blocked`
+			AND NOT EXISTS(SELECT `cid`    FROM `user-contact` WHERE `uid` = `post-thread-user`.`uid` AND `cid` IN (`authorcontact`.`id`, `ownercontact`.`id`) AND (`blocked` OR `ignored`))
+			AND NOT EXISTS(SELECT `gsid`   FROM `user-gserver` WHERE `uid` = `post-thread-user`.`uid` AND `gsid` IN (`authorcontact`.`gsid`, `ownercontact`.`gsid`) AND `ignored`);
 
 --
 -- VIEW owner-view
@@ -2736,8 +3029,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/API-Entities.md

@@ -454,7 +454,7 @@ Ex: Wed May 23 06:01:13 +0000 2007
 <tr>
 <td><code>allow_gid</code></td>
 <td>String (angle-brackets escaped integers)</td>
-<td>Optional. List of allowed group ids</td>
+<td>Optional. List of allowed circle ids</td>
 </tr>
 
 <tr>
@@ -466,7 +466,7 @@ Ex: Wed May 23 06:01:13 +0000 2007
 <tr>
 <td><code>deny_gid</code></td>
 <td>String (angle-brackets escaped integers)</td>
-<td>Optional. List of disallowed group ids</td>
+<td>Optional. List of disallowed circle ids</td>
 </tr>
 
 </tbody>
@@ -984,7 +984,7 @@ Identical to [the Twitter Media Object](https://developer.twitter.com/en/docs/tw
 <tr>
 <td><code>allow_gid</code></td>
 <td>String (ACL)</td>
-<td>List of contact group ids wrapped in angle brackets allowed to access the photo.</td>
+<td>List of contact circle ids wrapped in angle brackets allowed to access the photo.</td>
 </tr>
 
 <tr>
@@ -996,7 +996,7 @@ Identical to [the Twitter Media Object](https://developer.twitter.com/en/docs/tw
 <tr>
 <td><code>deny_gid</code></td>
 <td>String (ACL)</td>
-<td>List of contact group ids wrapped in angle brackets forbidden to access the photo.</td>
+<td>List of contact circle ids wrapped in angle brackets forbidden to access the photo.</td>
 </tr>
 
 <tr>

doc/API-Friendica.md

@@ -39,8 +39,8 @@ Create a new event for the current logged in user.
 - `publish` : (optional) create message for event
 - `allow_cid` : (optional) ACL-formatted list of allowed contact ids if private event
 - `allow_gid` : (optional) ACL-formatted list of disallowed contact ids if private event
-- `deny_cid` : (optional) ACL-formatted list of allowed group ids if private event
-- `deny_gid` : (optional) ACL-formatted list of disallowed group ids if private event
+- `deny_cid` : (optional) ACL-formatted list of allowed circle ids if private event
+- `deny_gid` : (optional) ACL-formatted list of disallowed circle ids if private event
 
 ### POST api/friendica/event_delete
 
@@ -323,33 +323,37 @@ On error:
 
 ---
 
-### GET api/friendica/group_show
+### GET api/friendica/circle_show
 
-Return all or a specified group of the user with the containing contacts as array.
+Alternatively: GET api/friendica/group_show (Backward compatibility)
+
+Return all or a specified circle of the user with the containing contacts as array.
 
 #### Parameters
 
-* `gid`: optional, if not given, API returns all groups of the user
+* `gid`: optional, if not given, API returns all circles of the user
 
 #### Return values
 
 Array of:
 
-* `name`: name of the group
-* `gid`: id of the group
+* `name`: name of the circle
+* `gid`: id of the circle
 * `user`: array of [Contacts](help/API-Entities#Contact)
 
-### POST api/friendica/group_create
+### POST api/friendica/circle_create
 
-Create the group with the posted array of contacts as members.
+Alternatively: POST api/friendica/group_create
+
+Create the circle with the posted array of contacts as members.
 
 #### Parameters
 
-* `name`: name of the group to be created
+* `name`: name of the circle to be created
 
 #### POST data
 
-JSON data as Array like the result of [GET api/friendica/group_show](#GET+api%2Ffriendica%2Fgroup_show):
+JSON data as Array like the result of [GET api/friendica/circle_show](#GET+api%2Ffriendica%2Fcircle_show):
 
 * `gid`
 * `name`
@@ -360,23 +364,25 @@ JSON data as Array like the result of [GET api/friendica/group_show](#GET+api%2F
 Array of:
 
 * `success`: true if successfully created or reactivated
-* `gid`: gid of the created group
-* `name`: name of the created group
+* `gid`: gid of the created circle
+* `name`: name of the created circle
 * `status`: "missing user" | "reactivated" | "ok"
 * `wrong users`: array of users, which were not available in the contact table
 
-### POST api/friendica/group_update
+### POST api/friendica/circle_update
 
-Update the group with the posted array of contacts as members (post all members of the group to the call; function will remove members not posted).
+Alternatively: POST api/friendica/group_update
+
+Update the circle with the posted array of contacts as members (post all members of the circle to the call; function will remove members not posted).
 
 #### Parameters
 
-* `gid`: id of the group to be changed
-* `name`: name of the group to be changed
+* `gid`: id of the circle to be changed
+* `name`: name of the circle to be changed
 
 #### POST data
 
-JSON data as array like the result of [GET api/friendica/group_show](#GET+api%2Ffriendica%2Fgroup_show):
+JSON data as array like the result of [GET api/friendica/circle_show](#GET+api%2Ffriendica%2Fcircle_show):
 
 * `gid`
 * `name`
@@ -387,27 +393,29 @@ JSON data as array like the result of [GET api/friendica/group_show](#GET+api%2F
 Array of:
 
 * `success`: true if successfully updated
-* `gid`: gid of the changed group
-* `name`: name of the changed group
+* `gid`: gid of the changed circle
+* `name`: name of the changed circle
 * `status`: "missing user" | "ok"
 * `wrong users`: array of users, which were not available in the contact table
 
-### POST api/friendica/group_delete
+### POST api/friendica/circle_delete
 
-Delete the specified group of contacts; API call need to include the correct gid AND name of the group to be deleted.
+Alternatively: POST api/friendica/group_delete
+
+Delete the specified circle of contacts; API call need to include the correct gid AND name of the circle to be deleted.
 
 #### Parameters
 
-* `gid`: id of the group to be deleted
-* `name`: name of the group to be deleted
+* `gid`: id of the circle to be deleted
+* `name`: name of the circle to be deleted
 
 #### Return values
 
 Array of:
 
 * `success`: true if successfully deleted
-* `gid`: gid of the deleted group
-* `name`: name of the deleted group
+* `gid`: gid of the deleted circle
+* `name`: name of the deleted circle
 * `status`: "deleted" if successfully deleted
 * `wrong users`: empty array
 
@@ -556,7 +564,7 @@ Alias of [`api/friendica/photo/update`](#POST+api%2Ffriendica%2Fphoto%2Fupdate)
 
 Saves data for the scales 0-2 to database (see above for scale description).
 Call adds non-public entries to items table to enable authenticated contacts to comment/like the photo.
-Client should pay attention to the fact that updated access rights are not transferred to the contacts. i.e. public photos remain publicly visible if they have been commented/liked before setting visibility back to a limited group.
+Client should pay attention to the fact that updated access rights are not transferred to the contacts. i.e. public photos remain publicly visible if they have been commented/liked before setting visibility back to a limited circle.
 Currently it is best to inform user that updating rights is not the right way to do this, and offer a solution to add photo as a new photo with the new rights instead.
 
 #### Parameters

doc/API-Mastodon.md

@@ -11,21 +11,7 @@ Authentication is the same as described in [Using the APIs](help/api#Authenticat
 
 ## Clients
 
-### Supported apps
-
-For supported apps please have a look at the [FAQ](help/FAQ#clients)
-
-### Unsupported apps
-
-#### Android
-
-- [Fedilab](https://framagit.org/tom79/fedilab) Automatically uses the legacy API, see issue: https://framagit.org/tom79/fedilab/-/issues/520
-- [Mammut](https://github.com/jamiesanson/Mammut) There are problems with the token request, see issue https://github.com/jamiesanson/Mammut/issues/19
-
-#### iOS
-
-- [Mast](https://github.com/Beesitech/Mast) Doesn't accept the entered instance name. Claims that it is invalid (Message is: "Not a valid instance (may be closed or dead)")
-- [Toot!](https://apps.apple.com/app/toot/id1229021451)
+Please find a list of supported apps at [FAQ](help/FAQ#clients).
 
 ## Entities
 
@@ -170,7 +156,8 @@ Example:
 
 - [`GET /api/v1/followed_tags`](https://docs.joinmastodon.org/methods/followed_tags/)
 - [`GET /api/v1/instance`](https://docs.joinmastodon.org/methods/instance/#v1)
-- `GET /api/v1/instance/rules` Undocumented, returns Terms of Service
+- [`GET /api/v1/instance/extended_description`](https://docs.joinmastodon.org/methods/instance/#extended_description)
+- [`GET /api/v1/instance/rules`](https://docs.joinmastodon.org/methods/instance/#rules)
 - [`GET /api/v1/instance/peers`](https://docs.joinmastodon.org/methods/instance#list-of-connected-domains)
 - [`GET /api/v1/lists`](https://docs.joinmastodon.org/methods/timelines/lists/)
 - [`POST /api/v1/lists`](https://docs.joinmastodon.org/methods/timelines/lists/)
@@ -211,7 +198,7 @@ Example:
         - `title`: Explicitly sets the title for a post status, ignored if used on a comment status. For post statuses the legacy behavior is to use any "spoiler text" as the title if it is provided. If both the title and spoiler text are provided for a post status then they will each be used for their respective roles. If no title is provided then the legacy behavior will persist. If you want to create a post with no title but spoiler text then explicitly set the title but set it to an empty string `""`.
 - [`POST /api/v1/statuses`](https://docs.joinmastodon.org/methods/statuses/#create)
     - Does not support `polls` argument as Friendica does not have polls
-    - Additionally to the static values `public`, `unlisted` and `private`, the `visibility` parameter can contain a numeric value with a group id.
+    - Additionally to the static values `public`, `unlisted` and `private`, the `visibility` parameter can contain a numeric value with a circle id.
     - Additional field `quote_id` for the post that is being quote reshared
     - Additional fields `friendica` for Friendica specific parameters:
        - `title`: Explicitly sets the title for a post status, ignored if used on a comment status. For post statuses the legacy behavior is to use any "spoiler text" as the title if it is provided. If both the title and spoiler text are provided for a post status then they will each be used for their respective roles. If no title is provided then the legacy behavior will persist. If you want to create a post with no title but spoiler text then explicitly set the title but set it to an empty string `""`.
@@ -314,7 +301,6 @@ They refer to features or data that don't exist in Friendica yet.
 - [`PUT /api/v1/filters/:id`](https://docs.joinmastodon.org/methods/accounts/filters/)
 - [`DELETE /api/v1/filters/:id`](https://docs.joinmastodon.org/methods/accounts/filters/)
 - [`GET /api/v1/instance/activity`](https://docs.joinmastodon.org/methods/instance#weekly-activity)
-- [`POST /api/v1/markers`](https://docs.joinmastodon.org/methods/timelines/markers/)
 - [`PUT /api/v1/scheduled_statuses/:id`](https://docs.joinmastodon.org/methods/statuses/scheduled_statuses/)
 - [`GET /api/v1/statuses/{id:\d+}/history`](https://github.com/mastodon/mastodon/pull/16697)
 - [`GET /api/v1/streaming`](https://docs.joinmastodon.org/methods/timelines/streaming/)

doc/Accesskeys.md

@@ -16,6 +16,7 @@ General
 -------
 * p - Profile
 * n - Network
+* l - Channel
 * c - Community
 * s - Search
 * a - Admin
@@ -28,6 +29,19 @@ General
 * l - Local community
 * g - Global community
 
+../channel
+--------
+* y - for you
+* f - followers
+* r - sharers of sharers
+* q - quiet sharers
+* h - what's hot
+* i - Images
+* v - Videos
+* d - Audio
+* g - Posts in your language
+* o - Hot posts in your language
+
 ../profile
 --------
 * m - Status Messages and Posts
@@ -48,7 +62,7 @@ General
 * i - Only show ignored contacts
 * y - Only show archived contacts
 * h - Only show hidden contacts
-* e - Edit contact groups
+* e - Edit contact circles
 
 ../contact (single contact view)
 -------------------------------

doc/Account-Basics.md

@@ -23,10 +23,10 @@ If you do not have an OpenID address or do not wish to use OpenID, leave this fi
 If you have an OpenID account elsewhere and wish to use it, enter the address into this field and click 'Register'.
 Friendica will attempt to extract as much information as possible from your OpenID provider and return to this page with those items already filled in.
 
-### Your Full Name
+### Your Display Name
 
-Please provide your full name **as you would like it to be displayed on this system**.
-Most people use their real name for this, but you're under no obligation to do so yourself.
+Please provide your display name **as you would like it to be displayed on this system**.
+Some people use their real name for this, but you're under no obligation to do so yourself.
 
 ### Email Address
 
@@ -101,7 +101,7 @@ See Also
 
 * [Global Directory](help/Making-Friends#The+Directories)
 
-* [Groups and Privacy](help/Groups-and-Privacy)
+* [Circles and Privacy](help/Circles-and-Privacy)
 
 * [Move Account](help/Move-Account)
 

doc/Addons.md

@@ -221,6 +221,15 @@ Please note: body contents are bbcode - not HTML
 Called when receiving a post from another source. This may also be used to post local activity or system generated messages.
 `$b` is the item array of information to be stored in the database and the item body is bbcode.
 
+### detect_languages
+Called after the language detection. This can be used for alternative language detection methods.
+`$data` is an array:
+
+- **text**: The text that is analyzed.
+- **detected**: (input/output) Array of language codes detected in the related text. The array key is the language code, the array value the probability.
+- **uri-id**: The Uri-Id of the item.
+- **author-id**: The id of the author contact.
+
 ### addon_settings
 Called when generating the HTML for the addon settings page.
 `$data` is an array containing:
@@ -800,6 +809,7 @@ Here is a complete list of all hook callbacks with file locations (as of 24-Sep-
 
 ### src/Model/Item.php
 
+    Hook::callAll('detect_languages', $item);
     Hook::callAll('post_local', $item);
     Hook::callAll('post_remote', $item);
     Hook::callAll('post_local_end', $posted_item);

doc/BBCode.md

@@ -376,8 +376,8 @@ code</code></td>
 &nbsp;&nbsp;[li] Second list element<br>
 [/ul]<br>
 [list]<br>
-&nbsp;&nbsp;[*] First list element<br>
-&nbsp;&nbsp;[*] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
 	<ul class="listbullet" style="list-style-type: circle;">
@@ -388,12 +388,12 @@ code</code></td>
 </tr>
 <tr>
   <td>[ol]<br>
-&nbsp;&nbsp;[*] First list element<br>
-&nbsp;&nbsp;[*] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/ol]<br>
 [list=1]<br>
-&nbsp;&nbsp;[*] First list element<br>
-&nbsp;&nbsp;[*] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
     <ul class="listdecimal" style="list-style-type: decimal;">
@@ -404,8 +404,8 @@ code</code></td>
 </tr>
 <tr>
   <td>[list=]<br>
-&nbsp;&nbsp;[*] First list element<br>
-&nbsp;&nbsp;[*] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
     <ul class="listnone" style="list-style-type: none;">
@@ -416,8 +416,8 @@ code</code></td>
 </tr>
 <tr>
   <td>[list=i]<br>
-&nbsp;&nbsp;[*] First list element<br>
-&nbsp;&nbsp;[*] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
     <ul class="listlowerroman" style="list-style-type: lower-roman;">
@@ -428,8 +428,8 @@ code</code></td>
 </tr>
 <tr>
   <td>[list=I]<br>
-&nbsp;&nbsp;[*] First list element<br>
-&nbsp;&nbsp;[*] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
     <ul class="listupperroman" style="list-style-type: upper-roman;">
@@ -440,8 +440,8 @@ code</code></td>
 </tr>
 <tr>
   <td>[list=a]<br>
-&nbsp;&nbsp;[*] First list element<br>
-&nbsp;&nbsp;[*] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
     <ul class="listloweralpha" style="list-style-type: lower-alpha;">
@@ -452,8 +452,8 @@ code</code></td>
 </tr>
 <tr>
   <td>[list=A]<br>
-&nbsp;&nbsp;[*] First list element<br>
-&nbsp;&nbsp;[*] Second list element<br>
+&nbsp;&nbsp;[li] First list element<br>
+&nbsp;&nbsp;[li] Second list element<br>
 [/list]</td>
   <td>
     <ul class="listupperalpha" style="list-style-type: upper-alpha;">

doc/Bugs-and-Issues.md

@@ -6,7 +6,7 @@ Bugs and Issues
 If your server has a support page, you should report any bugs/issues you encounter there first.
 Reporting to your support page before reporting to the developers makes their job easier, as they don't have to deal with bug reports that might not have anything to do with them.
 Reducing the workload in this way helps us get new features faster.
-You can also contact the [friendica support forum](https://forum.friendi.ca/profile/helpers) and report your problem there.
+You can also contact the [friendica support group](https://forum.friendi.ca/profile/helpers) and report your problem there.
 Bugs are rarely limited to one person, and the chances are somebody from another node has encountered the problem too, and will be able to help you.
 
 If you're a technical user, or your site doesn't have a support page, you'll need to use the [Bug Tracker](https://github.com/friendica/friendica/issues).

doc/Channels.md

@@ -0,0 +1,99 @@
+Channels
+=====
+
+* [Home](help)
+
+Channels are a way to discover new content or to display content that you might have missed otherwise.
+There are several predefined channels, additionally you can create your own channels, based on some rules.
+Channels only display posts from the last 24 hours (this value can be changed by the admin).
+
+In the display settings in the section "Timelines" you can define which channels and other timelines you want to see in the "Channels" widget on the network page and which channels should appear in the menu bar at the top of the page.
+
+Also in the display settings in the section "Channels" you can define all the languages that you want to see in your channels. Here you can select more than one language.
+
+On the contact page you can define the channel frequency for every contact. The options are:
+
+* Default frequency: Posts by this contact are displayed in the "for you" channel if you interact often with this contact or if a post reached some level of interaction.
+* Display all posts of this contact: All posts from this contact will appear on the "for you" channel.
+* Display only few posts: When a contact creates a lot of posts in a short period, this setting reduces the number of displayed posts in every channel.
+* Never display posts: Posts from this contact will never be displayed in any channel.
+
+Predefined Channels
+---
+
+* For you: Posts from contacts you interact with and who interact with you. In detail, it consists of:
+    * 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.
+* Sharers of sharers: Posts from accounts that are followed by accounts that you follow.
+* Quiet sharers: Posts from accounts that you follow but who don't post very often.
+* Images: Posts with images.
+* Audio: Posts with audio.
+* Videos: Posts with videos.
+
+User defined Channels
+---
+
+In the "Channels" settings you can create your own channels.
+
+Each channel is defined by these values:
+
+* Label: This value is mandatory and is used for the menu label.
+* Description: A short description of the content. This can help to keep the overview, when you have got a lot of channels.
+* Access Key: When you want to access this channel via an access key, you can define it here. Pay attention to not use an already used one.
+* Circle: This defines the data source for this channel. By default it is set to the public timeline. There are some predefined values, like the accounts that you follow or the accounts that follow you. Also all of your circles can be selected. 
+* Include Tags: Comma separated list of tags. A post will be used when it contains any of the listed tags.
+* Exclude Tags: Comma separated list of tags. If a post contain any of these tags, then it will not be part of nthis channel.
+* Full Text Search: This can be used to include or exclude content, based on the content and some additional keywords. It uses the "boolean mode" operators from MariaDB: https://mariadb.com/kb/en/full-text-index-overview/#in-boolean-mode
+* Images, Videos, Audio: When selected, you will see content with the selected media type. This can be combined. If none of these fields are checked, you will see any content, with or without attacked media.
+
+Additional keywords for the full text search
+---
+
+Additionally to the search for content, there are keywords that can be used in the full text search.
+Alternatives are presented with "|".
+
+* from - Use "from:nickname" or "from:nickname@domain.tld" to search for posts from a specific author.
+* to - Use "from:nickname" or "from:nickname@domain.tld" to search for posts with the given contact as receiver.
+* group - Use "group:nickname" or "group:nickname@domain.tld" to search for group post of the given group.
+* application | relay - Use "application:nickname" or "application:nickname@domain.tld" to search for posts that had been reshared by the given relay application.
+* server - Use "server:hostname" to search for posts from a specific server. In the case of group postings, the search text contains both the hostname of the group server and the author's hostname.
+* source - The ActivityPub type of the post source. Use this for example to include or exclude group posts or posts from services (aka bots).
+    * source:person - The post is created by a regular user account.
+    * source:organization - The post is created by an organisation.
+    * source:group - The post is created by or distributed via a group.
+    * source:service | source:news - The posts originates from a service account. This source type is often used to mark bot accounts.
+    * source:application | source:relay - The post is created by an application. This is most likely unused in the fediverse for post creation.
+* tag - Use "tag:tagname" to search for a specific tag.
+* media - With this keyword you can search for attached media.
+    * media:image | media:photo | media:picture - The post contains an image
+    * media:video - The post contains a video
+    * media:audio - The post contains audio
+    * media:card - The post contains a link preview card
+    * media:post - The post links another post, means it is a quoted post
+* network | net - Use this to include or exclude some networks from your channel.
+    * network:apub | network:activitypub - ActivityPub (Used by the systems in the Fediverse)
+    * network:dfrn | network:friendica - Legacy Friendica protocol. Nowayday Friendica mostly uses ActivityPub.
+    * network:dspr | network:diaspora - The Diaspora protocol is mainly used by Diaspora itself. Some other systems support the protocol as well like Hubzilla, Socialhome or Ganggo.
+    * network:feed - RSS/Atom feeds
+    * network:mail - Mails that had been imported via IMAP.
+    * network:stat | network:ostatus - The OStatus protocol is mainly used by old GNU Social installations.
+    * network:dscs | network:discourse - Posts that are received by the Discourse connector.
+    * network:tmbl | network:tumblr - Posts that are received by the Tumblr connector.
+    * network:bsky | network:bluesky - Posts that are received by the Bluesky connector.
+* platform - Use this to include or exclude some platforms from your channel, e.g. "+platform:friendica". In the case of group postings, the search text contains both the platform of the group server and the author's platform.
+* visibility - You have the choice between different visibilities. You can only see unlisted or private posts that you have the access for.
+    * visibility:public
+    * visibility:unlisted
+    * visibility:private
+* language | lang - 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/Circles-and-Privacy.md

@@ -1,55 +1,55 @@
-Groups and Privacy
+Circles and Privacy
 ==================
 
 * [Home](help)
 
 
-Groups are merely collections of friends.
+Circles are merely collections of friends.
 But Friendica uses these to unlock some very powerful features.
 
-**Setting Up Groups** 
+**Setting Up Circles**
 
-To create a group, visit your Friendica "Contacts" page and select "Create a new group".
-Give the group a name.
+To create a circle, visit your Friendica "Contacts" page and select "Create a new circle".
+Give the circle a name.
 
-This brings you to a page where you can select the group members. 
+This brings you to a page where you can select the circle members.
 
 You will have two boxes on this page.
-The top box is the roster of current group members.
-Below that is another box containing all of your friends who are *not* members of the group. 
+The top box is the roster of current circle members.
+Below that is another box containing all of your friends who are *not* members of the circle.
 
-If you click on a photo of a person who isn't in the group, they will be put into the group.
-If you click on a photo of a person who is in the group, they will be removed from it. 
+If you click on a photo of a person who isn't in the circle, they will be put into the circle.
+If you click on a photo of a person who is in the circle, they will be removed from it.
 
 **Access Control**
 
-Once you have created a group, you may use it in any access control list.
+Once you have created a circle, you may use it in any access control list.
 This is the little lock icon beneath the status update box on your home page.
-If you click this you can select who can see and who can *not* see the post you are about to make..
-These can be individual people or groups. 
+If you click this, you can select who can see and who can *not* see the post you are about to make...
+These can be individual people or circles.
 
-On your "Network" page you will find posts and conversation from everybody in your network.
-You may select an individual group on this page to show conversations pertaining only to members of that group. 
+On your "Network" page, you will find posts and conversations from everybody in your network.
+You may select an individual circle on this page to show conversations pertaining only to members of that circle.
 
 But wait, there's more...
 
-If you look carefully when visiting a group from your Network page, the lock icon under the status update box has an exclamation mark next to it.
+If you look carefully when visiting a circle from your Network page, the lock icon under the status update box has an exclamation mark next to it.
 This is meant to draw attention to that lock.
 Click the lock.
-You will see that since you are only viewing a certain group of people, your status updates while on that screen default to only being seen by that same group of people.
+You will see that since you are only viewing a certain circle of people, your status updates while on that screen default to only being seen by that same circle of people.
 This is how you keep your future employers from seeing what you write to your drinking buddies.
-You can over-ride this setting, but this makes it easy to separate your conversations into different friend circles.
+You can override this setting, but this makes it easy to separate your conversations into different friend circles.
 
 **Default Post Privacy**
 
 By default, Friendica assumes that you want all of your posts to be private.
-Therefore, when you sign up, Friendica creates a group for you that it will automatically add all of your contacts to.
-All of your posts are restricted to that group by default.
+Therefore, when you sign up, Friendica creates a circle for you that it will automatically add all of your contacts to.
+All of your posts are restricted to that circle by default.
 
-Note that this behaviour can be overridden by your site admin, in which case your posts will be "public" (i.e. visible to the entire Internet) by default.
+Note that this behaviour can be overridden by your site admin, in which case your posts will be "public" (i.e., visible to the entire Internet) by default.
 
 If you want your posts to be "public" by default, you can change your default post permissions on your Settings page.
-You also have the option there to change which groups you post to by default, or to change which group your new contacts get placed into by default.
+You also have the option to change which circles you post to by default or which circle your new contacts get placed into by default.
 
 **Privacy Concerns To Be Aware Of**
 
@@ -60,19 +60,17 @@ This is a trust issue you need to be aware of.
 No software in the world can prevent your friends from leaking your confidential and trusted communications.
 Only a wise choice of friends.
 
-But it isn't as clear cut when dealing with GNU Social and other network providers.
+But it isn't as clear-cut when dealing with GNU Social and other network providers.
 If you look at the Contact Edit page for any person, we will tell you whether or not they are members of an insecure network where you should exercise caution.
 
 Once you have created a post, you can not change the permissions assigned.
 Within seconds it has been delivered to lots of people - and perhaps everybody it was addressed to.
-If you mistakenly created a message and wish you could take it back, the best you can do is to delete it.
-We will send out a delete notification to everybody who received the message - and this should wipe out the message with the same speed it was initially propagated.
-In most cases it will be completely wiped from the Internet - in under a minute.
+If you mistakenly created a message and wish to take it back, the best you can do is delete it.
+We will send out a delete notification to everybody who received the message - and this should wipe out the message with the same speed as it was initially propagated.
+In most cases, it will be completely wiped from the Internet - in under a minute.
 Again, this applies to Friendica networks.
-Once a message spreads to other networks, it may not be removed quickly and in some cases it may not be removed at all. 
+Once a message spreads to other networks, it may not be removed quickly, and in some cases, it may not be removed at all.
 
-In case you haven't yet figured this out, we are encouraging you to encourage your friends to use Friendica - because all these privacy features work much better within a privacy-aware network.
-Many of the other social networks Friendica can connect to have no privacy controls.
 
 
 Profiles, Photos, and Privacy

doc/Developers-Intro.md

@@ -13,14 +13,14 @@ Whether you feel like an expert or like a newbie - join us with your ideas!
 
 ## Contact us
 
-The discussion of Friendica development takes place in the following Friendica forums:
+The discussion of Friendica development takes place in the following Friendica groups:
 
-* The main [forum for Friendica development](https://forum.friendi.ca/profile/developers)
+* The main [group for Friendica development](https://forum.friendi.ca/profile/developers)
 
 ## Help other users
 
 Remember the questions you had when you first tried Friendica?
-A good place to start can be to help new people find their way around Friendica in the [general support forum](https://forum.friendi.ca/profile/helpers).
+A good place to start can be to help new people find their way around Friendica in the [general support group](https://forum.friendi.ca/profile/helpers).
 Welcome them, answer their questions, point them to documentation or ping other helpers directly if you can't help but think you know who can.
 
 ## Translation
@@ -33,10 +33,10 @@ If you don't want to translate the UI, or it is already done to your satisfactio
 Are you good at designing things?
 If you have seen Friendica you probably have ideas to improve it, haven't you?
 
-* If you would like to work with us on enhancing the user interface, please join the [forum for Friendica development](https://forum.friendi.ca/profile/developers).
+* If you would like to work with us on enhancing the user interface, please join the [group for Friendica development](https://forum.friendi.ca/profile/developers).
 * Make plans for a better Friendica interface design and share them with us.
 * Tell us if you are able to realize your ideas or what kind of help you need.
-	We can't promise we have the right skills in the group but we'll try.
+	We can't promise we have the right skills in the group, but we'll try.
 * Choose a thing to start with, e.g. work on the icon set of your favorite theme
 
 ## Programming
@@ -72,7 +72,7 @@ just place it into `.git/hooks/post-merge` and make it executable.
 
 ### Coding standards
 
-For the sake of consistency between contribution and general code readability, Friendica follows the widespread [PSR-2 coding standards](http://www.php-fig.org/psr/psr-2/) to the exception of a few rules.
+For the sake of consistency between contribution and general code readability, Friendica follows the widespread [PSR-2 coding standards](http://www.php-fig.org/psr/psr-2/) excepted a few rules.
 Here's a few primers if you are new to Friendica or to the PSR-2 coding standards:
 
 * Indentation is tabs, period (not PSR-2).
@@ -88,7 +88,7 @@ Here's a few primers if you are new to Friendica or to the PSR-2 coding standard
 Don't worry, you don't have to know by heart the PSR-2 coding standards to start contributing to Friendica.
 There are a few tools you can use to check or fix your files before you commit.
 
-For documentation we use the standard of *one sentence per line* for the `md` files in the `/doc` and `/doc/$lng` subdirectories.
+For documentation, we use the standard of *one sentence per line* for the `md` files in the `/doc` and `/doc/$lng` subdirectories.
 
 #### Check with [PHP Code Sniffer](https://github.com/squizlabs/PHP_CodeSniffer)
 
@@ -113,7 +113,7 @@ If the command-line tools `diff` and `patch` are unavailable for you, `phpcbf` c
 
 ### Code documentation
 
-If you are interested in having the documentation of the Friendica code outside of the code files, you can use [Doxygen](http://doxygen.org) to generate it.
+If you are interested in having the documentation of the Friendica code outside the code files, you can use [Doxygen](http://doxygen.org) to generate it.
 The configuration file for Doxygen is located in the base directory of the project sources.
 Run
 
@@ -126,7 +126,7 @@ If you find missing documentation, don't hesitate to contact us and write it dow
 
 ### Issues
 
-Have a look at our [issue tracker](https://github.com/friendica/friendica) on github!
+Have a look at our [issue tracker](https://github.com/friendica/friendica) on GitHub!
 
 * Try to reproduce a bug that needs more inquiries and write down what you find out.
 * If a bug looks fixed, ask the bug reporters for feedback to find out if the bug can be closed.
@@ -143,13 +143,13 @@ If you want to get involved here:
 * Look at the first steps that were made (e.g. the clean theme).
 	Ask us to find out whom to talk to about their experiences.
 * Talk to design people if you know any.
-* Let us know about your plans [in the dev forum](https://forum.friendi.ca/profile/developers)
+* Let us know about your plans [in the dev group](https://forum.friendi.ca/profile/developers)
 	Do not worry about cross-posting.
 
 ### Client software
 
 As Friendica is using a [Twitter/GNU Social compatible API](help/api) any of the clients for those platforms should work with Friendica as well.
-Furthermore there are several client projects, especially for use with Friendica.
+Furthermore, there are several client projects, especially for use with Friendica.
 If you are interested in improving those clients, please contact the developers of the clients directly.
 
 * Android / LinageOS: **Friendiqa** [src](https://git.friendi.ca/lubuwest/Friendiqa)/[Google Play](https://play.google.com/store/apps/details?id=org.qtproject.friendiqa) developed by [Marco R](https://freunde.ma-nic.de/profile/marco)

doc/FAQ-admin.md

@@ -42,7 +42,7 @@ The listed emails need to be separated by a comma like this:
 'admin_email' => 'mail1@example.com,mail2@example.com',
 ```
 
-<a name="dbupdate">
+<a name="dbupdate"></a>
 ### The Database structure seems not to be updated. What can I do?
 
 Please have a look at the Admin panel under [DB updates](/admin/dbsync/) and follow the link to *check database structure*.
@@ -52,4 +52,4 @@ You can manually execute the structure update from the CLI in the base directory
 
     bin/console dbstructure update
 
-if there occur any errors, please contact the [support forum](https://forum.friendi.ca/profile/helpers).
+if there occur any errors, please contact the [Friendica Support group](https://forum.friendi.ca/profile/helpers) or discuss in the [Friendica Admins group](https://forum.friendi.ca/profile/admins).

doc/FAQ.md

@@ -4,14 +4,14 @@ Frequently Asked Questions - FAQ
 * [Home](help)
 
 * **[Where I can find help?](help/FAQ#help)**
-* **[Why do I getting warnings about certificates?](help/FAQ#ssl)**
+* **[Why do I get warnings about certificates?](help/FAQ#ssl)**
 * **[How can I upload images, files, links, videos and sound files to posts?](help/FAQ#upload)**
 * **[Is it possible to have different avatars per profile?](help/FAQ#avatars)**
 * **[How can I view Friendica in a certain language?](help/FAQ#language)**
 * **[How do blocked, ignored, archived and hidden contacts behave?](help/FAQ#contacts)**
 * **[What happens when an account is removed? Is it truly deleted?](help/FAQ#removed)**
 * **[Can I subscribe to a hashtag?](help/FAQ#hashtag)**
-* **[How to create a RSS feed of the stream?](help/FAQ#rss)**
+* **[How to create an RSS feed of the stream?](help/FAQ#rss)**
 * **[What friendica clients can I use?](help/FAQ#clients)**
 
 
@@ -21,7 +21,7 @@ Frequently Asked Questions - FAQ
 
 If this FAQ does not answer your question you can always reach out to the community via the following options:
 
-  * Friendica Support Forum: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
+  * Friendica Support Group: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
   * Community chat rooms (the IRC, Matrix and XMPP rooms are bridged) these public chats are logged [from IRC](https://gnusociarg.nsupdate.info/2021/%23friendica/) and [Matrix](https://view.matrix.org/alias/%23friendi.ca:matrix.org/)
     * XMPP: support(at)forum.friendi.ca
     * IRC: #friendica at [libera.chat](https://web.libera.chat/?channels=#friendica)
@@ -66,7 +66,7 @@ If this doesn't work, try to add the link by typing: [url=http://example.com]*se
 You can also add video and audio files to posts.
 However, instead of a direct upload you have to use one of the following methods:
 
-1. Add the video or audio link of a hoster (Youtube, Vimeo, Soundcloud and anyone else with oembed/opengraph-support). Videos will be shown with a preview image you can click on to start. SoundCloud directly inserts a player to your post.
+1. Add the video or audio link of a hoster (YouTube, Vimeo, Soundcloud and anyone else with oembed/opengraph-support). Videos will be shown with a preview image you can click on to start. SoundCloud directly inserts a player to your post.
 
 2. If you have your own server, you can upload multimedia files via FTP and insert the URL.
 
@@ -107,33 +107,33 @@ When a certain language is forced, the language remains until session is closed.
 
 Direct communication will be blocked.
 Blocked contacts are not included in delivery, and their own posts to you are not imported.
-However their conversations with your friends will still be visible in your stream.
+However, their conversations with your friends will still be visible in your stream.
 If you remove a contact completely, they can send you another friend request.
 Blocked contacts cannot do this. They cannot communicate with you directly, only through friends.
 
 ##### Ignored
 
 Ignored contacts are included in delivery and will receive your posts and private messages.
-However we do not import their posts or private messages to you.
-Like blocking you will still see this person's comments to posts made by your friends.
+However, we do not import their posts or private messages to you.
+Like blocking, you will still see this person's comments to posts made by your friends.
 
 An addon called "blockem" can be installed to collapse/hide all posts from a particular person in your stream if you desire complete blocking of an individual, including their conversations with your other friends.
 
 ##### Archived
 
 Communication is not possible and will not be attempted.
-However unlike blocking, existing posts this person made before being archived will be visible in your stream.
+However, unlike blocking, existing posts this person made before being archived will be visible in your stream.
 
 ##### Hidden
 
 Contact not be displayed in your public friend list.
-However a hidden contact will appear normally in conversations and this may expose their hidden status to anybody who can see the conversation.
+However, a hidden contact will appear normally in conversations and this may expose their hidden status to anybody who can see the conversation.
 
 <a name="removed"></a>
 ### What happens when an account is removed?
 
 If you remove your account, it will be scheduled for permanent deletion in *seven days*.
-As soon as you activate the deletion process you won't be able to login any more. 
+As soon as you activate the deletion process you won't be able to log in anymore.
 Only the administrator of your node can halt this process prior to permanent deletion.
 
 After the elapsed time of seven days, all your posts, messages, photos, and personal information stored on your node will be deleted.
@@ -143,12 +143,12 @@ Your username cannot be reissued for future sign-ups for security reasons.
 <a name="hashtag"></a>
 ### Can I follow a hashtag?
 
-Yes. Simply add the hash tag to your saved searches.
+Yes. Simply add the hashtag to your saved searches.
 The posts will appear on your network page.
 For technical reasons, your answers to such posts won't appear on the "personal" tab in the network page and the whole thread isn't accessible via the API.
 
 <a name="rss"></a>
-### How to create a RSS feed of the stream?
+### How to create an RSS feed of the stream?
 
 If you want to share your public page via rss you can use one of the following links:
 
@@ -178,12 +178,12 @@ The available features are client specific and may differ.
 #### Android
 
 * [AndStatus](http://andstatus.org) ([F-Droid](https://f-droid.org/repository/browse/?fdid=org.andstatus.app), [Google Play](https://play.google.com/store/apps/details?id=org.andstatus.app))
-* [Fedi](https://github.com/Big-Fig/Fediverse.app) ([Google Play](https://play.google.com/store/apps/details?id=com.fediverse.app))
 * [Fedilab](https://fedilab.app) ([F-Droid](https://f-droid.org/app/fr.gouv.etalab.mastodon), [Google Play](https://play.google.com/store/apps/details?id=app.fedilab.android))
 * [Friendiqa](https://git.friendi.ca/lubuwest/Friendiqa) ([F-Droid](https://git.friendi.ca/lubuwest/Friendiqa#install), [Google Play](https://play.google.com/store/apps/details?id=org.qtproject.friendiqa))
-* [Husky](https://git.sr.ht/~captainepoch/husky) ([F-Droid](https://f-droid.org/repository/browse/?fdid=su.xash.husky), [Google Play](https://play.google.com/store/apps/details?id=su.xash.husky))
+* [Husky](https://codeberg.org/husky/husky) ([F-Droid](https://f-droid.org/repository/browse/?fdid=su.xash.husky), [Google Play](https://play.google.com/store/apps/details?id=su.xash.husky))
 * [Mastodon](https://github.com/mastodon/mastodon-android) ([F-Droid](https://f-droid.org/en/packages/org.joinmastodon.android/), [Google Play](https://play.google.com/store/apps/details?id=org.joinmastodon.android))
-* [Subway Tooter](https://github.com/tateisu/SubwayTooter) ([F-Droid](https://android.izzysoft.de/repo/apk/jp.juggler.subwaytooter))
+* [Pachli](https://pachli.app/) ([F-Droid](https://f-droid.org/en/packages/app.pachli/), [Google Play](https://play.google.com/store/apps/details?id=app.pachli))
+* [Subway Tooter](https://github.com/tateisu/SubwayTooter) ([F-Droid via Izzy](https://android.izzysoft.de/repo/apk/jp.juggler.subwaytooter.noFcm))
 * [Tooot](https://tooot.app/) ([Google Play](https://play.google.com/store/apps/details?id=com.xmflsct.app.tooot))
 * [Tusky](https://tusky.app) ([F-Droid](https://f-droid.org/repository/browse/?fdid=com.keylesspalace.tusky), [Google Play](https://play.google.com/store/apps/details?id=com.keylesspalace.tusky))
 * [TwidereX](https://github.com/TwidereProject/TwidereX-Android) ([F-Droid](https://f-droid.org/en/packages/com.twidere.twiderex/), [Google Play](https://play.google.com/store/apps/details?id=com.twidere.twiderex))
@@ -191,10 +191,10 @@ The available features are client specific and may differ.
 
 #### iOS
 
-* [Mastodon](https://joinmastodon.org/apps) ([AppStore](https://apps.apple.com/us/app/mastodon-for-iphone/id1571998974))
-* [Stella*](https://www.stella-app.net/) ([AppStore](https://apps.apple.com/us/app/stella-for-mastodon-twitter/id921372048))
-* [Tooot](https://github.com/tooot-app) ([AppStore](https://apps.apple.com/app/id1549772269)
-* [TwidereX](https://github.com/TwidereProject/TwidereX-iOS) ([AppStore](https://apps.apple.com/app/twidere-x/id1530314034))
+* [Mastodon](https://joinmastodon.org/apps) ([App Store](https://apps.apple.com/us/app/mastodon-for-iphone/id1571998974))
+* [Stella*](https://www.stella-app.net/) ([App Store](https://apps.apple.com/us/app/stella-for-mastodon-twitter/id921372048))
+* [Tooot](https://github.com/tooot-app) ([App Store](https://apps.apple.com/app/id1549772269))
+* [TwidereX](https://github.com/TwidereProject/TwidereX-iOS) ([App Store](https://apps.apple.com/app/twidere-x/id1530314034))
 
 #### Linux
 
@@ -206,12 +206,12 @@ The available features are client specific and may differ.
 #### macOS
 
 * [TheDesk](https://thedesk.top/en/) ([GitHub](https://github.com/cutls/TheDesk))
-* [Whalebird](https://whalebird.social/en/desktop/contents) ([AppStore](https://apps.apple.com/de/app/whalebird/id1378283354), [GitHub](https://github.com/h3poteto/whalebird-desktop))
+* [Whalebird](https://whalebird.social/en/desktop/contents) ([App Store](https://apps.apple.com/de/app/whalebird/id1378283354), [GitHub](https://github.com/h3poteto/whalebird-desktop))
 
 #### Windows
 
 * [TheDesk](https://thedesk.top/en/) ([GitHub](https://github.com/cutls/TheDesk))
-* [Whalebird](https://whalebird.social/en/desktop/contents) ([Website Download](https://whalebird.social/en/desktop/contents/downloads#windows), [GitHub](https://github.com/h3poteto/whalebird-desktop))
+* [Whalebird](https://whalebird.social/en/desktop/contents) ([Microsoft Store](https://apps.microsoft.com/detail/9nbw4csdv5hc), [GitHub](https://github.com/h3poteto/whalebird-desktop))
 
 #### Web Frontend
 

doc/Forums.md

@@ -1,66 +0,0 @@
-Forums
-=====
-
-* [Home](help)
-
-
-Friendica also lets you create community forums and other types of accounts that can function as discussion forums, celebrity accounts, announcement channels, news reflectors, or organization pages, depending on how you want to interact with others. Management of these pages can be delegated to other accounts, or a parent account can be designated to easily toggle multiple identities.
-
-Every page in Friendica has a nickname and these must all be unique. This applies to all forums, whether they are normal profiles or forum profiles. 
-
-Managing Accounts
----
-
-To create a new linked account that can be used as a forum, log in to your normal account and go to Settings > Manage Accounts.
-Here you can register additional accounts with new nicknames that will be linked to your primary account. 
-
-You may appoint a delegate to manage your new account (e.g. forum page).
-The Delegates section of Manage Accounts page will provide you with a list of contacts on this instance under "Potential Delegates".
-Selecting one or more persons will give them access to manage your forum.
-They will be able to edit contacts, profiles, and all content for this account/page.
-Please use this facility wisely.
-Delegated managers will not be able to alter basic account settings, such as passwords or page types, or remove the account.
-
-Additionally, this page is also where you can choose to designate an account as a parent user.
-If your primary account is designated as the parent user, you will be able to easily toggle identities and manage your forums or other types of accounts.
-
-Types of Accounts
----
-
-On the new account, visit the Settings > Account page.
-Towards the end of the page is a section for "Advanced account types".
-Typically you would use "Personal Page - Standard" for a normal personal account with manual approval of “friends” and “followers.”
-This is the default selection.
-On this page you can change the type of account if desired.
-
-The other subtypes of a Personal Page are “Soapbox” and “Love-all.”
-A Soapbox account is an announcement channel that automatically approvals follower requests.
-Everything posted by the account will go out to the followers, but there will be no opportunity for interaction.
-This setting would typically be used for announcements or corporate communications.
-“Love-all” automatically approves contacts as friends.
-
-In addition to Personal Page, there are options for Organization Page, News Page, and Community Forum.
-Organization and New Pages automatically approve contact requests as followers.
-
-Community Forum provide the ability for people to become friends/fans of the forum without requiring approval.
-This creates a forum page where all members can freely interact.
-
-Posting to Community forums
----
-
-If you are a member of a community forum, you may post to the forum by including an @-tag in the post mentioning the forum.
-For example @bicycle would send my post to all members of the group "bicycle" in addition to the normal recipients.
-If you mention a forum (you are a member of) in a new posting, the posting will be distributed to all members of the forum, regardless of your privacy settings for the posting.
-Also, if the forum is a public forum, your posting will be public for the all internet users.
-If your post is private you must also explicitly include the group in the post permissions (to allow the forum "contact" to see the post) **and** mention it in a tag (which redistributes the post to the forum members).
-Posting privately to a public forum, will result in your posting being displayed on the forum wall, but not on yours.
-
-Additionally it is possible to address a forum with the exclamation mark.
-In the example above this means that you can address the bicycle forum via !bicycle.
-The difference to the @ is that the post will only be sent to the addressed forum.
-This also means that you shouldn't address multiple forums in a single post in that way since it will only be distributed by one the forums.
-
-You may also post to a community forum by posting a "wall-to-wall" post using secure cross-site authentication.
-
-Comments which are relayed to community forums will be relayed back to the original post creator.
-Mentioning the forum with an @-tag in a comment does not relay the message, as distribution is controlled entirely by the original post creator. 

doc/GitHub.md

@@ -3,7 +3,7 @@ Friendica on GitHub
 
 * [Home](help)
 
-Here is how you can work on the code with us. If you have any questions please write to the Friendica developers' forum.
+Here is how you can work on the code with us. If you have any questions please write to the Friendica developers' group.
 
 Introduction to the workflow with our GitHub repository
 -------------------------------------------------------

doc/Groups.md

@@ -0,0 +1,68 @@
+Groups
+=====
+
+* [Home](help)
+
+
+Friendica also lets you create accounts that can function as discussion groups, celebrity accounts, announcement channels, news reflectors, or organization pages, depending on how you want to interact with others.
+Management of these accounts can be delegated to other accounts, or a parent account can be designated to easily toggle multiple identities.
+
+Every account in Friendica has a nickname and these must all be unique.
+This applies to all accounts, whether they are individual profiles or group profiles.
+
+Managing Accounts
+---
+
+To create a new linked account that can be used as a group, log in to your normal account and go to Settings > Manage Accounts.
+Here you can register additional accounts with new nicknames that will be linked to your primary account.
+
+You may appoint a delegate to manage your new account.
+The Delegates section of Manage Accounts page will provide you with a list of contacts on this instance under "Potential Delegates".
+Selecting one or more persons will give them access to manage your newly created account.
+They will be able to edit contacts, profiles, and all content for this account.
+Please use this facility wisely.
+Delegated managers will not be able to alter basic account settings, such as passwords or account types, or remove the account.
+
+Additionally, this page is also where you can choose to designate an account as a parent user.
+If your primary account is designated as the parent user, you will be able to easily toggle identities and manage your groups or other types of accounts.
+
+Types of Accounts
+---
+
+On the new account, visit the Settings > Account page.
+Towards the end of the page is a section for "Advanced account types".
+Typically, you would use "Personal Page - Standard" for a normal personal account with manual approval of “friends” and “followers.”
+This is the default selection.
+On this page you can change the type of account if desired.
+
+The other subtypes of a Personal Page are “Soapbox” and “Love-all.”
+A Soapbox account is an announcement channel that automatically approvals follower requests.
+Everything posted by the account will go out to the followers, but there will be no opportunity for interaction.
+This setting would typically be used for announcements or corporate communications.
+“Love-all” automatically approves contacts as friends.
+
+In addition to Personal Page, there are options for Organization Page, News Page, and Community Group.
+Organization and New Pages automatically approve contact requests as followers.
+
+Community Group provide the ability for people to join the group without requiring approval.
+This creates a group where all members can freely interact.
+
+Posting to Community groups
+---
+
+If you are a member of a community group, you may post to the group by including an @-mention in the post mentioning the group.
+For example @bicycle would send my post to all members of the group "bicycle" in addition to the normal recipients.
+If you mention a group (you are a member of) in a new posting, the posting will be distributed to all members of the group, regardless of your privacy settings for the posting.
+Also, if the group is public, your posting will be public for the all internet users.
+If your post is private you must also explicitly include the group in the post permissions (to allow the group "contact" to see the post) **and** mention it in a tag (which redistributes the post to the group members).
+Posting privately to a public group, will result in your posting being displayed on the group wall, but not on yours.
+
+Additionally, it is possible to address a group with the exclamation mark.
+In the example above this means that you can address the bicycle group via !bicycle.
+The difference with the @-mention is that the post will only be sent to the addressed group.
+This also means that you shouldn't address multiple groups in a single post in that way since it will only be distributed by one the groups.
+
+You may also post to a community group by posting a "wall-to-wall" post using secure cross-site authentication.
+
+Comments which are relayed to community groups will be relayed back to the original post creator.
+Mentioning the group with an @-mention in a comment does not relay the message, as distribution is controlled entirely by the original post creator.

doc/Home.md

@@ -14,9 +14,10 @@ Friendica Documentation and Resources
 * You and other users
 	* [Connectors](help/Connectors)
 	* [Making Friends](help/Making-Friends)
-	* [Groups and Privacy](help/Groups-and-Privacy)
+	* [Circles and Privacy](help/Circles-and-Privacy)
 	* [Tags and Mentions](help/Tags-and-Mentions)
-	* [Community Forums](help/Forums)
+	* [Community Groups](help/Groups)
+	* [Channels](help/Channels)
 	* [Chats](help/Chats)
 * Further information
 	* [Move your account](help/Move-Account)
@@ -67,7 +68,7 @@ Friendica Documentation and Resources
 
 * [Main Website](https://friendi.ca)
 * Ways to get Support
-  * Friendica Support Forum: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
+  * Friendica Support Group: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
   * [Mailing List Archive](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca) you can subscribe to the list by sending an email to ``support-request(at)friendi.ca?subject=subscribe``
   * Community chat rooms (the IRC, Matrix and XMPP rooms are bridged) these public chats are logged [from IRC](https://gnusociarg.nsupdate.info/2021/%23friendica/) and [Matrix](https://view.matrix.org/alias/%23friendi.ca:matrix.org/)
     * XMPP/Jabber MUC: support(at)forum.friendi.ca

doc/Improve-Performance.md

@@ -3,7 +3,7 @@ How to improve the performance of a Friendica site
 
 * [Home](help)
 
-Feel free to ask in the [Friendica support forum](https://forum.friendi.ca/profile/helpers) if you need some clarification about the following instructions or if you need help in any other way.
+Feel free to ask in the [Friendica support group](https://forum.friendi.ca/profile/helpers) if you need some clarification about the following instructions or if you need help in any other way.
 
 System configuration
 --------

doc/Install.md

@@ -15,7 +15,7 @@ Many will.
 But **please** review the [requirements](#Requirements) and confirm these with your hosting provider prior to installation.
 
 ## Support
-If you encounter installation issues, please let us know via the [helper](http://forum.friendi.ca/profile/helpers) or the [developer](https://forum.friendi.ca/profile/developers) forum or [file an issue](https://github.com/friendica/friendica/issues).
+If you encounter installation issues, please let us know via the [helper](http://forum.friendi.ca/profile/helpers) or the [developer](https://forum.friendi.ca/profile/developers) group or [file an issue](https://github.com/friendica/friendica/issues).
 
 Please be as clear as you can about your operating environment and provide as much detail as possible about any error messages you may see, so that we can prevent it from happening in the future.
 Due to the large variety of operating systems and PHP platforms in existence we may have only limited ability to debug your PHP installation or acquire any missing modules - but we will do our best to solve any general code issues.
@@ -28,9 +28,9 @@ Due to the large variety of operating systems and PHP platforms in existence we
 ### Requirements
 
 * Apache with mod-rewrite enabled and "Options All" so you can use a local `.htaccess` file
-* PHP 7.3+ (PHP8 is not fully supported yet)
+* PHP 7.4+
   * PHP *command line* access with register_argc_argv set to true in the php.ini file
-  * Curl, GD, GMP, PDO, mbstrings, MySQLi, hash, xml, zip and OpenSSL extensions
+  * Curl, GD, GMP, PDO, mbstrings, MySQLi, hash, xml, zip, IntlChar and OpenSSL extensions
   * The POSIX module of PHP needs to be activated (e.g. [RHEL, CentOS](http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7) have disabled it)
   * Some form of email server or email gateway such that PHP mail() works.
     If you cannot set up your own email server, you can use the [phpmailer](https://github.com/friendica/friendica-addons/tree/develop/phpmailer) addon and use a remote SMTP server.
@@ -44,7 +44,7 @@ For alternative server configurations (such as Nginx server and MariaDB database
 
 ### Optional
 
-* PHP ImageMagick extension (php-imagick) for animated GIF support.
+* PHP ImageMagick extension (php-imagick) for animated GIF and animated WebP support.
 
 ## Installation procedure
 

doc/Making-Friends.md

@@ -20,15 +20,15 @@ You'll also see a link to a **Global Directory**.
 There are several global directories across the globe that regularly exchange information with each other.
 The specific global directory that you see usually depends on where your server is located.
 If you click through to the global directory, you will be presented with a list of everybody who choses to be listed across all instances of Friendica.
-You will also see a "Show Community Forums" link, which will direct you to Groups, Forums and Fanpages.
-You connect to people, groups and forums in the same way, except groups and forums will automatically accept your introduction request, whereas a human will approve you manually.
+You will also see a "Show Community Groups" link, which will direct you to Groups.
+You connect to people and groups the same way, public groups will automatically accept your introduction, whereas private groups and some individual users will need to manually approve it.
 
 Connect to other Friendica users
 ---
 
 Visit their profile.
 Just beneath their profile picture will be the word 'Connect' (we're assuming this is an English language profile).
-Click that 'Connect' button and it will take you to a 'Connect' form.
+Click that 'Connect' button, and it will take you to a 'Connect' form.
 
 The form is going to ask you for your Identity Address.
 This is necessary so that this person's website can find yours.
@@ -41,7 +41,7 @@ It's easy for people to remember.
 
 You *could* also put in the URL of your "home" page, such as "http://demo.friendica.com/profile/bob" instead of the email-style address.
 
-When you've submitted the connection page, it will take you back to your own site where you must then login (if necessary) and verify the connection request on *your* site.
+When you've submitted the connection page, it will take you back to your own site where you must then log in (if necessary) and verify the connection request on *your* site.
 Once you've done this, the two websites can communicate with each other to complete the process (after your new friend has approved the request).
 
 If you already know somebody's Identity Address, you can enter it in the "connect" box on your "Contacts" page.
@@ -55,14 +55,14 @@ You can also use your Identity Address or other people's Identity Addresses to b
 Currently, Friendica supports connections with people on diaspora*, Red, Hubzilla, GNU Social, StatusNet, Mastodon, Pleroma, socialhome, and ganggo platforms.
 
 If you know (for instance) "alice" on gnusocial.net (a GNU Social site) you could put alice@gnusocial.net into your Contact page and become friends across networks.
-Likewise you can put in the URL to Alice's gnusocial.net page, if you wish.
+Likewise, you can put in the URL to Alice's gnusocial.net page, if you wish.
 Note: Some versions of GNU Social software may require the full URL to your profile and may not work with the identity address.
 
 People on these networks can also initiate contact with you, if they know your contact details.
 
 ### Other social media
 If you server provides this functionality, you can also connect with people one
-Twitter or important feeds from Tumblr, Wordpress, and many more.
+Twitter or important feeds from Tumblr, WordPress, and many more.
 
 To connect, enter their contact details in the "connect" box on your "Contacts" page.
 

doc/Move-Account.md

@@ -8,7 +8,7 @@ How to move your account between servers
 
 * Go to "Settings" -> "[Export personal data](uexport)"
 * Click on "Export account" to save your account data.
-* **Save the file in a secure place!** It contains your details, your contacts, groups, and personal settings. It also contains your secret keys to authenticate yourself to your contacts.
+* **Save the file in a secure place!** It contains your details, your contacts, circles, and personal settings. It also contains your secret keys to authenticate yourself to your contacts.
 * Go to your new server, and open *http://newserver.com/user/import* (there is not a direct link to this page at the moment). Please consider that this is only possible on servers with open registration. On other systems only the administrator can add accounts with an uploaded file.
 * Do NOT create a new account prior to importing your old settings - user import should be used *instead* of register.
 * Load your saved account file and click "Import".
@@ -17,7 +17,7 @@ How to move your account between servers
 
 Friendica contacts
 ---
-Friendica will recreate your account on the new server, with your contacts and groups.
+Friendica will recreate your account on the new server, with your contacts and circles.
 A message is sent to Friendica contacts, to inform them about your move:
 If your contacts are running on an updated server, your details on their side will be automatically updated.
 

doc/Quick-Start-andfinally.md

@@ -4,8 +4,7 @@ Here are some more things to help get you started:
 
 **Groups**
 
-
-- <a href="http://forum.friendi.ca/profile/helpers">Friendica Support</a> - problems?  This is the place to ask.
+- <a href="https://forum.friendi.ca/profile/helpers">Friendica Support</a> - problems?  This is the place to ask.
 
 **Documentation**
 

doc/Quick-Start-groupsandpages.md

@@ -1,9 +1,9 @@
 This is the global directory.
 If you get lost, you can <a href = "help/Quick-Start-groupsandpages">click this link</a> to bring yourself back here.
 
-On this page, you'll find a collection of groups, forums and celebrity pages.
+On this page, you'll find a collection of groups.
 Groups are not real people.
-Connecting to them is similar to "liking" something on Facebook, or signing up for a new forum.
+Connecting to them is similar to "liking" something on Facebook, or signing up for a new group.
 You don't have to feel awkward about introducing yourself to a new person, because they're not people!
 
 When you connect to a group, all messages to that group will start appearing in your network tab.
@@ -15,6 +15,6 @@ Remember the link at the top of this page will bring you back here.
 
 Once you've added some groups, <a href="help/Quick-Start-andfinally">move on to the next section</a>.
 
-<iframe src="https://dir.friendica.social/forum" width="950" height="600"></iframe>
+<iframe src="https://dir.friendica.social/group" width="950" height="600"></iframe>
 
 

doc/Settings.md

@@ -77,11 +77,11 @@ Additionally to the setting in the admin panel, you can decide if registrations
 To enable invitation based registration, you have to set the `invitation_only` setting to `true` in the `system` section of the [config/local.config.php](/help/Config) file.
 If you want to use this method, the registration policy has to be set to either *open* or *requires approval*.
 
-#### Check Full Names
+#### Check Display Names
 
 You may find a lot of spammers trying to register on your site.
-During testing we discovered that since these registrations were automatic, the "Full Name" field was often set to just an account name with no space between first and last name.
-If you would like to support people with only one name as their full name, you may change this setting to true.
+During testing we discovered that since these registrations were automatic, the "Display Name" field was often set to just an account name with no space between first and last name.
+If you would like to support people with only one name as their display name, you can leave this setting set to false.
 Default is false.
 
 #### OpenID

doc/StrategyHooks.md

@@ -0,0 +1,89 @@
+Friendica strategy Hooks
+===========================================
+
+* [Home](help)
+
+## Strategy hooks
+
+This type of hook is based on the [Strategy Design Pattern](https://refactoring.guru/design-patterns/strategy).
+
+A strategy class defines a possible implementation of a given interface based on a unique name.
+Every name is possible as long as it's unique and not `null`.
+Using an empty name (`''`) is possible as well and should be used as the "default" implementation.
+To register a strategy, use the [`ICanRegisterInstance`](../src/Core/Hooks/Capability/ICanRegisterInstances.php) interface.
+
+After registration, a caller can automatically create this instance with the [`ICanCreateInstances`](../src/Core/Hooks/Capability/ICanCreateInstances.php) interface and the chosen name.
+
+This is useful in case there are different, possible implementations for the same purpose, like for logging, locking, caching, ...
+
+Normally, a config entry is used to choose the right implementation at runtime.
+And if no config entry is set, the "default" implementation should be used.
+
+### Example
+
+```php
+interface ExampleInterface
+{
+	public function testMethod();
+}
+
+public class ConcreteClassA implements ExampleInterface
+{
+	public function testMethod()
+	{
+		echo "concrete class A";
+	}
+}
+
+public class ConcreteClassB implements ExampleInterface
+{
+	public function testMethod()
+	{
+		echo "concrete class B";
+	}
+}
+
+/** @var \Friendica\Core\Hooks\Capability\ICanRegisterStrategies $instanceRegister */
+$instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassA::class, 'A');
+$instanceRegister->registerStrategy(ExampleInterface::class, ConcreteClassB::class, 'B');
+
+/** @var \Friendica\Core\Hooks\Capability\ICanCreateInstances $instanceManager */
+/** @var ConcreteClassA $concreteClass */
+$concreteClass = $instanceManager->create(ExampleInterface::class, 'A');
+
+$concreteClass->testMethod();
+// output:
+// "concrete class A";
+```
+
+## hooks.config.php
+
+To avoid registering all strategies manually inside the code, Friendica introduced the [`hooks.config.php`](../static/hooks.config.php) file.
+
+There, you can register all kind of strategies  in one file.
+
+### [`HookType::STRATEGY`](../src/Core/Hooks/Capability/HookType.php)
+
+For each given interface, a list of key-value pairs can be set, where the key is the concrete implementation class and the value is an array of unique names.
+
+### Example
+
+```php
+use Friendica\Core\Hooks\Capability\BehavioralHookType as H;
+
+return [
+	H::STRATEGY  => [
+		ExampleInterface::class => [
+			ConcreteClassA::class => ['A'],
+			ConcreteClassB::class => ['B'],
+		],
+	],
+];
+```
+
+## Addons
+
+The hook logic is useful for decoupling the Friendica core logic, but its primary goal is to modularize Friendica in creating addons.
+
+Therefor you can either use the interfaces directly as shown above, or you can place your own `hooks.config.php` file inside a `static` directory directly under your addon core directory.
+Friendica will automatically search these config files for each **activated** addon and register the given hooks.

doc/Tags-and-Mentions.md

@@ -23,23 +23,23 @@ You can tag a person on a different network or one that is **not in your social
 
 Unless their system blocks unsolicited "mentions", the person tagged will likely receive a "Mention" post/activity or become a direct participant in the conversation in the case of public posts.
 Friendica blocks incoming “mentions” from people with no relationship to you.
-The exception is an ongoing conversation started from a contact of both you and the 3rd person or a conversation in a forum where you are a member of.
+The exception is an ongoing conversation started from a contact of both you and the 3rd person or a conversation in a group where you are a member of.
 This is a spam prevention measure.
 
 Remote mentions are delivered using the OStatus protocol.
 This protocol is used by Friendica and GNU Social and several other systems like Mastodon, but is not currently implemented in Diaspora.
 As the OStatus protocol allows this Friendica user can be @-mentioned by users from platforms using this protocol in conversations if the "Enable OStatus support" is activated on the Friendica node.
-These @-mentions wont be blocked, even if there is no relationship between the sender and the receiver of the message.
+These @-mentions won't be blocked, even if there is no relationship between the sender and the receiver of the message.
 
-Friendica makes no distinction between people and forums for the purpose of tagging.
-You can use @-mentions for forums like for other accounts to tag the forum.
-If you want to post something exclusively to a forum (e.g. the support forum) please use the bang-notation instead of  the @tag.
-So !helpers will be an exclusive posting to the support forum if you are connected with the forum.
-If you select a forum from the ACL a !-mention will be added automatically to your posting.
+Friendica makes no distinction between people and groups for the purpose of tagging.
+You can use @-mentions for groups like for other accounts to tag the group.
+If you want to post something exclusively to a group (e.g. the support group) please use the !-mention instead of  the @-mention.
+So !helpers will be an exclusive posting to the support group if you are connected with the group.
+If you select a group from the ACL a !-mention will be added automatically to your posting.
 
-If you sort your contacts into groups, you cannot @-mention these groups.
-But you can select the group in the access control when creating a new posting, to allow (or disallow) a certain group of people to see the posting.
-See [Groups and Privacy](help/Groups-and-Privacy) for more details about grouping your contacts.
+If you sort your contacts into circles, you cannot @-mention these circles.
+But you can select the circle in the access control when creating a new posting, to allow (or disallow) a certain circle of people to see the posting.
+See [Circles and Privacy](help/Circles-and-Privacy) for more details about grouping your contacts.
 
 **Topical Tags**
 

doc/Text_editor.md

@@ -88,11 +88,11 @@ Click on "show" under contact name to hide the post to everyone but selected.
 
 Click on "Visible to everybody" to make the post public again.
 
-If you have defined some groups, you can check "show" for groups also. All contact in that group will see the post.
-If you want to hide the post to one contact of a group selected for "show", click "don't show" under contact name.
+If you have defined some circles, you can check "show" for circles also. All contact in that circle will see the post.
+If you want to hide the post to one contact of a circle selected for "show", click "don't show" under contact name.
 
 Click again on "show" or "don't show" to switch it off.
 
-You can search for contacts or groups with the search box.
+You can search for contacts or circles with the search box.
 
-See also [Group and Privacy](help/Groups-and-Privacy)
+See also [Circles and Privacy](help/Circles-and-Privacy)

doc/Update.md

@@ -11,7 +11,9 @@ If you installed Friendica in the ``path/to/friendica`` folder:
 2. Copy  the following items from ``path/to/friendica`` to ``path/to/friendica_new``:
    * ``config/local.config.php``
    * ``proxy/``
-The following items only need to be copied if they are located inside your friendica path:
+   * ``.htaccess`` if using Apache web server
+
+    The following items only need to be copied if they are located inside your friendica path:
    * your storage folder as set in **Admin -> Site -> File Upload -> Storage base path** 
    * your item cache as set in **Admin -> Site -> Performance -> Path to item cache**
    * your temp folder as set in **Admin -> Site -> Advanced -> Temp path**

doc/api.md

@@ -68,8 +68,8 @@ xml:
 The [RSStoFriendika](https://github.com/pafcu/RSStoFriendika) code can be used as an example of how to use the API with python.
 The lines for posting are located at [line 21](https://github.com/pafcu/RSStoFriendika/blob/master/RSStoFriendika.py#L21) and following.
 
-def tweet(server, message, group_allow=None):
+def tweet(server, message, circle_allow=None):
 url = server + '/api/statuses/update'
-urllib2.urlopen(url, urllib.urlencode({'status': message,'group_allow[]':group_allow}, doseq=True))
+urllib2.urlopen(url, urllib.urlencode({'status': message, 'circle_allow[]': circle_allow}, doseq=True))
 
 There is also a [module for python 3](https://bitbucket.org/tobiasd/python-friendica) for using the API.

doc/database.md

@@ -17,6 +17,8 @@ Database Tables
 | [arrived-activity](help/database/db_arrived-activity) | Id of arrived activities |
 | [attach](help/database/db_attach) | file attachments |
 | [cache](help/database/db_cache) | Stores temporary data |
+| [channel](help/database/db_channel) | User defined Channels |
+| [check-full-text-search](help/database/db_check-full-text-search) | Check for a full text search match in user defined channels before storing the message in the system |
 | [config](help/database/db_config) | main configuration storage |
 | [contact](help/database/db_contact) | contact table |
 | [contact-relation](help/database/db_contact-relation) | Contact relations |
@@ -30,8 +32,8 @@ Database Tables
 | [fetch-entry](help/database/db_fetch-entry) |  |
 | [fetched-activity](help/database/db_fetched-activity) | Id of fetched activities |
 | [fsuggest](help/database/db_fsuggest) | friend suggestion stuff |
-| [group](help/database/db_group) | privacy groups, group info |
-| [group_member](help/database/db_group_member) | privacy groups, member info |
+| [group](help/database/db_group) | privacy circles, circle info |
+| [group_member](help/database/db_group_member) | privacy circles, member info |
 | [gserver](help/database/db_gserver) | Global servers |
 | [gserver-tag](help/database/db_gserver-tag) | Tags that the server has subscribed |
 | [hook](help/database/db_hook) | addon hook registry |
@@ -59,13 +61,16 @@ 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 |
 | [post-history](help/database/db_post-history) | Post history |
 | [post-link](help/database/db_post-link) | Post related external links |
 | [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 |
@@ -77,7 +82,8 @@ Database Tables
 | [push_subscriber](help/database/db_push_subscriber) | Used for OStatus: Contains feed subscribers |
 | [register](help/database/db_register) | registrations requiring admin approval |
 | [report](help/database/db_report) |  |
-| [report-post](help/database/db_report-post) |  |
+| [report-post](help/database/db_report-post) | Individual posts attached to a moderation report |
+| [report-rule](help/database/db_report-rule) | Terms of service rule lines relevant to a moderation report |
 | [search](help/database/db_search) |  |
 | [session](help/database/db_session) | web session storage |
 | [storage](help/database/db_storage) | Data stored by Database storage backend |
@@ -85,6 +91,7 @@ Database Tables
 | [tag](help/database/db_tag) | tags and mentions |
 | [user](help/database/db_user) | The local users |
 | [user-contact](help/database/db_user-contact) | User specific public contact data |
+| [user-gserver](help/database/db_user-gserver) | User settings about remote servers |
 | [userd](help/database/db_userd) | Deleted usernames |
 | [verb](help/database/db_verb) | Activity Verbs |
 | [worker-ipc](help/database/db_worker-ipc) | Inter process communication between the frontend and the worker |

doc/database/db_attach.md

@@ -18,9 +18,9 @@ Fields
 | created       | creation time                                         | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 | edited        | last edit time                                        | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
 | allow_cid     | Access Control - list of allowed contact.id '<19><78> | mediumtext         | YES  |     | NULL                |                |
-| allow_gid     | Access Control - list of allowed groups               | mediumtext         | YES  |     | NULL                |                |
+| allow_gid     | Access Control - list of allowed circles              | mediumtext         | YES  |     | NULL                |                |
 | deny_cid      | Access Control - list of denied contact.id            | mediumtext         | YES  |     | NULL                |                |
-| deny_gid      | Access Control - list of denied groups                | mediumtext         | YES  |     | NULL                |                |
+| deny_gid      | Access Control - list of denied circles               | mediumtext         | YES  |     | NULL                |                |
 | backend-class | Storage backend class                                 | tinytext           | YES  |     | NULL                |                |
 | backend-ref   | Storage backend data reference                        | text               | YES  |     | NULL                |                |
 

doc/database/db_channel.md

@@ -0,0 +1,42 @@
+Table channel
+===========
+
+User defined Channels
+
+Fields
+------
+
+| Field            | Description                                                                                       | Type               | Null | Key | Default | Extra          |
+| ---------------- | ------------------------------------------------------------------------------------------------- | ------------------ | ---- | --- | ------- | -------------- |
+| id               |                                                                                                   | int unsigned       | NO   | PRI | NULL    | auto_increment |
+| uid              | User id                                                                                           | mediumint unsigned | NO   |     | NULL    |                |
+| label            | Channel label                                                                                     | varchar(64)        | NO   |     | NULL    |                |
+| description      | Channel description                                                                               | varchar(64)        | YES  |     | NULL    |                |
+| circle           | Circle or channel that this channel is based on                                                   | int                | YES  |     | NULL    |                |
+| access-key       | Access key                                                                                        | varchar(1)         | YES  |     | NULL    |                |
+| include-tags     | Comma separated list of tags that will be included in the channel                                 | varchar(1023)      | YES  |     | NULL    |                |
+| exclude-tags     | Comma separated list of tags that aren't allowed in the channel                                   | varchar(1023)      | YES  |     | NULL    |                |
+| min-size         | Minimum post size                                                                                 | int unsigned       | YES  |     | NULL    |                |
+| max-size         | Maximum post size                                                                                 | int unsigned       | 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
+------------
+
+| Name    | Fields |
+| ------- | ------ |
+| PRIMARY | id     |
+| uid     | uid    |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+
+Return to [database documentation](help/database)

doc/database/db_check-full-text-search.md

@@ -0,0 +1,23 @@
+Table check-full-text-search
+===========
+
+Check for a full text search match in user defined channels before storing the message in the system
+
+Fields
+------
+
+| Field      | Description                              | Type         | Null | Key | Default | Extra |
+| ---------- | ---------------------------------------- | ------------ | ---- | --- | ------- | ----- |
+| pid        | The ID of the process                    | int unsigned | NO   | PRI | NULL    |       |
+| searchtext | Simplified text for the full text search | mediumtext   | YES  |     | NULL    |       |
+
+Indexes
+------------
+
+| Name       | Fields               |
+| ---------- | -------------------- |
+| PRIMARY    | pid                  |
+| searchtext | FULLTEXT, searchtext |
+
+
+Return to [database documentation](help/database)

doc/database/db_contact-relation.md

@@ -7,12 +7,17 @@ Fields
 ------
 
 | Field                 | Description                                                             | Type              | Null | Key | Default             | Extra |
-| ---------------- | --------------------------------------------------- | ------------ | ---- | --- | ------------------- | ----- |
+| --------------------- | ----------------------------------------------------------------------- | ----------------- | ---- | --- | ------------------- | ----- |
 | cid                   | contact the related contact had interacted with                         | int unsigned      | NO   | PRI | 0                   |       |
 | relation-cid          | related contact who had interacted with the contact                     | int unsigned      | NO   | PRI | 0                   |       |
-| last-interaction | Date of the last interaction                        | datetime     | NO   |     | 0001-01-01 00:00:00 |       |
+| last-interaction      | Date of the last interaction by relation-cid on cid                     | datetime          | NO   |     | 0001-01-01 00:00:00 |       |
 | follow-updated        | Date of the last update of the contact relationship                     | datetime          | NO   |     | 0001-01-01 00:00:00 |       |
-| follows          |                                                     | boolean      | NO   |     | 0                   |       |
+| follows               | if true, relation-cid follows cid                                       | boolean           | NO   |     | 0                   |       |
+| score                 | score for interactions of cid on relation-cid                           | smallint unsigned | YES  |     | NULL                |       |
+| relation-score        | score for interactions of relation-cid on cid                           | smallint unsigned | YES  |     | NULL                |       |
+| thread-score          | score for interactions of cid on threads of relation-cid                | smallint unsigned | YES  |     | NULL                |       |
+| relation-thread-score | score for interactions of relation-cid on threads of cid                | smallint unsigned | YES  |     | NULL                |       |
+| post-score            | score for the amount of posts from cid that can be seen by relation-cid | smallint unsigned | YES  |     | NULL                |       |
 
 Indexes
 ------------

doc/database/db_contact.md

@@ -51,8 +51,8 @@ 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                                                                                         | varbinary(383)     | YES  |     |                     |                |
-| gsid                      | Global Server ID                                                                                               | int unsigned       | YES  |     | NULL                |                |
+| baseurl                   | baseurl of the contact from the gserver record, can be missing                                                 | varbinary(383)     | YES  |     |                     |                |
+| gsid                      | Global Server ID, can be missing                                                                               | int unsigned       | YES  |     | NULL                |                |
 | bd                        |                                                                                                                | date               | NO   |     | 0001-01-01          |                |
 | reason                    |                                                                                                                | text               | YES  |     | NULL                |                |
 | self                      | 1 if the contact is the user him/her self                                                                      | boolean            | NO   |     | 0                   |                |
@@ -81,7 +81,7 @@ Fields
 | 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                   |                |
+| forum                     | contact is a group. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = false instead        | boolean            | NO   |     | 0                   |                |
 | prv                       | contact is a private group. Deprecated, use 'contact-type' = 'community' and 'manually-approve' = true instead | boolean            | NO   |     | 0                   |                |
 | bdyear                    |                                                                                                                | varchar(4)         | NO   |     |                     |                |
 | site-pubkey               | Deprecated                                                                                                     | text               | YES  |     | NULL                |                |

doc/database/db_event.md

@@ -25,9 +25,9 @@ Fields
 | nofinish  | if event does have no end this is 1                        | boolean            | NO   |     | 0                   |                |
 | ignore    | 0 or 1                                                     | boolean            | NO   |     | 0                   |                |
 | allow_cid | Access Control - list of allowed contact.id '<19><78>'     | mediumtext         | YES  |     | NULL                |                |
-| allow_gid | Access Control - list of allowed groups                    | mediumtext         | YES  |     | NULL                |                |
+| allow_gid | Access Control - list of allowed circles                   | mediumtext         | YES  |     | NULL                |                |
 | deny_cid  | Access Control - list of denied contact.id                 | mediumtext         | YES  |     | NULL                |                |
-| deny_gid  | Access Control - list of denied groups                     | mediumtext         | YES  |     | NULL                |                |
+| deny_gid  | Access Control - list of denied circles                    | mediumtext         | YES  |     | NULL                |                |
 
 Indexes
 ------------

doc/database/db_group.md

@@ -1,7 +1,7 @@
 Table group
 ===========
 
-privacy groups, group info
+privacy circles, circle info
 
 Fields
 ------
@@ -11,9 +11,9 @@ Fields
 | id      | sequential ID                                                                             | int unsigned       | NO   | PRI | NULL    | auto_increment |
 | uid     | Owner User id                                                                             | mediumint unsigned | NO   |     | 0       |                |
 | visible | 1 indicates the member list is not private                                                | boolean            | NO   |     | 0       |                |
-| deleted | 1 indicates the group has been deleted                                                    | boolean            | NO   |     | 0       |                |
-| cid     | Contact id of forum. When this field is filled then the members are synced automatically. | int unsigned       | YES  |     | NULL    |                |
-| name    | human readable name of group                                                              | varchar(255)       | NO   |     |         |                |
+| deleted | 1 indicates the circle has been deleted                                                   | boolean            | NO   |     | 0       |                |
+| cid     | Contact id of group. When this field is filled then the members are synced automatically. | int unsigned       | YES  |     | NULL    |                |
+| name    | human readable name of circle                                                             | varchar(255)       | NO   |     |         |                |
 
 Indexes
 ------------

doc/database/db_group_member.md

@@ -1,16 +1,16 @@
 Table group_member
 ===========
 
-privacy groups, member info
+privacy circles, member info
 
 Fields
 ------
 
 | Field      | Description                                                | Type         | Null | Key | Default | Extra          |
-| ---------- | --------------------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |
+| ---------- | ---------------------------------------------------------- | ------------ | ---- | --- | ------- | -------------- |
 | id         | sequential ID                                              | int unsigned | NO   | PRI | NULL    | auto_increment |
-| gid        | groups.id of the associated group                         | int unsigned | NO   |     | 0       |                |
-| contact-id | contact.id of the member assigned to the associated group | int unsigned | NO   |     | 0       |                |
+| gid        | group.id of the associated circle                          | int unsigned | NO   |     | 0       |                |
+| contact-id | contact.id of the member assigned to the associated circle | int unsigned | NO   |     | 0       |                |
 
 Indexes
 ------------

doc/database/db_permissionset.md

@@ -11,9 +11,9 @@ Fields
 | id        | sequential ID                                          | int unsigned       | NO   | PRI | NULL    | auto_increment |
 | uid       | Owner id of this permission set                        | mediumint unsigned | NO   |     | 0       |                |
 | allow_cid | Access Control - list of allowed contact.id '<19><78>' | mediumtext         | YES  |     | NULL    |                |
-| allow_gid | Access Control - list of allowed groups                | mediumtext         | YES  |     | NULL    |                |
+| allow_gid | Access Control - list of allowed circles               | mediumtext         | YES  |     | NULL    |                |
 | deny_cid  | Access Control - list of denied contact.id             | mediumtext         | YES  |     | NULL    |                |
-| deny_gid  | Access Control - list of denied groups                 | mediumtext         | YES  |     | NULL    |                |
+| deny_gid  | Access Control - list of denied circles                | mediumtext         | YES  |     | NULL    |                |
 
 Indexes
 ------------

doc/database/db_photo.md

@@ -30,9 +30,9 @@ Fields
 | scale         |                                                                     | tinyint unsigned   | NO   |     | 0                   |                |
 | profile       |                                                                     | boolean            | NO   |     | 0                   |                |
 | allow_cid     | Access Control - list of allowed contact.id '<19><78>'              | mediumtext         | YES  |     | NULL                |                |
-| allow_gid     | Access Control - list of allowed groups                             | mediumtext         | YES  |     | NULL                |                |
+| allow_gid     | Access Control - list of allowed circles                            | mediumtext         | YES  |     | NULL                |                |
 | deny_cid      | Access Control - list of denied contact.id                          | mediumtext         | YES  |     | NULL                |                |
-| deny_gid      | Access Control - list of denied groups                              | mediumtext         | YES  |     | NULL                |                |
+| deny_gid      | Access Control - list of denied circles                             | mediumtext         | YES  |     | NULL                |                |
 | accessible    | Make photo publicly accessible, ignoring permissions                | boolean            | NO   |     | 0                   |                |
 | backend-class | Storage backend class                                               | tinytext           | YES  |     | NULL                |                |
 | backend-ref   | Storage backend data reference                                      | text               | YES  |     | NULL                |                |

doc/database/db_post-content.md

@@ -17,6 +17,7 @@ Fields
 | 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    |       |
+| sensitive       | If true, this post contains sensitive content                                                                             | boolean        | 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    |       |
@@ -31,11 +32,10 @@ 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 |
 
 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

@@ -0,0 +1,42 @@
+Table post-engagement
+===========
+
+Engagement data per post
+
+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    |       |
+| 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 in the ISO 639-1 format          | char(2)            | YES  |     | NULL    |       |
+| searchtext   | Simplified text for the full text search                              | mediumtext         | YES  |     | NULL    |       |
+| size         | Body size                                                             | int unsigned       | YES  |     | NULL    |       |
+| created      |                                                                       | datetime           | YES  |     | NULL    |       |
+| network      |                                                                       | char(4)            | YES  |     | NULL    |       |
+| restricted   | If true, this post is either unlisted or not from a federated network | boolean            | NO   |     | 0       |       |
+| comments     | Number of comments                                                    | mediumint unsigned | YES  |     | NULL    |       |
+| activities   | Number of activities (like, dislike, ...)                             | mediumint unsigned | YES  |     | NULL    |       |
+
+Indexes
+------------
+
+| Name       | Fields               |
+| ---------- | -------------------- |
+| PRIMARY    | uri-id               |
+| owner-id   | owner-id             |
+| created    | created              |
+| searchtext | FULLTEXT, searchtext |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| owner-id | [contact](help/database/db_contact) | id |
+
+Return to [database documentation](help/database)

doc/database/db_post-searchindex.md

@@ -0,0 +1,38 @@
+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    |       |
+| owner-id   | Item owner                                                            | int unsigned | 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 in the ISO 639-1 format          | char(2)      | YES  |     | NULL    |       |
+| searchtext | Simplified text for the full text search                              | mediumtext   | YES  |     | NULL    |       |
+| size       | Body size                                                             | int unsigned | YES  |     | NULL    |       |
+| created    |                                                                       | datetime     | YES  |     | NULL    |       |
+| restricted | If true, this post is either unlisted or not from a federated network | boolean      | NO   |     | 0       |       |
+
+Indexes
+------------
+
+| Name       | Fields               |
+| ---------- | -------------------- |
+| PRIMARY    | uri-id               |
+| owner-id   | owner-id             |
+| created    | created              |
+| searchtext | FULLTEXT, searchtext |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uri-id | [item-uri](help/database/db_item-uri) | id |
+| owner-id | [contact](help/database/db_contact) | id |
+
+Return to [database documentation](help/database)

doc/database/db_post-thread-user.md

@@ -37,7 +37,7 @@ Indexes
 ------------
 
 | Name                 | Fields                |
-| ----------------- | ------------------- |
+| -------------------- | --------------------- |
 | PRIMARY              | uid, uri-id           |
 | uri-id               | uri-id                |
 | conversation-id      | conversation-id       |
@@ -49,11 +49,18 @@ Indexes
 | psid                 | psid                  |
 | post-user-id         | post-user-id          |
 | commented            | commented             |
+| received             | received              |
+| author-id_created    | author-id, created    |
+| owner-id_created     | owner-id, created     |
 | uid_received         | uid, received         |
 | uid_wall_received    | uid, wall, received   |
 | uid_commented        | uid, commented        |
+| uid_created          | uid, created          |
 | uid_starred          | uid, starred          |
 | uid_mention          | uid, mention          |
+| contact-id_commented | contact-id, commented |
+| contact-id_received  | contact-id, received  |
+| contact-id_created   | contact-id, created   |
 
 Foreign Keys
 ------------

doc/database/db_post-user.md

@@ -58,7 +58,8 @@ Indexes
 | event-id             | event-id                |
 | psid                 | psid                    |
 | author-id_uid        | author-id, uid          |
-| author-id_received   | author-id, received     |
+| author-id_created    | author-id, created      |
+| owner-id_created     | owner-id, created       |
 | parent-uri-id_uid    | parent-uri-id, uid      |
 | uid_wall_received    | uid, wall, received     |
 | uid_contactid        | uid, contact-id         |

doc/database/db_profile.md

@@ -13,7 +13,7 @@ Fields
 | profile-name      | Deprecated                                                     | varchar(255)       | YES  |     | NULL       |                |
 | is-default        | Deprecated                                                     | boolean            | YES  |     | NULL       |                |
 | hide-friends      | Hide friend list from viewers of this profile                  | boolean            | NO   |     | 0          |                |
-| name              |                                                                | varchar(255)       | NO   |     |            |                |
+| name              | Unused in favor of user.username                               | varchar(255)       | NO   |     |            |                |
 | pdesc             | Deprecated                                                     | varchar(255)       | YES  |     | NULL       |                |
 | dob               | Day of birth                                                   | varchar(32)        | NO   |     | 0000-00-00 |                |
 | address           |                                                                | varchar(255)       | NO   |     |            |                |
@@ -57,10 +57,9 @@ Indexes
 ------------
 
 | Name           | Fields          |
-| -------------- | ---------------------- |
+| -------------- | --------------- |
 | PRIMARY        | id              |
 | uid_is-default | uid, is-default |
-| pub_keywords   | FULLTEXT, pub_keywords |
 
 Foreign Keys
 ------------

doc/database/db_report-post.md

@@ -1,7 +1,7 @@
 Table report-post
 ===========
 
-
+Individual posts attached to a moderation report
 
 Fields
 ------

doc/database/db_report-rule.md

@@ -0,0 +1,29 @@
+Table report-rule
+===========
+
+Terms of service rule lines relevant to a moderation report
+
+Fields
+------
+
+| Field   | Description                                                               | Type         | Null | Key | Default | Extra |
+| ------- | ------------------------------------------------------------------------- | ------------ | ---- | --- | ------- | ----- |
+| rid     | Report id                                                                 | int unsigned | NO   | PRI | NULL    |       |
+| line-id | Terms of service rule line number, may become invalid after a TOS change. | int unsigned | NO   | PRI | NULL    |       |
+| text    | Terms of service rule text recorded at the time of the report             | text         | NO   |     | NULL    |       |
+
+Indexes
+------------
+
+| Name    | Fields       |
+| ------- | ------------ |
+| PRIMARY | rid, line-id |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| rid | [report](help/database/db_report) | id |
+
+Return to [database documentation](help/database)

doc/database/db_report.md

@@ -7,27 +7,39 @@ Fields
 ------
 
 | Field           | Description                                                  | Type               | Null | Key | Default                    | Extra          |
-| ----------- | ----------------------------------------------- | ------------------ | ---- | --- | ------------------- | -------------- |
+| --------------- | ------------------------------------------------------------ | ------------------ | ---- | --- | -------------------------- | -------------- |
 | id              | sequential ID                                                | int unsigned       | NO   | PRI | NULL                       | auto_increment |
 | uid             | Reporting user                                               | mediumint unsigned | YES  |     | NULL                       |                |
 | reporter-id     | Reporting contact                                            | int unsigned       | YES  |     | NULL                       |                |
 | cid             | Reported contact                                             | int unsigned       | NO   |     | NULL                       |                |
+| gsid            | Reported contact server                                      | int unsigned       | YES  |     | NULL                       |                |
 | comment         | Report                                                       | text               | YES  |     | NULL                       |                |
-| category    | Category of the report (spam, violation, other) | varchar(20)        | YES  |     | NULL                |                |
-| rules       | Violated rules                                  | text               | YES  |     | NULL                |                |
+| category-id     | Report category, one of Entity Report::CATEGORY_*            | int unsigned       | NO   |     | 1                          |                |
 | forward         | Forward the report to the remote server                      | boolean            | YES  |     | NULL                       |                |
-| created     |                                                 | datetime           | NO   |     | 0001-01-01 00:00:00 |                |
-| status      | Status of the report                            | tinyint unsigned   | YES  |     | NULL                |                |
+| public-remarks  | Remarks shared with the reporter                             | text               | YES  |     | NULL                       |                |
+| private-remarks | Remarks shared with the moderation team                      | text               | YES  |     | NULL                       |                |
+| last-editor-uid | Last editor user                                             | mediumint unsigned | YES  |     | NULL                       |                |
+| assigned-uid    | Assigned moderator user                                      | mediumint unsigned | YES  |     | NULL                       |                |
+| status          | Status of the report, one of Entity Report::STATUS_*         | tinyint unsigned   | NO   |     | NULL                       |                |
+| resolution      | Resolution of the report, one of Entity Report::RESOLUTION_* | tinyint unsigned   | YES  |     | NULL                       |                |
+| created         |                                                              | datetime(6)        | NO   |     | 0001-01-01 00:00:00.000000 |                |
+| edited          | Last time the report has been edited                         | datetime(6)        | YES  |     | NULL                       |                |
 
 Indexes
 ------------
 
 | Name              | Fields             |
-| ----------- | ----------- |
+| ----------------- | ------------------ |
 | PRIMARY           | id                 |
 | uid               | uid                |
 | cid               | cid                |
 | reporter-id       | reporter-id        |
+| gsid              | gsid               |
+| last-editor-uid   | last-editor-uid    |
+| assigned-uid      | assigned-uid       |
+| status-resolution | status, resolution |
+| created           | created            |
+| edited            | edited             |
 
 Foreign Keys
 ------------
@@ -37,5 +49,8 @@ Foreign Keys
 | uid | [user](help/database/db_user) | uid |
 | reporter-id | [contact](help/database/db_contact) | id |
 | cid | [contact](help/database/db_contact) | id |
+| gsid | [gserver](help/database/db_gserver) | id |
+| last-editor-uid | [user](help/database/db_user) | uid |
+| assigned-uid | [user](help/database/db_user) | uid |
 
 Return to [database documentation](help/database)

doc/database/db_user-contact.md

@@ -7,7 +7,7 @@ Fields
 ------
 
 | Field                     | Description                                                             | Type               | Null | Key | Default | Extra |
-| ------------------------- | ------------------------------------------------------------ | ------------------ | ---- | --- | ------- | ----- |
+| ------------------------- | ----------------------------------------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
 | cid                       | Contact id of the linked public contact                                 | int unsigned       | NO   | PRI | 0       |       |
 | uid                       | User id                                                                 | mediumint unsigned | NO   | PRI | 0       |       |
 | uri-id                    | Id of the item-uri table entry that contains the contact url            | int unsigned       | YES  |     | NULL    |       |
@@ -16,12 +16,13 @@ Fields
 | collapsed                 | Posts from this contact are collapsed                                   | boolean            | YES  |     | NULL    |       |
 | hidden                    | This contact is hidden from the others                                  | boolean            | YES  |     | NULL    |       |
 | is-blocked                | User is blocked by this contact                                         | boolean            | YES  |     | NULL    |       |
+| channel-frequency         | Controls the frequency of the appearance of this contact in channels    | tinyint unsigned   | YES  |     | NULL    |       |
 | pending                   |                                                                         | boolean            | YES  |     | NULL    |       |
 | rel                       | The kind of the relation between the user and the contact               | tinyint unsigned   | YES  |     | NULL    |       |
 | info                      |                                                                         | mediumtext         | YES  |     | NULL    |       |
 | notify_new_posts          |                                                                         | boolean            | YES  |     | NULL    |       |
-| remote_self               |                                                              | boolean            | YES  |     | NULL    |       |
-| fetch_further_information |                                                              | tinyint unsigned   | YES  |     | NULL    |       |
+| remote_self               | 0 => No mirroring, 1-2 => Mirror as own post, 3 => Mirror as reshare    | tinyint unsigned   | YES  |     | NULL    |       |
+| fetch_further_information | 0 => None, 1 => Fetch information, 3 => Fetch keywords, 2 => Fetch both | tinyint unsigned   | YES  |     | NULL    |       |
 | ffi_keyword_denylist      |                                                                         | text               | YES  |     | NULL    |       |
 | subhub                    |                                                                         | boolean            | YES  |     | NULL    |       |
 | hub-verify                |                                                                         | varbinary(383)     | YES  |     | NULL    |       |

doc/database/db_user-gserver.md

@@ -0,0 +1,31 @@
+Table user-gserver
+===========
+
+User settings about remote servers
+
+Fields
+------
+
+| Field   | Description                              | Type               | Null | Key | Default | Extra |
+| ------- | ---------------------------------------- | ------------------ | ---- | --- | ------- | ----- |
+| uid     | Owner User id                            | mediumint unsigned | NO   | PRI | 0       |       |
+| gsid    | Gserver id                               | int unsigned       | NO   | PRI | 0       |       |
+| ignored | server accounts are ignored for the user | boolean            | NO   |     | 0       |       |
+
+Indexes
+------------
+
+| Name    | Fields    |
+| ------- | --------- |
+| PRIMARY | uid, gsid |
+| gsid    | gsid      |
+
+Foreign Keys
+------------
+
+| Field | Target Table | Target Field |
+|-------|--------------|--------------|
+| uid | [user](help/database/db_user) | uid |
+| gsid | [gserver](help/database/db_gserver) | id |
+
+Return to [database documentation](help/database)

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                   |                |

doc/de/Account-Basics.md

@@ -109,7 +109,7 @@ Ein ['Tipp für neue Mitglieder'](newmember)-Link zeigt sich in den ersten beide
 
 ## Schau Dir ebenfalls folgende Seiten an
 
-* [Gruppen und Privatssphäre](help/Groups-and-Privacy)
+* [Circles und Privatssphäre](help/Circles-and-Privacy)
 
 * [Account löschen](help/Remove-Account)
 

doc/de/Addons.md

@@ -103,6 +103,15 @@ Derzeitige Hooks
     $b ist das Item-Array einer Information, die in der Datenbank und im Item gespeichert ist.
         {Bitte beachte: der Seiteninhalt ist bbcode - nicht HTML)
 
+**'detect_languages'**
+Wird nach der Sprachenerkennung aufgerufen.
+Dieser Hook kann dafür verwendet werden, alternative Erkennungsfunktionen einzubinden.
+`$data` ist ein Array:
+        'text' => Der analysierte Text.
+        'detected' => (Eingabe/Ausgabe) Das Array mit den erkannten Sprachen. Der Sprachcode ist der Array-Schlüssel, der Array-Wert ist der dezimale Wert für die Wahrscheinlichkeit.
+        'uri-id' => Die Uri-Id des Beitrags
+        'author-id' => Die Contact-id des Autors.
+
 **'addon_settings'** - wird aufgerufen, wenn die HTML-Ausgabe der Addon-Einstellungsseite generiert wird.
     $b ist die HTML-Ausgabe (String) der Addon-Einstellungsseite vor dem finalen "</form>"-Tag.
 
@@ -316,6 +325,7 @@ Eine komplette Liste aller Hook-Callbacks mit den zugehörigen Dateien (am 01-Ap
 
 ### src/Model/Item.php
 
+    Hook::callAll('detect_languages', $item);
     Hook::callAll('post_local', $item);
     Hook::callAll('post_remote', $item);
     Hook::callAll('post_local_end', $posted_item);

doc/de/BBCode.md

@@ -356,8 +356,8 @@ Zeilen</code></td>
 &nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/ul]<br>
 [list]<br>
-&nbsp;&nbsp;[*] Erstes Listenelement<br>
-&nbsp;&nbsp;[*] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
 	<ul class="listbullet" style="list-style-type: circle;">
@@ -368,12 +368,12 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[ol]<br>
-&nbsp;&nbsp;[*] Erstes Listenelement<br>
-&nbsp;&nbsp;[*] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/ol]<br>
 [list=1]<br>
-&nbsp;&nbsp;[*] Erstes Listenelement<br>
-&nbsp;&nbsp;[*] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
     <ul class="listdecimal" style="list-style-type: decimal;">
@@ -384,8 +384,8 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[list=]<br>
-&nbsp;&nbsp;[*] Erstes Listenelement<br>
-&nbsp;&nbsp;[*] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
     <ul class="listnone" style="list-style-type: none;">
@@ -396,8 +396,8 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[list=i]<br>
-&nbsp;&nbsp;[*] Erstes Listenelement<br>
-&nbsp;&nbsp;[*] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
     <ul class="listlowerroman" style="list-style-type: lower-roman;">
@@ -408,8 +408,8 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[list=I]<br>
-&nbsp;&nbsp;[*] Erstes Listenelement<br>
-&nbsp;&nbsp;[*] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
     <ul class="listupperroman" style="list-style-type: upper-roman;">
@@ -420,8 +420,8 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[list=a]<br>
-&nbsp;&nbsp;[*] Erstes Listenelement<br>
-&nbsp;&nbsp;[*] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
     <ul class="listloweralpha" style="list-style-type: lower-alpha;">
@@ -432,8 +432,8 @@ Zeilen</code></td>
 </tr>
 <tr>
   <td>[list=A]<br>
-&nbsp;&nbsp;[*] Erstes Listenelement<br>
-&nbsp;&nbsp;[*] Zweites Listenelement<br>
+&nbsp;&nbsp;[li] Erstes Listenelement<br>
+&nbsp;&nbsp;[li] Zweites Listenelement<br>
 [/list]</td>
   <td>
     <ul class="listupperalpha" style="list-style-type: upper-alpha;">

doc/de/Circles-and-Privacy.md

@@ -1,54 +1,54 @@
-Gruppen und Privatsphäre
+Circles und Privatsphäre
 ==================
 
 * [Zur Startseite der Hilfe](help)
 
-Gruppen sind nur eine Ansammlung von Freunden. 
+Circles sind nur eine Ansammlung von Freunden.
 Aber Friendica nutzt diese, um sehr mächtige Features zur Verfügung zu stellen.
 
-**Gruppen erstellen** 
+**Circles erstellen**
 
-Um eine Gruppe zu erstellen, besuche deine "Kontakte"-Seite und wähle "Neue Gruppe erstellen" (je nach Design nur als Pluszeichen angezeigt). 
-Gib deiner Gruppe einen Namen. 
+Um eine Circle zu erstellen, besuche deine "Kontakte"-Seite und wähle "Neue Circle erstellen" (je nach Design nur als Pluszeichen angezeigt).
+Gib deiner Circle einen Namen.
 
 Das führt dich zu einer Seite, auf der du die Gruppenmitglieder auswählen kannst.
 
 Du hast zwei Boxen auf der Seite.
 Die obere Box ist die Übersicht der aktuellen Mitglieder.
-Die untere beinhaltet alle Freunde, die *nicht* Mitglied dieser Gruppe sind. 
+Die untere beinhaltet alle Freunde, die *nicht* Mitglied dieser Circle sind.
 
-Wenn du auf das Foto einer Person klickst, die nicht in der Gruppe ist, wird diese in die Gruppe verschoben. 
-Wenn du auf das Foto einer Person klickst, die bereits in der Gruppe ist, dann wird diese Person daraus entfernt.
+Wenn du auf das Foto einer Person klickst, die nicht in der Circle ist, wird diese in die Circle verschoben.
+Wenn du auf das Foto einer Person klickst, die bereits in der Circle ist, dann wird diese Person daraus entfernt.
 
 **Zugriffskontrolle**
 
-Sobald du eine Gruppe erstellt hast, kannst du diese auf jeder Zugriffsrechteliste nutzen. 
+Sobald du eine Circle erstellt hast, kannst du diese auf jeder Zugriffsrechteliste nutzen.
 Damit ist das kleine Schloss neben deinem Statuseditor auf deiner Startseite gemeint.
 Wenn du darauf klickst, kannst du auswählen, wer deinen Beitrag sehen kann und wer *nicht*.
-Dabei kann es sich um eine einzelne Person oder eine ganze Gruppe handeln. 
+Dabei kann es sich um eine einzelne Person oder eine ganze Circle handeln.
 
 Auf deiner "Netzwerk"-Seite ("Unterhaltungen deiner Kontakte") findest du Beiträge und Gespräche aller deiner Kontakte in deinem Netzwerk.
-Du kannst aber auch eine einzelne Gruppe auswählen und nur Beiträge dieser Gruppenmitglieder anzeigen lassen.
+Du kannst aber auch eine einzelne Circle auswählen und nur Beiträge dieser Gruppenmitglieder anzeigen lassen.
 
 Aber stopp, es gibt noch mehr...
 
-Wenn du auf deiner "Netzwerk"-Seite eine bestimmte Gruppe ausgewählt hast, dann findest du im Statuseditor neben dem Schloss ein Ausrufezeichen. 
+Wenn du auf deiner "Netzwerk"-Seite eine bestimmte Circle ausgewählt hast, dann findest du im Statuseditor neben dem Schloss ein Ausrufezeichen.
 Dies dient dazu, deine Aufmerksamkeit auf das Schloss zu richten.
 Klicke auf das Schloss.
-Dort siehst du, dass dein Status-Update in dieser Ansicht standardmäßig nur für diese Gruppe freigegeben ist. 
+Dort siehst du, dass dein Status-Update in dieser Ansicht standardmäßig nur für diese Circle freigegeben ist.
 Das hilft dir, deinen zukünftigen Mitarbeitern nicht das Gleiche zu schreiben wie deinen Trinkfreunden.
 Du kannst diese Einstellung natürlich auch überschreiben.
 
 **Standardmäßige Zugriffsrechte von Beiträgen**
 
 Standardmäßig geht Friendica davon aus, dass alle deine Beiträge privat sein sollen.
-Aus diesem Grund erstellt Friendica nach der Anmeldung eine Gruppe, in die automatisch alle deine Kontakte hinzugefügt werden.
-Alle deine Beiträge sind nur auf diese Gruppe beschränkt.
+Aus diesem Grund erstellt Friendica nach der Anmeldung eine Circle, in die automatisch alle deine Kontakte hinzugefügt werden.
+Alle deine Beiträge sind nur auf diese Circle beschränkt.
 
 Beachte, dass diese Einstellung von deinem Seiten-Administrator überschrieben werden kann, was bedeutet, dass alle deine Beiträge standardmäßig "öffentlich" sind (bspw. für das gesamte Internet).
 
 Wenn du deine Beiträge standardmäßig "öffentlich" haben willst, dann kannst du deine Standardzugriffsrechte auf deiner Einstellungseite ändern.
-Dort kannst du außerdem festlegen, welchen Gruppen standardmäßig deine Beiträge erhalten oder in welche Gruppe deine neuen Kontakte standardmäßig eingeordnet werden.
+Dort kannst du außerdem festlegen, welchen Circles standardmäßig deine Beiträge erhalten oder in welche Circle deine neuen Kontakte standardmäßig eingeordnet werden.
 
 **Fragen der Privatssphäre, die zu beachten sind**
 
@@ -60,7 +60,7 @@ Keine Software der Welt kann deine Freunde davon abhalten, die privaten Unterhal
 Nur eine gute Auswahl deiner Freunde.
 
 Bei GNu Social und anderen Netzwerk-Anbietern ist es nicht so gesichert.
-Du musst **sehr** vorsichtig sein, wenn du Mitglieder anderer Netzwerke in einer deiner Gruppen hast, da es möglich ist, dass deine privaten Nachrichten in einem öffentlichen Stream enden. 
+Du musst **sehr** vorsichtig sein, wenn du Mitglieder anderer Netzwerke in einer deiner Circles hast, da es möglich ist, dass deine privaten Nachrichten in einem öffentlichen Stream enden.
 Wenn du auf die "Kontakt bearbeiten"-Seite einer Person gehst, zeigen wir dir, ob sie Mitglied eines unsicheren Netzwerks ist oder nicht.
 
 Sobald du einen Post erstellt hast, kannst du die Zugriffsrechte nicht mehr ändern.

doc/de/FAQ-admin.md

@@ -45,7 +45,7 @@ Die aufgelisteten Adressen werden wie folgt durch Kommas voneinander getrennt:
 'admin_email' => 'mail1@example.com,mail2@example.com',
 ```
 
-<a name="dbupdate">
+<a name="dbupdate"></a>
 ### Die Datenbank Struktur schein nicht aktuell zu sein. Was kann ich tun?
 
 Rufe bitte im Admin Panel den Punkt [DB Updates](/admin/dbsync/) auf und folge dem Link *Datenbank Struktur überprüfen*.
@@ -56,4 +56,4 @@ Starte dazu bitte vom Grundverzeichnis deiner Friendica Instanz folgendes Komman
 
     bin/console dbstructure update
 
-sollten bei der Ausführung Fehler auftreten, kontaktiere bitte das [Support Forum](https://forum.friendi.ca/profile/helpers).
+sollten bei der Ausführung Fehler auftreten, kontaktiere bitte die [Friendia Support](https://forum.friendi.ca/profile/helpers)  Gruppe oder die [Friendica Admins](https://forum.friendi.ca/profile/admins) Gruppe.

doc/de/FAQ.md

@@ -23,7 +23,7 @@ Wenn Du Deinen Account nicht nutzen kannst, kannst Du einen Account auf einer ö
 
 Wenn du dir keinen weiteren Friendica Account einrichten willst, kannst du auch gerne über einen der folgenden alternativen Kanäle Hilfe suchen:
 
-  * Friendica Support Forum: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
+  * Friendica Support Gruppe: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
   * Chats der Friendica Community (die IRC, Matrix und XMPP Räume sind mit einer Brücke verbunden) Logs dieser öffentlichen Chaträume können [hier aus dem IRC](https://gnusociarg.nsupdate.info/2021/%23friendica/) und [hier aus der Matrix](https://view.matrix.org/alias/%23friendi.ca:matrix.org/) gefunden werden.
     * XMPP: support(at)forum.friendi.ca
     * IRC: #friendica auf [libera.chat](https://web.libera.chat/?channels=#friendica)

doc/de/Forums.md

@@ -1,63 +0,0 @@
-Foren
-=====
-
-* [Zur Startseite der Hilfe](help)
-
-
-In Friendica kannst Du auch Foren und/oder Prominenten-Seiten erstellen. 
-
-Jede Seite in Friendica hat einen einmaligen Spitznamen. 
-Das gilt für alle Seiten, unabhängig davon, ob es sich um normale Profile oder Forenseiten handelt. 
-
-Das Erste, was Du machen musst, um ein neues Forum zu kreieren, ist einen neuen Account zu erstellen. 
-Bitte beachte, dass der Seitenadministrator die Registrierung neuer Accounts sperren oder an Bedingungen knüpfen kann. 
-
-Wenn Du einen zweiten Account in einem System erstellst und die gleiche Email-Adresse oder den gleichen OpenID-Account nutzt, kannst Du Dich zukünftig nur noch mit Deinem Spitznamen anmelden. 
-
-Gehe im neuen Account auf die "Einstellungs"-Seite und dort am Ende der Seite auf "Erweiterte Konto-/Seitentyp-Einstellungen". 
-Normalerweise nutzt Du "Normales Konto" für einen normalen, persönlichen Account. 
-Das ist die Standardeinstellung. 
-Gr‬uppenseiten bieten die Möglichkeit, Leute als Freund/Fan ohne Kontaktbestätigung zuzulassen. 
-
-Die Auswahl der Einstellung, die Du wählst, hängt davon ab, wie Du mit anderen Leuten auf Deiner Seite interagieren willst. 
-Die "Marktschreier"-Einstellung (Soapbox) lässt den Seitenbesitzer die gesamte Kommunikation kontrollieren. 
-Alles was Du schreibst, geht an alle Seitennutzer, aber es gibt keine Möglichkeit, zu interagieren. 
-Diese Seite wird normalerweise für Ankündigungen oder die Kommunikation von Gemeinschaften genutzt.
-
-Die normalste Einstellung ist das "Forum-/Promi-Konto". 
-Diese erstellt eine Gruppenseite, in der alle Mitglieder frei miteinander interagieren können. 
-
-Der "Automatische Freunde Seite"-Account ist typischerweise für persönliche Profile, bei denen Du alle Freundschaftsanfragen automatisch bestätigen willst. 
-
-
-**Multiple Foren verwalten**
-
-Wir schlagen vor, dass Du ein Gruppenforum mit der gleichen Email-Adresse und dem gleichen Passwort wie bei Deinem normalen Account nutzt. 
-Wenn Du das machst, findest Du einen neuen "Verwalten"-Link in der Menüleiste, über den Du einfach zwischen den Identitäten wechseln kannst. 
-Du musst das nicht machen, die Alternative ist allerdings, Dich immer wieder aus- und wieder einzuloggen. 
-Und das kann umständlich sein, wenn Du mehrere verschiedene Foren/Identitäten verwaltest.
-
-Du kannst ebenso jemanden wählen, der Dein Forum verwaltet. 
-Mach das, indem Du die [Delegations-Setup-Seite](/settings/delegation) besuchst. 
-Dort wird Dir eine Liste an "Potentiellen Bevollmächtigen" angezeigt. 
-Die Auswahl einer oder mehrerer Personen gibt diesen die Möglichkeit, Dein Forum zu verwalten. 
-Sie können Kontakte, Profile und alle Inhalte Deines Accounts/deiner Seite bearbeiten. 
-Bitte nutze diese Einstellung mit Vorsicht. 
-Delegierte haben allerdings keine Möglichkeit, grundlegende Account-Einstellungen wie das Passwort oder den Seitentypen zu ändern bzw. den Account zu löschen.
-
-
-**Beiträge auf Community-Foren**
-
-Wenn Du Mitglied eines Community-Forums bist, kannst Du das Forum in einem Beitrag hinzufügen/erwähnen, wenn Du den @-Tag nutzt. 
-Zum Beispiel würde @Fahrrad Deinen Beitrag neben den sonst ausgewählten Nutzern an alle Nutzer schicken, die in der Gruppe "Fahrrad" sind. 
-Wenn Dein Beitrag privat ist, musst Du diese Gruppe explizit in den Zugriffsrechten des Beitrags auswählen **und** sie mit dem @-Tag erwähnen (was den Beitrag auf die Gruppenmitglieder erweitert).
-
-Zusätzlich ist es möglich, Foren mit dem Ausrufezeichen zu adressieren.
-Im obigen Beispiel bedeutet dies, dass Du das Fahrrad-Forum per !Fahrrad erreichen würdest.
-Der Unterschied zum @ besteht darin, dass der Beitrag auschließlich über das Forum verbreitet wird und nicht an weitere Nutzer.
-Dies bedeutet auch, dass es nicht sinnvoll ist, mehrere Foren per ! in einem Beitrag zu adressieren, da nur eines der Foren den Beitrag verbreiten wird.
-
-Du kannst außerdem via "Wall zu Wall" einen Beitrag auf der Community-Seite bzw. in dem Community-Forum erstellen.
-
-Kommentare, die Du an ein Community-Forum schickst, werden dem Originalbeitrag hinzugefügt. 
-Ein weiteres Forum mit dem @-Tag zu erwähnen, leitet den Beitrag nicht an dieses weiter, da die Verteilung der Kommentare komplett vom Originalbeitrag bestimmt wird.

doc/de/Groups.md

@@ -0,0 +1,63 @@
+Gruppen
+=====
+
+* [Zur Startseite der Hilfe](help)
+
+
+In Friendica kannst Du auch Gruppen und/oder Prominenten-Seiten erstellen.
+
+Jede Seite in Friendica hat einen einmaligen Spitznamen.
+Das gilt für alle Seiten, unabhängig davon, ob es sich um normale Profile oder Forenseiten handelt.
+
+Das Erste, was Du machen musst, um eine neue Gruppe zu kreieren, ist einen neuen Account zu erstellen.
+Bitte beachte, dass der Seitenadministrator die Registrierung neuer Accounts sperren oder an Bedingungen knüpfen kann.
+
+Wenn Du einen zweiten Account in einem System erstellst und die gleiche Email-Adresse oder den gleichen OpenID-Account nutzt, kannst Du Dich zukünftig nur noch mit Deinem Spitznamen anmelden.
+
+Gehe im neuen Account auf die "Einstellungs"-Seite und dort am Ende der Seite auf "Erweiterte Konto-/Seitentyp-Einstellungen".
+Normalerweise nutzt Du "Normales Konto" für einen normalen, persönlichen Account.
+Das ist die Standardeinstellung.
+Gruppenseiten bieten die Möglichkeit, Leute als Freund/Fan ohne Kontaktbestätigung zuzulassen.
+
+Die Auswahl der Einstellung, die Du wählst, hängt davon ab, wie Du mit anderen Leuten auf Deiner Seite interagieren willst.
+Die "Marktschreier"-Einstellung (Soapbox) lässt den Seitenbesitzer die gesamte Kommunikation kontrollieren.
+Alles was Du schreibst, geht an alle Seitennutzer, aber es gibt keine Möglichkeit, zu interagieren.
+Diese Seite wird normalerweise für Ankündigungen oder die Kommunikation von Gemeinschaften genutzt.
+
+Die normalste Einstellung ist das "Gruppe-/Promi-Konto".
+Diese erstellt eine Gruppenseite, in der alle Mitglieder frei miteinander interagieren können.
+
+Der "Automatische Freunde Seite"-Account ist typischerweise für persönliche Profile, bei denen Du alle Freundschaftsanfragen automatisch bestätigen willst.
+
+
+**Multiple Gruppen verwalten**
+
+Wir schlagen vor, dass Du eine Gruppe mit der gleichen Email-Adresse und dem gleichen Passwort wie bei Deinem normalen Account nutzt.
+Wenn Du das machst, findest Du einen neuen "Verwalten"-Link in der Menüleiste, über den Du einfach zwischen den Identitäten wechseln kannst.
+Du musst das nicht machen, die Alternative ist allerdings, Dich immer wieder aus- und wieder einzuloggen.
+Und das kann umständlich sein, wenn Du mehrere verschiedene Gruppen/Identitäten verwaltest.
+
+Du kannst ebenso jemanden wählen, der Deine Gruppe verwaltet.
+Mach das, indem Du die [Delegations-Setup-Seite](/settings/delegation) besuchst.
+Dort wird Dir eine Liste an "Potentiellen Bevollmächtigen" angezeigt.
+Die Auswahl einer oder mehrerer Personen gibt diesen die Möglichkeit, Deine Gruppe zu verwalten.
+Sie können Kontakte, Profile und alle Inhalte Deines Accounts/deiner Seite bearbeiten.
+Bitte nutze diese Einstellung mit Vorsicht.
+Delegierte haben allerdings keine Möglichkeit, grundlegende Account-Einstellungen wie das Passwort oder den Seitentypen zu ändern bzw. den Account zu löschen.
+
+
+**Beiträge auf Community-Gruppen**
+
+Wenn Du Mitglied einer Community-Gruppen bist, kannst Du die Gruppe in einem Beitrag hinzufügen/erwähnen, wenn Du die @-Erwähnung nutzt.
+Zum Beispiel würde @Fahrrad Deinen Beitrag neben den sonst ausgewählten Nutzern an alle Nutzer schicken, die in der Gruppe "Fahrrad" sind.
+Wenn Dein Beitrag privat ist, musst Du diese Gruppe explizit in den Zugriffsrechten des Beitrags auswählen **und** sie mit der @-Erwähnung ansprechen (was den Beitrag auf die Gruppenmitglieder erweitert).
+
+Zusätzlich ist es möglich, Gruppen mit einem Ausrufezeichen zu adressieren.
+Im obigen Beispiel bedeutet dies, dass Du das Fahrrad-Gruppe per !Fahrrad erreichen würdest.
+Der Unterschied zum @ besteht darin, dass der Beitrag auschließlich über die Gruppe verbreitet wird und nicht an weitere Nutzer.
+Dies bedeutet auch, dass es nicht sinnvoll ist, mehrere Gruppen per ! in einem Beitrag zu adressieren, da nur eine der Gruppen den Beitrag verbreiten wird.
+
+Du kannst außerdem via "Wall zu Wall" einen Beitrag auf der Community-Seite bzw. in der Community-Gruppe erstellen.
+
+Kommentare, die Du an eine Community-Gruppe schickst, werden dem Originalbeitrag hinzugefügt.
+Eine weitere Gruppe mit dem @-Erwähnung anzusprechen, leitet den Beitrag nicht an dieses weiter, da die Verteilung der Kommentare komplett vom Originalbeitrag bestimmt wird.

doc/de/Home.md

@@ -14,9 +14,10 @@ Friendica - Dokumentation und Ressourcen
 * Du und andere Nutzer
 	* [Konnektoren (Connectors)](help/Connectors)
 	* [Freunde finden](help/Making-Friends)
-	* [Gruppen und Privatsphäre](help/Groups-and-Privacy)
+	* [Circles und Privatsphäre](help/Circles-and-Privacy)
 	* [Tags und Erwähnungen](help/Tags-and-Mentions)
-	* [Community-Foren](help/Forums)
+	* [Community-Gruppen](help/Groups)
+	* [Channels](help/Channels)
 	* [Chats](help/Chats)
 * Weiterführende Informationen
 	* [Account umziehen](help/Move-Account)
@@ -63,7 +64,7 @@ Friendica - Dokumentation und Ressourcen
 
 * [Haupt-Webseite](https://friendi.ca)
 * Support Kanäle
-  * Friendica Support Forum: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
+  * Friendica Support Gruppe: [@helpers@forum.friendi.ca](https://forum.friendi.ca/~helpers)
   * [Mailing Listen Archiv](http://mailman.friendi.ca/mailman/listinfo/support-friendi.ca) zum Abonnieren der Liste eine E-Mail an ``support-request(at)friendi.ca?subject=subscribe`` senden
   * Chats der Friendica Community (die IRC, Matrix und XMPP Räume sind mit einer Brücke verbunden) Logs dieser öffentlichen Chaträume können [hier aus dem IRC](https://gnusociarg.nsupdate.info/2021/%23frie) und [hier aus der Matrix](https://view.matrix.org/alias/%23friendi.ca:matrix.org/) gefunden werden.
     * XMPP/Jabber MUC: support(at)forum.friendi.ca

doc/de/Install.md

@@ -12,7 +12,7 @@ Diese Funktionalität benötigt ein wenig mehr als die normalen Blogs.
 Nicht jeder PHP/MySQL-Hosting-Anbieter kann Friendica unterstützen.
 Viele hingegen können es. Aber **bitte** prüfe die Voraussetzungen deines Servers vor der Installation.
 
-Wenn dir Fehler während der Installation auffallen, sag uns bitte über [Helper](http://forum.friendi.ca/profile/helpers) oder das [Entwickler Forum](https://forum.friendi.ca/profile/developers) Bescheid oder [erstelle ein Issue](https://github.com/friendica/friendica/issues).
+Wenn dir Fehler während der Installation auffallen, sag uns bitte über [Helper](http://forum.friendi.ca/profile/helpers) oder die [Entwickler Gruppe](https://forum.friendi.ca/profile/developers) Bescheid oder [erstelle ein Issue](https://github.com/friendica/friendica/issues).
 Gib uns bitte so viele Infos zu deinem System, wie du kannst, und beschreibe den Fehler mit allen Details und Fehlermeldungen, so dass wir den Fehler zukünftig verhindern können.
 Aufgrund der großen Anzahl an verschiedenen Betriebssystemen und PHP-Plattformen haben wir nur geringe Kapazitäten, um deine PHP-Installation zu debuggen oder fehlende Module zu ersetzen, aber wir tun unser Bestes, um allgemeine Code-Fehler zu beheben.
 
@@ -25,9 +25,9 @@ Requirements
 ---
 
 * Apache mit einer aktiverten mod-rewrite-Funktion und dem Eintrag "Options All", so dass du die lokale .htaccess-Datei nutzen kannst
-* PHP  7.3+ (PHP 8 wird noch nicht komplett unterstützt)
+* PHP  7.4+
   * PHP *Kommandozeilen*-Zugang mit register_argc_argv auf "true" gesetzt in der php.ini-Datei
-  * Curl, GD, GMP, PDO, MySQLi, xml, zip und OpenSSL-Erweiterung
+  * Curl, GD, GMP, PDO, mbstrings, MySQLi, hash, xml, zip, IntlChar and OpenSSL-Erweiterung
   * Das POSIX Modul muss aktiviert sein ([CentOS, RHEL](http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7http://www.bigsoft.co.uk/blog/index.php/2014/12/08/posix-php-commands-not-working-under-centos-7) haben dies z.B. deaktiviert)
   * Einen E-Mail Server, so dass PHP `mail()` funktioniert.
     Wenn kein eigener E-Mail Server zur Verfügung steht, kann alternativ das [phpmailer](https://github.com/friendica/friendica-addons/tree/develop/phpmailer) Addon mit einem externen SMTP Account verwendet werden.

doc/de/Making-Friends.md

@@ -12,12 +12,12 @@ Das Verzeichnis ist in zwei Teile aufgeteilt.
 Wenn du auf den "Verzeichnis"-Button klickst, wirst du zunächst alle Mitglieder deines Servers sehen, die sich dazu entschlossen haben, angezeigt zu werden.
 Außerdem siehst du dort einen Link zum globalen Verzeichnis.
 Wenn du dich durch das globale Verzeichnis klickst, siehst du alle Nutzer weltweit auf allen Servern, die sich entschlossen haben, im Verzeichnis zu erscheinen.
-Du wirst außerdem den Link "Show Community Forums" sehen, welcher dich zu Gruppen, Foren und Fan-Seiten führt. 
-Du verbindest dich mit Personen, Gruppen und Foren auf die gleiche Art, wobei Gruppen und Foren deine Anfrage automatisch annehmen, wohingegen ein Mensch dich erst manuell bestätigen muss.
+Du wirst außerdem den Link "Show Community Groups" sehen, welcher dich zu Gruppen und Fan-Seiten führt.
+Du verbindest dich mit Personen und Gruppen auf die gleiche Art, wobei Gruppen deine Anfrage automatisch annehmen, wohingegen ein Mensch dich erst manuell bestätigen muss.
 
 *Mit anderen Friendica-Nutzern verbinden*
 
-Bes‪uche ihr Profil. 
+Besuche ihr Profil.
 Direkt unter dem Profilfoto ist das Wort "Verbinden" (bzw. "Connect" in einem englischsprachigem Profil).
 Klicke drauf und du gelangst zur "Verbinden"-Seite.
 Dort wirst du nach deiner Identitätsadresse gefragt.

doc/de/Quick-Start-groupsandpages.md

@@ -6,7 +6,7 @@ Gruppen und Seiten
 Hier siehst Du das globale Verzeichnis.
 Wenn Du Dich mal verirrt hast, kannst Du diesen Link klicken und wieder hierher kommen.
 
-Auf dieser Seite findest Du eine Zusammenstellung von Gruppen, Foren und Promi-Seiten. 
+Auf dieser Seite findest Du eine Zusammenstellung von Gruppen. 
 Gruppen sind keine realen Personen.
 Sich mit diesen zu verbinden ist, als wenn man jemanden auf Facebook "liked" ("gefällt mir") oder wenn man sich in einem Forum anmeldet. 
 Du musst nicht unsicher sein, ob Du jemandem zu nahe trittst, wenn Du Dich so ohne weiteres mit einer Gruppe verbindest; es handelt sich eben nicht um reale Personen.
@@ -21,6 +21,6 @@ Solltest Du beim Stöbern durch die vielen Gruppen nicht wieder hierher zurück
 
 Wenn Du einige Gruppen hinzugefügt hast, gehe <a href="help/Quick-Start-andfinally">weiter zum nächsten Schritt</a>.
 
-<iframe src="https://dir.friendica.social/forum" width="950" height="600"></iframe>
+<iframe src="https://dir.friendica.social/group" width="950" height="600"></iframe>
 
 

doc/de/Tags-and-Mentions.md

@@ -27,7 +27,7 @@ Diese Maßnahme dient dazu, Spam zu vermeiden.
 "Fernerwähnungen" werden durch das OStatus-Protokoll übermittelt.
 Dieses Protokoll wird von Friendica, GNU Social und anderen Systemen genutzt, ist allerdings derzeit nicht in Diaspora eingebaut.
 
-Friendica unterscheidet bei Tags nicht zwischen Personen und Gruppen (einige andere Netzwerke nutzen "!gruppe", um solche zu markieren).
+Friendica unterscheidet bei Tags nicht zwischen Personen und Gruppen (einige andere Netzwerke nutzen "!circle", um solche zu markieren).
 
 
 **Thematische Tags**

doc/de/groupsandpages.md

@@ -1,26 +0,0 @@
-Gruppen und Seiten 
-==========
-
-* [Zur Startseite der Hilfe](help)
-
-Hier siehst du das globale Verzeichnis. 
-Wenn du dich mal verirrt hast, kannst du <a href = "help/groupsandpages">diesen Link klicken</a> und wieder hierher kommen. 
-
-Auf dieser Seite findest du eine Zusammenstellung von Gruppen, Foren und bekannten Seiten. 
-Gruppen sind keine realen Personen. 
-Sich mit diesen zu verbinden ist, als wenn man jemanden auf Facebook "liked" ("gefällt mir") oder wenn man sich in einem Forum anmeldet. 
-Habe keine Sorge, falls du dich unbehaglich fühlst, wenn du dich einer neuen Person vorstellen sollst, da es sich nicht um Personen handelt.
-
-Wenn du dich mit einer Gruppe verbindest, erscheinen alle Nachrichten der Gruppe in deinem "Netzwerk"-Tab. 
-Du kannst diese Beiträge kommentieren oder selbst in der Gruppe schreiben, ohne eine der Gruppenmitglieder persönlich hinzuzufügen. 
-Das ist ein großartiger Weg, dynamisch neue Freunde zu gewinnen. 
-Du findest Personen, die du magst, anstatt Fremde hinzuzufügen. 
-Suche dir einfach eine Gruppe und füge sie so hinzu, wie du auch normale Freunde hinzufügst. 
-Es gibt eine Menge Gruppen und möglicherweise findest du nicht wieder zu dieser Seite zurück. 
-In diesem Fall nutze einfach den Link oben auf dieser Seite.
-
-Wenn du einige Gruppen hinzugefügt hast, gehe <a href="help/andfinally">weiter zum nächsten Schritt</a>.
-
-<iframe src="https://dir.friendica.social/home" width="950" height="600"></iframe>
-
-

doc/themes.md

@@ -2,153 +2,10 @@
 
 * [Home](help)
 
-To change the look of friendica you have to touch the themes.
-The current default theme is [Vier](https://github.com/friendica/friendica/tree/stable/view/theme/vier) but there are numerous others.
-Have a look at [github.com/bkil/friendica-themes](https://github.com/bkil/friendica-themes) for an overview of the existing themes.
-In case none of them suits your needs, there are several ways to change a theme.
+The default Theme in Friendica is called [frio](https://github.com/friendica/friendica/tree/stable/view/theme/frio).
 
-So, how to work on the UI of friendica.
+Open `Settings > Display > Custom Theme Settings` adjust the Theme to your liking. Select your preferred Appearance - light, dark or black - and your favorite Accent color. Click `Submit` to save your changes.
 
-You can either directly edit an existing theme.
-But you might loose your changes when the theme is updated by the friendica team.
+The `Custom` Appearance allows to tweak the themes CSS and set colors for UI elements. So called `schemestrings` can be shared between users.
 
-If you are almost happy with an existing theme, the easiest way to cover your needs is to create a new theme, inheriting most of the properties of the parent theme and change just minor stuff.
-The below for a more detailed description of theme heritage.
-
-Some themes also allow users to select *variants* of the theme.
-Those theme variants most often contain an additional [CSS](https://en.wikipedia.org/wiki/CSS) file to override some styling of the default theme values.
-From the themes in the main repository *vier* and *vier* are using this methods for variations.
-Quattro is using a slightly different approach.
-
-Third you can start your theme from scratch.
-Which is the most complex way to change friendicas look.
-But it leaves you the most freedom.
-So below for a *detailed* description and the meaning of some special files.
-
-### Styling
-
-If you want to change the styling of a theme, have a look at the themes CSS file.
-In most cases, you can found these in
-
-    /view/theme/**your-theme-name**/style.css
-
-sometimes, there is also a file called style.php in the theme directory.
-This is only needed if the theme allows the user to change certain things of the theme dynamically.
-Say the font size or set a background image.
-
-### Templates
-
-If you want to change the structure of the theme, you need to change the templates used by the theme.
-Friendica themes are using [SMARTY3](http://www.smarty.net/) for templating.
-The default template can be found in
-
-    /view/templates
-
-if you want to override any template within your theme create your version of the template in
-
-    /view/theme/**your-theme-name**/templates
-
-any template that exists there will be used instead of the default one.
-
-### JavaScript
-
-The same rule applies to the JavaScript files found in
-
-    /js
-
-they will be overwritten by files in
-
-    /view/theme/**your-theme-name**/js.
-
-## Creating a Theme from Scratch
-
-Keep patient.
-Basically what you have to do is identify which template you have to change so it looks more like what you want.
-Adopt the CSS of the theme accordingly.
-And iterate the process until you have the theme the way you want it.
-
-*Use the source Luke.* and don't hesitate to ask in @[developers](https://forum.friendi.ca/profile/developers) or @[helpers](https://forum.friendi.ca/profile/helpers).
-
-## Special Files
-
-### unsupported
-
-If a file with this name (which might be empty) exists in the theme directory, the theme is marked as *unsupported*.
-An unsupported theme may not be selected by a user in the settings.
-Users who are already using it wont notice anything.
-
-### README(.md)
-
-The contents of this file, with or without the .md which indicates [Markdown](https://daringfireball.net/projects/markdown/) syntax, will be displayed at most repository hosting services and in the theme page within the admin panel of friendica.
-
-This file should contain information you want to let others know about your theme.
-
-### screenshot.[png|jpg]
-
-If you want to have a preview image of your theme displayed in the settings you should take a screenshot and save it with this name.
-Supported formats are PNG and JPEG.
-
-### theme.php
-
-This is the main definition file of the theme.
-In the header of that file, some meta information is stored.
-For example, have a look at the theme.php of the *vier* theme:
-
-    <?php
-    /**
-     * [Licence]
-     *
-     * Name: Vier
-     * Version: 1.2
-     * Author: Fabio <http://kirgroup.com/profile/fabrixxm>
-     * Author: Ike <http://pirati.ca/profile/heluecht>
-     * Author: Beanow <https://fc.oscp.info/profile/beanow>
-     * Maintainer: Ike <http://pirati.ca/profile/heluecht>
-     * Description: "Vier" is a very compact and modern theme. It uses the font awesome font library: http://fortawesome.github.com/Font-Awesome/
-     */
-
-You see the definition of the theme's name, it's version and the initial author of the theme.
-These three pieces of information should be listed.
-If the original author is no longer working on the theme, but a maintainer has taken over, the maintainer should be listed as well.
-The information from the theme header will be displayed in the admin panel.
-
-The first thing in file is to import the `App` class from `\Friendica\` namespace.
-
-    use Friendica\App;
-
-This will make our job a little easier, as we don't have to specify the full name every time we need to use the `App` class.
-
-The next crucial part of the theme.php file is a definition of an init function.
-The name of the function is <theme-name>_init.
-So in the case of vier it is
-
-    function vier_init(App $a) {
-		$a->theme_info = array();
-		$a->set_template_engine('smarty3');
-    }
-
-Here we have set the basic theme information, in this case they are empty.
-But the array needs to be set.
-And we have set the template engine that should be used by friendica for this theme.
-At the moment you should use the *smarty3* engine.
-There once was a friendica specific templating engine as well but that is not used anymore.
-If you like to use another templating engine, please implement it.
-
-If you want to add something to the HTML header of the theme, one way to do so is by adding it to the theme.php file.
-To do so, add something alike
-
-    DI::page()['htmlhead'] .= <<< EOT
-    /* stuff you want to add to the header */
-    EOT;
-
-So you can access the properties of this friendica session from the theme.php file as well.
-
-### default.php
-
-This file covers the structure of the underlying HTML layout.
-The default file is in
-
-    /view/default.php
-
-if you want to change it, say adding a 4th column for banners of your favourite FLOSS projects, place a new default.php file in your theme directory.
-As with the theme.php file, you can use the properties of the $a variable with holds the friendica application to decide what content is displayed.
+In the `General Theme Settings` you can also find the [vier](https://github.com/friendica/friendica/tree/stable/view/theme/vier) Theme, which precedes frio and is no longer officially maintained.

images/icons/Makefile

@@ -1,6 +1,6 @@
 
 IMAGES=add.png edit.png	gear.png info.png menu.png \
-		notify_off.png star.png  delete.png feed.png group.png \
+		notify_off.png star.png  delete.png feed.png circle.png \
 		lock.png notice.png notify_on.png user.png link.png \
 		play.png plugin.png unlock.png zip.png audio.png video.png \
 		image.png text.png