Change "discordapp.com" to "discord.com" where appropriate

Tyrrrz · Jul 18, 2020 · 2fc0aa4 · 2fc0aa4
1 parent ba66b52
commit 2fc0aa4
Show file tree

Hide file tree

Showing 20 changed files with 26 additions and 26 deletions.
diff --git a/DiscordChatExporter.Cli/Commands/GuideCommand.cs b/DiscordChatExporter.Cli/Commands/GuideCommand.cs
@@ -14,7 +14,7 @@ public ValueTask ExecuteAsync(IConsole console)
             console.Output.WriteLine(" 1. Open Discord");
             console.Output.WriteLine(" 2. Press Ctrl+Shift+I to show developer tools");
             console.Output.WriteLine(" 3. Navigate to the Application tab");
-            console.Output.WriteLine(" 4. Select \"Local Storage\" > \"https://discordapp.com\" on the left");
+            console.Output.WriteLine(" 4. Select \"Local Storage\" > \"https://discord.com\" on the left");
             console.Output.WriteLine(" 5. Press Ctrl+R to reload");
             console.Output.WriteLine(" 6. Find \"token\" at the bottom and copy the value");
             console.Output.WriteLine(" *  Automating user accounts is technically against TOS, use at your own risk.");

diff --git a/DiscordChatExporter.Domain/Discord/DiscordClient.cs b/DiscordChatExporter.Domain/Discord/DiscordClient.cs
@@ -19,7 +19,7 @@ public class DiscordClient
         private readonly HttpClient _httpClient = Singleton.HttpClient;
         private readonly IAsyncPolicy<HttpResponseMessage> _httpRequestPolicy;
 
