Merge branch 'feature/ignore-pos' into develop

eve-n0rman · Apr 27, 2021 · dcb4a96 · dcb4a96
2 parents b7ac9bd + b042fc1
commit dcb4a96
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 1 deletion.
diff --git a/structurebot/config.py b/structurebot/config.py
@@ -11,6 +11,7 @@
     'TOO_SOON': datetime.timedelta(days=int(os.getenv('TOO_SOON', 3))),
     'CORPORATION_NAME': os.getenv('CORPORATION_NAME'),
     'SLACK_CHANNEL': os.getenv('SLACK_CHANNEL', None),
+    'IGNORE_POS': os.getenv('IGNORE_POS', False),
     'STRONT_HOURS': os.getenv('STRONT_HOURS', 12),
     'DEBUG': os.getenv('DEBUG', False),
     'DETONATION_WARNING': datetime.timedelta(days=os.getenv('DETONATION_WARNING', 1)),

diff --git a/structurebot/pos.py b/structurebot/pos.py
@@ -92,6 +92,8 @@ def from_name(self):
     def from_corp_name(corp_name, corp_assets=None):
         pos_mod_dict = {}
         pos_list = []
+        if CONFIG['IGNORE_POS']:
+            return pos_list
         corp_assets = corp_assets or Asset.from_entity_name(corp_name)
         assets = [a for a in corp_assets if Pos.is_pos_mod(a)]
         pos_mods = [m for m in assets if m.group.name != 'Control Tower']

diff --git a/tests/test_structures.py b/tests/test_structures.py
@@ -122,5 +122,5 @@ def test_inaccessible(self):
 
     def test_accessible(self):
         bravestar = citadels.Structure(1032110505696, type_id=35834)
-        self.assertEqual(str(bravestar), 'GE-8JV - Mothership Bellicose (1032110505696) - Keepstar')
+        self.assertEqual(str(bravestar), 'GE-8JV - Mothership Bellicose -R (1032110505696) - Keepstar')
         self.assertTrue(bravestar.accessible)