C3L-NOC/spaceapi Changeset - 7bd5b62747f6 · Chaos Computer Club Lëtzebuerg Projects

Changeset - 7bd5b62747f6

Parent rev.

Child rev.

[Not reviewed]

default

0 1 0

Dennis Fink - 9 years ago 2016-10-25 19:36:24
dennis.fink@c3l.lu

Added some tweets and simplified the set_state

1 file changed with 15 insertions and 12 deletions:

spaceapi/utils.py

0 comments (0 inline, 0 general)

spaceapi/utils.py

➞

Show inline comments

@@ @@ -18,21 +18,24 @@ elif not os.path.isfile(default_json_fil @@
     raise RuntimeError('default.json is not a file!')
 possible_open_tweets = (
     'The space is now open!',
     'The space is open! Come in and hack something!',
     'Yes, we\'re open! Come in and create something!',
     'Come by and hack something! We\'ve just opened!',
     'The ChaosStuff is now open for everyone!',
+)
 possible_closed_tweets = (
     'The space is now closed!',
     'We\'re closed now! See you soon.',
     'Sorry, we are closed now!',
+)
-def send_tweet(tweet):
+def post_tweet(tweet):
     if 'TWITTER_CONSUMER_KEY' in current_app.config:
         auth = tweepy.OAuthHandler(
             current_app.config['TWITTER_CONSUMER_KEY'],
             current_app.config['TWITTER_CONSUMER_SECRET']
+        )
         auth.set_access_token(
@@ @@ -123,44 +126,44 @@ class ActiveStatus(Singleton, dict): @@
     def clear_user_present(self):
         self['sensors']['people_now_presents'][0]['value'] = 0
         if 'names' in self['sensors']['people_now_present'][0]:
             del self['sensors']['people_now_present'][0]['names']
     def set_new_state(self, value=None, trigger_person=None, message=None):
         if value is not None:
             if value != self['state']['open']:
                 self['state']['open'] = value
     def send_tweet(self, value):
                 tweet = random.choice(possible_open_tweets) if value else random.choice(possible_closed_tweets)
                 try:
-                    send_tweet(tweet)
+            post_tweet(tweet)
                 except Exception as e:
                     current_app.logger.error('Sending tweet failed! %s' % e,
                                              exc_info=True)
     def set_new_state(self, value=None, trigger_person=None, message=None):
         if value is not None and value != self['state']['open']:
             self['state']['open'] = value
             self.send_tweet(value)
                 if not value:
                     if 'people_now_present' in self['sensors']:
                         self.clear_user_present()
                     if 'message' in self['state']:
                         del self['state']['message']
                 if trigger_person is None:
                     del self['state']['trigger_person']
                 else:
                     self['state']['trigger_person'] = trigger_person
             self['state']['lastchange'] = int(time())
         if message is not None:
             self['state']['message'] = message
         if value is not None or message is not None:
             self['state']['lastchange'] = int(time())
 def request_wants_json():
     best = request.accept_mimetypes.best_match(
         ['application/json', 'text/html']
+    )
     return best == 'application/json' and \

0 comments (0 inline, 0 general)