Test CI

.circleci/config.yml

@@ -1,6 +1,6 @@
 version: 2.1
 orbs:
-  win: circleci/windows@1.0.0
+  # win: circleci/windows@1.0.0
   aws-s3: circleci/aws-s3@1.0.11
   owasp: entur/owasp@0.0.10
 
@@ -61,6 +61,7 @@ commands:
         type: string
         default: ""
     steps:
+      - run: wget -qO - https://download.opensuse.org/repositories/Emulators:/Wine:/Debian/xUbuntu_18.04/Release.key | apt-key add -
       - run: apt-get update && apt-get -y install << parameters.apt_opts >>
       - run: npm ci
 
@@ -388,7 +389,6 @@ workflows:
   version: 2
   build_and_test:
     jobs:
-      - check
       - begin-notification:
           context: desktop-notify
           filters:
@@ -398,57 +398,12 @@ workflows:
                 # release-XX.YY.ZZ
                 # release-XX.YY.ZZ-rc-something
                 - /^release-\d+(\.\d+){1,2}(-rc.*)?/
-      - build-linux:
-          requires:
-            - check
-      - check-deps:
-          context: sast-webhook
-          requires:
-            - build-linux
-
-      - build-win-no-installer:
-          requires:
-            - check
-          filters:
-            branches:
-              ignore:
-                - /^release-\d+(\.\d+){1,2}(-rc.*)?/
-
-      - build-mac-no-dmg:
-          requires:
-            - check
-          filters:
-            branches:
-              ignore:
-                - /^release-\d+(\.\d+){1,2}(-rc.*)?/
-
-      - msi_installer:
-          requires:
-            - check
-          context: windows-codesign
-          filters:
-            branches:
-              only:
-                # only for release and release candidates
-                # release-XX.YY.ZZ
-                # release-XX.YY.ZZ-rc-something
-                - /^release-\d+(\.\d+){1,2}(-rc.*)?/
-
-      - mac_installer:
-          requires:
-            - check
-          context: codesign-certificates
-          filters:
-            branches:
-              only:
-                - /^release-\d+(\.\d+){1,2}(-rc.*)?/
+      - build-linux
 
       - store_artifacts:
           # for master/PR builds
           requires:
             - build-linux
-            - build-win-no-installer
-            - build-mac-no-dmg
           filters:
             branches:
               ignore:
@@ -457,8 +412,6 @@ workflows:
       - upload_to_s3:
           # for release builds
           requires:
-            - msi_installer
-            - mac_installer
             - build-linux
           context: mattermost-release-s3
           filters:

NOTICE.txt

@@ -217,55 +217,103 @@ SOFTWARE.
 
 ---
 
-## prop-types
+## font-awesome
 
-This product contains 'prop-types' by Facebook.
+This product contains 'font-awesome' by Fort Awesome.
 
-Runtime type checking for React props and similar objects.
+The iconic SVG, font, and CSS framework
 
 * HOMEPAGE:
-  * https://facebook.github.io/react/
+  * https://github.com/FortAwesome/Font-Awesome
 
-* LICENSE: MIT
+* LICENSE: Font Awesome Free License
+-------------------------
 
-MIT License
+Font Awesome Free is free, open source, and GPL friendly. You can use it for
+commercial projects, open source projects, or really almost whatever you want.
+Full Font Awesome Free license: https://fontawesome.com/license/free.
 
-Copyright (c) 2013-present, Facebook, Inc.
+# Icons: CC BY 4.0 License (https://creativecommons.org/licenses/by/4.0/)
+In the Font Awesome Free download, the CC BY 4.0 license applies to all icons
+packaged as SVG and JS file types.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
+# Fonts: SIL OFL 1.1 License (https://scripts.sil.org/OFL)
+In the Font Awesome Free download, the SIL OFL license applies to all icons
+packaged as web and desktop font files.
 
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
+# Code: MIT License (https://opensource.org/licenses/MIT)
+In the Font Awesome Free download, the MIT license applies to all non-font and
+non-icon files.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
+# Attribution
+Attribution is required by MIT, SIL OFL, and CC BY licenses. Downloaded Font
+Awesome Free files already contain embedded comments with sufficient
+attribution, so you shouldn't need to do anything additional when using these
+files normally.
+
+We've kept attribution comments terse, so we ask that you do not actively work
+to remove them from files, especially code. They're a great way for folks to
+learn about Font Awesome.
+
+# Brand Icons
+All brand icons are trademarks of their respective owners. The use of these
+trademarks does not indicate endorsement of the trademark holder by Font
+Awesome, nor vice versa. **Please do not use brand logos for any purpose except
+to represent the company, product, or service to which they refer.**
 
 ---
 
