Merge branch 'master' into cantidad_de_votos_por_proyecto

Author: GabiAndi

src/pycamp_bot/commands/projects.py

@@ -118,8 +118,14 @@ async def project_topic(update, context):
     user = Pycampista.get_or_create(username=username, chat_id=chat_id)[0]
 
     new_project.owner = user
-
-    new_project.save()
+    try:
+        new_project.save()
+    except peewee.IntegrityError:
+        await context.bot.send_message(
+            chat_id=update.message.chat_id,
+            text="Ups ese proyecto ya fue cargado"
+        )
+        return ConversationHandler.END
 
     await context.bot.send_message(
         chat_id=update.message.chat_id,
@@ -196,7 +202,6 @@ async def show_projects(update, context):
         if participants_count > 0:
             project_text += "\n Interesades: {}".format(participants_count)
         text.append(project_text)
-    text.append(project_text)
 
     if text:
         text = "\n\n".join(text)

src/pycamp_bot/commands/voting.py

@@ -19,7 +19,7 @@ async def wrap(*args):
         if pycamp.vote_authorized:
             await func(update, context)
         else:
-            context.bot.send_message(
+            await context.bot.send_message(
                 chat_id=update.message.chat_id,
                 text="La eleccion no está autorizada. Avisale a un admin (/admins)!")
     return wrap

src/pycamp_bot/commands/wizard.py

@@ -1,5 +1,6 @@
 from telegram.ext import CommandHandler
 from pycamp_bot.models import Pycampista
+import random
 
 
 async def become_wizard(update, context):
@@ -24,19 +25,23 @@ async def become_wizard(update, context):
 
 async def summon_wizard(update, context):
     username = update.message.from_user.username
-    try:
-        wizard = Pycampista.get(Pycampista.wizard is True)
+    wizard_list = list(Pycampista.select().where(Pycampista.wizard==True))
+    if len(wizard_list) == 0:
+        await context.bot.send_message(
+            chat_id=update.message.chat_id,
+            text="No hay ningunx magx todavia"
+        )
+    else:
+        wizard = random.choice(wizard_list)
         await context.bot.send_message(
             chat_id=wizard.chat_id,
             text="PING PING PING MAGX! @{} te necesesita!".format(username)
         )
-    except Pycampista.DoesNotExist:
         await context.bot.send_message(
-            chat_id=update.chat_id,
-            text="Hubo un accidente, el mago esta en otro plano.".format(username)
+            chat_id=update.message.chat_id,
+            text="Tu magx asignadx es: @{}".format(wizard.username)
         )
 
-
 def set_handlers(application):
     application.add_handler(
             CommandHandler('evocar_magx', summon_wizard))