Merge pull request #117 from WrithemTwine/devfeature

Devfeature
WrithemTwine · Dec 5, 2023 · 59652a2 · 59652a2
2 parents 25e8bee + 2ab7d84
commit 59652a2
Show file tree

Hide file tree

Showing 69 changed files with 4,279 additions and 596 deletions.
diff --git a/.gitignore b/.gitignore
@@ -341,3 +341,4 @@ healthchecksdb
 /TestStreamerBot/Orion_ChatDataStore_pre_merge.xml
 /TestStreamerBot/Orion_ChatDataStore_after_merge.xml
 /TestStreamerBot/Atlantis_ChatDataStore_unsure_merge.xml
+/ChatDataStore.xml
diff --git a/StreamerBot/Culture/GUI_Msgs.xaml b/StreamerBot/Culture/GUI_Msgs.xaml
@@ -2,13 +2,13 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:system="clr-namespace:System;assembly=mscorlib">
 
-    <!-- Begin- Manage Scopes-->
+    <!-- Begin- Manage Scopes--><!--
 
     <system:String x:Key="CredentialsTwitchScopesDiffOauthBot">bits:read chat:read chat:edit channel:moderate moderator:manage:banned_users moderator:read:followers</system:String>
     <system:String x:Key="CredentialsTwitchScopesDiffOauthChannel">channel:read:redemptions channel:manage:broadcast channel:manage:raids</system:String>
     <system:String x:Key="CredentialsTwitchScopesOauthSame">bits:read chat:read chat:edit channel:moderate moderator:manage:banned_users moderator:read:followers channel:read:redemptions channel:manage:broadcast channel:manage:raids</system:String>
 
-    <!-- End-Manage Scopes-->
+    --><!-- End-Manage Scopes-->
 
 
     <system:String x:Key="Disabled">Disabled</system:String>
@@ -67,7 +67,7 @@
 
     <system:String x:Key="CredentialsTwitchAcctConnectClientIds">Click 'Connect' (to connect with Twitch Account) and copy the resulting "Access Token". You can save it to your local files and paste it to the left credential box.</system:String>
 
-    <system:String x:Key="CredentialsTwitchRefreshDate">Be sure to click "Refresh Date" here in the credentials which will give you the 60-day date from now in which you need to refresh the 'access token'. You would only need to perform the new 'access token' to get another token.</system:String>
+    <system:String x:Key="CredentialsTwitchRefreshDate">Be sure to click "Refresh Date" here in the credentials which will give you the 60-day (53-days as it appears 'Follow' calls to Twitch only work with the token less than 60-days) date from now in which you need to refresh the 'access token'. You would only need to perform the new 'access token' to get another token.</system:String>
 
 </ResourceDictionary>
 
diff --git a/StreamerBot/StreamerBot.csproj b/StreamerBot/StreamerBot.csproj
@@ -1,62 +1,63 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
 
