TeamInklings/Octobot
TeamInklings/Octobot
1
0
Fork 1
mirror of https://github.com/TeamOctolings/Octobot.git synced 2025-05-06 22:16:29 +03:00
Code Issues Wiki Activity

Keep adapting code to new guild data storage...

Browse source 
Fix #15, update InspectCode, make Dependabot use the correct label
This commit is contained in:
Octol1ttle 2023-01-12 22:00:52 +05:00
parent fe2cfb3b3c
commit 4b2d98c440
Signed by: Octol1ttle
GPG key ID: B77C34313AEE1FFF
16 changed files with 152 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

22
Boyfriend/Data/GuildData.cs
View file

@ -24,7 +24,7 @@ public record GuildData {
// TODO: { "AutoStartEvents", "false" }
};
private static readonly Dictionary<ulong, GuildData> GuildDataDictionary = new();
public static readonly Dictionary<ulong, GuildData> GuildDataDictionary = new();
public readonly Dictionary<ulong, MemberData> MemberData;
@ -44,15 +44,12 @@ public record GuildData {
= JsonSerializer.Deserialize<Dictionary<string, string>>(File.ReadAllText($"{_id}/Configuration.json")) ??
new Dictionary<string, string>();
// ReSharper disable twice ForeachCanBePartlyConvertedToQueryUsingAnotherGetEnumerator
if (Preferences.Keys.Count < DefaultPreferences.Keys.Count)
foreach (var key in DefaultPreferences.Keys)
if (!Preferences.ContainsKey(key))
Preferences.Add(key, DefaultPreferences[key]);
foreach (var key in DefaultPreferences.Keys.Where(key => !Preferences.ContainsKey(key)))
Preferences.Add(key, DefaultPreferences[key]);
if (Preferences.Keys.Count > DefaultPreferences.Keys.Count)
foreach (var key in Preferences.Keys)
if (!DefaultPreferences.ContainsKey(key))
Preferences.Remove(key);
foreach (var key in Preferences.Keys.Where(key => !DefaultPreferences.ContainsKey(key)))
Preferences.Remove(key);
Preferences.TrimExcess();
MemberData = new Dictionary<ulong, MemberData>();
@ -67,7 +64,7 @@ public record GuildData {
if (MemberData.TryGetValue(member.Id, out var memberData)) {
if (!memberData.IsInGuild &&
DateTimeOffset.Now.ToUnixTimeSeconds() -
Math.Max(memberData.LeftAt.Last(), memberData.BannedUntil) >
Math.Max(memberData.LeftAt.Last().ToUnixTimeSeconds(), memberData.BannedUntil.ToUnixTimeSeconds()) >
60 * 60 * 24 * 30) {
File.Delete($"{_id}/MemberData/{memberData.Id}.json");
MemberData.Remove(memberData.Id);
@ -83,8 +80,11 @@ public record GuildData {
}
public SocketRole? MuteRole {
get => _cachedMuteRole ??= Boyfriend.Client.GetGuild(_id).Roles
.Single(x => x.Id == ulong.Parse(Preferences["MuteRole"]));
get {
if (Preferences["MuteRole"] is "0") return null;
return _cachedMuteRole ??= Boyfriend.Client.GetGuild(_id).Roles
.Single(x => x.Id == ulong.Parse(Preferences["MuteRole"]));
}
set => _cachedMuteRole = value;
}

16
Boyfriend/Data/MemberData.cs
View file

@ -3,23 +3,23 @@
namespace Boyfriend.Data;
public record MemberData {
public long BannedUntil;
public DateTimeOffset BannedUntil;
public ulong Id;
public bool IsInGuild;
public List<long> JoinedAt;
public List<long> LeftAt;
public long MutedUntil;
public List<DateTimeOffset> JoinedAt;
public List<DateTimeOffset> LeftAt;
public DateTimeOffset MutedUntil;
public List<Reminder> Reminders;
public List<ulong> Roles;
public MemberData(IGuildUser user) {
Id = user.Id;
IsInGuild = true;
JoinedAt = new List<long> { user.JoinedAt!.Value.ToUnixTimeSeconds() };
LeftAt = new List<long>();
JoinedAt = new List<DateTimeOffset> { user.JoinedAt!.Value };
LeftAt = new List<DateTimeOffset>();
Roles = user.RoleIds.ToList();
Reminders = new List<Reminder>();
MutedUntil = 0;
BannedUntil = 0;
MutedUntil = DateTimeOffset.MinValue;
BannedUntil = DateTimeOffset.MinValue;
}
}

2
Boyfriend/Data/Reminder.cs
View file

@ -1,6 +1,6 @@
namespace Boyfriend.Data;
public struct Reminder {
public long RemindAt;
public DateTimeOffset RemindAt;
public string ReminderText;
}