SoDOff-Project/sodoff-mmo
1
0
Fork 1
mirror of https://github.com/SoDOff-Project/sodoff-mmo.git synced 2025-10-11 08:18:49 -07:00
Code Issues Packages Projects Releases Wiki Activity

Remember mutes and bans and fixed some bugs I didn't initially catch.

Browse Source
This commit is contained in:
Hipposgrumm 2025-05-31 22:51:21 -06:00
parent 6abcc9d484
commit 1de7049c5d
3 changed files with 109 additions and 61 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitignore vendored
View File

@ -6,3 +6,4 @@ src/obj
src/Properties src/Properties
src/sodoffmmo.csproj.user src/sodoffmmo.csproj.user
/src/discord_bot_token /src/discord_bot_token
/muted_banned_users.json

37
src/Core/Client.cs
View File

@ -3,6 +3,7 @@ using sodoffmmo.Management;
using System; using System;
using System.Net.Sockets; using System.Net.Sockets;
using System.Runtime.CompilerServices; using System.Runtime.CompilerServices;
using System.Text.Json;
namespace sodoffmmo.Core; namespace sodoffmmo.Core;
public class Client { public class Client {
@ -10,8 +11,26 @@ public class Client {
static object lck = new(); static object lck = new();
// VikingId, Reason (nullable) // VikingId, Reason (nullable)
public static readonly Dictionary<int, string?> MutedList = new(); public static readonly Dictionary<int, string?> MutedList;
public static readonly Dictionary<int, string?> BannedList = new(); public static readonly Dictionary<int, string?> BannedList;
static Client() {
// Will get from run directory. This shouldn't really be a problem.
if (File.Exists("muted_banned_users.json")) {
try {
MutedBannedData? data = JsonSerializer.Deserialize<MutedBannedData>(File.ReadAllText("muted_banned_users.json"));
if (data != null) {
MutedList = data.MutedList ?? new();
BannedList = data.BannedList ?? new();
return;
}
} catch {
Console.WriteLine("Data for Muted/Banned users wasn't read. Is it corrupted?");
}
}
MutedList = new();
BannedList = new();
}
public int ClientID { get; private set; } public int ClientID { get; private set; }
public PlayerData PlayerData { get; set; } = new(); public PlayerData PlayerData { get; set; } = new();
@ -149,4 +168,18 @@ public class Client {
return socket.Connected && !scheduledDisconnect; return socket.Connected && !scheduledDisconnect;
} }
} }
public static void SaveMutedBanned() {
File.WriteAllText("muted_banned_users.json", JsonSerializer.Serialize(new MutedBannedData {
MutedList = MutedList,
BannedList = BannedList
}, new JsonSerializerOptions {
WriteIndented = true
}));
}
}
internal sealed class MutedBannedData {
public Dictionary<int, string?>? MutedList { get; set; }
public Dictionary<int, string?>? BannedList { get; set; }
} }

132
src/Management/DiscordManager.cs
View File

