From 08d0000eeccce9bc44705443d921f3cfbd1c508a Mon Sep 17 00:00:00 2001
From: MrUnknownDE <web@johanneskr.de>
Date: Thu, 12 Apr 2018 22:04:23 +0200
Subject: [PATCH] UnknownBot 0.0.2v

+ ?server - Server Informationen
+ config.ini added
* Game Status Fix
---
 .idea/UnknownBot.iml |   2 +-
 .idea/misc.xml       |   2 +-
 .idea/workspace.xml  | 101 +++++++++++++++++++++++++++++++++----------
 bin/bot.py           |  53 ++++++++++++++++++-----
 bin/config.ini       |   7 ++-
 5 files changed, 127 insertions(+), 38 deletions(-)

diff --git a/.idea/UnknownBot.iml b/.idea/UnknownBot.iml
index 6711606..d24d66b 100644
--- a/.idea/UnknownBot.iml
+++ b/.idea/UnknownBot.iml
@@ -2,7 +2,7 @@
 <module type="PYTHON_MODULE" version="4">
   <component name="NewModuleRootManager">
     <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
+    <orderEntry type="jdk" jdkName="Python 3.6 (UnknownBot)" jdkType="Python SDK" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
   <component name="TestRunnerService">
diff --git a/.idea/misc.xml b/.idea/misc.xml
index b4c416b..83d71f3 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
-  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 virtualenv at C:\Users\MCGFX\OneDrive\##Johannes\Dev\UnknownBot\venv (1)" project-jdk-type="Python SDK" />
+  <component name="ProjectRootManager" version="2" project-jdk-name="Python 3.6 (UnknownBot)" project-jdk-type="Python SDK" />
 </project>
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 1c5141a..2b91b8b 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -1,5 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="BookmarkManager">
+    <bookmark url="file://$PROJECT_DIR$/bin/bot.py" line="94" mnemonic="2" />
+  </component>
   <component name="ChangeListManager">
     <list default="true" id="bbbc6827-f4b9-4b70-9d3b-0cbd6386c246" name="Default" comment="" />
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
@@ -10,12 +13,12 @@
     <option name="LAST_RESOLUTION" value="IGNORE" />
   </component>
   <component name="FileEditorManager">
-    <leaf>
+    <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
       <file leaf-file-name="bot.py" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/bin/bot.py">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="541">
-              <caret line="191" column="16" selection-start-line="191" selection-start-column="16" selection-end-line="191" selection-end-column="16" />
+            <state relative-caret-position="89">
+              <caret line="60" column="36" selection-start-line="60" selection-start-column="36" selection-end-line="60" selection-end-column="36" />
               <folding>
                 <element signature="e#0#14#0" expanded="true" />
               </folding>
@@ -26,8 +29,8 @@
       <file leaf-file-name="config.ini" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/bin/config.ini">
           <provider selected="true" editor-type-id="text-editor">
-            <state>
-              <caret column="29" selection-start-column="29" selection-end-column="29" />
+            <state relative-caret-position="17">
+              <caret line="1" column="10" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="10" />
             </state>
           </provider>
         </entry>
@@ -56,24 +59,23 @@
   <component name="IdeDocumentHistory">
     <option name="CHANGED_PATHS">
       <list>
+        <option value="$PROJECT_DIR$/run.py" />
         <option value="$PROJECT_DIR$/bin/bot.py" />
         <option value="$PROJECT_DIR$/bin/config.ini" />
-        <option value="$PROJECT_DIR$/run.py" />
       </list>
     </option>
   </component>
-  <component name="ProjectFrameBounds">
-    <option name="x" value="100" />
-    <option name="y" value="20" />
+  <component name="ProjectFrameBounds" extendedState="6">
+    <option name="x" value="632" />
+    <option name="y" value="39" />
     <option name="width" value="1400" />
-    <option name="height" value="820" />
+    <option name="height" value="829" />
   </component>
   <component name="ProjectView">
     <navigator proportions="" version="1">
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -86,12 +88,22 @@
               <item name="UnknownBot" type="462c0819:PsiDirectoryNode" />
               <item name="bin" type="462c0819:PsiDirectoryNode" />
             </path>
+            <path>
+              <item name="UnknownBot" type="b2602c69:ProjectViewProjectNode" />
+              <item name="UnknownBot" type="462c0819:PsiDirectoryNode" />
+              <item name="Vorlagen" type="462c0819:PsiDirectoryNode" />
+            </path>
           </expand>
           <select />
         </subPane>
       </pane>
+      <pane id="Scope" />
     </panes>
   </component>
+  <component name="PropertiesComponent">
+    <property name="last_opened_file_path" value="$PROJECT_DIR$" />
+    <property name="settings.editor.selected.configurable" value="com.jetbrains.python.configuration.PyActiveSdkModuleConfigurable" />
+  </component>
   <component name="RunDashboard">
     <option name="ruleStates">
       <list>
@@ -143,31 +155,41 @@
     <servers />
   </component>
   <component name="ToolWindowManager">
