Browse Source

Change string to luap

Stuart Johnson 1 year ago
parent
commit
252c0baa9d

+ 21 - 9
.vs/TFA-Bot/xs/UserPrefs.xml

@@ -4,39 +4,51 @@
     <Files>
       <File FileName="TFA-Bot/DiscordBot/Commands/clsHelp.cs" Line="44" Column="1" />
       <File FileName="TFA-Bot/DiscordBot/Commands/clsNetworks.cs" Line="32" Column="45" />
-      <File FileName="TFA-Bot/DataClasses/clsNetwork.cs" Line="52" Column="1" />
+      <File FileName="TFA-Bot/DataClasses/clsNetwork.cs" Line="104" Column="38" />
       <File FileName="TFA-Bot/clsExtenstions.cs" Line="88" Column="1" />
       <File FileName="TFA-Bot/DiscordBot/Commands/clsListNodes.cs" Line="21" Column="65" />
-      <File FileName="TFA-Bot/Program.cs" Line="34" Column="96" />
+      <File FileName="TFA-Bot/Program.cs" Line="132" Column="54" />
       <File FileName="TFA-Bot/DataClasses/clsNodeGroup.cs" Line="57" Column="44" />
-      <File FileName="TFA-Bot/DataClasses/clsNode.cs" Line="424" Column="17" />
+      <File FileName="TFA-Bot/DataClasses/clsNode.cs" Line="177" Column="47" />
       <File FileName="TFA-Bot/DiscordBot/clsBotClient.cs" Line="169" Column="84" />
-      <File FileName="TFA-Bot/clsEmail.cs" Line="92" Column="59" />
+      <File FileName="TFA-Bot/clsEmail.cs" Line="96" Column="14" />
       <File FileName="TFA-Bot/clsAlarm.cs" Line="82" Column="55" />
       <File FileName="TFA-Bot/DiscordBot/Commands/clsDiscord.cs" Line="31" Column="13" />
       <File FileName="TFA-Bot/DiscordBot/Commands/clsGoodnight.cs" Line="31" Column="1" />
-      <File FileName="TFA-Bot/DiscordBot/Commands/clsEmail.cs" Line="21" Column="25" />
+      <File FileName="TFA-Bot/DiscordBot/Commands/clsEmail.cs" Line="30" Column="1" />
       <File FileName="TFA-Bot/DiscordBot/Commands/clsAlarm.cs" Line="1" Column="1" />
       <File FileName="TFA-Bot/DiscordBot/Commands/IBotCommand.cs" Line="21" Column="1" />
-      <File FileName="TFA-Bot/DiscordBot/clsCommands.cs" Line="73" Column="31" />
+      <File FileName="TFA-Bot/DiscordBot/clsCommands.cs" Line="18" Column="53" />
       <File FileName="TFA-Bot/clsColumnDisplay.cs" Line="20" Column="50" />
-      <File FileName="TFA-Bot/Spreadsheet/clsSpreadsheet.cs" Line="15" Column="38" />
+      <File FileName="TFA-Bot/Spreadsheet/clsSpreadsheet.cs" Line="75" Column="17" />
       <File FileName="TFA-Bot/Spreadsheet/ASheetColumnHeader.cs" Line="1" Column="1" />
       <File FileName="TFA-Bot/Spreadsheet/ISpreadsheet.cs" Line="1" Column="1" />
       <File FileName="TFA-Bot/Utils/clsRollingAverage.cs" Line="48" Column="1" />
