Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions deploy/templates/app/intbot.env.example
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,8 @@ DISCORD_BOT_CHANNEL_NAME="DISCORD_BOT_CHANNEL_NAME"

DISCORD_HELPDESK_CHANNEL_ID="DISCORD_HELPDESK_CHANNEL_ID"
DISCORD_HELPDESK_CHANNEL_NAME="DISCORD_HELPDESK_CHANNEL_NAME"
DISCORD_VOLUNTEERS_CHANNEL_ID="DISCORD_VOLUNTEERS_CHANNEL_ID"
DISCORD_VOLUNTEERS_CHANNEL_NAME="DISCORD_VOLUNTEERS_CHANNEL_NAME"
DISCORD_BILLING_CHANNEL_ID="DISCORD_BILLING_CHANNEL_ID"
DISCORD_BILLING_CHANNEL_NAME="DISCORD_BILLING_CHANNEL_NAME"
DISCORD_BILLING_CHANNEL_ID="DISCORD_BILLING_CHANNEL_ID"
Expand Down Expand Up @@ -54,6 +56,7 @@ GITHUB_EM_PROJECT_ID="GITHUB_EM_PROJECT_ID"
ZAMMAD_WEBHOOK_SECRET_TOKEN="zammad-shared-secret-goes-here"
ZAMMAD_GROUP_BILLING="zammad-billing-group-name-goes-here"
ZAMMAD_GROUP_HELPDESK="zammad-helpdesk-group-name-goes-here"
ZAMMAD_GROUP_VOLUNTEERS="zammad-volunteers-group-name-goes-here"
ZAMMAD_GROUP_PROGRAMME="zammad-programme-group-name-goes-here"
ZAMMAD_GROUP_FINAID="zammad-finaid-group-name-goes-here"
ZAMMAD_GROUP_SPONSORS="zammad-sponsors-group-name-goes-here"
Expand Down
5 changes: 5 additions & 0 deletions intbot/core/bot/channel_router.py
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ class Channels:
channel_id=settings.DISCORD_HELPDESK_CHANNEL_ID,
channel_name=settings.DISCORD_HELPDESK_CHANNEL_NAME,
)
volunteers_channel = DiscordChannel(
channel_id=settings.DISCORD_VOLUNTEERS_CHANNEL_ID,
channel_name=settings.DISCORD_VOLUNTEERS_CHANNEL_NAME,
)
programme_channel = DiscordChannel(
channel_id=settings.DISCORD_PROGRAMME_CHANNEL_ID,
channel_name=settings.DISCORD_PROGRAMME_CHANNEL_NAME,
Expand Down Expand Up @@ -131,6 +135,7 @@ def github_router(wh: Webhook) -> DiscordChannel:
def zammad_router(wh: Webhook) -> DiscordChannel:
groups = {
ZammadConfig.helpdesk_group: Channels.helpdesk_channel,
ZammadConfig.volunteers_group: Channels.volunteers_channel,
ZammadConfig.billing_group: Channels.billing_channel,
ZammadConfig.programme_group: Channels.programme_channel,
ZammadConfig.finaid_group: Channels.finaid_channel,
Expand Down
1 change: 1 addition & 0 deletions intbot/core/integrations/zammad.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ class ZammadConfig:
finaid_group = settings.ZAMMAD_GROUP_FINAID
sponsors_group = settings.ZAMMAD_GROUP_SPONSORS
grants_group = settings.ZAMMAD_GROUP_GRANTS
volunteers_group = settings.ZAMMAD_GROUP_VOLUNTEERS


class ZammadGroup(BaseModel):
Expand Down
3 changes: 3 additions & 0 deletions intbot/intbot/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,8 @@ def get(name) -> str:

DISCORD_HELPDESK_CHANNEL_ID = get("DISCORD_HELPDESK_CHANNEL_ID")
DISCORD_HELPDESK_CHANNEL_NAME = get("DISCORD_HELPDESK_CHANNEL_NAME")
DISCORD_VOLUNTEERS_CHANNEL_ID = get("DISCORD_VOLUNTEERS_CHANNEL_ID")
DISCORD_VOLUNTEERS_CHANNEL_NAME = get("DISCORD_VOLUNTEERS_CHANNEL_NAME")
DISCORD_BILLING_CHANNEL_ID = get("DISCORD_BILLING_CHANNEL_ID")
DISCORD_BILLING_CHANNEL_NAME = get("DISCORD_BILLING_CHANNEL_NAME")
DISCORD_PROGRAMME_CHANNEL_ID = get("DISCORD_PROGRAMME_CHANNEL_ID")
Expand Down Expand Up @@ -202,6 +204,7 @@ def get(name) -> str:
ZAMMAD_GROUP_FINAID = get("ZAMMAD_GROUP_FINAID")
ZAMMAD_GROUP_SPONSORS = get("ZAMMAD_GROUP_SPONSORS")
ZAMMAD_GROUP_GRANTS = get("ZAMMAD_GROUP_GRANTS")
ZAMMAD_GROUP_VOLUNTEERS = get("ZAMMAD_GROUP_VOLUNTEERS")

# Pretalx
PRETALX_API_TOKEN = get("PRETALX_API_TOKEN")
Expand Down