Add support for NC25 (#26)

.editorconfig

@@ -1,9 +1,13 @@
 root = true
 
 [*]
-indent_style = space
+indent_style = tab
 indent_size = 4
 charset = utf-8
 trim_trailing_whitespace = true
 insert_final_newline = true
 end_of_line = lf
+
+[*.{yml,yaml}]
+indent_style = space
+indent_size = 2

.github/workflows/lint.yml

@@ -1,6 +1,10 @@
 name: Lint
 
-on: pull_request
+on:
+  pull_request:
+  push:
+    branches:
+      - master
 
 jobs:
   build:
@@ -8,7 +12,9 @@ jobs:
     steps:
       - uses: actions/checkout@v2
       - name: Install dependencies
-        run: npm install
+        run: |
+            npm install
+            composer install
       - name: Run prettier
         if: ${{ always() }}
         run: npm run prettier
@@ -16,3 +22,7 @@ jobs:
         continue-on-error: true
         if: ${{ always() }}
         run: npm run stylelint
+      - name: Run PHP CS fixer
+        continue-on-error: true
+        if: ${{ always() }}
+        run: composer run cs:check

.vscode/extensions.json

@@ -2,6 +2,5 @@
     "recommendations": [
         "editorconfig.editorconfig",
         "junstyle.php-cs-fixer",
-        "coenraads.bracket-pair-colorizer-2"
     ]
 }

CHANGELOG.md

@@ -2,6 +2,37 @@
 
 ## [Unreleased]
 
+## 0.5.0 - 2023-02-03
+
+### Added
+
+-	Support for Nextcloud 25 (Requires v0.5.0 of Talked server)
+
+## 0.4.0 - 2022-05-19
+
+### Added
+
+-	Support for Nextcloud 24 (Requires v0.4.0 of Talked server)
+
+### Removed
+
+-	Support for Nextcloud 21
+
+## 0.3.0 - 2022-01-05
+
+### Added
+
+-	Support for Nextcloud 23 (Requires v0.3.0 of Talked server)
+-	Allow supplying grid_view as an argument to the start recording command (Requires v0.3.0 of Talked server)
+
+## 0.2.0 - 2021-09-30
+
+### Added
+
+-	[#8](https://github.com/MetaProvide/talked-client/issues/8) Add hidden option to hide the Talked settings
+-	[#9](https://github.com/MetaProvide/talked-client/issues/9) Allow connecting to the Talked server over a unix socket
+-	[#14](https://github.com/MetaProvide/talked-client/issues/14) Allow supplying arguments to the start recording command (Currently just audio_only)
+
 ## 0.1.0 - 2021-08-23
 
 -   Initial release

README.md

@@ -40,19 +40,31 @@ occ talk:command:add recording Talked "php /var/www/html/occ talked:record {ROOM
 
 ### Configuring Talked
 
-After you have registered the Talk command you should configure Talked. If you head to Admin settings > Talk, then you will find the settings for Talked near the bottom. Here you can specify the URL for your Talked server and whether to use HTTP Basic auth, and the credentials for HTTP Basic auth.
+After you have registered the Talk command you should configure Talked. If you head to Admin settings > Talk, then you will find the settings for Talked near the bottom. Here you can specify the URI for your Talked server and whether to use HTTP Basic auth, and the credentials for HTTP Basic auth.
 
 The http / https should be included in the url, for example: https://talked.example.com
 
+You can also connect to the Talked server over a unix socket. To specify the path to a unix socket prefix the path with `unix:` for example: `unix:/tmp/talked.sock`.
+
+Please note that abstract sockets aren't supported.
+
 ## Usage
 
 To use Talked, simply use the `/recording` command in a chat room. If you don't specify any options or run `/recording help` you will get a help message telling you about the different options. The following options are available:
 
-`/recording start` - starts a recording in the current room.
-`/recording stop`  - stops the active recording
-`/recording status` - checks if there is an active recording
-`/recording info` - prints the version number of the Talked server.
-`/recording help` - prints a help message with the different options.
+* `/recording start` - starts a recording in the current room.
+* `/recording stop`  - stops the active recording.
+* `/recording status` - checks if there is an active recording.
+* `/recording info` - prints the version number of the Talked server.
+* `/recording help` - prints a help message with the different options.
+
+### Audio only
+
+When starting a recording you can also supply a audio_only options which allows you to configure whether the recording should be with or without video. The default is to record with video, so to record just audio you could use the following start command:
+
+`/recording start audio_only=true`
+
+If you have the changed the default to be audio only recordings you can simply change the true to false to create a recording with video.
 
 ## License
 

appinfo/info.xml

@@ -47,21 +47,25 @@ occ talk:command:add recording Talked "php /var/www/html/occ talked:record {ROOM
 
 ### Configuring Talked
 
-After you have registered the Talk command you should configure Talked. If you head to Admin settings > Talk, then you will find the settings for Talked near the bottom. Here you can specify the URL for your Talked server and whether to use HTTP Basic auth, and the credentials for HTTP Basic auth.
+After you have registered the Talk command you should configure Talked. If you head to Admin settings > Talk, then you will find the settings for Talked near the bottom. Here you can specify the URI for your Talked server and whether to use HTTP Basic auth, and the credentials for HTTP Basic auth.
 
 The http / https should be included in the url, for example: https://talked.example.com
 
+You can also connect to the Talked server over a unix socket. To specify the path to a unix socket prefix the path with `unix:` for example: `unix:/tmp/talked.sock`.
+
+Please note that abstract sockets aren't supported.
+
 ## Usage
 
 To use Talked, simply use the `/recording` command in a chat room. If you don't specify any options or run `/recording help` you will get a help message telling you about the different options. The following options are available:
 
-`/recording start` - starts a recording in the current room.
-`/recording stop`  - stops the active recording
-`/recording status` - checks if there is an active recording
-`/recording info` - prints the version number of the Talked server.
-`/recording help` - prints a help message with the different options.
+* `/recording start` - starts a recording in the current room.
+* `/recording stop`  - stops the active recording.
+* `/recording status` - checks if there is an active recording.
+* `/recording info` - prints the version number of the Talked server.
+* `/recording help` - prints a help message with the different options.
     ]]></description>
-    <version>0.1.0</version>
+    <version>0.5.0</version>
     <licence>agpl</licence>
     <author mail="mw@mwalbeck.org">Magnus Walbeck</author>
     <namespace>Talked</namespace>
@@ -71,7 +75,7 @@ To use Talked, simply use the `/recording` command in a chat room. If you don't
     <bugs>https://github.com/MetaProvide/talked-client/issues</bugs>
     <repository>https://github.com/MetaProvide/talked-client.git</repository>
     <dependencies>
-        <nextcloud min-version="21" max-version="22"/>
+        <nextcloud min-version="22" max-version="25"/>
     </dependencies>
     <commands>
         <command>OCA\Talked\Command\Record</command>

appinfo/routes.php

@@ -25,7 +25,7 @@
 
 
 return [
-    'routes' => [
-        ['name' => 'Settings#admin', 'url' => '/settings/admin', 'verb' => 'POST']
-    ],
+	'routes' => [
+		['name' => 'Settings#admin', 'url' => '/settings/admin', 'verb' => 'POST']
+	],
 ];

composer.json

@@ -1,17 +1,17 @@
 {
-    "autoload-dev": {
+	"autoload-dev": {
 		"psr-4": {
 			"OCP\\": "vendor/christophwurst/nextcloud/OCP",
 			"OCA\\Talked\\": "lib/"
 		}
 	},
-    "scripts": {
-        "cs:check": "php-cs-fixer fix --dry-run --diff",
-        "cs:fix": "php-cs-fixer fix"
-    },
-    "require": {},
-    "require-dev": {
-        "nextcloud/coding-standard": "^0.5.0",
-        "christophwurst/nextcloud": "^21.0"
-    }
+	"scripts": {
+		"cs:check": "php-cs-fixer fix --dry-run --diff",
+		"cs:fix": "php-cs-fixer fix"
+	},
+	"require": {},
+	"require-dev": {
+		"nextcloud/coding-standard": "^0.5.0",
+		"christophwurst/nextcloud": "^24.0"
+	}
 }

composer.lock

@@ -4,30 +4,33 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "6f3c74820b7ebcd29ffc6118a8b084fc",
+    "content-hash": "c3f058d45b299d0e6d3982137208e932",
     "packages": [],
     "packages-dev": [
         {
             "name": "christophwurst/nextcloud",
-            "version": "v21.0.0",
+            "version": "v24.0.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/ChristophWurst/nextcloud_composer.git",
-                "reference": "41e1476b4aed5bce7371895054049eca353729c5"
+                "reference": "6ce63c3d29c59dc17394c8967981fd9272681713"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/41e1476b4aed5bce7371895054049eca353729c5",
-                "reference": "41e1476b4aed5bce7371895054049eca353729c5",
+                "url": "https://api.github.com/repos/ChristophWurst/nextcloud_composer/zipball/6ce63c3d29c59dc17394c8967981fd9272681713",
+                "reference": "6ce63c3d29c59dc17394c8967981fd9272681713",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.3 || ~8.0.0"
+                "php": "^7.4 || ~8.0 || ~8.1",
+                "psr/container": "^1.0",
+                "psr/event-dispatcher": "^1.0",
+                "psr/log": "^1.1"
             },
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-master": "21.0.0-dev"
+                    "dev-master": "24.0.0-dev"
                 }
             },
             "notification-url": "https://packagist.org/downloads/",
@@ -41,27 +44,94 @@
                 }
             ],
             "description": "Composer package containing Nextcloud's public API (classes, interfaces)",
