diff --git a/deploy/templates/app/intbot.env.example b/deploy/templates/app/intbot.env.example index 5046fdc..3205ea3 100644 --- a/deploy/templates/app/intbot.env.example +++ b/deploy/templates/app/intbot.env.example @@ -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" @@ -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" diff --git a/intbot/core/bot/channel_router.py b/intbot/core/bot/channel_router.py index 3209259..5ee6e63 100644 --- a/intbot/core/bot/channel_router.py +++ b/intbot/core/bot/channel_router.py @@ -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, @@ -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, diff --git a/intbot/core/integrations/zammad.py b/intbot/core/integrations/zammad.py index 732c545..ff83342 100644 --- a/intbot/core/integrations/zammad.py +++ b/intbot/core/integrations/zammad.py @@ -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): diff --git a/intbot/intbot/settings.py b/intbot/intbot/settings.py index 1550ea3..63cd3a7 100644 --- a/intbot/intbot/settings.py +++ b/intbot/intbot/settings.py @@ -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") @@ -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")