-  <PropertyGroup>
-    <OutputType>WinExe</OutputType>
-    <TargetFramework>net6.0-windows</TargetFramework>
-    <UseWPF>true</UseWPF>
-    <AssemblyName>TwineStreamerBot</AssemblyName>
-    <Description>A chat, clip, live, follow bot for Twitch using the C# TwitchLib library. https://twitch.tv/WrithemTwine</Description>
-    <PackageLicenseExpression>MIT</PackageLicenseExpression>
-    <PackageProjectUrl>https://github.com/WrithemTwine/TwineChatBot</PackageProjectUrl>
-    <RepositoryUrl>https://github.com/WrithemTwine/TwineChatBot</RepositoryUrl>
-    <NeutralLanguage>en-US</NeutralLanguage>
-    <PackageTags>Twitch, bot, twitchlib, streamer</PackageTags>
-    <SignAssembly>false</SignAssembly>
-    <Version>1.2.9.0</Version>    
-    <Copyright>2023</Copyright>
-    <PackageReleaseNotes>Updated repeating command process</PackageReleaseNotes>
-    <Authors>WrithemTwine</Authors>
-    <Company>TwineStreamerBot</Company>
-    <ApplicationIcon>img\TSB_Icon.ico</ApplicationIcon>
-    <EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
-  </PropertyGroup>
-
-  <PropertyGroup>
-    <ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
-  </PropertyGroup>
-
-  <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
-    <DefineConstants>DEBUG;TRACE</DefineConstants>
-    <NoWarn>1701;1702;8002</NoWarn>
-    <Optimize>false</Optimize>
-  </PropertyGroup>
-
-  <ItemGroup>
-    <None Remove="img\SplashScreen1.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Logging.Console" Version="7.0.0" />
-    <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.1823.32" />
-  </ItemGroup>
-
-  <PropertyGroup Label="Globals">
-    <WebView2LoaderPreference>Static</WebView2LoaderPreference>
-  </PropertyGroup>
-
+	<PropertyGroup>
+		<OutputType>WinExe</OutputType>
+		<TargetFramework>net6.0-windows</TargetFramework>
+		<UseWPF>true</UseWPF>
+		<AssemblyName>TwineStreamerBot</AssemblyName>
+		<Description>A chat, clip, live, follow bot for Twitch using the C# TwitchLib library. https://twitch.tv/WrithemTwine</Description>
+		<PackageLicenseExpression>MIT</PackageLicenseExpression>
+		<PackageProjectUrl>https://github.com/WrithemTwine/TwineChatBot</PackageProjectUrl>
+		<RepositoryUrl>https://github.com/WrithemTwine/TwineChatBot</RepositoryUrl>
+		<NeutralLanguage>en-US</NeutralLanguage>
+		<PackageTags>Twitch, bot, twitchlib, streamer</PackageTags>
+		<SignAssembly>false</SignAssembly>
+		<Version>1.2.10.0</Version>
+		<Copyright>2023</Copyright>
+		<PackageReleaseNotes>Added channel point data to the overlay tab to show and refresh the available items. Updated and fixed for bugs.</PackageReleaseNotes>
+		<Authors>WrithemTwine</Authors>
+		<Company>TwineStreamerBot</Company>
+		<ApplicationIcon>img\TSB_Icon.ico</ApplicationIcon>
+		<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
+		<IncludeNativeLibrariesForSelfExtract>True</IncludeNativeLibrariesForSelfExtract>
+	</PropertyGroup>
+
+	<PropertyGroup>
+		<ValidateExecutableReferencesMatchSelfContained>false</ValidateExecutableReferencesMatchSelfContained>
+	</PropertyGroup>
+
+	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
+		<DefineConstants>DEBUG;TRACE</DefineConstants>
+		<NoWarn>1701;1702;8002</NoWarn>
+		<Optimize>false</Optimize>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<None Remove="img\SplashScreen1.png" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="8.0.0" />
+		<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2151.40" />
+	</ItemGroup>
+
+	<PropertyGroup Label="Globals">
+		<WebView2LoaderPreference>Static</WebView2LoaderPreference>
+	</PropertyGroup>
+
+	<ItemGroup>
+		<ProjectReference Include="..\StreamerBotLib\StreamerBotLib.csproj" />
+	</ItemGroup>
+
+	<ItemGroup>
+		<SplashScreen Include="img\SplashScreen1.png" />
+	</ItemGroup>
+
 	<ItemGroup>
-    <ProjectReference Include="..\StreamerBotLib\StreamerBotLib.csproj" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <SplashScreen Include="img\SplashScreen1.png" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Page Update="Culture\GUI_Msgs.xaml">
-      <XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
-    </Page>
-  </ItemGroup>
+		<Page Update="Culture\GUI_Msgs.xaml">
+			<XamlRuntime>$(DefaultXamlRuntime)</XamlRuntime>
+		</Page>
+	</ItemGroup>
 
 </Project>