-            "time": "2021-03-01T08:42:25+00:00"
+            "time": "2022-05-09T13:50:27+00:00"
         },
         {
-            "name": "composer/semver",
-            "version": "3.2.5",
+            "name": "composer/pcre",
+            "version": "1.0.1",
             "source": {
                 "type": "git",
-                "url": "https://github.com/composer/semver.git",
-                "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9"
+                "url": "https://github.com/composer/pcre.git",
+                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/semver/zipball/31f3ea725711245195f62e54ffa402d8ef2fdba9",
-                "reference": "31f3ea725711245195f62e54ffa402d8ef2fdba9",
+                "url": "https://api.github.com/repos/composer/pcre/zipball/67a32d7d6f9f560b726ab25a061b38ff3a80c560",
+                "reference": "67a32d7d6f9f560b726ab25a061b38ff3a80c560",
                 "shasum": ""
             },
             "require": {
                 "php": "^5.3.2 || ^7.0 || ^8.0"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.54",
+                "phpstan/phpstan": "^1.3",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^4.2 || ^5"
+            },
+            "type": "library",
+            "extra": {
+                "branch-alias": {
+                    "dev-main": "1.x-dev"
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "Composer\\Pcre\\": "src"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Jordi Boggiano",
+                    "email": "j.boggiano@seld.be",
+                    "homepage": "http://seld.be"
+                }
+            ],
+            "description": "PCRE wrapping library that offers type-safe preg_* replacements.",
+            "keywords": [
+                "PCRE",
+                "preg",
+                "regex",
+                "regular expression"
+            ],
+            "funding": [
+                {
+                    "url": "https://packagist.com",
+                    "type": "custom"
+                },
+                {
+                    "url": "https://github.com/composer",
+                    "type": "github"
+                },
+                {
+                    "url": "https://tidelift.com/funding/github/packagist/composer/composer",
+                    "type": "tidelift"
+                }
+            ],
+            "time": "2022-01-21T20:24:37+00:00"
+        },
+        {
+            "name": "composer/semver",
+            "version": "3.3.2",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/composer/semver.git",
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/composer/semver/zipball/3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "reference": "3953f23262f2bff1919fc82183ad9acb13ff62c9",
+                "shasum": ""
+            },
+            "require": {
+                "php": "^5.3.2 || ^7.0 || ^8.0"
+            },
+            "require-dev": {
+                "phpstan/phpstan": "^1.4",
                 "symfony/phpunit-bridge": "^4.2 || ^5"
             },
             "type": "library",
@@ -117,29 +187,31 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-24T12:41:47+00:00"
+            "time": "2022-04-01T19:23:25+00:00"
         },
         {
             "name": "composer/xdebug-handler",
-            "version": "2.0.2",
+            "version": "2.0.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/composer/xdebug-handler.git",
-                "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339"
+                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/84674dd3a7575ba617f5a76d7e9e29a7d3891339",
-                "reference": "84674dd3a7575ba617f5a76d7e9e29a7d3891339",
+                "url": "https://api.github.com/repos/composer/xdebug-handler/zipball/9e36aeed4616366d2b690bdce11f71e9178c579a",
+                "reference": "9e36aeed4616366d2b690bdce11f71e9178c579a",
                 "shasum": ""
             },
             "require": {
+                "composer/pcre": "^1",
                 "php": "^5.3.2 || ^7.0 || ^8.0",
                 "psr/log": "^1 || ^2 || ^3"
             },
             "require-dev": {
-                "phpstan/phpstan": "^0.12.55",
-                "symfony/phpunit-bridge": "^4.2 || ^5"
+                "phpstan/phpstan": "^1.0",
+                "phpstan/phpstan-strict-rules": "^1.1",
+                "symfony/phpunit-bridge": "^4.2 || ^5.0 || ^6.0"
             },
             "type": "library",
             "autoload": {
@@ -176,7 +248,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-31T17:03:58+00:00"
+            "time": "2022-02-24T20:20:32+00:00"
         },
         {
             "name": "doctrine/annotations",
@@ -248,32 +320,28 @@
         },
         {
             "name": "doctrine/lexer",
-            "version": "1.2.1",
+            "version": "1.2.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/doctrine/lexer.git",
-                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042"
+                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/e864bbf5904cb8f5bb334f99209b48018522f042",
-                "reference": "e864bbf5904cb8f5bb334f99209b48018522f042",
+                "url": "https://api.github.com/repos/doctrine/lexer/zipball/c268e882d4dbdd85e36e4ad69e02dc284f89d229",
+                "reference": "c268e882d4dbdd85e36e4ad69e02dc284f89d229",
                 "shasum": ""
             },
             "require": {
-                "php": "^7.2 || ^8.0"
+                "php": "^7.1 || ^8.0"
             },
             "require-dev": {
-                "doctrine/coding-standard": "^6.0",
-                "phpstan/phpstan": "^0.11.8",
-                "phpunit/phpunit": "^8.2"
+                "doctrine/coding-standard": "^9.0",
+                "phpstan/phpstan": "^1.3",
+                "phpunit/phpunit": "^7.5 || ^8.5 || ^9.5",
+                "vimeo/psalm": "^4.11"
             },
             "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
             "autoload": {
                 "psr-4": {
                     "Doctrine\\Common\\Lexer\\": "lib/Doctrine/Common/Lexer"
@@ -320,20 +388,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2020-05-25T17:44:05+00:00"
+            "time": "2022-02-28T11:07:21+00:00"
         },
         {
             "name": "friendsofphp/php-cs-fixer",
-            "version": "v2.19.1",
+            "version": "v2.19.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/FriendsOfPHP/PHP-CS-Fixer.git",
-                "reference": "1fa4af92841f67362c053728989b262fba8eb1ec"
+                "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/1fa4af92841f67362c053728989b262fba8eb1ec",
-                "reference": "1fa4af92841f67362c053728989b262fba8eb1ec",
+                "url": "https://api.github.com/repos/FriendsOfPHP/PHP-CS-Fixer/zipball/75ac86f33fab4714ea5a39a396784d83ae3b5ed8",
+                "reference": "75ac86f33fab4714ea5a39a396784d83ae3b5ed8",
                 "shasum": ""
             },
             "require": {
@@ -425,7 +493,7 @@
                     "type": "github"
                 }
             ],
