Able to add a different jikan rest site

ThomasAunvik · Jun 7, 2020 · cd85245 · cd85245
1 parent 9d6b059
commit cd85245
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/AnimeListBot/Handler/Database/DatabaseService.cs b/AnimeListBot/Handler/Database/DatabaseService.cs
@@ -81,7 +81,7 @@ public async Task<DiscordUser> GetUserById(ulong id, bool forceUpdate = false)
 
         public bool DoesUserIdExist(ulong id)
         {
-            return dbConn.DiscordUser.Find(id) != null;
+            return dbConn.DiscordUser.ToList().Find(x => x.UserId == id) != null;
         }
 
         public async Task<bool> CreateUser(DiscordUser user)

diff --git a/AnimeListBot/Handler/Utils/Config.cs b/AnimeListBot/Handler/Utils/Config.cs
@@ -41,6 +41,9 @@ public class Config
         public ulong test_error_channel;
         public ulong test_channel;
 
+        // Jikan
+        public string jikan_api;
+
         // Database
         public string ip;
         public int port;

diff --git a/AnimeListBot/Modules/AutoAdder.cs b/AnimeListBot/Modules/AutoAdder.cs
@@ -195,7 +195,8 @@ await dmChannel.SendMessageAsync(returnMessage +
                         "\nPlease use the following link formats:\n" +
                         "MAL: `https://myanimelist.net/profile/[username]` \n" +
                         "Anilist: `https://anilist.co/user/[username]`");
-                    await message.DeleteAsync();
+
+                    await PermissionWrapper.DeleteMessage((IUserMessage)message);
                     return;
                 }
 

diff --git a/AnimeListBot/Program.cs b/AnimeListBot/Program.cs
@@ -103,7 +103,12 @@ public async Task RunBotAsync(string[] args)
                 gitStatus = File.ReadAllText("git_status.txt");
             }
 
-            _jikan = new Jikan(true, surpressException: false);
+            if (!string.IsNullOrEmpty(bot_config.jikan_api)) {
+                _jikan = new Jikan(bot_config.jikan_api, surpressException: false);
+            }else
+            {
+                _jikan = new Jikan(true, surpressException: false);
+            }
             _sauceNao  = new SauceNao(bot_config.saucenao_token);
             _dbl = new AuthDiscordBotListApi(botID, bot_config.dbl_token);
 

diff --git a/AnimeListBot/config_template.json b/AnimeListBot/config_template.json
@@ -4,11 +4,13 @@
 
   "cluster_id": 0,
   "override_shard_amount": 0,
-  
-  "ignoredExceptionMessages": ["Server requested a reconnect", "WebSocket connection was closed"],
-  
+
+  "ignoredExceptionMessages": [ "Server requested a reconnect", "WebSocket connection was closed" ],
+
   "dbl_token": "Discord Bot List Token",
 
+  "jikan_api": "http://localhost:8000/v3/",
+
   "ip": "localhost",
   "port": 5432,
   "catalog": "animelistbot",