Skip to content

Commit 3a47992

Browse files
csharpfritzcsharpfritz
committed
Updated to .NET 6 and removed Kraken API reference
1 parent 02cabcb commit 3a47992

File tree

13 files changed

+86
-92
lines changed

13 files changed

+86
-92
lines changed

‎ConsoleChatbot/ConsoleChatbot.csproj

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
<PropertyGroup>
44
<OutputType>Exe</OutputType>
5-
<TargetFramework>net5.0</TargetFramework>
5+
<TargetFramework>net6.0</TargetFramework>
66
</PropertyGroup>
77

88
<ItemGroup>
@@ -16,11 +16,11 @@
1616
</ItemGroup>
1717

1818
<ItemGroup>
19-
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="2.2.0" />
20-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="2.1.1" />
22-
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="2.2.0" />
23-
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="2.2.0" />
19+
<PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="6.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Logging.Console" Version="6.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Configuration.UserSecrets" Version="6.0.1" />
2424
</ItemGroup>
2525

2626
</Project>

‎ConsoleChatbot/Program.cs

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -48,14 +48,18 @@ private static FritzBot CreateFritzBot(IChatService chatService)
4848

4949
serviceCollection.AddHttpClient("ShoutoutCommand", c =>
5050
{
51-
c.BaseAddress = new Uri("https://api.twitch.tv/kraken/channels/");
5251
c.DefaultRequestHeaders.Add("client-id", config["StreamServices:Twitch:ClientId"]);
5352
});
5453

5554
FritzBot.RegisterCommands(serviceCollection);
55+
56+
var loggerService = LoggerFactory.Create(configure =>
57+
configure.AddConsole(options => {
58+
options.LogToStandardErrorThreshold = LogLevel.Information;
59+
})
60+
);
5661
var svcProvider = serviceCollection.BuildServiceProvider();
57-
var loggerFactory = svcProvider.GetService<ILoggerFactory>()
58-
.AddConsole(LogLevel.Information);
62+
var loggerFactory = svcProvider.GetService<ILoggerFactory>();
5963

6064
return new FritzBot(config, svcProvider, loggerFactory);
6165

‎Fritz.Chatbot/Commands/TeamCommand.cs

Lines changed: 25 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ public TeamCommand(IConfiguration configuration, ILoggerFactory loggerFactory, I
4646
if (!string.IsNullOrEmpty(TwitchTokenConfig.Tokens?.access_token))
4747
{
4848
_HttpClient = httpClientFactory.CreateClient("TeamLookup");
49-
_HttpClient.BaseAddress = new Uri($"https://api.twitch.tv/kraken/teams/");
49+
_HttpClient.BaseAddress = new Uri($"https://api.twitch.tv/helix/teams");
5050
_HttpClient.DefaultRequestHeaders.Add("Client-ID", configuration["StreamServices:Twitch:ClientId"]);
5151
_HttpClient.DefaultRequestHeaders.Add("Accept", "application/vnd.twitchtv.v5+json");
5252

@@ -65,9 +65,11 @@ public TeamCommand(IConfiguration configuration, ILoggerFactory loggerFactory, I
6565
private void SendNotificationsToWidget()
6666
{
6767

68-
while (true) {
68+
while (true)
69+
{
6970

70-
if (_TeammateNotifications.TryPeek(out var _)) {
71+
if (_TeammateNotifications.TryPeek(out var _))
72+
{
7173

7274
_Context.Clients.All.SendAsync("Teammate", _TeammateNotifications.Dequeue());
7375
Task.Delay(5000).GetAwaiter().GetResult(); // TODO: This notification needs to go into a queue
@@ -111,53 +113,41 @@ public async Task Execute(IChatService chatService, string userName, string full
111113
private async Task GetTeammates()
112114
{
113115

114-
var response = await _HttpClient.GetStringAsync(_TeamName);
116+
var response = await _HttpClient.GetStringAsync($"?name={_TeamName}");
115117
var team = JsonConvert.DeserializeObject<TeamResponse>(response);
116118

117-
_Teammates = team.users.Select(u => u.name).ToHashSet();
119+
_Teammates = team.data.First().users.Select(u => u.user_name).ToHashSet();
118120

119121
}
120122

121123

122-
internal class TeamResponse
124+
public class TeamResponse
123125
{
124-
public int _id { get; set; }
125-
public object background { get; set; }
126-
public string banner { get; set; }
127-
public DateTime created_at { get; set; }
128-
public string display_name { get; set; }
129-
public string info { get; set; }
130-
public string logo { get; set; }
131-
public string name { get; set; }
132-
public DateTime updated_at { get; set; }
133-
public User[] users { get; set; }
126+
public TeamSummary[] data { get; set; }
134127
}
135128

136-
137-
internal class User
129+
public class TeamSummary
138130
{
139-
public int _id { get; set; }
140-
public string broadcaster_language { get; set; }
131+
public User[] users { get; set; }
132+
public object background_image_url { get; set; }
133+
public object banner { get; set; }
141134
public DateTime created_at { get; set; }
142-
public string display_name { get; set; }
143-
public int followers { get; set; }
144-
public string game { get; set; }
145-
public string language { get; set; }
146-
public string logo { get; set; }
147-
public bool mature { get; set; }
148-
public string name { get; set; }
149-
public bool partner { get; set; }
150-
public string profile_banner { get; set; }
151-
public object profile_banner_background_color { get; set; }
152-
public string status { get; set; }
153135
public DateTime updated_at { get; set; }
154-
public string url { get; set; }
155-
public object video_banner { get; set; }
156-
public int views { get; set; }
136+
public string info { get; set; }
137+
public string thumbnail_url { get; set; }
138+
public string team_name { get; set; }
139+
public string team_display_name { get; set; }
140+
public string id { get; set; }
141+
}
142+
143+
public class User
144+
{
145+
public string user_id { get; set; }
146+
public string user_name { get; set; }
147+
public string user_login { get; set; }
157148
}
158149

159150

160151
}
161152

162-
163153
}

‎Fritz.Chatbot/Fritz.Chatbot.csproj

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,28 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
88
<Compile Include="..\Fritz.StreamTools\Helpers\TaskExtensions.cs" Link="Helpers\TaskExtensions.cs" />
99
</ItemGroup>
1010

1111
<ItemGroup>
12-
<PackageReference Include="FaunaDB.Client" Version="2.12.0" />
13-
<PackageReference Include="Markdig" Version="0.18.3" />
14-
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.0.4" />
15-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="1.0.4" />
12+
<PackageReference Include="FaunaDB.Client" Version="4.2.0" />
13+
<PackageReference Include="Markdig" Version="0.27.0" />
14+
<PackageReference Include="Microsoft.AspNetCore.SignalR" Version="1.1.0" />
15+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.2" />
1616
<PackageReference Include="Microsoft.Azure.CognitiveServices.Vision.CustomVision.Prediction" Version="1.0.0" />
1717
<PackageReference Include="Microsoft.Azure.CognitiveServices.Vision.CustomVision.Training" Version="1.0.0" />
18-
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="2.2.0" />
19-
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="2.1.1" />
20-
<PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
21-
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="2.2.0" />
22-
<PackageReference Include="Microsoft.Extensions.Logging" Version="2.1.1" />
23-
<PackageReference Include="NetCoreAudio" Version="1.5.0" />
24-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
18+
<PackageReference Include="Microsoft.Extensions.Configuration" Version="6.0.0" />
19+
<PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="6.0.0" />
20+
<PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="6.0.0" />
21+
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
22+
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.0" />
23+
<PackageReference Include="Microsoft.Extensions.Logging" Version="6.0.0" />
24+
<PackageReference Include="NetCoreAudio" Version="1.6.3" />
25+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
2526
</ItemGroup>
2627

2728
<ItemGroup>

‎Fritz.ObsProxy/Fritz.ObsProxy.csproj

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
<Project Sdk="Microsoft.NET.Sdk.Worker">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
<UserSecretsId>dotnet-Fritz.ObsProxy-63F1EE89-A75A-469F-919F-8238E927CEB8</UserSecretsId>
66
</PropertyGroup>
77

88
<ItemGroup>
9-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="3.1.3" />
10-
<PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
9+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="6.0.2" />
10+
<PackageReference Include="Microsoft.Extensions.Hosting" Version="6.0.1" />
1111
<PackageReference Include="OBS.WebSocket.NET" Version="4.7.2" />
12-
<PackageReference Include="SixLabors.ImageSharp" Version="1.0.0-rc0002" />
12+
<PackageReference Include="SixLabors.ImageSharp" Version="2.0.0" />
1313
</ItemGroup>
1414

1515
<ItemGroup>

‎Fritz.StreamLib.Core/Fritz.StreamLib.Core.csproj

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,14 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>net5.0</TargetFramework>
4+
<TargetFramework>net6.0</TargetFramework>
55
</PropertyGroup>
66

77
<ItemGroup>
8-
<PackageReference Include="Microsoft.Extensions.Http" Version="2.1.1" />
9-
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
10-
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.3" />
8+
<PackageReference Include="Microsoft.Extensions.Configuration.Abstractions" Version="6.0.0" />
9+
<PackageReference Include="Microsoft.Extensions.Http" Version="6.0.0" />
10+
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
11+
<PackageReference Include="System.Threading.Tasks.Extensions" Version="4.5.4" />
1112
</ItemGroup>
1213

1314
</Project>

‎Fritz.StreamTools/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
FROM mcr.microsoft.com/dotnet/aspnet:5.0 AS base
1+
FROM mcr.microsoft.com/dotnet/aspnet:6.0 AS base
22
WORKDIR /app
33
EXPOSE 80
44

5-
FROM mcr.microsoft.com/dotnet/sdk:5.0 AS build
5+
FROM mcr.microsoft.com/dotnet/sdk:6.0 AS build
66
WORKDIR /src
77
COPY global.json .
88
COPY Fritz.StreamTools/Fritz.StreamTools.csproj Fritz.StreamTools/

‎Fritz.StreamTools/Fritz.StreamTools.csproj

Lines changed: 8 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<Project Sdk="Microsoft.NET.Sdk.Web">
22
<PropertyGroup>
3-
<TargetFramework>net5.0</TargetFramework>
3+
<TargetFramework>net6.0</TargetFramework>
44
<DockerComposeProjectPath>..\docker-compose.dcproj</DockerComposeProjectPath>
55
<UserSecretsId>78c713a0-80e0-4e16-956a-33cf16f08a02</UserSecretsId>
66
<TreatWarningsAsErrors>true</TreatWarningsAsErrors>
@@ -18,16 +18,15 @@
1818
<Content Remove="wwwroot\hey_listen.wav" />
1919
</ItemGroup>
2020
<ItemGroup>
21-
<PackageReference Include="BuildBundlerMinifier" Version="2.9.406" />
21+
<PackageReference Include="BuildBundlerMinifier" Version="3.2.449" />
2222
<PackageReference Include="Bundgaard.MixerLib" Version="1.2.65" />
23-
<PackageReference Include="LazyCache.AspNetCore" Version="2.0.1" />
24-
<PackageReference Include="Microsoft.ApplicationInsights.AspNetCore" Version="2.7.1" />
25-
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="1.1.5" />
23+
<PackageReference Include="LazyCache.AspNetCore" Version="2.4.0" />
24+
<PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="6.0.2" />
2625
<PackageReference Include="Microsoft.Azure.CognitiveServices.Language.TextAnalytics" Version="4.0.0" />
27-
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="2.2.0" />
28-
<PackageReference Include="Octokit" Version="0.32.0" />
29-
<PackageReference Include="System.IO.Abstractions" Version="6.0.21" />
30-
<PackageReference Include="System.Memory" Version="4.5.3" />
26+
<PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="6.0.2" />
27+
<PackageReference Include="Octokit" Version="0.50.0" />
28+
<PackageReference Include="System.IO.Abstractions" Version="16.1.10" />
29+
<PackageReference Include="System.Memory" Version="4.5.4" />
3130
</ItemGroup>
3231
<ItemGroup>
3332
<None Include="wwwroot\js\GoalConfiguration\GoalConfiguration.js" />

‎Fritz.StreamTools/Program.cs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ public static void Main(string[] args)
2121

2222
public static IWebHostBuilder CreateWebHostBuilder(string[] args) =>
2323
WebHost.CreateDefaultBuilder(args)
24-
.UseApplicationInsights()
2524
.UseStartup<Startup>();
2625
}
2726
}

‎Fritz.StreamTools/StartupServices/ConfigureServices.cs

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,7 @@ private static void AddAspNetFeatures(this IServiceCollection services)
183183

184184
services.AddRazorPages();
185185

186-
services.AddMvc()
187-
.SetCompatibilityVersion(CompatibilityVersion.Version_3_0);
186+
services.AddMvc();
188187

189188
}
190189

0 commit comments

Comments
 (0)