-            "time": "2021-08-02T17:52:09+00:00"
+            "time": "2021-11-15T17:17:55+00:00"
         },
         {
             "name": "nextcloud/coding-standard",
@@ -563,20 +631,20 @@
         },
         {
             "name": "psr/container",
-            "version": "1.1.1",
+            "version": "1.1.2",
             "source": {
                 "type": "git",
                 "url": "https://github.com/php-fig/container.git",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf"
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/8622567409010282b7aeebe4bb841fe98b58dcaf",
-                "reference": "8622567409010282b7aeebe4bb841fe98b58dcaf",
+                "url": "https://api.github.com/repos/php-fig/container/zipball/513e0666f7216c7459170d56df27dfcefe1689ea",
+                "reference": "513e0666f7216c7459170d56df27dfcefe1689ea",
                 "shasum": ""
             },
             "require": {
-                "php": ">=7.2.0"
+                "php": ">=7.4.0"
             },
             "type": "library",
             "autoload": {
@@ -603,7 +671,7 @@
                 "container-interop",
                 "psr"
             ],
-            "time": "2021-03-05T17:36:06+00:00"
+            "time": "2021-11-05T16:50:12+00:00"
         },
         {
             "name": "psr/event-dispatcher",
@@ -700,26 +768,26 @@
         },
         {
             "name": "symfony/console",
-            "version": "v5.3.6",
+            "version": "v5.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/console.git",
-                "reference": "51b71afd6d2dc8f5063199357b9880cea8d8bfe2"
+                "reference": "ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/console/zipball/51b71afd6d2dc8f5063199357b9880cea8d8bfe2",
-                "reference": "51b71afd6d2dc8f5063199357b9880cea8d8bfe2",
+                "url": "https://api.github.com/repos/symfony/console/zipball/ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b",
+                "reference": "ffe3aed36c4d60da2cf1b0a1cee6b8f2e5fa881b",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php73": "^1.8",
+                "symfony/polyfill-php73": "^1.9",
                 "symfony/polyfill-php80": "^1.16",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/string": "^5.1"
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/string": "^5.1|^6.0"
             },
             "conflict": {
                 "psr/log": ">=3",
@@ -734,12 +802,12 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2",
-                "symfony/config": "^4.4|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/event-dispatcher": "^4.4|^5.0",
-                "symfony/lock": "^4.4|^5.0",
-                "symfony/process": "^4.4|^5.0",
-                "symfony/var-dumper": "^4.4|^5.0"
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/event-dispatcher": "^4.4|^5.0|^6.0",
+                "symfony/lock": "^4.4|^5.0|^6.0",
+                "symfony/process": "^4.4|^5.0|^6.0",
+                "symfony/var-dumper": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "psr/log": "For using the console logger",
@@ -792,20 +860,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-27T19:10:22+00:00"
+            "time": "2022-04-12T16:02:29+00:00"
         },
         {
             "name": "symfony/deprecation-contracts",
-            "version": "v2.4.0",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/deprecation-contracts.git",
-                "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627"
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/5f38c8804a9e97d23e0c8d63341088cd8a22d627",
-                "reference": "5f38c8804a9e97d23e0c8d63341088cd8a22d627",
+                "url": "https://api.github.com/repos/symfony/deprecation-contracts/zipball/e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
+                "reference": "e8b495ea28c1d97b5e0c121748d6f9b53d075c66",
                 "shasum": ""
             },
             "require": {
@@ -814,7 +882,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.4-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -856,26 +924,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-23T23:28:01+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/event-dispatcher",
-            "version": "v5.3.4",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher.git",
-                "reference": "f2fd2208157553874560f3645d4594303058c4bd"
+                "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/f2fd2208157553874560f3645d4594303058c4bd",
-                "reference": "f2fd2208157553874560f3645d4594303058c4bd",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/dec8a9f58d20df252b9cd89f1c6c1530f747685d",
+                "reference": "dec8a9f58d20df252b9cd89f1c6c1530f747685d",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
-                "symfony/event-dispatcher-contracts": "^2",
+                "symfony/deprecation-contracts": "^2.1|^3",
+                "symfony/event-dispatcher-contracts": "^2|^3",
                 "symfony/polyfill-php80": "^1.16"
             },
             "conflict": {
@@ -887,13 +955,13 @@
             },
             "require-dev": {
                 "psr/log": "^1|^2|^3",
-                "symfony/config": "^4.4|^5.0",
-                "symfony/dependency-injection": "^4.4|^5.0",
-                "symfony/error-handler": "^4.4|^5.0",
-                "symfony/expression-language": "^4.4|^5.0",
-                "symfony/http-foundation": "^4.4|^5.0",
-                "symfony/service-contracts": "^1.1|^2",
-                "symfony/stopwatch": "^4.4|^5.0"
+                "symfony/config": "^4.4|^5.0|^6.0",
+                "symfony/dependency-injection": "^4.4|^5.0|^6.0",
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/expression-language": "^4.4|^5.0|^6.0",
+                "symfony/http-foundation": "^4.4|^5.0|^6.0",
+                "symfony/service-contracts": "^1.1|^2|^3",
+                "symfony/stopwatch": "^4.4|^5.0|^6.0"
             },
             "suggest": {
                 "symfony/dependency-injection": "",
@@ -938,20 +1006,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-23T15:55:36+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/event-dispatcher-contracts",
-            "version": "v2.4.0",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/event-dispatcher-contracts.git",
-                "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11"
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/69fee1ad2332a7cbab3aca13591953da9cdb7a11",
-                "reference": "69fee1ad2332a7cbab3aca13591953da9cdb7a11",
+                "url": "https://api.github.com/repos/symfony/event-dispatcher-contracts/zipball/f98b54df6ad059855739db6fcbc2d36995283fe1",
+                "reference": "f98b54df6ad059855739db6fcbc2d36995283fe1",
                 "shasum": ""
             },
             "require": {
@@ -964,7 +1032,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.4-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -1014,25 +1082,26 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-03-23T23:28:01+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/filesystem",
-            "version": "v5.3.4",
+            "version": "v5.4.7",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/filesystem.git",
-                "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32"
+                "reference": "3a4442138d80c9f7b600fb297534ac718b61d37f"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/filesystem/zipball/343f4fe324383ca46792cae728a3b6e2f708fb32",
-                "reference": "343f4fe324383ca46792cae728a3b6e2f708fb32",
+                "url": "https://api.github.com/repos/symfony/filesystem/zipball/3a4442138d80c9f7b600fb297534ac718b61d37f",
+                "reference": "3a4442138d80c9f7b600fb297534ac718b61d37f",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
                 "symfony/polyfill-ctype": "~1.8",
+                "symfony/polyfill-mbstring": "~1.8",
                 "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
@@ -1074,24 +1143,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-21T12:40:44+00:00"
+            "time": "2022-04-01T12:33:59+00:00"
         },
         {
             "name": "symfony/finder",
-            "version": "v5.3.4",
+            "version": "v5.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/finder.git",
-                "reference": "17f50e06018baec41551a71a15731287dbaab186"
+                "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/finder/zipball/17f50e06018baec41551a71a15731287dbaab186",
-                "reference": "17f50e06018baec41551a71a15731287dbaab186",
+                "url": "https://api.github.com/repos/symfony/finder/zipball/9b630f3427f3ebe7cd346c277a1408b00249dad9",
+                "reference": "9b630f3427f3ebe7cd346c277a1408b00249dad9",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-php80": "^1.16"
             },
             "type": "library",
