From 30886ce7b9828855070b69eb7922b6e638372df7 Mon Sep 17 00:00:00 2001
From: Sakimori <sakimorihalley@gmail.com>
Date: Sat, 19 Dec 2020 20:26:05 -0500
Subject: [PATCH] functional soulscream retriever

---
 .gitignore          |  3 ++-
 config.json         | 13 +++++++++----
 database.py         |  5 -----
 onomancer.py        |  7 ++++++-
 the-prestige.pyproj |  4 ++++
 the_prestige.py     | 20 ++++++++++++++++++--
 6 files changed, 39 insertions(+), 13 deletions(-)

diff --git a/.gitignore b/.gitignore
index 34558be..14f0fc0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -340,4 +340,5 @@ ASALocalRun/
 healthchecksdb
 
 # Personal config file, contains bot token
-config.json
\ No newline at end of file
+config.json
+ids
\ No newline at end of file
diff --git a/config.json b/config.json
index ba6fb04..22eb80b 100644
--- a/config.json
+++ b/config.json
@@ -1,6 +1,11 @@
 {
-    "token": "Nzg5OTU2MTY2Nzk2NTc0NzQw.X95mAg.gQBAAQZMy5-a70fVtT50YiYO4oc",
-    "owners": [
-        102691114762371072
-    ]
+  "token": "Nzg5OTU2MTY2Nzk2NTc0NzQw.X95mAg.gQBAAQZMy5-a70fVtT50YiYO4oc",
+  "owners": [
+    102691114762371072
+  ],
+  "prefix": [
+    "m;",
+    "m!"
+  ],
+  "soulscream channel id": 790005613110493276
 }
\ No newline at end of file
diff --git a/database.py b/database.py
index 0b5ee80..54e92f6 100644
--- a/database.py
+++ b/database.py
@@ -1,8 +1,3 @@
 #handles the database interactions
 
 import sqlite3 as sql
-
-
-
-
-
diff --git a/onomancer.py b/onomancer.py
index 9928b34..67f212d 100644
--- a/onomancer.py
+++ b/onomancer.py
@@ -2,11 +2,16 @@
 
 import requests
 import json
+import database as db
+
 
 onomancer_url = "https://onomancer.sibr.dev/api/"
 name_stats_hook = "generateStats/"
 
 def get_stats(username):
+    #check database for cached name first
+
+    #yell at onomancer
     response = requests.get(onomancer_url + name_stats_hook + username)
     if response.status_code == 200:
-        return response.json
\ No newline at end of file
+        return response.json()
\ No newline at end of file
diff --git a/the-prestige.pyproj b/the-prestige.pyproj
index c1849e3..20153e4 100644
--- a/the-prestige.pyproj
+++ b/the-prestige.pyproj
@@ -41,6 +41,10 @@
       <Architecture>X86</Architecture>
     </Interpreter>
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="config.json" />
+    <Content Include="ids" />
+  </ItemGroup>
   <Import Project="$(MSBuildExtensionsPath32)\Microsoft\VisualStudio\v$(VisualStudioVersion)\Python Tools\Microsoft.PythonTools.targets" />
   <!-- Uncomment the CoreCompile target to enable the Build command in
        Visual Studio and specify your pre- and post-build commands in
diff --git a/the_prestige.py b/the_prestige.py
index 9e11c25..aa5bf1d 100644
--- a/the_prestige.py
+++ b/the_prestige.py
@@ -2,6 +2,7 @@ import discord
 import json
 import database as db
 import os
+import onomancer as ono
 
 client = discord.Client()
 
@@ -12,7 +13,9 @@ def config():
                 "token" : "",
                 "owners" : [
                     0000
-                    ]
+                    ],
+                "prefix" : ["m;", "m!"],
+                "soulscream channel id" : 0
             }
         with open("config.json", "w") as config_file:
             json.dump(config_dic, config_file, indent=4)
@@ -28,7 +31,20 @@ async def on_ready():
 
 @client.event
 async def on_message(msg):
-    print(
+    command = False
+    for prefix in config()["prefix"]:
+        if msg.content.startswith(prefix):
+            command = True
+            command_s = msg.content.split(prefix, 1)
+    if not command:
+        return
+
+    if msg.channel.id == config()["soulscream channel id"]:
+        try:
+            await msg.channel.send(ono.get_stats(msg.author.nick)["soulscream"])
+        except TypeError:
+            await msg.channel.send(ono.get_stats(msg.author.name)["soulscream"])
+        
 
 
 client.run(config()["token"])
\ No newline at end of file