add widget bot, add level

OpenShock · May 4, 2024 · 5d3c2cb · 5d3c2cb
1 parent 59b72b4
commit 5d3c2cb
Show file tree

Hide file tree

Showing 8 changed files with 9 additions and 22 deletions.
diff --git a/ShockOsc/Backend/BackendHubManager.cs b/ShockOsc/Backend/BackendHubManager.cs
@@ -141,7 +141,7 @@ private async Task RemoteActivateShocker(ControlLogSender sender, ControlLog log
                 log.Type, log.Shocker.Name, log.Intensity, inSeconds, sender.CustomName, sender.Name);
 
         var template = _configManager.Config.Chatbox.Types[log.Type];
-        if (_configManager.Config.Osc.Chatbox &&
+        if (_configManager.Config.Chatbox.Enabled &&
             _configManager.Config.Chatbox.DisplayRemoteControl && template.Enabled)
         {
             // Chatbox message remote

diff --git a/ShockOsc/Config/ChatboxConf.cs b/ShockOsc/Config/ChatboxConf.cs
@@ -4,6 +4,7 @@ namespace OpenShock.ShockOsc.Config;
 
 public sealed class ChatboxConf
 {
+    public bool Enabled { get; set; } = true;
     public string Prefix { get; set; } = "[ShockOsc] ";
     public bool DisplayRemoteControl { get; set; } = true;
 

diff --git a/ShockOsc/Config/OscConf.cs b/ShockOsc/Config/OscConf.cs
@@ -2,7 +2,6 @@
 
 public sealed class OscConf
 {
-    public bool Chatbox { get; set; } = true;
     public bool Hoscy { get; set; } = false;
     public ushort HoscySendPort { get; set; } = 9001;
     public bool QuestSupport { get; set; } = false;

diff --git a/ShockOsc/Services/OscClient.cs b/ShockOsc/Services/OscClient.cs
@@ -49,6 +49,7 @@ public ValueTask SendGameMessage(string address, params object?[]?arguments)
 
     public ValueTask SendChatboxMessage(string message)
     {
+        if(!_configManager.Config.Chatbox.Enabled) return ValueTask.CompletedTask;
         if (_configManager.Config.Osc.Hoscy) return _hoscySenderChannel.Writer.WriteAsync(new OscMessage("/hoscy/message", message));
 
         return _gameSenderChannel.Writer.WriteAsync(new OscMessage("/chatbox/input", message, true));

diff --git a/ShockOsc/Services/ShockOsc.cs b/ShockOsc/Services/ShockOsc.cs
@@ -414,7 +414,7 @@ private async Task InstantShock(ProgramGroup programGroup, uint duration, byte i
 
         await _backendHubManager.ControlGroup(programGroup.Id, duration, intensity, ControlType.Shock, exclusive);
 
-        if (!_configManager.Config.Osc.Chatbox) return;
+        if (!_configManager.Config.Chatbox.Enabled) return;
         // Chatbox message local
         var dat = new
         {

diff --git a/ShockOsc/Ui/Pages/Dash/Tabs/ChatboxTab.razor b/ShockOsc/Ui/Pages/Dash/Tabs/ChatboxTab.razor
@@ -7,7 +7,7 @@
 <MudPaper Outlined="true" Class="rounded-lg mud-paper-padding">
     <MudText>Chatbox Options</MudText>
     <MudDivider/>
-    <MudCheckBox Class="option-width option-checkbox-height" @bind-Value="ConfigManager.Config.Osc.Chatbox" Label="Chatbox" @bind-Value:after="OnSettingsValueChange"/>
+    <MudCheckBox Class="option-width option-checkbox-height" @bind-Value="ConfigManager.Config.Chatbox.Enabled" Label="Chatbox" @bind-Value:after="OnSettingsValueChange"/>
     <MudCheckBox Class="option-width option-checkbox-height" @bind-Value="ConfigManager.Config.Chatbox.DisplayRemoteControl" Label="Display Remote Control" @bind-Value:after="OnSettingsValueChange"/>
     <br/>
     <br/>

diff --git a/ShockOsc/Ui/Pages/Dash/Tabs/DashboardTab.razor b/ShockOsc/Ui/Pages/Dash/Tabs/DashboardTab.razor
@@ -57,14 +57,8 @@
         </div>
     </MudPaper>
 
-    @* <MudPaper Outlined="true" Elevation="1" Class="rounded-lg mud-paper-padding item" Style="text-align: center"> *@
-    @*     <MudText Typo="Typo.h6">Discord</MudText> *@
-    @*     <iframe src="https://e.widgetbot.io/channels/383670897724358657/515696193851097109" allow="clipboard-write; fullscreen" height="600" width="800"></iframe> *@
-    @* *@
-    @* </MudPaper> *@
-
     <MudPaper Outlined="true" Elevation="1" Class="rounded-lg mud-paper-padding item discord" Style="padding: 0">
-        <iframe src="https://discord.com/widget?id=1078124408775901204&theme=dark" width="350" height="500" allowtransparency="true" frameborder="0"></iframe>
+        <iframe src="https://e.widgetbot.io/channels/1078124408775901204/1236453005746896898" allowtransparency="true"></iframe>
 
     </MudPaper>
 
@@ -74,16 +68,6 @@
     </MudPaper>
 
 
-    <MudPaper Outlined="true" Elevation="1" Class="rounded-lg mud-paper-padding item" Style="text-align: center">
-        <MudText Typo="Typo.h6">Placeholder</MudText>
-        <MudText Typo="Typo.body2">Duo no lorem aliquyam dolor voluptua minim dolor diam sed dolores accusam est dolore voluptua takimata vel ullamcorper erat takimata erat at consectetuer amet magna</MudText>
-    </MudPaper>
-
-    <MudPaper Outlined="true" Elevation="1" Class="rounded-lg mud-paper-padding item" Style="text-align: center">
-        <MudText Typo="Typo.h6">Placeholder</MudText>
-        <MudText Typo="Typo.body2">Duo no lorem aliquyam dolor voluptua minim dolor diam sed dolores accusam est dolore voluptua takimata vel ullamcorper erat takimata erat at consectetuer amet magna</MudText>
-    </MudPaper>
-
     <MudPaper Outlined="true" Elevation="1" Class="rounded-lg mud-paper-padding item" Style="text-align: center">
         <MudText Typo="Typo.h6">Placeholder</MudText>
         <MudText Typo="Typo.body2">Duo no lorem aliquyam dolor voluptua minim dolor diam sed dolores accusam est dolore voluptua takimata vel ullamcorper erat takimata erat at consectetuer amet magna</MudText>
@@ -118,7 +102,7 @@
     }
     
     .dashboard-box .discord {
-            grid-area: 1 / 3 / 3 / 3;
+            grid-area: 2 / 2 / 4 / 4;
         }
 
     .dashboard-box .item:hover {

diff --git a/ShockOsc/Ui/Pages/Dash/Tabs/LogsTab.razor b/ShockOsc/Ui/Pages/Dash/Tabs/LogsTab.razor
@@ -9,11 +9,13 @@
 <MudTable T="LogStore.LogEntry" RowClass="cursor-pointer" RowClassFunc="RowClassFunc" Items="LogStore.Logs.OrderByDescending(x => x.Time)" OnRowClick="LogRowClick" Breakpoint="Breakpoint.Sm" Hover="true" Dense="true" Height="100%">
     <HeaderContent>
         <MudTh>Time</MudTh>
+        <MudTh>Level</MudTh>
         <MudTh>Source</MudTh>
         <MudTh>Message</MudTh>
     </HeaderContent>
     <RowTemplate>
         <MudTd>@context.Time.ToString("HH:mm:ss")</MudTd>
+        <MudTd>@context.Level.ToString()</MudTd>
         <MudTd>@context.SourceContextShort</MudTd>
         <MudTd>@context.Message.TruncateAtChar(120)</MudTd>
     </RowTemplate>