fix some dumb mistakes

Charcoal-SE · Jan 11, 2015 · 3961a47 · 3961a47
1 parent 21f2066
commit 3961a47
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 2 deletions.
diff --git a/bodyfetcher.py b/bodyfetcher.py
@@ -56,6 +56,6 @@ def makeApiCallForSite(self, site):
                         for specialroom in GlobalVars.specialrooms:
                             sites = specialroom["sites"]
                             if site in sites and reason not in specialroom["unwantedReasons"]:
-                                # specialroom["room"].send_message(s)
+                                specialroom["room"].send_message(s)
                 except:
                     print "NOP"
diff --git a/findspam.py b/findspam.py
@@ -4,7 +4,6 @@
 
 class FindSpam:
     rules = [
-<<<<<<< HEAD
      {'regex': u"(?i)\\b(baba(ji)?|nike|vashi?k[ae]r[ae]n|sumer|kolcak|porn|molvi|judi bola|ituBola.com|lost lover|11s|acai|skin care|LifeForce|swtor2credits|me2.do|black magic|bam2u|Neuro(3X|flexyn)|Nutra|TesteroneXL|Bowtrol|Slim ?Genix|Cleanse EFX|Babyliss ?Pro|Forskolin|Blackline Elite|TestCore Pro|Xtreme Antler|Maxx Test 3000|Cheap Wigs?|(Improve )?Brain Power|aging skin|acne( prone)? skin|(skin )?eye serum|skin (serum|eye)|fake (passports?|driver'?s? licen[cs]e|ID cards?)|bagprada)\\b|ಌ|(support|service|helpline)( phone)? number|1[ -]?866[ -]?978[ -]?6819", 'all': True,
         'sites': [], 'reason': "Bad keyword in {}", 'title': True, 'body': True, 'username': True},
      {'regex': u"(?i)\\b(weight (loo?s[es]|reduction)|muscles? build(ing)?|muscles?( (grow(th)?|diets?))?|anti aging|SkinCentric|loo?s[es] weight|wrinkles?)\\b", 'all': True,