cleanup

app.py

@@ -8,8 +8,11 @@ from slack_sdk.errors import SlackApiError
 
 DISCORD_TOKEN = os.getenv('DISCORD_TOKEN')
 SLACK_BOT_TOKEN = os.getenv('BOT_USER_OAUTH_TOKEN_HF')
-SLACK_CHANNEL_ID = os.getenv('SLACK_CHANNEL_ID_HF')
-SLACK_CHANNEL_ID_TEST = 'C07B4KNU5BQ'
+
+# real = os.getenv('SLACK_CHANNEL_ID_HF')
+# test = 'C07B4KNU5BQ'
+SLACK_CHANNEL_ID = 'C07B4KNU5BQ'
+
 
 TRIGGERS = {
     "discord bot": "<@U051DB2754M>", # Adam
@@ -44,8 +47,11 @@ bot = commands.Bot(command_prefix='!', intents=intents)
 slack_client = WebClient(token=SLACK_BOT_TOKEN)
 
 thread_mapping = {}
+# 1259415803879751700    = test forum
+# 1019883044724822016    = ask for help
 FORUM_CHANNEL_ID = 1259415803879751700
 
+
 @bot.event
 async def on_ready():
     print(f'Logged in as {bot.user}')
@@ -66,31 +72,28 @@ async def on_message(message):
                     await post_to_slack(message.author, message.content, message.channel.name, message.jump_url, slack_mention, trigger)
                     break
 
-
-
-
     # Check if the message is in a thread
     if isinstance(message.channel, discord.Thread):
         discord_thread_id = message.channel.id
 
         # Check if there's an existing Slack thread for this Discord thread
+        # (the only Slack threads created should be for forum channel threads, not just any thread)
         if discord_thread_id in thread_mapping:
             slack_thread_ts = thread_mapping[discord_thread_id]
-        else:
-            # If not, create a new Slack thread and update the mapping
-            slack_thread_ts = post_to_slack_forum_version('#discord-slackbot-test', f"Thread started: {message.channel.name}")
-            if slack_thread_ts:
-                thread_mapping[discord_thread_id] = slack_thread_ts
-
-        # Post the message to the existing Slack thread
-        post_to_slack_forum_version('#discord-slackbot-test', message.content, thread_ts=slack_thread_ts)
+            # post to slack only if thread already exists
+            post_to_slack_forum_version(SLACK_CHANNEL_ID, message.content, thread_ts=slack_thread_ts)
 
 
 @bot.event
 async def on_thread_create(thread):
+    # (discord) must be the child thread of the CORRECT forum channel(s) (not just any thread, or any forum channel)
     if isinstance(thread.parent, discord.ForumChannel) and thread.parent.id == FORUM_CHANNEL_ID:
         discord_thread_id = thread.id
-        slack_thread_ts = post_to_slack_forum_version('#discord-slackbot-test', f"New forum thread started: {thread.name}")
+        slack_thread_ts = post_to_slack_forum_version(
+            SLACK_CHANNEL_ID,
+            f"New forum thread started in #ask-for-help by {thread.owner}: *{thread.name}*\n"
+            f"{thread.jump_url}"
+        )
         if slack_thread_ts:
             thread_mapping[discord_thread_id] = slack_thread_ts
 
@@ -106,10 +109,6 @@ def post_to_slack_forum_version(channel, text, thread_ts=None):
     except SlackApiError as e:
         print(f"Error posting to Slack: {e.response['error']}")
         return None
-
-
-
-
     #----------------------------------------------------------------------------------------------