fixes and tweet removal
This commit is contained in:
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user