@@ -1133,25 +1203,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-23T15:54:19+00:00"
+            "time": "2022-04-15T08:07:45+00:00"
         },
         {
             "name": "symfony/options-resolver",
-            "version": "v5.3.4",
+            "version": "v5.4.3",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/options-resolver.git",
-                "reference": "a603e5701bd6e305cfc777a8b50bf081ef73105e"
+                "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/a603e5701bd6e305cfc777a8b50bf081ef73105e",
-                "reference": "a603e5701bd6e305cfc777a8b50bf081ef73105e",
+                "url": "https://api.github.com/repos/symfony/options-resolver/zipball/cc1147cb11af1b43f503ac18f31aa3bec213aba8",
+                "reference": "cc1147cb11af1b43f503ac18f31aa3bec213aba8",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/deprecation-contracts": "^2.1",
+                "symfony/deprecation-contracts": "^2.1|^3",
                 "symfony/polyfill-php73": "~1.0",
                 "symfony/polyfill-php80": "^1.16"
             },
@@ -1199,25 +1269,28 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-23T15:55:36+00:00"
+            "time": "2022-01-02T09:53:40+00:00"
         },
         {
             "name": "symfony/polyfill-ctype",
-            "version": "v1.23.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-ctype.git",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce"
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/46cd95797e9df938fdd2b03693b5fca5e64b01ce",
-                "reference": "46cd95797e9df938fdd2b03693b5fca5e64b01ce",
+                "url": "https://api.github.com/repos/symfony/polyfill-ctype/zipball/30885182c981ab175d4d034db0f6f469898070ab",
+                "reference": "30885182c981ab175d4d034db0f6f469898070ab",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-ctype": "*"
+            },
             "suggest": {
                 "ext-ctype": "For best performance"
             },
@@ -1232,12 +1305,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Ctype\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Ctype\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1275,20 +1348,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2021-10-20T20:35:02+00:00"
         },
         {
             "name": "symfony/polyfill-intl-grapheme",
-            "version": "v1.23.1",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-grapheme.git",
-                "reference": "16880ba9c5ebe3642d1995ab866db29270b36535"
+                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/16880ba9c5ebe3642d1995ab866db29270b36535",
-                "reference": "16880ba9c5ebe3642d1995ab866db29270b36535",
+                "url": "https://api.github.com/repos/symfony/polyfill-intl-grapheme/zipball/81b86b50cf841a64252b439e738e97f4a34e2783",
+                "reference": "81b86b50cf841a64252b439e738e97f4a34e2783",
                 "shasum": ""
             },
             "require": {
@@ -1308,12 +1381,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Grapheme\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1353,11 +1426,11 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T12:26:48+00:00"
+            "time": "2021-11-23T21:10:46+00:00"
         },
         {
             "name": "symfony/polyfill-intl-normalizer",
-            "version": "v1.23.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-intl-normalizer.git",
@@ -1386,12 +1459,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Intl\\Normalizer\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1438,21 +1511,24 @@
         },
         {
             "name": "symfony/polyfill-mbstring",
-            "version": "v1.23.1",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6"
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/9174a3d80210dca8daa7f31fec659150bbeabfc6",
-                "reference": "9174a3d80210dca8daa7f31fec659150bbeabfc6",
+                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/0abb51d2f102e00a4eefcf46ba7fec406d245825",
+                "reference": "0abb51d2f102e00a4eefcf46ba7fec406d245825",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.1"
             },
+            "provide": {
+                "ext-mbstring": "*"
+            },
             "suggest": {
                 "ext-mbstring": "For best performance"
             },
@@ -1467,12 +1543,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Mbstring\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1511,7 +1587,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-05-27T12:26:48+00:00"
+            "time": "2021-11-30T18:21:41+00:00"
         },
         {
             "name": "symfony/polyfill-php70",
@@ -1580,7 +1656,7 @@
         },
         {
             "name": "symfony/polyfill-php72",
-            "version": "v1.23.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php72.git",
@@ -1606,12 +1682,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php72\\": ""
-                },
                 "files": [
                     "bootstrap.php"
-                ]
+                ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php72\\": ""
+                }
             },
             "notification-url": "https://packagist.org/downloads/",
             "license": [
@@ -1653,16 +1729,16 @@
         },
         {
             "name": "symfony/polyfill-php73",
-            "version": "v1.23.0",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php73.git",
-                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010"
+                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/fba8933c384d6476ab14fb7b8526e5287ca7e010",
-                "reference": "fba8933c384d6476ab14fb7b8526e5287ca7e010",
+                "url": "https://api.github.com/repos/symfony/polyfill-php73/zipball/cc5db0e22b3cb4111010e48785a97f670b350ca5",
+                "reference": "cc5db0e22b3cb4111010e48785a97f670b350ca5",
                 "shasum": ""
             },
             "require": {
@@ -1679,12 +1755,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php73\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php73\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1725,20 +1801,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-02-19T12:13:01+00:00"
+            "time": "2021-06-05T21:20:04+00:00"
         },
         {
             "name": "symfony/polyfill-php80",
-            "version": "v1.23.1",
+            "version": "v1.25.0",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/polyfill-php80.git",
-                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be"
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/1100343ed1a92e3a38f9ae122fc0eb21602547be",
-                "reference": "1100343ed1a92e3a38f9ae122fc0eb21602547be",
+                "url": "https://api.github.com/repos/symfony/polyfill-php80/zipball/4407588e0d3f1f52efb65fbe92babe41f37fe50c",
+                "reference": "4407588e0d3f1f52efb65fbe92babe41f37fe50c",
                 "shasum": ""
             },
             "require": {
@@ -1755,12 +1831,12 @@
                 }
             },
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php80\\": ""
-                },
                 "files": [
                     "bootstrap.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Polyfill\\Php80\\": ""
+                },
                 "classmap": [
                     "Resources/stubs"
                 ]