@ -94,7 +94,21 @@ class DiscordManager {
socketMessage.Author.IsBot socketMessage.Author.IsBot
) return; ) return;
// Get the room if it exists. // Get the room if it exists.
Room? room = (roomChannel && Room.Exists(arg.Channel.Name)) ? Room.Get(arg.Channel.Name) : null; Room[]? room = null;
string? roomName = null;
if (roomChannel) {
roomName = arg.Channel.Name;
if (Room.Exists(arg.Channel.Name)) {
room = new Room[1]{Room.Get(arg.Channel.Name)};
} else if (Configuration.DiscordBotConfig!.Merges.TryGetValue(arg.Channel.Name, out string[]? zones) && zones?.Length > 0) {
room = new Room[zones.Length];
for (int i=0;i<zones.Length;i++) {
if (Room.Exists(zones[i])) {
room[i] = Room.Get(zones[i]);
}
}
}
}
// Perms // Perms
Role role = Role.User; Role role = Role.User;
@ -112,11 +126,11 @@ class DiscordManager {
// Denotes commands that work the same or similarly // Denotes commands that work the same or similarly
// regardless of whether you're in a room thread. // regardless of whether you're in a room thread.
"!freechat <bool: enabled> - Enable/Disable free chat in all rooms.", "!freechat <bool: enabled> - Enable/Disable free chat in all rooms.",
"!tempmute <int: vikingid> [string... reason] - Mute someone (until they reconnect or go elsewhere).", "!tempmute <int: vikingid> [string... reason] - Mute someone (until they reconnect).",
"!untempmute <int: vikingid> - Revoke a tempmute.", "!untempmute <int: vikingid> - Revoke a tempmute.",
"!mute <int: vikingid> [string... reason] - Mute a vikingid (currently forgotten after server restart due to technical restrictions, but this will probably be fixed in the future).", "!mute <int: vikingid> [string... reason] - Mute a vikingid.",
"!unmute <int: vikingid> - Revoke a mute.", "!unmute <int: vikingid> - Revoke a mute.",
"!ban <int: vikingid> [string... reason] - Ban a vikingid from MMO (currently forgotten after server restart due to technical restrictions, but this will probably be fixed in the future).", "!ban <int: vikingid> [string... reason] - Ban a vikingid from MMO.",
"!unban <int: vikingid> - Revoke a ban.", "!unban <int: vikingid> - Revoke a ban.",
"!pardon <int: vikingid> - Alias for !unban", "!pardon <int: vikingid> - Alias for !unban",
"!mutelist - Get a list of muted users.", "!mutelist - Get a list of muted users.",
@ -130,15 +144,14 @@ class DiscordManager {
// freechat command // freechat command
if (message.Length > 1) { if (message.Length > 1) {
bool enable; bool enable;
if (!bool.TryParse(message[1], out enable)) { int val = message[1][0] & 0b11011111;
if ((message[1][0] & 0b11011111) == 'Y') { if (val == 'Y' || val == 'T') {
enable = true; enable = true;
} else if ((message[1][0] & 0b11011111) == (int)'N') { } else if (val == 'N' || val == 'F') {
enable = false; enable = false;
} else { } else {
await arg.Channel.SendMessageAsync("Input a boolean or yes/no value!", messageReference: arg.Reference); await arg.Channel.SendMessageAsync("Input a boolean or yes/no value!", messageReference: arg.Reference);
return; return;
}
} }
Configuration.ServerConfiguration.EnableChat = enable; Configuration.ServerConfiguration.EnableChat = enable;
await arg.Channel.SendMessageAsync($"Chat {(enable?"en":"dis")}abled!", messageReference: arg.Reference); await arg.Channel.SendMessageAsync($"Chat {(enable?"en":"dis")}abled!", messageReference: arg.Reference);
@ -152,8 +165,7 @@ class DiscordManager {
} }
// tempmute command // tempmute command
if (message.Length > 1 && int.TryParse(message[1], out int id)) { if (message.Length > 1 && int.TryParse(message[1], out int id)) {
IEnumerable<Client> vikings = FindViking(id, room); IEnumerable<Client> vikings = FindViking(id);
if (room != null && !vikings.Any()) vikings = FindViking(id); // Plan B
if (vikings.Any()) { if (vikings.Any()) {
bool sent = false; bool sent = false;
string? reason = null; string? reason = null;
@ -171,11 +183,11 @@ class DiscordManager {
} }
} else { } else {
player.Muted = true; player.Muted = true;
string msg = $"Tempmuted {player.PlayerData.DiplayName}"; string msg = $"Tempmuted {SanitizeString(player.PlayerData.DiplayName)}";
if (reason != null) { if (reason != null) {
msg += ". Reason: "+reason; msg += ". Reason: "+reason;
} }
if (!sent) await arg.Channel.SendMessageAsync(msg, messageReference: arg.Reference); if (!sent) SendMessage(msg, roomName: roomName);
} }
sent = true; sent = true;
} }
@ -192,8 +204,7 @@ class DiscordManager {
} }
// un-tempmute command // un-tempmute command
if (message.Length > 1 && int.TryParse(message[1], out int id)) { if (message.Length > 1 && int.TryParse(message[1], out int id)) {
IEnumerable<Client> vikings = FindViking(id, room); IEnumerable<Client> vikings = FindViking(id);
if (room != null && !vikings.Any()) vikings = FindViking(id); // Plan B
if (vikings.Any()) { if (vikings.Any()) {
bool sent = false; bool sent = false;
foreach (Client player in vikings) { foreach (Client player in vikings) {
@ -202,7 +213,7 @@ class DiscordManager {
if (!sent) await arg.Channel.SendMessageAsync("This user is true muted. To unmute them, use !unmute", messageReference: arg.Reference); if (!sent) await arg.Channel.SendMessageAsync("This user is true muted. To unmute them, use !unmute", messageReference: arg.Reference);
} else { } else {
player.Muted = false; player.Muted = false;
if (!sent) await arg.Channel.SendMessageAsync($"Un-tempmuted {player.PlayerData.DiplayName}.", messageReference: arg.Reference); if (!sent) SendMessage($"Un-tempmuted {SanitizeString(player.PlayerData.DiplayName)}.", roomName: roomName);
} }
} else { } else {
if (!sent) await arg.Channel.SendMessageAsync("This user is not muted.", messageReference: arg.Reference); if (!sent) await arg.Channel.SendMessageAsync("This user is not muted.", messageReference: arg.Reference);
@ -223,10 +234,9 @@ class DiscordManager {
// true mute command // true mute command
if (message.Length > 1 && int.TryParse(message[1], out int id)) { if (message.Length > 1 && int.TryParse(message[1], out int id)) {
string? name = null; string? name = null;
IEnumerable<Client> vikings = FindViking(id, room); IEnumerable<Client> vikings = FindViking(id);
if (room != null && !vikings.Any()) vikings = FindViking(id); // Plan B
foreach (Client player in vikings) { foreach (Client player in vikings) {
name = player.PlayerData.DiplayName; name = SanitizeString(player.PlayerData.DiplayName);
player.Muted = true; player.Muted = true;
} }
if (Client.MutedList.TryGetValue(id, out string? rreason)) { if (Client.MutedList.TryGetValue(id, out string? rreason)) {
@ -239,12 +249,13 @@ class DiscordManager {
reason = string.Join(' ', message, 2, message.Length - 2); reason = string.Join(' ', message, 2, message.Length - 2);
} }
Client.MutedList.Add(id, reason); Client.MutedList.Add(id, reason);
Client.SaveMutedBanned();
string msg = $"Muted *VikingID {id}*"; string msg = $"Muted *VikingID {id}*";
if (name != null) msg = $"Muted {name}"; if (name != null) msg = $"Muted {name}";
if (reason != null) { if (reason != null) {
msg += ". Reason: " + reason; msg += ". Reason: " + reason;
} }
await arg.Channel.SendMessageAsync(msg, messageReference: arg.Reference); SendMessage(msg, roomName: roomName);
} }
} else { } else {
await arg.Channel.SendMessageAsync("Input a valid vikingid!", messageReference: arg.Reference); await arg.Channel.SendMessageAsync("Input a valid vikingid!", messageReference: arg.Reference);
@ -257,19 +268,20 @@ class DiscordManager {
// unmute command // unmute command
if (message.Length > 1 && int.TryParse(message[1], out int id)) { if (message.Length > 1 && int.TryParse(message[1], out int id)) {
string? name = null; string? name = null;
IEnumerable<Client> vikings = FindViking(id, room); IEnumerable<Client> vikings = FindViking(id);
if (room != null && !vikings.Any()) vikings = FindViking(id); // Plan B
if (vikings.Any()) { if (vikings.Any()) {
foreach (Client player in vikings) { foreach (Client player in vikings) {
if (player.Muted) { if (player.Muted) {
name = player.PlayerData.DiplayName; name = SanitizeString(player.PlayerData.DiplayName);
player.Muted = false; player.Muted = false;
} }
} }
} }
if (Client.MutedList.Remove(id) || name != null) { // name is only set if there is an unmute bool listRemoved = Client.MutedList.Remove(id);
if (listRemoved || name != null) { // name is only set if there is an unmute
if (listRemoved) Client.SaveMutedBanned();
if (name != null) { if (name != null) {
await arg.Channel.SendMessageAsync($"Unmuted {name}.", messageReference: arg.Reference); SendMessage($"Unmuted {name}.", roomName: roomName);
} else { } else {
await arg.Channel.SendMessageAsync($"Unmuted *VikingID {id}*.", messageReference: arg.Reference); await arg.Channel.SendMessageAsync($"Unmuted *VikingID {id}*.", messageReference: arg.Reference);
} }
@ -288,7 +300,7 @@ class DiscordManager {
if (message.Length > 1 && int.TryParse(message[1], out int id)) { if (message.Length > 1 && int.TryParse(message[1], out int id)) {
string? name = null; string? name = null;
foreach (Client player in FindViking(id)) { foreach (Client player in FindViking(id)) {
name = player.PlayerData.DiplayName; name = SanitizeString(player.PlayerData.DiplayName);
player.Banned = true; player.Banned = true;
player.SetRoom(player.Room); // This will run the client through the 'if Banned' conditions. player.SetRoom(player.Room); // This will run the client through the 'if Banned' conditions.
} }
@ -302,12 +314,13 @@ class DiscordManager {
reason = string.Join(' ', message, 2, message.Length - 2); reason = string.Join(' ', message, 2, message.Length - 2);
} }
Client.BannedList.Add(id, reason); Client.BannedList.Add(id, reason);
Client.SaveMutedBanned();
string msg = $"Banned *VikingID {id}*"; string msg = $"Banned *VikingID {id}*";
if (name != null) msg = $"Banned {name}"; if (name != null) msg = $"Banned {name}";
if (reason != null) { if (reason != null) {
msg += ". Reason: " + reason; msg += ". Reason: " + reason;
} }
await arg.Channel.SendMessageAsync(msg, messageReference: arg.Reference); SendMessage(msg, roomName: roomName);
} }
} else { } else {
await arg.Channel.SendMessageAsync("Input a valid vikingid!", messageReference: arg.Reference); await arg.Channel.SendMessageAsync("Input a valid vikingid!", messageReference: arg.Reference);
@ -320,18 +333,19 @@ class DiscordManager {
// unban command // unban command
if (message.Length > 1 && int.TryParse(message[1], out int id)) { if (message.Length > 1 && int.TryParse(message[1], out int id)) {
if (Client.BannedList.Remove(id)) { if (Client.BannedList.Remove(id)) {
Client.SaveMutedBanned();
string? playername = null; string? playername = null;
foreach (Room rooom in Room.AllRooms()) { foreach (Room rooom in Room.AllRooms()) {
foreach (Client player in rooom.Clients) { foreach (Client player in rooom.Clients) {
if (player.PlayerData.VikingId == id) { if (player.PlayerData.VikingId == id) {
playername = player.PlayerData.DiplayName; playername = SanitizeString(player.PlayerData.DiplayName);
player.Banned = false; player.Banned = false;
player.SetRoom(player.ReturnRoomOnPardon); // Put the player back. player.SetRoom(player.ReturnRoomOnPardon); // Put the player back.
} }
} }
} }
if (playername != null) { if (playername != null) {
await arg.Channel.SendMessageAsync($"Unbanned {playername}.", messageReference: arg.Reference); SendMessage($"Unbanned {playername}.", roomName: roomName);
} else { } else {
await arg.Channel.SendMessageAsync($"Unbanned *VikingID {id}*.", messageReference: arg.Reference); await arg.Channel.SendMessageAsync($"Unbanned *VikingID {id}*.", messageReference: arg.Reference);
} }
@ -364,7 +378,7 @@ class DiscordManager {
msg += $"; Reason: {play.Value}"; msg += $"; Reason: {play.Value}";
} }
} }
await arg.Channel.SendMessageAsync(msg, messageReference: arg.Reference); SendMessage(msg, roomName: roomName);
} else { } else {
await arg.Channel.SendMessageAsync("No-one is muted.", messageReference: arg.Reference); await arg.Channel.SendMessageAsync("No-one is muted.", messageReference: arg.Reference);
} }
@ -391,7 +405,7 @@ class DiscordManager {
msg += $"; Reason: {play.Value}"; msg += $"; Reason: {play.Value}";
} }
} }
await arg.Channel.SendMessageAsync(msg, messageReference: arg.Reference); SendMessage(msg, roomName: roomName);
} else { } else {
await arg.Channel.SendMessageAsync("No-one is banned.", messageReference: arg.Reference); await arg.Channel.SendMessageAsync("No-one is banned.", messageReference: arg.Reference);
} }
@ -408,21 +422,23 @@ class DiscordManager {
)); ));
} else if (message[0] == "!list") { } else if (message[0] == "!list") {
// list command (room ver.) // list command (room ver.)
if (room.ClientsCount > 0) { if (room.Sum(r => r.ClientsCount) > 0) {
string msg = "Players in Room:"; string msg = "Players in Room:";
foreach (Client player in room.Clients) { foreach (Room ro in room) {
string vikingid; foreach (Client player in ro.Clients) {
if (player.PlayerData.VikingId != 0) { string vikingid;
vikingid = "||VikingId: "+player.PlayerData.VikingId+"||"; if (player.PlayerData.VikingId != 0) {
} else { vikingid = "||VikingId: "+player.PlayerData.VikingId+"||";
vikingid = "||(Not Authenticated!)||"; } else {
} vikingid = "||(Not Authenticated!)||";
msg += $"\n* {SanitizeString(player.PlayerData.DiplayName)} {vikingid}"; }
if (player.Muted) { msg += $"\n* {SanitizeString(player.PlayerData.DiplayName)} {vikingid}";
msg += " (:mute: Muted)"; if (player.Muted) {
msg += " (:mute: Muted)";
}
} }
} }
SendMessage(msg, room); // Sent like this in case it's longer than 2000 characters (handled by this method). SendMessage(msg, roomName: roomName); // Sent like this in case it's longer than 2000 characters (handled by this method).
} else { } else {
await arg.Channel.SendMessageAsync("This room is empty.", messageReference: arg.Reference); await arg.Channel.SendMessageAsync("This room is empty.", messageReference: arg.Reference);
} }
@ -432,8 +448,14 @@ class DiscordManager {
// Due to client-based restrictions, this probably only works in SoD and maybe MaM. // Due to client-based restrictions, this probably only works in SoD and maybe MaM.
// Unless we want to create an MMOAvatar instance for the server "user". // Unless we want to create an MMOAvatar instance for the server "user".
// This is because the code for chatlogging is tied to ChatBubble and only ChatBubble. // This is because the code for chatlogging is tied to ChatBubble and only ChatBubble.
if (room.ClientsCount > 0) { bool sent = false;
room.Send(Utils.BuildChatMessage(Guid.Empty.ToString(), string.Join(' ', message, 1, message.Length-1), "Server")); foreach (Room ro in room) {
if (ro.ClientsCount > 0) {
ro.Send(Utils.BuildServerSideMessage(string.Join(' ', message, 1, message.Length-1), "Server"));
sent = true;
}
}
if (sent) {
await arg.AddReactionAsync(Emote.Parse(":white_check_mark:")); await arg.AddReactionAsync(Emote.Parse(":white_check_mark:"));
} else { } else {
await arg.Channel.SendMessageAsync("There is no-one in this room to see your message.", messageReference: arg.Reference); await arg.Channel.SendMessageAsync("There is no-one in this room to see your message.", messageReference: arg.Reference);
@ -611,22 +633,14 @@ class DiscordManager {
/// </summary> /// </summary>
/// <param name="id">Viking ID</param> /// <param name="id">Viking ID</param>
/// <returns>Clients for ID. If there are none then return an empty list.</returns> /// <returns>Clients for ID. If there are none then return an empty list.</returns>
private static IEnumerable<Client> FindViking(int id, Room? room=null) { private static IEnumerable<Client> FindViking(int id) {
List<Client> clients = new(); List<Client> clients = new();
if (room != null) { foreach (Room room in Room.AllRooms()) {
foreach (Client player in room.Clients) { foreach (Client player in room.Clients) {
if (player.PlayerData.VikingId == id) { if (player.PlayerData.VikingId == id) {
clients.Add(player); clients.Add(player);
} }
} }
return clients;
}
foreach (Room rooom in Room.AllRooms()) {
foreach (Client player in rooom.Clients) {
if (player.PlayerData.VikingId == id) {
clients.Add(player);
}
}
} }
return clients; return clients;
} }