generated from nhcarrigan/template
chore: lints
CI / dependency-pin-check-python (pull_request) Successful in 4s
CI / dependency-pin-check-typescript (pull_request) Successful in 4s
Security Scan and Upload / Security & DefectDojo Upload (pull_request) Successful in 55s
CI / python (pull_request) Successful in 9m25s
CI / typescript (pull_request) Successful in 9m46s
CI / dependency-pin-check-python (pull_request) Successful in 4s
CI / dependency-pin-check-typescript (pull_request) Successful in 4s
Security Scan and Upload / Security & DefectDojo Upload (pull_request) Successful in 55s
CI / python (pull_request) Successful in 9m25s
CI / typescript (pull_request) Successful in 9m46s
This commit is contained in:
@@ -6,10 +6,10 @@ import subprocess
|
|||||||
import time
|
import time
|
||||||
|
|
||||||
# Load team assignments and Discord to GitHub mappings
|
# Load team assignments and Discord to GitHub mappings
|
||||||
with open('team_assignments.json', 'r') as f:
|
with open("team_assignments.json") as f:
|
||||||
teams = json.load(f)
|
teams = json.load(f)
|
||||||
|
|
||||||
with open('discord_to_github.json', 'r') as f:
|
with open("discord_to_github.json") as f:
|
||||||
discord_to_github = json.load(f)
|
discord_to_github = json.load(f)
|
||||||
|
|
||||||
# Map team names to GitHub team slugs
|
# Map team names to GitHub team slugs
|
||||||
@@ -27,7 +27,7 @@ team_name_to_slug = {
|
|||||||
"Indigo Tulip": "indigo-tulip",
|
"Indigo Tulip": "indigo-tulip",
|
||||||
"Scarlet Hydrangea": "scarlet-hydrangea",
|
"Scarlet Hydrangea": "scarlet-hydrangea",
|
||||||
"Mint Narcissus": "mint-narcissus",
|
"Mint Narcissus": "mint-narcissus",
|
||||||
"Sage Marigold": "sage-marigold"
|
"Sage Marigold": "sage-marigold",
|
||||||
}
|
}
|
||||||
|
|
||||||
org = "nhcarrigan-spring-2026-cohort"
|
org = "nhcarrigan-spring-2026-cohort"
|
||||||
@@ -35,20 +35,30 @@ total_added = 0
|
|||||||
total_skipped = 0
|
total_skipped = 0
|
||||||
total_errors = 0
|
total_errors = 0
|
||||||
|
|
||||||
|
|
||||||
def add_user_to_team(username, team_slug, role="member"):
|
def add_user_to_team(username, team_slug, role="member"):
|
||||||
"""Add a user to a GitHub team"""
|
"""Add a user to a GitHub team"""
|
||||||
try:
|
try:
|
||||||
# Check if user is already a member
|
# Check if user is already a member
|
||||||
check_cmd = f"gh api orgs/{org}/teams/{team_slug}/memberships/{username} 2>/dev/null"
|
check_cmd = (
|
||||||
result = subprocess.run(check_cmd, shell=True, capture_output=True, text=True)
|
f"gh api orgs/{org}/teams/{team_slug}/memberships/{username} 2>/dev/null"
|
||||||
|
)
|
||||||
|
result = subprocess.run(
|
||||||
|
check_cmd, shell=True, capture_output=True, text=True, check=False
|
||||||
|
)
|
||||||
|
|
||||||
if result.returncode == 0:
|
if result.returncode == 0:
|
||||||
print(f" ✓ {username} is already in {team_slug}")
|
print(f" ✓ {username} is already in {team_slug}")
|
||||||
return "already_member"
|
return "already_member"
|
||||||
|
|
||||||
# Add user to team
|
# Add user to team
|
||||||
add_cmd = f"gh api -X PUT orgs/{org}/teams/{team_slug}/memberships/{username} -f role={role}"
|
add_cmd = (
|
||||||
result = subprocess.run(add_cmd, shell=True, capture_output=True, text=True)
|
f"gh api -X PUT orgs/{org}/teams/{team_slug}/memberships/{username} "
|
||||||
|
f"-f role={role}"
|
||||||
|
)
|
||||||
|
result = subprocess.run(
|
||||||
|
add_cmd, shell=True, capture_output=True, text=True, check=False
|
||||||
|
)
|
||||||
|
|
||||||
if result.returncode == 0:
|
if result.returncode == 0:
|
||||||
print(f" ✓ Added {username} to {team_slug} as {role}")
|
print(f" ✓ Added {username} to {team_slug} as {role}")
|
||||||
@@ -60,9 +70,10 @@ def add_user_to_team(username, team_slug, role="member"):
|
|||||||
print(f" ✗ Error adding {username} to {team_slug}: {str(e)}")
|
print(f" ✗ Error adding {username} to {team_slug}: {str(e)}")
|
||||||
return "error"
|
return "error"
|
||||||
|
|
||||||
|
|
||||||
# Process each team
|
# Process each team
|
||||||
for team_data in teams:
|
for team_data in teams:
|
||||||
team_name = team_data['name']
|
team_name = team_data["name"]
|
||||||
team_slug = team_name_to_slug[team_name]
|
team_slug = team_name_to_slug[team_name]
|
||||||
|
|
||||||
print(f"\n{'=' * 60}")
|
print(f"\n{'=' * 60}")
|
||||||
@@ -73,10 +84,13 @@ for team_data in teams:
|
|||||||
leaders_team_slug = f"{team_slug}-leaders"
|
leaders_team_slug = f"{team_slug}-leaders"
|
||||||
print(f"\nAdding leaders to {leaders_team_slug}:")
|
print(f"\nAdding leaders to {leaders_team_slug}:")
|
||||||
|
|
||||||
for discord_id in team_data['leaders']:
|
for discord_id in team_data["leaders"]:
|
||||||
github_username = discord_to_github.get(discord_id)
|
github_username = discord_to_github.get(discord_id)
|
||||||
if not github_username or github_username == "nhcarrigan-2025-hackathon":
|
if not github_username or github_username == "nhcarrigan-2025-hackathon":
|
||||||
print(f" ⚠ Skipping Discord ID {discord_id} - Missing/invalid GitHub username")
|
print(
|
||||||
|
f" ⚠ Skipping Discord ID {discord_id} - "
|
||||||
|
"Missing/invalid GitHub username"
|
||||||
|
)
|
||||||
total_skipped += 1
|
total_skipped += 1
|
||||||
continue
|
continue
|
||||||
|
|
||||||
@@ -92,10 +106,13 @@ for team_data in teams:
|
|||||||
# Add participants to main team
|
# Add participants to main team
|
||||||
print(f"\nAdding participants to {team_slug}:")
|
print(f"\nAdding participants to {team_slug}:")
|
||||||
|
|
||||||
for discord_id in team_data['participants']:
|
for discord_id in team_data["participants"]:
|
||||||
github_username = discord_to_github.get(discord_id)
|
github_username = discord_to_github.get(discord_id)
|
||||||
if not github_username or github_username == "nhcarrigan-2025-hackathon":
|
if not github_username or github_username == "nhcarrigan-2025-hackathon":
|
||||||
print(f" ⚠ Skipping Discord ID {discord_id} - Missing/invalid GitHub username")
|
print(
|
||||||
|
f" ⚠ Skipping Discord ID {discord_id} - "
|
||||||
|
"Missing/invalid GitHub username"
|
||||||
|
)
|
||||||
total_skipped += 1
|
total_skipped += 1
|
||||||
continue
|
continue
|
||||||
|
|
||||||
@@ -109,7 +126,7 @@ for team_data in teams:
|
|||||||
time.sleep(0.5)
|
time.sleep(0.5)
|
||||||
|
|
||||||
print(f"\n{'=' * 60}")
|
print(f"\n{'=' * 60}")
|
||||||
print(f"Summary:")
|
print("Summary:")
|
||||||
print(f"- Total users added: {total_added}")
|
print(f"- Total users added: {total_added}")
|
||||||
print(f"- Total users skipped (missing GitHub): {total_skipped}")
|
print(f"- Total users skipped (missing GitHub): {total_skipped}")
|
||||||
print(f"- Total errors: {total_errors}")
|
print(f"- Total errors: {total_errors}")
|
||||||
|
|||||||
@@ -1,13 +1,12 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
"""
|
"""Create private voice channels for each team in the specified category.
|
||||||
Create private voice channels for each team in the specified category.
|
|
||||||
Each channel will be visible and joinable only by the team's role.
|
Each channel will be visible and joinable only by the team's role.
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import json
|
|
||||||
import requests
|
|
||||||
import time
|
|
||||||
import os
|
import os
|
||||||
|
import time
|
||||||
|
|
||||||
|
import requests
|
||||||
|
|
||||||
# Discord configuration
|
# Discord configuration
|
||||||
BOT_TOKEN = os.environ["DISCORD_BOT_TOKEN"]
|
BOT_TOKEN = os.environ["DISCORD_BOT_TOKEN"]
|
||||||
@@ -33,10 +32,8 @@ TEAMS = {
|
|||||||
"Sage Marigold": {"role_id": "1464315153599299803"},
|
"Sage Marigold": {"role_id": "1464315153599299803"},
|
||||||
}
|
}
|
||||||
|
|
||||||
HEADERS = {
|
HEADERS = {"Authorization": f"Bot {BOT_TOKEN}", "Content-Type": "application/json"}
|
||||||
"Authorization": f"Bot {BOT_TOKEN}",
|
|
||||||
"Content-Type": "application/json"
|
|
||||||
}
|
|
||||||
|
|
||||||
def create_voice_channel(team_name, role_id):
|
def create_voice_channel(team_name, role_id):
|
||||||
"""Create a voice channel with specific permissions"""
|
"""Create a voice channel with specific permissions"""
|
||||||
@@ -50,14 +47,14 @@ def create_voice_channel(team_name, role_id):
|
|||||||
"id": GUILD_ID, # @everyone role ID is same as guild ID
|
"id": GUILD_ID, # @everyone role ID is same as guild ID
|
||||||
"type": 0, # Role type
|
"type": 0, # Role type
|
||||||
"deny": "1049600", # VIEW_CHANNEL (1 << 10) + CONNECT (1 << 20) = 1049600
|
"deny": "1049600", # VIEW_CHANNEL (1 << 10) + CONNECT (1 << 20) = 1049600
|
||||||
"allow": "0"
|
"allow": "0",
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"id": role_id, # Team role
|
"id": role_id, # Team role
|
||||||
"type": 0, # Role type
|
"type": 0, # Role type
|
||||||
"allow": "1049600", # VIEW_CHANNEL + CONNECT
|
"allow": "1049600", # VIEW_CHANNEL + CONNECT
|
||||||
"deny": "0"
|
"deny": "0",
|
||||||
}
|
},
|
||||||
]
|
]
|
||||||
|
|
||||||
data = {
|
data = {
|
||||||
@@ -67,7 +64,7 @@ def create_voice_channel(team_name, role_id):
|
|||||||
"permission_overwrites": permission_overwrites,
|
"permission_overwrites": permission_overwrites,
|
||||||
"user_limit": 0, # No user limit
|
"user_limit": 0, # No user limit
|
||||||
"bitrate": 64000, # 64 kbps
|
"bitrate": 64000, # 64 kbps
|
||||||
"rtc_region": None # Auto-select region
|
"rtc_region": None, # Auto-select region
|
||||||
}
|
}
|
||||||
|
|
||||||
response = requests.post(url, headers=HEADERS, json=data)
|
response = requests.post(url, headers=HEADERS, json=data)
|
||||||
@@ -82,9 +79,13 @@ def create_voice_channel(team_name, role_id):
|
|||||||
time.sleep(retry_after)
|
time.sleep(retry_after)
|
||||||
return create_voice_channel(team_name, role_id)
|
return create_voice_channel(team_name, role_id)
|
||||||
else:
|
else:
|
||||||
print(f"✗ Failed to create channel for {team_name}: {response.status_code} - {response.text}")
|
print(
|
||||||
|
f"✗ Failed to create channel for {team_name}: "
|
||||||
|
f"{response.status_code} - {response.text}"
|
||||||
|
)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
print(f"Creating private voice channels for {len(TEAMS)} teams...")
|
print(f"Creating private voice channels for {len(TEAMS)} teams...")
|
||||||
print(f"Category ID: {CATEGORY_ID}")
|
print(f"Category ID: {CATEGORY_ID}")
|
||||||
@@ -116,5 +117,6 @@ def main():
|
|||||||
print(" - Has no user limit")
|
print(" - Has no user limit")
|
||||||
print(" - Uses 64 kbps bitrate")
|
print(" - Uses 64 kbps bitrate")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
@@ -1,17 +1,15 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
"""
|
"""Discord Team Activity Checker
|
||||||
Discord Team Activity Checker
|
|
||||||
Checks for team members who haven't sent messages in their channels within 36 hours
|
Checks for team members who haven't sent messages in their channels within 36 hours
|
||||||
"""
|
"""
|
||||||
|
|
||||||
import asyncio
|
import asyncio
|
||||||
import aiohttp
|
|
||||||
from datetime import datetime, timezone, timedelta
|
|
||||||
from typing import Dict, List, Set
|
|
||||||
import json
|
import json
|
||||||
import time
|
|
||||||
import sys
|
|
||||||
import os
|
import os
|
||||||
|
import sys
|
||||||
|
from datetime import datetime, timedelta, timezone
|
||||||
|
|
||||||
|
import aiohttp
|
||||||
|
|
||||||
# Configuration
|
# Configuration
|
||||||
DISCORD_TOKEN = os.environ["DISCORD_BOT_TOKEN"]
|
DISCORD_TOKEN = os.environ["DISCORD_BOT_TOKEN"]
|
||||||
@@ -19,7 +17,7 @@ DISCORD_API_BASE = "https://discord.com/api/v10"
|
|||||||
INACTIVE_THRESHOLD_HOURS = 36
|
INACTIVE_THRESHOLD_HOURS = 36
|
||||||
|
|
||||||
# Load team assignments from file
|
# Load team assignments from file
|
||||||
with open("team_assignments.json", "r") as f:
|
with open("team_assignments.json") as f:
|
||||||
team_data = json.load(f)
|
team_data = json.load(f)
|
||||||
|
|
||||||
# Build TEAMS dictionary with channel IDs and member lists
|
# Build TEAMS dictionary with channel IDs and member lists
|
||||||
@@ -38,7 +36,7 @@ CHANNEL_IDS = {
|
|||||||
"Indigo Tulip": "1464316826384072925",
|
"Indigo Tulip": "1464316826384072925",
|
||||||
"Scarlet Hydrangea": "1464316839306985506",
|
"Scarlet Hydrangea": "1464316839306985506",
|
||||||
"Mint Narcissus": "1464316844251807952",
|
"Mint Narcissus": "1464316844251807952",
|
||||||
"Sage Marigold": "1464316850669093040"
|
"Sage Marigold": "1464316850669093040",
|
||||||
}
|
}
|
||||||
|
|
||||||
for team in team_data:
|
for team in team_data:
|
||||||
@@ -46,18 +44,21 @@ for team in team_data:
|
|||||||
if team_name in CHANNEL_IDS:
|
if team_name in CHANNEL_IDS:
|
||||||
TEAMS[team_name] = {
|
TEAMS[team_name] = {
|
||||||
"channel_id": CHANNEL_IDS[team_name],
|
"channel_id": CHANNEL_IDS[team_name],
|
||||||
"member_ids": team["leaders"] + team["participants"]
|
"member_ids": team["leaders"] + team["participants"],
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
class DiscordActivityChecker:
|
class DiscordActivityChecker:
|
||||||
def __init__(self, token: str):
|
def __init__(self, token: str):
|
||||||
self.token = token
|
self.token = token
|
||||||
self.headers = {
|
self.headers = {
|
||||||
"Authorization": f"Bot {token}",
|
"Authorization": f"Bot {token}",
|
||||||
"Content-Type": "application/json"
|
"Content-Type": "application/json",
|
||||||
}
|
}
|
||||||
self.session = None
|
self.session = None
|
||||||
self.cutoff_time = datetime.now(timezone.utc) - timedelta(hours=INACTIVE_THRESHOLD_HOURS)
|
self.cutoff_time = datetime.now(timezone.utc) - timedelta(
|
||||||
|
hours=INACTIVE_THRESHOLD_HOURS
|
||||||
|
)
|
||||||
|
|
||||||
async def __aenter__(self):
|
async def __aenter__(self):
|
||||||
self.session = aiohttp.ClientSession()
|
self.session = aiohttp.ClientSession()
|
||||||
@@ -67,7 +68,7 @@ class DiscordActivityChecker:
|
|||||||
if self.session:
|
if self.session:
|
||||||
await self.session.close()
|
await self.session.close()
|
||||||
|
|
||||||
async def get_user_info(self, user_id: str) -> Dict:
|
async def get_user_info(self, user_id: str) -> dict:
|
||||||
"""Get information about a specific user"""
|
"""Get information about a specific user"""
|
||||||
url = f"{DISCORD_API_BASE}/users/{user_id}"
|
url = f"{DISCORD_API_BASE}/users/{user_id}"
|
||||||
|
|
||||||
@@ -83,21 +84,26 @@ class DiscordActivityChecker:
|
|||||||
user_data = await response.json()
|
user_data = await response.json()
|
||||||
return user_data
|
return user_data
|
||||||
|
|
||||||
async def get_recent_message_authors(self, channel_id: str) -> Set[str]:
|
async def get_recent_message_authors(self, channel_id: str) -> set[str]:
|
||||||
"""Get user IDs of everyone who sent a message in the last 36 hours"""
|
"""Get user IDs of everyone who sent a message in the last 36 hours"""
|
||||||
url = f"{DISCORD_API_BASE}/channels/{channel_id}/messages?limit=100"
|
url = f"{DISCORD_API_BASE}/channels/{channel_id}/messages?limit=100"
|
||||||
active_users = set()
|
active_users = set()
|
||||||
|
|
||||||
async with self.session.get(url, headers=self.headers) as response:
|
async with self.session.get(url, headers=self.headers) as response:
|
||||||
if response.status != 200:
|
if response.status != 200:
|
||||||
print(f"Failed to get messages for channel {channel_id}: {response.status}")
|
print(
|
||||||
|
f"Failed to get messages for channel {channel_id}: "
|
||||||
|
f"{response.status}"
|
||||||
|
)
|
||||||
return active_users
|
return active_users
|
||||||
|
|
||||||
messages = await response.json()
|
messages = await response.json()
|
||||||
|
|
||||||
for message in messages:
|
for message in messages:
|
||||||
# Parse message timestamp
|
# Parse message timestamp
|
||||||
timestamp = datetime.fromisoformat(message["timestamp"].replace("Z", "+00:00"))
|
timestamp = datetime.fromisoformat(
|
||||||
|
message["timestamp"].replace("Z", "+00:00")
|
||||||
|
)
|
||||||
|
|
||||||
# If message is within our threshold, add the author
|
# If message is within our threshold, add the author
|
||||||
if timestamp > self.cutoff_time:
|
if timestamp > self.cutoff_time:
|
||||||
@@ -118,10 +124,15 @@ class DiscordActivityChecker:
|
|||||||
print(f"✅ Message sent to channel {channel_id}")
|
print(f"✅ Message sent to channel {channel_id}")
|
||||||
return True
|
return True
|
||||||
else:
|
else:
|
||||||
print(f"❌ Failed to send message to channel {channel_id}: {response.status}")
|
print(
|
||||||
|
f"❌ Failed to send message to channel {channel_id}: "
|
||||||
|
f"{response.status}"
|
||||||
|
)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
async def check_team_activity(self, team_name: str, channel_id: str, member_ids: List[str]) -> Dict:
|
async def check_team_activity(
|
||||||
|
self, team_name: str, channel_id: str, member_ids: list[str]
|
||||||
|
) -> dict:
|
||||||
"""Check activity for a specific team"""
|
"""Check activity for a specific team"""
|
||||||
print(f"Checking {team_name}...")
|
print(f"Checking {team_name}...")
|
||||||
|
|
||||||
@@ -142,28 +153,31 @@ class DiscordActivityChecker:
|
|||||||
total_members -= 1
|
total_members -= 1
|
||||||
continue
|
continue
|
||||||
|
|
||||||
inactive_members.append({
|
inactive_members.append(
|
||||||
"id": member_id,
|
{"id": member_id, "mention": f"<@{member_id}>"}
|
||||||
"mention": f"<@{member_id}>"
|
)
|
||||||
})
|
|
||||||
else:
|
else:
|
||||||
# If we can't get user info, still track them as inactive
|
# If we can't get user info, still track them as inactive
|
||||||
inactive_members.append({
|
inactive_members.append(
|
||||||
"id": member_id,
|
{"id": member_id, "mention": f"<@{member_id}>"}
|
||||||
"mention": f"<@{member_id}>"
|
)
|
||||||
})
|
|
||||||
|
|
||||||
return {
|
return {
|
||||||
"team": team_name,
|
"team": team_name,
|
||||||
"total_members": total_members,
|
"total_members": total_members,
|
||||||
"inactive_members": inactive_members,
|
"inactive_members": inactive_members,
|
||||||
"inactive_count": len(inactive_members)
|
"inactive_count": len(inactive_members),
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
async def main():
|
async def main():
|
||||||
"""Main function to check all teams"""
|
"""Main function to check all teams"""
|
||||||
print(f"Discord Activity Checker - Checking for inactivity over {INACTIVE_THRESHOLD_HOURS} hours")
|
print(
|
||||||
print(f"Cutoff time: {datetime.now(timezone.utc) - timedelta(hours=INACTIVE_THRESHOLD_HOURS)}")
|
f"Discord Activity Checker - Checking for inactivity over "
|
||||||
|
f"{INACTIVE_THRESHOLD_HOURS} hours"
|
||||||
|
)
|
||||||
|
cutoff = datetime.now(timezone.utc) - timedelta(hours=INACTIVE_THRESHOLD_HOURS)
|
||||||
|
print(f"Cutoff time: {cutoff}")
|
||||||
print("-" * 80)
|
print("-" * 80)
|
||||||
|
|
||||||
async with DiscordActivityChecker(DISCORD_TOKEN) as checker:
|
async with DiscordActivityChecker(DISCORD_TOKEN) as checker:
|
||||||
@@ -173,7 +187,9 @@ async def main():
|
|||||||
channel_id = team_info["channel_id"]
|
channel_id = team_info["channel_id"]
|
||||||
member_ids = team_info["member_ids"]
|
member_ids = team_info["member_ids"]
|
||||||
|
|
||||||
result = await checker.check_team_activity(team_name, channel_id, member_ids)
|
result = await checker.check_team_activity(
|
||||||
|
team_name, channel_id, member_ids
|
||||||
|
)
|
||||||
results.append(result)
|
results.append(result)
|
||||||
|
|
||||||
# Display results
|
# Display results
|
||||||
@@ -189,18 +205,25 @@ async def main():
|
|||||||
print(f" Total Members: {team_result['total_members']}")
|
print(f" Total Members: {team_result['total_members']}")
|
||||||
print(f" Inactive: {team_result['inactive_count']}")
|
print(f" Inactive: {team_result['inactive_count']}")
|
||||||
|
|
||||||
if team_result['inactive_members']:
|
if team_result["inactive_members"]:
|
||||||
print(" Inactive Members:")
|
print(" Inactive Members:")
|
||||||
for member in team_result['inactive_members']:
|
for member in team_result["inactive_members"]:
|
||||||
print(f" - {member['mention']}")
|
print(f" - {member['mention']}")
|
||||||
|
|
||||||
# Send message to team channel if requested
|
# Send message to team channel if requested
|
||||||
if send_messages and team_result['inactive_count'] > 0:
|
if send_messages and team_result["inactive_count"] > 0:
|
||||||
channel_id = TEAMS[team_result['team']]['channel_id']
|
channel_id = TEAMS[team_result["team"]]["channel_id"]
|
||||||
|
|
||||||
# Build message
|
# Build message
|
||||||
mentions = "\n".join([m['mention'] for m in team_result['inactive_members']])
|
mentions = "\n".join(
|
||||||
message = f"Good morning, the following people have not sent a message here in the last 36 hours. If you are on this list, please confirm you are still participating.\n\n{mentions}"
|
[m["mention"] for m in team_result["inactive_members"]]
|
||||||
|
)
|
||||||
|
message = (
|
||||||
|
"Good morning, the following people have not sent a "
|
||||||
|
"message here in the last 36 hours. If you are on this "
|
||||||
|
"list, please confirm you are still participating.\n\n"
|
||||||
|
f"{mentions}"
|
||||||
|
)
|
||||||
|
|
||||||
await checker.send_message_to_channel(channel_id, message)
|
await checker.send_message_to_channel(channel_id, message)
|
||||||
await asyncio.sleep(1) # Small delay between messages
|
await asyncio.sleep(1) # Small delay between messages
|
||||||
@@ -211,13 +234,18 @@ async def main():
|
|||||||
|
|
||||||
# Save results to JSON
|
# Save results to JSON
|
||||||
with open("discord_activity_report.json", "w") as f:
|
with open("discord_activity_report.json", "w") as f:
|
||||||
json.dump({
|
json.dump(
|
||||||
|
{
|
||||||
"generated_at": datetime.now(timezone.utc).isoformat(),
|
"generated_at": datetime.now(timezone.utc).isoformat(),
|
||||||
"threshold_hours": INACTIVE_THRESHOLD_HOURS,
|
"threshold_hours": INACTIVE_THRESHOLD_HOURS,
|
||||||
"results": results
|
"results": results,
|
||||||
}, f, indent=2)
|
},
|
||||||
|
f,
|
||||||
|
indent=2,
|
||||||
|
)
|
||||||
|
|
||||||
print("\n📄 Detailed report saved to discord_activity_report.json")
|
print("\n📄 Detailed report saved to discord_activity_report.json")
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
asyncio.run(main())
|
asyncio.run(main())
|
||||||
@@ -1,12 +1,10 @@
|
|||||||
#!/usr/bin/env python3
|
#!/usr/bin/env python3
|
||||||
"""
|
"""Update Cohort Leads role permissions to allow pinging in team channels."""
|
||||||
Update Cohort Leads role permissions to allow pinging in team channels.
|
|
||||||
"""
|
|
||||||
|
|
||||||
import json
|
|
||||||
import requests
|
|
||||||
import time
|
|
||||||
import os
|
import os
|
||||||
|
import time
|
||||||
|
|
||||||
|
import requests
|
||||||
|
|
||||||
# Discord configuration
|
# Discord configuration
|
||||||
BOT_TOKEN = os.environ["DISCORD_BOT_TOKEN"]
|
BOT_TOKEN = os.environ["DISCORD_BOT_TOKEN"]
|
||||||
@@ -15,26 +13,66 @@ BASE_URL = "https://discord.com/api/v10"
|
|||||||
|
|
||||||
# Team channel IDs from send_team_messages.py
|
# Team channel IDs from send_team_messages.py
|
||||||
TEAM_CHANNELS = {
|
TEAM_CHANNELS = {
|
||||||
"Jade Jasmine": {"channel_id": "1464316501573107886", "role_id": "1464314923780931677"},
|
"Jade Jasmine": {
|
||||||
"Crimson Dahlia": {"channel_id": "1464316744909852682", "role_id": "1464315093402784015"},
|
"channel_id": "1464316501573107886",
|
||||||
"Rose Camellia": {"channel_id": "1464316751268286611", "role_id": "1464315098452726106"},
|
"role_id": "1464314923780931677",
|
||||||
"Amber Wisteria": {"channel_id": "1464316761410113641", "role_id": "1464315105264275600"},
|
},
|
||||||
"Ivory Orchid": {"channel_id": "1464316770889240730", "role_id": "1464315109873684593"},
|
"Crimson Dahlia": {
|
||||||
"Teal Iris": {"channel_id": "1464316776459407448", "role_id": "1464315114378498152"},
|
"channel_id": "1464316744909852682",
|
||||||
"Peach Gardenia": {"channel_id": "1464316785040953543", "role_id": "1464315118904152107"},
|
"role_id": "1464315093402784015",
|
||||||
"Violet Carnation": {"channel_id": "1464316805261824032", "role_id": "1464315124251754559"},
|
},
|
||||||
"Azure Lotus": {"channel_id": "1464316814455472139", "role_id": "1464315128437801177"},
|
"Rose Camellia": {
|
||||||
"Coral Sunflower": {"channel_id": "1464316819711066263", "role_id": "1464315132896088168"},
|
"channel_id": "1464316751268286611",
|
||||||
"Indigo Tulip": {"channel_id": "1464316826384072925", "role_id": "1464315138428633241"},
|
"role_id": "1464315098452726106",
|
||||||
"Scarlet Hydrangea": {"channel_id": "1464316839306985506", "role_id": "1464315142710890520"},
|
},
|
||||||
"Mint Narcissus": {"channel_id": "1464316844251807952", "role_id": "1464315149203804405"},
|
"Amber Wisteria": {
|
||||||
"Sage Marigold": {"channel_id": "1464316850669093040", "role_id": "1464315153599299803"},
|
"channel_id": "1464316761410113641",
|
||||||
|
"role_id": "1464315105264275600",
|
||||||
|
},
|
||||||
|
"Ivory Orchid": {
|
||||||
|
"channel_id": "1464316770889240730",
|
||||||
|
"role_id": "1464315109873684593",
|
||||||
|
},
|
||||||
|
"Teal Iris": {
|
||||||
|
"channel_id": "1464316776459407448",
|
||||||
|
"role_id": "1464315114378498152",
|
||||||
|
},
|
||||||
|
"Peach Gardenia": {
|
||||||
|
"channel_id": "1464316785040953543",
|
||||||
|
"role_id": "1464315118904152107",
|
||||||
|
},
|
||||||
|
"Violet Carnation": {
|
||||||
|
"channel_id": "1464316805261824032",
|
||||||
|
"role_id": "1464315124251754559",
|
||||||
|
},
|
||||||
|
"Azure Lotus": {
|
||||||
|
"channel_id": "1464316814455472139",
|
||||||
|
"role_id": "1464315128437801177",
|
||||||
|
},
|
||||||
|
"Coral Sunflower": {
|
||||||
|
"channel_id": "1464316819711066263",
|
||||||
|
"role_id": "1464315132896088168",
|
||||||
|
},
|
||||||
|
"Indigo Tulip": {
|
||||||
|
"channel_id": "1464316826384072925",
|
||||||
|
"role_id": "1464315138428633241",
|
||||||
|
},
|
||||||
|
"Scarlet Hydrangea": {
|
||||||
|
"channel_id": "1464316839306985506",
|
||||||
|
"role_id": "1464315142710890520",
|
||||||
|
},
|
||||||
|
"Mint Narcissus": {
|
||||||
|
"channel_id": "1464316844251807952",
|
||||||
|
"role_id": "1464315149203804405",
|
||||||
|
},
|
||||||
|
"Sage Marigold": {
|
||||||
|
"channel_id": "1464316850669093040",
|
||||||
|
"role_id": "1464315153599299803",
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
HEADERS = {
|
HEADERS = {"Authorization": f"Bot {BOT_TOKEN}", "Content-Type": "application/json"}
|
||||||
"Authorization": f"Bot {BOT_TOKEN}",
|
|
||||||
"Content-Type": "application/json"
|
|
||||||
}
|
|
||||||
|
|
||||||
def get_guild_roles():
|
def get_guild_roles():
|
||||||
"""Get all roles in the guild to find Cohort Leads"""
|
"""Get all roles in the guild to find Cohort Leads"""
|
||||||
@@ -47,6 +85,7 @@ def get_guild_roles():
|
|||||||
print(f"Error getting roles: {response.status_code} - {response.text}")
|
print(f"Error getting roles: {response.status_code} - {response.text}")
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def find_cohort_leads_role(roles):
|
def find_cohort_leads_role(roles):
|
||||||
"""Find the Cohort Leads role from the list"""
|
"""Find the Cohort Leads role from the list"""
|
||||||
for role in roles:
|
for role in roles:
|
||||||
@@ -54,6 +93,7 @@ def find_cohort_leads_role(roles):
|
|||||||
return role
|
return role
|
||||||
return None
|
return None
|
||||||
|
|
||||||
|
|
||||||
def update_channel_permissions(channel_id, role_id, team_name):
|
def update_channel_permissions(channel_id, role_id, team_name):
|
||||||
"""Update channel permissions for a specific role"""
|
"""Update channel permissions for a specific role"""
|
||||||
url = f"{BASE_URL}/channels/{channel_id}/permissions/{role_id}"
|
url = f"{BASE_URL}/channels/{channel_id}/permissions/{role_id}"
|
||||||
@@ -66,7 +106,7 @@ def update_channel_permissions(channel_id, role_id, team_name):
|
|||||||
data = {
|
data = {
|
||||||
"allow": "2251799813816320", # MENTION_EVERYONE + PIN_MESSAGES permissions
|
"allow": "2251799813816320", # MENTION_EVERYONE + PIN_MESSAGES permissions
|
||||||
"deny": "0",
|
"deny": "0",
|
||||||
"type": 0 # Role permission type
|
"type": 0, # Role permission type
|
||||||
}
|
}
|
||||||
|
|
||||||
response = requests.put(url, headers=HEADERS, json=data)
|
response = requests.put(url, headers=HEADERS, json=data)
|
||||||
@@ -80,9 +120,13 @@ def update_channel_permissions(channel_id, role_id, team_name):
|
|||||||
time.sleep(retry_after)
|
time.sleep(retry_after)
|
||||||
return update_channel_permissions(channel_id, role_id, team_name)
|
return update_channel_permissions(channel_id, role_id, team_name)
|
||||||
else:
|
else:
|
||||||
print(f"✗ Failed to update {team_name} channel: {response.status_code} - {response.text}")
|
print(
|
||||||
|
f"✗ Failed to update {team_name} channel: "
|
||||||
|
f"{response.status_code} - {response.text}"
|
||||||
|
)
|
||||||
return False
|
return False
|
||||||
|
|
||||||
|
|
||||||
def main():
|
def main():
|
||||||
print("Fetching guild roles...")
|
print("Fetching guild roles...")
|
||||||
roles = get_guild_roles()
|
roles = get_guild_roles()
|
||||||
@@ -100,7 +144,10 @@ def main():
|
|||||||
print(f" - {role['name']} (ID: {role['id']})")
|
print(f" - {role['name']} (ID: {role['id']})")
|
||||||
return
|
return
|
||||||
|
|
||||||
print(f"\nFound Cohort Leads role: {cohort_leads_role['name']} (ID: {cohort_leads_role['id']})")
|
print(
|
||||||
|
f"\nFound Cohort Leads role: {cohort_leads_role['name']} "
|
||||||
|
f"(ID: {cohort_leads_role['id']})"
|
||||||
|
)
|
||||||
print(f"Updating permissions for {len(TEAM_CHANNELS)} team channels...")
|
print(f"Updating permissions for {len(TEAM_CHANNELS)} team channels...")
|
||||||
print("-" * 50)
|
print("-" * 50)
|
||||||
|
|
||||||
@@ -108,7 +155,9 @@ def main():
|
|||||||
fail_count = 0
|
fail_count = 0
|
||||||
|
|
||||||
for team_name, team_data in TEAM_CHANNELS.items():
|
for team_name, team_data in TEAM_CHANNELS.items():
|
||||||
if update_channel_permissions(team_data["channel_id"], cohort_leads_role["id"], team_name):
|
if update_channel_permissions(
|
||||||
|
team_data["channel_id"], cohort_leads_role["id"], team_name
|
||||||
|
):
|
||||||
success_count += 1
|
success_count += 1
|
||||||
else:
|
else:
|
||||||
fail_count += 1
|
fail_count += 1
|
||||||
@@ -124,7 +173,11 @@ def main():
|
|||||||
print("Cohort Leads can now:")
|
print("Cohort Leads can now:")
|
||||||
print(" - Use @everyone, @here, and mention all roles")
|
print(" - Use @everyone, @here, and mention all roles")
|
||||||
print(" - Pin and unpin messages")
|
print(" - Pin and unpin messages")
|
||||||
print("\nNote: They cannot view these channels unless they have the specific team role.")
|
print(
|
||||||
|
"\nNote: They cannot view these channels unless they have "
|
||||||
|
"the specific team role."
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
if __name__ == "__main__":
|
if __name__ == "__main__":
|
||||||
main()
|
main()
|
||||||
Reference in New Issue
Block a user