@@ -1805,20 +1881,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-28T13:41:28+00:00"
+            "time": "2022-03-04T08:16:47+00:00"
         },
         {
             "name": "symfony/process",
-            "version": "v5.3.4",
+            "version": "v5.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/process.git",
-                "reference": "d16634ee55b895bd85ec714dadc58e4428ecf030"
+                "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/process/zipball/d16634ee55b895bd85ec714dadc58e4428ecf030",
-                "reference": "d16634ee55b895bd85ec714dadc58e4428ecf030",
+                "url": "https://api.github.com/repos/symfony/process/zipball/597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
+                "reference": "597f3fff8e3e91836bb0bd38f5718b56ddbde2f3",
                 "shasum": ""
             },
             "require": {
@@ -1864,25 +1940,29 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-23T15:54:19+00:00"
+            "time": "2022-04-08T05:07:18+00:00"
         },
         {
             "name": "symfony/service-contracts",
-            "version": "v2.4.0",
+            "version": "v2.5.1",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/service-contracts.git",
-                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb"
+                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
-                "reference": "f040a30e04b57fbcc9c6cbcf4dbaa96bd318b9bb",
+                "url": "https://api.github.com/repos/symfony/service-contracts/zipball/24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
+                "reference": "24d9dc654b83e91aa59f9d167b131bc3b5bea24c",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "psr/container": "^1.1"
+                "psr/container": "^1.1",
+                "symfony/deprecation-contracts": "^2.1|^3"
+            },
+            "conflict": {
+                "ext-psr": "<1.1|>=2"
             },
             "suggest": {
                 "symfony/service-implementation": ""
@@ -1890,7 +1970,7 @@
             "type": "library",
             "extra": {
                 "branch-alias": {
-                    "dev-main": "2.4-dev"
+                    "dev-main": "2.5-dev"
                 },
                 "thanks": {
                     "name": "symfony/contracts",
@@ -1940,25 +2020,25 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-04-01T10:43:52+00:00"
+            "time": "2022-03-13T20:07:29+00:00"
         },
         {
             "name": "symfony/stopwatch",
-            "version": "v5.3.4",
+            "version": "v5.4.5",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/stopwatch.git",
-                "reference": "b24c6a92c6db316fee69e38c80591e080e41536c"
+                "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/b24c6a92c6db316fee69e38c80591e080e41536c",
-                "reference": "b24c6a92c6db316fee69e38c80591e080e41536c",
+                "url": "https://api.github.com/repos/symfony/stopwatch/zipball/4d04b5c24f3c9a1a168a131f6cbe297155bc0d30",
+                "reference": "4d04b5c24f3c9a1a168a131f6cbe297155bc0d30",
                 "shasum": ""
             },
             "require": {
                 "php": ">=7.2.5",
-                "symfony/service-contracts": "^1.0|^2"
+                "symfony/service-contracts": "^1|^2|^3"
             },
             "type": "library",
             "autoload": {
@@ -1999,20 +2079,20 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-07-10T08:58:57+00:00"
+            "time": "2022-02-18T16:06:09+00:00"
         },
         {
             "name": "symfony/string",
-            "version": "v5.3.3",
+            "version": "v5.4.8",
             "source": {
                 "type": "git",
                 "url": "https://github.com/symfony/string.git",
-                "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1"
+                "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8"
             },
             "dist": {
                 "type": "zip",
-                "url": "https://api.github.com/repos/symfony/string/zipball/bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1",
-                "reference": "bd53358e3eccec6a670b5f33ab680d8dbe1d4ae1",
+                "url": "https://api.github.com/repos/symfony/string/zipball/3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8",
+                "reference": "3c061a76bff6d6ea427d85e12ad1bb8ed8cd43e8",
                 "shasum": ""
             },
             "require": {
@@ -2023,20 +2103,23 @@
                 "symfony/polyfill-mbstring": "~1.0",
                 "symfony/polyfill-php80": "~1.15"
             },
+            "conflict": {
+                "symfony/translation-contracts": ">=3.0"
+            },
             "require-dev": {
-                "symfony/error-handler": "^4.4|^5.0",
-                "symfony/http-client": "^4.4|^5.0",
+                "symfony/error-handler": "^4.4|^5.0|^6.0",
+                "symfony/http-client": "^4.4|^5.0|^6.0",
                 "symfony/translation-contracts": "^1.1|^2",
-                "symfony/var-exporter": "^4.4|^5.0"
+                "symfony/var-exporter": "^4.4|^5.0|^6.0"
             },
             "type": "library",
             "autoload": {
-                "psr-4": {
-                    "Symfony\\Component\\String\\": ""
-                },
                 "files": [
                     "Resources/functions.php"
                 ],
+                "psr-4": {
+                    "Symfony\\Component\\String\\": ""
+                },
                 "exclude-from-classmap": [
                     "/Tests/"
                 ]
@@ -2079,7 +2162,7 @@
                     "type": "tidelift"
                 }
             ],
-            "time": "2021-06-27T11:44:38+00:00"
+            "time": "2022-04-19T10:40:37+00:00"
         }
     ],
     "aliases": [],

css/settings.css

@@ -1,13 +1,13 @@
 .talked-admin.section {
-    border-top: 1px solid var(--color-border);
+	border-top: 1px solid var(--color-border);
 }
 
 .talked-admin input {
-    margin-bottom: 1em;
+	margin-bottom: 1em;
 }
 
 .talked-admin input[type="text"],
 .talked-admin input[type="password"] {
-    width: 480px;
-    display: block;
+	width: 480px;
+	display: block;
 }

js/settings.js

@@ -23,36 +23,36 @@
  */
 
 function postSuccess(selector, id) {
-    $(selector).after(
-        " <span id='" + id + "' class='msg success'>" + t("talked", "Saved") + "</span>"
-    );
-    setTimeout(function () {
-        $("#" + id).remove();
-    }, 3000);
+	$(selector).after(
+		" <span id='" + id + "' class='msg success'>" + t("talked", "Saved") + "</span>"
+	);
+	setTimeout(function () {
+		$("#" + id).remove();
+	}, 3000);
 }
 
 function postError(selector, id) {
-    $(selector).after(
-        " <span id='" + id + "' class='msg error'>" + t("talked", "Error") + "</span>"
-    );
-    setTimeout(function () {
-        $("#" + id).remove();
-    }, 3000);
+	$(selector).after(
+		" <span id='" + id + "' class='msg error'>" + t("talked", "Error") + "</span>"
+	);
+	setTimeout(function () {
+		$("#" + id).remove();
+	}, 3000);
 }
 
 window.addEventListener("DOMContentLoaded", function () {
-    $("#talked-save-settings").click(function () {
-        $.post(OC.generateUrl("apps/talked/settings/admin"), {
-            server_url: $("#talked-server-url").val(),
-            use_http_basic_auth: $("#talked-use-http-basic-auth").prop("checked") ? 1 : 0,
-            http_basic_auth_username: $("#talked-http-basic-auth-username").val(),
-            http_basic_auth_password: $("#talked-http-basic-auth-password").val(),
-        })
-            .done(function () {
-                postSuccess("#talked-save-settings", "talked-save-settings-msg");
-            })
-            .fail(function () {
-                postError("#talked-save-settings", "talked-save-settings-msg");
-            });
-    });
+	$("#talked-save-settings").click(function () {
+		$.post(OC.generateUrl("apps/talked/settings/admin"), {
+			server_url: $("#talked-server-url").val(),
+			use_http_basic_auth: $("#talked-use-http-basic-auth").prop("checked") ? 1 : 0,
+			http_basic_auth_username: $("#talked-http-basic-auth-username").val(),
+			http_basic_auth_password: $("#talked-http-basic-auth-password").val(),
+		})
+			.done(function () {
+				postSuccess("#talked-save-settings", "talked-save-settings-msg");
+			})
+			.fail(function () {
+				postError("#talked-save-settings", "talked-save-settings-msg");
+			});
+	});
 });