-    <frame x="100" y="20" width="1400" height="820" extended-state="0" />
+    <frame x="-8" y="-8" width="1616" height="876" extended-state="6" />
     <layout>
-      <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.25" />
+      <window_info content_ui="combo" id="Project" order="0" visible="true" weight="0.21625" />
       <window_info anchor="bottom" id="TODO" order="6" />
-      <window_info anchor="bottom" id="Event Log" side_tool="true" />
-      <window_info anchor="bottom" id="Version Control" />
-      <window_info anchor="bottom" id="Python Console" />
-      <window_info anchor="bottom" id="Run" order="2" weight="0.32907802" />
+      <window_info anchor="bottom" id="Event Log" order="7" side_tool="true" />
+      <window_info anchor="bottom" id="Run" order="2" weight="0.3285151" />
+      <window_info anchor="bottom" id="Version Control" order="7" />
+      <window_info anchor="bottom" id="Python Console" order="7" />
       <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
-      <window_info anchor="bottom" id="Terminal" />
-      <window_info id="Favorites" side_tool="true" />
+      <window_info anchor="bottom" id="Terminal" order="7" />
       <window_info anchor="bottom" id="Debug" order="3" weight="0.4" />
-      <window_info anchor="bottom" id="Find" order="1" />
-      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
+      <window_info id="Favorites" order="2" side_tool="true" />
       <window_info anchor="right" content_ui="combo" id="Hierarchy" order="2" weight="0.25" />
-      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
+      <window_info anchor="right" id="Commander" internal_type="SLIDING" order="0" type="SLIDING" weight="0.4" />
       <window_info anchor="right" id="Ant Build" order="1" weight="0.25" />
       <window_info anchor="bottom" id="Message" order="0" />
+      <window_info anchor="bottom" id="Inspection" order="5" weight="0.4" />
       <window_info anchor="bottom" id="Cvs" order="4" weight="0.25" />
+      <window_info anchor="bottom" id="Find" order="1" />
     </layout>
   </component>
   <component name="VcsContentAnnotationSettings">
     <option name="myLimit" value="2678400000" />
   </component>
   <component name="editorHistoryManager">
+    <entry file="file://$PROJECT_DIR$/bin/bot.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="3247">
+          <caret line="191" column="16" selection-start-line="191" selection-start-column="16" selection-end-line="191" selection-end-column="16" />
+          <folding>
+            <element signature="e#0#14#0" expanded="true" />
+          </folding>
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/bin/config.ini">
       <provider selected="true" editor-type-id="text-editor">
         <state>
@@ -182,10 +204,41 @@
         </state>
       </provider>
     </entry>
+    <entry file="file://$PROJECT_DIR$/run.py">
+      <provider selected="true" editor-type-id="text-editor">
+        <state>
+          <caret column="14" selection-start-column="14" selection-end-column="14" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/README.md">
+      <provider selected="true" editor-type-id="split-provider[text-editor;markdown-preview-editor]">
+        <state split_layout="SPLIT">
+          <first_editor relative-caret-position="272">
+            <caret line="16" column="31" selection-start-line="16" selection-start-column="31" selection-end-line="16" selection-end-column="31" />
+          </first_editor>
+          <second_editor />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/Vorlagen/Embed Vorlagen.txt">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="136">
+          <caret line="10" column="80" lean-forward="true" selection-start-line="10" selection-start-column="19" selection-end-line="10" selection-end-column="80" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/bin/config.ini">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="17">
+          <caret line="1" column="10" selection-start-line="1" selection-start-column="10" selection-end-line="1" selection-end-column="10" />
+        </state>
+      </provider>
+    </entry>
     <entry file="file://$PROJECT_DIR$/bin/bot.py">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="541">
-          <caret line="191" column="16" selection-start-line="191" selection-start-column="16" selection-end-line="191" selection-end-column="16" />
+        <state relative-caret-position="89">
+          <caret line="60" column="36" selection-start-line="60" selection-start-column="36" selection-end-line="60" selection-end-column="36" />
           <folding>
             <element signature="e#0#14#0" expanded="true" />
           </folding>
diff --git a/bin/bot.py b/bin/bot.py
index 6506f58..66c1865 100644
--- a/bin/bot.py
+++ b/bin/bot.py
@@ -1,18 +1,19 @@
 import discord
 import asyncio
-
+import configparser
 
 client = discord.Client()
-ownerid = ("155076323612688384")
 
+config = configparser.ConfigParser()
+config.read("config.ini")
 
-##Uptime Variablen##
+ownerid = (config['DISCORD']['owner'])
+
+##Variablen##
 minutes = 0
 hours = 0
 days = 0
 
-## Music Bot
-
 players = {}
 
 @client.event
