diff options
| author | Austin Hellyer <[email protected]> | 2016-11-28 19:27:26 -0800 |
|---|---|---|
| committer | Austin Hellyer <[email protected]> | 2016-11-28 19:27:26 -0800 |
| commit | c64c499f45f006ad6181d06fc92cac2062576cea (patch) | |
| tree | 57607f7a7894753c0963b038ea049910c728e96b /src/utils | |
| parent | Optimize for cached, non-method compiles (diff) | |
| download | serenity-c64c499f45f006ad6181d06fc92cac2062576cea.tar.xz serenity-c64c499f45f006ad6181d06fc92cac2062576cea.zip | |
Re-order message builder file
Diffstat (limited to 'src/utils')
| -rw-r--r-- | src/utils/message_builder.rs | 43 |
1 files changed, 21 insertions, 22 deletions
diff --git a/src/utils/message_builder.rs b/src/utils/message_builder.rs index e12debc..5eadd19 100644 --- a/src/utils/message_builder.rs +++ b/src/utils/message_builder.rs @@ -28,28 +28,6 @@ use ::model::{ChannelId, Emoji, Mentionable, RoleId, UserId}; /// [`build`]: #method.build /// [`emoji`]: #method.emoji /// [`user`]: #method.user - -fn normalize(text: &str) -> String { - // Remove everyone and here mentions - // This changes 'at' symbol to a full-width variation - text.replace("@everyone", "@everyone") - .replace("@here", "@here") - // Remove invite links and popular scam websites, mostly to prevent the - // current user from triggering various ad detectors - .replace("discord.gg", "discord․gg") - .replace("discord.me", "discord․me") - .replace("discordlist.net", "discordlist․net") - .replace("discordservers.com", "discordservers․com") - .replace("discordapp.com/invite", "discordapp․com/invite") - // Remove right-to-left and other similar overrides - .replace('\u{202E}', " ") // RTL - .replace('\u{200F}', " ") // RTL Mark - .replace('\u{202B}', " ") // RTL Embedding - .replace('\u{200B}', " ") // Zero-width space - .replace('\u{200D}', " ") // Zero-width joiner - .replace('\u{200C}', " ") // Zero-width non-joiner -} - pub struct MessageBuilder(pub String); impl MessageBuilder { @@ -317,3 +295,24 @@ impl Default for MessageBuilder { MessageBuilder(String::default()) } } + +fn normalize(text: &str) -> String { + // Remove everyone and here mentions + // This changes 'at' symbol to a full-width variation + text.replace("@everyone", "@everyone") + .replace("@here", "@here") + // Remove invite links and popular scam websites, mostly to prevent the + // current user from triggering various ad detectors + .replace("discord.gg", "discord․gg") + .replace("discord.me", "discord․me") + .replace("discordlist.net", "discordlist․net") + .replace("discordservers.com", "discordservers․com") + .replace("discordapp.com/invite", "discordapp․com/invite") + // Remove right-to-left and other similar overrides + .replace('\u{202E}', " ") // RTL + .replace('\u{200F}', " ") // RTL Mark + .replace('\u{202B}', " ") // RTL Embedding + .replace('\u{200B}', " ") // Zero-width space + .replace('\u{200D}', " ") // Zero-width joiner + .replace('\u{200C}', " ") // Zero-width non-joiner +} |