Merge pull request #582 from fragforce/dev

Update prod

ffdonations/tasks/sender.py

@@ -54,7 +54,7 @@ def note_new_donation(self, donationID):
     payload = {
         'webauth': settings.FRAG_BOT_KEY,
         'user': settings.FRAG_BOT_BOT,
-        'message': message,
+        'message': message.encode('utf-8'),
     }
     r = requests.put(settings.FRAG_BOT_API, headers=payload)
     r.raise_for_status()

ffsite/templates/ff/root/donate.html

@@ -10,7 +10,7 @@ <h2>Donating to Fragforce via Extra-Life (US and Canada only)</h2>
         <div>
             <ul>
                 <li>Donate to a random Fragforce team member: 
-                    <a href="{{ rnd_pct.donate_link }}">{{ rnd_pct.name }}</a>
+                    <a href="https://extra-life.org/participant/{{ rnd_pct.id }}">{{ rnd_pct.displayName }}</a>
                 </li>
                 <li>
                     Alternatively, instead of donating to someone else, you can Join the team and raise money

ffsite/utils.py

@@ -1,20 +1,18 @@
-from ffsfdc.models import *
-from random import randint
-
-from django.db.models import Q, Max, Min
-
-from ffsfdc.models import *
+from random import choice
 
+from ffdonations.models import ParticipantModel
+from ffdonations.utils import el_teams
 
 def random_contact():
     """ Returns a randomly selected Contact """
     # Limit all queries to these
-    baseQ = Q(extra_life_id__isnull=False)
-    info = Contact.objects.filter(baseQ).all().aggregate(Min('id'), Max('id'))
-    pk = randint(info['id__min'], info['id__max'])
-    r = Contact.objects.filter(baseQ).filter(pk=pk).first()
-    if r:
-        return r
+    participants = ParticipantModel.objects.filter(team__id__in=el_teams())
+    if len(participants) > 0:
+        pk = choice(participants)
+    else:
+        pk = ParticipantModel()
+    if pk:
+        return pk
     else:
         # Retry if the contact doesn't exist
         return random_contact()