Skip to content

Commit d812664

Browse files
MrRoundRobinMrRoundRobin
committed
changed namespace
1 parent 7969dc1 commit d812664

File tree

10 files changed

+75
-66
lines changed

10 files changed

+75
-66
lines changed

‎src/Daemon.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace ms.robin.TeamsMqttBridge;
1+
namespace ro.TeamsMqttBridge;
22

33
internal class Daemon : ApplicationContext
44
{

‎src/HomeAssistant/Device.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace ms.robin.TeamsMqttBridge.HomeAssistant;
1+
namespace ro.TeamsMqttBridge.HomeAssistant;
22

33
internal class Device
44
{

‎src/HomeAssistant/Discovery.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace ms.robin.TeamsMqttBridge.HomeAssistant;
1+
namespace ro.TeamsMqttBridge.HomeAssistant;
22

33
internal class Discovery
44
{

‎src/Program.cs

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
namespace ms.robin.TeamsMqttBridge;
1+
namespace ro.TeamsMqttBridge;
22

33
using MQTTnet;
44
using MQTTnet.Client;
55
using MQTTnet.Extensions.ManagedClient;
6-
using ms.robin.TeamsMqttBridge.HomeAssistant;
6+
using ro.TeamsMqttBridge.HomeAssistant;
7+
using ro.TeamsMqttBridge.Utils;
78
using System.Text;
89
using System.Text.Json;
910

@@ -12,7 +13,7 @@ namespace ms.robin.TeamsMqttBridge;
1213
internal static class Program
1314
{
1415
internal static TeamsLocalApi.Client? TeamsClient { get; set; }
15-
internal static IManagedMqttClient? MqttClient { get; set; }
16+
internal static IManagedMqttClient? MqttClient { get; set; }
1617

1718
/// <summary>
1819
/// The main entry point for the application.
@@ -106,7 +107,7 @@ internal async static void TryReconnectMqtt()
106107
Model = "Teams HA Link",
107108
Manufacturer = "MrRoundRobin",
108109
};
109-
110+
110111
await MqttClient.EnqueueAsync($"homeassistant/switch/{Default.NodeName}/mute/config", JsonSerializer.Serialize(new Discovery()
111112
{
112113
Name = "Mute",
@@ -305,42 +306,42 @@ internal async static void SendUpdate(string? propertyName = null)
305306
return;
306307

307308
if (propertyName is null || propertyName == nameof(TeamsClient.IsMuted))
308-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/state/isMuted", TeamsClient.IsMuted ? "ON" : "OFF", retain: true);
309+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/state/isMuted", TeamsClient.IsMuted ? "ON" : "OFF", retain: true);
309310

310311
if (propertyName is null || propertyName == nameof(TeamsClient.IsCameraOn))
311-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/state/isCameraOn", TeamsClient.IsCameraOn ? "ON" : "OFF", retain: true);
312+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/state/isCameraOn", TeamsClient.IsCameraOn ? "ON" : "OFF", retain: true);
312313

313314
if (propertyName is null || propertyName == nameof(TeamsClient.IsHandRaised))
314-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/state/isHandRaised", TeamsClient.IsHandRaised ? "ON" : "OFF", retain: true);
315+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/state/isHandRaised", TeamsClient.IsHandRaised ? "ON" : "OFF", retain: true);
315316

316317
if (propertyName is null || propertyName == nameof(TeamsClient.IsInMeeting))
317-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/state/isInMeeting", TeamsClient.IsInMeeting ? "ON" : "OFF", retain: true);
318+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/state/isInMeeting", TeamsClient.IsInMeeting ? "ON" : "OFF", retain: true);
318319

319320
if (propertyName is null || propertyName == nameof(TeamsClient.IsRecordingOn))
320-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/state/isRecordingOn", TeamsClient.IsRecordingOn ? "ON" : "OFF", retain: true);
321+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/state/isRecordingOn", TeamsClient.IsRecordingOn ? "ON" : "OFF", retain: true);
321322

322323
if (propertyName is null || propertyName == nameof(TeamsClient.IsBackgroundBlurred))
323-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/state/isBackgroundBlurred", TeamsClient.IsBackgroundBlurred ? "ON" : "OFF", retain: true);
324+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/state/isBackgroundBlurred", TeamsClient.IsBackgroundBlurred ? "ON" : "OFF", retain: true);
324325

325326
if (propertyName is null || propertyName == nameof(TeamsClient.CanToggleMute))
326-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canToggleMute", TeamsClient.CanToggleMute ? "ON" : "OFF", retain: true);
327+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canToggleMute", TeamsClient.CanToggleMute ? "ON" : "OFF", retain: true);
327328

328329
if (propertyName is null || propertyName == nameof(TeamsClient.CanToggleVideo))
329-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canToggleVideo", TeamsClient.CanToggleVideo ? "ON" : "OFF", retain: true);
330+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canToggleVideo", TeamsClient.CanToggleVideo ? "ON" : "OFF", retain: true);
330331

331332
if (propertyName is null || propertyName == nameof(TeamsClient.CanToggleHand))
332-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canToggleHand", TeamsClient.CanToggleHand ? "ON" : "OFF", retain: true);
333+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canToggleHand", TeamsClient.CanToggleHand ? "ON" : "OFF", retain: true);
333334

334335
if (propertyName is null || propertyName == nameof(TeamsClient.CanToggleBlur))
335-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canToggleBlur", TeamsClient.CanToggleBlur ? "ON" : "OFF", retain: true);
336+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canToggleBlur", TeamsClient.CanToggleBlur ? "ON" : "OFF", retain: true);
336337

337338
if (propertyName is null || propertyName == nameof(TeamsClient.CanToggleRecord))
338-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canToggleRecord", TeamsClient.CanToggleRecord ? "ON" : "OFF", retain: true);
339+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canToggleRecord", TeamsClient.CanToggleRecord ? "ON" : "OFF", retain: true);
339340

340341
if (propertyName is null || propertyName == nameof(TeamsClient.CanLeave))
341-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canLeave", TeamsClient.CanLeave ? "ON" : "OFF", retain: true);
342+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canLeave", TeamsClient.CanLeave ? "ON" : "OFF", retain: true);
342343

343344
if (propertyName is null || propertyName == nameof(TeamsClient.CanReact))
344-
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canReact", TeamsClient.CanReact ? "ON" : "OFF", retain: true);
345+
await MqttClient.EnqueueAsync($"teams/{Default.NodeName}/permission/canReact", TeamsClient.CanReact ? "ON" : "OFF", retain: true);
345346
}
346347
}

‎src/Properties/Settings.Designer.cs

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/Properties/Settings.settings

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<?xml version='1.0' encoding='utf-8'?>
2-
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="ms.robin.TeamsMqttBridge.Properties" GeneratedClassName="Settings">
2+
<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" GeneratedClassNamespace="ro.TeamsMqttBridge.Properties" GeneratedClassName="Settings">
33
<Profiles />
44
<Settings>
55
<Setting Name="TeamsToken" Type="System.String" Scope="User">

‎src/SettingsForm.Designer.cs

Lines changed: 39 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/SettingsForm.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
namespace ms.robin.TeamsMqttBridge;
1+
namespace ro.TeamsMqttBridge;
22

33
using static Properties.Settings;
44

‎src/TeamsMQTTBridge.csproj

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,11 @@
66
<Nullable>enable</Nullable>
77
<UseWindowsForms>true</UseWindowsForms>
88
<ImplicitUsings>enable</ImplicitUsings>
9-
<RootNamespace>ms.robin.TeamsMqttBridge</RootNamespace>
9+
<RootNamespace>ro.TeamsMqttBridge</RootNamespace>
1010
<IncludeSymbols>True</IncludeSymbols>
1111
<SymbolPackageFormat>snupkg</SymbolPackageFormat>
1212
<EnforceCodeStyleInBuild>True</EnforceCodeStyleInBuild>
13+
<ApplicationIcon>Home_Assistant.ico</ApplicationIcon>
1314
</PropertyGroup>
1415

1516
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
@@ -20,10 +21,14 @@
2021
<WarningLevel>7</WarningLevel>
2122
</PropertyGroup>
2223

24+
<ItemGroup>
25+
<Content Include="Home_Assistant.ico" />
26+
</ItemGroup>
27+
2328
<ItemGroup>
2429
<PackageReference Include="Macross.Json.Extensions" Version="3.0.0" />
2530
<PackageReference Include="MQTTnet.Extensions.ManagedClient" Version="4.1.4.563" />
26-
<PackageReference Include="TeamsLocalApi" Version="1.0.0" />
31+
<PackageReference Include="Ro.TeamsLocalApi" Version="0.1.0" />
2732
</ItemGroup>
2833

2934
<ItemGroup>

‎src/Utils/JsonSnakeCaseNamingPolicy.cs

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@
44

55
// https://github.com/dotnet/corefx/blob/c54ddc76da61c50576eff92e3add9caf7107f8af/src/System.Text.Json/src/System/Text/Json/Serialization/JsonSnakeCaseNamingPolicy.cs
66

7-
namespace System.Text.Json
7+
using System.Text;
8+
using System.Text.Json;
9+
10+
namespace ro.TeamsMqttBridge.Utils
811
{
912
internal sealed class JsonSnakeCaseNamingPolicy : JsonNamingPolicy
1013
{
@@ -42,7 +45,7 @@ public override string ConvertName(string name)
4245
switch (state)
4346
{
4447
case SnakeCaseState.Upper:
45-
bool hasNext = (i + 1 < nameSpan.Length);
48+
bool hasNext = i + 1 < nameSpan.Length;
4649
if (i > 0 && hasNext)
4750
{
4851
char nextChar = nameSpan[i + 1];

0 commit comments

Comments
 (0)