Skip to content

Commit

Permalink
discord relay uses nicknames over usernames, allow zkls users to ment…
Browse files Browse the repository at this point in the history
…ion discord users by nick, disallow mentioning roles like @everyone
  • Loading branch information
DeinFreund committed Oct 17, 2018
1 parent b50fb0e commit 1a5edf0
Showing 1 changed file with 16 additions and 4 deletions.
20 changes: 16 additions & 4 deletions ZkLobbyServer/DiscordRelaySource.cs
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,11 @@ private static string GetName(IUser user)
return user.Username + "#" + user.Discriminator;
}

private static string ReplaceMention(string message, MatchEvaluator replace)
{
return Regex.Replace(message, "<@!{0,1}([0-9]+)>", replace);
}

public DiscordRelaySource(DiscordSocketClient client, ulong serverID, SaySource source)
{
discord = client;
Expand Down Expand Up @@ -50,13 +55,20 @@ public void SetTopic(string channel, string topic)
}
}


public void SendMessage(ChatRelayMessage m)
{
try
{
if (m.Source != source)
{
//Translate mentions of nicknames to discord mentions
var userIdsByNickname = discord.GetGuild(serverID).Users.ToDictionary(x => x.Nickname, x => x.Id);
userIdsByNickname.ForEach((pair) => m.Message = m.Message.Replace(pair.Key, string.Format("<@{0}>", pair.Value)));

//Block any mentions of an entire role
var roleIds = discord.GetGuild(serverID).Roles.Select(x => x.Id.ToString()).ToList();
m.Message = ReplaceMention(m.Message, match => roleIds.Contains(match.Groups[1].Value) ? "" : match.Groups[1].Value);

if (m.User != GlobalConst.NightwatchName) GetChannel(m.Channel)?.SendMessageAsync($"<{m.User}> {m.Message}");
// don't relay extra "nightwatch" if it is self relay
else GetChannel(m.Channel)?.SendMessageAsync(m.Message);
Expand All @@ -81,18 +93,18 @@ public void SendPm(string user, string message)
}


private static string TranslateMentions(SocketMessage msg)
private string TranslateMentions(SocketMessage msg)
{
var text = msg.Content;
if (string.IsNullOrEmpty(text)) return string.Empty;

return Regex.Replace(text, "<@([0-9]+)>",
return ReplaceMention(text,
m =>
{
var mentionedId = m.Groups[1].Value;

var user = msg.MentionedUsers.FirstOrDefault(x => x.Id.ToString() == mentionedId);
if (user != null) return user.Username;
if (user != null) return discord.GetGuild(serverID).Users.FirstOrDefault(x => x.Id == user.Id)?.Nickname ?? user.Username;

var channel = msg.MentionedChannels.FirstOrDefault(x => x.Id.ToString() == mentionedId);
if (channel != null) return channel.Name;
Expand Down

0 comments on commit 1a5edf0

Please sign in to comment.