]>
source.dussan.org Git - nextcloud-server.git/log
Morris Jobke [Mon, 25 May 2020 12:03:21 +0000 (14:03 +0200)]
Fix code style
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
Johannes Riedel [Tue, 17 Mar 2020 16:06:52 +0000 (17:06 +0100)]
Implement occ command security:bruteforceattemps:reset-for-ip
Signed-off-by: Johannes Riedel <joeried@users.noreply.github.com>
Christoph Wurst [Thu, 19 Mar 2020 14:37:31 +0000 (15:37 +0100)]
Merge pull request #20026 from nextcloud/techdebt/composer-files-v1.10.1
Update autoloaders for composer v1.10.1
Christoph Wurst [Thu, 19 Mar 2020 08:48:49 +0000 (09:48 +0100)]
Update autoloaders for composer v1.10.1
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
Nextcloud bot [Thu, 19 Mar 2020 02:20:00 +0000 (02:20 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Wed, 18 Mar 2020 19:47:06 +0000 (20:47 +0100)]
Merge pull request #20013 from nextcloud/bugfix/noid/fix-recursive-calls-in-logging-via-methods
Fix recursive calls in logging via server methods
Roeland Jago Douma [Wed, 18 Mar 2020 18:48:53 +0000 (19:48 +0100)]
Merge pull request #19242 from nextcloud/dav-long-properties
Handle long dav property paths by hashing them
Joas Schilling [Wed, 18 Mar 2020 09:43:54 +0000 (10:43 +0100)]
Fix recursive calls in logging via server methods
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Wed, 18 Mar 2020 14:32:39 +0000 (15:32 +0100)]
Merge pull request #20003 from nextcloud/enh/19989/type-additional-scoes
Annotate $additionalScopes so the IDE knows what type $scopeCandidate is
Robin Appelman [Tue, 4 Feb 2020 12:11:51 +0000 (13:11 +0100)]
rebuild autoloader
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Mon, 3 Feb 2020 12:41:55 +0000 (13:41 +0100)]
fix tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Mon, 3 Feb 2020 12:37:30 +0000 (13:37 +0100)]
remove the detour trough node and work with path directly
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Mon, 3 Feb 2020 12:23:40 +0000 (13:23 +0100)]
use INode instead of Node for custom properties
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Fri, 31 Jan 2020 15:10:19 +0000 (16:10 +0100)]
handle long property paths to hasing paths >250 chars
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Fri, 31 Jan 2020 14:56:52 +0000 (15:56 +0100)]
remove unused code
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Fri, 31 Jan 2020 14:47:13 +0000 (15:47 +0100)]
test custom properties backend against real database
test behaviour not implementation
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Fri, 31 Jan 2020 14:06:26 +0000 (15:06 +0100)]
merge the two almost identical custom property backends
Signed-off-by: Robin Appelman <robin@icewind.nl>
Roeland Jago Douma [Wed, 18 Mar 2020 12:38:35 +0000 (13:38 +0100)]
Merge pull request #19978 from nextcloud/harden/check_for_owner
Actually check if the owner is not null
Roeland Jago Douma [Wed, 18 Mar 2020 12:36:46 +0000 (13:36 +0100)]
Merge pull request #19981 from nextcloud/enh/reset_target_if_null_after_share
Update the target when it isempty after sharing
Joas Schilling [Wed, 18 Mar 2020 11:34:08 +0000 (12:34 +0100)]
Merge pull request #19813 from nextcloud/bugfix/noid/fix-color-box-shadow-variable
Fix color-box-shadow variable
Nextcloud bot [Wed, 18 Mar 2020 02:21:06 +0000 (02:21 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Tue, 17 Mar 2020 20:34:08 +0000 (21:34 +0100)]
Merge pull request #19932 from nextcloud/remove-placeholder-check
remove the requirement that everything that looks like a placeholder …
Roeland Jago Douma [Tue, 17 Mar 2020 18:38:22 +0000 (19:38 +0100)]
Merge pull request #19964 from nextcloud/bug/19963/invalid-constructor-template-response
Fix invalid instantiation of TemplateResponse if client not found
Roeland Jago Douma [Tue, 17 Mar 2020 17:17:14 +0000 (18:17 +0100)]
Merge pull request #19347 from nextcloud/fix/19345/log_deprecated_alias_use
Log untyped server DI requests
Daniel Kesselberg [Tue, 17 Mar 2020 14:23:59 +0000 (15:23 +0100)]
Annotate $additionalScopes so the IDE knows what type $scopeCandidate is.
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Roeland Jago Douma [Tue, 17 Mar 2020 14:09:50 +0000 (15:09 +0100)]
Merge pull request #19967 from roscomputing/enh/19958/usejsnoncedocs
add docs for useJsNonce
Roeland Jago Douma [Tue, 17 Mar 2020 14:08:25 +0000 (15:08 +0100)]
Merge pull request #19989 from nextcloud/fix-single-ScopeContext-passed-to-setScopes
Fix single "ScopeContext" passed to "setScopes"
Roeland Jago Douma [Tue, 17 Mar 2020 14:06:47 +0000 (15:06 +0100)]
Merge pull request #19987 from nextcloud/bugfix/noid/disable-storage-stats-without-session_keepalive
Only do regular polling of storage statistics if session_keepalive is enabled
Roeland Jago Douma [Tue, 17 Mar 2020 14:06:10 +0000 (15:06 +0100)]
Merge pull request #19995 from nextcloud/bugfix/noid/unify_default_types_lookupServerEnabled
Default value of lookupServerEnabled should be the same everywhere
Georg Ehrke [Tue, 17 Mar 2020 09:39:59 +0000 (10:39 +0100)]
Default value of lookupServerEnabled should be the same everywhere
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
Nextcloud bot [Tue, 17 Mar 2020 02:18:42 +0000 (02:18 +0000)]
[tx-robot] updated from transifex
blizzz [Mon, 16 Mar 2020 21:11:40 +0000 (22:11 +0100)]
Merge pull request #19968 from nextcloud/enh/noid/hide-apps-store-if-disabled
Hide card for apps store if disabled
Daniel Calviño Sánchez [Mon, 16 Mar 2020 15:48:25 +0000 (16:48 +0100)]
Fix single "ScopeContext" passed to "setScopes"
"setScopes" expects an array, but a single "ScopeContext" was being
passed instead.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Julius Härtl [Mon, 16 Mar 2020 14:59:41 +0000 (15:59 +0100)]
Only do regular polling of storage statistics if session_keepalive is enabled
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Roeland Jago Douma [Mon, 16 Mar 2020 12:38:55 +0000 (13:38 +0100)]
Update the target when it isempty after sharing
Hooks that listen to it (audit log) benefit from having the target
properly set.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Mon, 16 Mar 2020 12:12:10 +0000 (13:12 +0100)]
Actually check if the owner is not null
Else this can error out on storages that do not have an owner (e.g.
groupfolders).
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Daniel Kesselberg [Sun, 15 Mar 2020 16:32:50 +0000 (17:32 +0100)]
Hide card for apps store if disabled
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
John Molakvoæ [Mon, 16 Mar 2020 08:05:27 +0000 (09:05 +0100)]
Merge pull request #19960 from nextcloud/dependabot/npm_and_yarn/sinon-9.0.1
Bump sinon from 9.0.0 to 9.0.1
Roeland Jago Douma [Mon, 16 Mar 2020 08:03:41 +0000 (09:03 +0100)]
Merge pull request #19962 from nextcloud/dependabot/npm_and_yarn/vuex-3.1.3
Bump vuex from 3.1.2 to 3.1.3
Nextcloud bot [Mon, 16 Mar 2020 02:21:10 +0000 (02:21 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Fri, 7 Feb 2020 10:39:55 +0000 (11:39 +0100)]
Move deprecated aliases over to new registration
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Roeland Jago Douma [Fri, 7 Feb 2020 10:37:04 +0000 (11:37 +0100)]
Add a deprecated alias registration to find deprecated usages
Fixes #19345
Basically just a stupid wrapper with extra logging. So that we can at
least inform people they are using the wrong methods.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Pavel Krasikov [Sun, 15 Mar 2020 14:02:11 +0000 (17:02 +0300)]
add docs for useJsNonce
Signed-off-by: Pavel Krasikov <klonishe@gmail.com>
dependabot-preview[bot] [Sun, 15 Mar 2020 02:18:05 +0000 (02:18 +0000)]
Bump vuex from 3.1.2 to 3.1.3
Bumps [vuex](https://github.com/vuejs/vuex) from 3.1.2 to 3.1.3.
- [Release notes](https://github.com/vuejs/vuex/releases)
- [Commits](https://github.com/vuejs/vuex/compare/v3.1.2...v3.1.3)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Roeland Jago Douma [Sun, 15 Mar 2020 12:15:40 +0000 (13:15 +0100)]
Merge pull request #19954 from roscomputing/fix/19941/fix_safari_useragent
fix safari useragent for versions with 3 digits
Roeland Jago Douma [Sun, 15 Mar 2020 12:07:44 +0000 (13:07 +0100)]
Merge pull request #19961 from nextcloud/dependabot/npm_and_yarn/jsdom-16.2.1
Bump jsdom from 16.2.0 to 16.2.1
Daniel Kesselberg [Sun, 15 Mar 2020 10:52:06 +0000 (11:52 +0100)]
Fix invalid instantiation of TemplateResponse if client not found
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Nextcloud bot [Sun, 15 Mar 2020 02:19:16 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
dependabot-preview[bot] [Sun, 15 Mar 2020 02:17:21 +0000 (02:17 +0000)]
Bump jsdom from 16.2.0 to 16.2.1
Bumps [jsdom](https://github.com/jsdom/jsdom) from 16.2.0 to 16.2.1.
- [Release notes](https://github.com/jsdom/jsdom/releases)
- [Changelog](https://github.com/jsdom/jsdom/blob/master/Changelog.md)
- [Commits](https://github.com/jsdom/jsdom/compare/16.2.0...16.2.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
dependabot-preview[bot] [Sun, 15 Mar 2020 02:16:39 +0000 (02:16 +0000)]
Bump sinon from 9.0.0 to 9.0.1
Bumps [sinon](https://github.com/sinonjs/sinon) from 9.0.0 to 9.0.1.
- [Release notes](https://github.com/sinonjs/sinon/releases)
- [Changelog](https://github.com/sinonjs/sinon/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sinonjs/sinon/compare/v9.0.0...v9.0.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Pavel Krasikov [Sat, 14 Mar 2020 13:19:57 +0000 (16:19 +0300)]
fix safari useragent for versions with 3 digits
Signed-off-by: Pavel Krasikov <klonishe@gmail.com>
Roeland Jago Douma [Sat, 14 Mar 2020 13:01:29 +0000 (14:01 +0100)]
Merge pull request #19947 from nextcloud/dependabot/npm_and_yarn/acorn-6.4.1
[Security] Bump acorn from 6.3.0 to 6.4.1
Roeland Jago Douma [Sat, 14 Mar 2020 08:18:34 +0000 (09:18 +0100)]
Merge pull request #19937 from nextcloud/share-mail-hide-download-int
properly set 'hide_download' as integer
Nextcloud bot [Sat, 14 Mar 2020 02:18:04 +0000 (02:18 +0000)]
[tx-robot] updated from transifex
dependabot-preview[bot] [Fri, 13 Mar 2020 22:20:14 +0000 (22:20 +0000)]
[Security] Bump acorn from 6.3.0 to 6.4.1
Bumps [acorn](https://github.com/acornjs/acorn) from 6.3.0 to 6.4.1. **This update includes a security fix.**
- [Release notes](https://github.com/acornjs/acorn/releases)
- [Commits](https://github.com/acornjs/acorn/compare/6.3.0...6.4.1)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Robin Appelman [Fri, 13 Mar 2020 18:44:43 +0000 (18:44 +0000)]
Merge pull request #19931 from nextcloud/external-storage-password-placeholders-fix-tests
fix external storage controller tests
Robin Appelman [Fri, 13 Mar 2020 16:38:56 +0000 (17:38 +0100)]
properly set 'hide_download' as integer
the database field is a smallint, not a boolean.
fixes postgresql tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
Roeland Jago Douma [Fri, 13 Mar 2020 14:51:52 +0000 (15:51 +0100)]
Merge pull request #19907 from nextcloud/bugfix/noid/dont-allow-anchor-and-queries-in-remote-url
Don't allow anchors and queries in remote urls
Robin Appelman [Fri, 13 Mar 2020 14:33:47 +0000 (15:33 +0100)]
fix external storage controller tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
Robin Appelman [Fri, 13 Mar 2020 14:29:14 +0000 (15:29 +0100)]
remove the requirement that everything that looks like a placeholder is substituted
While maybe not common, `$` is a valid option in config fields
Signed-off-by: Robin Appelman <robin@icewind.nl>
Marco Ambrosini [Fri, 13 Mar 2020 10:45:00 +0000 (11:45 +0100)]
Fix dark mode color-box-shadow variable
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
Marco Ambrosini [Fri, 6 Mar 2020 12:24:38 +0000 (13:24 +0100)]
Fix color-box-shadow variable
Signed-off-by: Marco Ambrosini <marcoambrosini@pm.me>
Joas Schilling [Fri, 13 Mar 2020 10:11:00 +0000 (11:11 +0100)]
Fix willReturnOnConsecutiveCalls
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Fri, 13 Mar 2020 09:54:40 +0000 (10:54 +0100)]
Merge pull request #19915 from nextcloud/external-storage-password-placeholders
Use placeholder values for password fields in external storage webui
Roeland Jago Douma [Fri, 13 Mar 2020 09:17:12 +0000 (10:17 +0100)]
Merge pull request #19910 from nextcloud/bugfix/noid/invalid-from-mail
Do not use the instance name as user part of from mail addresses
Roeland Jago Douma [Fri, 13 Mar 2020 09:16:45 +0000 (10:16 +0100)]
Merge pull request #19914 from nextcloud/fix/19484/sharebymail_hidedownload
Properly respect hide download on sharebymail
Roeland Jago Douma [Thu, 12 Mar 2020 13:43:27 +0000 (14:43 +0100)]
Properly respect hide download on sharebymail
fixes #19484
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Nextcloud bot [Fri, 13 Mar 2020 02:18:18 +0000 (02:18 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Thu, 12 Mar 2020 18:58:16 +0000 (19:58 +0100)]
Merge pull request #19888 from nextcloud/fix/objectstore_rename_mimetype
Get correct mimetype on objectstores
Roeland Jago Douma [Thu, 12 Mar 2020 18:54:49 +0000 (19:54 +0100)]
Merge pull request #19899 from nextcloud/force-compatible-eventdispatcher-version-in-integration-tests
Force compatible EventDispatcher version in integration tests
Robin Appelman [Thu, 12 Mar 2020 18:45:23 +0000 (19:45 +0100)]
Use placeholder values for password fields in external storage webui
This prevents the password from being sent to the webui.
While an admin will always be able to retrieve the passwords (as they
can do arbitrairy code execution by design) this prevents casual
password snooping
Signed-off-by: Robin Appelman <robin@icewind.nl>
Julius Härtl [Thu, 12 Mar 2020 13:20:03 +0000 (14:20 +0100)]
Do not use the instance name as user part of from mail addresses
This will cause issues since the theming name can contain characters
that are not allowed in the local part of the mail address (like spaces)
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Joas Schilling [Thu, 12 Mar 2020 12:43:29 +0000 (13:43 +0100)]
Don't allow anchors and queries in remote urls
Signed-off-by: Joas Schilling <coding@schilljs.com>
Roeland Jago Douma [Thu, 12 Mar 2020 12:24:52 +0000 (13:24 +0100)]
Merge pull request #19902 from nextcloud/enh/noid/typo-portalm
Change Portalm to Portal
Daniel Kesselberg [Thu, 12 Mar 2020 10:41:19 +0000 (11:41 +0100)]
Change Portalm to Portal
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
Roeland Jago Douma [Thu, 12 Mar 2020 09:58:15 +0000 (10:58 +0100)]
Merge pull request #19892 from nextcloud/enh/installation-bundle
Move install scripts to a bundle
Daniel Calviño Sánchez [Thu, 12 Mar 2020 09:45:23 +0000 (10:45 +0100)]
Force compatible EventDispatcher version in integration tests
Nextcloud requires EventDispatcher from Symfony 4.4. Behat required
Symfony 4.x until Behat 3.5, but since Behat 3.6 it supports Symfony 5.x
too. However, as the EventDispatcher version was not restricted in the
"composer.json" file Composer installed the latest compatible version
with all the dependencies, which happened to be Symfony 5.x. To prevent
that now the EventDispatcher is explicitly limited to Symfony 4.4 only.
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
Joas Schilling [Thu, 12 Mar 2020 08:28:01 +0000 (09:28 +0100)]
Merge pull request #19587 from nextcloud/enh/add-guidelines-for-submitting-issues
Add guidelines for submitting issues
Joas Schilling [Thu, 12 Mar 2020 08:23:58 +0000 (09:23 +0100)]
Add a link to the portal directly
Signed-off-by: Joas Schilling <coding@schilljs.com>
John Molakvoæ [Thu, 12 Mar 2020 07:47:14 +0000 (08:47 +0100)]
Merge pull request #19777 from nextcloud/fix/viewer-public
Properly emit Viewer event on files and files_sharing
Nextcloud bot [Thu, 12 Mar 2020 02:19:02 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Wed, 11 Mar 2020 15:22:52 +0000 (16:22 +0100)]
Merge pull request #19822 from nextcloud/sftp-read-stream
Faster implementation of sftp read and write stream
Julius Härtl [Wed, 11 Mar 2020 13:23:21 +0000 (14:23 +0100)]
Bump bundles
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Wed, 11 Mar 2020 13:20:30 +0000 (14:20 +0100)]
Only load required scripts on install page
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Wed, 11 Mar 2020 13:19:38 +0000 (14:19 +0100)]
Use jquery-ui to only embed button components
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Julius Härtl [Wed, 11 Mar 2020 13:06:25 +0000 (14:06 +0100)]
Move install scripts to bundle
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Roeland Jago Douma [Wed, 11 Mar 2020 10:14:12 +0000 (11:14 +0100)]
Get correct mimetype on objectstores
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Joas Schilling [Wed, 11 Mar 2020 08:36:57 +0000 (09:36 +0100)]
Merge pull request #19861 from nextcloud/bugfix/noid/load-remote-shares-also-when-one-is-down
Don't break when one remote share is down
John Molakvoæ (skjnldsv) [Fri, 6 Mar 2020 14:44:42 +0000 (15:44 +0100)]
Use dispatchTyped
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
John Molakvoæ (skjnldsv) [Wed, 4 Mar 2020 12:51:40 +0000 (13:51 +0100)]
Properly emit Viewer event on files and files_sharing
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
John Molakvoæ (skjnldsv) [Wed, 4 Mar 2020 12:51:40 +0000 (13:51 +0100)]
Fix import order and formatting
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Roeland Jago Douma [Wed, 11 Mar 2020 06:43:47 +0000 (07:43 +0100)]
Merge pull request #19839 from nextcloud/dependabot/npm_and_yarn/nextcloud/vue-1.4.0
Bump @nextcloud/vue from 1.3.1 to 1.4.0
Nextcloud bot [Wed, 11 Mar 2020 02:19:03 +0000 (02:19 +0000)]
[tx-robot] updated from transifex
Roeland Jago Douma [Tue, 10 Mar 2020 19:30:52 +0000 (20:30 +0100)]
Merge pull request #19173 from nextcloud/bugfix/noid/fix-displayname-of-contacts-in-remote-activities
Use contacts name on federated activities
Roeland Jago Douma [Tue, 10 Mar 2020 19:10:54 +0000 (20:10 +0100)]
Merge pull request #19580 from nextcloud/debt/noid/outdated-check
Update check for outdated php version.
dependabot-preview[bot] [Tue, 10 Mar 2020 18:46:25 +0000 (18:46 +0000)]
Bump @nextcloud/vue from 1.3.1 to 1.4.0
Bumps [@nextcloud/vue](https://github.com/nextcloud/nextcloud-vue) from 1.3.1 to 1.4.0.
- [Release notes](https://github.com/nextcloud/nextcloud-vue/releases)
- [Commits](https://github.com/nextcloud/nextcloud-vue/compare/v1.3.1...v1.4.0)
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Roeland Jago Douma [Tue, 10 Mar 2020 18:45:40 +0000 (19:45 +0100)]
Merge pull request #19867 from Jose123456/error-logging
Set error_logging correctly. Fixes #19847
Roeland Jago Douma [Tue, 10 Mar 2020 18:39:03 +0000 (19:39 +0100)]
Merge pull request #19812 from nextcloud/enh/noid/subscription-config
Add config flag for subscription and hide server development notice
Joas Schilling [Fri, 7 Feb 2020 09:51:22 +0000 (10:51 +0100)]
Fix unit tests
Signed-off-by: Joas Schilling <coding@schilljs.com>
Joas Schilling [Tue, 28 Jan 2020 11:51:43 +0000 (12:51 +0100)]
Unify the code a bit
Signed-off-by: Joas Schilling <coding@schilljs.com>