Release 1.2.0

.env

@@ -1,5 +1,5 @@
 # In all environments, the following files are loaded if they exist,
-# the later taking precedence over the former:
+# the latter taking precedence over the former:
 #
 #  * .env                contains default values for the environment variables needed by the app
 #  * .env.local          uncommitted file with local overrides
@@ -9,13 +9,13 @@
 # Real environment variables win over .env files.
 #
 # DO NOT DEFINE PRODUCTION SECRETS IN THIS FILE NOR IN ANY OTHER COMMITTED FILES.
+# https://symfony.com/doc/current/configuration/secrets.html
 #
 # Run "composer dump-env prod" to compile .env files for production use (requires symfony/flex >=1.2).
-# https://symfony.com/doc/current/best_practices/configuration.html#infrastructure-related-configuration
+# https://symfony.com/doc/current/best_practices.html#use-environment-variables-for-infrastructure-configuration
 
 ###> symfony/framework-bundle ###
 APP_ENV=dev
 APP_SECRET=7189792ca5da6b84aff72ec1c63d95ae
-#TRUSTED_PROXIES=127.0.0.1,127.0.0.2
-#TRUSTED_HOSTS='^localhost|example\.com$'
 ###< symfony/framework-bundle ###
+

Dockerfile

@@ -0,0 +1,56 @@
+FROM composer as composer
+
+COPY --chown=nobody . /app
+RUN composer install --optimize-autoloader --no-interaction --no-progress
+
+FROM alpine:3.19
+
+# Install packages and remove default server definition
+RUN apk add --no-cache \
+  curl \
+  nginx \
+  php83 \
+  php83-ctype \
+  php83-curl \
+  php83-dom \
+  php83-fpm \
+  php83-intl \
+  php83-mbstring \
+  php83-session \
+  php83-tokenizer \
+  php83-simplexml \
+  supervisor
+
+# Configure nginx - http
+COPY docker_config/nginx.conf /etc/nginx/nginx.conf
+# Configure nginx - default server
+COPY docker_config/conf.d /etc/nginx/conf.d/
+
+# Configure PHP-FPM
+ENV PHP_INI_DIR /etc/php83
+COPY docker_config/fpm-pool.conf ${PHP_INI_DIR}/php-fpm.d/www.conf
+COPY docker_config/php.ini ${PHP_INI_DIR}/conf.d/custom.ini
+
+# Configure supervisord
+COPY docker_config/supervisord.conf /etc/supervisor/conf.d/supervisord.conf
+
+# Add application
+COPY --chown=nobody --from=composer /app/ /var/www/fediplan/
+
+# Make sure files/folders needed by the processes are accessable when they run under the nobody user
+RUN chown -R nobody.nobody /var/www/fediplan /run /var/lib/nginx /var/log/nginx
+
+# Create symlink for php
+RUN ln -s /usr/bin/php83 /usr/bin/php
+
+# Switch to use a non-root user from here on
+USER nobody
+
+# Expose the port nginx is reachable on
+EXPOSE 8080
+
+# Let supervisord start nginx & php-fpm
+CMD ["/usr/bin/supervisord", "-c", "/etc/supervisor/conf.d/supervisord.conf"]
+
+# Configure a healthcheck to validate that everything is up&running
+HEALTHCHECK --timeout=10s CMD curl --silent --fail http://127.0.0.1:8080/fpm-ping || exit 1

README.md