@@ -38,13 +39,14 @@ async def on_message(message):
     if message.content.lower().startswith("?info"):
         server = client.servers
         embed = discord.Embed(title="Support-Discord: mrunknownde.de", colour=discord.Colour(0x8800ff),
-                              url="https://mrunknownde.de", description="\nAll in One Informationen")
+                              url="https://mrunknownde.de", description="\n\n\nIrgendwelche Informationen")
+        embed.set_thumbnail(url="https://dl.mrunknownde.de/4KbNR")
         embed.set_author(name="UnknownBot Informationen", url="https://mrunknownde.de",
-                         icon_url="https://dl.mrunknownde.de/Bilder/Rem_re_zero_render_by_ozkberg-daf287u.png")
-        embed.set_footer(text="Alpha 0.0.1v", icon_url="https://slides.steveliedtke.de/git2/images/Git-Icon-small.png")
+                         icon_url="https://dl.mrunknownde.de/4KbNR")
+        embed.set_footer(text="{0}".format(config['VERSION']['version']), icon_url="https://slides.steveliedtke.de/git2/images/Git-Icon-small.png")
         embed.add_field(name="Benutzer", value="{0}", inline=True)
         embed.add_field(name="Servers", value="{0}".format(server), inline=True)
-        embed.add_field(name="Letztes Update", value="08.04.2018 - 19:55 Uhr", inline=True)
+        embed.add_field(name="Letztes Update", value="12.04.2018 - 22:55 Uhr", inline=True)
         embed.add_field(name="Onlinezeit", value="{0} Tag(e) {1} Stunde(n) {2} Minute(n)".format(days, hours, minutes), inline=True)
         embed.add_field(name="Discord.py", value="{0}", inline=True)
 
@@ -55,16 +57,45 @@ async def on_message(message):
             user = message.author
             usercreateat = str(user.created_at).split(".", 1)[0]
             userjoinat = str(user.joined_at).split(".", 1)[0]
-            userstatus = user.get_user_info()
+            userstatus = user.game
+            usericon = user.icon_url
 
             userembed = discord.Embed(colour=discord.Colour(0x8800ff))
             userembed.set_author(name="{0} #{1} Account Informationen".format(user.name, user.discriminator),
                              icon_url="https://dl.mrunknownde.de/Bilder/Rem_re_zero_render_by_ozkberg-daf287u.png")
+            userembed.set_footer(text="{0}".format(config['VERSION']['version']),
+                             icon_url="https://slides.steveliedtke.de/git2/images/Git-Icon-small.png")
             userembed.add_field(name="Account Erstellt", value="{0}".format(usercreateat), inline=True)
             userembed.add_field(name="Server beigetreten", value="{0}".format(userjoinat), inline=False)
             userembed.add_field(name="Status", value="{0}".format(userstatus), inline=False)
 
+            await client.send_message(message.channel, "{0}".format(usericon))
             await client.send_message(message.channel, embed=userembed)
+
+        except IndexError as error:
+            await client.send_message(message.channel, "Fehler beim Verarbeiten \n\n ```{error}```\n Diesen Fehler dem Support melden.".format(error=error))
+        except Exception as error:
+            await client.send_message(message.channel, "Fehler beim Verarbeiten \n\n ```{error}```\n Diesen Fehler dem Support melden.".format(error=error))
+        finally:
+            pass
+    if message.content.lower().startswith("?server"):
+        try:
+            servers = message.server
+            serverrcreateat = str(servers.created_at).split(".", 1)[0]
+            serverowner = servers.owner
+            servericon = servers.icon
+            serverid = servers.id
+
+            userembed = discord.Embed(colour=discord.Colour(0x8800ff))
+            userembed.set_author(name="{0} - Informationen".format(servers.name), icon_url="https://cdn.discordapp.com/icons/{0}/{1}.jpg".format(serverid, servericon))
+            userembed.set_footer(text="{0}".format(config['VERSION']['version']), icon_url="https://slides.steveliedtke.de/git2/images/Git-Icon-small.png")
+            userembed.set_thumbnail(url="https://cdn.discordapp.com/icons/{0}/{1}.jpg".format(serverid, servericon))
+            userembed.add_field(name="Server Erstellt", value="{0}".format(serverrcreateat), inline=True)
+            userembed.add_field(name="Server Owner", value="{0}".format(serverowner), inline=False)
+            userembed.add_field(name="Mitglieder", value="-Buggy-")
+
+            await client.send_message(message.channel, embed=userembed)
+
         except IndexError as error:
             await client.send_message(message.channel, "Fehler beim Verarbeiten \n\n ```{error}```\n Diesen Fehler dem Support melden.".format(error=error))
         except Exception as error:
@@ -189,4 +220,4 @@ async def uptime():
 
 
 client.loop.create_task(uptime())
-client.run("-><-")
\ No newline at end of file
+client.run(config['DISCORD']['bot-token'])
\ No newline at end of file
diff --git a/bin/config.ini b/bin/config.ini
index 62b25e5..4675360 100644
--- a/bin/config.ini
+++ b/bin/config.ini
@@ -1 +1,6 @@
-Discord-Key = Its not Working
\ No newline at end of file
+[DISCORD]
+bot-token=
+owner= 155076323612688384
+
+[VERSION]
+version= Alpha 0.0.2v
\ No newline at end of file