Skip to content

Commit 78477d0

Browse files
HandyS11claude
HandyS11
and
claude
committed
style: apply jb cleanupcode ReformatAndReorder to alarm-slice files
Whitespace-only line-wrap reformats produced by dotnet jb cleanupcode --profile=ReformatAndReorder. No semantic changes. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
1 parent 9401d6e commit 78477d0

10 files changed

Lines changed: 86 additions & 44 deletions

File tree

‎src/RustPlusBot.Features.Alarms/Modules/AlarmComponentModule.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,8 @@ public async Task PingToggleAsync(string tail)
8989
}
9090

9191
await store
92-
.SetPingEveryoneAsync(Context.Guild.Id, serverId, entityId, !current.PingEveryone, CancellationToken.None)
92+
.SetPingEveryoneAsync(Context.Guild.Id, serverId, entityId, !current.PingEveryone,
93+
CancellationToken.None)
9394
.ConfigureAwait(false);
9495
}
9596

‎src/RustPlusBot.Features.Alarms/Pairing/AlarmPairingCoordinator.cs‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,8 @@ public async Task HandlePairedAsync(AlarmPairedEvent evt, CancellationToken canc
4242
await using (scope.ConfigureAwait(false))
4343
{
4444
var store = scope.ServiceProvider.GetRequiredService<IAlarmStore>();
45-
if (await store.ExistsAsync(evt.GuildId, evt.ServerId, evt.EntityId, cancellationToken).ConfigureAwait(false))
45+
if (await store.ExistsAsync(evt.GuildId, evt.ServerId, evt.EntityId, cancellationToken)
46+
.ConfigureAwait(false))
4647
{
4748
return;
4849
}
@@ -54,7 +55,8 @@ public async Task HandlePairedAsync(AlarmPairedEvent evt, CancellationToken canc
5455
return;
5556
}
5657

57-
var culture = await GetCultureAsync(scope.ServiceProvider, evt.GuildId, cancellationToken).ConfigureAwait(false);
58+
var culture = await GetCultureAsync(scope.ServiceProvider, evt.GuildId, cancellationToken)
59+
.ConfigureAwait(false);
5860
var defaultName = $"Alarm {evt.EntityId}";
5961
var (embed, components) = renderer.RenderPrompt(evt.ServerId, evt.EntityId, defaultName, culture);
6062
var messageId = await poster.EnsureAsync(channel, null, embed, components, cancellationToken)
@@ -96,7 +98,8 @@ public async Task<bool> TryAcceptAsync(
9698
var channelId = await locator.GetChannelIdAsync(guildId, serverId, cancellationToken).ConfigureAwait(false);
9799
if (channelId is { } channel)
98100
{
99-
var culture = await GetCultureAsync(scope.ServiceProvider, guildId, cancellationToken).ConfigureAwait(false);
101+
var culture = await GetCultureAsync(scope.ServiceProvider, guildId, cancellationToken)
102+
.ConfigureAwait(false);
100103

101104
// The alarm is freshly accepted; unreachable is false (it just paired).
102105
// The supervisor's prime path will re-render real state shortly.

‎src/RustPlusBot.Features.Alarms/Rendering/AlarmLocalizer.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ namespace RustPlusBot.Features.Alarms.Rendering;
55
/// <summary>Dictionary-backed localizer for Smart Alarms with English fallback and region normalization.</summary>
66
/// <remarks>Mirrors the SwitchLocalizer pattern; a future refactor may hoist a shared implementation.</remarks>
77
/// <param name="catalog">The culture → (key → value) catalog.</param>
8-
internal sealed class AlarmLocalizer(IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>> catalog) : IAlarmLocalizer
8+
internal sealed class AlarmLocalizer(IReadOnlyDictionary<string, IReadOnlyDictionary<string, string>> catalog)
9+
: IAlarmLocalizer
910
{
1011
private const string FallbackCulture = "en";
1112

‎src/RustPlusBot.Features.Pairing/Pairing/PairingHandler.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,10 +74,14 @@ private async Task HandleEntityAsync(
7474
switch (notification.EntityKind)
7575
{
7676
case RustPlusBot.Domain.Entities.PairedEntityKind.SmartSwitch:
77-
await eventBus.PublishAsync(new SwitchPairedEvent(guildId, server.Id, notification.EntityId), cancellationToken).ConfigureAwait(false);
77+
await eventBus
78+
.PublishAsync(new SwitchPairedEvent(guildId, server.Id, notification.EntityId), cancellationToken)
79+
.ConfigureAwait(false);
7880
break;
7981
case RustPlusBot.Domain.Entities.PairedEntityKind.SmartAlarm:
80-
await eventBus.PublishAsync(new AlarmPairedEvent(guildId, server.Id, notification.EntityId), cancellationToken).ConfigureAwait(false);
82+
await eventBus
83+
.PublishAsync(new AlarmPairedEvent(guildId, server.Id, notification.EntityId), cancellationToken)
84+
.ConfigureAwait(false);
8185
break;
8286
default:
8387
LogUnroutedEntityKind(logger, notification.EntityKind);
@@ -90,5 +94,6 @@ private async Task HandleEntityAsync(
9094
private static partial void LogUnknownEntityServer(ILogger logger, Guid facepunchServerId);
9195

9296
[LoggerMessage(Level = LogLevel.Debug, Message = "Dropping entity pairing of unrouted kind {Kind}.")]
93-
private static partial void LogUnroutedEntityKind(ILogger logger, RustPlusBot.Domain.Entities.PairedEntityKind kind);
97+
private static partial void
98+
LogUnroutedEntityKind(ILogger logger, RustPlusBot.Domain.Entities.PairedEntityKind kind);
9499
}

‎src/RustPlusBot.Features.Workspace/Locating/AlarmChannelLocator.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -20,16 +20,16 @@ internal sealed class AlarmChannelLocator(IServiceScopeFactory scopeFactory, ICl
2020

2121
private Dictionary<(ulong GuildId, Guid ServerId), ulong> _byServer = new();
2222

23-
/// <inheritdoc />
24-
public void Dispose() => _refreshGate.Dispose();
25-
2623
/// <inheritdoc />
2724
public async Task<ulong?> GetChannelIdAsync(ulong guildId, Guid serverId, CancellationToken cancellationToken)
2825
{
2926
await EnsureFreshAsync(cancellationToken).ConfigureAwait(false);
3027
return _byServer.TryGetValue((guildId, serverId), out var id) ? id : null;
3128
}
3229

30+
/// <inheritdoc />
31+
public void Dispose() => _refreshGate.Dispose();
32+
3333
private async Task EnsureFreshAsync(CancellationToken cancellationToken)
3434
{
3535
if (clock.UtcNow - _builtAt < CacheTtl)

‎tests/RustPlusBot.Features.Alarms.Tests/AlarmEmbedRendererTests.cs‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,8 @@ public void RenderAlarm_triggered_days_ago_shows_days_format()
113113
public void RenderAlarm_ping_off_button_is_secondary_style()
114114
{
115115
var (_, components) = Create().RenderAlarm(Sample(pingEveryone: false), unreachable: false, "en");
116-
var btn = Buttons(components).Single(b => b.CustomId!.StartsWith(AlarmComponentIds.PingTogglePrefix, StringComparison.Ordinal));
116+
var btn = Buttons(components).Single(b =>
117+
b.CustomId!.StartsWith(AlarmComponentIds.PingTogglePrefix, StringComparison.Ordinal));
117118

118119
Assert.Equal(ButtonStyle.Secondary, btn.Style);
119120
Assert.False(btn.IsDisabled);
@@ -123,7 +124,8 @@ public void RenderAlarm_ping_off_button_is_secondary_style()
123124
public void RenderAlarm_ping_on_button_is_success_style()
124125
{
125126
var (_, components) = Create().RenderAlarm(Sample(pingEveryone: true), unreachable: false, "en");
126-
var btn = Buttons(components).Single(b => b.CustomId!.StartsWith(AlarmComponentIds.PingTogglePrefix, StringComparison.Ordinal));
127+
var btn = Buttons(components).Single(b =>
128+
b.CustomId!.StartsWith(AlarmComponentIds.PingTogglePrefix, StringComparison.Ordinal));
127129

128130
Assert.Equal(ButtonStyle.Success, btn.Style);
129131
Assert.False(btn.IsDisabled);
@@ -135,7 +137,8 @@ public void RenderAlarm_ping_on_button_is_success_style()
135137
public void RenderAlarm_relay_off_button_is_secondary_style()
136138
{
137139
var (_, components) = Create().RenderAlarm(Sample(relayToTeamChat: false), unreachable: false, "en");
138-
var btn = Buttons(components).Single(b => b.CustomId!.StartsWith(AlarmComponentIds.RelayTogglePrefix, StringComparison.Ordinal));
140+
var btn = Buttons(components).Single(b =>
141+
b.CustomId!.StartsWith(AlarmComponentIds.RelayTogglePrefix, StringComparison.Ordinal));
139142

140143
Assert.Equal(ButtonStyle.Secondary, btn.Style);
141144
Assert.False(btn.IsDisabled);
@@ -145,7 +148,8 @@ public void RenderAlarm_relay_off_button_is_secondary_style()
145148
public void RenderAlarm_relay_on_button_is_success_style()
146149
{
147150
var (_, components) = Create().RenderAlarm(Sample(relayToTeamChat: true), unreachable: false, "en");
148-
var btn = Buttons(components).Single(b => b.CustomId!.StartsWith(AlarmComponentIds.RelayTogglePrefix, StringComparison.Ordinal));
151+
var btn = Buttons(components).Single(b =>
152+
b.CustomId!.StartsWith(AlarmComponentIds.RelayTogglePrefix, StringComparison.Ordinal));
149153

150154
Assert.Equal(ButtonStyle.Success, btn.Style);
151155
Assert.False(btn.IsDisabled);
@@ -169,7 +173,8 @@ public void RenderAlarm_unreachable_disables_all_buttons()
169173
public void RenderAlarm_ping_on_label_contains_on()
170174
{
171175
var (_, components) = Create().RenderAlarm(Sample(pingEveryone: true), unreachable: false, "en");
172-
var btn = Buttons(components).Single(b => b.CustomId!.StartsWith(AlarmComponentIds.PingTogglePrefix, StringComparison.Ordinal));
176+
var btn = Buttons(components).Single(b =>
177+
b.CustomId!.StartsWith(AlarmComponentIds.PingTogglePrefix, StringComparison.Ordinal));
173178

174179
Assert.Contains("on", btn.Label, StringComparison.OrdinalIgnoreCase);
175180
}
@@ -178,7 +183,8 @@ public void RenderAlarm_ping_on_label_contains_on()
178183
public void RenderAlarm_ping_off_label_contains_off()
179184
{
180185
var (_, components) = Create().RenderAlarm(Sample(pingEveryone: false), unreachable: false, "en");
181-
var btn = Buttons(components).Single(b => b.CustomId!.StartsWith(AlarmComponentIds.PingTogglePrefix, StringComparison.Ordinal));
186+
var btn = Buttons(components).Single(b =>
187+
b.CustomId!.StartsWith(AlarmComponentIds.PingTogglePrefix, StringComparison.Ordinal));
182188

183189
Assert.Contains("off", btn.Label, StringComparison.OrdinalIgnoreCase);
184190
}

‎tests/RustPlusBot.Features.Alarms.Tests/AlarmRefresherTests.cs‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -114,10 +114,7 @@ public async Task RefreshAsync_channel_unresolved_does_not_post()
114114
var serverId = Guid.NewGuid();
115115
var alarm = new SmartAlarm
116116
{
117-
GuildId = 10UL,
118-
ServerId = serverId,
119-
EntityId = 42UL,
120-
Name = "Fire Alarm",
117+
GuildId = 10UL, ServerId = serverId, EntityId = 42UL, Name = "Fire Alarm",
121118
};
122119
var h = Create(alarm: alarm, channelId: null);
123120

‎tests/RustPlusBot.Features.Alarms.Tests/AlarmStateRelayTests.cs‎

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -81,10 +81,7 @@ public async Task Triggered_active_managed_alarm_updates_state_and_refreshes()
8181
var serverId = Guid.NewGuid();
8282
var alarm = new SmartAlarm
8383
{
84-
GuildId = 10UL,
85-
ServerId = serverId,
86-
EntityId = 42UL,
87-
Name = "Perimeter",
84+
GuildId = 10UL, ServerId = serverId, EntityId = 42UL, Name = "Perimeter",
8885
};
8986
var h = Create(alarm: alarm);
9087

@@ -93,7 +90,8 @@ await h.Relay.HandleTriggeredAsync(
9390

9491
await h.Store.Received(1).UpdateStateAsync(
9592
10UL, serverId, 42UL, true, _fixedNow, Arg.Any<CancellationToken>());
96-
await h.Refresher.Received(1).RefreshAsync(10UL, serverId, 42UL, unreachable: false, Arg.Any<CancellationToken>());
93+
await h.Refresher.Received(1)
94+
.RefreshAsync(10UL, serverId, 42UL, unreachable: false, Arg.Any<CancellationToken>());
9795
}
9896

9997
/// <summary>Active trigger with PingEveryone sends the @everyone message.</summary>
@@ -209,7 +207,8 @@ await h.Relay.HandleTriggeredAsync(
209207

210208
await h.Store.Received(1).UpdateStateAsync(
211209
10UL, serverId, 42UL, false, null, Arg.Any<CancellationToken>());
212-
await h.Refresher.Received(1).RefreshAsync(10UL, serverId, 42UL, unreachable: false, Arg.Any<CancellationToken>());
210+
await h.Refresher.Received(1)
211+
.RefreshAsync(10UL, serverId, 42UL, unreachable: false, Arg.Any<CancellationToken>());
213212
await h.Poster.DidNotReceive()
214213
.SendEveryonePingAsync(Arg.Any<ulong>(), Arg.Any<string>(), Arg.Any<CancellationToken>());
215214
await h.TeamChatSender.DidNotReceive()
@@ -272,7 +271,8 @@ await h.Relay.HandleTriggeredAsync(
272271

273272
await h.Store.Received(1).UpdateStateAsync(
274273
10UL, serverId, 42UL, true, _fixedNow, Arg.Any<CancellationToken>());
275-
await h.Refresher.Received(1).RefreshAsync(10UL, serverId, 42UL, unreachable: false, Arg.Any<CancellationToken>());
274+
await h.Refresher.Received(1)
275+
.RefreshAsync(10UL, serverId, 42UL, unreachable: false, Arg.Any<CancellationToken>());
276276
await h.Poster.Received(1).SendEveryonePingAsync(777UL, "@everyone Fire", Arg.Any<CancellationToken>());
277277
}
278278

@@ -290,23 +290,29 @@ public async Task ConnectionStatus_not_connected_refreshes_all_alarms_unreachabl
290290
h.Connections.GetStateAsync(10UL, serverId, Arg.Any<CancellationToken>())
291291
.Returns(new ConnectionState
292292
{
293-
GuildId = 10UL,
294-
RustServerId = serverId,
295-
Status = ConnectionStatus.Unreachable,
293+
GuildId = 10UL, RustServerId = serverId, Status = ConnectionStatus.Unreachable,
296294
});
297295

298296
h.Store.ListByServerAsync(10UL, serverId, Arg.Any<CancellationToken>())
299297
.Returns(new[]
300298
{
301-
new SmartAlarm { GuildId = 10UL, ServerId = serverId, EntityId = 42UL, Name = "A" },
302-
new SmartAlarm { GuildId = 10UL, ServerId = serverId, EntityId = 43UL, Name = "B" },
299+
new SmartAlarm
300+
{
301+
GuildId = 10UL, ServerId = serverId, EntityId = 42UL, Name = "A"
302+
},
303+
new SmartAlarm
304+
{
305+
GuildId = 10UL, ServerId = serverId, EntityId = 43UL, Name = "B"
306+
},
303307
});
304308

305309
await h.Relay.HandleConnectionStatusAsync(
306310
new ConnectionStatusChangedEvent(10UL, serverId), CancellationToken.None);
307311

308-
await h.Refresher.Received(1).RefreshAsync(10UL, serverId, 42UL, unreachable: true, Arg.Any<CancellationToken>());
309-
await h.Refresher.Received(1).RefreshAsync(10UL, serverId, 43UL, unreachable: true, Arg.Any<CancellationToken>());
312+
await h.Refresher.Received(1)
313+
.RefreshAsync(10UL, serverId, 42UL, unreachable: true, Arg.Any<CancellationToken>());
314+
await h.Refresher.Received(1)
315+
.RefreshAsync(10UL, serverId, 43UL, unreachable: true, Arg.Any<CancellationToken>());
310316
}
311317

312318
/// <summary>Connected server → no-op (supervisor's prime path handles it).</summary>
@@ -319,9 +325,7 @@ public async Task ConnectionStatus_connected_does_nothing()
319325
h.Connections.GetStateAsync(10UL, serverId, Arg.Any<CancellationToken>())
320326
.Returns(new ConnectionState
321327
{
322-
GuildId = 10UL,
323-
RustServerId = serverId,
324-
Status = ConnectionStatus.Connected,
328+
GuildId = 10UL, RustServerId = serverId, Status = ConnectionStatus.Connected,
325329
});
326330

327331
await h.Relay.HandleConnectionStatusAsync(

‎tests/RustPlusBot.Features.Pairing.Tests/PairingHandlerTests.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ public async Task EntityPairing_UnknownServer_DropsAndCreatesNothing()
133133
public async Task EntityPairing_Alarm_PublishesAlarmPairedEvent_NotSwitch()
134134
{
135135
var (context, connection) = TestDb.Create();
136-
await using var _ = context; await using var __ = connection;
136+
await using var _ = context;
137+
await using var __ = connection;
137138
var bus = Substitute.For<IEventBus>();
138139
var handler = CreateHandler(context, bus);
139140
await handler.HandleAsync(10UL, 99UL, ServerPairing(), CancellationToken.None);

‎tests/RustPlusBot.Persistence.Tests/Alarms/SmartAlarmSchemaTests.cs‎

Lines changed: 29 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,13 +13,20 @@ public async Task RemovingServer_CascadeDeletesAlarms()
1313
await using var _ = context;
1414
await using var __ = connection;
1515

16-
var server = new RustServer { GuildId = 10UL, Name = "S", Ip = "1.2.3.4", Port = 28015 };
16+
var server = new RustServer
17+
{
18+
GuildId = 10UL, Name = "S", Ip = "1.2.3.4", Port = 28015
19+
};
1720
context.RustServers.Add(server);
1821
await context.SaveChangesAsync();
1922

2023
context.SmartAlarms.Add(new SmartAlarm
2124
{
22-
GuildId = 10UL, ServerId = server.Id, EntityId = 42UL, Name = "Alarm 42", CreatedUtc = DateTimeOffset.UtcNow,
25+
GuildId = 10UL,
26+
ServerId = server.Id,
27+
EntityId = 42UL,
28+
Name = "Alarm 42",
29+
CreatedUtc = DateTimeOffset.UtcNow,
2330
});
2431
await context.SaveChangesAsync();
2532

@@ -36,13 +43,30 @@ public async Task DuplicateEntityForSameServer_IsRejected()
3643
await using var _ = context;
3744
await using var __ = connection;
3845

39-
var server = new RustServer { GuildId = 10UL, Name = "S", Ip = "1.2.3.4", Port = 28015 };
46+
var server = new RustServer
47+
{
48+
GuildId = 10UL, Name = "S", Ip = "1.2.3.4", Port = 28015
49+
};
4050
context.RustServers.Add(server);
4151
await context.SaveChangesAsync();
4252

43-
context.SmartAlarms.Add(new SmartAlarm { GuildId = 10UL, ServerId = server.Id, EntityId = 7UL, Name = "a", CreatedUtc = DateTimeOffset.UtcNow });
53+
context.SmartAlarms.Add(new SmartAlarm
54+
{
55+
GuildId = 10UL,
56+
ServerId = server.Id,
57+
EntityId = 7UL,
58+
Name = "a",
59+
CreatedUtc = DateTimeOffset.UtcNow
60+
});
4461
await context.SaveChangesAsync();
45-
context.SmartAlarms.Add(new SmartAlarm { GuildId = 10UL, ServerId = server.Id, EntityId = 7UL, Name = "b", CreatedUtc = DateTimeOffset.UtcNow });
62+
context.SmartAlarms.Add(new SmartAlarm
63+
{
64+
GuildId = 10UL,
65+
ServerId = server.Id,
66+
EntityId = 7UL,
67+
Name = "b",
68+
CreatedUtc = DateTimeOffset.UtcNow
69+
});
4670

4771
await Assert.ThrowsAsync<DbUpdateException>(() => context.SaveChangesAsync());
4872
}

0 commit comments

Comments
 (0)