Merge branch 'staging'

# Conflicts:
#	pybot/endpoints/slack/actions.py
#	pybot/endpoints/slack/utils/action_messages.py

Author: AllenAnthes

.gitignore

@@ -19,7 +19,6 @@ dist/
 downloads/
 eggs/
 .eggs/
-lib/
 lib64/
 parts/
 sdist/

Pipfile.lock

@@ -14,16 +14,9 @@
 from pybot.endpoints.slack.utils import PORT, HOST
 from pybot.endpoints.slack.utils import slack_configs
 
-VERSION = "0.1.0"
+VERSION = "0.2.0"
 logger = logging.getLogger(__name__)
 
-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'),
-}
-
 
 def make_sentry_logger():
     client = raven.Client(

pybot/__main__.py

@@ -25,7 +25,7 @@ async def mentor_request(request: dict, app: SirBot) -> None:
     id_fallback = f" [couldn't find user - email provided: {request['email']} ]"
     slack_id = await _slack_user_id_from_email(request['email'], slack, fallback=id_fallback)
 
-    futures = [app.plugins['airtable'].api.translate_service_id(request['service']),
+    futures = [airtable.get_name_from_record_id('Services', request['service']),
                _get_requested_mentor(request.get('requested_mentor'), slack, airtable),
                _get_matching_skillset_mentors(request.get('skillsets'), slack, airtable)]
 

pybot/endpoints/airtable/requests.py

@@ -1,4 +1,3 @@
-import os
 from typing import List, Optional, Tuple
 
 from sirbot import SirBot
@@ -10,12 +9,13 @@
 from pybot.endpoints.slack.utils import MENTOR_CHANNEL
 from .message_templates.messages import claim_mentee_attachment, mentor_request_text
 
+
 async def _get_requested_mentor(requested_mentor: Optional[str], slack: SlackAPI,
                                 airtable: AirtableAPI) -> Optional[str]:
     try:
         if not requested_mentor:
             return None
-        mentor = await airtable.get_mentor_from_record_id(requested_mentor)
+        mentor = await airtable.get_row_from_record_id('Mentors', requested_mentor)
         email = mentor['Email']
         slack_user_id = await _slack_user_id_from_email(email, slack)
         return f" Requested mentor: <@{slack_user_id}>"

pybot/endpoints/airtable/utils.py

@@ -1,222 +0,0 @@
-import logging
-from pprint import pprint
-
-from sirbot import SirBot
-from slack import methods
-from slack.actions import Action
-
-from pybot.endpoints.slack.utils.action_messages import *
-from pybot.endpoints.slack.utils import COMMUNITY_CHANNEL, TICKET_CHANNEL
-
-logger = logging.getLogger(__name__)
-
-
-def create_endpoints(plugin):
-    plugin.on_action("resource_buttons", resource_buttons, wait=False)
-    plugin.on_action("greeted", member_greeted, name='greeted', wait=False)
-    plugin.on_action("greeted", reset_greet, name='reset_greet', wait=False)
-    plugin.on_action("suggestion", open_suggestion, wait=False)
-    plugin.on_action("suggestion_modal", post_suggestion, wait=False)
-    plugin.on_action("claim_mentee", claim_mentee, wait=False)
-    plugin.on_action("reset_claim_mentee", claim_mentee, wait=False)
-    plugin.on_action("claimed", claimed, name='claimed', wait=False)
-    plugin.on_action("claimed", reset_claim, name='reset_claim', wait=False)
-    plugin.on_action("report_message", open_report_dialog, wait=False)
-    plugin.on_action("report_dialog", send_report, wait=False)
-    plugin.on_action("open_ticket", open_ticket, wait=False)
-    plugin.on_action("ticket_status", ticket_status, wait=False)
-
-
-async def ticket_status(action: Action, app: SirBot):
-    """
-    Updates the ticket status dropdown. (I don't know why we need to manually
-    update the message for this..)
-    """
-    slack = app.plugins["slack"].api
-
-    response, selected_option = updated_ticket_status(action)
-    update_message = update_ticket_message(action, selected_option['text'])
-
-    await slack.query(methods.CHAT_UPDATE, response)
-    await slack.query(methods.CHAT_POST_MESSAGE, update_message)
-
-
-async def open_ticket(action: Action, app: SirBot):
-    """
-    Called when a user submits the ticket dialog.  Parses the submission and posts
-    the new ticket details to the required channel
-    """
-    attachments = ticket_attachments(action)
-    response = {
-        'channel': TICKET_CHANNEL,
-        'attachments': attachments,
-        'text': 'New Ticket Submission',
-    }
-
-    await app["plugins"]["slack"].api.query(methods.CHAT_POST_MESSAGE, response)
-
-
-async def send_report(action: Action, app: SirBot):
-    """
-    Called when a user submits the report dialog.  Pulls the original message
-    info from the state and posts the details to the moderators channel
-    """
-    slack_id = action['user']['id']
-    details = action['submission']['details']
-    message_details = json.loads(action.action['state'])
-
-    response = build_report_message(slack_id, details, message_details)
-
-    await app["plugins"]["slack"].api.query(methods.CHAT_POST_MESSAGE, response)
-
-
-async def open_report_dialog(action: Action, app: SirBot):
-    """
-    Opens the message reporting dialog for the user to provide details.
-
-    Adds the message that they're reporting to the dialog's hidden state
-    to be pulled out when submitted.
-    """
-    trigger_id = action['trigger_id']
-    response = {
-        'trigger_id': trigger_id,
-        'dialog': report_dialog(action),
-    }
-    await app.plugins["slack"].api.query(methods.DIALOG_OPEN, response)
-
-
-async def resource_buttons(action: Action, app: SirBot):
-    """
-    Edits the resource message with the clicked on resource
-    """
-    name = action['actions'][0]['name']
-
-    response = base_response(action)
-    response['text'] = HELP_MENU_RESPONSES[name]
-
-    await app.plugins["slack"].api.query(methods.CHAT_UPDATE, response)
-
-
-async def open_suggestion(action: Action, app: SirBot):
-    """
-    Opens the suggestion modal when the user clicks on the "Are we missing something?" button
-    """
-    trigger_id = action['trigger_id']
-    response = {
-        'trigger_id': trigger_id,
-        'dialog': suggestion_dialog(trigger_id)
-    }
-
-    await app.plugins["slack"].api.query(methods.DIALOG_OPEN, response)
-
-
-async def post_suggestion(action: Action, app: SirBot):
-    """
-    Posts a suggestion supplied by the suggestion modal to the community channel
-    """
-    suggesting_user = action['user']['id']
-    suggestion = action['submission']['suggestion']
-
-    response = {
-        'text': new_suggestion_text(suggesting_user, suggestion),
-        'channel': COMMUNITY_CHANNEL
-    }
-
-    await app.plugins["slack"].api.query(methods.CHAT_POST_MESSAGE, response)
-
-
-async def member_greeted(action: Action, app: SirBot):
-    """
-    Called when a community member clicks the button saying they greeted the new member
-    """
-    response = base_response(action)
-    user_id = action['user']['id']
-    response['attachments'] = greeted_attachment(user_id)
-
-    await app.plugins["slack"].api.query(methods.CHAT_UPDATE, response)
-
-
-async def reset_greet(action: Action, app: SirBot):
-    """
-    Resets the claim greet button back to its initial state and appends the user that hit reset and the time
-    """
-    response = base_response(action)
-    response['attachments'] = not_greeted_attachment()
-    response['attachments'][0]['text'] = reset_greet_message(action['user']['id'])
-
-    await app.plugins["slack"].api.query(methods.CHAT_UPDATE, response)
-
-
-async def claimed(action: Action, app: SirBot):
-    """
-    Provides basic "claim" functionality for use-cases that don't have any other effects.
-
-    Simply updates the button to allow resets and displays the user and time it was clicked.
-    """
-    response = base_response(action)
-    user_id = action['user']['id']
-
-    attachments = action['original_message']['attachments']
-
-    for index, attachment in enumerate(attachments):
-        if 'callback_id' in attachment and attachment['callback_id'] == 'claimed':
-            attachments[index] = claimed_attachment(user_id)
-    response['attachments'] = attachments
-
-    await app.plugins['slack'].api.query(methods.CHAT_UPDATE, response)
-
-
-async def reset_claim(action: Action, app: SirBot):
-    """
-    Provides basic "unclaim" functionality for use-cases that don't have any other effects.
-
-    Updates the button back to its initial state
-    """
-    response = base_response(action)
-
-    attachments = action['original_message']['attachments']
-    for index, attachment in enumerate(attachments):
-        if 'callback_id' in attachment and attachment['callback_id'] == 'claimed':
-            attachments[index] = not_claimed_attachment()
-
-    response['attachments'] = attachments
-    await app.plugins['slack'].api.query(methods.CHAT_UPDATE, response)
-
-
-async def claim_mentee(action: Action, app: SirBot):
-    """
-    Called when a mentor clicks on the button to claim a mentor request.
-
-    Attempts to update airtable with the new request status and updates the claim
-    button allowing it to be reset if needed.
-    """
-    try:
-        update_airtable = True
-        clicker_id = action['user']['id']
-        request_record = action['actions'][0]['name']
-        click_type = action['actions'][0]['value']
-
-        response = base_response(action)
-
-        user_info = await app.plugins['slack'].api.query(methods.USERS_INFO, dict(user=clicker_id))
-        clicker_email = user_info['user']['profile']['email']
-
-        if click_type == 'mentee_claimed':
-            mentor_id = await app.plugins['airtable'].api.mentor_id_from_slack_email(clicker_email)
-            if mentor_id:
-                attachment = mentee_claimed_attachment(clicker_id, request_record)
-            else:
-                update_airtable = False
-                attachment = action['original_message']['attachments']
-                attachment[0]['text'] = f":warning: <@{clicker_id}>'s slack Email not found in Mentor table. :warning:"
-        else:
-            mentor_id = ''
-            attachment = mentee_unclaimed_attachment(clicker_id, request_record)
-
-        response['attachments'] = attachment
-
-        await app.plugins['slack'].api.query(methods.CHAT_UPDATE, response)
-        if update_airtable:
-            await app.plugins['airtable'].api.update_request(request_record, mentor_id)
-    except Exception as ex:
-        print(ex)

pybot/endpoints/slack/actions.py

@@ -0,0 +1,44 @@
+from .general_actions import claimed, reset_claim
+from .help_ticket import open_ticket, ticket_status
+from .report_message import open_report_dialog, send_report
+from .mentor_request import mentor_request_submit, cancel_mentor_request, add_skillset, \
+    clear_skillsets, open_details_dialog, mentor_details_submit, claim_mentee, set_requested_mentor, set_requested_service, \
+    set_group
+from .new_member import member_greeted, open_suggestion, post_suggestion, reset_greet, resource_buttons
+
+
+def create_endpoints(plugin):
+    # simple actions that can be used in multiple scenarios
+    plugin.on_action("claimed", claimed, name='claimed', wait=False)
+    plugin.on_action("claimed", reset_claim, name='reset_claim', wait=False)
+
+    # new member interactive actions
+    plugin.on_action("resource_buttons", resource_buttons, wait=False)
+    plugin.on_action("greeted", member_greeted, name='greeted', wait=False)
+    plugin.on_action("greeted", reset_greet, name='reset_greet', wait=False)
+    plugin.on_action("suggestion", open_suggestion, wait=False)
+    plugin.on_action("suggestion_modal", post_suggestion, wait=False)
+
+    # reporting related interactive actions
+    plugin.on_action("report_message", open_report_dialog, wait=False)
+    plugin.on_action("report_dialog", send_report, wait=False)
+
+    # help ticket/request interactive actions
+    plugin.on_action("open_ticket", open_ticket, wait=False)
+    plugin.on_action("ticket_status", ticket_status, wait=False)
+
+    # mentorship related interactive actions
+    plugin.on_action("mentor_request_submit", mentor_request_submit, name='submit', wait=False)
+    plugin.on_action("mentor_request_submit", cancel_mentor_request, name='cancel', wait=False)
+
+    # plugin.on_action("mentor_request_update", mentor_request_update, wait=False)
+    plugin.on_action("mentor_request_update", add_skillset, name='skillset', wait=False)
+    plugin.on_action("mentor_request_update", clear_skillsets, name='clearSkills', wait=False)
+    plugin.on_action("mentor_request_update", open_details_dialog, name='addDetails', wait=False)
+    plugin.on_action("mentor_request_update", set_requested_mentor, name='mentor', wait=False)
+    plugin.on_action("mentor_request_update", set_requested_service, name='service', wait=False)
+    plugin.on_action("mentor_request_update", set_group, name='group', wait=False)
+
+    plugin.on_action("mentor_details_submit", mentor_details_submit, wait=False)
+    plugin.on_action("claim_mentee", claim_mentee, wait=False)
+    plugin.on_action("reset_claim_mentee", claim_mentee, wait=False)

pybot/endpoints/slack/actions/__init__.py

@@ -0,0 +1,41 @@
+from sirbot import SirBot
+from slack import methods
+from slack.actions import Action
+
+from pybot.endpoints.slack.utils.action_messages import claimed_attachment, base_response, not_claimed_attachment
+
+
+async def claimed(action: Action, app: SirBot):
+    """
+    Provides basic "claim" functionality for use-cases that don't have any other effects.
+
+    Simply updates the button to allow resets and displays the user and time it was clicked.
+    """
+    response = base_response(action)
+    user_id = action['user']['id']
+
+    attachments = action['original_message']['attachments']
+
+    for index, attachment in enumerate(attachments):
+        if attachment['callback_id'] == 'claimed':
+            attachments[index] = claimed_attachment(user_id)
+    response['attachments'] = attachments
+
+    await app.plugins['slack'].api.query(methods.CHAT_UPDATE, response)
+
+
+async def reset_claim(action: Action, app: SirBot):
+    """
+    Provides basic "unclaim" functionality for use-cases that don't have any other effects.
+
+    Updates the button back to its initial state
+    """
+    response = base_response(action)
+
+    attachments = action['original_message']['attachments']
+    for index, attachment in enumerate(attachments):
+        if attachment['callback_id'] == 'claimed':
+            attachments[index] = not_claimed_attachment()
+
+    response['attachments'] = attachments
+    await app.plugins['slack'].api.query(methods.CHAT_UPDATE, response)