Fixed #1. Implemented animated emoji support.

Emzi0767 · Dec 22, 2017 · 71b87a7 · 71b87a7
1 parent d5fc1a7
commit 71b87a7
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 12 deletions.
diff --git a/EmoteScavenger/Emoji.cs b/EmoteScavenger/Emoji.cs
@@ -1,23 +1,22 @@
-using System;
-
-namespace EmoteScavenger
+namespace EmoteScavenger
 {
     public struct Emoji
     {
         public string Name { get; }
         public ulong Id { get; }
         public string GuildName { get; }
         public ulong GuildId { get; }
+        public string Url { get; }
+        public bool IsAnimated { get; }
 
-        public Emoji(string name, ulong id, string guildName, ulong guildId)
+        public Emoji(string name, ulong id, string guildName, ulong guildId, string url, bool anim)
         {
             this.Name = name;
             this.Id = id;
             this.GuildName = guildName;
             this.GuildId = guildId;
+            this.Url = url;
+            this.IsAnimated = anim;
         }
-
-        public Uri GetUri()
-            => new Uri($"https://cdn.discordapp.com/emojis/{this.Id}.png");
     }
 }
diff --git a/EmoteScavenger/EmoteScavenger.csproj b/EmoteScavenger/EmoteScavenger.csproj
@@ -4,10 +4,13 @@
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp2.0</TargetFramework>
     <LangVersion>7.1</LangVersion>
+
+    <Version>1.0.1</Version>
+    <FileVersion>$(Version).0</FileVersion>
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DSharpPlus" Version="4.0.0-beta-00397" />
+    <PackageReference Include="DSharpPlus" Version="4.0.0-beta-00399" />
     <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="2.0.1" />
   </ItemGroup>
 

diff --git a/EmoteScavenger/MultiDownloader.cs b/EmoteScavenger/MultiDownloader.cs
@@ -50,7 +50,8 @@ public Task DownloadAllAsync(IEnumerable<Emoji> emojis)
             foreach (var emoji in emojis)
             {
                 var td = dirs[emoji.GuildId];
-                var tf = Path.Combine(td.FullName, $"{emoji.Name}.png");
+                var tf = Path.Combine(td.FullName, $"{emoji.Name}");
+                tf = string.Concat(tf, emoji.IsAnimated ? ".gif" : ".png");
 
                 tasks.Add(DownloadAsync(emoji, new FileInfo(tf)));
             }
@@ -64,7 +65,7 @@ private async Task DownloadAsync(Emoji emoji, FileInfo targetFile)
 
             try
             {
-                using (var res = await this.Http.GetAsync(string.Format(SOURCE_URL, emoji.Id)))
+                using (var res = await this.Http.GetAsync(emoji.Url))
                 using (var str = await res.Content.ReadAsStreamAsync())
                 using (var fs = targetFile.Create())
                     await str.CopyToAsync(fs);

diff --git a/EmoteScavenger/Program.cs b/EmoteScavenger/Program.cs
@@ -61,7 +61,7 @@ private static FileInfo GetTokenLocation()
         private static string ExtractToken(FileInfo dbf)
         {
             var tfn = string.Concat(dbf.FullName, ".tmp");
-            dbf = dbf.CopyTo(tfn);
+            dbf = dbf.CopyTo(tfn, true);
 
             string token = null;
             using (var db = new StorageContext(dbf))

diff --git a/EmoteScavenger/Scavenger.cs b/EmoteScavenger/Scavenger.cs
@@ -68,7 +68,7 @@ private Task Discord_GuildAvailable(GuildCreateEventArgs e)
 
             var xg = e.Guild;
             foreach (var xe in xg.Emojis)
-                this.Emojis.Add(new Emoji(xe.Name, xe.Id, xg.Name, xg.Id));
+                this.Emojis.Add(new Emoji(xe.Name, xe.Id, xg.Name, xg.Id, xe.Url, xe.IsAnimated));
 
             if (this.GuildsToSync.TryDequeue(out var gld))
                 return e.Client.SyncGuildsAsync(gld);