Merge pull request #1 from madgeraccoon/master

woof woof lol

.dominae/dominae.py

@@ -121,19 +121,19 @@ async def on_message(message):
         if message.content.startswith(pre + 'say'):
 
             f = open(txt + '/ssay.txt','w')
-            f.write(message.content.replace("ssay ",""))
+            f.write(message.content.replace(pre + "say ",""))
             f.close()
 
             subprocess.check_output(sh + "/ssay.sh")
             await channel.send(file=discord.File(img + '/ssay.png'))
 
             print ("Phrase Uploaded")
-            print ("'" + message.content.replace("ssay ","") + "'")
+            print ("'" + message.content.replace(pre + "say ","") + "'")
             print ('by {} at {} \n'.format(author, str(datetime.now())))
 
         if message.content.startswith(pre + 'vox'):
 
-            voxs = message.content.replace("svox ","")
+            voxs = message.content.replace(pre + "vox ","")
             voxfn = voxs.replace(" ",".wav \n") + ".wav"
             voxfn += " svox.wav\n"
             voxfn = voxfn.lower()
@@ -145,7 +145,7 @@ async def on_message(message):
             await channel.send(file=discord.File(cwd + '/VOX/svox.wav'))
 
             print ("Black Mesa Resarch Facility Notified")
-            print ("'" + message.content.replace("svox ","") + "'")
+            print ("'" + message.content.replace(pre + "vox ","") + "'")
             print ('by {} at {} \n'.format(author, str(datetime.now())))
 
         if message.content.startswith('#PREFIX'):
@@ -202,6 +202,15 @@ async def on_message(message):
             print ('by {} at {} \n'.format(author, str(datetime.now())))
 
 
+        if message.content.startswith(pre + 'fetch'):
+            subprocess.check_output(sh + "/screenfetch.sh")
+            with open(txt + '/screenfetch.txt', 'r') as fetchfile:
+                fetch = fetchfile.read()
+            embed = discord.Embed(description=fetch, color=0x7900CE) #change stuff after the x for different hex colors on the embed
+            embed.set_author(name="Screenfetch", icon_url='https://cdn.discordapp.com/attachments/437821201461805066/552014178521710612/Centepeetle_GemPNG.webp') # set a custom icon url here
+            await channel.send(embed=embed)
+
+
         if message.content.startswith(pre + 'help svox'):
 
             await channel.send("Here are the current VOX keywords.")

.dominae/sh/screenfetch.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+screenfetch -N -n > ~/.dominae/txt/screenfetch.txt
+sed -i -e 's/^/**/' ~/.dominae/txt/screenfetch.txt
+sed -i -e 's/:/**:/' ~/.dominae/txt/screenfetch.txt
+sed -i -e 's/@/**@/g' ~/.dominae/txt/screenfetch.txt
+sed -i -e 's/**@ /@ /g' ~/.dominae/txt/screenfetch.txt
+#sed -i -e 's/**@**/@/g' ~/.dominae/txt/screenfetch.txt