@@ -27,5 +27,8 @@ See: [Download Composer](https://getcomposer.org/download/)
 
 Your site needs to target /path/to/FediPlan/public
 
-    
+
-#### Support My work at [fedilab.app](https://fedilab.app/page/donations/)
+#### Support My work at [fedilab.app](https://fedilab.app/page/donations/)
+
+#### Credits
+Docker configurations are based on [github.com/TrafeX/docker-php-nginx](https://github.com/TrafeX/docker-php-nginx)

bin/console

@@ -3,40 +3,19 @@
 
 use App\Kernel;
 use Symfony\Bundle\FrameworkBundle\Console\Application;
-use Symfony\Component\Console\Input\ArgvInput;
-use Symfony\Component\Debug\Debug;
 
-if (false === in_array(\PHP_SAPI, ['cli', 'phpdbg', 'embed'], true)) {
+if (!is_dir(dirname(__DIR__).'/vendor')) {
-    echo 'Warning: The console should be invoked via the CLI version of PHP, not the '.\PHP_SAPI.' SAPI'.\PHP_EOL;
+    throw new LogicException('Dependencies are missing. Try running "composer install".');
 }
 
-set_time_limit(0);
+if (!is_file(dirname(__DIR__).'/vendor/autoload_runtime.php')) {
-
+    throw new LogicException('Symfony Runtime is missing. Try running "composer require symfony/runtime".');
-require dirname(__DIR__).'/vendor/autoload.php';
-
-if (!class_exists(Application::class)) {
-    throw new RuntimeException('You need to add "symfony/framework-bundle" as a Composer dependency.');
 }
 
-$input = new ArgvInput();
+require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
-if (null !== $env = $input->getParameterOption(['--env', '-e'], null, true)) {
-    putenv('APP_ENV='.$_SERVER['APP_ENV'] = $_ENV['APP_ENV'] = $env);
-}
 
-if ($input->hasParameterOption('--no-debug', true)) {
+return function (array $context) {
-    putenv('APP_DEBUG='.$_SERVER['APP_DEBUG'] = $_ENV['APP_DEBUG'] = '0');
+    $kernel = new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
-}
 
-require dirname(__DIR__).'/config/bootstrap.php';
+    return new Application($kernel);
-
+};
-if ($_SERVER['APP_DEBUG']) {
-    umask(0000);
-
-    if (class_exists(Debug::class)) {
-        Debug::enable();
-    }
-}
-
-$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
-$application = new Application($kernel);
-$application->run($input);

composer.json

@@ -1,41 +1,55 @@
 {
     "type": "project",
     "license": "proprietary",
+    "minimum-stability": "stable",
+    "prefer-stable": true,
     "require": {
-        "php": "^7.1.3",
+        "php": ">=8.2",
         "ext-ctype": "*",
+        "ext-curl": "*",
         "ext-iconv": "*",
-        "craue/formflow-bundle": "^3.2",
+        "craue/formflow-bundle": "*",
-        "doctrine/collections": "^1.6",
+        "curl/curl": "^2.5",
-        "friendsofsymfony/jsrouting-bundle": "^2.4",
+        "friendsofsymfony/jsrouting-bundle": "*",
-        "sensio/framework-extra-bundle": "^5.4",
+        "phpdocumentor/reflection-docblock": "^5.4",
-        "symfony/asset": "4.3.*",
+        "phpstan/phpdoc-parser": "^1.29",
-        "symfony/console": "4.3.*",
+        "symfony/asset": "7.0.*",
-        "symfony/debug": "4.3.*",
+        "symfony/asset-mapper": "7.0.*",
-        "symfony/dotenv": "4.3.*",
+        "symfony/console": "7.0.*",
-        "symfony/flex": "^1.3.1",
+        "symfony/dotenv": "7.0.*",
-        "symfony/framework-bundle": "4.3.*",
+        "symfony/expression-language": "7.0.*",
-        "symfony/polyfill-intl-messageformatter": "^1.15",
+        "symfony/flex": "^2",
-        "symfony/security-bundle": "4.3.*",
+        "symfony/form": "7.0.*",
-        "symfony/translation": "4.3.*",
+        "symfony/framework-bundle": "7.0.*",
-        "symfony/twig-bundle": "4.3.*",
+        "symfony/http-client": "7.0.*",
-        "symfony/yaml": "4.3.*",
+        "symfony/intl": "7.0.*",
-        "twig/extensions": "^1.5",
+        "symfony/mime": "7.0.*",
-      "ext-curl": "*",
+        "symfony/monolog-bundle": "^3.0",
-        "ext-json": "*"
+        "symfony/notifier": "7.0.*",
-    },
+        "symfony/process": "7.0.*",
-    "require-dev": {
+        "symfony/property-access": "7.0.*",
-        "symfony/phpunit-bridge": "^7.0",
+        "symfony/property-info": "7.0.*",
-        "symfony/web-server-bundle": "4.3.*"
+        "symfony/runtime": "7.0.*",
+        "symfony/security-bundle": "7.0.*",
+        "symfony/serializer": "7.0.*",
+        "symfony/stimulus-bundle": "^2.17",
+        "symfony/string": "7.0.*",
+        "symfony/translation": "7.0.*",
+        "symfony/twig-bundle": "7.0.*",
+        "symfony/ux-turbo": "^2.17",
+        "symfony/validator": "7.0.*",
+        "symfony/web-link": "7.0.*",
+        "symfony/yaml": "7.0.*",
+        "twig/extra-bundle": "^2.12|^3.0",
+        "twig/twig": "^2.12|^3.0"
     },
     "config": {
-        "preferred-install": {
-            "*": "dist"
-        },
-        "sort-packages": true,
         "allow-plugins": {
-            "symfony/flex": true
+            "php-http/discovery": true,
-        }
+            "symfony/flex": true,
+            "symfony/runtime": true
+        },
+        "sort-packages": true
     },
     "autoload": {
         "psr-4": {
@@ -48,17 +62,20 @@
         }
     },
     "replace": {
-        "paragonie/random_compat": "2.*",
         "symfony/polyfill-ctype": "*",
         "symfony/polyfill-iconv": "*",
-        "symfony/polyfill-php71": "*",
+        "symfony/polyfill-php72": "*",
-        "symfony/polyfill-php70": "*",
+        "symfony/polyfill-php73": "*",
-        "symfony/polyfill-php56": "*"
+        "symfony/polyfill-php74": "*",
+        "symfony/polyfill-php80": "*",
+        "symfony/polyfill-php81": "*",
+        "symfony/polyfill-php82": "*"
     },
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd",
-            "assets:install %PUBLIC_DIR%": "symfony-cmd"
+            "assets:install %PUBLIC_DIR%": "symfony-cmd",
+            "importmap:install": "symfony-cmd"
         },
         "post-install-cmd": [
             "@auto-scripts"
@@ -73,7 +90,17 @@
     "extra": {
         "symfony": {
             "allow-contrib": false,
-            "require": "4.3.*"
+            "require": "7.0.*"
         }
+    },
+    "require-dev": {
+        "phpunit/phpunit": "^9.5",
+        "symfony/browser-kit": "7.0.*",
+        "symfony/css-selector": "7.0.*",
+        "symfony/debug-bundle": "7.0.*",
+        "symfony/maker-bundle": "^1.0",
+        "symfony/phpunit-bridge": "^7.0",
+        "symfony/stopwatch": "7.0.*",
+        "symfony/web-profiler-bundle": "7.0.*"
     }
 }

config/bundles.php

@@ -2,10 +2,15 @@
 
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
-    Symfony\Bundle\WebServerBundle\WebServerBundle::class => ['dev' => true],
-    Sensio\Bundle\FrameworkExtraBundle\SensioFrameworkExtraBundle::class => ['all' => true],
     Symfony\Bundle\SecurityBundle\SecurityBundle::class => ['all' => true],
+    Symfony\Bundle\DebugBundle\DebugBundle::class => ['dev' => true],
     Symfony\Bundle\TwigBundle\TwigBundle::class => ['all' => true],
+    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     FOS\JsRoutingBundle\FOSJsRoutingBundle::class => ['all' => true],
     Craue\FormFlowBundle\CraueFormFlowBundle::class => ['all' => true],
+    Twig\Extra\TwigExtraBundle\TwigExtraBundle::class => ['all' => true],
+    Symfony\UX\StimulusBundle\StimulusBundle::class => ['all' => true],
+    Symfony\UX\Turbo\TurboBundle::class => ['all' => true],
+    Symfony\Bundle\MonologBundle\MonologBundle::class => ['all' => true],
+    Symfony\Bundle\MakerBundle\MakerBundle::class => ['dev' => true],
 ];

config/packages/asset_mapper.yaml

@@ -0,0 +1,5 @@
+framework:
+    asset_mapper:
+        # The paths to make available to the asset mapper.
+        paths:
+            - assets/

config/packages/debug.yaml

@@ -0,0 +1,5 @@
+when@dev:
+    debug:
+        # Forwards VarDumper Data clones to a centralized server allowing to inspect dumps on CLI or in your browser.
+        # See the "server:dump" command to start a new server.
+        dump_destination: "tcp://%env(VAR_DUMPER_SERVER)%"

config/packages/dev/routing.yaml

@@ -1,3 +0,0 @@
-framework:
-    router:
-        strict_requirements: true

config/packages/framework.yaml

@@ -1,16 +1,16 @@
+# see https://symfony.com/doc/current/reference/configuration/framework.html
 framework:
     secret: '%env(APP_SECRET)%'
     #csrf_protection: true
-    #http_method_override: true
 
-    # Enables session support. Note that the session will ONLY be started if you read or write from it.
+    # Note that the session will be started ONLY if you read or write from it.
-    # Remove or comment this section to explicitly disable session support.
+    session: true
-    session:
-        handler_id: null
-        cookie_secure: auto
-        cookie_samesite: lax
 
     #esi: true
     #fragments: true
-    php_errors:
+
-        log: true
+when@test:
+    framework:
+        test: true
+        session:
+            storage_factory_id: session.storage.factory.mock_file

config/packages/routing.yaml

@@ -1,4 +1,10 @@
 framework:
     router:
-        strict_requirements: null
+    # Configure how to generate URLs in non-HTTP contexts, such as CLI commands.
-        utf8: true
+    # See https://symfony.com/doc/current/routing.html#generating-urls-in-commands
+    #default_uri: http://localhost
+
+when@prod:
+    framework:
+        router:
+            strict_requirements: null

config/packages/security.yaml

@@ -1,13 +1,19 @@
 security:
+    # https://symfony.com/doc/current/security.html#registering-the-user-hashing-passwords
+    password_hashers:
+        Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface: 'auto'
     # https://symfony.com/doc/current/security.html#where-do-users-come-from-user-providers
     providers:
-        in_memory: { memory: ~ }
+        # used to reload user from session & other features (e.g. switch_user)
+        app_user_provider:
+            id: App\Security\UserProvider
     firewalls:
         dev:
             pattern: ^/(_(profiler|wdt)|css|images|js)/
             security: false
         main:
-            anonymous: ~
+            lazy: true
+            provider: app_user_provider
             logout:
                 path:   logout
 
@@ -23,3 +29,16 @@ security:
         # - { path: ^/admin, roles: ROLE_ADMIN }
          - { path: ^/(%languages%)?/schedule, roles: ROLE_USER }
          - { path: ^/(%languages%)?/scheduled, roles: ROLE_USER }
+
+when@test:
+    security:
+        password_hashers:
+            # By default, password hashers are resource intensive and take time. This is
+            # important to generate secure password hashes. In tests however, secure hashes
+            # are not important, waste resources and increase test times. The following
+            # reduces the work factor to the lowest possible values.
+            Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface:
+                algorithm: auto
+                cost: 4 # Lowest possible value for bcrypt
+                time_cost: 3 # Lowest possible value for argon
+                memory_cost: 10 # Lowest possible value for argon

config/packages/sensio_framework_extra.yaml

@@ -1,3 +0,0 @@
-sensio_framework_extra:
-    router:
-        annotations: false

config/packages/test/framework.yaml

@@ -1,4 +0,0 @@
-framework:
-    test: true
-    session:
-        storage_id: session.storage.mock_file

config/packages/test/routing.yaml

@@ -1,3 +0,0 @@
-framework:
-    router:
-        strict_requirements: true

config/packages/test/validator.yaml

@@ -1,3 +0,0 @@
-framework:
-    validation:
-        not_compromised_password: false

config/packages/twig.yaml

@@ -1,4 +1,6 @@
 twig:
-    default_path: '%kernel.project_dir%/templates'
+    file_name_pattern: '*.twig'
-    debug: '%kernel.debug%'
+
-    strict_variables: '%kernel.debug%'
+when@test:
+    twig:
+        strict_variables: true

config/packages/validator.yaml

@@ -1,8 +1,11 @@
 framework:
     validation:
-        email_validation_mode: html5
+    # Enables validator auto-mapping support.
+    # For instance, basic validation constraints will be inferred from Doctrine's metadata.
+    #auto_mapping:
+    #    App\Entity\: []
 
-        # Enables validator auto-mapping support.
+when@test:
-        # For instance, basic validation constraints will be inferred from Doctrine's metadata.
+    framework:
-        #auto_mapping:
+        validation:
-        #    App\Entity\: []
+            not_compromised_password: false

config/packages/web_profiler.yaml

@@ -0,0 +1,17 @@
+when@dev:
+    web_profiler:
+        toolbar: true
+        intercept_redirects: false
+
+    framework:
+        profiler:
+            only_exceptions: false
+            collect_serializer_data: true
+
+when@test:
+    web_profiler:
+        toolbar: false
+        intercept_redirects: false
+
+    framework:
+        profiler: { collect: false }

config/preload.php

@@ -0,0 +1,5 @@
+<?php
+
+if (file_exists(dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php')) {
+    require dirname(__DIR__).'/var/cache/prod/App_KernelProdContainer.preload.php';
+}

config/routes.yaml

@@ -1,3 +1,5 @@
-#index:
+controllers:
-#    path: /
+  resource:
-#    controller: App\Controller\DefaultController::index
+    path: ../src/Controller/
+    namespace: App\Controller
+  type: attribute

config/routes/annotations.yaml

@@ -1,3 +0,0 @@
-controllers:
-    resource: ../../src/Controller/
-    type: annotation

config/routes/dev/twig.yaml

@@ -1,3 +0,0 @@
-_errors:
-    resource: '@TwigBundle/Resources/config/routing/errors.xml'
-    prefix: /_error

config/routes/framework.yaml

@@ -0,0 +1,4 @@
+when@dev:
+    _errors:
+        resource: '@FrameworkBundle/Resources/config/routing/errors.xml'
+        prefix: /_error

config/routes/security.yaml

@@ -0,0 +1,3 @@
+_security_logout:
+    resource: security.route_loader.logout
+    type: service

config/routes/web_profiler.yaml

@@ -0,0 +1,8 @@
+when@dev:
+    web_profiler_wdt:
+        resource: '@WebProfilerBundle/Resources/config/routing/wdt.xml'
+        prefix: /_wdt
+
+    web_profiler_profiler:
+        resource: '@WebProfilerBundle/Resources/config/routing/profiler.xml'
+        prefix: /_profiler

config/services.yaml

@@ -4,7 +4,7 @@
 # Put parameters here that don't need to change on each machine where the app is deployed
 # https://symfony.com/doc/current/best_practices/configuration.html#application-related-configuration
 parameters:
-    allowed_language: "fr|en|nl|pt-PT|pt-BR|de|ar|it|ca|ja"
+    allowed_language: "fr|en|nl|pt-PT|pt-BR|de|ar|it|ca|ja|pl|ru|uk"
     languages: "(%allowed_language%)?"
 services:
     # default configuration for services in *this* file
@@ -16,7 +16,10 @@ services:
     # this creates a service per class whose id is the fully-qualified class name
     App\:
         resource: '../src/*'
-        exclude: '../src/{DependencyInjection,Entity,Migrations,Tests,Kernel.php}'
+        exclude:
+            - '../src/DependencyInjection/'
+            - '../src/Entity/'
+            - '../src/Kernel.php'
 
     # controllers are imported separately to make sure services can be injected
     # as action arguments even if you don't extend any base controller class

docker_config/conf.d/default.conf

@@ -0,0 +1,56 @@
+# Default server definition
+server {
+    listen [::]:8080 default_server;
+    listen 8080 default_server;
+    server_name _;
+
+    sendfile off;
+    tcp_nodelay on;
+    absolute_redirect off;
+
+    root /var/www/fediplan/public;
+    index index.php index.html;
+
+    location / {
+        # First attempt to serve request as file, then
+        # as directory, then fall back to index.php
+        try_files $uri $uri/ /index.php?q=$uri&$args;
+    }
+
+    # Redirect server error pages to the static page /50x.html
+    error_page 500 502 503 504 /50x.html;
+    location = /50x.html {
+        root /var/lib/nginx/html;
+    }
+
+    # Pass the PHP scripts to PHP-FPM listening on php-fpm.sock
+    location ~ \.php$ {
+        try_files $uri =404;
+        fastcgi_split_path_info ^(.+\.php)(/.+)$;
+        fastcgi_pass unix:/run/php-fpm.sock;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        fastcgi_index index.php;
+        include fastcgi_params;
+    }
+
+    # Set the cache-control headers on assets to cache for 5 days
+    location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ {
+        expires 5d;
+    }
+
+    # Deny access to . files, for security
+    location ~ /\. {
+        log_not_found off;
+        deny all;
+    }
+
+    # Allow fpm ping and status from localhost
+    location ~ ^/(fpm-status|fpm-ping)$ {
+        access_log off;
+        allow 127.0.0.1;
+        deny all;
+        fastcgi_param SCRIPT_FILENAME $document_root$fastcgi_script_name;
+        include fastcgi_params;
+        fastcgi_pass unix:/run/php-fpm.sock;
+    }
+}

docker_config/fpm-pool.conf

@@ -0,0 +1,56 @@
+[global]
+; Log to stderr
+error_log = /dev/stderr
+
+[www]
+; The address on which to accept FastCGI requests.
+; Valid syntaxes are:
+;   'ip.add.re.ss:port'    - to listen on a TCP socket to a specific IPv4 address on
+;                            a specific port;
+;   '[ip:6:addr:ess]:port' - to listen on a TCP socket to a specific IPv6 address on
+;                            a specific port;
+;   'port'                 - to listen on a TCP socket to all addresses
+;                            (IPv6 and IPv4-mapped) on a specific port;
+;   '/path/to/unix/socket' - to listen on a unix socket.
+; Note: This value is mandatory.
+listen = /run/php-fpm.sock
+
+; Enable status page
+pm.status_path = /fpm-status
+
+; Ondemand process manager
+pm = ondemand
+
+; The number of child processes to be created when pm is set to 'static' and the
+; maximum number of child processes when pm is set to 'dynamic' or 'ondemand'.
+; This value sets the limit on the number of simultaneous requests that will be
+; served. Equivalent to the ApacheMaxClients directive with mpm_prefork.
+; Equivalent to the PHP_FCGI_CHILDREN environment variable in the original PHP
+; CGI. The below defaults are based on a server without much resources. Don't
+; forget to tweak pm.* to fit your needs.
+; Note: Used when pm is set to 'static', 'dynamic' or 'ondemand'
+; Note: This value is mandatory.
+pm.max_children = 100
+
+; The number of seconds after which an idle process will be killed.
+; Note: Used only when pm is set to 'ondemand'
+; Default Value: 10s
+pm.process_idle_timeout = 10s;
+
+; The number of requests each child process should execute before respawning.
+; This can be useful to work around memory leaks in 3rd party libraries. For
+; endless request processing specify '0'. Equivalent to PHP_FCGI_MAX_REQUESTS.
+; Default Value: 0
+pm.max_requests = 1000
+
+; Make sure the FPM workers can reach the environment variables for configuration
+clear_env = no
+
+; Catch output from PHP
+catch_workers_output = yes
+
+; Remove the 'child 10 said into stderr' prefix in the log and only show the actual message
+decorate_workers_output = no
+
+; Enable ping page to use in healthcheck
+ping.path = /fpm-ping

docker_config/nginx.conf

@@ -0,0 +1,47 @@
+worker_processes auto;
+error_log stderr warn;
+pid /run/nginx.pid;
+
+events {
+    worker_connections 1024;
+}
+
+http {
+    include mime.types;
+    # Threat files with a unknown filetype as binary
+    default_type application/octet-stream;
+
+    # Define custom log format to include reponse times
+    log_format main_timed '$remote_addr - $remote_user [$time_local] "$request" '
+                          '$status $body_bytes_sent "$http_referer" '
+                          '"$http_user_agent" "$http_x_forwarded_for" '
+                          '$request_time $upstream_response_time $pipe $upstream_cache_status';
+
+    access_log /dev/stdout main_timed;
+    error_log /dev/stderr notice;
+
+    keepalive_timeout 65;
+
+    # Write temporary files to /tmp so they can be created as a non-privileged user
+    client_body_temp_path /tmp/client_temp;
+    proxy_temp_path /tmp/proxy_temp_path;
+    fastcgi_temp_path /tmp/fastcgi_temp;
+    uwsgi_temp_path /tmp/uwsgi_temp;
+    scgi_temp_path /tmp/scgi_temp;
+
+    # Hide headers that identify the server to prevent information leakage
+    proxy_hide_header X-Powered-By;
+    fastcgi_hide_header X-Powered-By;
+    server_tokens off;
+
+    # Enable gzip compression by default
+    gzip on;
+    gzip_proxied any;
+    # Based on CloudFlare's recommended settings
+    gzip_types text/richtext text/plain text/css text/x-script text/x-component text/x-java-source text/x-markdown application/javascript application/x-javascript text/javascript text/js image/x-icon image/vnd.microsoft.icon application/x-perl application/x-httpd-cgi text/xml application/xml application/rss+xml application/vnd.api+json application/x-protobuf application/json multipart/bag multipart/mixed application/xhtml+xml font/ttf font/otf font/x-woff image/svg+xml application/vnd.ms-fontobject application/ttf application/x-ttf application/otf application/x-otf application/truetype application/opentype application/x-opentype application/font-woff application/eot application/font application/font-sfnt application/wasm application/javascript-binast application/manifest+json application/ld+json application/graphql+json application/geo+json;
+    gzip_vary on;
+    gzip_disable "msie6";
+
+    # Include server configs
+    include /etc/nginx/conf.d/*.conf;
+}

docker_config/php.ini

@@ -0,0 +1,3 @@
+[Date]
+date.timezone="UTC"
+expose_php= Off

docker_config/supervisord.conf

@@ -0,0 +1,23 @@
+[supervisord]
+nodaemon=true
+logfile=/dev/null
+logfile_maxbytes=0
+pidfile=/run/supervisord.pid
+
+[program:php-fpm]
+command=php-fpm83 -F
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=false
+startretries=0
+
+[program:nginx]
+command=nginx -g 'daemon off;'
+stdout_logfile=/dev/stdout
+stdout_logfile_maxbytes=0
+stderr_logfile=/dev/stderr
+stderr_logfile_maxbytes=0
+autorestart=false
+startretries=0

importmap.php

@@ -0,0 +1,28 @@
+<?php
+
+/**
+ * Returns the importmap for this application.
+ *
+ * - "path" is a path inside the asset mapper system. Use the
+ *     "debug:asset-map" command to see the full list of paths.
+ *
+ * - "entrypoint" (JavaScript only) set to true for any module that will
+ *     be used as an "entrypoint" (and passed to the importmap() Twig function).
+ *
+ * The "importmap:require" command can be used to add new entries to this file.
+ */
+return [
+    'app' => [
+        'path' => './assets/app.js',
+        'entrypoint' => true,
+    ],
+    '@hotwired/stimulus' => [
+        'version' => '3.2.2',
+    ],
+    '@symfony/stimulus-bundle' => [
+        'path' => './vendor/symfony/stimulus-bundle/assets/dist/loader.js',
+    ],
+    '@hotwired/turbo' => [
+        'version' => '7.3.0',
+    ],
+];

public/index.php

@@ -1,27 +1,9 @@
 <?php
 
 use App\Kernel;
-use Symfony\Component\Debug\Debug;
-use Symfony\Component\HttpFoundation\Request;
 
-require dirname(__DIR__).'/config/bootstrap.php';
+require_once dirname(__DIR__).'/vendor/autoload_runtime.php';
 
-if ($_SERVER['APP_DEBUG']) {
+return function (array $context) {
-    umask(0000);
+    return new Kernel($context['APP_ENV'], (bool) $context['APP_DEBUG']);
-
+};
-    Debug::enable();
-}
-
-if ($trustedProxies = $_SERVER['TRUSTED_PROXIES'] ?? $_ENV['TRUSTED_PROXIES'] ?? false) {
-    Request::setTrustedProxies(explode(',', $trustedProxies), Request::HEADER_X_FORWARDED_ALL ^ Request::HEADER_X_FORWARDED_HOST);
-}
-
-if ($trustedHosts = $_SERVER['TRUSTED_HOSTS'] ?? $_ENV['TRUSTED_HOSTS'] ?? false) {
-    Request::setTrustedHosts([$trustedHosts]);
-}
-
-$kernel = new Kernel($_SERVER['APP_ENV'], (bool) $_SERVER['APP_DEBUG']);
-$request = Request::createFromGlobals();
-$response = $kernel->handle($request);
-$response->send();
-$kernel->terminate($request, $response);

public/js/emojionearea.js

@@ -1400,13 +1400,14 @@ document = window.document || {};
                 self.editor.html(self.content = '');
             }
             source[sourceValFunc](self.getText());
-            let inputText;
+            var count = 0;
-            inputText = self.getText();
+            $('.emojionearea-editor').each(function() {
-            inputText = inputText
+                var currentElement = $(this);
-                .replace(/(^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9.-]+[a-z0-9]+)/ig, '$1@$3')
+                count += currentElement.text()
-                .replace(/(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/g, 'xxxxxxxxxxxxxxxxxxxxxxx');
+                    .replace(/(^|[^\/\w])@(([a-z0-9_]+)@[a-z0-9.-]+[a-z0-9]+)/ig, '$1@$3')
-
+                    .replace(/(http(s)?:\/\/.)?(www\.)?[-a-zA-Z0-9@:%._+~#=]{2,256}\.[a-z]{2,6}\b([-a-zA-Z0-9@:%_+.~#?&/=]*)/g, 'xxxxxxxxxxxxxxxxxxxxxxx').length;
-            $("#count").text(inputText.length);
+            });
+            $("#count").text(count);
         });
         if (options.shortcuts) {
             self.on("@keydown", function(_, e) {
@@ -1456,12 +1457,11 @@ document = window.document || {};
                         id: css_class,
                         match: /\B((:[\-+\w]*)|(@[\-+\w]*)|(#[\-+\w]*))$/,
                         search: function (term, callback) {
-
                             if (term.startsWith(":")) {
                                 callback($.map(map, function (emoji) {
                                     return emoji.indexOf(term) === 0 ? emoji : null;
                                 }));
-                            } else if (term.startsWith("@")){
+                            } else if (term.startsWith("@") && term.substring(1).length > 1){
                                 $.ajax({
                                     url: "https://"+$('#data_api').attr('data-instance')+"/api/v2/search?type=accounts&q="+term.substring(1),
                                     headers: {"Authorization": $('#data_api').attr('data-token')},
@@ -1471,7 +1471,7 @@ document = window.document || {};
                                         return value;
                                     }));
                                 });
-                            }else if (term.startsWith("#")){
+                            }else if (term.startsWith("#") && term.substring(1).length > 1){
                                 $.ajax({
                                     url: "https://"+$('#data_api').attr('data-instance')+"/api/v2/search?type=hashtags&q="+term.substring(1),
                                     headers: {"Authorization": $('#data_api').attr('data-token')},
@@ -1481,6 +1481,10 @@ document = window.document || {};
                                         return value;
                                     }));
                                 });
+                            } else {
+                                callback($.map(map, function () {
+                                    return null;
+                                }));
                             }
                         },
                         template: function (value) {
@@ -1500,7 +1504,6 @@ document = window.document || {};
                             }else if (typeof value.name != 'undefined') {
                                 return "#"+value.name+ " ";
                             }else{
-
                                 return shortnameTo(value, self.emojiTemplate);
                             }
                         },

src/Controller/FediPlanController.php

@@ -1,8 +1,4 @@
-<?php /** @noinspection PhpUndefinedClassInspection */
+<?php
-/** @noinspection PhpDocSignatureInspection */
-/** @noinspection PhpUnused */
-/** @noinspection DuplicatedCode */
-/** @noinspection PhpTranslationKeyInspection */
 
 /**
  * Created by fediplan.
@@ -15,34 +11,39 @@ namespace App\Controller;
 
 use App\Form\ComposeType;
 use App\Form\ConnectMastodonAccountFlow;
+use App\Security\MastodonAccount;
 use App\Services\Mastodon_api;
 use App\SocialEntity\Client;
 use App\SocialEntity\Compose;
-use App\SocialEntity\MastodonAccount;
 use App\SocialEntity\PollOption;
 use DateTime;
 use DateTimeZone;
 use Exception;
+use Psr\Container\ContainerExceptionInterface;
+use Psr\Container\NotFoundExceptionInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\Form\FormError;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Attribute\Route;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
 use Symfony\Component\Security\Http\Event\InteractiveLoginEvent;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
-
+use \Symfony\Component\HttpFoundation\RedirectResponse;
-
+use \Symfony\Component\HttpFoundation\Response;
 class FediPlanController extends AbstractController
 {
 
 
-    /**
+    #[Route(
-     * @Route("/{_locale}",name="index", defaults={"_locale"="en"}, requirements={"_locale": "%allowed_language%"})
+        '/{_locale}',
-     */
+        name: 'index',
-    public function indexAction(Request $request, AuthorizationCheckerInterface $authorizationChecker, ConnectMastodonAccountFlow $flow, Mastodon_api $mastodon_api, TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher)
+        requirements: ['_locale' => '%allowed_language%'],
+        defaults: ['_locale'=>'en']
+    )]
+    public function index(Request $request, AuthorizationCheckerInterface $authorizationChecker, ConnectMastodonAccountFlow $flow, Mastodon_api $mastodon_api, TranslatorInterface $translator, EventDispatcherInterface $eventDispatcher): RedirectResponse|Response
     {
 
         if ($authorizationChecker->isGranted('IS_AUTHENTICATED_FULLY')) {
@@ -72,15 +73,11 @@ class FediPlanController extends AbstractController
                         // form for the next step
                         $mastodon_api->set_client($createApp['response']['client_id'], $createApp['response']['client_secret']);
                         $urlToMastodon = $mastodon_api->getAuthorizationUrl();
-                        if (isset($createApp['error'])) {
+                        $flow->saveCurrentStepData($form);
-                            $form->get('host')->addError(new FormError($translator->trans('error.instance.mastodon_oauth_url', [], 'fediplan', 'en')));
+                        $client_id = $createApp['response']['client_id'];
-                        } else {
+                        $client_secret = $createApp['response']['client_secret'];
-                            $flow->saveCurrentStepData($form);
+                        $flow->nextStep();
-                            $client_id = $createApp['response']['client_id'];
+                        $form = $flow->createForm();
-                            $client_secret = $createApp['response']['client_secret'];
-                            $flow->nextStep();
-                            $form = $flow->createForm();
-                        }
                     }
 
                 }
