Refactor/broadcast to mercure ng

.eslintrc.js

@@ -48,11 +48,9 @@ module.exports = {
 	extends: [
 		'eslint:recommended',
 		'plugin:node/recommended',
-		'plugin:vue/essential',
-		'plugin:vue/recommended',
 		'standard'
 	],
-	plugins: ['vue', 'node'],
+	plugins: ['node'],
 	rules: {
 		// space before function ()
 		'space-before-function-paren': ['error', 'never'],
@@ -65,7 +63,6 @@ module.exports = {
 		// tabs only
 		indent: ['error', 'tab'],
 		'no-tabs': 0,
-		'vue/html-indent': ['error', 'tab'],
 		// only debug console
 		'no-console': ['error', {allow: ['error', 'warn', 'debug']}],
 		// classes blocks
@@ -76,27 +73,7 @@ module.exports = {
 		'multiline-ternary': ['error', 'always-multiline'],
 		// es6 import/export and require
 		'node/no-unpublished-require': ['off'],
-		'node/no-unsupported-features/es-syntax': ['off'],
-		// kebab case components for vuejs
-		'vue/component-name-in-template-casing': ['error', 'kebab-case'],
-		// space before self-closing elements
-		'vue/html-closing-bracket-spacing': 'error',
-		// newline before closing bracket
-		'vue/html-closing-bracket-newline': ["error", {
-			"singleline": "never",
-			"multiline": "never"
-		}
-		],
-		// code spacing with attributes
-		'vue/max-attributes-per-line': [
-			'error',
-			{
-				singleline: 3,
-				multiline: {
-					max: 3,
-					allowFirstLine: true
-				}
-			}
+		'node/no-unsupported-features/es-syntax': ['off']
 		]
 	}
 }

appinfo/info.xml

@@ -8,7 +8,7 @@
 
 	]]>
 	</description>
-	<version>0.6.10</version>
+	<version>0.7.0</version>
 	<licence>agpl</licence>
 	<author>Maxence Lange</author>
 	<namespace>Push</namespace>
@@ -19,12 +19,7 @@
 	<website>https://github.com/nextcloud/push</website>
 	<bugs>https://github.com/nextcloud/push/issues</bugs>
 	<repository>https://github.com/nextcloud/push.git</repository>
-	<screenshot>https://raw.githubusercontent.com/nextcloud/push/master/screenshots/0.3.0.png</screenshot>
 	<dependencies>
-		<nextcloud min-version="18" max-version="18"/>
+		<nextcloud min-version="20" max-version="20"/>
 	</dependencies>
-
-	<commands>
-		<command>OCA\Push\Command\Test</command>
-	</commands>
 </info>

composer.json

@@ -10,7 +10,6 @@
     }
   ],
   "require": {
-    "daita/my-small-php-tools": "dev-master"
   },
   "scripts": {
     "lint": "find . -name \\*.php -not -path './vendor/*' -exec php -l \"{}\" \\;"

lib/AppInfo/Application.php

@@ -1,6 +1,4 @@
-<?php
-declare(strict_types=1);
-
+<?php declare(strict_types=1);
 
 /**
  * Push - Nextcloud Push Service
@@ -27,77 +25,36 @@
  *
  */
 
-
 namespace OCA\Push\AppInfo;
 
-
-use OC;
-use OCA\Push\Helper\PushHelper;
-use OCA\Push\Service\Extensions\NextcloudFilesAppService;
-use OCA\Push\Service\PushService;
+use OCA\Push\Listener\CspListener;
+use OCA\Push\Service\PushClient;
 use OCP\AppFramework\App;
+use OCP\AppFramework\Bootstrap\IBootContext;
+use OCP\AppFramework\Bootstrap\IBootstrap;
+use OCP\AppFramework\Bootstrap\IRegistrationContext;
 use OCP\AppFramework\IAppContainer;
-use OCP\AppFramework\QueryException;
-use OCP\Push\IPushManager;
-use OCP\Util;
-
-
-/**
- * Class Application
- *
- * @package OCA\Push\AppInfo
- */
-class Application extends App {
+use OCP\EventDispatcher\IEventDispatcher;
+use OCP\Push\IManager;
+use OCP\Security\CSP\AddContentSecurityPolicyEvent;
 
+class Application extends App implements IBootstrap {
 
 	const APP_NAME = 'push';
 
-
-	/** @var IAppContainer */
-	private $container;
-
-
 	/**
 	 * @param array $params
 	 */
 	public function __construct(array $params = []) {
 		parent::__construct(self::APP_NAME, $params);
-
-		$this->container = $this->getContainer();
 	}
 
-
-	/**
-	 *
-	 */
-	public function registerPush() {
-		try {
-			/** @var IPushManager $pushManager */
-			$pushManager = $this->container->query(IPushManager::class);
-			$pushService = $this->container->query(PushService::class);
-			$pushHelper = $this->container->query(PushHelper::class);
-			$pushManager->registerPushApp($pushService, $pushHelper);
-
-			Util::addScript('push', 'polling');
-		} catch (QueryException $e) {
-			OC::$server->getLogger()
-					   ->log(1, 'issue while registering Nextcloud Push : ' . $e->getMessage());
-		}
+	public function register(IRegistrationContext $context): void {
+		$context->registerPushApp(PushClient::class);
+		$context->registerEventListener(AddContentSecurityPolicyEvent::class, CspListener::class);
 	}
 
+	public function boot(IBootContext $context): void {
 
-	/**
-	 *
-	 */
-	public function registerExtensions() {
-		$eventDispatcher = OC::$server->getEventDispatcher();
-		try {
-			$extendsFilesApp = $this->container->query(NextcloudFilesAppService::class);
-			$extendsFilesApp->attach($eventDispatcher);
-		} catch (QueryException $e) {
-		}
 	}
-
-
 }
-