-        private readonly Uri _baseUri = new Uri("https://discordapp.com/api/v6/", UriKind.Absolute);
+        private readonly Uri _baseUri = new Uri("https://discord.com/api/v6/", UriKind.Absolute);
 
         public DiscordClient(AuthToken token)
         {

diff --git a/DiscordChatExporter.Domain/Discord/Models/Attachment.cs b/DiscordChatExporter.Domain/Discord/Models/Attachment.cs
@@ -7,7 +7,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/channel#attachment-object
+    // https://discord.com/developers/docs/resources/channel#attachment-object
     public partial class Attachment : IHasId
     {
         public string Id { get; }

diff --git a/DiscordChatExporter.Domain/Discord/Models/Channel.cs b/DiscordChatExporter.Domain/Discord/Models/Channel.cs
@@ -6,7 +6,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/channel#channel-object-channel-types
+    // https://discord.com/developers/docs/resources/channel#channel-object-channel-types
     // Order of enum fields needs to match the order in the docs.
     public enum ChannelType
     {
@@ -19,7 +19,7 @@ public enum ChannelType
         GuildStore
     }
 
-    // https://discordapp.com/developers/docs/resources/channel#channel-object
+    // https://discord.com/developers/docs/resources/channel#channel-object
     public partial class Channel : IHasId
     {
         public string Id { get; }

diff --git a/DiscordChatExporter.Domain/Discord/Models/Embed.cs b/DiscordChatExporter.Domain/Discord/Models/Embed.cs
@@ -7,7 +7,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/channel#embed-object
+    // https://discord.com/developers/docs/resources/channel#embed-object
     public partial class Embed
     {
         public string? Title { get; }

diff --git a/DiscordChatExporter.Domain/Discord/Models/EmbedAuthor.cs b/DiscordChatExporter.Domain/Discord/Models/EmbedAuthor.cs
@@ -3,7 +3,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/channel#embed-object-embed-author-structure
+    // https://discord.com/developers/docs/resources/channel#embed-object-embed-author-structure
     public partial class EmbedAuthor
     {
         public string? Name { get; }

diff --git a/DiscordChatExporter.Domain/Discord/Models/EmbedField.cs b/DiscordChatExporter.Domain/Discord/Models/EmbedField.cs
@@ -3,7 +3,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/channel#embed-object-embed-field-structure
+    // https://discord.com/developers/docs/resources/channel#embed-object-embed-field-structure
     public partial class EmbedField
     {
         public string Name { get; }

diff --git a/DiscordChatExporter.Domain/Discord/Models/EmbedFooter.cs b/DiscordChatExporter.Domain/Discord/Models/EmbedFooter.cs
@@ -3,7 +3,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/channel#embed-object-embed-footer-structure
+    // https://discord.com/developers/docs/resources/channel#embed-object-embed-footer-structure
     public partial class EmbedFooter
     {
         public string Text { get; }

diff --git a/DiscordChatExporter.Domain/Discord/Models/EmbedImage.cs b/DiscordChatExporter.Domain/Discord/Models/EmbedImage.cs
@@ -3,7 +3,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/channel#embed-object-embed-image-structure
+    // https://discord.com/developers/docs/resources/channel#embed-object-embed-image-structure
     public partial class EmbedImage
     {
         public string? Url { get; }

diff --git a/DiscordChatExporter.Domain/Discord/Models/Emoji.cs b/DiscordChatExporter.Domain/Discord/Models/Emoji.cs
@@ -7,7 +7,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/emoji#emoji-object
+    // https://discord.com/developers/docs/resources/emoji#emoji-object
     public partial class Emoji
     {
         public string? Id { get; }

diff --git a/DiscordChatExporter.Domain/Discord/Models/Guild.cs b/DiscordChatExporter.Domain/Discord/Models/Guild.cs
@@ -3,7 +3,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/guild#guild-object
+    // https://discord.com/developers/docs/resources/guild#guild-object
     public partial class Guild : IHasId
     {
         public string Id { get; }

diff --git a/DiscordChatExporter.Domain/Discord/Models/Member.cs b/DiscordChatExporter.Domain/Discord/Models/Member.cs
@@ -7,7 +7,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/guild#guild-member-object
+    // https://discord.com/developers/docs/resources/guild#guild-member-object
     public partial class Member : IHasId
     {
         public string Id => User.Id;

diff --git a/DiscordChatExporter.Domain/Discord/Models/Message.cs b/DiscordChatExporter.Domain/Discord/Models/Message.cs
@@ -7,7 +7,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/channel#message-object-message-types
+    // https://discord.com/developers/docs/resources/channel#message-object-message-types
     public enum MessageType
     {
         Default,
@@ -20,7 +20,7 @@ public enum MessageType
         GuildMemberJoin
     }
 
-    // https://discordapp.com/developers/docs/resources/channel#message-object
+    // https://discord.com/developers/docs/resources/channel#message-object
     public partial class Message : IHasId
     {
         public string Id { get; }

diff --git a/DiscordChatExporter.Domain/Discord/Models/Reaction.cs b/DiscordChatExporter.Domain/Discord/Models/Reaction.cs
@@ -3,7 +3,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/channel#reaction-object
+    // https://discord.com/developers/docs/resources/channel#reaction-object
     public partial class Reaction
     {
         public Emoji Emoji { get; }

diff --git a/DiscordChatExporter.Domain/Discord/Models/Role.cs b/DiscordChatExporter.Domain/Discord/Models/Role.cs
@@ -4,7 +4,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/topics/permissions#role-object
+    // https://discord.com/developers/docs/topics/permissions#role-object
     public partial class Role
     {
         public string Id { get; }

diff --git a/DiscordChatExporter.Domain/Discord/Models/User.cs b/DiscordChatExporter.Domain/Discord/Models/User.cs
@@ -5,7 +5,7 @@
 
 namespace DiscordChatExporter.Domain.Discord.Models
 {
-    // https://discordapp.com/developers/docs/resources/user#user-object
+    // https://discord.com/developers/docs/resources/user#user-object
     public partial class User : IHasId
     {
         public string Id { get; }

diff --git a/DiscordChatExporter.Domain/Exporting/Writers/Html/Core.css b/DiscordChatExporter.Domain/Exporting/Writers/Html/Core.css
@@ -2,31 +2,31 @@
 
 @font-face {
     font-family: Whitney;
-    src: url(https://discordapp.com/assets/6c6374bad0b0b6d204d8d6dc4a18d820.woff);
+    src: url(https://discord.com/assets/6c6374bad0b0b6d204d8d6dc4a18d820.woff);
     font-weight: 300;
 }
 
 @font-face {
     font-family: Whitney;
-    src: url(https://discordapp.com/assets/e8acd7d9bf6207f99350ca9f9e23b168.woff);
+    src: url(https://discord.com/assets/e8acd7d9bf6207f99350ca9f9e23b168.woff);
     font-weight: 400;
 }
 
 @font-face {
     font-family: Whitney;
-    src: url(https://discordapp.com/assets/3bdef1251a424500c1b3a78dea9b7e57.woff);
+    src: url(https://discord.com/assets/3bdef1251a424500c1b3a78dea9b7e57.woff);
     font-weight: 500;
 }
 
 @font-face {
     font-family: Whitney;
-    src: url(https://discordapp.com/assets/be0060dafb7a0e31d2a1ca17c0708636.woff);
+    src: url(https://discord.com/assets/be0060dafb7a0e31d2a1ca17c0708636.woff);
     font-weight: 600;
 }
 
 @font-face {
     font-family: Whitney;
-    src: url(https://discordapp.com/assets/8e12fb4f14d9c4592eb8ec9f22337b04.woff);
+    src: url(https://discord.com/assets/8e12fb4f14d9c4592eb8ec9f22337b04.woff);
     font-weight: 700;
 }
 

diff --git a/DiscordChatExporter.Domain/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs b/DiscordChatExporter.Domain/Exporting/Writers/MarkdownVisitors/HtmlMarkdownVisitor.cs
@@ -136,7 +136,7 @@ protected override MarkdownNode VisitEmoji(EmojiNode emoji)
         protected override MarkdownNode VisitLink(LinkNode link)
         {
             // Extract message ID if the link points to a Discord message
-            var linkedMessageId = Regex.Match(link.Url, "^https?://discordapp.com/channels/.*?/(\\d+)/?$").Groups[1].Value;
+            var linkedMessageId = Regex.Match(link.Url, "^https?://(?:discord|discordapp).com/channels/.*?/(\\d+)/?$").Groups[1].Value;
 
             if (!string.IsNullOrWhiteSpace(linkedMessageId))
             {

diff --git a/DiscordChatExporter.Gui/Views/RootView.xaml b/DiscordChatExporter.Gui/Views/RootView.xaml
@@ -148,7 +148,7 @@
                             <Run Text="4. Select" />
                             <Run Foreground="{DynamicResource PrimaryTextBrush}" Text="Local Storage" />
                             <Run Text="&gt;" />
-                            <Run Foreground="{DynamicResource PrimaryTextBrush}" Text="https://discordapp.com" />
+                            <Run Foreground="{DynamicResource PrimaryTextBrush}" Text="https://discord.com" />
                             <Run Text="on the left" />
                             <LineBreak />
                             <Run Text="5. Press" />

diff --git a/Readme.md b/Readme.md
@@ -5,7 +5,7 @@
 [![Downloads](https://img.shields.io/github/downloads/Tyrrrz/DiscordChatExporter/total.svg)](https://github.com/Tyrrrz/DiscordChatExporter/releases)
 [![Donate](https://img.shields.io/badge/donate-$$$-purple.svg)](https://tyrrrz.me/donate)
 
-DiscordChatExporter can be used to export message history from a [Discord](https://discordapp.com) channel to a file. It works with direct messages, group messages, server channels, supports Discord's dialect of markdown and all other rich media features.
+DiscordChatExporter can be used to export message history from a [Discord](https://discord.com) channel to a file. It works with direct messages, group messages, server channels, supports Discord's dialect of markdown and all other rich media features.
 
 _For guides and other info -- check out the [wiki](https://github.com/Tyrrrz/DiscordChatExporter/wiki)._