lib/Command/Record.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 /**
@@ -28,59 +29,57 @@ declare(strict_types=1);
 namespace OCA\Talked\Command;
 
 use OCP\IConfig;
+use OCP\Util;
 use Symfony\Component\Console\Command\Command;
 use Symfony\Component\Console\Input\InputArgument;
 use Symfony\Component\Console\Input\InputInterface;
 use Symfony\Component\Console\Output\OutputInterface;
 use Psr\Log\LoggerInterface;
 
-class Record extends Command
-{
-    /** @var IConfig */
+class Record extends Command {
+	/** @var IConfig */
 	private $config;
 
-    /** @var LoggerInterface */
-    private $logger;
+	/** @var LoggerInterface */
+	private $logger;
 
 
 	public function __construct(IConfig $config, LoggerInterface $logger) {
 		parent::__construct();
 		$this->config = $config;
-        $this->logger = $logger;
+		$this->logger = $logger;
 	}
 
-    protected function configure(): void
-    {
-        $this
-            ->setName('talked:record')
-            ->setDescription('Call recording for Nextcloud Talk')
-            ->addArgument(
-                'token',
-                InputArgument::REQUIRED,
-                'A Talk room token.'
-            )
-            ->addArgument(
-                'cmd',
-                InputArgument::OPTIONAL,
-                'The command to run, the following are valid commands: info, status, start, stop and help.',
-                'help'
-            )
-        ;
-    }
+	protected function configure(): void {
+		$this
+			->setName('talked:record')
+			->setDescription('Call recording for Nextcloud Talk')
+			->addArgument(
+				'token',
+				InputArgument::REQUIRED,
+				'A Talk room token.'
+			)
+			->addArgument(
+				'cmd',
+				InputArgument::OPTIONAL,
+				'The command to run, the following are valid commands: info, status, start, stop and help.',
+				'help'
+			)
+		;
+	}
 
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $token = $input->getArgument('token');
-        $cmd = $input->getArgument('cmd');
-        $serverUrl = $this->config->getAppValue('talked', 'server_url', '');
+	protected function execute(InputInterface $input, OutputInterface $output): int {
+		$token = $input->getArgument('token');
+		$arguments = explode(" ", $input->getArgument('cmd'));
+		$serverUrl = $this->config->getAppValue('talked', 'server_url', '');
 
-        if ($serverUrl === '') {
-            $output->writeln('A recording server hasn\'t been configured yet.');
-            return 0;
-        }
+		if ($serverUrl === '') {
+			$output->writeln('A recording server hasn\'t been configured yet.');
+			return 0;
+		}
 
-        if ($cmd === 'help' or $cmd === '') {
-            $message = 'Talked - Call recording for Nextcloud Talk
+		if ($arguments[0] === 'help' or $arguments[0] === '') {
+			$message = 'Talked - Call recording for Nextcloud Talk
 
 You have the following options available:
         /recording start - Starts a call recording
@@ -89,123 +88,183 @@ You have the following options available:
         /recording help - Shows this help message
             ';
 
-            $output->writeln($message);
+			$output->writeln($message);
 
-            return 0;
-        }
+			return 0;
+		}
 
-        if ($cmd === 'info') {
-            $result = $this->sendGetRequest($serverUrl, '');
+		if ($arguments[0] === 'info') {
+			$result = $this->sendGetRequest($serverUrl, '');
 
-            $output->writeln($result);
+			$output->writeln($result);
 
-            return 0;
-        }
+			return 0;
+		}
 
-        if ($cmd === 'status') {
-            $payload = [
-                'token' => $token
-            ];
+		if ($arguments[0] === 'status') {
+			$payload = [
+				'token' => $token
+			];
 
-            $result = $this->sendPostRequest($serverUrl, 'status', $payload);
+			$result = $this->sendPostRequest($serverUrl, 'status', $payload);
 
-            $output->writeln($result);
+			$output->writeln($result);
 
-            return 0;
-        }
+			return 0;
+		}
 
-        if ($cmd === 'start') {
-            $payload = [
-                'token' => $token
-            ];
+		if ($arguments[0] === 'start') {
+			$payload = [
+				'token' => $token,
+				'nextcloud_version' => Util::getVersion()[0]
+			];
 
-            $result = $this->sendPostRequest($serverUrl, 'start', $payload);
+			if (count($arguments) > 1) {
+				$parsedArguments = $this->parseArguments($arguments);
+				$payload = array_merge($parsedArguments, $payload);
+			}
 
-            $output->writeln($result);
+			$result = $this->sendPostRequest($serverUrl, 'start', $payload);
 
-            return 0;
-        }
+			$output->writeln($result);
 
-        if ($cmd === 'stop') {
-            $payload = [
-                'token' => $token
-            ];
+			return 0;
+		}
 
-            $result = $this->sendPostRequest($serverUrl, 'stop', $payload);
+		if ($arguments[0] === 'stop') {
+			$payload = [
+				'token' => $token
+			];
 
-            $output->writeln($result);
+			$result = $this->sendPostRequest($serverUrl, 'stop', $payload);
 
-            return 0;
-        }
+			$output->writeln($result);
 
-        $output->writeln('The specified command doesn\'t exist.');
-        return 0;
-    }
+			return 0;
+		}
 
-    protected function sendGetRequest($serverUrl, $endpoint, $headers = []) {
-        if ($this->config->getAppValue('talked', 'server_url', '0')) {
-            $headers = $this->addBasicAuthHeaders($headers);
-        }
+		$output->writeln('The specified command doesn\'t exist.');
+		return 0;
+	}
 
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $serverUrl . '/' . $endpoint);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-        $result = curl_exec($ch);
-        $curl_error_code = curl_errno($ch);
-        $curl_error = curl_error($ch);
-        curl_close($ch);
+	protected function sendGetRequest(string $serverUrl, string $endpoint, array $headers = []): string {
+		if ($this->config->getAppValue('talked', 'server_url', '0')) {
+			$headers = $this->addBasicAuthHeaders($headers);
+		}
 
-        if ($curl_error_code > 0) {
-            $this->logger->error('cURL Error (' . $curl_error_code . '): ' . $curl_error);
-            $message = 'An error occured while running the command. Please try again or contact an administrator.';
-        } else {
-            $message = json_decode($result)->message;
-        }
+		$curlHandle = curl_init();
 
-        return $message;
-    }
+		$curlHandle = $this->configureServerUri($curlHandle, $serverUrl, $endpoint);
 
