Cleanup

Author: bradchoate

.coveragerc

@@ -8,7 +8,6 @@ exclude_lines =
 
 omit =
     */lib/flyingcow/*
-    */lib/feathers/*
 
 [xml]
 output = coverage.xml

handlers/image.py

@@ -85,7 +85,6 @@ def get(self, share_key):
 
         sourcefile = sharedfile.sourcefile()
         sharedfile_owner = sharedfile.user()
-        owner_twitter_account = Externalservice.by_user(sharedfile_owner, Externalservice.TWITTER)
         comments = sharedfile.comments()
         view_count = sharedfile.livish_view_count()
         save_count = sharedfile.save_count
@@ -108,9 +107,6 @@ def get(self, share_key):
                 add_to_shakes.append(user_shake)
         can_add_to_shakes = (can_delete and len(add_to_shakes) > 0)
 
-        if owner_twitter_account:
-            owner_twitter_account = owner_twitter_account.screen_name
-
         image_url = "/r/%s" % (sharedfile.share_key)
         if options.debug:
             file_path =  "originals/%s" % (sourcefile.file_key)
@@ -131,7 +127,6 @@ def get(self, share_key):
             sourcefile=sourcefile, in_these_shakes=in_these_shakes, user_shakes=user_shakes,
             add_to_shakes=add_to_shakes, can_add_to_shakes=can_add_to_shakes,
             can_comment=can_comment,
-            owner_twitter_account=owner_twitter_account,
             user_is_owner=user_is_owner,
             og_width=og_width, og_height=og_height)
 

handlers/tools.py

@@ -189,59 +189,6 @@ def get(self):
         return self.render("tools/plugins.html")
 
 
-class ToolsTwitterHandler(BaseHandler):
-    @tornado.web.authenticated
-    @require_membership
-    def get(self):
-        return self.render("tools/twitter.html")
-
-
-class ToolsTwitterHowToHandler(BaseHandler):
-    @tornado.web.authenticated
-    @require_membership
-    def get(self):
-        return self.render("tools/twitter-how-to.html")
-
-
-class ToolsTwitterConnectHandler(BaseHandler, tornado.auth.TwitterMixin):
-    @tornado.web.authenticated
-    @require_membership
-    async def get(self):
-        if self.get_argument("oauth_token", None):
-            self.get_authenticated_user(self._on_auth)
-            return
-        self.authorize_redirect(callback=self._on_redirect)
-
-    def _on_redirect(self):
-        pass
-
-    def _on_auth(self, user):
-        if not user:
-            raise tornado.web.HTTPError(500, "Twitter auth failed")
-
-        #is there an existing external account?
-        current_user = self.get_current_user()
-        authenticated_user = User.get("id=%s", current_user['id'])
-        existing = Externalservice.by_user(authenticated_user, Externalservice.TWITTER)
-        if existing:
-            existing.service_id = user['access_token']['user_id']
-            existing.service_secret = user['access_token']['secret']
-            existing.service_key = user['access_token']['key']
-            existing.screen_name = user['access_token']['screen_name']
-            existing.save()
-        else:
-            external_service = Externalservice(
-                                    user_id=authenticated_user.id,
-                                    service_id=user['access_token']['user_id'],
-                                    screen_name=user['access_token']['screen_name'],
-                                    type=Externalservice.TWITTER,
-                                    service_key=user['access_token']['key'],
-                                    service_secret=user['access_token']['secret'])
-            external_service.save()
-        # if not, insert credentials for this user
-        # if there is, update that account
-        return self.render("tools/twitter-connected.html")
-
 class BookmarkletPageHandler(BaseHandler):
     """Displays a page for a user to save the bookmarklet."""
 

lib/feathers/__init__.py

@@ -33,8 +33,6 @@ def app_settings(cls):
             "debug": options.debug,
             "cookie_secret": options.cookie_secret,
             "xsrf_cookies": options.xsrf_cookies,
-            "twitter_consumer_key": options.twitter_consumer_key,
-            "twitter_consumer_secret": options.twitter_consumer_secret,
 
             # invariant settings
             "login_url": "/sign-in",

main.py

@@ -49,10 +49,6 @@ def parse_dictionary(settings):
 define('aws_port', metavar="AWS_PORT", type=int, help="AWS Port", default=None)
 define('aws_secret', metavar="SECRET", help="Amazon API secret for S3 & Payments")
 define('aws_bucket', metavar="NAME", help="Name of Amazon S3 bucket to use")
-define('twitter_consumer_key', metavar='KEY', help="Twitter API consumer key")
-define('twitter_consumer_secret', metavar='SECRET', help="Twitter API consumer secret")
-define('twitter_access_key', metavar='KEY', help="Twitter API Access Key")
-define('twitter_access_secret', metavar='SECRET', help="Twitter API Access Secret")
 define('postmark_api_key', metavar='KEY', help="Postmark (postmarkapp.com) API key")
 define('recaptcha_site_key', metavar="KEY", help="Site key for reCAPTCHA v3")
 define('recaptcha_secret_key', metavar="SECRET", help="Secret key for reCAPTCHA v3")

mltshpoptions.py

@@ -71,8 +71,7 @@ def create_for_email(self, email, user_id):
 
 Once you have your account set up, check out:
 https://%s/tools/plugins (browser plugins for saving images)
-https://%s/tools/twitter (connecting your phone's Twitter app to use MLTSHP instead of Twitpic or yFrog)
-https://twitter.com/mltshphq (our twitter account)
+https://mefi.social/@best_of_mltshp (our Mastodon account)
 https://mltshphq.tumblr.com/ (our blog)
 
 - MLTSHP""" % (sending_user.name, options.app_host, invitation_key, options.app_host, options.app_host)
@@ -89,8 +88,7 @@ def create_for_email(self, email, user_id):
 <p>Once you have your account set up, check out:</p>
 <p>
 <a href="https://%s/tools/plugins">https://%s/tools/plugins</a> (browser plugins for saving images)<br>
-<a href="https://%s/tools/twitter">https://%s/tools/twitter</a> (connecting your phone's Twitter app to use MLTSHP instead of Twitpic or yFrog)<br>
-<a href="https://twitter.com/mltshphq">https://twitter.com/mltshphq</a> (our twitter account)<br>
+<a href="https://mefi.social/@best_of_mltshp">https://mefi.social/@best_of_mltshp</a> (our Mastodon account)<br>
 <a href="https://mltshphq.tumblr.com/">https://mltshp.tumblr.com/</a> (our weblog)
 </p>
 <p>

models/invitation.py

@@ -86,8 +86,7 @@ def create_for_email(self, email, user_id):
 
 Once you have your account set up, check out:
 https://%s/tools/plugins (browser plugins for saving images)
-https://%s/tools/twitter (connecting your phone's Twitter app to use MLTSHP instead of Twitpic or yFrog)
-https://twitter.com/mltshphq (our twitter account)
+https://mefi.social/@best_of_mltshp (our Mastodon account)
 https://mltshp.tumblr.com/ (our blog)
 
 - MLTSHP""" % (sending_user.name, options.app_host, voucher_key, options.app_host, options.app_host)
@@ -104,8 +103,7 @@ def create_for_email(self, email, user_id):
 <p>Once you have your account set up, check out:</p>
 <p>
 <a href="https://%s/tools/plugins">https://%s/tools/plugins</a> (browser plugins for saving images)<br>
-<a href="https://%s/tools/twitter">https://%s/tools/twitter</a> (connecting your phone's Twitter app to use MLTSHP instead of Twitpic or yFrog)<br>
-<a href="https://twitter.com/mltshphq">https://twitter.com/mltshphq</a> (our twitter account)<br>
+<a href="https://mefi.social/@best_of_mltshp">https://mefi.social/@best_of_mltshp</a> (our Mastodon account)<br>
 <a href="https://mltshphq.tumblr.com/">https://mltshphq.tumblr.com/</a> (our blog)
 </p>
 <p>

models/voucher.py

@@ -231,9 +231,6 @@
 
     (r"/tools/p", handlers.tools.PickerPopupHandler),
     (r"/tools/plugins", handlers.tools.PluginsHandler),
-    (r"/tools/twitter", handlers.tools.ToolsTwitterHandler),
-    (r"/tools/twitter/connect", handlers.tools.ToolsTwitterConnectHandler),
-    (r"/tools/twitter/how-to", handlers.tools.ToolsTwitterHowToHandler),
     (r"/tools/new-post", handlers.tools.NewPostHandler),
     (r"/tools/save-video", handlers.tools.SaveVideoHandler),
     (r"/tools/bookmarklet", handlers.tools.BookmarkletPageHandler),

routes.py

@@ -51,9 +51,4 @@
     "debug_workers": True,
     "superuser_list": "admin",
     "tornado_logging": False,
-    # these must be set for testing test/unit/externalservice_tests.py
-    # "twitter_consumer_key" : "twitter_consumer_key_here",
-    # "twitter_consumer_secret" : "twitter_consumer_secret_key_here",
-    # "twitter_access_key" : "twitter_access_key_here",
-    # "twitter_access_secret" : "twitter_access_secret_here",
 }