eightball/PluralKit
1
0
Fork 0
mirror of https://github.com/PluralKit/PluralKit.git synced 2026-02-04 04:56:49 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

fix(bot): get rid of infra-specific code in HttpDiscordCache

Browse source
This commit is contained in:
alyssa 2025-04-19 18:26:44 +00:00
parent 292c182eb2
commit 795e4f43b4
1 changed files with 12 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Myriad/Cache/HTTPDiscordCache.cs
View file

@ -14,7 +14,7 @@ public class HttpDiscordCache: IDiscordCache
{ {
private readonly ILogger _logger; private readonly ILogger _logger;
private readonly HttpClient _client; private readonly HttpClient _client;
private readonly Uri _cacheEndpoint; private readonly string _cacheEndpoint;
private readonly string? _eventTarget; private readonly string? _eventTarget;
private readonly int _shardCount; private readonly int _shardCount;
private readonly ulong _ownUserId; private readonly ulong _ownUserId;
@ -29,7 +29,7 @@ public class HttpDiscordCache: IDiscordCache
{ {
_logger = logger; _logger = logger;
_client = client; _client = client;
_cacheEndpoint = new Uri(cacheEndpoint); _cacheEndpoint = cacheEndpoint;
_eventTarget = eventTarget; _eventTarget = eventTarget;
_shardCount = shardCount; _shardCount = shardCount;
_ownUserId = ownUserId; _ownUserId = ownUserId;
@ -52,13 +52,12 @@ public class HttpDiscordCache: IDiscordCache
private async Task<T?> QueryCache<T>(string endpoint, ulong guildId) private async Task<T?> QueryCache<T>(string endpoint, ulong guildId)
{ {
var cluster = _cacheEndpoint.Authority; var cluster = _cacheEndpoint;
// todo: there should not be infra-specific code here
if (cluster.Contains(".service.consul") || cluster.Contains("process.pluralkit-gateway.internal"))
// int(((guild_id >> 22) % shard_count) / 16)
cluster = $"cluster{(int)(((guildId >> 22) % (ulong)_shardCount) / 16)}.{cluster}";
var response = await _client.GetAsync($"{_cacheEndpoint.Scheme}://{cluster}{endpoint}"); if (cluster.Contains("{clusterid}"))
cluster = cluster.Replace("{clusterid}", $"{(int)(((guildId >> 22) % (ulong)_shardCount) / 16)}");
var response = await _client.GetAsync($"http://{cluster}{endpoint}");
if (response.StatusCode == HttpStatusCode.NotFound) if (response.StatusCode == HttpStatusCode.NotFound)
return default; return default;
@ -81,14 +80,13 @@ public class HttpDiscordCache: IDiscordCache
if (_eventTarget == null) if (_eventTarget == null)
throw new Exception("missing event target for remote await event"); throw new Exception("missing event target for remote await event");
var cluster = _cacheEndpoint.Authority; var cluster = _cacheEndpoint;
// todo: there should not be infra-specific code here
if (cluster.Contains(".service.consul") || cluster.Contains("process.pluralkit-gateway.internal")) if (cluster.Contains("{clusterid}"))
// int(((guild_id >> 22) % shard_count) / 16) cluster = cluster.Replace("{clusterid}", $"{(int)(shardId / 16)}");
cluster = $"cluster{shardId / 16}.{cluster}";
var response = await _client.PostAsync( var response = await _client.PostAsync(
$"{_cacheEndpoint.Scheme}://{cluster}/await_event", $"http://{cluster}/await_event",
new StringContent(JsonSerializer.Serialize(data), Encoding.UTF8) new StringContent(JsonSerializer.Serialize(data), Encoding.UTF8)
); );