mirror of
https://github.com/barelyprofessional/KfChatDotNet.git
synced 2026-05-02 04:22:04 -04:00
Handle presence updates that don't contain a username
This commit is contained in:
@@ -845,7 +845,7 @@ public class BotServices
|
|||||||
// TODO: Figure out why this never works
|
// TODO: Figure out why this never works
|
||||||
private void DiscordOnPresenceUpdated(object sender, DiscordPresenceUpdateModel presence)
|
private void DiscordOnPresenceUpdated(object sender, DiscordPresenceUpdateModel presence)
|
||||||
{
|
{
|
||||||
var settings = SettingsProvider.GetMultipleValuesAsync([BuiltIn.Keys.DiscordBmjId, BuiltIn.Keys.DiscordIcon]).Result;
|
var settings = SettingsProvider.GetMultipleValuesAsync([BuiltIn.Keys.DiscordBmjId, BuiltIn.Keys.DiscordIcon, BuiltIn.Keys.TwitchBossmanJackUsername]).Result;
|
||||||
if (presence.User.Id != settings[BuiltIn.Keys.DiscordBmjId].Value)
|
if (presence.User.Id != settings[BuiltIn.Keys.DiscordBmjId].Value)
|
||||||
{
|
{
|
||||||
return;
|
return;
|
||||||
@@ -857,7 +857,7 @@ public class BotServices
|
|||||||
// }
|
// }
|
||||||
// _lastDiscordStatus = presence.Status;
|
// _lastDiscordStatus = presence.Status;
|
||||||
var clientStatus = presence.ClientStatus.Keys.Aggregate(string.Empty, (current, device) => current + $"{device} is {presence.ClientStatus[device]}; ");
|
var clientStatus = presence.ClientStatus.Keys.Aggregate(string.Empty, (current, device) => current + $"{device} is {presence.ClientStatus[device]}; ");
|
||||||
_chatBot.SendChatMessage($"[img]{settings[BuiltIn.Keys.DiscordIcon].Value}[/img] {presence.User.GlobalName ?? presence.User.Username} has updated his Discord presence: {clientStatus}");
|
_chatBot.SendChatMessage($"[img]{settings[BuiltIn.Keys.DiscordIcon].Value}[/img] {presence.User.GlobalName ?? presence.User.Username ?? settings[BuiltIn.Keys.TwitchBossmanJackUsername].Value} has updated his Discord presence: {clientStatus}");
|
||||||
UpdateBossmanLastSighting($"going {presence.Status} on Discord").Wait(_cancellationToken);
|
UpdateBossmanLastSighting($"going {presence.Status} on Discord").Wait(_cancellationToken);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -272,8 +272,7 @@ public class DiscordUserModel
|
|||||||
{
|
{
|
||||||
[JsonPropertyName("id")]
|
[JsonPropertyName("id")]
|
||||||
public required string Id { get; set; }
|
public required string Id { get; set; }
|
||||||
[JsonPropertyName("username")]
|
[JsonPropertyName("username")] public string? Username { get; set; } = null;
|
||||||
public required string Username { get; set; }
|
|
||||||
[JsonPropertyName("global_name")]
|
[JsonPropertyName("global_name")]
|
||||||
public string? GlobalName { get; set; }
|
public string? GlobalName { get; set; }
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user