Merge branch 'gonzobot' of github.com:edwardslabs/CloudBot into gonzobot

Author: edwardslabs

plugins/dwi.py

@@ -24,12 +24,28 @@
 				]
 
 
+Facepalmacros = ['https://i.imgur.com/iWKad22r.jpg',
+                 'https://i.imgur.com/3Jauxrw.jpg',
+                 'https://i.imgur.com/kFyKOgj.gif',
+                 'https://i.imgur.com/5JaFlhU.jpg?1',
+                 'https://i.imgur.com/qbnNXWy.gif',
+                 'https://i.imgur.com/h46ycmx.png',
+                 'https://i.imgur.com/gPNQzaf.jpg',
+                 'https://i.imgur.com/9I8A9C5.jpg']
 
 
 @hook.command('dwi','dealwithit')
 
 def DWI(text, message):
-	'''Tell some one in the channel to deal with it'''
+	'''Tell some one in the channel to deal with it. File located in dwi.py'''
 	PersonNeedsToDeal = text.strip()
 
 	message('{} {}'.format(random.choice(DWIphrases).format(PersonNeedsToDeal), random.choice(DWImacros)))
+
+@hook.command('fp','facepalm')
+
+def FP(text,message):
+	''' Expresses your frustration with another user. File located in dwi.py'''
+	FacePalmer = text.strip()
+
+	message('Dammit {} {}'.format(FacePalmer, random.choice(Facepalmacros)))    

plugins/halal.py

@@ -32,18 +32,71 @@
 			'Fish Makkanwala',
 			'Szechwan'
 			]
+kdish = ['gefilte fish',
+         'matzo ball soup',
+         'cholent',
+         'sufganiyot',
+         'cream cheese with lox bagel',
+         'lamb merguez with lentils and pears',
+         'warm apple streusel with ice cream on top',
+         'mushroom and truffle pizza',
+         'lemon and rosemary salad with a side of rice',
+         'latkes with applesauce',
+         'challah french toast',
+         'grilled fish tacos with chili-lime dressing',
+         'date charoset',
+         'huevos haminados',
+         'baba-ghanouj',
+         'bastani with freshly baked pita',
+         'hummus with perfectly fried falafel',
+         'mujadrah with warm bread',
+         'shishlik with red peppers, mushrooms, and onion',
+         'spicy shakshouka with french bread',
+         'hadgi badah with a tall glass of apple juice',
+         'malawah with a large glass of milk',
+         'sweet kugel with extra sugar on top',
+         'hamantaschen with date and raspberry filling',
+         'marbled halva with almonds on top',
+         'labna with a side of chili sauce',
+         'polow shirin with extra pomegranate',
+         'lamb bademjan'
+         'beef kubbeh with extra chili peppers',
+         'beef shawarma with a side of hummus and rice',
+         'lamb and mushroom kofta with a large coke',
+         'cheese and spinach sambousek',
+         'bamieh with a side of grilled chicken',
+         'chicken tagine with saffron rice and a slice of lechuch',
+         'kofta mishmisheya with grilled vegetables',
+         'charoset with day old matzah',
+         'sour cherry rugelach',
+         'orange-scented flan with dulce de leche syrup',
+         'brisket with potatoes and a spinach salad',
+         'bouikos con kashkaval',
+         'lemon-rice soup with soda crackers'
+         ]
+
+
 
 @hook.command('halaal', 'halal', autohelp = False)
 def	serving(text, action):
 	'''Serves halaal dishes to some one in the channel'''
 	diner = text.strip()
 
 	if diner =='':
-		action('Has {} {} {}'.format(random.choice(quantity), random.choice(quality), random.choice(dish)))
+		action('has {} {} {}'.format(random.choice(quantity), random.choice(quality), random.choice(dish)))
 
 	else:
 		action('Serves {} {} {} {}'.format(diner, random.choice(quantity), random.choice(quality), random.choice(dish)))
 
+@hook.command('kosher', autohelp=False)
+def kserving(text, action):
+
+    '''Servers a Kosher dish to some one in the channel. Part of halal.py. Made with help of snoonet user Yat'''
+    kdiner = text.strip()
+    if kdiner =='':
+    	action('has {} {} {}'.format(random.choice(quantity), random.choice(quality), random.choice(kdish)))
+    else:
+    	action('Serves {} {} {} {}'.format(kdiner, random.choice(quantity), random.choice(quality), random.choice(kdish)))
 
 #written by ilgnome
 #find me in #gonzobot

plugins/jokes.py

@@ -29,7 +29,7 @@ def load_jokes(bot):
 
     with codecs.open(os.path.join(bot.data_dir, "wisdom.txt"), encoding="utf-8") as f:
         wisdom = [line.strip() for line in f.readlines() if not line.startswith("//")]
-    
+
     with codecs.open(os.path.join(bot.data_dir, "book_puns.txt"), encoding="utf-8") as f:
         book_puns = [line.strip() for line in f.readlines() if not line.startswith("//")]
 

plugins/karma.py

@@ -103,7 +103,7 @@ def points(text, chan, db, conn):
     score = 0
     karma = ""
     thing = ""
-    if text.endswith("-global"):
+    if text.endswith("-global") or text.endswith(" global"):
         thing = text[:-7].strip()
         karma = db.execute("select score from karma where thing = :thing", {'thing': thing.lower()}).fetchall()
     else:
@@ -132,7 +132,7 @@ def pointstop(text, chan, db, message, conn, notice):
     points = defaultdict(int)
     items = ""
     out = ""
-    if text == "global":
+    if text == "global" or text == "-global":
         items = db.execute("select thing, score from karma").fetchall()
         out = "The top {} favorite things in all channels are: "
     else:
@@ -162,7 +162,7 @@ def pointsbottom(text, chan, db, message, conn, notice):
     points = defaultdict(int)
     items = ""
     out = ""
-    if text == "global":
+    if text == "global" or text == "-global":
         items = db.execute("select thing, score from karma").fetchall()
         out = "The {} most hated things in all channels are: "
     else:

plugins/tell.py

@@ -167,7 +167,7 @@ def tell_cmd(text, nick, db, notice, conn):
         notice("Invalid nick '{}'.".format(target))
         return
 
-    if not re.match("^[a-z0-9_|.\-\]\[]*$", target.lower()):
+    if not re.match("^[a-z0-9_|.\-\`\]\[]*$", target.lower()):
         notice("Invalid nick '{}'.".format(target))
         return