diff --git a/Dockerfile b/Dockerfile index 5e9281b..55c7f28 100644 --- a/Dockerfile +++ b/Dockerfile @@ -52,6 +52,7 @@ ENV basic_Username='' \ discord_ServerID='' \ discord_ClientToken='' \ discord_AllowDiscordCommands='false' \ + discord_hideChatterName='false' \ events_Enabled='false' \ events_GroupMemberJoins='false' \ events_GroupMemberLeaves='false' \ diff --git a/SecondBotEvents/Config/DiscordConfig.cs b/SecondBotEvents/Config/DiscordConfig.cs index 857d44d..31efe0b 100644 --- a/SecondBotEvents/Config/DiscordConfig.cs +++ b/SecondBotEvents/Config/DiscordConfig.cs @@ -18,6 +18,7 @@ namespace SecondBotEvents.Config settings.Add("InteractionCommandName"); settings.Add("InteractionHttpTarget"); settings.Add("InteractionChannelNumber"); + settings.Add("hideChatterName"); settings.Add("HideStatusOutput"); } @@ -26,6 +27,11 @@ namespace SecondBotEvents.Config return ReadSettingAsBool("Enabled"); } + public bool GethideChatterName() + { + return ReadSettingAsBool("hideChatterName", false); + } + public ulong GetServerID() { return ReadSettingAsUlong("ServerID", 0); diff --git a/SecondBotEvents/Services/DiscordService.cs b/SecondBotEvents/Services/DiscordService.cs index 4bf3e56..76f10af 100644 --- a/SecondBotEvents/Services/DiscordService.cs +++ b/SecondBotEvents/Services/DiscordService.cs @@ -363,7 +363,14 @@ namespace SecondBotEvents.Services "discordapi", "GroupBan", null, args.ToArray(), 0, "none", false, 0, "", false), message); return; } - GetClient().Self.InstantMessageGroup(groupuuid, message.Author.Username + ": " + message.CleanContent); + if (myConfig.GethideChatterName() == false) + { + GetClient().Self.InstantMessageGroup(groupuuid, message.Author.Username + ": " + message.CleanContent); + } + else + { + GetClient().Self.InstantMessageGroup(groupuuid, message.CleanContent); + } _ = message.DeleteAsync(); } @@ -419,7 +426,7 @@ namespace SecondBotEvents.Services _ = TextChannel.DeleteAsync(); return; } - if(UUID.TryParse(bits[1], out UUID avataruuid) == false) + if (UUID.TryParse(bits[1], out UUID avataruuid) == false) { _ = TextChannel.DeleteAsync(); return; @@ -436,14 +443,21 @@ namespace SecondBotEvents.Services CleanChannel(TextChannel); return; } - else if(cleaned == "!offertp") + else if (cleaned == "!offertp") { _ = MarkMessage((IUserMessage)message, "✅"); GetClient().Self.SendTeleportLure(avataruuid); return; } - master.DataStoreService.GetAvatarName(avataruuid); // add avatar to lookup service just in case. - GetClient().Self.InstantMessage(avataruuid, message.Author.Username + ": " + message.CleanContent); + if (myConfig.GethideChatterName() == false) + { + master.DataStoreService.GetAvatarName(avataruuid); // add avatar to lookup service just in case. + GetClient().Self.InstantMessage(avataruuid, message.Author.Username + ": " + message.CleanContent); + } + else + { + GetClient().Self.InstantMessage(avataruuid, message.CleanContent); + } _ = MarkMessage((IUserMessage)message, "✅"); } @@ -1035,7 +1049,6 @@ namespace SecondBotEvents.Services { LoginEventsAttached = true; GetClient().Self.IM += BotImMessage; - GetClient().Network.SimConnected -= BotCurrentSim; GetClient().Self.ChatFromSimulator += LocalChat; GetClient().Groups.CurrentGroups += GroupCurrent; GetClient().Groups.RequestCurrentGroups();