Merge pull request #58 from OperationCode/staging

Env var cleanup

Author: apex-omontgomery

.gitignore

@@ -2,4 +2,118 @@
 *.env
 .pytest_cache
 !/docker/example.env
-*/__pycache__
+
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pyenv
+.python-version
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/

pybot/__main__.py

@@ -11,11 +11,9 @@
 
 from . import endpoints
 from .plugins import AirtablePlugin
+from pybot.endpoints.slack.utils import PORT, HOST
+from pybot.endpoints.slack.utils import slack_configs
 
-PORT = os.environ.get("SIRBOT_PORT", 5000)
-HOST = os.environ.get("SIRBOT_ADDR", "0.0.0.0")
-ACCESS_TOKEN = os.environ.get("OAUTH_ACCESS_TOKEN", "access token")
-VERIFICATION_TOKEN = os.environ.get("VERIFICATION_TOKEN ", "verification token")
 VERSION = "0.1.0"
 logger = logging.getLogger(__name__)
 

pybot/endpoints/airtable/utils.py

@@ -7,11 +7,9 @@
 from slack.exceptions import SlackAPIError
 from slack.io.aiohttp import SlackAPI
 from pybot.plugins.airtable.api import AirtableAPI
+from pybot.endpoints.slack.utils import MENTOR_CHANNEL
 from .message_templates.messages import claim_mentee_attachment, mentor_request_text
 
-MENTORS_CHANNEL = os.environ.get("MENTORS_CHANNEL") or "G1DRT62UC"
-
-
 async def _get_requested_mentor(requested_mentor: Optional[str], slack: SlackAPI,
                                 airtable: AirtableAPI) -> Optional[str]:
     try:
@@ -49,17 +47,17 @@ def _create_messages(mentors: List[str], request: dict, requested_mentor_message
         'text': mentor_request_text(slack_id, service_translation, request.get('skillsets', None),
                                     requested_mentor_message),
         'attachments': claim_mentee_attachment(request['record']),
-        'channel': MENTORS_CHANNEL
+        'channel': MENTOR_CHANNEL
     }
 
     details_message = {
         'text': f"Additional details: {request.get('details', 'None Given')}",
-        'channel': MENTORS_CHANNEL
+        'channel': MENTOR_CHANNEL
     }
 
     matching_mentors_message = {
         'text': "Mentors matching all or some of the requested skillsets: " + ' '.join(mentors),
-        'channel': MENTORS_CHANNEL
+        'channel': MENTOR_CHANNEL
     }
 
     return first_message, details_message, matching_mentors_message

pybot/endpoints/slack/actions.py

@@ -6,7 +6,7 @@
 from slack.actions import Action
 
 from pybot.endpoints.slack.utils.action_messages import *
-from pybot.endpoints.slack.utils import COMMUNITY_CHANNEL
+from pybot.endpoints.slack.utils import COMMUNITY_CHANNEL, TICKET_CHANNEL
 
 logger = logging.getLogger(__name__)
 
@@ -48,7 +48,7 @@ async def open_ticket(action: Action, app: SirBot):
     """
     attachments = ticket_attachments(action)
     response = {
-        'channel': MODERATOR_CHANNEL,
+        'channel': TICKET_CHANNEL,
         'attachments': attachments,
         'text': 'New Ticket Submission',
     }

pybot/endpoints/slack/utils/__init__.py

@@ -4,10 +4,21 @@
 
 load_dotenv()
 
+MENTOR_CHANNEL = os.environ.get("MENTOR_CHANNEL") or "G1DRT62UC"
 COMMUNITY_CHANNEL = os.environ.get("COMMUNITY_CHANNEL") or "G12343"
-MODERATOR_CHANNEL = os.environ.get('REPORT_CHANNEL') or 'G8NDRJJF9'
+MODERATOR_CHANNEL = os.environ.get('MODERATOR_CHANNEL') or 'G8NDRJJF9'
+TICKET_CHANNEL = os.environ.get('TICKET_CHANNEL') or 'G8NDRJJF9'
 APP_TOKEN = os.environ.get('APP_TOKEN') or "123"
 YELP_TOKEN = os.environ.get('YELP_TOKEN') or 'token'
 PYBACK_HOST = os.environ.get('PYBACK_HOST') or 'pyback'
 PYBACK_PORT = os.environ.get('PYBACK_PORT') or 8000
 PYBACK_TOKEN = os.environ.get('PYBACK_TOKEN') or 'token'
+PORT = os.environ.get("SIRBOT_PORT", 5000)
+HOST = os.environ.get("SIRBOT_ADDR", "0.0.0.0")
+
+slack_configs = {
+    'token': os.environ.get('BOT_OATH_TOKEN'),
+    'verify': os.environ.get('VERIFICATION_TOKEN'),
+    'bot_id': os.environ.get('SLACK_BOT_ID'),
+    'bot_user_id': os.environ.get('SLACK_BOT_ID'),
+}