-    protected function sendPostRequest($serverUrl, $endpoint, $payload,  $headers = []) {
-        if ($this->config->getAppValue('talked', 'server_url', '0')) {
-            $headers = $this->addBasicAuthHeaders($headers);
-        }
+		curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($curlHandle, CURLOPT_HTTPHEADER, $headers);
+		curl_setopt($curlHandle, CURLOPT_TIMEOUT, 60);
+		curl_setopt($curlHandle, CURLOPT_CONNECTTIMEOUT, 10);
+		$result = curl_exec($curlHandle);
+		$curlErrorCode = curl_errno($curlHandle);
+		$curlError = curl_error($curlHandle);
+		curl_close($curlHandle);
 
-        $headers[] = 'Content-Type: application/json';
-        
-        $ch = curl_init();
-        curl_setopt($ch, CURLOPT_URL, $serverUrl . '/' . $endpoint);
-        curl_setopt($ch, CURLOPT_RETURNTRANSFER, true);
-        curl_setopt($ch, CURLOPT_POST, true);
-        curl_setopt($ch, CURLOPT_POSTFIELDS, json_encode($payload));
-        curl_setopt($ch, CURLOPT_HTTPHEADER, $headers);
-        curl_setopt($ch, CURLOPT_TIMEOUT, 30);
-        curl_setopt($ch, CURLOPT_CONNECTTIMEOUT, 10);
-        $result = curl_exec($ch);
-        $curl_error_code = curl_errno($ch);
-        $curl_error = curl_error($ch);
-        curl_close($ch);
+		if ($curlErrorCode > 0) {
+			$this->logger->error('cURL Error (' . $curlErrorCode . '): ' . $curlError);
+			$message = 'An error occured while running the command. Please try again or contact an administrator.';
+		} else {
+			$message = json_decode($result)->message;
+		}
 
-        if ($curl_error_code > 0) {
-            $this->logger->error('cURL Error (' . $curl_error_code . '): ' . $curl_error);
-            $message = 'An error occured while running the command. Please try again or contact an administrator.';
-        } else {
-            $message = json_decode($result)->message;
-        }
+		return $message;
+	}
 
-        return $message;
-    }
+	protected function sendPostRequest(string $serverUrl, string $endpoint, array $payload,  array $headers = []): string {
+		if ($this->config->getAppValue('talked', 'server_url', '0')) {
+			$headers = $this->addBasicAuthHeaders($headers);
+		}
 
-    protected function addBasicAuthHeaders() {
-        $username = $this->config->getAppValue('talked', 'http_basic_auth_username');
-        $password = $this->config->getAppValue('talked', 'http_basic_auth_password');
+		$headers[] = 'Content-Type: application/json';
 
-        $base64EncodedAuth = base64_encode($username . ':' . $password);
+		$curlHandle = curl_init();
 
-        $headers[] = 'Authorization: Basic ' . $base64EncodedAuth;
+		$curlHandle = $this->configureServerUri($curlHandle, $serverUrl, $endpoint);
 
-        return $headers;
-    }
+		curl_setopt($curlHandle, CURLOPT_RETURNTRANSFER, true);
+		curl_setopt($curlHandle, CURLOPT_POST, true);
+		curl_setopt($curlHandle, CURLOPT_POSTFIELDS, json_encode($payload));
+		curl_setopt($curlHandle, CURLOPT_HTTPHEADER, $headers);
+		curl_setopt($curlHandle, CURLOPT_TIMEOUT, 60);
+		curl_setopt($curlHandle, CURLOPT_CONNECTTIMEOUT, 10);
+		$result = curl_exec($curlHandle);
+		$curlErrorCode = curl_errno($curlHandle);
+		$curlError = curl_error($curlHandle);
+		curl_close($curlHandle);
+
+		if ($curlErrorCode > 0) {
+			$this->logger->error('cURL Error (' . $curlErrorCode . '): ' . $curlError);
+			$message = 'An error occured while running the command. Please try again or contact an administrator.';
+		} else {
+			$message = json_decode($result)->message;
+		}
+
+		return $message;
+	}
+
+	protected function addBasicAuthHeaders(): array {
+		$username = $this->config->getAppValue('talked', 'http_basic_auth_username');
+		$password = $this->config->getAppValue('talked', 'http_basic_auth_password');
+
+		$base64EncodedAuth = base64_encode($username . ':' . $password);
+
+		$headers[] = 'Authorization: Basic ' . $base64EncodedAuth;
+
+		return $headers;
+	}
+
+	protected function configureServerUri($curlHandle, string $serverUrl, string $endpoint) {
+		# Check if the URI is pointing to a unix socket
+		if (substr($serverUrl, 0, 5) === 'unix:') {
+			curl_setopt($curlHandle, CURLOPT_UNIX_SOCKET_PATH, substr($serverUrl, 5));
+			# Configure the URL the requests should go to. In later versions
+			# curl requires a dummy hostname, so here we just specify localhost.
+			curl_setopt($curlHandle, CURLOPT_URL, 'http://localhost' . '/' . $endpoint);
+		} else {
+			# If the URI isn't pointing to a unix socket, assume we are connecting over TCP
+			curl_setopt($curlHandle, CURLOPT_URL, $serverUrl . '/' . $endpoint);
+		}
+		return $curlHandle;
+	}
+
+	protected function parseArguments($arguments) {
+		// Remove the initial command
+		array_shift($arguments);
+
+		$parsedArguments = [];
+
+		foreach($arguments as $argument) {
+
+			if (!str_contains($argument, '=')) {
+				continue;
+			}
+			$parts = explode('=', $argument);
+
+			switch ($parts[0]) {
+				case 'audio_only':
+					if (strtolower($parts[1]) === 'true') {
+						$parsedArguments['audio_only'] = true;
+					} elseif (strtolower($parts[1]) === 'false') {
+						$parsedArguments['audio_only'] = false;
+					}
+					continue 2;
+				case 'grid_view':
+					if (strtolower($parts[1]) === 'true') {
+						$parsedArguments['grid_view'] = true;
+					} elseif (strtolower($parts[1]) === 'false') {
+						$parsedArguments['grid_view'] = false;
+					}
+					continue 2;
+				default:
+					continue 2;
+			}
+		}
+
+		return $parsedArguments;
+	}
 }

lib/Controller/SettingsController.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 /**
@@ -31,54 +32,52 @@ use OCP\AppFramework\Controller;
 use OCP\IConfig;
 use OCP\IRequest;
 
-class SettingsController extends Controller
-{
+class SettingsController extends Controller {
 
-    /** @var string */
-    public const APP_NAME = 'talked';
+	/** @var string */
+	public const APP_NAME = 'talked';
 
-    /** @var IConfig */
-    private $config;
+	/** @var IConfig */
+	private $config;
 
-    /**
-     * @param IConfig $config
-     * @param IRequest $request
-     */
-    public function __construct(
-        IConfig $config,
-        IRequest $request
-    ) {
-        parent::__construct(self::APP_NAME, $request);
-        $this->config = $config;
-    }
+	/**
+	 * @param IConfig $config
+	 * @param IRequest $request
+	 */
+	public function __construct(
+		IConfig $config,
+		IRequest $request
+	) {
+		parent::__construct(self::APP_NAME, $request);
+		$this->config = $config;
+	}
 
