reddark - interpret oliver or archived as restricted

diff --git a/modules/reddark.py b/modules/reddark.py
index a1ea26f653c87bbde44ba494f2b9448018b5a515..004efd51974580370f13d2355782c4bae760654d 100644 (file)
--- a/modules/reddark.py
+++ b/modules/reddark.py
@@ -70,10 +70,10 @@ def getText(subreddit):
        except Exception as e2:
                e = e2
        if r is None:
-               debug("Error getting text: " + repr(e))
+               debug("Error getting text: " + repr(e), False)
                return ''
        if r.status_code != 403:
-               debug("Error getting text: " + str(r.status_code) + " (403 expected)")
+               debug("Error getting text: " + str(r.status_code) + " (403 expected)", False)
                return ''
        soup = BeautifulSoup(r.text, 'html.parser')
        elements = soup.find_all(class_='interstitial-subreddit-description')
@@ -90,10 +90,10 @@ def handleDelta(message):
                message['text'] = getText(message['name'])
                print(repr(message))
                chanmsg('[%(section)s] %(name)s went %(state)s (was: %(previous_state)s) (https://old.reddit.com/%(name)s)%(text)s' % message)
-       elif message['state'] == 'restricted':
-               chanmsg('[%(section)s] %(name)s went %(state)s (was: %(previous_state)s) (https://old.reddit.com/%(name)s)' % message)
-       else:
+       elif message['state'] == 'public':
                chanmsg('[%(section)s] %(name)s went \x02%(state)s\x02 (was: %(previous_state)s) (https://old.reddit.com/%(name)s)' % message)
+       else:
+               chanmsg('[%(section)s] %(name)s went %(state)s (was: %(previous_state)s) (https://old.reddit.com/%(name)s)' % message)
 
 def handleState(message):
        global last_update, last_topic
@@ -105,11 +105,11 @@ def handleState(message):
                if sub['state'] == 'PRIVATE':
                        output['privateSubs'] += 1
                        output['protestingSubs'] += 1
-               elif sub['state'] == 'RESTRICTED':
-                       output['restrictedSubs'] += 1
-                       output['protestingSubs'] += 1
                elif sub['state'] == 'PUBLIC':
                        output['publicSubs'] += 1
+               else:
+                       output['restrictedSubs'] += 1
+                       output['protestingSubs'] += 1
        output['pct'] = round(output['protestingSubs']/output['totalSubs']*100, 2)
        output['pctPublic'] = round(output['publicSubs']/output['totalSubs']*100, 2)
        output['pctPrivate'] = round(output['privateSubs']/output['totalSubs']*100, 2)