Make character optional for moves

src/characters/meter-commands.ts

@@ -1,7 +1,7 @@
 import { updatePreviousMoveOrCreateBlock } from "mechanics/editor";
 import { Editor } from "obsidian";
 import { ConditionMeterDefinition } from "rules/ruleset";
-import { MoveBlockFormat } from "settings/ui";
+import { MoveBlockFormat } from "settings";
 import { node } from "utils/kdl";
 import { updating } from "utils/lens";
 import { vaultProcess } from "utils/obsidian";

src/index.ts

@@ -1,27 +1,24 @@
 import { addAssetToCharacter } from "characters/commands";
 import { generateEntityCommand } from "entity/command";
 import { IndexManager } from "indexer/manager";
+import { runMoveCommand } from "moves/action";
 import {
   Plugin,
   type Editor,
   type MarkdownFileInfo,
   type MarkdownView,
 } from "obsidian";
+import { DEFAULT_SETTINGS, ForgedPluginSettings } from "settings";
 import { ProgressContext } from "tracks/context";
 import { ForgedAPI } from "./api";
 import { CharacterIndexer, CharacterTracker } from "./character-tracker";
 import * as meterCommands from "./characters/meter-commands";
 import { Datastore } from "./datastore";
 import registerMechanicsBlock from "./mechanics/mechanics-blocks";
-import { runMoveCommand } from "./moves/action";
 import { registerMoveBlock } from "./moves/block";
 import { runOracleCommand } from "./oracles/command";
 import { registerOracleBlock } from "./oracles/render";
-import {
-  DEFAULT_SETTINGS,
-  ForgedPluginSettings,
-  ForgedSettingTab,
-} from "./settings/ui";
+import { ForgedSettingTab } from "./settings/ui";
 import { ClockIndex, ClockIndexer } from "./tracks/clock-file";
 import {
   advanceClock,
@@ -95,38 +92,22 @@ export default class ForgedPlugin extends Plugin {
       id: "make-a-move",
       name: "Make a Move",
       icon: "zap",
-      editorCallback: async (
-        editor: Editor,
-        view: MarkdownView | MarkdownFileInfo,
-      ) => {
-        // TODO: what if it is just a fileinfo?
-        await runMoveCommand(
-          this.app,
-          this.datastore,
-          new ProgressContext(this),
-          this.characters,
-          editor,
-          view as MarkdownView,
-          this.settings,
-        );
-      },
+      editorCallback: (editor: Editor, view: MarkdownView | MarkdownFileInfo) =>
+        // TODO: what if view is just a fileinfo?
+        runMoveCommand(this, editor, view as MarkdownView),
     });
 
     this.addCommand({
       id: "ask-the-oracle",
       name: "Ask the Oracle",
       icon: "help-circle",
-      editorCallback: async (
-        editor: Editor,
-        view: MarkdownView | MarkdownFileInfo,
-      ) => {
-        await runOracleCommand(
+      editorCallback: (editor: Editor, view: MarkdownView | MarkdownFileInfo) =>
+        runOracleCommand(
           this.app,
           this.datastore,
           editor,
           view as MarkdownView,
-        );
-      },
+        ),
     });
 
     this.addCommand({

src/moves/action/format.ts

@@ -1,7 +1,7 @@
 import { Document, Node } from "kdljs";
 import { Editor, stringifyYaml } from "obsidian";
+import { MoveBlockFormat } from "settings";
 import { createOrAppendMechanics } from "../../mechanics/editor";
-import { MoveBlockFormat } from "../../settings/ui";
 import { node } from "../../utils/kdl";
 import { MoveDescription, moveIsAction, moveIsProgress } from "../desc";
 import { generateMoveLine } from "../move-line-parser";