Merge branch 'main' into fix/chat

Author: DonnieBLT

poetry.lock

@@ -14,7 +14,7 @@ django-allauth = "^0.61.1"
 beautifulsoup4 = "^4.13.3"
 django-email-obfuscator = "^0.1.5"
 django-gravatar2 = "^1.4.5"
-django-import-export = "^4.3.5"
+django-import-export = "^4.3.7"
 django-annoying = "^0.10.7"
 dj-rest-auth = "^5.0.2"
 user-agents = "^2.2.0"
@@ -40,7 +40,7 @@ django-mdeditor = "^0.1.20"
 django-tz-detect = "^0.4.0"
 django-star-ratings = "^0.9.2"
 django-environ = "^0.12.0"
-django-simple-captcha = "^0.6.1"
+django-simple-captcha = "^0.6.2"
 django-filter = "^24.3"
 pillow = "^10.4.0"
 sentry-sdk = "^2.22.0"

pyproject.toml

@@ -1,4 +1,5 @@
 import time
+from urllib.parse import urlparse
 
 import requests
 from django.conf import settings
@@ -20,6 +21,7 @@ def add_arguments(self, parser):
 
     def handle(self, *args, **kwargs):
         project_id = kwargs.get("project_id")
+
         if not project_id:
             self.stdout.write(self.style.ERROR("Please provide a project ID using --project_id"))
             return
@@ -30,27 +32,62 @@ def handle(self, *args, **kwargs):
             self.stdout.write(self.style.ERROR(f"Project with ID {project_id} does not exist"))
             return
 
+        repo = None
+
+        if not hasattr(project, "url"):
+            self.stdout.write(self.style.ERROR(f"Project {project.name} does not have a URL attribute"))
+            return
+
+        if not project.url:
+            self.stdout.write(self.style.ERROR(f"Project {project.name} has an empty URL"))
+            return
+
+        try:
+            parsed_url = urlparse(project.url.strip())
+
+            if parsed_url.netloc == "github.com":
+                repo_path = parsed_url.path.strip("/")
+                if repo_path and repo_path.count("/") == 1:
+                    repo = repo_path
+                else:
+                    self.stdout.write(
+                        self.style.ERROR(f"Invalid GitHub repository format: {parsed_url.path}. Expected 'owner/repo'")
+                    )
+                    return
+            else:
+                self.stdout.write(self.style.ERROR(f"Project URL is not a GitHub repository URL: {project.url}"))
+                return
+        except Exception as e:
+            self.stdout.write(self.style.ERROR(f"Error parsing URL {project.url}: {str(e)}"))
+            return
+
+        if not repo:
+            self.stdout.write(self.style.ERROR("Could not extract valid GitHub repository information"))
+            return
+
         headers = {
             "Authorization": f"token {settings.GITHUB_TOKEN}",
             "Content-Type": "application/json",
         }
 
-        owner_repo = project.github_url.rstrip("/").split("/")[-2:]
-        repo_name = f"{owner_repo[0]}/{owner_repo[1]}"
         contributors = []
 
         # Fetch contributors
         page = 1
         while True:
-            url = f"https://api.github.com/repos/{repo_name}/contributors?per_page=100&page={page}"
+            url = f"https://api.github.com/repos/{repo}/contributors?per_page=100&page={page}"
+            self.stdout.write(self.style.SUCCESS(f"Fetching from: {url}"))
+
             response = requests.get(url, headers=headers)
 
             if response.status_code != 200:
                 self.stdout.write(
-                    self.style.WARNING(
-                        f"Failed to fetch contributors for {repo_name} page {page}: {response.status_code}"
-                    )
+                    self.style.WARNING(f"Failed to fetch contributors for {repo} page {page}: {response.status_code}")
                 )
+                if response.status_code == 404:
+                    self.stdout.write(self.style.ERROR(f"Repository '{repo}' not found. Please check the project URL."))
+                elif response.status_code == 403:
+                    self.stdout.write(self.style.ERROR("API rate limit exceeded or authentication issue."))
                 break
 
             contributors_data = response.json()
@@ -59,30 +96,53 @@ def handle(self, *args, **kwargs):
 
             for c in contributors_data:
                 try:
+                    name = str(c["login"])[:255]
+                    github_url = str(c["html_url"])[:255]
+                    avatar_url = str(c["avatar_url"])[:255]
+
                     contributor, created = Contributor.objects.get_or_create(
                         github_id=c["id"],
                         defaults={
-                            "name": c["login"],
-                            "github_url": c["html_url"],
-                            "avatar_url": c["avatar_url"],
-                            "contributor_type": c["type"],
+                            "name": name,
+                            "github_url": github_url,
+                            "avatar_url": avatar_url,
+                            "contributor_type": str(c["type"])[:255],
                             "contributions": c["contributions"],
                         },
                     )
+
+                    if not created:
+                        contributor.contributions = c["contributions"]
+                        contributor.save()
+
                     contributors.append(contributor)
+
+                    if created:
+                        self.stdout.write(f"Created new contributor: {name}")
+                    else:
+                        self.stdout.write(f"Updated existing contributor: {name}")
+
                 except MultipleObjectsReturned:
+                    self.stdout.write(self.style.WARNING(f"Multiple records found for {c['login']}"))
                     contributor = Contributor.objects.filter(github_id=c["id"]).first()
                     contributors.append(contributor)
+                except Exception as e:
+                    self.stdout.write(self.style.ERROR(f"Error processing contributor {c['login']}: {str(e)}"))
 
             if "next" not in response.links:
                 break
 
             page += 1
-            # Respect GitHub's rate limits
             time.sleep(1)
 
-        project.contributors.set(contributors)
-        project.contributor_count = len(contributors)
-        project.save()
+        # Link contributors to project
+        if hasattr(project, "contributors"):
+            project.contributors.set(contributors)
+            self.stdout.write(f"Set {len(contributors)} contributors for project {project.name}")
+
+        if hasattr(project, "contributor_count"):
+            project.contributor_count = len(contributors)
+            project.save()
+            self.stdout.write(f"Updated contributor count to {len(contributors)}")
 
         self.stdout.write(self.style.SUCCESS(f"Successfully fetched contributors for project {project.name}"))

website/management/commands/fetch_contributors.py

@@ -998,8 +998,7 @@ <h3 class="font-medium text-gray-900 group-hover:text-red-600 transition-colors"
                         row.innerHTML = `
                             <td class="px-4 py-4 whitespace-nowrap">
                                 <div class="flex items-center">
-                                    <img class="h-8 w-8 rounded-full" width="20" height="20" 
-                                         src="${stat.contributor.avatar_url}" alt="${stat.contributor.name}">
+                                    <img class="h-8 w-8 rounded-full" width="20" height="20" src="${stat.contributor.avatar_url}" alt="${stat.contributor.name}">
                                     <div class="ml-3">
                                         <div class="text-sm font-medium text-gray-900">${stat.contributor.name}</div>
                                         <div class="text-sm text-gray-500">@${stat.contributor.github_id}</div>