Merge pull request #66 from Praxxian/develop

Release 4.0.0
Praxxian · Dec 28, 2024 · 9e9224e · 9e9224e
2 parents df82b15 + f36c41a
commit 9e9224e
Show file tree

Hide file tree

Showing 9 changed files with 17 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,7 @@
 # Lava Flow
 
-
+## Release 4.0.0 (2024-12-27)
+- Fixed v12 compatibility issues (permissions, folder creation).
 
 ## Release 3.1.0 (2024-04-01)
 - Notes can be turned into pages within a single Journal Entry.

diff --git a/README.md b/README.md
@@ -21,6 +21,7 @@ I highly recommend using the latest version of Foundry supported by the module,
 | v1.\* | v9 |
 | v2.\* | v10 |
 | v3.\* | v11 |
+| v4.\* | v12 |
 
 ## How to Use
 

diff --git a/bundle/lava-flow.zip b/bundle/lava-flow.zip
diff --git a/bundle/module.json b/bundle/module.json
@@ -2,7 +2,7 @@
   "name": "lava-flow",
   "title": "Lava Flow",
   "description": "A module for importing Obsidian MD vaults into Foundry VTT as journal entries.",
-  "version": "3.1.0",
+  "version": "4.0.0",
   "authors": [
     {
       "name": "Chase Burke"
@@ -17,8 +17,8 @@
   "languages": [{ "lang": "en", "name": "English", "path": "lang/en.json" }],
   "url": "https://github.com/Praxxian/lava-flow",
   "license": "https://github.com/Praxxian/lava-flow/LICENSE",
-  "manifest": "https://github.com/Praxxian/lava-flow/releases/download/3.1.0/module.json",
-  "download": "https://github.com/Praxxian/lava-flow/releases/download/3.1.0/lava-flow.zip",
+  "manifest": "https://github.com/Praxxian/lava-flow/releases/download/4.0.0/module.json",
+  "download": "https://github.com/Praxxian/lava-flow/releases/download/4.0.0/lava-flow.zip",
   "readme": "https://github.com/Praxxian/lava-flow/README.md",
   "changelog": "https://github.com/Praxxian/lava-flow/CHANGELOG.md"
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,9 +1,9 @@
 {
   "name": "lava-flow",
   "title": "Lava Flow",
-  "version": "3.1.0",
+  "version": "4.0.0",
   "description": "A module for importing Obsidian MD vaults into Foundry VTT as journal entries.",
-  "devDir": "C:\\Users\\cburk\\AppData\\Local\\FoundryVTT\\Data\\modules",
+  "devDir": "C:\\Users\\Chase\\AppData\\Local\\FoundryVTT\\Data\\modules",
   "main": "src/index.ts",
   "scripts": {
     "lint": "eslint . --ext .ts --quiet --fix",

diff --git a/src/lava-flow-form.ts b/src/lava-flow-form.ts
@@ -37,7 +37,7 @@ export class LavaFlowForm extends FormApplication {
       sheetConfig: false,
     };
 
-    const mergedOptions = mergeObject(defaults, overrides);
+    const mergedOptions = foundry.utils.mergeObject(defaults, overrides);
 
     return mergedOptions;
   }

diff --git a/src/lava-flow.ts b/src/lava-flow.ts
@@ -303,8 +303,11 @@ export default class LavaFlow {
       name: journalName,
       folder: parentFolder?.id,
     };
-    if (playerObserve && entryData.permission !== undefined && entryData.permission !== null)
-      entryData.permission.default = CONST.DOCUMENT_PERMISSION_LEVELS.OBSERVER;
+
+    if (playerObserve && entryData.permission !== undefined && entryData.permission !== null){
+      // @ts-expect-error
+      entryData.permission.default = CONST.DOCUMENT_OWNERSHIP_LEVELS.OBSERVER;
+    }      
 
     const entry = (await JournalEntry.create(entryData)) ?? new JournalEntry();
     await entry.setFlag(LavaFlow.FLAGS.SCOPE, LavaFlow.FLAGS.JOURNAL, true);

diff --git a/src/util.ts b/src/util.ts
@@ -27,7 +27,7 @@ export async function createFolder(folderName: string, parentFolderID: string |
   const folder = await Folder.create({
     name: folderName,
     type: 'JournalEntry',
-    parent: parentFolderID,
+    folder: parentFolderID,
   });
   await folder?.setFlag(LavaFlow.FLAGS.SCOPE, LavaFlow.FLAGS.FOLDER, true);
   return folder ?? null;