-## react
+## hapi/joi
 
-This product contains 'react' by Facebook.
+This product contains 'hapi/joi' by Sideway Inc.
 
-React is a JavaScript library for building user interfaces.
+The most powerful schema description language and data validator for JavaScript.
 
 * HOMEPAGE:
-  * https://reactjs.org/
+  * https://github.com/sideway/joi
+
+* LICENSE: BSD-3-Clause
+
+Copyright (c) 2012-2020, Sideway Inc, and project contributors.
+Copyright (c) 2012-2014, Walmart.
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met:
+
+Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer.
+Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution.
+The names of any contributors may not be used to endorse or promote products derived from this software without specific prior written permission.
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDERS AND CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+---
+
+## jq
+
+This product contains 'jq' by Stephen Dolan.
+
+jq is a lightweight and flexible command-line JSON processor.
+
+* HOMEPAGE:
+  * https://github.com/stedolan/jq
+
+* LICENSE: MIT
+
+---
+
+## prop-types
+
+This product contains 'prop-types' by Facebook.
+
+Runtime type checking for React props and similar objects.
+
+* HOMEPAGE:
+  * https://facebook.github.io/react/
 
 * LICENSE: MIT
 
 MIT License
 
-Copyright (c) Facebook, Inc. and its affiliates.
+Copyright (c) 2013-present, Facebook, Inc.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -322,41 +370,6 @@ THE SOFTWARE.
 
 ---
 
-## react-dom
-
-This product contains 'react-dom' by Facebook.
-
-React package for working with the DOM.
-
-* HOMEPAGE:
-  * https://reactjs.org/
-
-* LICENSE: MIT
-
-MIT License
-
-Copyright (c) Facebook, Inc. and its affiliates.
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-
----
-
 ## react-transition-group
 
 This product contains 'react-transition-group' by React Community.
@@ -854,6 +867,40 @@ OTHER DEALINGS IN THE SOFTWARE.
 
 ---
 
+## valid-url
+
+This product contains 'valid-url' by Odysseas Tsatalos.
+
+URL validation
+
+* HOMEPAGE:
+  * https://github.com/ogt/valid-url
+
+* LICENSE: MIT
+
+Copyright (c) 2013 Odysseas Tsatalos and oDesk Corporation
+
+This software is released under the MIT license:
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of
+this software and associated documentation files (the "Software"), to deal in
+the Software without restriction, including without limitation the rights to
+use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
+the Software, and to permit persons to whom the Software is furnished to do so,
+subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
+FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
+IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
+CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
+---
+
 ## winreg
 
 This product contains 'winreg' by Paul Bottin.
@@ -877,6 +924,46 @@ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
 
 ---
 
