fix calendar secret links

Peergos · Jul 29, 2024 · 3e5d09a · 3e5d09a
1 parent e685f4f
commit 3e5d09a
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/mixins/router/index.js b/src/mixins/router/index.js
@@ -182,7 +182,8 @@ module.exports = {
             if (pathParts.length >= 4) {
                 if (pathParts[0] == '' &&
                     pathParts[2] == '.apps' &&
-                    pathParts[3] == 'calendar')
+                    pathParts[3] == 'calendar' &&
+                    pathParts.length <= 6)
                     return "Calendar";
                 if (pathParts[0] == '' &&
                     pathParts[2] == '.messaging')

diff --git a/src/views/Drive.vue b/src/views/Drive.vue
@@ -997,6 +997,7 @@ module.exports = {
                                         var open = () => {
                                             const oneFile = that.files.length == 1;
                                             const openSubdir = props.args != null && props.args.path != null;
+                                            const appDir = "Drive" != that.getApp(that.currentDir, linkPath);
                                             if (props.args != null && props.args.filename != null && props.args.filename != "") {
                                                 // if props name a file, open it
                                                 that.appArgs = props.args;
@@ -1011,7 +1012,7 @@ module.exports = {
 					        var app = props.app || that.getApp(that.currentDir, that.getPath, false);
                                                 that.openInApp(props.args, app);
                                                 that.openFileOrDir(app, that.getPath, props.args, false);
-                                            } else if (oneFile) { // if there is exactly 1 file, open it
+                                            } else if (oneFile && !appDir) { // if there is exactly 1 file, open it
                                                 const filename = that.files[0].getName();
                                                 that.selectedFiles = that.files;
 					                            let inbuiltApps = that.getInbuiltApps(that.files[0]);