Skip to content

Remove Discriminators #179

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
iShauny merged 3 commits into from
Jul 15, 2025
Merged

Remove Discriminators #179

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
87cb80d
Remove discriminators
Jul 15, 2025
c67ef44
Update unban exception handler
Jul 15, 2025
8c281bc
Update message for clarity
Jul 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
73 changes: 39 additions & 34 deletions Floofbot/Modules/Administration.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ public async Task YeetUser(
{
UserID = Convert.ToUInt64(userID),
ModID = Context.Message.Author.Id,
ModUsername = $"{Context.Message.Author.Username}#{Context.Message.Author.Discriminator}",
ModUsername = $"{Context.Message.Author.Username}",
Reason = reason
});
_floofDB.SaveChanges();
Expand Down Expand Up @@ -98,7 +98,7 @@ public async Task YeetUser(
try
{
//bans the user
await Context.Guild.AddBanAsync(badUser.Id, 0, $"{Context.User.Username}#{Context.User.Discriminator} -> {reason}");
await Context.Guild.AddBanAsync(badUser.Id, 0, $"{Context.User.Username} -> {reason}");
}
catch (Exception ex)
{
Expand All @@ -109,9 +109,9 @@ public async Task YeetUser(
modEmbedBuilder = new EmbedBuilder();
modEmbedBuilder.Title = (":shield: User Banned");
modEmbedBuilder.Color = ADMIN_COLOR;
modEmbedBuilder.Description = $"{badUser.Username}#{badUser.Discriminator} has been banned from {Context.Guild.Name}";
modEmbedBuilder.Description = $"{badUser.Username} has been banned from {Context.Guild.Name}";
modEmbedBuilder.AddField("User ID", badUser.Id);
modEmbedBuilder.AddField("Moderator", $"{Context.User.Username}#{Context.User.Discriminator}");
modEmbedBuilder.AddField("Moderator", $"{Context.User.Username}");
await Context.Channel.SendMessageAsync("", false, modEmbedBuilder.Build());
}

Expand Down Expand Up @@ -155,9 +155,14 @@ public async Task UnYeetUser([Summary("user")] string user)
{
await Context.Guild.RemoveBanAsync(userId); // unban user
}
catch (HttpException)
{
await Context.Channel.SendMessageAsync("⚠️ Command unable to be performed - ban entry not be found!");
return;
}
catch (Exception ex)
{
await Context.Channel.SendMessageAsync("Command unable to be performed sucessfully: " + ex.ToString());
await Context.Channel.SendMessageAsync("⚠️ Command unable to be performed sucessfully. User may not be found?" + ex.ToString());
return;
}
EmbedBuilder modEmbedBuilder = new EmbedBuilder();
Expand All @@ -166,7 +171,7 @@ public async Task UnYeetUser([Summary("user")] string user)
modEmbedBuilder.Color = ADMIN_COLOR;
modEmbedBuilder.Description = $"{userId} has been unbanned from {Context.Guild.Name}";
modEmbedBuilder.AddField("User ID", userId);
modEmbedBuilder.AddField("Moderator", $"{Context.User.Username}#{Context.User.Discriminator}");
modEmbedBuilder.AddField("Moderator", $"{Context.User.Username}");
await Context.Channel.SendMessageAsync("", false, modEmbedBuilder.Build());
}

Expand Down Expand Up @@ -196,7 +201,7 @@ public async Task pruneBanUser(
{
UserID = Convert.ToUInt64(userID),
ModID = Context.Message.Author.Id,
ModUsername = $"{Context.Message.Author.Username}#{Context.Message.Author.Discriminator}",
ModUsername = $"{Context.Message.Author.Username}",
Reason = reason
});
_floofDB.SaveChanges();
Expand Down Expand Up @@ -239,7 +244,7 @@ public async Task pruneBanUser(
try
{
//bans the user
await Context.Guild.AddBanAsync(badUser.Id, 7, $"{Context.User.Username}#{Context.User.Discriminator} -> {reason}"); // default 7 days prune
await Context.Guild.AddBanAsync(badUser.Id, 7, $"{Context.User.Username} -> {reason}"); // default 7 days prune
}
catch (Exception ex)
{
Expand All @@ -250,9 +255,9 @@ public async Task pruneBanUser(
modEmbedBuilder = new EmbedBuilder();
modEmbedBuilder.Title = (":shield: User Banned");
modEmbedBuilder.Color = ADMIN_COLOR;
modEmbedBuilder.Description = $"{badUser.Username}#{badUser.Discriminator} has been banned from {Context.Guild.Name}";
modEmbedBuilder.Description = $"{badUser.Username} has been banned from {Context.Guild.Name}";
modEmbedBuilder.AddField("User ID", badUser.Id);
modEmbedBuilder.AddField("Moderator", $"{Context.User.Username}#{Context.User.Discriminator}");
modEmbedBuilder.AddField("Moderator", $"{Context.User.Username}");
await Context.Channel.SendMessageAsync("", false, modEmbedBuilder.Build());
}

Expand Down Expand Up @@ -281,7 +286,7 @@ public async Task ViewAutoBans()
if (index < autoBans.Count)
{
var modUser = resolveUser(autoBans[index].ModID.ToString()); // try to resolve the mod who added it
var modUsername = ((modUser != null) ? $"{modUser.Username}#{modUser.Discriminator}" : $"{autoBans[index].ModUsername}"); // try to get mod's new username, otherwise, use database stored name
var modUsername = ((modUser != null) ? $"{modUser.Username}" : $"{autoBans[index].ModUsername}"); // try to get mod's new username, otherwise, use database stored name
text += $"{index + 1}. {autoBans[index].UserID} - added by {modUsername}\n";
}
}
Expand Down Expand Up @@ -389,9 +394,9 @@ public async Task kickUser(
EmbedBuilder kickBuilder = new EmbedBuilder();
kickBuilder.Title = ("🥾 User Kicked");
kickBuilder.Color = ADMIN_COLOR;
kickBuilder.Description = $"{badUser.Username}#{badUser.Discriminator} has been kicked from {Context.Guild.Name}";
kickBuilder.Description = $"{badUser.Username} has been kicked from {Context.Guild.Name}";
kickBuilder.AddField("User ID", badUser.Id);
kickBuilder.AddField("Moderator", $"{Context.User.Username}#{Context.User.Discriminator}");
kickBuilder.AddField("Moderator", $"{Context.User.Username}");
await Context.Channel.SendMessageAsync("", false, kickBuilder.Build());
}
catch
Expand Down Expand Up @@ -440,9 +445,9 @@ public async Task silentKickUser(
EmbedBuilder kickBuilder = new EmbedBuilder();
kickBuilder.Title = ("🥾 User Silently Kicked");
kickBuilder.Color = ADMIN_COLOR;
kickBuilder.Description = $"{badUser.Username}#{badUser.Discriminator} has been silently kicked from {Context.Guild.Name}";
kickBuilder.Description = $"{badUser.Username} has been silently kicked from {Context.Guild.Name}";
kickBuilder.AddField("User ID", badUser.Id);
kickBuilder.AddField("Moderator", $"{Context.User.Username}#{Context.User.Discriminator}");
kickBuilder.AddField("Moderator", $"{Context.User.Username}");
await Context.Channel.SendMessageAsync("", false, kickBuilder.Build());
}

Expand Down Expand Up @@ -504,7 +509,7 @@ public async Task warnUser(
DateAdded = DateTime.Now,
Forgiven = false,
GuildId = Context.Guild.Id,
Moderator = $"{Context.User.Username}#{Context.User.Discriminator}",
Moderator = $"{Context.User.Username}",
ModeratorId = Context.User.Id,
Reason = reason,
UserId = uid,
Expand Down Expand Up @@ -533,10 +538,10 @@ public async Task warnUser(
builder = new EmbedBuilder();
builder.Title = (":shield: User Warned");
builder.Color = ADMIN_COLOR;
string badUserIdentifier = (badUser != null) ? $"{badUser.Username}#{badUser.Discriminator}" : $"{uid}";
string badUserIdentifier = (badUser != null) ? $"{badUser.Username}" : $"{uid}";
builder.Description = $"Warning added for {badUserIdentifier} with reason {reason}";
builder.AddField("User ID", uid);
builder.AddField("Moderator", $"{Context.User.Username}#{Context.User.Discriminator}");
builder.AddField("Moderator", $"{Context.User.Username}");

await Context.Channel.SendMessageAsync("", false, builder.Build());
}
Expand Down Expand Up @@ -598,7 +603,7 @@ public async Task userNote(
DateAdded = DateTime.Now,
Forgiven = false,
GuildId = Context.Guild.Id,
Moderator = $"{Context.User.Username}#{Context.User.Discriminator}",
Moderator = $"{Context.User.Username}",
ModeratorId = Context.User.Id,
Reason = reason,
UserId = uid
Expand All @@ -608,10 +613,10 @@ public async Task userNote(
builder = new EmbedBuilder();
builder.Title = (":pencil: User Note Added");
builder.Color = ADMIN_COLOR;
string badUserIdentifier = (badUser != null) ? $"{badUser.Username}#{badUser.Discriminator}" : $"{uid}";
string badUserIdentifier = (badUser != null) ? $"{badUser.Username}" : $"{uid}";
builder.Description = $"Usernote added for {badUserIdentifier} with reason {reason}";
builder.AddField("User ID", uid);
builder.AddField("Moderator", $"{Context.User.Username}#{Context.User.Discriminator}");
builder.AddField("Moderator", $"{Context.User.Username}");

await Context.Channel.SendMessageAsync("", false, builder.Build());
}
Expand Down Expand Up @@ -675,10 +680,10 @@ public async Task PurgeUserMessages(
EmbedBuilder builder = new EmbedBuilder();
builder.Title = (":shield: Messages Purged");
builder.Color = ADMIN_COLOR;
string badUserIdentifier = (badUser != null) ? $"{badUser.Username}#{badUser.Discriminator}" : $"{userId}";
builder.Description = $"{badUser.Username}#{badUser.Discriminator}'s messages were purged";
string badUserIdentifier = (badUser != null) ? $"{badUser.Username}" : $"{userId}";
builder.Description = $"{badUser.Username}'s messages were purged";
builder.AddField("User ID", badUser.Id);
builder.AddField("Moderator", $"{Context.User.Username}#{Context.User.Discriminator}");
builder.AddField("Moderator", $"{Context.User.Username}");

await Context.Channel.SendMessageAsync("", false, builder.Build());
}
Expand Down Expand Up @@ -827,15 +832,15 @@ public async Task MuteUser([Summary("user")]string user, [Summary("Time")]string
}

if (Context.Guild.GetUser(badUser.Id).Roles.Contains(muteRole)) {
await Context.Channel.SendMessageAsync($"{badUser.Username}#{badUser.Discriminator} is already muted!");
await Context.Channel.SendMessageAsync($"{badUser.Username} is already muted!");
return;
}

await Context.Guild.GetUser(badUser.Id).AddRoleAsync(muteRole);

EmbedBuilder builder = new EmbedBuilder() {
Title = "🔇 User Muted",
Description = $"{badUser.Username}#{badUser.Discriminator} Muted!",
Description = $"{badUser.Username} Muted!",
Color = ADMIN_COLOR
};

Expand Down Expand Up @@ -972,13 +977,13 @@ public async Task UnmuteUser([Summary("user")]string user)
await Context.Guild.GetUser(badUser.Id).RemoveRoleAsync(muteRole);
}
else {
await Context.Channel.SendMessageAsync($"{badUser.Username}#{badUser.Discriminator} is not muted");
await Context.Channel.SendMessageAsync($"{badUser.Username} is not muted");
return;
}

EmbedBuilder builder = new EmbedBuilder() {
Title = "🔊 User Unmuted",
Description = $"{badUser.Username}#{badUser.Discriminator} was unmuted!",
Description = $"{badUser.Username} was unmuted!",
Color = ADMIN_COLOR
};

Expand Down Expand Up @@ -1131,7 +1136,7 @@ private async Task UpdateForgivenStatus(string function, string type, string bad
if (user == null) // no user, just id in database
builder.WithTitle($"{((type == "warnings") ? "Warnings" : "User Notes")} for {badUser}");
else
builder.WithTitle($"{((type == "warnings") ? "Warnings" : "User Notes")} for {user.Username}#{user.Discriminator}");
builder.WithTitle($"{((type == "warnings") ? "Warnings" : "User Notes")} for {user.Username}");
if (warnings == null) // for some reason didnt recieve data from database
{
Log.Error("Fatal error when trying to access warnings for the forgive user command!");
Expand Down Expand Up @@ -1174,7 +1179,7 @@ private async Task UpdateForgivenStatus(string function, string type, string bad
if (w.Id == warningId)
{
var modId = Context.Message.Author.Id;
var modUsername = $"{Context.Message.Author.Username}#{Context.Message.Author.Discriminator}";
var modUsername = $"{Context.Message.Author.Username}";
await SetWarningForgivenStatus(w, !oldStatus, modId);
await Context.Channel.SendMessageAsync($"Got it! {modUsername} has {function} the warning with the ID {w.Id} and the reason: {w.Reason}.");
return;
Expand All @@ -1188,7 +1193,7 @@ private async Task UpdateForgivenStatus(string function, string type, string bad
if (un.Id == warningId)
{
var modId = Context.Message.Author.Id;
var modUsername = $"{Context.Message.Author.Username}#{Context.Message.Author.Discriminator}";
var modUsername = $"{Context.Message.Author.Username}";
await SetUserNoteForgivenStatus(un, !oldStatus, modId);
await Context.Channel.SendMessageAsync($"Got it! {modUsername} has {function} the user note with the ID {un.Id} and the reason: {un.Reason}.");
return;
Expand Down Expand Up @@ -1244,7 +1249,7 @@ private Embed GetWarnings(ulong uid, bool isOwnLog)
.Where(u => u.UserId == uid && u.GuildId == Context.Guild.Id)
.OrderByDescending(x => x.DateAdded).Take(10);
}
string badUserIdentifier = (badUser != null) ? $"{badUser.Username}#{badUser.Discriminator}" : $"{uid}";
string badUserIdentifier = (badUser != null) ? $"{badUser.Username}" : $"{uid}";
if (!isOwnLog) // mod viewing someones history
{
if (formalWarnings.Count() == 0 && userNotes.Count() == 0)
Expand Down Expand Up @@ -1288,7 +1293,7 @@ private Embed GetWarnings(ulong uid, bool isOwnLog)
if (warning.Forgiven)
{
IUser forgivenBy = resolveUser(warning.ForgivenBy.ToString());
var forgivenByText = (forgivenBy == null) ? "" : $"(forgiven by {forgivenBy.Username}#{forgivenBy.Discriminator})";
var forgivenByText = (forgivenBy == null) ? "" : $"(forgiven by {forgivenBy.Username})";
builder.AddField($"~~**{warningCount + 1}**. {warning.DateAdded.ToString("yyyy MMMM dd")} - {warning.Moderator}~~ {forgivenByText}", $"{hyperLink}```{warning.Reason}```");
}
else
Expand Down Expand Up @@ -1326,7 +1331,7 @@ private Embed GetWarnings(ulong uid, bool isOwnLog)
if (usernote.Forgiven)
{
IUser forgivenBy = resolveUser(usernote.ForgivenBy.ToString());
var forgivenByText = (forgivenBy == null) ? "" : $"(forgiven by {forgivenBy.Username}#{forgivenBy.Discriminator})";
var forgivenByText = (forgivenBy == null) ? "" : $"(forgiven by {forgivenBy.Username})";
builder.AddField($"~~**{userNoteCount + 1}**. {usernote.DateAdded.ToString("yyyy MMMM dd")} - {usernote.Moderator}~~ {forgivenByText}", $"```{usernote.Reason}```");

}
Expand Down
Loading
Loading