fixes and tweet removal

rowers/admin.py

@@ -96,7 +96,7 @@ class C2WorldClassAgePerformanceAdmin(admin.ModelAdmin):
 
 class SiteAnnouncementAdmin(admin.ModelAdmin):
     list_display = ('announcement', 'created',
-                    'modified', 'expires', 'dotweet')
+                    'modified', 'expires')
 
 
 class TeamAdmin(admin.ModelAdmin):

rowers/models.py

@@ -26,7 +26,7 @@ from django.contrib.admin.widgets import AdminDateWidget, AdminTimeWidget, Admin
 
 import os
 import json
-import twitter
+
 import re
 import pytz
 from django_countries.fields import CountryField
@@ -72,12 +72,6 @@ from rowsandall_app.settings import (
 
 # END PERMISSIONS
 
-tweetapi = twitter.Api(consumer_key=TWEET_CONSUMER_KEY,
-                       consumer_secret=TWEET_CONSUMER_SECRET,
-                       access_token_key=TWEET_ACCESS_TOKEN_KEY,
-                       access_token_secret=TWEET_ACCESS_TOKEN_SECRET)
-
-
 timezones = (
     (x, x) for x in pytz.common_timezones
 )
@@ -4928,21 +4922,12 @@ class SiteAnnouncement(models.Model):
     announcement = models.TextField(max_length=280)
     expires = models.DateField(default=current_day)
     modified = models.DateField(default=current_day)
-    dotweet = models.BooleanField(default=False)
 
     def save(self, *args, **kwargs):
         if not self.id:
             self.created = timezone.now()
             self.expires = timezone.now()+datetime.timedelta(days=10)
         self.modified = timezone.now()
-        if self.dotweet:  # pragma: no cover
-            try:
-                _ = tweetapi.PostUpdate(self.announcement)
-            except:
-                try:
-                    _ = tweetapi.PostUpdate(self.announcement[:270])
-                except:
-                    pass
         return super(SiteAnnouncement, self).save(*args, **kwargs)
 
 # A comment by a user on a training

rowers/tasks.py

@@ -3404,6 +3404,9 @@ def handle_nk_async_workout(alldata, userid, nktoken, nkid, delaysec, defaulttim
     workoutid, error = add_workout_from_data(userid, nkid, data, df)
 
     # dologging('nklog.log','NK Workout ID {id}'.format(id=workoutid))
+    if workoutid == 0:
+        return 0
+    
     workout = Workout.objects.get(id=workoutid)
     newnkid = workout.uploadedtonk
     sr = SyncRecord.objects.filter(nkid=newnkid)

rowers/uploads.py

@@ -149,7 +149,10 @@ def do_sync(w, options, quick=False):
             w.uploadedtonk = options['nkid']
             w.save()
             record = SyncRecord(workout=w,nkid=options['nkid'])
+            try:
                 record.save()
+            except:
+                pass
     except KeyError:
         pass
 

rowers/views/racesviews.py

@@ -2615,14 +2615,6 @@ def indoorvirtualevent_create_view(request):
 
             vs.save()
 
-            # create Site Announcement & Tweet
-            if settings.DEBUG or settings.TESTING:
-                dotweet = False
-            elif 'dev' in settings.SITE_URL:  # pragma: no cover
-                dotweet = False
-            else:  # pragma: no cover
-                dotweet = True
-
             announcementshort = "New Virtual Indoor Challenge on rowsandall.com: {name}".format(
                 name=name,
             )
@@ -2637,7 +2629,6 @@ def indoorvirtualevent_create_view(request):
 
             sa = SiteAnnouncement(
                 announcement=announcement,
-                dotweet=dotweet
             )
 
             sa.save()
@@ -2763,14 +2754,6 @@ def fastestvirtualevent_create_view(request):
 
             vs.save()
 
-            # create Site Announcement & Tweet
-            if settings.DEBUG or settings.TESTING:
-                dotweet = False
-            elif 'dev' in settings.SITE_URL:  # pragma: no cover
-                dotweet = False
-            else:  # pragma: no cover
-                dotweet = True
-
             announcementshort = "New Virtual Challenge on rowsandall.com: {name}".format(
                 name=name,
             )
@@ -2785,7 +2768,6 @@ def fastestvirtualevent_create_view(request):
 
             sa = SiteAnnouncement(
                 announcement=announcement,
-                dotweet=dotweet
             )
 
             sa.save()
@@ -2896,14 +2878,6 @@ def virtualevent_create_view(request):
 
             vs.save()
 
-            # create Site Announcement & Tweet
-            if settings.DEBUG or settings.TESTING:
-                dotweet = False
-            elif 'dev' in settings.SITE_URL:  # pragma: no cover
-                dotweet = False
-            else:  # pragma: no cover
-                dotweet = True
-
             announcementshort = "New Virtual Challenge on rowsandall.com: {name} on course {course}".format(
                 name=name,
                 course=course.name,
@@ -2919,7 +2893,6 @@ def virtualevent_create_view(request):
 
             sa = SiteAnnouncement(
                 announcement=announcement,
-                dotweet=dotweet
             )
 
             sa.save()