Fix deleted changes that were introduced by analysis merge

ConTroll.py

@@ -1,10 +1,10 @@
 from flask import Flask
 from flask import g, session, request, url_for, flash
 from flask import redirect, render_template
-import keys
+from keys import userBlacklist
 from twitter_auth import twitterBlueprint, twitter
 from flask_oauthlib.client import OAuth
-
+from trollchecker import is_tweet_troll
 app = Flask(__name__)
 app.debug = True
 app.secret_key = 'development'
@@ -16,33 +16,10 @@
 def getTroll(inTweet):
     # restricting our blocks to a single twitter account during testing
     if inTweet['user']['screen_name'] in userBlacklist:
-        return is_troll(inTweet['text'])
+        return is_tweet_troll(inTweet['text'])
     else:
         return False
 
-twitter = oauth.remote_app(
-    'twitter',
-    consumer_key=keys.CONSUMER_KEY,
-    consumer_secret=keys.CONSUMER_SECRET,
-    base_url="https://api.twitter.com/1.1/",
-    request_token_url='https://api.twitter.com/oauth/request_token',
-    access_token_url='https://api.twitter.com/oauth/access_token',
-    authorize_url='https://api.twitter.com/oauth/authenticate',
-)
-
-@twitter.tokengetter
-def get_twitter_token():
-    if 'twitter_oauth' in session:
-        resp = session['twitter_oauth']
-        return resp['oauth_token'], resp['oauth_token_secret']
-
-@app.before_request
-def before_request():
-    g.user = None
-    if 'twitter_oauth' in session:
-        g.user = session['twitter_oauth']
-
-
 @app.route('/')
 def index():
     tweets = None
@@ -56,30 +33,6 @@ def index():
             flash('Unable to load tweets from Twitter.')
     return render_template('index.html', tweets=tweets)
 
-
-@app.route('/tweet', methods=['POST'])
-def tweet():
-    if g.user is None:
-        return redirect(url_for('login', next=request.url))
-    status = request.form['tweet']
-    if not status:
-        return redirect(url_for('index'))
-    resp = twitter.post('statuses/update.json', data={
-        'status': status
-    })
-
-    if resp.status == 403:
-        flash("Error: #%d, %s " % (
-            resp.data.get('errors')[0].get('code'),
-            resp.data.get('errors')[0].get('message'))
-        )
-    elif resp.status == 401:
-        flash('Authorization error with Twitter.')
-    else:
-        flash('Successfully tweeted your tweet (ID: #%s)' % resp.data['id'])
-    return redirect(url_for('index'))
-
-
 @app.route('/login')
 def login():
     callback_url = url_for('oauthorized', next=request.args.get('next'))
@@ -91,15 +44,11 @@ def logout():
     session.pop('twitter_oauth', None)
     return redirect(url_for('index'))
 
-
-@app.route('/oauthorized')
-def oauthorized():
-    resp = twitter.authorized_response()
-    if resp is None:
-        flash('You denied the request to sign in.')
-    else:
-        session['twitter_oauth'] = resp
-    return redirect(url_for('index'))
+@app.before_request
+def before_request():
+    g.user = None
+    if 'twitter_oauth' in session:
+        g.user = session['twitter_oauth']
 
 @app.route('/block', methods=['GET'])
 def block():

twitter_auth.py

@@ -0,0 +1,46 @@
+# module for setting up authentication with Twitter
+from flask import g, session, request, url_for, flash
+from flask import redirect, Blueprint
+
+import keys
+from flask_oauthlib.client import OAuth
+
+twitterBlueprint = Blueprint('twitter_auth', __name__)
+oauth = OAuth(twitterBlueprint)
+
+twitter = oauth.remote_app(
+    'twitter',
+    consumer_key=keys.CONSUMER_KEY,
+    consumer_secret=keys.CONSUMER_SECRET,
+    base_url="https://api.twitter.com/1.1/",
+    request_token_url='https://api.twitter.com/oauth/request_token',
+    access_token_url='https://api.twitter.com/oauth/access_token',
+    authorize_url='https://api.twitter.com/oauth/authenticate',
+)
+
+@twitter.tokengetter
+def get_twitter_token():
+    if 'twitter_oauth' in session:
+        resp = session['twitter_oauth']
+        return resp['oauth_token'], resp['oauth_token_secret']
+
+@twitterBlueprint.route('/login')
+def login():
+    callback_url = url_for('twitter_auth.oauthorized', next=request.args.get('next'))
+    return twitter.authorize(callback=callback_url or request.referrer or None)
+
+
+@twitterBlueprint.route('/logout')
+def logout():
+    session.pop('twitter_oauth', None)
+    return redirect(url_for('index'))
+
+
+@twitterBlueprint.route('/oauthorized')
+def oauthorized():
+    resp = twitter.authorized_response()
+    if resp is None:
+        flash('You denied the request to sign in.')
+    else:
+        session['twitter_oauth'] = resp
+    return redirect(url_for('index'))