@@ -102,14 +99,23 @@ class FediPlanController extends AbstractController
                     if (isset($accountReply['error'])) {
                         $form->get('code')->addError(new FormError($translator->trans('error.instance.mastodon_account', [], 'fediplan', 'en')));
                     } else {
-                        $Account = $mastodon_api->getSingleAccount($accountReply['response']);
+                        $account = $mastodon_api->getSingleAccount($accountReply['response']);
-                        $Account->setInstance($host);
+                        $instanceReply = $mastodon_api->get_instance();
-                        $Account->setToken($token_type . " " . $access_token);
+                        $instance = $mastodon_api->getInstanceConfiguration($instanceReply['response']);
-                        $token = new UsernamePasswordToken($Account, null, 'main', array('ROLE_USER'));
+                        $session = $request->getSession();
-                        $this->get('security.token_storage')->setToken($token);
+                        $session->set("instance",$instance);
-                        $event = new InteractiveLoginEvent($request, $token);
+                        $account->setInstance($host);
-                        $eventDispatcher->dispatch($event, "security.interactive_login");
+                        $account->setToken($token_type . " " . $access_token);
-                        return $this->redirectToRoute('schedule');
+                        $token = new UsernamePasswordToken($account, 'main', array('ROLE_USER'));
+                        try {
+                            $this->container->get('security.token_storage')->setToken($token);
+                            $event = new InteractiveLoginEvent($request, $token);
+                            $eventDispatcher->dispatch($event, "security.interactive_login");
+                            return $this->redirectToRoute('schedule');
+                        } catch (NotFoundExceptionInterface|ContainerExceptionInterface $e) {
+                            $form->get('code')->addError(new FormError($translator->trans('error.instance.mastodon_account', [], 'fediplan', 'en')));
+                        }
+
                     }
                 }
             }
@@ -128,27 +134,31 @@ class FediPlanController extends AbstractController
     }
 
 
-    /**
+    #[Route(
-     * @Route("/{_locale}/schedule", name="schedule", defaults={"_locale"="en"}, requirements={"_locale": "%allowed_language%"})
+        '/{_locale}/schedule',
-     */
+        name: 'schedule',
-    public function schedule(Request $request, Mastodon_api $mastodon_api, TranslatorInterface $translator)
+        requirements: ['_locale' => '%allowed_language%'],
+        defaults: ['_locale'=>'en']
+    )]
+    public function schedule(Request $request, Mastodon_api $mastodon_api, TranslatorInterface $translator): Response
     {
 
         $compose = new Compose();
 
         $pollOption1 = new PollOption();
         $pollOption1->setTitle("");
-        $compose->getPollOptions()->add($pollOption1);
+        $options = $compose->getPollOptions();
+        $options[] = $pollOption1;
         $pollOption2 = new PollOption();
         $pollOption2->setTitle("");
-        $compose->getPollOptions()->add($pollOption2);
+        $options[] = $pollOption2;
-        $form = $this->createForm(ComposeType::class, $compose, ['user' => $this->getUser()]);
+        $compose->setPollOptions($options);
+        $user = $this->getUser();
+        $form = $this->createForm(ComposeType::class, $compose, ['user' => $user]);
         $form->handleRequest($request);
         if ($form->isSubmitted() && $form->isValid()) {
             /** @var $data Compose */
             $data = $form->getData();
-            /* @var $user MastodonAccount */
-            $user = $this->getUser();
             $mastodon_api->set_url("https://" . $user->getInstance());
             $token = explode(" ", $user->getToken())[1];
             $type = explode(" ", $user->getToken())[0];
@@ -157,8 +167,7 @@ class FediPlanController extends AbstractController
             //Update media description and store their id
             foreach ($_POST as $key => $value) {
                 if ($key != "compose") {
-
+                    if (str_contains($key, 'media_id_')) {
-                    if (strpos($key, 'media_id_') !== false) {
 
                         $mediaId = $value;
                         $description = $_POST['media_description_' . $mediaId];
@@ -182,7 +191,12 @@ class FediPlanController extends AbstractController
             }
             $params['sensitive'] = ($data->getSensitive() == null || !$data->getSensitive()) ? false : true;
 
-            $pollOptions = $data->getPollOptions();
+            if($data->getAttachPoll() > 0) {
+                $pollOptions = $data->getPollOptions();
+            } else{
+                $pollOptions = array();
+            }
+
             $pollExpiresAt = $data->getPollExpiresAt();
             $isPollMultiple = $data->isPollMultiple();
             if (count($pollOptions) > 0) {
@@ -227,10 +241,12 @@ class FediPlanController extends AbstractController
                 $compose = new Compose();
                 $pollOption1 = new PollOption();
                 $pollOption1->setTitle("");
-                $compose->getPollOptions()->add($pollOption1);
+                $options = $compose->getPollOptions();
+                $options[] = $pollOption1;
                 $pollOption2 = new PollOption();
                 $pollOption2->setTitle("");
-                $compose->getPollOptions()->add($pollOption2);
+                $options[] = $pollOption2;
+                $compose->setPollOptions($options);
                 $session->getFlashBag()->add(
                     'Success',
                     $translator->trans('common.schedule_success', [], 'fediplan', 'en')
@@ -249,20 +265,24 @@ class FediPlanController extends AbstractController
 
     }
 
-
+    #[Route(
-    /**
+        '/{_locale}/scheduled',
-     * @Route("/{_locale}/scheduled", name="scheduled", defaults={"_locale"="en"}, requirements={"_locale": "%allowed_language%"})
+        name: 'scheduled',
-     */
+        requirements: ['_locale' => '%allowed_language%'],
-    public function scheduled()
+        defaults: ['_locale'=>'en']
+    )]
+    public function scheduled(): Response
     {
         return $this->render("fediplan/scheduled.html.twig");
     }
 
 
-    /**
+    #[Route(
-     * @Route("/{_locale}/scheduled/messages/{max_id}",  options={"expose"=true}, name="load_more")
+        '/{_locale}/scheduled/messages/{max_id}',
-     */
+        name: 'load_more',
-    public function loadMoreAction(Mastodon_api $mastodon_api, string $max_id = null)
+        options: ['expose' => true]
+    )]
+    public function loadMoreAction(Mastodon_api $mastodon_api, string $max_id = null): JsonResponse
     {
 
         $user = $this->getUser();
@@ -281,10 +301,15 @@ class FediPlanController extends AbstractController
         return new JsonResponse($data);
     }
 
-    /**
+    #[Route(
-     * @Route("/{_locale}/scheduled/delete/messages/{id}", options={"expose"=true}, name="delete_message", methods={"POST"}, defaults={"_locale"="en"}, requirements={"_locale": "%allowed_language%"})
+        '/{_locale}/scheduled/delete/messages/{id}',
-     */
+        name: 'delete_message',
-    public function deleteMessage(Mastodon_api $mastodon_api, string $id = null)
+        requirements: ['_locale' => '%allowed_language%'],
+        options: ['expose' => true],
+        defaults: ['_locale'=>'en'],
+        methods: ['POST']
+    )]
+    public function deleteMessage(Mastodon_api $mastodon_api, string $id = null): JsonResponse
     {
         $user = $this->getUser();
         $mastodon_api->set_url("https://" . $user->getInstance());
@@ -295,19 +320,23 @@ class FediPlanController extends AbstractController
         return new JsonResponse($response);
     }
 
-    /**
+
-     * @Route("/about",defaults={"_locale"="en"})
+    #[Route(
-     * @Route("/{_locale}/about", name="about", defaults={"_locale":"en"}, requirements={"_locale": "%allowed_language%"})
+        '/{_locale}/about',
-     */
+        name: 'about',
-    public function about()
+        requirements: ['_locale' => '%allowed_language%'],
+        defaults: ['_locale'=>'en']
+    )]
+    public function about(): Response
     {
         return $this->render("fediplan/about.html.twig");
     }
 
-    /**
+    #[Route(
-     * @Route("/logout", name="logout")
+        '/logout',
-     */
+        name: 'logout'
-    public function logout()
+    )]
+    public function logout(): Response
     {
         return $this->render("fediplan/index.html.twig");
     }

src/EventSubscriber/LocaleSubscriber.php