-      <File FileName="TFA-Bot/Spreadsheet/clsSpreadsheetReader.cs" Line="15" Column="16" />
+      <File FileName="TFA-Bot/Spreadsheet/clsSpreadsheetReader.cs" Line="17" Column="40" />
+      <File FileName="entrypoint.sh" Line="7" Column="21" />
+      <File FileName="TFA-Bot/Dialler/clsDiallerTwilio.cs" Line="41" Column="51" />
+      <File FileName="TFA-Bot/DiscordBot/Commands/clsBotControl.cs" Line="30" Column="84" />
+      <File FileName="TFA-Bot/Git/clsGitBranchInfo.cs" Line="1" Column="1" />
+      <File FileName="TFA-Bot/Git/clsGitHead.cs" Line="1" Column="1" />
+      <File FileName="TFA-Bot/Git/clsGit.cs" Line="61" Column="17" />
+      <File FileName="TFA-Bot/Git/AssemblyGitCommit.cs" Line="13" Column="2" />
+      <File FileName="TFA-Bot/clsVersion.cs" Line="25" Column="47" />
       <File FileName="TFA-Bot Status" />
     </Files>
     <Pads>
       <Pad Id="ProjectPad">
         <State name="__root__">
           <Node name="TFA-Bot" expanded="True">
-            <Node name="TFA-Bot" expanded="True" selected="True">
+            <Node name="Solution Items" expanded="True" />
+            <Node name="TFA-Bot" expanded="True">
               <Node name="Packages" expanded="True" />
               <Node name="DataClasses" expanded="True" />
+              <Node name="Dialler" expanded="True" />
               <Node name="DiscordBot" expanded="True">
                 <Node name="Commands" expanded="True" />
+                <Node name="clsCommands.cs" selected="True" />
               </Node>
+              <Node name="Git" expanded="True" />
               <Node name="Spreadsheet" expanded="True" />
               <Node name="Utils" expanded="True" />
             </Node>

+ 1 - 1
TFA-Bot/DataClasses/clsNetwork.cs

@@ -94,7 +94,7 @@ namespace TFABot
                     }
                     else if (++LateHeightCount==1)
                     {
-                        NetworkAlarm = new clsAlarm(clsAlarm.enumAlarmType.Network,$"WARNING: Network Height {seconds:0} sec late.  {Name} stall or an election?",this);
+                        NetworkAlarm = new clsAlarm(clsAlarm.enumAlarmType.Network,$"WARNING: {Name} stall or an election? Network Height {seconds:0} sec late.",this);
                         Program.AlarmManager.New(NetworkAlarm);
                     }
                 }

+ 2 - 2
TFA-Bot/TFA-Bot.csproj

@@ -85,10 +85,10 @@
       <HintPath>..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll</HintPath>
     </Reference>
     <Reference Include="MimeKit">
-      <HintPath>..\packages\MimeKit.2.3.2\lib\net46\MimeKit.dll</HintPath>
+      <HintPath>..\packages\MimeKit.2.4.0.1\lib\net46\MimeKit.dll</HintPath>
     </Reference>
     <Reference Include="MailKit">
-      <HintPath>..\packages\MailKit.2.3.2\lib\net46\MailKit.dll</HintPath>
+      <HintPath>..\packages\MailKit.2.4.0.1\lib\net46\MailKit.dll</HintPath>
     </Reference>
     <Reference Include="RestSharp">
       <HintPath>..\packages\RestSharp.106.6.10\lib\net452\RestSharp.dll</HintPath>

+ 2 - 2
TFA-Bot/packages.config

@@ -7,8 +7,8 @@
   <package id="DSharpPlus.WebSocket.WebSocketSharp" version="3.2.3" targetFramework="net462" />
   <package id="LibGit2Sharp" version="0.26.1" targetFramework="net462" />
   <package id="LibGit2Sharp.NativeBinaries" version="2.0.289" targetFramework="net462" />
-  <package id="MailKit" version="2.3.2" targetFramework="net462" />
-  <package id="MimeKit" version="2.3.2" targetFramework="net462" />
+  <package id="MailKit" version="2.4.0.1" targetFramework="net462" />
+  <package id="MimeKit" version="2.4.0.1" targetFramework="net462" />
   <package id="Newtonsoft.Json" version="12.0.2" targetFramework="net462" />
   <package id="RestSharp" version="106.6.10" targetFramework="net462" />
   <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />