build v3.4.3

nextcloud · Dec 5, 2018 · f54bdce · f54bdce
1 parent d71398a
commit f54bdce
Show file tree

Hide file tree

Showing 26 changed files with 410 additions and 182 deletions.
diff --git a/appinfo/info.xml b/appinfo/info.xml
@@ -5,7 +5,7 @@
    <name>JavaScript XMPP Chat</name>
    <summary>Facebook-like chat</summary>
    <description>Facebook-like chat with end-to-end encrypted conversation, video calls, multi-user rooms, XMPP and internal server backend.</description>
-   <version>3.4.2</version>
+   <version>3.4.3</version>
    <licence>agpl</licence>
    <author mail="[email protected]">Klaus Herberth</author>
    <author>Tobia De Koninck</author>

diff --git a/build/appinfo/app.php b/build/appinfo/app.php
@@ -73,7 +73,7 @@
    $config->setAppValue('ojsxc', 'apiSecret', $apiSecret);
 }
 
-if (Application::getServerType() === 'internal') {
+if (Application::getServerType() === Application::INTERNAL) {
 	Hooks::register();
 }
 

diff --git a/build/appinfo/application.php b/build/appinfo/application.php
@@ -2,16 +2,17 @@
 
 namespace OCA\OJSXC\AppInfo;
 
+use OCA\DAV\Server;
 use OCA\OJSXC\Controller\ManagedServerController;
 use OCA\OJSXC\Controller\SettingsController;
 use OCA\OJSXC\Controller\ExternalApiController;
 use OCA\OJSXC\Middleware\ExternalApiMiddleware;
 use OCA\OJSXC\Command\RefreshRoster;
+use OCA\OJSXC\Command\ServerSharing;
 use OCA\OJSXC\Controller\HttpBindController;
 use OCA\OJSXC\Db\IQRosterPushMapper;
 use OCA\OJSXC\Db\MessageMapper;
 use OCA\OJSXC\Db\PresenceMapper;
-use OCA\OJSXC\Db\Stanza;
 use OCA\OJSXC\Db\StanzaMapper;
 use OCA\OJSXC\Migration\RefreshRoster as RefreshRosterMigration;
 use OCA\OJSXC\NewContentContainer;
@@ -31,7 +32,6 @@
 use OCP\AppFramework\App;
 use OCP\IContainer;
 use OCP\IRequest;
-use OCP\IUserBackend;
 
 class Application extends App {
 
@@ -64,7 +64,7 @@ public function __construct(array $urlParams=array()){
 			return new HttpBindController(
 				$c->query('AppName'),
 				$c->query('Request'),
-				$c->query('OJSXC_UserId'),
+				$c->query('UserId'),
 				$c->query('StanzaMapper'),
 				$c->query('IQHandler'),
 				$c->query('MessageHandler'),
@@ -161,7 +161,7 @@ public function __construct(array $urlParams=array()){
 			return new PresenceMapper(
 				$container->getServer()->getDatabaseConnection(),
 				$c->query('Host'),
-				$c->query('OJSXC_UserId'),
+				$c->query('UserId'),
 				$c->query('MessageMapper'),
 				$c->query('NewContentContainer'),
 				self::$config['polling']['timeout'],
@@ -175,7 +175,7 @@ public function __construct(array $urlParams=array()){
 		 */
 		$container->registerService('IQHandler', function(IContainer $c) {
 			return new IQ(
-				$c->query('OJSXC_UserId'),
+				$c->query('UserId'),
 				$c->query('Host'),
 				$c->query('OCP\IUserManager'),
 				$c->query('OCP\IConfig'),
@@ -185,7 +185,7 @@ public function __construct(array $urlParams=array()){
 
 		$container->registerService('PresenceHandler', function(IContainer $c) {
 			return new Presence(
-				$c->query('OJSXC_UserId'),
+				$c->query('UserId'),
 				$c->query('Host'),
 				$c->query('PresenceMapper'),
 				$c->query('MessageMapper')
@@ -194,7 +194,7 @@ public function __construct(array $urlParams=array()){
 
 		$container->registerService('MessageHandler', function(IContainer $c) {
 			return new Message(
-				$c->query('OJSXC_UserId'),
+				$c->query('UserId'),
 				$c->query('Host'),
 				$c->query('MessageMapper'),
 				$c->query('UserProvider'),
@@ -276,6 +276,12 @@ public function __construct(array $urlParams=array()){
 			);
 		});
 
+		$container->registerService('ServerSharingCommand', function($c) {
+			return new ServerSharing(
+				$c->query('OCP\IConfig')
+			);
+		});
+
 		/**
 		 * A modified userID for use in OJSXC.
 		 * This is automatically made lowercase.
@@ -325,7 +331,7 @@ private function getLock() {
 			} else if ($cache->isAvailable()) {
 				$memcache = $cache->create('ojsxc');
 				return new MemLock(
-					$c->query('OJSXC_UserId'),
+					$c->query('UserId'),
 					$memcache
 				);
 			} else {
@@ -335,7 +341,7 @@ private function getLock() {
 
 		// default
 		return new DbLock(
-			$c->query('OJSXC_UserId'),
+			$c->query('UserId'),
 			$c->query('OCP\IConfig'),
 			$c->getServer()->getDatabaseConnection()
 		);
@@ -386,7 +392,11 @@ public static function convertToRealUID($providedUid) {
 	 */
 	public static function contactsStoreApiSupported() {
 		$version = \OCP\Util::getVersion();
-		return $version[0] >= 13;
+		if ($version[0] >= 13 && \OC::$server->getConfig()->getAppValue('ojsxc', 'use_server_sharing_settings', 'no') === 'yes') {
+			// ContactsStore API is supported and feature is enabled
+			return true;
+		}
+		return false;
 	}
 
 	public static function getServerType() {

diff --git a/build/appinfo/info.xml b/build/appinfo/info.xml
@@ -5,7 +5,7 @@
    <name>JavaScript XMPP Chat</name>
    <summary>Facebook-like chat</summary>
    <description>Facebook-like chat with end-to-end encrypted conversation, video calls, multi-user rooms, XMPP and internal server backend.</description>
-   <version>3.4.2</version>
+   <version>3.4.3</version>
    <licence>agpl</licence>
    <author mail="[email protected]">Klaus Herberth</author>
    <author>Tobia De Koninck</author>
@@ -37,7 +37,7 @@
       <lib>xmlreader</lib>
       <lib>xmlwriter</lib>
       <lib>dom</lib>
-      <nextcloud min-version="12" max-version="14"/>
+      <nextcloud min-version="12" max-version="16"/>
    </dependencies>
 
    <repair-steps>

diff --git a/build/appinfo/register_command.php b/build/appinfo/register_command.php
@@ -5,4 +5,5 @@
 $app = new Application();
 
 /** @var Symfony\Component\Console\Application $application */
-$application->add($app->getContainer()->query('RefreshRosterCommand'));
+$application->add($app->getContainer()->query('RefreshRosterCommand'));
+$application->add($app->getContainer()->query('ServerSharingCommand'));
diff --git a/build/css/jquery-ui.min.css b/build/css/jquery-ui.min.css
diff --git a/build/css/jsxc.oc.css b/build/css/jsxc.oc.css
@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.4.2 - 2018-09-05
+ * ojsxc v3.4.3 - 2018-12-05
  * 
  * Copyright (c) 2018 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 3.4.2
+ * @version 3.4.3
  * @license MIT
  */
 
@@ -2925,9 +2925,6 @@ fieldset[disabled]
     resize: none;
     transition: height 0.5s;
     font-size: 13px; }
-  .jsxc_window textarea::-webkit-input-placeholder {
-    color: #000;
-    opacity: 0.3; }
   .jsxc_window textarea::-moz-placeholder {
     color: #000;
     opacity: 0.3; }
@@ -3114,15 +3111,14 @@ fieldset[disabled]
   .jsxc_in .jsxc_timestamp {
     float: left; }
 
-.jsxc_out {
+.jsxc_out, .jsxc_probably_out {
   float: right;
   position: relative;
   max-width: 76%;
   margin-right: 10px;
   padding-right: 10px;
-  border-radius: 3px;
-  background-color: #e6ffd1; }
-  .jsxc_out:after {
+  border-radius: 3px; }
+  .jsxc_out:after, .jsxc_probably_out:after {
     content: " ";
     position: absolute;
     border-style: solid;
@@ -3133,19 +3129,22 @@ fieldset[disabled]
     z-index: 1;
     right: -6px;
     bottom: 10px; }
-  .jsxc_out.jsxc_received:before {
+  .jsxc_out.jsxc_received:before, .jsxc_probably_out.jsxc_received:before {
     content: "✓";
     position: absolute;
     bottom: 2px;
     right: 2px;
     font-size: 12px;
     line-height: 12px;
     color: #008000; }
-  .jsxc_out.jsxc_received .jsxc_timestamp {
+  .jsxc_out.jsxc_received .jsxc_timestamp, .jsxc_probably_out.jsxc_received .jsxc_timestamp {
     margin-right: 4px; }
-  .jsxc_out .jsxc_timestamp {
+  .jsxc_out .jsxc_timestamp, .jsxc_probably_out .jsxc_timestamp {
     float: right; }
 
+.jsxc_out {
+  background-color: #e6ffd1; }
+
 .jsxc_sys {
   width: auto;
   max-width: none;
@@ -3546,8 +3545,7 @@ ul.jsxc_vCard {
   border-color: #4cae4c; }
 
 .jsxc_oneway .jsxc_avatar {
-  -webkit-filter: grayscale(100%);
-          filter: grayscale(100%); }
+  filter: grayscale(100%); }
 
 img.jsxc_vCard {
   float: right;
@@ -3615,8 +3613,7 @@ img.jsxc_vCard {
   z-index: 110;
   margin: 8px 2px 5px 10px;
   right: 0;
-  -webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
-          filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
+  filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
   padding: 4px 12px;
   padding-left: 5px; }
   .jsxc_menu:after {
@@ -4089,6 +4086,9 @@ div.jsxc_video {
   100% {
     background-position-x: 0%; } }
 
+.jsxc_avatar {
+  font-family: 'Nunito', 'Open Sans', Frutiger, Calibri, 'Myriad Pro', Myriad, sans-serif; }
+
 #jsxc_roster {
   padding-top: 5px;
   top: 45px;
@@ -4111,8 +4111,18 @@ div.jsxc_video {
     #jsxc a:hover {
       text-decoration: none; }
 
+#jsxc_submit_wrapper {
+  display: -ms-flexbox;
+  display: flex;
+  -ms-flex-align: center;
+      align-items: center;
+  -ms-flex-pack: center;
+      justify-content: center;
+  position: relative; }
+
 #jsxc_submit {
   font-size: 15px;
+  height: auto;
   padding: 3px 5px;
   opacity: 1;
   font-weight: normal; }
@@ -4236,7 +4246,7 @@ div.jsxc_video {
   #content, #content-wrapper, #filestable > thead {
     padding-right: 0;
     transition: padding-right 0.5s; }
-  #mainContainer, #odf-toolbar, #app-sidebar {
+  #mainContainer, #odf-toolbar, #app-sidebar, #view-toggle {
     right: 0;
     transition: right 0.5s; }
   .app-mail .submit-message-wrapper {
@@ -4245,7 +4255,7 @@ div.jsxc_video {
       transition: right 0.5s; }
   .jsxc-roster-shown #content, .jsxc-roster-shown #content-wrapper, .jsxc-roster-shown #filestable > thead {
     padding-right: 210px; }
-  .jsxc-roster-shown #mainContainer, .jsxc-roster-shown #odf-toolbar, .jsxc-roster-shown #app-sidebar {
+  .jsxc-roster-shown #mainContainer, .jsxc-roster-shown #odf-toolbar, .jsxc-roster-shown #app-sidebar, .jsxc-roster-shown #view-toggle {
     right: 210px; }
   .jsxc-roster-shown .app-mail .submit-message-wrapper {
     right: 225px; }

diff --git a/build/js/eof.js b/build/js/eof.js
@@ -1,13 +1,13 @@
 /*!
- * ojsxc v3.4.2 - 2018-09-05
+ * ojsxc v3.4.3 - 2018-12-05
  * 
  * Copyright (c) 2018 Klaus Herberth <[email protected]> <br>
  * Released under the MIT license
  * 
  * Please see http://www.jsxc.org/
  * 
  * @author Klaus Herberth <[email protected]>
- * @version 3.4.2
+ * @version 3.4.3
  * @license MIT
  */
 

diff --git a/build/js/jsxc/css/jsxc.css b/build/js/jsxc/css/jsxc.css
@@ -2912,9 +2912,6 @@ fieldset[disabled]
     resize: none;
     transition: height 0.5s;
     font-size: 13px; }
-  .jsxc_window textarea::-webkit-input-placeholder {
-    color: #000;
-    opacity: 0.3; }
   .jsxc_window textarea::-moz-placeholder {
     color: #000;
     opacity: 0.3; }
@@ -3101,15 +3098,14 @@ fieldset[disabled]
   .jsxc_in .jsxc_timestamp {
     float: left; }
 
-.jsxc_out {
+.jsxc_out, .jsxc_probably_out {
   float: right;
   position: relative;
   max-width: 76%;
   margin-right: 10px;
   padding-right: 10px;
-  border-radius: 3px;
-  background-color: #e6ffd1; }
-  .jsxc_out:after {
+  border-radius: 3px; }
+  .jsxc_out:after, .jsxc_probably_out:after {
     content: " ";
     position: absolute;
     border-style: solid;
@@ -3120,19 +3116,22 @@ fieldset[disabled]
     z-index: 1;
     right: -6px;
     bottom: 10px; }
-  .jsxc_out.jsxc_received:before {
+  .jsxc_out.jsxc_received:before, .jsxc_probably_out.jsxc_received:before {
     content: "✓";
     position: absolute;
     bottom: 2px;
     right: 2px;
     font-size: 12px;
     line-height: 12px;
     color: #008000; }
-  .jsxc_out.jsxc_received .jsxc_timestamp {
+  .jsxc_out.jsxc_received .jsxc_timestamp, .jsxc_probably_out.jsxc_received .jsxc_timestamp {
     margin-right: 4px; }
-  .jsxc_out .jsxc_timestamp {
+  .jsxc_out .jsxc_timestamp, .jsxc_probably_out .jsxc_timestamp {
     float: right; }
 
+.jsxc_out {
+  background-color: #e6ffd1; }
+
 .jsxc_sys {
   width: auto;
   max-width: none;
@@ -3533,8 +3532,7 @@ ul.jsxc_vCard {
   border-color: #4cae4c; }
 
 .jsxc_oneway .jsxc_avatar {
-  -webkit-filter: grayscale(100%);
-          filter: grayscale(100%); }
+  filter: grayscale(100%); }
 
 img.jsxc_vCard {
   float: right;
@@ -3602,8 +3600,7 @@ img.jsxc_vCard {
   z-index: 110;
   margin: 8px 2px 5px 10px;
   right: 0;
-  -webkit-filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
-          filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
+  filter: drop-shadow(0 0 5px rgba(150, 150, 150, 0.75));
   padding: 4px 12px;
   padding-left: 5px; }
   .jsxc_menu:after {