@@ -15,14 +15,14 @@ use Symfony\Component\HttpKernel\KernelEvents;
 
 class LocaleSubscriber implements EventSubscriberInterface
 {
-    private $defaultLocale;
+    private string $defaultLocale;
 
     public function __construct($defaultLocale = 'en')
     {
         $this->defaultLocale = $defaultLocale;
     }
 
-    public static function getSubscribedEvents()
+    public static function getSubscribedEvents(): array
     {
         return [
             // must be registered before (i.e. with a higher priority than) the default Locale listener
@@ -30,7 +30,7 @@ class LocaleSubscriber implements EventSubscriberInterface
         ];
     }
 
-    public function onKernelRequest(RequestEvent $event)
+    public function onKernelRequest(RequestEvent $event): void
     {
         $request = $event->getRequest();
         if (!$request->hasPreviousSession()) {

src/Form/ComposeType.php

@@ -10,28 +10,29 @@
 namespace App\Form;
 
 
+use App\Security\MastodonAccount;
 use App\SocialEntity\Compose;
-use App\SocialEntity\MastodonAccount;
 use DateTime;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\Extension\Core\Type\CollectionType;
 use Symfony\Component\Form\Extension\Core\Type\DateTimeType;
+use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\Form\Extension\Core\Type\TextareaType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\Extension\Core\Type\TimezoneType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Translation\Translator;
 
 class ComposeType extends AbstractType
 {
 
 
-    private $securityContext;
+    private Security $securityContext;
     private $translator;
 
     public function __construct(Security $securityContext, Translator $translator)
@@ -40,7 +41,7 @@ class ComposeType extends AbstractType
         $this->translator = $translator;
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         /**@var $user MastodonAccount */
         $user = $options['user'];
@@ -76,6 +77,8 @@ class ComposeType extends AbstractType
                 'data' => $user->getDefaultVisibility(),
                 'label' => 'page.schedule.form.visibility',
                 'translation_domain' => 'fediplan']);
+        $builder->add('attach_poll', HiddenType::class, ['required' => true, 'empty_data' => 0]);
+
         $builder->add('timeZone', TimezoneType::class,
             [
                 'label' => 'page.schedule.form.timeZone',
@@ -123,7 +126,7 @@ class ComposeType extends AbstractType
     }
 
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => Compose::class,

src/Form/ConnectMastodonAccountFlow.php

@@ -14,7 +14,7 @@ use Craue\FormFlowBundle\Form\FormFlow;
 class ConnectMastodonAccountFlow extends FormFlow
 {
 
-    protected function loadStepsConfig()
+    protected function loadStepsConfig(): array
     {
         return [
             [

src/Form/ConnectMastodonAccountType.php

@@ -17,7 +17,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 class ConnectMastodonAccountType extends AbstractType
 {
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         switch ($options['flow_step']) {
             case 1:
@@ -38,12 +38,12 @@ class ConnectMastodonAccountType extends AbstractType
         }
     }
 
-    public function getBlockPrefix()
+    public function getBlockPrefix(): string
     {
         return 'addMastodonAccount';
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'validation_groups' => ['registration'],

src/Form/PollOptionType.php

@@ -7,36 +7,42 @@
 namespace App\Form;
 
 
+use App\SocialEntity\Instance;
 use App\SocialEntity\PollOption;
+use Symfony\Bundle\SecurityBundle\Security;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\HttpFoundation\RequestStack;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
-use Symfony\Component\Security\Core\Security;
 
 class PollOptionType extends AbstractType
 {
 
 
-    private $securityContext;
+    private Security $securityContext;
+    private Instance $instance;
 
-    public function __construct(Security $securityContext)
+    public function __construct(Security $securityContext, RequestStack $requestStack)
     {
         $this->securityContext = $securityContext;
+        $this->instance = $requestStack->getSession()->get('instance');
     }
 
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
+        $max_char = $this->instance->getConfiguration()->getPolls()->getMaxCharactersPerOption();
         $builder->add('title', TextType::class,
             [
                 'required' => false,
-                'attr' => ['class' => 'form-control'],
+                'attr' => ['class' => 'form-control', 'maxlength' => $max_char],
                 'label' => 'page.schedule.form.poll_item',
             ]);
     }
 
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
             'data_class' => PollOption::class,

src/Kernel.php

@@ -3,52 +3,9 @@
 namespace App;
 
 use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\RouteCollectionBuilder;
-use function dirname;
 
 class Kernel extends BaseKernel
 {
     use MicroKernelTrait;
-
-    private const CONFIG_EXTS = '.{php,xml,yaml,yml}';
-
-    public function registerBundles(): iterable
-    {
-        $contents = require $this->getProjectDir() . '/config/bundles.php';
-        foreach ($contents as $class => $envs) {
-            if ($envs[$this->environment] ?? $envs['all'] ?? false) {
-                yield new $class();
-            }
-        }
-    }
-
-    public function getProjectDir(): string
-    {
-        return dirname(__DIR__);
-    }
-
-    protected function configureContainer(ContainerBuilder $container, LoaderInterface $loader): void
-    {
-        $container->addResource(new FileResource($this->getProjectDir() . '/config/bundles.php'));
-        $container->setParameter('container.dumper.inline_class_loader', true);
-        $confDir = $this->getProjectDir() . '/config';
-
-        $loader->load($confDir . '/{packages}/*' . self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir . '/{packages}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir . '/{services}' . self::CONFIG_EXTS, 'glob');
-        $loader->load($confDir . '/{services}_' . $this->environment . self::CONFIG_EXTS, 'glob');
-    }
-
-    protected function configureRoutes(RouteCollectionBuilder $routes): void
-    {
-        $confDir = $this->getProjectDir() . '/config';
-
-        $routes->import($confDir . '/{routes}/' . $this->environment . '/**/*' . self::CONFIG_EXTS, '/', 'glob');
-        $routes->import($confDir . '/{routes}/*' . self::CONFIG_EXTS, '/', 'glob');
-        $routes->import($confDir . '/{routes}' . self::CONFIG_EXTS, '/', 'glob');
-    }
 }

src/Security/MastodonAccount.php

@@ -1,70 +1,68 @@
 <?php
 
-namespace App\SocialEntity;
+namespace App\Security;
 
+use App\SocialEntity\Client;
+use App\SocialEntity\CustomField;
+use App\SocialEntity\Emoji;
+use Symfony\Component\Security\Core\User\UserInterface;
 
-use DateTimeInterface;
+class MastodonAccount implements UserInterface
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
-
-class MastodonAccount
 {
+    private string $acct;
+    private string $id;
 
-    private $id;
+    private string $account_id;
 
-    private $account_id;
+    private string $username;
 
-    private $username;
+    private string $display_name;
 
-    private $acct;
+    private bool $locked;
 
-    private $display_name;
+    private \DateTime $created_at;
 
-    private $locked;
+    private int $followers_count;
 
-    private $created_at;
+    private int $following_count;
 
-    private $followers_count;
+    private int $statuses_count;
 
-    private $following_count;
+    private string $note;
 
-    private $statuses_count;
+    private string $url;
 
-    private $note;
+    private string $avatar;
 
-    private $url;
+    private string $avatar_static;
 
-    private $avatar;
+    private string $header;
 
-    private $avatar_static;
+    private string $header_static;
 
-    private $header;
+    private MastodonAccount $moved;
 
-    private $header_static;
+    private bool $bot;
 
-    private $moved;
+    private string $instance;
 
-    private $bot;
+    private Client $client;
 
-    private $instance;
+    private string $token;
 
-    private $client;
+    private array $Fields;
+    /** @var Emoji[] */
+    private array $Emojis;
 
-    private $token;
+    private string $default_sensitivity;
 
-    private $Fields;
+    private string $default_visibility;
-
-    private $Emojis;
-
-    private $default_sensitivity;
-
-    private $default_visibility;
 
 
     public function __construct()
     {
-        $this->Fields = new ArrayCollection();
+        $this->Fields = array();
-        $this->Emojis = new ArrayCollection();
+        $this->Emojis = array();
     }
 
 
@@ -121,12 +119,12 @@ class MastodonAccount
         return $this;
     }
 
-    public function getCreatedAt(): ?DateTimeInterface
+    public function getCreatedAt(): ?\DateTime
     {
         return $this->created_at;
     }
 
-    public function setCreatedAt(DateTimeInterface $created_at): self
+    public function setCreatedAt(\DateTime $created_at): self
     {
         $this->created_at = $created_at;
 
@@ -324,59 +322,52 @@ class MastodonAccount
         return $this;
     }
 
-    /**
+
-     * @return Collection|CustomField[]
+    public function getFields(): array
-     */
-    public function getFields(): Collection
     {
         return $this->Fields;
     }
 
     public function addField(CustomField $field): self
     {
-        if (!$this->Fields->contains($field)) {
+        if (in_array($field, $this->Fields) !== false) {
             $this->Fields[] = $field;
             $field->setMastodonAccount($this);
         }
-
         return $this;
     }
 
     public function removeField(CustomField $field): self
     {
-        if ($this->Fields->contains($field)) {
+
-            $this->Fields->removeElement($field);
+        if (($key = array_search($field, $this->Fields)) !== false) {
+            unset($this->Fields[$key]);
             // set the owning side to null (unless already changed)
             if ($field->getMastodonAccount() === $this) {
                 $field->setMastodonAccount(null);
             }
         }
-
         return $this;
     }
 
-    /**
+    public function getEmojis(): array
-     * @return Collection|Emoji[]
-     */
-    public function getEmojis(): Collection
     {
         return $this->Emojis;
     }
 
     public function addEmoji(Emoji $emoji): self
     {
-        if (!$this->Emojis->contains($emoji)) {
+        if (in_array($emoji, $this->Emojis) !== false) {
             $this->Emojis[] = $emoji;
             $emoji->setMastodonAccount($this);
         }
-
         return $this;
     }
 
     public function removeEmoji(Emoji $emoji): self
     {
-        if ($this->Emojis->contains($emoji)) {
+        if (($key = array_search($emoji, $this->Emojis)) !== false) {
-            $this->Emojis->removeElement($emoji);
+            unset($this->Emojis[$key]);
             // set the owning side to null (unless already changed)
             if ($emoji->getMastodonAccount() === $this) {
                 $emoji->setMastodonAccount(null);
@@ -390,7 +381,7 @@ class MastodonAccount
     /**
      * @return mixed
      */
-    public function getDefaultSensitivity()
+    public function getDefaultSensitivity(): mixed
     {
         return $this->default_sensitivity;
     }
@@ -418,6 +409,52 @@ class MastodonAccount
     {
         $this->default_visibility = $default_visibility;
     }
+    /**
+     * @var list<string> The user roles
+     */
+    private $roles = [];
 
 
+    /**
+     * A visual identifier that represents this user.
+     *
+     * @see UserInterface
+     */
+    public function getUserIdentifier(): string
+    {
+        return (string) $this->acct;
+    }
+
+    /**
+     * @see UserInterface
+     *
+     * @return list<string>
+     */
+    public function getRoles(): array
+    {
+        $roles = $this->roles;
+        // guarantee every user at least has ROLE_USER
+        $roles[] = 'ROLE_USER';
+
+        return array_unique($roles);
+    }
+
+    /**
+     * @param list<string> $roles
+     */
+    public function setRoles(array $roles): static
+    {
+        $this->roles = $roles;
+
+        return $this;
+    }
+
+    /**
+     * @see UserInterface
+     */
+    public function eraseCredentials(): void
+    {
+        // If you store any temporary, sensitive data on the user, clear it here
+        // $this->plainPassword = null;
+    }
 }

src/Security/UserProvider.php

@@ -0,0 +1,79 @@
+<?php
+
+namespace App\Security;
+
+use Symfony\Component\Security\Core\Exception\UnsupportedUserException;
+use Symfony\Component\Security\Core\Exception\UserNotFoundException;
+use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
+use Symfony\Component\Security\Core\User\PasswordUpgraderInterface;
+use Symfony\Component\Security\Core\User\UserInterface;
+use Symfony\Component\Security\Core\User\UserProviderInterface;
+
+class UserProvider implements UserProviderInterface, PasswordUpgraderInterface
+{
+    /**
+     * Symfony calls this method if you use features like switch_user
+     * or remember_me.
+     *
+     * If you're not using these features, you do not need to implement
+     * this method.
+     *
+     * @throws UserNotFoundException if the user is not found
+     */
+    public function loadUserByIdentifier($identifier): UserInterface
+    {
+        // Load a User object from your data source or throw UserNotFoundException.
+        // The $identifier argument may not actually be a username:
+        // it is whatever value is being returned by the getUserIdentifier()
+        // method in your User class.
+        throw new \Exception('TODO: fill in loadUserByIdentifier() inside '.__FILE__);
+    }
+
+    /**
+     * @deprecated since Symfony 5.3, loadUserByIdentifier() is used instead
+     */
+    public function loadUserByUsername($username): UserInterface
+    {
+        return $this->loadUserByIdentifier($username);
+    }
+
+    /**
+     * Refreshes the user after being reloaded from the session.
+     *
+     * When a user is logged in, at the beginning of each request, the
+     * User object is loaded from the session and then this method is
+     * called. Your job is to make sure the user's data is still fresh by,
+     * for example, re-querying for fresh User data.
+     *
+     * If your firewall is "stateless: true" (for a pure API), this
+     * method is not called.
+     */
+    public function refreshUser(UserInterface $user): UserInterface
+    {
+        if (!$user instanceof MastodonAccount) {
+            throw new UnsupportedUserException(sprintf('Invalid user class "%s".', $user::class));
+        }
+
+        // Return a User object after making sure its data is "fresh".
+        // Or throw a UsernameNotFoundException if the user no longer exists.
+       return $user;
+    }
+
+    /**
+     * Tells Symfony to use this provider for this User class.
+     */
+    public function supportsClass(string $class): bool
+    {
+        return MastodonAccount::class === $class || is_subclass_of($class, MastodonAccount::class);
+    }
+
+    /**
+     * Upgrades the hashed password of a user, typically for using a better hash algorithm.
+     */
+    public function upgradePassword(PasswordAuthenticatedUserInterface $user, string $newHashedPassword): void
+    {
+        // TODO: when hashed passwords are in use, this method should:
+        // 1. persist the new password in the user storage
+        // 2. update the $user object with $user->setPassword($newHashedPassword);
+    }
+}

src/Services/Mastodon_api.php

@@ -11,17 +11,22 @@
 namespace App\Services;
 
 
+use App\Security\MastodonAccount;
 use App\Services\Curl as Curl;
 use App\SocialEntity\Application;
 use App\SocialEntity\Attachment;
+use App\SocialEntity\Configuration;
 use App\SocialEntity\CustomField;
 use App\SocialEntity\Emoji;
-use App\SocialEntity\MastodonAccount;
+use App\SocialEntity\Instance;
+use App\SocialEntity\MediaAttachments;
 use App\SocialEntity\Mention;
 use App\SocialEntity\Notification;
 use App\SocialEntity\Poll;
 use App\SocialEntity\PollOption;
+use App\SocialEntity\Polls;
 use App\SocialEntity\Status;
+use App\SocialEntity\Statuses;
 use App\SocialEntity\Tag;
 use CURLFile;
 use DateTime;
@@ -66,7 +71,7 @@ class Mastodon_api
      *
      * @param string $path
      */
-    public function set_url($path)
+    public function set_url(string $path): void
     {
         $this->mastodon_url = $path;
     }
@@ -77,7 +82,7 @@ class Mastodon_api
      * @param string $id
      * @param string $secret
      */
-    public function set_client($id, $secret)
+    public function set_client(string $id, string $secret): void
     {
         $this->client_id = $id;
         $this->client_secret = $secret;
@@ -89,7 +94,7 @@ class Mastodon_api
      * @param string $token
      * @param string $type
      */
-    public function set_token($token, $type)
+    public function set_token(string $token, string $type): void
     {
         $this->token['access_token'] = $token;
         $this->token['token_type'] = $type;
@@ -100,7 +105,7 @@ class Mastodon_api
      *
      * @param array $scopes read / write / follow
      */
-    public function set_scopes($scopes)
+    public function set_scopes(array $scopes): void
     {
         $this->scopes = $scopes;
     }
@@ -119,7 +124,7 @@ class Mastodon_api
      *          string      $response['client_id']
      *          string      $response['client_secret']
      */
-    public function create_app($client_name, $scopes = array(), $redirect_uris = '', $website = '')
+    public function create_app(string $client_name, array $scopes = array(), string $redirect_uris = '', string $website = ''): array
     {
         $parameters = array();
 
@@ -162,7 +167,7 @@ class Mastodon_api
      *
      * @return  array       $response
      */
-    private function _post($url, $parameters = array())
+    private function _post(string $url, array $parameters = array()): array
     {
 
         $params["method"] = "POST";
@@ -185,7 +190,7 @@ class Mastodon_api
      *
      * @return  array       $data
      */
-    public function get_content_remote($url, $parameters = array())
+    public function get_content_remote(string $url, array $parameters = array()): array
     {
         $data = array();
 
@@ -304,7 +309,7 @@ class Mastodon_api
      *          string      $response['scope']              read
      *          int         $response['created_at']         time
      */
-    public function login($id, $password)
+    public function login(string $id, string $password): array
     {
         $parameters = array();
         $parameters['client_id'] = $this->client_id;
@@ -340,7 +345,7 @@ class Mastodon_api
      *          string      $response['scope']              read
      *          int         $response['created_at']         time
      */
-    public function loginAuthorization($code, $redirect_uri = '')
+    public function loginAuthorization(string $code, string $redirect_uri = ''): array
     {
         $parameters = array();
         $parameters['client_id'] = $this->client_id;
@@ -367,7 +372,7 @@ class Mastodon_api
      *
      * @return  string       $response Authorization code
      */
-    public function getAuthorizationUrl($redirect_uri = '')
+    public function getAuthorizationUrl(string $redirect_uri = ''): string
     {
         if (empty($redirect_uri))
             $redirect_uri = 'urn:ietf:wg:oauth:2.0:oob';
@@ -389,7 +394,7 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array       $response
      *          int         $response['id']
@@ -408,7 +413,7 @@ class Mastodon_api
      *          string      $response['header']                 A base64 encoded image to display as the user's header image
      *          string      $response['header_static']
      */
-    public function accounts($id)
+    public function accounts(string $id): array
     {
         return $this->_get('/api/v1/accounts/' . $id);
     }
@@ -421,7 +426,7 @@ class Mastodon_api
      *
      * @return  array       $response
      */
-    private function _get($url, $parameters = array())
+    private function _get(string $url, array $parameters = array()): array
     {
 
         $params["method"] = "GET";
@@ -433,7 +438,6 @@ class Mastodon_api
         }
         $params['body'] = $parameters;
         $url = $this->mastodon_url . $url;
-
         return $this->get_content_remote($url, $params);
     }
 
@@ -444,7 +448,7 @@ class Mastodon_api
      *
      * @return  array       $response
      */
-    public function accounts_verify_credentials()
+    public function accounts_verify_credentials(): array
     {
         return $this->_get('/api/v1/accounts/verify_credentials');
     }
@@ -462,7 +466,7 @@ class Mastodon_api
      *
      * @return  array   $response
      */
-    public function accounts_update_credentials($parameters)
+    public function accounts_update_credentials($parameters): array
     {
         return $this->_patch('/api/v1/accounts/update_credentials', $parameters);
     }
@@ -475,7 +479,7 @@ class Mastodon_api
      *
      * @return  array       $parameters
      */
-    private function _patch($url, $parameters = array())
+    private function _patch(string $url, array $parameters = array()): array
     {
 
         $params["method"] = "PATCH";
@@ -497,11 +501,11 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array       $response
      */
-    public function accounts_followers($id)
+    public function accounts_followers(string $id): array
     {
         return $this->_get('/api/v1/accounts/' . $id . '/followers');
     }
@@ -511,11 +515,11 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array       $response
      */
-    public function accounts_following($id)
+    public function accounts_following(string $id): array
     {
         return $this->_get('/api/v1/accounts/' . $id . '/following');
     }
@@ -525,11 +529,11 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array       $response
      */
-    public function accounts_statuses($id)
+    public function accounts_statuses(string $id): array
     {
         return $this->_get('/api/v1/accounts/' . $id . '/statuses');
     }
@@ -539,11 +543,11 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array       $response
      */
-    public function accounts_own_statuses($id)
+    public function accounts_own_statuses(string $id): array
     {
         $response = $this->_get('/api/v1/accounts/' . $id . '/statuses?exclude_replies=1');
         $result = [];
@@ -563,11 +567,11 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array       $response
      */
-    public function accounts_follow($id)
+    public function accounts_follow(string $id): array
     {
         return $this->_post('/api/v1/accounts/' . $id . '/follow');
     }
@@ -577,11 +581,11 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array       $response
      */
-    public function accounts_unfollow($id)
+    public function accounts_unfollow(string $id): array
     {
         return $this->_post('/api/v1/accounts/' . $id . '/unfollow');
     }
@@ -591,11 +595,11 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array       $response
      */
-    public function accounts_block($id)
+    public function accounts_block(string $id): array
     {
         return $this->_post('/api/v1/accounts/' . $id . '/block');
     }
@@ -605,11 +609,11 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array       $response
      */
-    public function accounts_unblock($id)
+    public function accounts_unblock(string $id): array
     {
         return $this->_post('/api/v1/accounts/' . $id . '/unblock');
     }
@@ -619,11 +623,11 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array       $response
      */
-    public function accounts_mute($id)
+    public function accounts_mute(string $id): array
     {
         return $this->_post('/api/v1/accounts/' . $id . '/mute');
     }
@@ -633,11 +637,11 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array       $response
      */
-    public function accounts_unmute($id)
+    public function accounts_unmute(string $id): array
     {
         return $this->_post('/api/v1/accounts/' . $id . '/unmute');
     }
@@ -658,7 +662,7 @@ class Mastodon_api
      *          bool        $response['muting']
      *          bool        $response['requested']
      */
-    public function accounts_relationships($parameters)
+    public function accounts_relationships(array $parameters): array
     {
         return $this->_get('/api/v1/accounts/relationships', $parameters);
     }
@@ -672,7 +676,7 @@ class Mastodon_api
      *
      * @return  array       $response
      */
-    public function accounts_search($parameters)
+    public function accounts_search(array $parameters): array
     {
         return $this->_get('/api/v1/accounts/search', $parameters);
     }
@@ -682,7 +686,7 @@ class Mastodon_api
      *
      * @return  array       $response
      */
-    public function blocks()
+    public function blocks(): array
     {
         return $this->_get('/api/v1/blocks');
     }
@@ -692,7 +696,7 @@ class Mastodon_api
      *
      * @return  array       $response
      */
-    public function favourites()
+    public function favourites(): array
     {
         return $this->_get('/api/v1/favourites');
     }
@@ -702,7 +706,7 @@ class Mastodon_api
      *
      * @return  array       $response
      */
-    public function follow_requests()
+    public function follow_requests(): array
     {
         return $this->_get('/api/v1/follow_requests');
     }
@@ -712,11 +716,11 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array       $response
      */
-    public function follow_requests_authorize($id)
+    public function follow_requests_authorize(string $id): array
     {
         return $this->_post('/api/v1/follow_requests/authorize', array('id' => $id));
     }
@@ -726,10 +730,10 @@ class Mastodon_api
      *
      * @see     https://your-domain/web/accounts/:id
      *
-     * @param int $id
+     * @param string $id
      * @return  array       $response
      */
-    public function follow_requests_reject($id)
+    public function follow_requests_reject(string $id): array
     {
         return $this->_post('/api/v1/follow_requests/reject', array('id' => $id));
     }
@@ -742,27 +746,11 @@ class Mastodon_api
      * @param string $uri username@domain of the person you want to follow
      * @return  array       $response
      */
-    public function follows($uri)
+    public function follows($uri): array
     {
         return $this->_post('/api/v1/follows', array('uri' => $uri));
     }
 
-    /**
-     * instance
-     *
-     * Getting instance information
-     *
-     * @return  array       $response
-     *          string      $response['uri']
-     *          string      $response['title']
-     *          string      $response['description']
-     *          string      $response['email']
-     */
-    public function instance()
-    {
-        return $this->_get('/api/v1/instance');
-    }
-
     /**
      * mutes
      *
@@ -770,7 +758,7 @@ class Mastodon_api
      *
      * @return  array       $response
      */
-    public function mutes()
+    public function mutes(): array
     {
         return $this->_get('/api/v1/mutes');
     }
@@ -783,7 +771,7 @@ class Mastodon_api
      *
      * @return  array   $response
      */
-    public function notifications($parameters)
+    public function notifications($parameters): array
     {
         $url = '/api/v1/notifications';
 
@@ -797,7 +785,7 @@ class Mastodon_api
      *
      * @return  array   $response
      */
-    public function notifications_clear()
+    public function notifications_clear(): array
     {
         return $this->_post('/api/v1/notifications/clear');
     }
@@ -809,7 +797,7 @@ class Mastodon_api
      *
      * @return  array   $response
      */
-    public function get_reports()
+    public function get_reports(): array
     {
         return $this->_get('/api/v1/reports');
     }
@@ -826,7 +814,7 @@ class Mastodon_api
      *
      * @return  array   $response
      */
-    public function post_reports($parameters)
+    public function post_reports(array $parameters): array
     {
         return $this->_post('/api/v1/reports', $parameters);
     }
@@ -842,7 +830,7 @@ class Mastodon_api
      *
      * @return  array   $response
      */
-    public function search($parameters)
+    public function search(array $parameters): array
     {
         return $this->_get('/api/v1/search', $parameters);
     }
@@ -852,11 +840,11 @@ class Mastodon_api
      *
      * Fetching a status
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array   $response
      */
-    public function statuses($id)
+    public function statuses(string $id): array
     {
         return $this->_get('/api/v1/statuses/' . $id);
     }
@@ -866,11 +854,11 @@ class Mastodon_api
      *
      * Getting status context
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array   $response
      */
-    public function statuses_context($id)
+    public function statuses_context(string $id): array
     {
         return $this->_get('/api/v1/statuses/' . $id . '/context');
     }
@@ -880,11 +868,11 @@ class Mastodon_api
      *
      * Getting a card associated with a status
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array   $response
      */
-    public function statuses_card($id)
+    public function statuses_card(string $id): array
     {
         return $this->_get('/api/v1/statuses/' . $id . '/card');
     }
@@ -894,11 +882,11 @@ class Mastodon_api
      *
      * Getting who reblogged a status
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array   $response
      */
-    public function statuses_reblogged_by($id)
+    public function statuses_reblogged_by(string $id): array
     {
         return $this->_get('/api/v1/statuses/' . $id . '/reblogged_by');
     }
@@ -908,11 +896,11 @@ class Mastodon_api
      *
      * Getting who favourited a status
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array   $response
      */
-    public function statuses_favourited_by($id)
+    public function statuses_favourited_by(string $id): array
     {
         return $this->_get('/api/v1/statuses/' . $id . '/favourited_by');
     }
@@ -927,7 +915,7 @@ class Mastodon_api
      *
      * @return  array       $response
      */
-    public function post_media($parameters)
+    public function post_media(array $parameters): array
     {
         return $this->_post('/api/v1/media', $parameters);
     }
@@ -943,7 +931,7 @@ class Mastodon_api
      * @param $parameters
      * @return  array       $response
      */
-    public function update_media($id, $parameters)
+    public function update_media(string $id, array $parameters): array
     {
         return $this->_put('/api/v1/media/' . $id, $parameters);
     }
@@ -958,7 +946,7 @@ class Mastodon_api
      *
      * @return  array       $response
      */
-    private function _put($url, $parameters = array())
+    private function _put(string $url, array $parameters = array()): array
     {
 
         $params["method"] = "PUT";
@@ -986,7 +974,7 @@ class Mastodon_api
      *
      * @return  array       $response
      */
-    public function post_statuses($parameters)
+    public function post_statuses(array $parameters): array
     {
         return $this->_post('/api/v1/statuses', $parameters);
     }
@@ -996,11 +984,11 @@ class Mastodon_api
      *
      * Deleting a status
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array   $response       empty
      */
-    public function delete_statuses($id)
+    public function delete_statuses(string $id): array
     {
         return $this->_delete('/api/v1/statuses/' . $id);
     }
@@ -1014,7 +1002,7 @@ class Mastodon_api
      *
 
      */
-    private function _delete($url)
+    private function _delete(string $url): array
     {
         $parameters = array();
         $parameters["method"] = "DELETE";
@@ -1034,11 +1022,11 @@ class Mastodon_api
      *
      * Deleting a scheduled status
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array   $response       empty
      */
-    public function delete_scheduled($id)
+    public function delete_scheduled(string $id): array
     {
         return $this->_delete('/api/v1/scheduled_statuses/' . $id);
     }
@@ -1048,11 +1036,11 @@ class Mastodon_api
      *
      * Reblogging a status
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array   $response
      */
-    public function statuses_reblog($id)
+    public function statuses_reblog(string $id): array
     {
         return $this->_post('/api/v1/statuses/' . $id . '/reblog');
     }
@@ -1062,11 +1050,11 @@ class Mastodon_api
      *
      * Unreblogging a status
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array   $response
      */
-    public function statuses_unreblog($id)
+    public function statuses_unreblog(string $id): array
     {
         return $this->_post('/api/v1/statuses/' . $id . '/unreblog');
     }
@@ -1076,11 +1064,11 @@ class Mastodon_api
      *
      * Favouriting a status
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array   $response
      */
-    public function statuses_favourite($id)
+    public function statuses_favourite(string $id): array
     {
         return $this->_post('/api/v1/statuses/' . $id . '/favourite');
     }
@@ -1090,16 +1078,28 @@ class Mastodon_api
      *
      * Unfavouriting a status
      *
-     * @param int $id
+     * @param string $id
      *
      * @return  array   $response
      */
-    public function statuses_unfavourite($id)
+    public function statuses_unfavourite(string $id): array
     {
         return $this->_post('/api/v1/statuses/' . $id . '/unfavourite');
     }
 
 
+    /**
+     * scheduled_statuses
+     *
+     *
+     * @return  array   $response
+     */
+    public function get_instance(): array
+    {
+        return $this->_get('/api/v1/instance');
+    }
+
+
     /**
      * scheduled_statuses
      *
@@ -1107,7 +1107,7 @@ class Mastodon_api
      *
      * @return  array   $response
      */
-    public function get_scheduled($parameters = array())
+    public function get_scheduled($parameters = array()): array
     {
         return $this->_get('/api/v1/scheduled_statuses/', $parameters);
     }
@@ -1117,7 +1117,7 @@ class Mastodon_api
      *
      * @return  array   $response
      */
-    public function timelines_home()
+    public function timelines_home(): array
     {
         return $this->_get('/api/v1/timelines/home');
     }
@@ -1130,7 +1130,7 @@ class Mastodon_api
      *
      * @return  array   $response
      */
-    public function timelines_public($parameters = array())
+    public function timelines_public(array $parameters = array()): array
     {
         return $this->_get('/api/v1/timelines/public', $parameters);
     }
@@ -1144,7 +1144,7 @@ class Mastodon_api
      *
      * @return  array       $response
      */
-    public function timelines_tag($hashtag, $parameters = array())
+    public function timelines_tag(string $hashtag, array $parameters = array()): array
     {
         return $this->_get('/api/v1/timelines/tag/' . $hashtag, $parameters);
     }
@@ -1160,13 +1160,12 @@ class Mastodon_api
      * @param $host
      * @return string|null
      */
-    public function getInstanceNodeInfo($host)
+    public function getInstanceNodeInfo(string $host): ?string
     {
         $curl = new Curl();
         $url = "https://" . $host . "/.well-known/nodeinfo";
         $reply = $curl->get($url);
 
-
         $responseArray = json_decode($reply->response, true);
         if (empty($responseArray)) {
             $curl = new Curl();
@@ -1193,7 +1192,7 @@ class Mastodon_api
      * @param $accountParams array
      * @return MastodonAccount
      */
-    public function updateAccount(MastodonAccount $MastodonAccount, $accountParams)
+    public function updateAccount(MastodonAccount $MastodonAccount, array $accountParams): MastodonAccount
     {
 
         $MastodonAccount->setUsername($accountParams['username']);
@@ -1242,21 +1241,21 @@ class Mastodon_api
         return $MastodonAccount;
     }
 
-    public function stringToDate($string_date)
+    public function stringToDate(?string $string_date): DateTime
     {
         try {
             return new DateTime($string_date);
         } catch (Exception $e) {
         }
-        return "";
+        return new DateTime();
     }
 
     /**
      * getNotifications Hydrate an array of Notification from API reply
-     * @param $notificationParams
+     * @param $notificationParams array
      * @return array
      */
-    public function getNotifications($notificationParams)
+    public function getNotifications(array $notificationParams): array
     {
         $notifications = [];
         foreach ($notificationParams as $notificationParam)
@@ -1269,7 +1268,7 @@ class Mastodon_api
      * @param $notificationParams
      * @return Notification
      */
-    public function getSingleNotification($notificationParams)
+    public function getSingleNotification($notificationParams): Notification
     {
         $notification = new Notification();
         $notification->setId($notificationParams['id']);
@@ -1281,12 +1280,52 @@ class Mastodon_api
         return $notification;
     }
 
+    /**
+     * get instance configuration from API reply
+     * @param $instantParams array
+     * @return Instance
+     */
+    public function getInstanceConfiguration(array $instantParams): Instance
+    {
+        $Instance = new Instance();
+        $Configuration = new Configuration();
+        $Statuses = new Statuses();
+        $MediaAttachments = new MediaAttachments();
+        $Polls = new Polls();
+        if(isset($instantParams['configuration'])) {
+            //Dealing with statuses configuration
+            if(isset($instantParams['configuration']['statuses'])) {
+                $Statuses->setMaxCharacters($instantParams['configuration']['statuses']['max_characters']);
+                $Statuses->setMaxMediaAttachments($instantParams['configuration']['statuses']['max_media_attachments']);
+                $Statuses->setCharactersReservedPerUrl($instantParams['configuration']['statuses']['characters_reserved_per_url']);
+            }
+            if(isset($instantParams['configuration']['media_attachments'])) {
+                $MediaAttachments->setSupportedMimeTypes($instantParams['configuration']['media_attachments']['supported_mime_types']);
+                $MediaAttachments->setImageSizeLimit($instantParams['configuration']['media_attachments']['image_size_limit']);
+                $MediaAttachments->setImageMatrixLimit($instantParams['configuration']['media_attachments']['image_matrix_limit']);
+                $MediaAttachments->setVideoSizeLimit($instantParams['configuration']['media_attachments']['video_size_limit']);
+                $MediaAttachments->setVideoFrameRateLimit($instantParams['configuration']['media_attachments']['video_frame_rate_limit']);
+                $MediaAttachments->setVideoMatrixLimit($instantParams['configuration']['media_attachments']['video_matrix_limit']);
+            }
+            if(isset($instantParams['configuration']['polls'])) {
+                $Polls->setMaxOptions($instantParams['configuration']['polls']['max_options']);
+                $Polls->setMaxCharactersPerOption($instantParams['configuration']['polls']['max_characters_per_option']);
+                $Polls->setMinExpiration($instantParams['configuration']['polls']['min_expiration']);
+                $Polls->setMaxExpiration($instantParams['configuration']['polls']['max_expiration']);
+            }
+        }
+        $Configuration->setStatuses($Statuses);
+        $Configuration->setMediaAttachments($MediaAttachments);
+        $Configuration->setPolls($Polls);
+        $Instance->setConfiguration($Configuration);
+        return $Instance;
+    }
     /**
      * getSingleAccount Hydrate a MastodonAccount from API reply
-     * @param $accountParams
+     * @param $accountParams array
      * @return MastodonAccount
      */
-    public function getSingleAccount($accountParams)
+    public function getSingleAccount(array $accountParams): MastodonAccount
     {
 
         $MastodonAccount = new MastodonAccount();
@@ -1343,10 +1382,10 @@ class Mastodon_api
 
     /**
      * getSingleStatus Hydrate a Status from API reply
-     * @param $statusParams
+     * @param $statusParams array
      * @return Status
      */
-    public function getSingleStatus($statusParams)
+    public function getSingleStatus(array $statusParams): Status
     {
 
         $status = new Status();
@@ -1477,7 +1516,7 @@ class Mastodon_api
      * @param $statusParams
      * @return array
      */
-    public function getStatuses($statusParams)
+    public function getStatuses($statusParams): array
     {
         $statuses = [];
         foreach ($statusParams as $statusParam)
@@ -1487,11 +1526,11 @@ class Mastodon_api
 
     /**
      * getScheduledStatuses Hydrate an array of Scheduled Status from API reply
-     * @param $statusParams
+     * @param $statusParams array
-     * @param $account
+     * @param $account MastodonAccount
      * @return array
      */
-    public function getScheduledStatuses($statusParams, $account)
+    public function getScheduledStatuses(array $statusParams, MastodonAccount $account): array
     {
         $statuses = [];
         foreach ($statusParams as $statusParam)
@@ -1502,11 +1541,11 @@ class Mastodon_api
 
     /**
      * getSingleScheduledStatus Hydrate a scheduled Status from API reply
-     * @param $statusParams
+     * @param $statusParams array
-     * @param $account
+     * @param $account MastodonAccount
      * @return Status
      */
-    public function getSingleScheduledStatus($statusParams, $account)
+    public function getSingleScheduledStatus(array $statusParams, MastodonAccount $account): Status
     {
 
         $status = new Status();
@@ -1578,10 +1617,10 @@ class Mastodon_api
 
     /**
      * getSingleAttachment Hydrate an Attachment from API reply
-     * @param $mediaParams
+     * @param $mediaParams array
      * @return Attachment
      */
-    public function getSingleAttachment($mediaParams)
+    public function getSingleAttachment(array $mediaParams): Attachment
     {
 
         $attachment = new Attachment();

src/SocialEntity/Application.php

@@ -6,10 +6,8 @@ namespace App\SocialEntity;
 class Application
 {
 
-    /** @var string */
+    private string $name;
-    private $name;
+    private string $website;
-    /** @var string */
-    private $website;
 
     /**
      * @return string

src/SocialEntity/Attachment.php

@@ -5,22 +5,15 @@ namespace App\SocialEntity;
 
 class Attachment
 {
-    /** @var string */
+
-    private $id;
+    private string $id;
-    /** @var string */
+    private string $type;
-    private $type;
+    private string $url;
-    /** @var string */
+    private string $remote_url;
-    private $url;
+    private string $preview_url;
-    /** @var string */
+    private string $text_url;
-    private $remote_url;
+    private string $meta;
-    /** @var string */
+    private string $description;
-    private $preview_url;
-    /** @var string */
-    private $text_url;
-    /** @var string */
-    private $meta;
-    /** @var string */
-    private $description;
 
     /**
      * @return string

src/SocialEntity/Card.php

@@ -5,30 +5,18 @@ namespace App\SocialEntity;
 
 class Card
 {
-    /** @var string */
+    private string $url;
-    private $url;
+    private string $title;
-    /** @var string */
+    private string $description;
-    private $title;
+    private string $image;
-    /** @var string */
+    private string $type;
-    private $description;
+    private string $author_name;
-    /** @var string */
+    private string $author_url;
-    private $image;
+    private string $provider_name;
-    /** @var string */
+    private string $provider_url;
-    private $type;
+    private string $html;
-    /** @var string */
+    private int $width;
-    private $author_name;
+    private int $height;
-    /** @var string */
-    private $author_url;
-    /** @var string */
-    private $provider_name;
-    /** @var string */
-    private $provider_url;
-    /** @var string */
-    private $html;
-    /** @var int */
-    private $width;
-    /** @var int */
-    private $height;
 
     /**
      * @return string
@@ -222,5 +210,4 @@ class Card
         $this->height = $height;
     }
 
-
 }

src/SocialEntity/Client.php

@@ -3,20 +3,17 @@
 namespace App\SocialEntity;
 
 
+use App\Security\MastodonAccount;
+
 class Client
 {
 
-    private $id;
+    private string $id;
-
+    private string $host;
-    private $host;
+    private string $client_id;
-
+    private string $client_secret;
-    private $client_id;
+    private MastodonAccount $account;
-
+    private string $code;
-    private $client_secret;
-
-    private $account;
-
-    private $code;
 
     public function getId(): ?int
     {

src/SocialEntity/Compose.php

@@ -3,55 +3,52 @@
 namespace App\SocialEntity;
 
 use DateTime;
-use DateTimeInterface;
+
-use Doctrine\Common\Collections\ArrayCollection;
 
 
 class Compose
 {
 
-    private $id;
+    private string $id;
+    private ?string $content_warning = null;
+    private ?string $content = null;
 
-    private $content_warning;
+    private string $visibility;
+    private DateTime $created_at;
+    private DateTime $scheduled_at;
+    private DateTime $sent_at;
+    private bool $sensitive;
+    private ?string $in_reply_to_id = null;
 
-    private $content;
+    private string $timeZone;
+    /** @var PollOption[] */
+    private ?array $poll_options = null;
+    private ?int  $poll_expires_at = null;
+    private ?bool $poll_multiple = null;
 
-    private $visibility;
+    public function getAttachPoll(): ?bool
+    {
+        return $this->attach_poll;
+    }
 
-    private $created_at;
+    public function setAttachPoll(?bool $attach_poll): void
-
+    {
-    private $scheduled_at;
+        $this->attach_poll = $attach_poll;
-
+    }
-    private $sent_at;
+    private ?bool $attach_poll = null;
-
-    private $sensitive;
-
-    private $in_reply_to_id;
-
-    private $timeZone;
-
-    private $poll_options;
-    /** @var int */
-    private $poll_expires_at;
-    /** @var bool */
-    private $poll_multiple;
 
     public function __construct()
     {
-        $this->poll_options = new ArrayCollection();
+        $this->poll_options = array();
     }
 
-    /**
+
-     * @return mixed
+    public function getTimeZone(): string
-     */
-    public function getTimeZone()
     {
         return $this->timeZone;
     }
 
-    /**
+
-     * @param mixed $timeZone
-     */
     public function setTimeZone($timeZone): void
     {
         $this->timeZone = $timeZone;
@@ -63,7 +60,7 @@ class Compose
 
     public function getSent()
     {
-        return ($this->sent_at != null);
+        return ($this->sent_at != null && !empty($this->sent_at));
     }
 
     public function getId(): ?int
@@ -108,29 +105,23 @@ class Compose
     }
 
 
-    /**
+    public function getSensitive(): bool
-     * @return boolean
-     */
-    public function getSensitive()
     {
         return $this->sensitive;
     }
 
-    /**
-     * @param mixed $sensitive
-     */
     public function setSensitive(bool $sensitive): void
     {
         $this->sensitive = $sensitive;
     }
 
 
-    public function getCreatedAt(): ?DateTimeInterface
+    public function getCreatedAt(): ?DateTime
     {
         return $this->created_at;
     }
 
-    public function setCreatedAt(DateTimeInterface $created_at): self
+    public function setCreatedAt(DateTime $created_at): self
     {
         $this->created_at = $created_at;
 
@@ -161,41 +152,29 @@ class Compose
         return $this;
     }
 
-    /**
+
-     * @return ArrayCollection|null
+
-     */
+    public function getPollOptions(): ?array
-    public function getPollOptions(): ?ArrayCollection
     {
         return $this->poll_options;
     }
 
-    /**
+
-     * @param ArrayCollection $poll_options
+    public function setPollOptions(?array $poll_options): void
-     */
-    public function setPollOptions(?ArrayCollection $poll_options): void
     {
         $this->poll_options = $poll_options;
     }
 
-    /**
-     * @return int
-     */
     public function getPollExpiresAt(): ?int
     {
         return $this->poll_expires_at;
     }
 
-    /**
-     * @param int $poll_expires_at
-     */
     public function setPollExpiresAt(?int $poll_expires_at): void
     {
         $this->poll_expires_at = $poll_expires_at;
     }
 
-    /**
-     * @return bool
-     */
     public function isPollMultiple(): ?bool
     {
         return $this->poll_multiple;

src/SocialEntity/CustomField.php

@@ -3,20 +3,21 @@
 namespace App\SocialEntity;
 
 
-use DateTimeInterface;
+use App\Security\MastodonAccount;
+use DateTime;
 
 class CustomField
 {
 
-    private $id;
+    private string $id;
 
-    private $name;
+    private string $name;
 
-    private $value;
+    private string $value;
 
-    private $verified_at;
+    private \DateTime $verified_at;
 
-    private $mastodonAccount;
+    private MastodonAccount $mastodonAccount;
 
 
     public function __construct()
@@ -40,12 +41,12 @@ class CustomField
         return $this;
     }
 
-    public function getVerifiedAt(): ?DateTimeInterface
+    public function getVerifiedAt(): ?DateTime
     {
         return $this->verified_at;
     }
 
-    public function setVerifiedAt(?DateTimeInterface $verified_at): self
+    public function setVerifiedAt(?DateTime $verified_at): self
     {
         $this->verified_at = $verified_at;
 

src/SocialEntity/Emoji.php

@@ -3,19 +3,21 @@
 namespace App\SocialEntity;
 
 
+use App\Security\MastodonAccount;
+
 class Emoji
 {
-    private $id;
+    private string $id;
 
-    private $shortcode;
+    private string $shortcode;
 
-    private $static_url;
+    private string $static_url;
 
-    private $url;
+    private string $url;
 
-    private $visible_in_picker;
+    private bool $visible_in_picker;
 
-    private $mastodonAccount;
+    private MastodonAccount $mastodonAccount;
 
 
     public function __construct()

src/SocialEntity/Instance.php

@@ -0,0 +1,225 @@
+<?php
+
+namespace App\SocialEntity;
+
+class Statuses {
+    private int $max_characters = 500;
+    private int $max_media_attachments = 4;
+    private int $characters_reserved_per_url = 23;
+    public function getMaxCharacters(): int
+    {
+        return $this->max_characters;
+    }
+
+    public function setMaxCharacters(int $max_characters): void
+    {
+        $this->max_characters = $max_characters;
+    }
+
+    public function getMaxMediaAttachments(): int
+    {
+        return $this->max_media_attachments;
+    }
+
+    public function setMaxMediaAttachments(int $max_media_attachments): void
+    {
+        $this->max_media_attachments = $max_media_attachments;
+    }
+
+    public function getCharactersReservedPerUrl(): int
+    {
+        return $this->characters_reserved_per_url;
+    }
+
+    public function setCharactersReservedPerUrl(int $characters_reserved_per_url): void
+    {
+        $this->characters_reserved_per_url = $characters_reserved_per_url;
+    }
+}
+
+class MediaAttachments {
+    private array $supported_mime_types = ["image/jpeg","image/png","image/gif","image/heic","image/heif","image/webp","image/avif","video/webm","video/mp4","video/quicktime","video/ogg","audio/wave","audio/wav","audio/x-wav","audio/x-pn-wave","audio/vnd.wave","audio/ogg","audio/vorbis","audio/mpeg","audio/mp3","audio/webm","audio/flac","audio/aac","audio/m4a","audio/x-m4a","audio/mp4","audio/3gpp","video/x-ms-asf"];
+    private int $image_size_limit = 16777216;
+    private int $image_matrix_limit = 33177600;
+    private int $video_size_limit = 103809024;
+    private int $video_frame_rate_limit = 120;
+    private int $video_matrix_limit = 8294400;
+    public function getSupportedMimeTypes(): array
+    {
+        return $this->supported_mime_types;
+    }
+
+    public function setSupportedMimeTypes(array $supported_mime_types): void
+    {
+        $this->supported_mime_types = $supported_mime_types;
+    }
+
+    public function getSupportedFiles() : string {
+        $values = "/(\.|\/)(gif|jpe?g|apng|png|mp4|mp3|avi|mov|webm|wmv|flv|wav|ogg)$/i";
+        if(isset($this->supported_mime_types) && count($this->supported_mime_types) >0) {
+            $values = "/(\.|\/)(";
+            foreach ($this->supported_mime_types as $value) {
+                $cleanedValue = preg_replace("#(image/)|(video/)|(audio/)#","",$value,);
+                if(!str_contains($cleanedValue, '.') && !str_contains($cleanedValue, '-')) {
+                    $values .= $cleanedValue.'|';
+                }
+            }
+            $values .= "jpg)$/i";
+        }
+        return $values;
+    }
+    public function getImageSizeLimit(): int
+    {
+        return $this->image_size_limit;
+    }
+
+    public function setImageSizeLimit(int $image_size_limit): void
+    {
+        $this->image_size_limit = $image_size_limit;
+    }
+
+    public function getImageMatrixLimit(): int
+    {
+        return $this->image_matrix_limit;
+    }
+
+    public function setImageMatrixLimit(int $image_matrix_limit): void
+    {
+        $this->image_matrix_limit = $image_matrix_limit;
+    }
+
+    public function getVideoSizeLimit(): int
+    {
+        return $this->video_size_limit;
+    }
+
+    public function setVideoSizeLimit(int $video_size_limit): void
+    {
+        $this->video_size_limit = $video_size_limit;
+    }
+
+    public function getVideoFrameRateLimit(): int
+    {
+        return $this->video_frame_rate_limit;
+    }
+
+    public function setVideoFrameRateLimit(int $video_frame_rate_limit): void
+    {
+        $this->video_frame_rate_limit = $video_frame_rate_limit;
+    }
+
+    public function getVideoMatrixLimit(): int
+    {
+        return $this->video_matrix_limit;
+    }
+
+    public function setVideoMatrixLimit(int $video_matrix_limit): void
+    {
+        $this->video_matrix_limit = $video_matrix_limit;
+    }
+}
+
+
+class Polls {
+    private int $max_options = 4;
+    private int $max_characters_per_option = 50;
+    private int $min_expiration = 300;
+    private int $max_expiration = 2629746;
+
+    public function getMaxOptions(): int
+    {
+        return $this->max_options;
+    }
+
+    public function setMaxOptions(int $max_options): void
+    {
+        $this->max_options = $max_options;
+    }
+
+    public function getMaxCharactersPerOption(): int
+    {
+        return $this->max_characters_per_option;
+    }
+
+    public function setMaxCharactersPerOption(int $max_characters_per_option): void
+    {
+        $this->max_characters_per_option = $max_characters_per_option;
+    }
+
+    public function getMinExpiration(): int
+    {
+        return $this->min_expiration;
+    }
+
+    public function setMinExpiration(int $min_expiration): void
+    {
+        $this->min_expiration = $min_expiration;
+    }
+
+    public function getMaxExpiration(): int
+    {
+        return $this->max_expiration;
+    }
+
+    public function setMaxExpiration(int $max_expiration): void
+    {
+        $this->max_expiration = $max_expiration;
+    }
+
+}
+
+class Configuration {
+    private Statuses $statuses;
+    private MediaAttachments $mediaAttachments;
+
+    public function getStatuses(): Statuses
+    {
+        return $this->statuses;
+    }
+
+    public function setStatuses(Statuses $statuses): void
+    {
+        $this->statuses = $statuses;
+    }
+
+    public function getMediaAttachments(): MediaAttachments
+    {
+        return $this->mediaAttachments;
+    }
+
+    public function setMediaAttachments(MediaAttachments $mediaAttachments): void
+    {
+        $this->mediaAttachments = $mediaAttachments;
+    }
+
+    public function getPolls(): Polls
+    {
+        return $this->polls;
+    }
+
+    public function setPolls(Polls $polls): void
+    {
+        $this->polls = $polls;
+    }
+    private Polls $polls;
+
+}
+
+
+class Instance
+{
+    private Configuration $configuration;
+
+    public function getConfiguration(): Configuration
+    {
+        return $this->configuration;
+    }
+
+    public function setConfiguration(Configuration $configuration): void
+    {
+        $this->configuration = $configuration;
+    }
+
+}
+
+

src/SocialEntity/Mention.php

@@ -4,14 +4,10 @@ namespace App\SocialEntity;
 
 class Mention
 {
-    /** @var string */
+    private string $url;
-    private $url;
+    private string $username;
-    /** @var string */
+    private string $acct;
-    private $username;
+    private string $id;
-    /** @var string */
-    private $acct;
-    /** @var string */
-    private $id;
 
 
     /**

src/SocialEntity/Notification.php

@@ -3,20 +3,16 @@
 namespace App\SocialEntity;
 
 
+use App\Security\MastodonAccount;
 use DateTime;
 
 class Notification
 {
-    /** @var string */
+    private string $id;
-    private $id;
+    private string $type;
-    /** @var string */
+    private DateTime $created_at;
-    private $type;
+    private MastodonAccount $account;
-    /** @var DateTime */
+    private Status $status;
-    private $created_at;
-    /** @var MastodonAccount */
-    private $account;
-    /** @var Status */
-    private $status;
 
 
     /**

src/SocialEntity/Poll.php

@@ -8,26 +8,19 @@ use DateTime;
 
 class Poll
 {
-    /** @var string */
+    private string $id;
-    private $id;
+    private DateTime $expires_at;
-    /** @var DateTime */
+    private bool $expired;
-    private $expires_at;
+    private bool $multiple;
-    /** @var bool */
+    private int $votes_count;
-    private $expired;
+    private int $voters_count;
-    /** @var bool */
+    private bool $voted;
-    private $multiple;
-    /** @var int */
-    private $votes_count;
-    /** @var int */
-    private $voters_count;
-    /** @var bool */
-    private $voted;
     /** @var int[] */
-    private $own_votes;
+    private array $own_votes;
     /** @var PollOption[] */
-    private $options;
+    private array $options;
     /** @var Emoji[] */
-    private $emojis;
+    private array $emojis;
 
     /**
      * @return string

src/SocialEntity/PollOption.php

@@ -6,38 +6,27 @@ namespace App\SocialEntity;
 
 class PollOption
 {
-    /** @var string */
+    private ?string $title = null;
-    private $title;
+    private ?int $votes_count = null;
-    /** @var int */
+
-    private $votes_count;
 
-    /**
-     * @return string
-     */
     public function getTitle(): ?string
     {
         return $this->title;
     }
 
-    /**
-     * @param string $title
-     */
     public function setTitle(?string $title): void
     {
         $this->title = $title;
     }
 
-    /**
+
-     * @return int
-     */
     public function getVotesCount(): ?int
     {
         return $this->votes_count;
     }
 
-    /**
+
-     * @param int $votes_count
-     */
     public function setVotesCount(?int $votes_count): void
     {
         $this->votes_count = $votes_count;

src/SocialEntity/Status.php

@@ -3,66 +3,43 @@
 namespace App\SocialEntity;
 
 
+use App\Security\MastodonAccount;
 use DateTime;
 
 class Status
 {
-    /** @var string */
+    private string $id;
-    private $id;
+    private string $uri;
-    /** @var string */
+    private string $url;
-    private $uri;
+    private MastodonAccount $account;
-    /** @var string */
+    private ?string $in_reply_to_id;
-    private $url;
+    private ?string $in_reply_to_account_id;
-    /** @var MastodonAccount */
+    private ?string $content;
-    private $account;
+    private DateTime $created_at;
-    /** @var string */
+    private DateTime $scheduled_at;
-    private $in_reply_to_id;
-    /** @var string */
-    private $in_reply_to_account_id;
-    /** @var string */
-    private $content;
-    /** @var DateTime */
-    private $created_at;
-    /** @var DateTime */
-    private $scheduled_at;
     /** @var Emoji[] */
-    private $emojis = [];
+    private array $emojis = [];
-    /** @var int */
+    private int $replies_count;
-    private $replies_count;
+    private int $reblogs_count;
-    /** @var int */
+    private int $favourites_count;
-    private $reblogs_count;
+    private bool $reblogged;
-    /** @var int */
+    private bool $favourited;
-    private $favourites_count;
+    private bool $muted;
-    /** @var boolean */
+    private bool $sensitive_;
-    private $reblogged;
+    private ?string $spoiler_text;
-    /** @var boolean */
+    private string $visibility;
-    private $favourited;
-    /** @var boolean */
-    private $muted;
-    /** @var boolean */
-    private $sensitive_;
-    /** @var string */
-    private $spoiler_text;
-    /** @var string */
-    private $visibility;
     /** @var Attachment[] */
-    private $media_attachments = [];
+    private array $media_attachments = [];
     /** @var Mention[] */
-    private $mentions = [];
+    private array $mentions = [];
     /** @var Tag[] */
-    private $tags = [];
+    private array $tags = [];
-    /** @var Card */
+    private Card $card;
-    private $card;
+    private Application $application;
-    /** @var Application */
+    private string  $language;
-    private $application;
+    private bool $pinned;
-    /** @var string */
+    private Status $reblog;
-    private $language;
+    private Poll $poll;
-    /** @var boolean */
-    private $pinned;
-    /** @var Status */
-    private $reblog;
-    /** @var Poll */
-    private $poll;
 
     /**
      * @return string
@@ -129,15 +106,15 @@ class Status
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getInReplyToId(): string
+    public function getInReplyToId(): ?string
     {
         return $this->in_reply_to_id;
     }
 
     /**
-     * @param string $in_reply_to_id
+     * @param mixed $in_reply_to_id
      */
     public function setInReplyToId(?string $in_reply_to_id): void
     {
@@ -153,7 +130,7 @@ class Status
     }
 
     /**
-     * @param string $in_reply_to_account_id
+     * @param mixed $in_reply_to_account_id
      */
     public function setInReplyToAccountId(?string $in_reply_to_account_id): void
     {
@@ -161,17 +138,17 @@ class Status
     }
 
     /**
-     * @return string
+     * @return string|null
      */
-    public function getContent(): string
+    public function getContent(): ?string
     {
         return $this->content;
     }
 
     /**
-     * @param string $content
+     * @param mixed $content
      */
-    public function setContent(string $content): void
+    public function setContent(?string $content): void
     {
         $this->content = $content;
     }
@@ -185,7 +162,7 @@ class Status
     }
 
     /**
-     * @param DateTime $created_at
+     * @param mixed $created_at
      */
     public function setCreatedAt(?DateTime $created_at): void
     {
@@ -346,7 +323,7 @@ class Status
     }
 
     /**
-     * @param string $spoiler_text
+     * @param mixed $spoiler_text
      */
     public function setSpoilerText(?string $spoiler_text): void
     {

src/SocialEntity/Tag.php

@@ -6,14 +6,10 @@ namespace App\SocialEntity;
 class Tag
 {
 
-    /** @var string */
+    private string $name;
-    private $name;
+    private string $url;
-    /** @var string */
+    private array $history = [];
-    private $url;
+    private Status $status;
-    /** @var array */
-    private $history = [];
-    /** @var Status */
-    private $status;
 
     /**
      * @return string

src/Twig/AppExtension.php

@@ -8,7 +8,7 @@
 
 namespace App\Twig;
 
-use App\SocialEntity\MastodonAccount;
+use App\Security\MastodonAccount;
 use App\SocialEntity\Status;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
@@ -66,6 +66,14 @@ class AppExtension extends AbstractExtension
                 return "Català";
             case "ar":
                 return "العربية";
+            case "ja":
+                return "日本語";
+            case "pl":
+                return "Polski";
+            case "ru":
+                return "Русский";
+            case "uk":
+                return "Украïна";
 
         }
     }

symfony.lock

@@ -1,166 +1,140 @@
 {
     "craue/formflow-bundle": {
-        "version": "3.2.0"
+        "version": "3.7.0"
-    },
-    "doctrine/annotations": {
-        "version": "1.0",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "master",
-            "version": "1.0",
-            "ref": "cb4152ebcadbe620ea2261da1a1c5a9b8cea7672"
-        },
-        "files": [
-            "config/routes/annotations.yaml"
-        ]
-    },
-    "doctrine/collections": {
-        "version": "1.6.4"
-    },
-    "doctrine/lexer": {
-        "version": "1.1.0"
     },
     "friendsofsymfony/jsrouting-bundle": {
-        "version": "2.3",
+        "version": "3.5",
         "recipe": {
             "repo": "github.com/symfony/recipes-contrib",
-            "branch": "master",
+            "branch": "main",
             "version": "2.3",
             "ref": "a9f2e49180f75cdc71ae279a929c4b2e0638de84"
-        },
+        }
-        "files": [
-            "config/routes/fos_js_routing.yaml"
-        ]
     },
-    "php": {
+    "phpunit/phpunit": {
-        "version": "7.3"
+        "version": "9.6",
-    },
-    "psr/cache": {
-        "version": "1.0.1"
-    },
-    "psr/container": {
-        "version": "1.0.0"
-    },
-    "psr/log": {
-        "version": "1.1.0"
-    },
-    "sensio/framework-extra-bundle": {
-        "version": "5.2",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "5.2",
+            "version": "9.6",
-            "ref": "fb7e19da7f013d0d422fa9bce16f5c510e27609b"
+            "ref": "7364a21d87e658eb363c5020c072ecfdc12e2326"
         },
         "files": [
-            "config/packages/sensio_framework_extra.yaml"
+            "./.env.test",
+            "./phpunit.xml.dist",
+            "./tests/bootstrap.php"
         ]
     },
-    "symfony/asset": {
+    "symfony/asset-mapper": {
-        "version": "v4.3.3"
+        "version": "7.0",
-    },
+        "recipe": {
-    "symfony/cache": {
+            "repo": "github.com/symfony/recipes",
-        "version": "v4.3.3"
+            "branch": "main",
-    },
+            "version": "6.4",
-    "symfony/cache-contracts": {
+            "ref": "6c28c471640cc2c6e60812ebcb961c526ef8997f"
-        "version": "v1.1.5"
+        },
-    },
+        "files": [
-    "symfony/config": {
+            "./assets/app.js",
-        "version": "v4.3.3"
+            "./assets/styles/app.css",
+            "./config/packages/asset_mapper.yaml",
+            "./importmap.php"
+        ]
     },
     "symfony/console": {
-        "version": "3.3",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "3.3",
+            "version": "5.3",
-            "ref": "482d233eb8de91ebd042992077bbd5838858890c"
+            "ref": "1781ff40d8a17d87cf53f8d4cf0c8346ed2bb461"
         },
         "files": [
-            "bin/console",
+            "./bin/console"
-            "config/bootstrap.php"
         ]
     },
-    "symfony/debug": {
+    "symfony/debug-bundle": {
-        "version": "v4.3.3"
+        "version": "7.0",
-    },
+        "recipe": {
-    "symfony/dependency-injection": {
+            "repo": "github.com/symfony/recipes",
-        "version": "v4.3.3"
+            "branch": "main",
-    },
+            "version": "5.3",
-    "symfony/dotenv": {
+            "ref": "5aa8aa48234c8eb6dbdd7b3cd5d791485d2cec4b"
-        "version": "v4.3.3"
+        },
-    },
+        "files": [
-    "symfony/event-dispatcher": {
+            "./config/packages/debug.yaml"
-        "version": "v4.3.3"
+        ]
-    },
-    "symfony/event-dispatcher-contracts": {
-        "version": "v1.1.5"
-    },
-    "symfony/filesystem": {
-        "version": "v4.3.3"
-    },
-    "symfony/finder": {
-        "version": "v4.3.3"
     },
     "symfony/flex": {
-        "version": "1.0",
+        "version": "2.4",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
             "version": "1.0",
-            "ref": "dc3fc2e0334a4137c47cfd5a3ececc601fa61a0b"
+            "ref": "146251ae39e06a95be0fe3d13c807bcf3938b172"
         },
         "files": [
-            ".env"
+            "./.env"
         ]
     },
-    "symfony/form": {
-        "version": "v4.3.3"
-    },
     "symfony/framework-bundle": {
-        "version": "4.2",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "4.2",
+            "version": "7.0",
-            "ref": "61ad963f28c091b8bb9449507654b9c7d8bbb53c"
+            "ref": "6356c19b9ae08e7763e4ba2d9ae63043efc75db5"
         },
         "files": [
-            "config/bootstrap.php",
+            "./config/packages/cache.yaml",
-            "config/packages/cache.yaml",
+            "./config/packages/framework.yaml",
-            "config/packages/framework.yaml",
+            "./config/preload.php",
-            "config/packages/test/framework.yaml",
+            "./config/routes/framework.yaml",
-            "config/services.yaml",
+            "./config/services.yaml",
-            "public/index.php",
+            "./public/index.php",
-            "src/Controller/.gitignore",
+            "./src/Controller/.gitignore",
-            "src/Kernel.php"
+            "./src/Kernel.php"
         ]
     },
-    "symfony/http-foundation": {
+    "symfony/maker-bundle": {
-        "version": "v4.3.3"
+        "version": "1.59",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "1.0",
+            "ref": "fadbfe33303a76e25cb63401050439aa9b1a9c7f"
+        }
     },
-    "symfony/http-kernel": {
+    "symfony/monolog-bundle": {
-        "version": "v4.3.3"
+        "version": "3.10",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "3.7",
+            "ref": "aff23899c4440dd995907613c1dd709b6f59503f"
+        },
+        "files": [
+            "./config/packages/monolog.yaml"
+        ]
     },
-    "symfony/inflector": {
+    "symfony/notifier": {
-        "version": "v4.3.3"
+        "version": "7.0",
-    },
+        "recipe": {
-    "symfony/intl": {
+            "repo": "github.com/symfony/recipes",
-        "version": "v4.3.3"
+            "branch": "main",
-    },
+            "version": "5.0",
-    "symfony/mime": {
+            "ref": "178877daf79d2dbd62129dd03612cb1a2cb407cc"
-        "version": "v4.3.3"
+        },
-    },
+        "files": [
-    "symfony/options-resolver": {
+            "./config/packages/notifier.yaml"
-        "version": "v4.3.3"
+        ]
     },
     "symfony/phpunit-bridge": {
         "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
             "branch": "main",
-            "version": "5.1",
+            "version": "6.3",
-            "ref": "2f91477d6efaed3fb857db87480f7d07d31cbb3e"
+            "ref": "a411a0480041243d97382cac7984f7dce7813c08"
         },
         "files": [
             "./.env.test",
@@ -169,152 +143,101 @@
             "./tests/bootstrap.php"
         ]
     },
-    "symfony/polyfill-intl-icu": {
-        "version": "v1.12.0"
-    },
-    "symfony/polyfill-intl-idn": {
-        "version": "v1.12.0"
-    },
-    "symfony/polyfill-intl-messageformatter": {
-        "version": "v1.15.0"
-    },
-    "symfony/polyfill-mbstring": {
-        "version": "v1.12.0"
-    },
-    "symfony/polyfill-php72": {
-        "version": "v1.12.0"
-    },
-    "symfony/polyfill-php73": {
-        "version": "v1.12.0"
-    },
-    "symfony/process": {
-        "version": "v4.3.3"
-    },
-    "symfony/property-access": {
-        "version": "v4.3.3"
-    },
     "symfony/routing": {
-        "version": "4.2",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "4.2",
+            "version": "7.0",
-            "ref": "4c107a8d23a16b997178fbd4103b8d2f54f688b7"
+            "ref": "21b72649d5622d8f7da329ffb5afb232a023619d"
         },
         "files": [
-            "config/packages/dev/routing.yaml",
+            "./config/packages/routing.yaml",
-            "config/packages/routing.yaml",
+            "./config/routes.yaml"
-            "config/packages/test/routing.yaml",
-            "config/routes.yaml"
         ]
     },
     "symfony/security-bundle": {
-        "version": "3.3",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "3.3",
+            "version": "6.4",
-            "ref": "e5a0228251d1dd2bca4c8ef918e14423c06db625"
+            "ref": "2ae08430db28c8eb4476605894296c82a642028f"
         },
         "files": [
-            "config/packages/security.yaml"
+            "./config/packages/security.yaml",
+            "./config/routes/security.yaml"
         ]
     },
-    "symfony/security-core": {
+    "symfony/stimulus-bundle": {
-        "version": "v4.3.3"
+        "version": "2.17",
-    },
+        "recipe": {
-    "symfony/security-csrf": {
+            "repo": "github.com/symfony/recipes",
-        "version": "v4.3.3"
+            "branch": "main",
-    },
+            "version": "2.13",
-    "symfony/security-guard": {
+            "ref": "6acd9ff4f7fd5626d2962109bd4ebab351d43c43"
-        "version": "v4.3.3"
+        },
-    },
+        "files": [
-    "symfony/security-http": {
+            "./assets/bootstrap.js",
-        "version": "v4.3.3"
+            "./assets/controllers.json",
-    },
+            "./assets/controllers/hello_controller.js"
-    "symfony/serializer": {
+        ]
-        "version": "v4.3.3"
-    },
-    "symfony/service-contracts": {
-        "version": "v1.1.5"
     },
     "symfony/translation": {
-        "version": "3.3",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "3.3",
+            "version": "6.3",
-            "ref": "2ad9d2545bce8ca1a863e50e92141f0b9d87ffcd"
+            "ref": "e28e27f53663cc34f0be2837aba18e3a1bef8e7b"
         },
         "files": [
-            "config/packages/translation.yaml",
+            "./config/packages/translation.yaml",
-            "translations/.gitignore"
+            "./translations/.gitignore"
         ]
     },
-    "symfony/translation-contracts": {
-        "version": "v1.1.5"
-    },
-    "symfony/twig-bridge": {
-        "version": "v4.3.3"
-    },
     "symfony/twig-bundle": {
-        "version": "3.3",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "3.3",
+            "version": "6.4",
-            "ref": "369b5b29dc52b2c190002825ae7ec24ab6f962dd"
+            "ref": "cab5fd2a13a45c266d45a7d9337e28dee6272877"
         },
         "files": [
-            "config/packages/twig.yaml",
+            "./config/packages/twig.yaml",
-            "config/routes/dev/twig.yaml",
+            "./templates/base.html.twig"
-            "templates/base.html.twig"
         ]
     },
+    "symfony/ux-turbo": {
+        "version": "v2.17.0"
+    },
     "symfony/validator": {
-        "version": "4.3",
+        "version": "7.0",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "4.3",
+            "version": "7.0",
-            "ref": "d902da3e4952f18d3bf05aab29512eb61cabd869"
+            "ref": "8c1c4e28d26a124b0bb273f537ca8ce443472bfd"
         },
         "files": [
-            "config/packages/test/validator.yaml",
+            "./config/packages/validator.yaml"
-            "config/packages/validator.yaml"
         ]
     },
-    "symfony/var-exporter": {
+    "symfony/web-profiler-bundle": {
-        "version": "v4.3.3"
+        "version": "7.0",
-    },
-    "symfony/web-server-bundle": {
-        "version": "3.3",
         "recipe": {
             "repo": "github.com/symfony/recipes",
-            "branch": "master",
+            "branch": "main",
-            "version": "3.3",
+            "version": "6.1",
-            "ref": "dae9b39fd6717970be7601101ce5aa960bf53d9a"
+            "ref": "e42b3f0177df239add25373083a564e5ead4e13a"
-        }
-    },
-    "symfony/yaml": {
-        "version": "v4.3.3"
-    },
-    "twig/extensions": {
-        "version": "1.0",
-        "recipe": {
-            "repo": "github.com/symfony/recipes",
-            "branch": "master",
-            "version": "1.0",
-            "ref": "a86723ee8d8b2f9437c8ce60a5546a1c267da5ed"
         },
         "files": [
-            "config/packages/twig_extensions.yaml"
+            "./config/packages/web_profiler.yaml",
+            "./config/routes/web_profiler.yaml"
         ]
     },
-    "twig/twig": {
+    "twig/extra-bundle": {
-        "version": "v2.11.3"
+        "version": "v3.9.3"
-    },
-    "willdurand/jsonp-callback-validator": {
-        "version": "v1.1.0"
     }
 }

templates/fediplan/Ajax/layout.html.twig

@@ -14,10 +14,27 @@
                             {% if status.spoilerText is defined %}
                                 <b>{{ status.spoilerText  }}</b> <br/>
                             {% endif %}
-                            {{ status.content | nl2br }}
+                            {% if status.content is not null %}
+                                {{ status.content | nl2br }}
+                            {% endif %}
                         </p>
                     </div>
                 </div>
+                {% if status.getMediaAttachments() is not null and status.getMediaAttachments() | length > 0%}
+                <div class="card-horizontal" style=" display: flex;flex: 1 1 auto;">
+                    <div class="img-square-wrapper">
+                        {% for media in  status.getMediaAttachments() %}
+                            <img class="" width="150" src="{{ media.url  }}"
+                                 style=" border-radius: 5%; margin: 5px;"
+                                 {% if media.getDescription is not null %}
+                                     alt="{{ media.getDescription() }}"
+                                     title="{{ media.getDescription() }}"
+                                 {% endif %}
+                            />
+                        {% endfor %}
+                    </div>
+                </div>
+                {% endif %}
                 <div class="card-footer">
                     <small class="text-muted">
                         {% if status.visibility == "public" %}
@@ -32,7 +49,12 @@
                     </small> - {{ status.scheduledAt | date('d/m/y H:i')   }}
                     <button class="btn btn-danger small" data-record-id="{{ status.getId() }}"  style="position: absolute;right: 5px;bottom: 5px;"
 
-                            data-record-title="{{ status.content }} - {{ status.scheduledAt | date('d/m/y H:m')  }}"
+                            {% if status.content is not null %}
+                                data-record-title="{{ status.content }} - {{ status.scheduledAt | date('d/m/y H:m')  }}"
+                            {% else %}
+                                data-record-title="{{ status.scheduledAt | date('d/m/y H:m')  }}"
+                            {% endif %}
+
                             data-toggle="modal" data-target="#confirm-delete"
                     >X</button>
                 </div>

templates/fediplan/index.html.twig

@@ -75,7 +75,7 @@
     <blockquote class="blockquote text-center" style="margin-top: 50px;">
         <p class="mb-0">{{ 'page.index.about'|trans |raw}}</p>
         <p>{{ 'page.index.data'|trans |raw}}</p>
-        <footer class="blockquote-footer">FediPlan 1.1.1</footer>
+        <footer class="blockquote-footer">FediPlan 1.2</footer>
     </blockquote>
 
     {{ form_end(form) }}

templates/fediplan/schedule.html.twig

@@ -3,6 +3,7 @@
 {% block title %}{{ 'common.schedule'|trans }}{% endblock %}
 
 {% block content %}
+    {% set instanceConfiguration = app.session.get("instance").getConfiguration() %}
     {% include 'nav.html.twig' %}
     <h3>Schedule for <i><img class="" width="30" src="{{ app.user.avatar }}"  alt="{{ app.user.avatar }}"/> {{ convertAccountEmoji(app.user, app.user.displayName) | raw }} (@{{ app.user.acct}}@{{ instance }})</i></h3>
 
@@ -55,7 +56,8 @@
             <div class="row">
                 <div class="col-md-4 col-4" style="margin-top: 20px;">
                     <div class="form-inline has-feedback">
-                        <label for="count">{{ 'common.counter'|trans }}</label>&nbsp;&nbsp;<span id="count" class="form-control">0</span>
+                        <label for="count">{{ 'common.counter'|trans }}</label>&nbsp;&nbsp;<span id="count" >0</span>
+                        &nbsp;/{{ instanceConfiguration.statuses.maxCharacters }}
                     </div>
                 </div>
                 <div class=" col-md-4 col-4" style="margin-top: 20px;">
@@ -179,7 +181,7 @@
             <!-- The file upload form used as target for the file upload widget -->
             <form
                     id="fileupload"
-                    action="https://{{ instance }}/api/v1/media"
+                    action="https://{{ instance }}/api/v2/media"
                     method="POST"
                     enctype="multipart/form-data"
             >
@@ -274,13 +276,17 @@
               </td>
               <td>
                   {% if (!o.options.autoUpload && o.options.edit && o.options.loadImageFileTypes.test(file.type)) { %}
-                    <button class="btn btn-success edit" data-index="{%=i%}" disabled>
+                    <button class="btn btn-success edit" data-index="{%=i%}" disabled
+                            data-toggle="tooltip" data-placement="top" title="{% endverbatim %}{{ 'page.schedule.form.edit_media'|trans }} {% verbatim %}"
+                    >
                         <i class="glyphicon glyphicon-edit"></i>
                         <span>{% endverbatim %}{{ 'common.edit'|trans }} {% verbatim %}</span>
                     </button>
                   {% } %}
                   {% if (!i && !o.options.autoUpload) { %}
-                      <button class="btn btn-primary start" disabled>
+                      <button class="btn btn-primary start" disabled
+                                data-toggle="tooltip" data-placement="top" title="{% endverbatim %}{{ 'page.schedule.form.upload_media'|trans }} {% verbatim %}"
+                      >
                           <i class="glyphicon glyphicon-upload"></i>
                           <span> {% endverbatim %} {{ 'common.start'|trans }} {% verbatim %} </span>
                       </button>
@@ -431,7 +437,7 @@
                     $('#media_container').append($(content));
 
                 },
-                acceptFileTypes: /(\.|\/)(gif|jpe?g|apng|png|mp4|mp3|avi|mov|webm|wmv|flv|wav|ogg)$/i
+                acceptFileTypes: {{ app.session.get("instance").getConfiguration().getMediaAttachments().getSupportedFiles() }}
             });
 
             // Enable iframe cross-domain access via redirect option:
@@ -473,10 +479,13 @@
             $('#poll_switch').click(function (e) {
                 if($('#poll_container').hasClass("d-none") ){
                     $('#poll_container').removeClass("d-none");
+                    $('#compose_attach_poll').val(1);
                 }else{
                     $('#poll_container').addClass("d-none");
+                    $('#compose_attach_poll').val(0);
                 }
             });
+
             var $collectionHolder;
 
             // setup an "add a tag" link
@@ -501,6 +510,10 @@
                 var $newFormLi = $('<li></li>').append(newForm);
                 $newLinkLi.before($newFormLi);
                 addOptionFormDeleteLink($newFormLi);
+                var optionsCount = $collectionHolder.find('input').length;
+                if(optionsCount >= {{ app.session.get("instance").getConfiguration().polls.maxOptions }}) {
+                    $addTagButton.hide();
+                }
             }
 
             function addOptionFormDeleteLink($tagFormLi) {
@@ -508,6 +521,10 @@
                 $tagFormLi.append($removeFormButton);
                 $removeFormButton.on('click', function(e) {
                     $tagFormLi.remove();
+                    var optionsCount = $collectionHolder.find('input').length;
+                    if(optionsCount < {{ app.session.get("instance").getConfiguration().polls.maxOptions }}) {
+                        $addTagButton.show();
+                    }
                 });
             }
 
@@ -527,8 +544,17 @@
                 searchPosition: "bottom",
                 search: false
             });
-            var timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+            var timezone;
+
+            if(!!sessionStorage.getItem('timeZone')) {
+                timezone = sessionStorage.getItem('timeZone');
+            } else {
+                timezone = Intl.DateTimeFormat().resolvedOptions().timeZone;
+            }
             $('#compose_timeZone').val(timezone);
+            $('#compose_timeZone').on('change', function () {
+                sessionStorage.setItem("timeZone", this.value);
+            });
             $(document).on('click', '.delete_media', function () {
                 var id = $(this).attr('data-id');
                 $('#media_container_' + id).remove();

templates/fediplan/scheduled.html.twig

@@ -76,7 +76,6 @@
                         $('#loader').addClass("d-none");
                     })
             }
-
         });
 
 

templates/nav.html.twig

@@ -54,6 +54,9 @@
                         <a class="dropdown-item"  href="{{ path(route, {'_locale':'pt-BR' }) }}">Brasil</a>
                         <a class="dropdown-item"  href="{{ path(route, {'_locale':'ca' }) }}">Català</a>
                         <a class="dropdown-item"  href="{{ path(route, {'_locale':'ja' }) }}">日本語</a>
+                        <a class="dropdown-item"  href="{{ path(route, {'_locale':'pl' }) }}">Polski</a>
+                        <a class="dropdown-item"  href="{{ path(route, {'_locale':'ru' }) }}">Русский</a>
+                        <a class="dropdown-item"  href="{{ path(route, {'_locale':'uk' }) }}">Украïна</a>
                     </div>
                 </li>
             </ul>

translations/fediplan+intl-icu.ca.yaml

@@ -1,4 +1,3 @@
----
 poll:
   duration_m: >-
     {minutes, plural, =0    {zero minuts} one   {un minut} other {# minuts} }

translations/fediplan+intl-icu.es.yaml

@@ -1,4 +1,3 @@
----
 poll:
   duration_m: >-
     {minutes, plural, =0    {cero minutos} one   {un minuto} other {# minutos} }

translations/fediplan+intl-icu.fr.yaml

@@ -1,4 +1,3 @@
----
 poll:
   duration_m: >-
     {minutes, plural, =0    {zéro minute} one   {une minute} other {# minutes} }

translations/fediplan+intl-icu.it.yaml

@@ -1,4 +1,3 @@
----
 poll:
   duration_m: >-
     {minutes, plural, =0    {zero minuti} one   {un minuto} other {# minuti} }

translations/fediplan+intl-icu.zh-CN.yaml

@@ -1,4 +1,3 @@
----
 poll:
   duration_m: >-
     {minutes, plural, =0    {零分钟} other {# 分钟} }

translations/fediplan.ca.yaml

@@ -24,8 +24,6 @@ common:
   counter: Comptador
   license: Llicència
   author: Autor/a
-  error: Error
-  no: "No"
   yes: "Sí"
   poll: Enquesta
 status:

translations/fediplan.de.yaml

@@ -2,8 +2,6 @@
 common:
   next: Weiter
   previous: Zurück
-  accounts: Accounts
-  login: Login
   schedule: Planen
   scheduled: Geplant
   logout: Ausloggen
@@ -17,7 +15,6 @@ common:
   cancel: Abbrechen
   delete: Löschen
   edit: Bearbeiten
-  start: Start
   proceed_confirm: Möchtest du fortfahren?
   start_upload: Starte Upload
   counter: Zähler

translations/fediplan.en.yaml

@@ -71,4 +71,6 @@ page:
       end_in: End in
       poll_item: Poll choice
       add_poll_item: Add a choice
-      remove_poll_item: Remove this choice
+      remove_poll_item: Remove this choice
+      edit_media: Edit locally the media
+      upload_media: Upload this media first, then you will be able to add a description.

translations/fediplan.es.yaml

@@ -24,8 +24,6 @@ common:
   counter: Contador
   license: Licencia
   author: Autor
-  error: Error
-  no: "No"
   yes: "Sí"
   poll: Encuesta
 status:

translations/fediplan.fr.yaml

@@ -30,10 +30,8 @@ common:
   poll: Sondage
 status:
   visibility:
-    public: Public
     unlisted: Non listé
     private: Privé
-    direct: Direct
 messages:
   login_authorization: Veuillez cliquer sur « Obtenir un code d’autorisation » afin d’obtenir un code d’autorisation. Puis copiez/collez-le dans le champ.
   authorization_get: Obtenir un code d’autorisation
@@ -67,7 +65,6 @@ page:
       scheduled_at: Planifié pour
       send: Envoyer
       add_files: Ajouter des fichiers …
-      multiple: Multiple
       end_in: Fin dans
       poll_item: Choix du sondage
       add_poll_item: Ajouter un choix

translations/fediplan.it.yaml

@@ -25,7 +25,6 @@ common:
   license: Licenza
   author: Autore
   error: Errore
-  no: "No"
   yes: "Si"
   poll: Sondaggio
 status:

translations/fediplan.nl.yaml

@@ -2,7 +2,6 @@
 common:
   next: Volgende
   previous: Vorige
-  accounts: Accounts
   login: Inloggen
   schedule: Inplannen
   scheduled: Ingepland
@@ -17,7 +16,6 @@ common:
   cancel: Annuleren
   delete: Verwijderen
   edit: Bewerken
-  start: Start
   proceed_confirm: Wil je doorgaan?
   start_upload: Beginnen met uploaden
   counter: Teller
@@ -31,7 +29,6 @@ status:
     public: Openbaar
     unlisted: Niet-genoteerd
     private: Privé
-    direct: Direct
 messages:
   login_authorization: Klik alstublieft op "Krijg een autorisatiecode" om je autorisatiecode te krijgen. Kopieer/plak vervolgens in het veld.
   authorization_get: Krijg een autorisatiecode

translations/fediplan.pl.yaml

@@ -1 +1,76 @@
 ---
+common:
+  next: Dalej
+  previous: Wstecz
+  accounts: Konta
+  login: Logowanie
+  schedule: Harmonogram
+  scheduled: Zaplanowane
+  logout: Wyloguj
+  about: O projekcie
+  support_my_work: Wspomóż moją pracę
+  about_fediplan: Bezpieczne planowanie wiadomości z Mastodon i Pleroma
+  source_code: Kod źródłowy
+  no_results_found: Nie znaleziono wyników!
+  confirm_delete: Potwierdź usunięcie
+  delete_message: Zamierzasz usunąć
+  cancel: Anuluj
+  delete: Usuń
+  edit: Edytuj
+  start: Rozpocznij
+  proceed_confirm: Czy chcesz kontynuować?
+  schedule_success: Wiadomość została zaplanowana
+  start_upload: Rozpocznij przesyłanie
+  counter: Licznik
+  license: Licencja
+  author: Autor
+  error: Błąd
+  no: "Nie"
+  yes: "Tak"
+  poll: Ankieta
+status:
+  visibility:
+    public: Publiczny
+    unlisted: Niepubliczny
+    private: Prywatny
+    direct: Bezpośredni
+messages:
+  login_authorization: Kliknij "Uzyskaj kod autoryzacji", aby uzyskać kod autoryzacyjny. Następnie go skopiuj i wklej go w polu.
+  authorization_get: Uzyskaj kod autoryzacji
+error:
+  general: Coś poszło nie tak!
+  instance:
+    mastodon_only: To nie jest prawidłowa instancja Mastodon!
+    mastodon_client_id: Coś poszło nie tak podczas pobierania identyfikatora klienta!
+    mastodon_oauth_url: Coś poszło nie tak podczas uzyskiwania adresu URL autoryzacji!
+    mastodon_token: Coś poszło nie tak podczas otrzymywania tokenu!
+    mastodon_account: Coś poszło nie tak podczas pobierania informacji o koncie!
+    mastodon_account_already_used: To konto jest już zarządzane przez kogoś innego!
+page:
+  index:
+    about: FediPlan to aplikacja open source (<a href="https://framagit.org/tom79/fediplan" target="_blank">kod źródłowy</a>) zbudowana do planowania wiadomości z <a href="https://joinmastodon.org/" target="_blank">Mastodon</a> lub <a href="https://pleroma.social/" target="_blank">Pleroma</a> (2. +).
+    data: To <b>nie przechowuje żadnych danych</b> (token lub wiadomości), dlatego musisz utworzyć nowy token po wygaśnięciu sesji.
+    form:
+      code: Twój kod autoryzacji
+      instance: Twoja instancja
+  about:
+    scheduling: FediPlan pozwala użytkownikom na planowanie wiadomości na Mastodona i Pleroma (z załącznikami multimedialnymi).<br/> Planowana data musi wynosić co najmniej 5 minut w przyszłości. Można zaplanować maksymalnie 300 wiadomości w tym samym czasie, z czego dziennie może być opublikowane maksymalnie 50.
+    data: 'FediPlan nie przechowuje Twoich zaplanowanych wiadomości ani danych logowania. Używa tylko Mastodon API do <a href="https://docs.joinmastodon.org/api/rest/statuses/#scheduled-status" target="_blank">planowania wiadomości</a>'
+    issues: Możesz zgłaszać problemy lub prosić o ulepszenia na <a href="https://github.com/stom79/FediPlan/issues" target="_blank">Github</a> lub <a href="https://framagit.org/tom79/fediplan/issues" target="_blank">Framagit</a>.
+  schedule:
+    form:
+      content_warning: Ostrzeżenie o zawartości
+      content: Treść
+      visibility: Widoczność
+      timeZone: Strefa czasowa
+      sensitive: Wrażliwy
+      scheduled_at: Zaplanowane na
+      send: Zaplanuj
+      add_files: Dodaj pliki...
+      multiple: Zaznaczanie wielu odpowiedzi
+      end_in: Kończy się
+      poll_item: Odpowiedź
+      add_poll_item: Dodaj odpowiedź
+      remove_poll_item: Usuń tę odpowiedź
+      edit_media: Edytuj lokalnie media
+      upload_media: Najpierw wgraj te media, wtedy będziesz mógł dodać opis.

translations/fediplan.sv.yaml

@@ -17,8 +17,8 @@ common:
   cancel: Avbryt
   delete: Ta bort
   edit: Redigera
-  start: Start
   proceed_confirm: Vill du fortsätta?
+  schedule_success: Meddelandet har ändrats
   start_upload: Starta uppladdning
   counter: Räknare
   license: Licens
@@ -26,6 +26,7 @@ common:
   error: Fel
   no: "Nej"
   yes: "Ja"
+  poll: Enkät
 status:
   visibility:
     public: Offentligt
@@ -54,3 +55,19 @@ page:
   about:
     scheduling: FediPlan tillåter användare att schemalägga meddelanden för Mastodon och Pleroma (med bilagor till media).<br/> Det planerade datumet måste vara minst 5 minuter in i framtiden. Som mest kan 300 meddelanden schemaläggas samtidigt. Endast 50 meddelanden kan schemaläggas för en viss dag.
     data: 'FediPlan lagrar inte dina schemalagda meddelanden eller dina uppgifter. Den använder bara Mastodon API för <a href="https://docs.joinmastodon.org/api/rest/statuses/#scheduled-status" target="_blank">schemaläggning meddelanden</a>'
+  schedule:
+    form:
+      content_warning: Innehållsvarning
+      content: Innehåll
+      visibility: Synlighet
+      timeZone: Tidszon
+      sensitive: Nyeti
+      send: Gönder
+      add_files: Lägg till filer...
+      multiple: Multipla
+      end_in: Slutar om
+      poll_item: Omröstningsval
+      add_poll_item: Lägg till ett val
+      remove_poll_item: Ta bort detta val
+      edit_media: Redigera media lokalt
+      upload_media: Ladda upp detta media först, sedan kommer du att kunna lägga till en beskrivning.

translations/fediplan.uk.yaml

@@ -1 +1,76 @@
 ---
+common:
+  next: Далі
+  previous: Попереднє
+  accounts: Облікові записи
+  login: Увійти
+  schedule: Запланувати
+  scheduled: Заплановані
+  logout: Вийти
+  about: Про додаток
+  support_my_work: Підтримати мою роботу
+  about_fediplan: Безпечно запланувати повідомлення з Mastodon і Pleroma
+  source_code: Вихідний код
+  no_results_found: Нічого не знайдено!
+  confirm_delete: Підтвердіть видалення
+  delete_message: Ви збираєтеся видалити
+  cancel: Скасувати
+  delete: Видалити
+  edit: Редагувати
+  start: Почати
+  proceed_confirm: Ви хочете продовжити?
+  schedule_success: Повідомлення заплановане
+  start_upload: Почати завантаження
+  counter: Лічильник
+  license: Ліцензія
+  author: Автор
+  error: Помилка
+  no: "Ні"
+  yes: "Так"
+  poll: Опитування
+status:
+  visibility:
+    public: Загальнодоступне
+    unlisted: Приховане
+    private: Тільки для підписників
+    direct: Лише згадані люди
+messages:
+  login_authorization: Натисніть на "Отримати код авторизації", щоб отримати код авторизації. Потім скопіюйте та вставте його в поле.
+  authorization_get: Отримати код авторизації
+error:
+  general: Щось пішло не так!
+  instance:
+    mastodon_only: Це не дійсний інстанс Mastodon!
+    mastodon_client_id: Щось пішло не так при отриманні ідентифікатора клієнта!
+    mastodon_oauth_url: Щось пішло не так при отриманні URL-адреси авторизації!
+    mastodon_token: Щось пішло не так при отриманні токену!
+    mastodon_account: Щось пішло не так під час отримання акаунту!
+    mastodon_account_already_used: Цей обліковий запис вже управляється кимось іншим!
+page:
+  index:
+    about: FediPlan - програма з відкритим вихідним кодом (<a href="https://framagit.org/tom79/fediplan" target="_blank">вихідний код</a>) створена для планування ваших повідомлень з <a href="https://joinmastodon.org/" target="_blank">Mastodon</a> або <a href="https://pleroma.social/" target="_blank">Pleroma</a> (2. +).
+    data: Він <b>не зберігає якісь дані</b> (токен або повідомлення), тому потрібно створити новий токен, коли термін дії вашої сесії.
+    form:
+      code: Ваш код авторизації
+      instance: Ваш інстанс
+  about:
+    scheduling: FediPlan дозволяє користувачам запланувати повідомлення для Mastodon та Plerom (з медійними вкладеннями).<br/> Запланована дата має бути принаймні 5 хвилин на майбутнє. Не більше 300 повідомлень можна запланувати одночасно. Лише 50 повідомлень можна запланувати на вказаний день.
+    data: 'FediPlan не зберігає заплановані повідомлення або облікові дані. Він використовує тільки Mastodon API для <a href="https://docs.joinmastodon.org/api/rest/statuses/#scheduled-status" target="_blank">планувальних повідомлень</a>'
+    issues: Ви можете повідомити про проблеми або запитати покращення на <a href="https://github.com/stom79/FediPlan/issues" target="_blank">Github</a> або <a href="https://framagit.org/tom79/fediplan/issues" target="_blank">Framagit</a>.
+  schedule:
+    form:
+      content_warning: Попередження про вміст
+      content: Контент
+      visibility: Видимість
+      timeZone: Часовий пояс
+      sensitive: Чутливе
+      scheduled_at: Заплановано на
+      send: Відправити
+      add_files: Додати файли...
+      multiple: Кілька
+      end_in: Закінчення через
+      poll_item: Вибір опитування
+      add_poll_item: Додати варіант
+      remove_poll_item: Видалити цей варіант
+      edit_media: Редагувати локально медіа
+      upload_media: Спочатку завантажте цей медіа, а потім ви зможете додати опис.