Merge pull request #88 from Stars-Beyond/MACRO-FIX-TEMP

Macro fix temp

.github/workflows/Horizon-Publish.yml

@@ -4,7 +4,7 @@ on:
   release:
     types: [published]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 env:
   REGISTRY: ghcr.io
@@ -19,40 +19,41 @@ jobs:
         include:
           - dockerfile: ./Dockerfile.rust
             image: ghcr.io/Stars-Beyond/horizon
-
     permissions:
       contents: read
       packages: write
       id-token: write
-
+    
     steps:
       - name: Checkout repository
         uses: actions/checkout@v4
+
       - name: Checkout Submodules
         run: git submodule update --init --recursive
+
       - name: Install cosign
         if: github.event_name != 'pull_request'
         uses: sigstore/cosign-installer@59acb6260d9c0ba8f4a2f9d9b48431a222b68e20
         with:
           cosign-release: 'v2.2.4'
-
+      
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@f95db51fddba0c2d1ec667646a06c2ce06100226
-
+      
       - name: Log into registry ${{ matrix.image }}
         if: github.event_name != 'pull_request'
         uses: docker/login-action@343f7c4344506bcbf9b4de18042ae17996df046d
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
-
+      
       - name: Extract Docker metadata
         id: meta
         uses: docker/metadata-action@96383f45573cb7f253c731d3b3ab81c87ef81934
         with:
           images: ${{ matrix.image }}
-
+      
       - name: Build and push Docker image
         id: build-and-push
         uses: docker/build-push-action@0565240e2d4ab88bba5387d719585280857ece09
@@ -64,7 +65,7 @@ jobs:
           labels: ${{ steps.meta.outputs.labels }}
           cache-from: type=gha
           cache-to: type=gha,mode=max
-
+      
       - name: Sign the published Docker image
         if: ${{ github.event_name != 'pull_request' }}
         env:

.vscode/launch.json

@@ -0,0 +1,16 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // Hover to view descriptions of existing attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "type": "lldb",
+            "request": "launch",
+            "name": "Debug",
+            "program": "${workspaceFolder}/<executable file>",
+            "args": [],
+            "cwd": "${workspaceFolder}"
+        }
+    ]
+}

src/macros.rs

@@ -18,7 +18,11 @@
 macro_rules! define_event {
      ($app:expr, $($path:expr, $handler:expr),* $(,)?) => {
         $(
-            &$app.on($path, move || { $handler });
+            {
+                let app = &$app;  // Borrow $app
+                let handler = $handler.clone(); //define handler within the macro's scope
+                app.on($path, move || { handler });
+            }
         )*
      };
 }

src/main.rs

@@ -75,8 +75,8 @@ fn on_connect(socket: SocketRef, Data(data): Data<Value>, players: Arc<Mutex<Vec
     // systems                                             //
     /////////////////////////////////////////////////////////
 
-    //subsystems::actors::main::main();
-    // subsystems::core::chat::init(socket.clone());
+    // subsystems::actors::main::main();
+    subsystems::core::chat::init(socket.clone());
     // subsystems::core::leaderboard::init();
     // subsystems::player_data::init(socket.clone());
     subsystems::core::game_logic::init();
@@ -91,9 +91,9 @@ fn on_connect(socket: SocketRef, Data(data): Data<Value>, players: Arc<Mutex<Vec
     // file                                               //
     ////////////////////////////////////////////////////////
 
-    define_event!(socket, 
-        "test", events::test::main(),
-        );
+    //define_event!(socket, 
+    //    "test", events::test::main(),
+    //    );
 
     let players_clone = Arc::clone(&players);