Compose the clan module into the host

Register AddClans, document the feature and its API limits in the README, and
apply the repository formatting profile.

Full suite: 1217 passed, 1 skipped, 0 failed across 19 test assemblies
(Clans 82, Connections 112, Chat 54, Workspace 102, Persistence 125, Commands
149, Alarms 67, ItemData.Generator 63, Pairing 56, ItemData 53, Events 52,
Abstractions 48, Switches 40, StorageMonitors 37, Wipes 26, Players 22,
Discord 20, Localization 12, Map 97+1 skipped).

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Author: HandyS11

README.md

@@ -43,6 +43,26 @@ recycle/craft/research/decay/upkeep calculators are all shipped. Cameras are nex
 - Two-way relay between in-game team chat and a per-server `#teamchat` channel
   (via a managed webhook), with echo/loop suppression.
 
+### Clans
+
+- **Conditional channels** — `#clanchat` and `#claninfo` appear automatically when
+  the paired player is in a clan, and are removed again when they leave; no
+  command to run either way.
+- **`#clanchat`** — two-way relay between in-game clan chat and the channel, sharing
+  the same echo/loop suppression as the team bridge.
+- **`#claninfo`** — three pinned auto-refreshing embeds — **Overview** (score,
+  member count, creation date, leader, creator, MOTD), **Roster** (members grouped
+  by clan role, online first, with each role's permissions), and **Invites** —
+  refreshed on the existing `Workspace:InfoRefreshInterval`, plus a live feed of
+  clan changes (members joining/leaving, promotions/demotions, invites, rename,
+  MOTD, logo, colour, score, dissolution).
+- **Set MOTD** — a button on the overview embed opens a modal that writes the MOTD
+  back to the game; it is offered only when the paired player's in-game clan role
+  carries the permission.
+- **API limits** — RustPlusApi 2.0.0-beta.4 exposes no clan audit log, no per-member
+  scores, and no kick/invite/promote actions, so none of those are implemented; the
+  feed is instead derived by diffing successive clan snapshots.
+
 ### In-game `!commands`
 
 Run in team chat by any teammate; replies in the guild's language with a
@@ -128,7 +148,8 @@ See [docs/development/running-locally.md](docs/development/running-locally.md).
 | `RustPlusBot.Features.Workspace` | Channel/message provisioning, reconciler, `#info`/`#setup`/`#settings` surfaces |
 | `RustPlusBot.Features.Pairing` | FCM pairing listener, credential intake, account disconnect |
 | `RustPlusBot.Features.Connections` | Live socket supervisor, hot-swap/failover, Rust+ query seam |
-| `RustPlusBot.Features.Chat` | Two-way `#teamchat` ↔ in-game chat bridge |
+| `RustPlusBot.Features.Chat` | Two-way `#teamchat` / `#clanchat` ↔ in-game chat bridges |
+| `RustPlusBot.Features.Clans` | Clan state, `#claninfo` embeds and change feed, Set MOTD |
 | `RustPlusBot.Features.Commands` | In-game `!commands`, slash surfaces, `/help`/`/leader` |
 | `RustPlusBot.Features.Events` | Live map-event classification + `#events` feed |
 | `RustPlusBot.Features.Map` | Map image rendering with toggleable layers |

src/RustPlusBot.Features.Chat/Hosting/ChatHostedService.cs

@@ -27,8 +27,8 @@ internal sealed partial class ChatHostedService(
     ILogger<ChatHostedService> logger) : IHostedService, IDisposable
 {
     private readonly CancellationTokenSource _cts = new();
-    private Task? _teamLoop;
     private Task? _clanLoop;
+    private Task? _teamLoop;
 
     /// <inheritdoc />
     public void Dispose() => _cts.Dispose();

src/RustPlusBot.Features.Clans/Messages/ClanOverviewMessageRenderer.cs

@@ -120,7 +120,10 @@ private Task<IReadOnlyDictionary<ulong, string>> ResolveNamesAsync(
         CancellationToken cancellationToken)
     {
         // One batched call: the embed needs at most the leader, the creator and the MOTD author.
-        var ids = new HashSet<ulong> { clan.Creator };
+        var ids = new HashSet<ulong>
+        {
+            clan.Creator
+        };
         if (leader is not null)
         {
             ids.Add(leader.SteamId);

src/RustPlusBot.Features.Clans/State/ClanCapabilityProvider.cs

@@ -36,20 +36,6 @@ internal sealed class ClanCapabilityProvider(IServiceScopeFactory scopeFactory,
     /// <inheritdoc />
     public string Capability => WorkspaceCapabilities.Clan;
 
-    /// <summary>
-    /// Drops the cached answer for a server. Called by <see cref="ClanStateService"/> immediately
-    /// before it reconciles a clan transition, so the reconcile sees the just-written row rather
-    /// than a stale pre-transition answer.
-    /// </summary>
-    /// <param name="guildId">The guild snowflake.</param>
-    /// <param name="serverId">The server id.</param>
-    public void Invalidate(ulong guildId, Guid serverId)
-    {
-        // Bump first: an in-flight read that observes the new epoch after its query will not cache.
-        Interlocked.Increment(ref _epoch);
-        _cache.TryRemove((guildId, serverId), out _);
-    }
-
     /// <inheritdoc />
     public async ValueTask<bool> IsAvailableAsync(ulong guildId, Guid? serverId, CancellationToken cancellationToken)
     {
@@ -86,4 +72,18 @@ public async ValueTask<bool> IsAvailableAsync(ulong guildId, Guid? serverId, Can
             return available;
         }
     }
+
+    /// <summary>
+    /// Drops the cached answer for a server. Called by <see cref="ClanStateService"/> immediately
+    /// before it reconciles a clan transition, so the reconcile sees the just-written row rather
+    /// than a stale pre-transition answer.
+    /// </summary>
+    /// <param name="guildId">The guild snowflake.</param>
+    /// <param name="serverId">The server id.</param>
+    public void Invalidate(ulong guildId, Guid serverId)
+    {
+        // Bump first: an in-flight read that observes the new epoch after its query will not cache.
+        Interlocked.Increment(ref _epoch);
+        _cache.TryRemove((guildId, serverId), out _);
+    }
 }

src/RustPlusBot.Features.Clans/State/ClanSnapshotDiffer.cs

@@ -53,7 +53,8 @@ public static IReadOnlyList<ClanChange> Diff(ClanSnapshot? previous, ClanSnapsho
         // An id that left Invites and appeared in Members in one step is an acceptance, reported
         // once — never as a join plus a revocation.
         var accepted = previousInvites
-            .Where(id => !currentInvites.Contains(id) && currentMembers.ContainsKey(id) && !previousMembers.ContainsKey(id))
+            .Where(id =>
+                !currentInvites.Contains(id) && currentMembers.ContainsKey(id) && !previousMembers.ContainsKey(id))
             .ToHashSet();
 
         foreach (var id in currentMembers.Keys.Where(id => !previousMembers.ContainsKey(id) && !accepted.Contains(id))

src/RustPlusBot.Features.Connections/Supervisor/ConnectionSupervisor.cs

@@ -89,6 +89,48 @@ public async ValueTask DisposeAsync()
         _gate.Dispose();
     }
 
+    /// <inheritdoc />
+    public async Task<ChatSendResult> SendAsync(
+        ChatChannelKind kind,
+        ulong guildId,
+        Guid serverId,
+        string message,
+        CancellationToken cancellationToken)
+    {
+        if (!_liveSockets.TryGetValue((guildId, serverId), out var live))
+        {
+            return ChatSendResult.NotConnected;
+        }
+
+        try
+        {
+            switch (kind)
+            {
+                case ChatChannelKind.Team:
+                    await live.Connection.SendTeamMessageAsync(message, cancellationToken).ConfigureAwait(false);
+                    break;
+                case ChatChannelKind.Clan:
+                    await live.Connection.SendClanMessageAsync(message, cancellationToken).ConfigureAwait(false);
+                    break;
+                default:
+                    return ChatSendResult.Failed;
+            }
+
+            return ChatSendResult.Sent;
+        }
+        catch (OperationCanceledException)
+        {
+            throw;
+        }
+#pragma warning disable CA1031 // Broad catch: a failed relay send must not crash the caller; report Failed.
+        catch (Exception ex)
+#pragma warning restore CA1031
+        {
+            LogSendFailed(logger, ex, serverId);
+            return ChatSendResult.Failed;
+        }
+    }
+
     /// <inheritdoc />
     public async Task StartAllAsync(CancellationToken cancellationToken = default)
     {
@@ -380,48 +422,6 @@ public async Task<bool> SetClanMotdAsync(
             .ConfigureAwait(false);
     }
 
-    /// <inheritdoc />
-    public async Task<ChatSendResult> SendAsync(
-        ChatChannelKind kind,
-        ulong guildId,
-        Guid serverId,
-        string message,
-        CancellationToken cancellationToken)
-    {
-        if (!_liveSockets.TryGetValue((guildId, serverId), out var live))
-        {
-            return ChatSendResult.NotConnected;
-        }
-
-        try
-        {
-            switch (kind)
-            {
-                case ChatChannelKind.Team:
-                    await live.Connection.SendTeamMessageAsync(message, cancellationToken).ConfigureAwait(false);
-                    break;
-                case ChatChannelKind.Clan:
-                    await live.Connection.SendClanMessageAsync(message, cancellationToken).ConfigureAwait(false);
-                    break;
-                default:
-                    return ChatSendResult.Failed;
-            }
-
-            return ChatSendResult.Sent;
-        }
-        catch (OperationCanceledException)
-        {
-            throw;
-        }
-#pragma warning disable CA1031 // Broad catch: a failed relay send must not crash the caller; report Failed.
-        catch (Exception ex)
-#pragma warning restore CA1031
-        {
-            LogSendFailed(logger, ex, serverId);
-            return ChatSendResult.Failed;
-        }
-    }
-
     [LoggerMessage(Level = LogLevel.Error, Message = "Connection loop for server {ServerId} faulted.")]
     private static partial void LogLoopFaulted(ILogger logger, Exception exception, Guid serverId);
 

src/RustPlusBot.Features.Workspace/Registry/WorkspaceRegistry.cs

@@ -9,12 +9,12 @@ internal sealed class WorkspaceRegistry(
     IEnumerable<IMessageSpecProvider> messageProviders,
     IEnumerable<IWorkspaceCapabilityProvider> capabilityProviders) : IWorkspaceRegistry
 {
-    private readonly List<ChannelSpec> _channels = [.. channelProviders.SelectMany(p => p.GetChannelSpecs())];
-    private readonly List<MessageSpec> _messages = [.. messageProviders.SelectMany(p => p.GetMessageSpecs())];
-
     private readonly Dictionary<string, IWorkspaceCapabilityProvider> _capabilities =
         capabilityProviders.ToDictionary(p => p.Capability, StringComparer.Ordinal);
 
+    private readonly List<ChannelSpec> _channels = [.. channelProviders.SelectMany(p => p.GetChannelSpecs())];
+    private readonly List<MessageSpec> _messages = [.. messageProviders.SelectMany(p => p.GetMessageSpecs())];
+
     /// <inheritdoc />
     public ValueTask<bool> IsCapabilityAvailableAsync(string capability,
         ulong guildId,

src/RustPlusBot.Host/Program.cs

@@ -5,6 +5,7 @@
 using RustPlusBot.Discord;
 using RustPlusBot.Features.Alarms;
 using RustPlusBot.Features.Chat;
+using RustPlusBot.Features.Clans;
 using RustPlusBot.Features.Commands;
 using RustPlusBot.Features.Connections;
 using RustPlusBot.Features.Events;
@@ -69,6 +70,7 @@
     .ValidateOnStart();
 builder.Services.AddConnections();
 builder.Services.AddChat();
+builder.Services.AddClans();
 builder.Services.AddOptions<CommandOptions>()
     .Bind(builder.Configuration.GetSection("Commands"))
     .Validate(static o => o.Cooldown > TimeSpan.Zero, "Commands:Cooldown must be positive.")

src/RustPlusBot.Host/RustPlusBot.Host.csproj

@@ -26,6 +26,7 @@
     <ProjectReference Include="..\RustPlusBot.Features.Pairing\RustPlusBot.Features.Pairing.csproj" />
     <ProjectReference Include="..\RustPlusBot.Features.Connections\RustPlusBot.Features.Connections.csproj" />
     <ProjectReference Include="..\RustPlusBot.Features.Chat\RustPlusBot.Features.Chat.csproj" />
+    <ProjectReference Include="..\RustPlusBot.Features.Clans\RustPlusBot.Features.Clans.csproj" />
     <ProjectReference Include="..\RustPlusBot.Features.Commands\RustPlusBot.Features.Commands.csproj" />
     <ProjectReference Include="..\RustPlusBot.Features.Events\RustPlusBot.Features.Events.csproj" />
     <ProjectReference Include="..\RustPlusBot.Features.Switches\RustPlusBot.Features.Switches.csproj" />

src/RustPlusBot.Persistence/Clans/ClanSnapshotSerializer.cs

@@ -1,5 +1,4 @@
 using System.Text.Json;
-using RustPlusBot.Abstractions.Connections;
 
 namespace RustPlusBot.Persistence.Clans;