-    /**
-     * Set talked options
-     */
-    public function admin(): void
-    {
-        if ($this->request->getParam("server_url")) {
-            $this->config->setAppValue(self::APP_NAME, "server_url", rtrim($this->request->getParam("server_url"), '/'));
-        } else {
-            $this->config->setAppValue(self::APP_NAME, "server_url", "");
-        }
+	/**
+	 * Set talked options
+	 */
+	public function admin(): void {
+		if ($this->request->getParam("server_url")) {
+			$this->config->setAppValue(self::APP_NAME, "server_url", rtrim($this->request->getParam("server_url"), '/'));
+		} else {
+			$this->config->setAppValue(self::APP_NAME, "server_url", "");
+		}
 
-        if ($this->request->getParam("use_http_basic_auth")) {
-            $this->config->setAppValue(self::APP_NAME, "use_http_basic_auth", "1");
-        } else {
-            $this->config->setAppValue(self::APP_NAME, "use_http_basic_auth", "0");
-        }
+		if ($this->request->getParam("use_http_basic_auth")) {
+			$this->config->setAppValue(self::APP_NAME, "use_http_basic_auth", "1");
+		} else {
+			$this->config->setAppValue(self::APP_NAME, "use_http_basic_auth", "0");
+		}
 
-        if ($this->request->getParam("http_basic_auth_username")) {
-            $this->config->setAppValue(self::APP_NAME, "http_basic_auth_username", $this->request->getParam("http_basic_auth_username"));
-        } else {
-            $this->config->setAppValue(self::APP_NAME, "http_basic_auth_username", "");
-        }
+		if ($this->request->getParam("http_basic_auth_username")) {
+			$this->config->setAppValue(self::APP_NAME, "http_basic_auth_username", $this->request->getParam("http_basic_auth_username"));
+		} else {
+			$this->config->setAppValue(self::APP_NAME, "http_basic_auth_username", "");
+		}
 
-        if ($this->request->getParam("http_basic_auth_password")) {
-            $this->config->setAppValue(self::APP_NAME, "http_basic_auth_password", $this->request->getParam("http_basic_auth_password"));
-        } else {
-            $this->config->setAppValue(self::APP_NAME, "http_basic_auth_password", "");
-        }
-    }
+		if ($this->request->getParam("http_basic_auth_password")) {
+			$this->config->setAppValue(self::APP_NAME, "http_basic_auth_password", $this->request->getParam("http_basic_auth_password"));
+		} else {
+			$this->config->setAppValue(self::APP_NAME, "http_basic_auth_password", "");
+		}
+	}
 }

lib/Settings/Admin.php

@@ -1,4 +1,5 @@
 <?php
+
 declare(strict_types=1);
 
 /**
@@ -31,53 +32,50 @@ use OCP\AppFramework\Http\TemplateResponse;
 use OCP\IConfig;
 use OCP\Settings\ISettings;
 
-class Admin implements ISettings
-{
+class Admin implements ISettings {
 
-    /** @var string */
-    public const APP_NAME = 'talked';
+	/** @var string */
+	public const APP_NAME = 'talked';
 
-    /** @var IConfig */
-    private $config;
+	/** @var IConfig */
+	private $config;
 
-    /**
-     * @param IConfig $config
-     */
-    public function __construct(IConfig $config)
-    {
-        $this->config = $config;
-    }
+	/**
+	 * @param IConfig $config
+	 */
+	public function __construct(IConfig $config) {
+		$this->config = $config;
+	}
 
-    /**
-     * @return TemplateResponse
-     */
-    public function getForm(): TemplateResponse
-    {
-        $serverUrl = $this->config->getAppValue(self::APP_NAME, 'server_url', "");
-        $useHttpBasicAuth = $this->config->getAppValue(self::APP_NAME, 'use_http_basic_auth', "0");
-        $HttpBasicAuthUsername = $this->config->getAppValue(self::APP_NAME, 'http_basic_auth_username', "");
-        $HttpBasicAuthPassword = $this->config->getAppValue(self::APP_NAME, 'http_basic_auth_password', "");
-        return new TemplateResponse('talked', 'admin', [
-            "serverUrl" => $serverUrl,
-            "useHttpBasicAuth" => $useHttpBasicAuth,
-            "HttpBasicAuthUsername" => $HttpBasicAuthUsername,
-            "HttpBasicAuthPassword" => $HttpBasicAuthPassword
-        ]);
-    }
+	/**
+	 * @return TemplateResponse
+	 */
+	public function getForm(): TemplateResponse {
+		$serverUrl = $this->config->getAppValue(self::APP_NAME, 'server_url', "");
+		$useHttpBasicAuth = $this->config->getAppValue(self::APP_NAME, 'use_http_basic_auth', "0");
+		$httpBasicAuthUsername = $this->config->getAppValue(self::APP_NAME, 'http_basic_auth_username', "");
+		$httpBasicAuthPassword = $this->config->getAppValue(self::APP_NAME, 'http_basic_auth_password', "");
+		$hideSettings = $this->config->getAppValue(self::APP_NAME, 'hide_settings', "0");
+		return new TemplateResponse('talked', 'admin', [
+			"serverUrl" => $serverUrl,
+			"useHttpBasicAuth" => $useHttpBasicAuth,
+			"httpBasicAuthUsername" => $httpBasicAuthUsername,
+			"httpBasicAuthPassword" => $httpBasicAuthPassword,
+			"hideSettings" => $hideSettings
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    public function getSection(): string
-    {
-        return 'talk';
-    }
+	/**
+	 * @return string
+	 */
+	public function getSection(): string {
+		return 'talk';
+	}
 
-    /**
-     * @return int
-     */
-    public function getPriority(): int
-    {
-        return 50;
-    }
+	/**
+	 * @return int
+	 */
+	public function getPriority(): int {
+		return 50;
+	}
 }

package-lock.json

@@ -1677,9 +1677,9 @@
             "dev": true
         },
         "prettier": {
-            "version": "2.3.2",
-            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.3.2.tgz",
-            "integrity": "sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==",
+            "version": "2.5.1",
+            "resolved": "https://registry.npmjs.org/prettier/-/prettier-2.5.1.tgz",
+            "integrity": "sha512-vBZcPRUR5MZJwoyi3ZoyQlc1rXeEck8KgeC9AwwOn+exuxLxq5toTRDTSaVrXHxelDMHy9zlicw8u66yxoSUFg==",
             "dev": true
         },
         "prettier-linter-helpers": {

package.json

@@ -4,7 +4,7 @@
     "description": "Call recording for Nextcloud Talk",
     "author": "Magnus Walbeck",
     "devDependencies": {
-        "prettier": "^2.3.0",
+        "prettier": "^2.5.1",
         "stylelint": "^13.13.1",
         "stylelint-config-prettier": "^8.0.2",
         "stylelint-prettier": "^1.2.0"

templates/admin.php

@@ -27,19 +27,19 @@ style('talked', 'settings');
 script('talked', 'settings');
 ?>
 
-<div id="talked" class="talked-admin section">
+<div id="talked" class="talked-admin section <?php p($hideSettings ? "hidden" : ""); ?>">
     <h2><?php p($l->t("Talked")); ?></h2>
-    <h3><?php p($l->t("Talked server URL")); ?></h3>
+    <h3><?php p($l->t("Talked server URI")); ?></h3>
     <input type="text" class="" id="talked-server-url" placeholder="https://talked.example.com" value="<?php p($serverUrl); ?>">
 
     <input type="checkbox" class="checkbox" id="talked-use-http-basic-auth" <?php p($useHttpBasicAuth ? "checked" : ""); ?>>
     <label for="talked-use-http-basic-auth"><?php p($l->t("Use HTTP Basic auth for the Talked server")); ?></label>
 
     <h3><?php p($l->t("HTTP Basic username")); ?></h3>
-    <input type="text" class="" id="talked-http-basic-auth-username" value="<?php p($HttpBasicAuthUsername); ?>">
+    <input type="text" class="" id="talked-http-basic-auth-username" value="<?php p($httpBasicAuthUsername); ?>">
 
     <h3><?php p($l->t("HTTP Basic password")); ?></h3>
-    <input type="password" class="" id="talked-http-basic-auth-password" value="<?php p($HttpBasicAuthPassword); ?>">
+    <input type="password" class="" id="talked-http-basic-auth-password" value="<?php p($httpBasicAuthPassword); ?>">
 
     <button id="talked-save-settings"><?php p($l->t("Save")); ?></button>
 </div>