+## wix
+
+This product contains 'wix' by WiX Toolset.
+
+The WiX Toolset builds Windows installation packages from XML source code.
+
+* HOMEPAGE:
+  * https://github.com/wixtoolset/wix3
+
+* LICENSE: Copyright (c) .NET Foundation and contributors.
+This software is released under the Microsoft Reciprocal License (MS-RL) (the "License"); you may not use the software except in compliance with the License.
+
+The text of the Microsoft Reciprocal License (MS-RL) can be found online at:
+ http://opensource.org/licenses/ms-rl
+
+
+Microsoft Reciprocal License (MS-RL)
+
+This license governs use of the accompanying software. If you use the software, you accept this license. If you do not accept the license, do not use the software.
+
+1. Definitions
+ The terms "reproduce," "reproduction," "derivative works," and "distribution" have the same meaning here as under U.S. copyright law.
+ A "contribution" is the original software, or any additions or changes to the software.
+ A "contributor" is any person that distributes its contribution under this license.
+ "Licensed patents" are a contributor's patent claims that read directly on its contribution.
+
+2. Grant of Rights
+ (A) Copyright Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free copyright license to reproduce its contribution, prepare derivative works of its contribution, and distribute its contribution or any derivative works that you create.
+ (B) Patent Grant- Subject to the terms of this license, including the license conditions and limitations in section 3, each contributor grants you a non-exclusive, worldwide, royalty-free license under its licensed patents to make, have made, use, sell, offer for sale, import, and/or otherwise dispose of its contribution in the software or derivative works of the contribution in the software.
+
+3. Conditions and Limitations
+ (A) Reciprocal Grants- For any file you distribute that contains code from the software (in source code or binary format), you must provide recipients the source code to that file along with a copy of this license, which license will govern that file. You may license other files that are entirely your own work and do not contain code from the software under any terms you choose.
+ (B) No Trademark License- This license does not grant you rights to use any contributors' name, logo, or trademarks.
+ (C) If you bring a patent claim against any contributor over patents that you claim are infringed by the software, your patent license from such contributor to the software ends automatically.
+ (D) If you distribute any portion of the software, you must retain all copyright, patent, trademark, and attribution notices that are present in the software.
+ (E) If you distribute any portion of the software in source code form, you may do so only under this license by including a complete copy of this license with your distribution. If you distribute any portion of the software in compiled or object code form, you may only do so under a license that complies with this license.
+ (F) The software is licensed "as-is." You bear the risk of using it. The contributors give no express warranties, guarantees or conditions. You may have additional consumer rights under your local laws which this license cannot change. To the extent permitted under your local laws, the contributors exclude the implied warranties of merchantability, fitness for a particular purpose and non-infringement.
+
+---
+
 ## yargs
 
 This product contains 'yargs' by Yargs Contributors.

package.json

@@ -1,7 +1,7 @@
 {
   "name": "mattermost-desktop",
   "productName": "Mattermost",
-  "version": "4.6.0-develop",
+  "version": "4.6.1",
   "description": "Mattermost",
   "main": "main.js",
   "author": "Mattermost, Inc. <feedback@mattermost.com>",
@@ -32,7 +32,7 @@
     "package:all": "cross-env NODE_ENV=production npm-run-all check-build-config package:windows package:mac package:linux",
     "package:windows": "cross-env NODE_ENV=production npm-run-all check-build-config build && electron-builder --win --x64 --ia32 --publish=never",
     "package:mac": "cross-env NODE_ENV=production npm-run-all check-build-config build && electron-builder --mac --publish=never",
-    "package:linux": "cross-env NODE_ENV=production npm-run-all check-build-config build && electron-builder --linux --x64 --ia32 --publish=never",
+    "package:linux": "cross-env NODE_ENV=production npm-run-all check-build-config build && electron-builder --linux --x64 --publish=never",
     "lint:js": "eslint --ignore-path .gitignore --ignore-pattern node_modules --ext .js --ext .jsx .",
     "lint:js-quiet": "eslint --ignore-path .gitignore --ignore-pattern node_modules --ext .js --ext .jsx . --quiet",
     "fix:js": "eslint --ignore-path .gitignore --ignore-pattern node_modules --quiet --ext .js --ext .jsx . --fix",

src/browser/components/MainPage.jsx

@@ -526,7 +526,7 @@ export default class MainPage extends React.Component {
 
   handleTargetURLChange = (targetURL) => {
     clearTimeout(this.targetURLDisappearTimeout);
-    if (targetURL === '') {
+    if (targetURL === '' || this.parseDeeplinkURL(targetURL, [this.props.teams[this.state.key]])) { // Do not show URL for internal links on current team
       // set delay to avoid momentary disappearance when hovering over multiple links
       this.targetURLDisappearTimeout = setTimeout(() => {
         this.setState({targetURL: ''});
@@ -632,7 +632,7 @@ export default class MainPage extends React.Component {
     const title = process.platform === 'win32' ? item.serverInfo.name : 'Download Complete';
     const notificationBody = process.platform === 'win32' ? `Download Complete \n ${item.fileName}` : item.fileName;
 
-    await Utils.dispatchNotification(title, notificationBody, false, () => {
+    await Utils.dispatchNotification(title, notificationBody, false, {}, () => {
       shell.showItemInFolder(item.path.normalize());
     });
   }