Merge branch 'develop' into main

BrackeysCommunity · Feb 22, 2023 · 2824f63 · 2824f63
2 parents 2a81d3b + 2e03247
commit 2824f63
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/Marco/Marco.csproj b/Marco/Marco.csproj
@@ -6,7 +6,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <DockerDefaultTargetOS>Linux</DockerDefaultTargetOS>
-        <VersionPrefix>1.3.3</VersionPrefix>
+        <VersionPrefix>1.3.4</VersionPrefix>
     </PropertyGroup>
 
     <PropertyGroup Condition="'$(VersionSuffix)' != '' And '$(BuildNumber)' == ''">

diff --git a/Marco/Services/MacroListeningService.cs b/Marco/Services/MacroListeningService.cs
@@ -116,15 +116,16 @@ private async Task OnMessageCreated(DiscordClient sender, MessageCreateEventArgs
 
                 _cooldownService.UpdateCooldown(channel, macro);
 
-                int argIndex = spaceIndex < 0 ? prefix.Length + command.Length : spaceIndex;
+                // TODO revisit this feature
+                /*int argIndex = spaceIndex < 0 ? prefix.Length + command.Length : spaceIndex;
                 string response = Smart.Format(macro.Response, new
                 {
                     args = content[argIndex..].Split(),
                     channel,
                     guild,
                     user = (DiscordMember) e.Message.Author
-                });
-                await channel.SendMessageAsync(response).ConfigureAwait(false);
+                });*/
+                await channel.SendMessageAsync(macro.Response).ConfigureAwait(false);
             }
         }
         else