@@ -159,7 +161,7 @@
@@ -177,11 +179,31 @@
class="filter-option flex items-center px-3 py-2 hover:bg-gray-100 text-sm">
{% trans "Projects" %}
+
+ {% trans "Repos" %}
+
{% trans "Users" %}
+
+ {% trans "Issues" %}
+
+
+ {% trans "Domains" %}
+
+
+ {% trans "Labels" %}
+
@@ -345,9 +367,37 @@
{% if query %}
- Chat with BLT Bot
- {% endif %}
+
{% if issues %}
-
- {% for activity in issues %}
- {% include "_activity.html" %}
- {% endfor %}
+
+
- {% elif domains %}
-
+
+
+
+
+ Issues
+
+ {% for activity in issues %}
+ {% include "_activity.html" %}
+ {% endfor %}
+
+
-
- {% for domain in domains %}
-
+ {% endif %}
+ {% if domains %}
+
+
+
- {% elif users %}
-
+
+
Domains
+
+ {% for domain in domains %}
+
- {% endfor %}
+
+
+ {% endfor %}
+ {% if domain.logo %}
+ 
+ {% else %}
+
+
+ N/A
+
+ {% endif %}
+
+
+ + {{ domain.name }} +
+ {% if domain.hostname_domain %}{{ domain.hostname_domain }}
{% endif %} +
+ {% if domain.webshot %}
+
+ 
+
+ {% endif %}
+
+
+
+ {% if domain.managers.exists %}
+
+
+ Clicks: {{ domain.clicks|default:"0" }}
+
+
+
+ Open Issues: {{ domain.open_issues.count }}
+
+
+
+ Closed Issues: {{ domain.closed_issues.count }}
+
+
+ Managers:
+
+ {% endif %}
+
+ {% for manager in domain.managers.all %}
+
+ {{ manager.get_full_name|default:manager.username }}
+
+ {% endfor %}
+
+
+ {% if domain.twitter %}
+
+
+ Twitter
+
+ {% endif %}
+ {% if domain.facebook %}
+
+
+ Facebook
+
+ {% endif %}
+ {% if domain.github %}
+
+
+ GitHub
+
+ {% endif %}
+
+ {% if domain.tags.exists %}
+
+ {% for tag in domain.tags.all %}
+
+ {{ tag.name }}
+
+ {% endfor %}
+
+ {% endif %}
+ {% if domain.top_tester %}
+
+
+ Top Tester: {{ domain.top_tester.get_full_name|default:domain.top_tester.username }}
+
+ {% endif %}
+
+
+
+ Domain Color:
+
+
+
-
+
+ {% endif %}
+ {% if users %}
+
+
+
Users
+
{% for user in users %}
-
+ {% endif %}
+ {% if organizations %}
+
-
+
- {% if user.user.userprofile.avatar %}
- 
- {% elif user.user.socialaccount_set.all.0.get_avatar_url %}
- 
+
+
+ {% if user.user.userprofile.user_avatar %}
+ 
+ {% elif user.user.socialaccount_set.all.0.get_avatar_url %}
+
+ {% else %}
+ 
+ {% endif %}
+
+ {% endfor %}
+
+ {% endif %}
+
+
+ + {{ user.user.username }} + {{ user.get_title_display }} +
+
+
+ + + Role: + {{ user.role|default:"Not specified" }} +
++ + Points: + {{ user.total_score }} +
+ {% if user.team %} ++ + Team: + {{ user.team }} +
+ {% endif %} +
+ {% if user.linkedin_url %}
+
+
+ LinkedIn
+
+ {% endif %}
+ {% if user.github_url %}
+
+
+ GitHub
+
+ {% endif %}
+ {% if user.website_url %}
+
+
+ Website
+
+ {% endif %}
+
+
+ {% for badge in user.badges %}
+
+
+ 
+ {{ badge.badge.title }}
+
+ {% endfor %}
+
+ {% for tag in user.tags.all %}
+
+ {{ tag.name }}
+
+ {% endfor %}
+
+
+
+ {% endif %}
+ {% if projects %}
+
+
+ Organizations
+
+ {% for organization in organizations %}
+
+
+
+ {% endfor %}
+
+ {% if organization.logo %}
+ 
+ {% else %}
+
+
+ No Logo
+
+ {% endif %}
+
+
+ + {{ organization.name }} +
+ {% if organization.description %} +{{ organization.description|truncatechars:150 }}
+ {% endif %} +
+ {% if organization.email %}
+
+
+ {{ organization.email }}
+
+ {% endif %}
+ {% if organization.url %}
+
+
+ {{ organization.url }}
+
+ {% endif %}
+ {% if organization.twitter %}
+
+
+
+ {% endif %}
+ {% if organization.facebook %}
+
+
+
+ {% endif %}
+
+
+
+ {% if organization.tags.all %}
+
+ Type: {{ organization.get_type_display }}
+
+
+ Team Points: {{ organization.team_points }}
+
+
+
+ + {% if organization.is_active %} + Active + {% else %} + Inactive + {% endif %} +
+
+ {% for tag in organization.tags.all %}
+
+ {{ tag.name }}
+
+ {% endfor %}
+
+ {% endif %}
+
+
+
+ {% endif %}
+ {% if tags %}
+ Projects
+
+ {% for project in projects %}
+
+
+
+
+ {% if project.logo %}
+
{% else %}
-
+
-
+
+ No Logo
+
{% endif %}
- {{ user.user.username }}
+
+
+ {{ project.name }} +
+ {% if project.description %} +{{ project.description|truncatechars:150 }}
+ {% endif %} +
+ {% if project.url %}
+
+
+ {{ project.url }}
+
+ {% endif %}
+ {% if project.twitter %}
+
+
+
+ {% endif %}
+ {% if project.facebook %}
+
+
+
+ {% endif %}
+
+
-
- {% if user.total_score is None %}
- 0 Point
+
+ {% endfor %}
+
+ {% if project.organization %}
+ {% if project.organization.logo %}
+
+ {% endif %}
+
+ + Organization: + {{ project.organization.name }} +
+ {% else %} ++ Organization: Not Assigned +
+ {% endif %} +
+
+ {% if project.tags.all %}
+
+ Visits: {{ project.project_visit_count }}
+
+
+ Created: {{ project.created|date:"F j, Y" }}
+
+
+ Modified: {{ project.modified|date:"F j, Y" }}
+
+
+ {% for tag in project.tags.all %}
+
+ {{ tag.name }}
+
+ {% endfor %}
+
+ {% endif %}
+
+
+ {% endif %}
+ {% if repos %}
+
+
+ Tags
+
+
+ {% if matching_organizations %}
+ + Tags +
+
+ {% for tag in tags %}
+
+ {{ tag.name }}
+
+ {% endfor %}
+
+
+
+ {% endif %}
+ {% if matching_domains %}
+ + Matching Organizations +
+
+ {% for org in matching_organizations %}
+
+
+ {% if org.logo %}
+ 
+ {% endif %}
+ {{ org.name }}
+
+ {% endfor %}
+
+
+ {% endif %}
+ {% if matching_issues %}
+ + Matching Domains +
+
+ {% for domain in matching_domains %}
+
+
+ {% if domain.logo %}
+
+ {% endif %}
+ {{ domain.name }}
+
+ {% endfor %}
+
+
+ {% endif %}
+ {% if matching_user_profiles %}
+ + Matching Issues +
+
+ {% for issue in matching_issues %}
+
+
+ {% if issue.logo %}
+ 
+ {% endif %}
+ {{ issue.description }}
+
+ {% endfor %}
+
+
+ {% endif %}
+ {% if matching_repos %}
+ + Matching User Profiles +
+
+ {% for profile in matching_user_profiles %}
+
+ {% endfor %}
+
+ 
+ {% endif %}
+
+
+ {% endif %}
+ + Matching Repositories +
+
+ {% for repo in matching_repos %}
+
+
+ {{ repo.name }}
+
+ {% endfor %}
+
+
+ {% endif %}
{% endif %}
{% endblock content %}
diff --git a/website/views/core.py b/website/views/core.py
index e89f1aa79..4a6079c3a 100644
--- a/website/views/core.py
+++ b/website/views/core.py
@@ -37,9 +37,14 @@
Badge,
Domain,
Issue,
+ Organization,
PRAnalysisReport,
+ Project,
+ Repo,
Suggestion,
SuggestionVotes,
+ Tag,
+ UserBadge,
UserProfile,
Wallet,
)
@@ -300,24 +305,13 @@ def find_key(request, token):
def search(request, template="search.html"):
query = request.GET.get("query")
- stype = request.GET.get("type")
+ stype = request.GET.get("type", "organizations")
context = None
if query is None:
return render(request, template)
query = query.strip()
- if query[:6] == "issue:":
- stype = "issue"
- query = query[6:]
- elif query[:7] == "domain:":
- stype = "domain"
- query = query[7:]
- elif query[:5] == "user:":
- stype = "user"
- query = query[5:]
- elif query[:6] == "label:":
- stype = "label"
- query = query[6:]
- if stype == "issue" or stype is None:
+
+ if stype == "issues":
context = {
"query": query,
"type": stype,
@@ -325,21 +319,26 @@ def search(request, template="search.html"):
Q(is_hidden=True) & ~Q(user_id=request.user.id)
)[0:20],
}
- elif stype == "domain":
+ elif stype == "domains":
context = {
"query": query,
"type": stype,
"domains": Domain.objects.filter(Q(url__icontains=query), hunt=None)[0:20],
}
- elif stype == "user":
+ elif stype == "users":
+ users = (
+ UserProfile.objects.filter(Q(user__username__icontains=query))
+ .annotate(total_score=Sum("user__points__score"))
+ .order_by("-total_score")[0:20]
+ )
+ for userprofile in users:
+ userprofile.badges = UserBadge.objects.filter(user=userprofile.user)
context = {
"query": query,
"type": stype,
- "users": UserProfile.objects.filter(Q(user__username__icontains=query))
- .annotate(total_score=Sum("user__points__score"))
- .order_by("-total_score")[0:20],
+ "users": users,
}
- elif stype == "label":
+ elif stype == "labels":
context = {
"query": query,
"type": stype,
@@ -347,7 +346,61 @@ def search(request, template="search.html"):
Q(is_hidden=True) & ~Q(user_id=request.user.id)
)[0:20],
}
+ elif stype == "organizations":
+ organizations = Organization.objects.filter(name__icontains=query)
+ for org in organizations:
+ d = Domain.objects.filter(organization=org).first()
+ if d:
+ org.absolute_url = d.get_absolute_url()
+ context = {
+ "query": query,
+ "type": stype,
+ "organizations": Organization.objects.filter(name__icontains=query),
+ }
+ elif stype == "projects":
+ context = {
+ "query": query,
+ "type": stype,
+ "projects": Project.objects.filter(
+ Q(name__icontains=query) | Q(description__icontains=query)
+ ),
+ }
+ elif stype == "repos":
+ context = {
+ "query": query,
+ "type": stype,
+ "repos": Repo.objects.filter(
+ Q(name__icontains=query) | Q(description__icontains=query)
+ ),
+ }
+ elif stype == "tags":
+ tags = Tag.objects.filter(name__icontains=query)
+ matching_organizations = Organization.objects.filter(tags__in=tags).distinct()
+ matching_domains = Domain.objects.filter(tags__in=tags).distinct()
+ matching_issues = Issue.objects.filter(tags__in=tags).distinct()
+ matching_user_profiles = UserProfile.objects.filter(tags__in=tags).distinct()
+ matching_repos = Repo.objects.filter(tags__in=tags).distinct()
+ for org in matching_organizations:
+ d = Domain.objects.filter(organization=org).first()
+ if d:
+ org.absolute_url = d.get_absolute_url()
+ context = {
+ "query": query,
+ "type": stype,
+ "tags": tags,
+ "matching_organizations": matching_organizations,
+ "matching_domains": matching_domains,
+ "matching_issues": matching_issues,
+ "matching_user_profiles": matching_user_profiles,
+ "matching_repos": matching_repos,
+ }
+ elif stype == "languages":
+ context = {
+ "query": query,
+ "type": stype,
+ "repos": Repo.objects.filter(primary_language__icontains=query),
+ }
if request.user.is_authenticated:
context["wallet"] = Wallet.objects.get(user=request.user)
return render(request, template, context)
From 8dc96e604581b4b5b2a970adbe69c920db9e17e4 Mon Sep 17 00:00:00 2001
From: DonnieBLT <128622481+DonnieBLT@users.noreply.github.com>
Date: Thu, 23 Jan 2025 22:33:54 -0500
Subject: [PATCH 12/13] Update slack_handlers.py
---
website/views/slack_handlers.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/website/views/slack_handlers.py b/website/views/slack_handlers.py
index 7d2f8e62c..182768b43 100644
--- a/website/views/slack_handlers.py
+++ b/website/views/slack_handlers.py
@@ -262,7 +262,7 @@ def slack_commands(request):
"type": "section",
"text": {
"type": "mrkdwn",
- "text": " 🛠 *GSOC Projects:* View this year's participating GSOC projects .",
+ "text": " 🛠 *GSOC Projects:* View this year's participating GSOC projects https://owasp.org/www-community/initiatives/gsoc/gsoc2025ideas",
},
},
{"type": "divider"},
From c501ef82f4b5a9323aaaabb00ec45d57cf5a8cfe Mon Sep 17 00:00:00 2001
From: DonnieBLT <128622481+DonnieBLT@users.noreply.github.com>
Date: Thu, 23 Jan 2025 22:51:52 -0500
Subject: [PATCH 13/13] feat: Add project status field and Slack stats command
- Added a new `status` field to the Project model with predefined status choices
- Created a migration for the new Project status field
- Implemented a new `/stats` Slack command to display project and platform statistics
- Reformatted code to improve readability and follow line length guidelines
- Updated pyproject.toml to increase line length limit to 120 characters
---
pyproject.toml | 4 +-
website/migrations/0182_project_status.py | 27 ++++++
website/models.py | 112 +++++++---------------
website/views/slack_handlers.py | 52 ++++++++--
4 files changed, 106 insertions(+), 89 deletions(-)
create mode 100644 website/migrations/0182_project_status.py
diff --git a/pyproject.toml b/pyproject.toml
index 0b5747c78..86f87c393 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -92,11 +92,11 @@ pre-commit = "^3.8.0"
[tool.isort]
known_first_party = ["blt"]
-line_length = 100
+line_length = 120
profile = "black"
[tool.ruff]
-line-length = 100
+line-length = 120
target-version = "py311"
[tool.ruff.lint]
diff --git a/website/migrations/0182_project_status.py b/website/migrations/0182_project_status.py
new file mode 100644
index 000000000..eb7fbae8b
--- /dev/null
+++ b/website/migrations/0182_project_status.py
@@ -0,0 +1,27 @@
+# Generated by Django 5.1.4 on 2025-01-24 03:50
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+ dependencies = [
+ ("website", "0181_slackintegration_welcome_message"),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name="project",
+ name="status",
+ field=models.CharField(
+ choices=[
+ ("flagship", "Flagship"),
+ ("production", "Production"),
+ ("incubator", "Incubator"),
+ ("lab", "Lab"),
+ ("inactive", "Inactive"),
+ ],
+ default="new",
+ max_length=20,
+ ),
+ ),
+ ]
diff --git a/website/models.py b/website/models.py
index fe328d9e7..ca319cdd2 100644
--- a/website/models.py
+++ b/website/models.py
@@ -88,16 +88,10 @@ def __str__(self):
class SlackIntegration(models.Model):
- integration = models.OneToOneField(
- Integration, on_delete=models.CASCADE, related_name="slack_integration"
- )
- bot_access_token = models.CharField(
- max_length=255, null=True, blank=True
- ) # will be different for each workspace
+ integration = models.OneToOneField(Integration, on_delete=models.CASCADE, related_name="slack_integration")
+ bot_access_token = models.CharField(max_length=255, null=True, blank=True) # will be different for each workspace
workspace_name = models.CharField(max_length=255, null=True, blank=True)
- default_channel_name = models.CharField(
- max_length=255, null=True, blank=True
- ) # Default channel ID
+ default_channel_name = models.CharField(max_length=255, null=True, blank=True) # Default channel ID
default_channel_id = models.CharField(max_length=255, null=True, blank=True)
daily_updates = models.BooleanField(default=False)
daily_update_time = models.IntegerField(
@@ -193,12 +187,7 @@ def closed_issues(self):
@property
def top_tester(self):
- return (
- User.objects.filter(issue__domain=self)
- .annotate(total=Count("issue"))
- .order_by("-total")
- .first()
- )
+ return User.objects.filter(issue__domain=self).annotate(total=Count("issue")).order_by("-total").first()
@property
def get_name(self):
@@ -315,9 +304,7 @@ class HuntPrize(models.Model):
name = models.CharField(max_length=50)
value = models.PositiveIntegerField(default=0)
no_of_eligible_projects = models.PositiveIntegerField(default=1) # no of winner in this prize
- valid_submissions_eligible = models.BooleanField(
- default=False
- ) # all valid submissions are winners in this prize
+ valid_submissions_eligible = models.BooleanField(default=False) # all valid submissions are winners in this prize
prize_in_crypto = models.BooleanField(default=False)
description = models.TextField(null=True, blank=True)
created = models.DateTimeField(auto_now_add=True)
@@ -352,12 +339,8 @@ class Issue(models.Model):
status = models.CharField(max_length=10, default="open", null=True, blank=True)
user_agent = models.CharField(max_length=255, default="", null=True, blank=True)
ocr = models.TextField(default="", null=True, blank=True)
- screenshot = models.ImageField(
- upload_to="screenshots", null=True, blank=True, validators=[validate_image]
- )
- closed_by = models.ForeignKey(
- User, null=True, blank=True, related_name="closed_by", on_delete=models.CASCADE
- )
+ screenshot = models.ImageField(upload_to="screenshots", null=True, blank=True, validators=[validate_image])
+ closed_by = models.ForeignKey(User, null=True, blank=True, related_name="closed_by", on_delete=models.CASCADE)
closed_date = models.DateTimeField(default=None, null=True, blank=True)
github_url = models.URLField(default="", null=True, blank=True)
created = models.DateTimeField(auto_now_add=True)
@@ -400,9 +383,7 @@ def get_twitter_message(self):
prefix
+ self.domain_title
+ spacer
- + self.description[
- : 140 - (len(prefix) + len(self.domain_title) + len(spacer) + len(issue_link))
- ]
+ + self.description[: 140 - (len(prefix) + len(self.domain_title) + len(spacer) + len(issue_link))]
+ issue_link
)
return msg
@@ -462,9 +443,7 @@ def delete_image_on_issue_delete(sender, instance, **kwargs):
except NotFound:
logger.warning(f"File not found in Google Cloud Storage: {blob_name}")
except Exception as e:
- logger.error(
- f"Error deleting image from Google Cloud Storage: {blob_name} - {str(e)}"
- )
+ logger.error(f"Error deleting image from Google Cloud Storage: {blob_name} - {str(e)}")
else:
@@ -496,9 +475,7 @@ def delete_image_on_post_delete(sender, instance, **kwargs):
except NotFound:
logger.warning(f"File not found in Google Cloud Storage: {blob_name}")
except Exception as e:
- logger.error(
- f"Error deleting image from Google Cloud Storage: {blob_name} - {str(e)}"
- )
+ logger.error(f"Error deleting image from Google Cloud Storage: {blob_name} - {str(e)}")
else:
@@ -530,12 +507,8 @@ def update_issue_image_access(sender, instance, **kwargs):
class Winner(models.Model):
hunt = models.ForeignKey(Hunt, null=True, blank=True, on_delete=models.CASCADE)
- winner = models.ForeignKey(
- User, related_name="winner", null=True, blank=True, on_delete=models.CASCADE
- )
- runner = models.ForeignKey(
- User, related_name="runner", null=True, blank=True, on_delete=models.CASCADE
- )
+ winner = models.ForeignKey(User, related_name="winner", null=True, blank=True, on_delete=models.CASCADE)
+ runner = models.ForeignKey(User, related_name="runner", null=True, blank=True, on_delete=models.CASCADE)
second_runner = models.ForeignKey(
User,
related_name="second_runner",
@@ -598,12 +571,8 @@ class UserProfile(models.Model):
issue_flaged = models.ManyToManyField(Issue, blank=True, related_name="flaged")
issues_hidden = models.BooleanField(default=False)
- subscribed_domains = models.ManyToManyField(
- Domain, related_name="user_subscribed_domains", blank=True
- )
- subscribed_users = models.ManyToManyField(
- User, related_name="user_subscribed_users", blank=True
- )
+ subscribed_domains = models.ManyToManyField(Domain, related_name="user_subscribed_domains", blank=True)
+ subscribed_users = models.ManyToManyField(User, related_name="user_subscribed_users", blank=True)
btc_address = models.CharField(max_length=100, blank=True, null=True)
bch_address = models.CharField(max_length=100, blank=True, null=True)
eth_address = models.CharField(max_length=100, blank=True, null=True)
@@ -655,9 +624,7 @@ def update_streak_and_award_points(self, check_in_date=None):
try:
with transaction.atomic():
# Streak logic
- if not self.last_check_in or check_in_date == self.last_check_in + timedelta(
- days=1
- ):
+ if not self.last_check_in or check_in_date == self.last_check_in + timedelta(days=1):
self.current_streak += 1
self.longest_streak = max(self.current_streak, self.longest_streak)
# If check-in is not consecutive, reset streak
@@ -773,9 +740,7 @@ class Wallet(models.Model):
created = models.DateTimeField(auto_now_add=True)
def deposit(self, value):
- self.transaction_set.create(
- value=value, running_balance=self.current_balance + Decimal(value)
- )
+ self.transaction_set.create(value=value, running_balance=self.current_balance + Decimal(value))
self.current_balance += Decimal(value)
self.save()
@@ -783,9 +748,7 @@ def withdraw(self, value):
if value > self.current_balance:
raise Exception("This wallet has insufficient balance.")
- self.transaction_set.create(
- value=-value, running_balance=self.current_balance - Decimal(value)
- )
+ self.transaction_set.create(value=-value, running_balance=self.current_balance - Decimal(value))
self.current_balance -= Decimal(value)
self.save()
@@ -903,6 +866,14 @@ def __str__(self):
class Project(models.Model):
+ STATUS_CHOICES = [
+ ("flagship", "Flagship"),
+ ("production", "Production"),
+ ("incubator", "Incubator"),
+ ("lab", "Lab"),
+ ("inactive", "Inactive"),
+ ]
+
organization = models.ForeignKey(
Organization,
null=True,
@@ -913,9 +884,8 @@ class Project(models.Model):
name = models.CharField(max_length=255)
slug = models.SlugField(unique=True, blank=True)
description = models.TextField()
- url = models.URLField(
- unique=True, null=True, blank=True
- ) # Made url nullable in case of no website
+ status = models.CharField(max_length=20, choices=STATUS_CHOICES, default="new")
+ url = models.URLField(unique=True, null=True, blank=True) # Made url nullable in case of no website
project_visit_count = models.IntegerField(default=0)
twitter = models.CharField(max_length=30, null=True, blank=True)
facebook = models.URLField(null=True, blank=True)
@@ -956,9 +926,7 @@ class Contribution(models.Model):
title = models.CharField(max_length=255)
description = models.TextField()
repository = models.ForeignKey(Project, on_delete=models.CASCADE, null=True)
- contribution_type = models.CharField(
- max_length=20, choices=CONTRIBUTION_TYPES, default="commit"
- )
+ contribution_type = models.CharField(max_length=20, choices=CONTRIBUTION_TYPES, default="commit")
github_username = models.CharField(max_length=255, default="")
github_id = models.CharField(max_length=100, null=True, blank=True)
github_url = models.URLField(null=True, blank=True)
@@ -979,9 +947,7 @@ class BaconToken(models.Model):
amount = models.DecimalField(max_digits=10, decimal_places=2)
created = models.DateTimeField(auto_now_add=True)
contribution = models.OneToOneField(Contribution, on_delete=models.CASCADE)
- token_id = models.CharField(
- max_length=64, blank=True, null=True
- ) # Token ID from the Runes protocol
+ token_id = models.CharField(max_length=64, blank=True, null=True) # Token ID from the Runes protocol
def __str__(self):
return f"{self.user.username} - {self.amount} BACON"
@@ -1028,9 +994,7 @@ def clear_blocked_cache(sender, instance=None, **kwargs):
class TimeLog(models.Model):
- user = models.ForeignKey(
- settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="timelogs"
- )
+ user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="timelogs")
# associate organization with sizzle
organization = models.ForeignKey(
Organization,
@@ -1055,9 +1019,7 @@ def __str__(self):
class ActivityLog(models.Model):
- user = models.ForeignKey(
- settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="activity_logs"
- )
+ user = models.ForeignKey(settings.AUTH_USER_MODEL, on_delete=models.CASCADE, related_name="activity_logs")
window_title = models.CharField(max_length=255)
url = models.URLField(null=True, blank=True) # URL field for activity-related URL
recorded_at = models.DateTimeField(auto_now_add=True)
@@ -1245,9 +1207,7 @@ def verify_file_upload(sender, instance, **kwargs):
print(f"Checking if image '{instance.image.name}' exists in the storage backend...")
if not default_storage.exists(instance.image.name):
print(f"Image '{instance.image.name}' was not uploaded to the storage backend.")
- raise ValidationError(
- f"Image '{instance.image.name}' was not uploaded to the storage backend."
- )
+ raise ValidationError(f"Image '{instance.image.name}' was not uploaded to the storage backend.")
class Repo(models.Model):
@@ -1330,15 +1290,11 @@ class ContributorStats(models.Model):
comments = models.PositiveIntegerField(default=0)
# "day" for daily entries, "month" for monthly entries
- granularity = models.CharField(
- max_length=10, choices=[("day", "Day"), ("month", "Month")], default="day"
- )
+ granularity = models.CharField(max_length=10, choices=[("day", "Day"), ("month", "Month")], default="day")
class Meta:
# You can't have two different stats for the same date+granularity
unique_together = ("contributor", "repo", "date", "granularity")
def __str__(self):
- return (
- f"{self.contributor.name} in {self.repo.name} " f"on {self.date} [{self.granularity}]"
- )
+ return f"{self.contributor.name} in {self.repo.name} " f"on {self.date} [{self.granularity}]"
diff --git a/website/views/slack_handlers.py b/website/views/slack_handlers.py
index 7d2f8e62c..806bc9942 100644
--- a/website/views/slack_handlers.py
+++ b/website/views/slack_handlers.py
@@ -4,12 +4,13 @@
import os
import time
+from django.db.models import Count
from django.http import HttpResponse, JsonResponse
from django.views.decorators.csrf import csrf_exempt
from slack import WebClient
from slack_sdk.errors import SlackApiError
-from website.models import SlackIntegration
+from website.models import Domain, Hunt, Issue, Project, SlackIntegration, User
if os.getenv("ENV") != "production":
from dotenv import load_dotenv
@@ -41,10 +42,7 @@ def verify_slack_signature(request):
sig_basestring = f"v0:{timestamp}:{request.body.decode()}"
# Calculate our signature
- my_signature = (
- "v0="
- + hmac.new(SIGNING_SECRET.encode(), sig_basestring.encode(), hashlib.sha256).hexdigest()
- )
+ my_signature = "v0=" + hmac.new(SIGNING_SECRET.encode(), sig_basestring.encode(), hashlib.sha256).hexdigest()
# Compare signatures
is_valid = hmac.compare_digest(my_signature, signature)
@@ -175,9 +173,7 @@ def _handle_team_join(user_id, request):
dm_channel = dm_response["channel"]["id"]
- welcome_blocks = [
- {"type": "section", "text": {"type": "mrkdwn", "text": welcome_message}}
- ]
+ welcome_blocks = [{"type": "section", "text": {"type": "mrkdwn", "text": welcome_message}}]
# Send message using appropriate client
welcome_response = workspace_client.chat_postMessage(
@@ -206,7 +202,45 @@ def slack_commands(request):
team_id = request.POST.get("team_id")
team_domain = request.POST.get("team_domain") # Get the team domain
- if command == "/contrib":
+ if command == "/stats":
+ # Get project counts by status
+ project_stats = Project.objects.values("status").annotate(count=Count("id"))
+ stats_by_status = {stat["status"]: stat["count"] for stat in project_stats}
+
+ # Get other key metrics
+ total_issues = Issue.objects.count()
+ total_users = User.objects.count()
+ total_domains = Domain.objects.count()
+ total_hunts = Hunt.objects.count()
+
+ # Format stats sections with line breaks for readability
+ stats_sections = [
+ "*Project Statistics:*\n",
+ "• Flagship Projects: " f"{stats_by_status.get('flagship', 0)}",
+ "• Production Projects: " f"{stats_by_status.get('production', 0)}",
+ "• Incubator Projects: " f"{stats_by_status.get('incubator', 0)}",
+ "• Lab Projects: " f"{stats_by_status.get('lab', 0)}",
+ "• New Projects: " f"{stats_by_status.get('new', 0)}",
+ "• Active Projects: " f"{stats_by_status.get('active', 0)}",
+ "• Inactive Projects: " f"{stats_by_status.get('inactive', 0)}",
+ "\n*Overall Platform Statistics:*\n",
+ f"• Total Issues: {total_issues}",
+ f"• Total Users: {total_users}",
+ f"• Total Domains: {total_domains}",
+ f"• Total Hunts: {total_hunts}",
+ ]
+
+ stats_message = "\n".join(stats_sections)
+
+ try:
+ # Post message to Slack
+ client = WebClient(token=workspace_client.bot_token)
+ client.chat_postMessage(channel=request.POST.get("channel_id"), text=stats_message)
+ return JsonResponse({"response_type": "in_channel"})
+ except SlackApiError:
+ return JsonResponse({"error": "Error posting message"}, status=500)
+
+ elif command == "/contrib":
try:
# First try to get custom integration
try:
+
- {% else %}
- Repositories
+
+ {% for repo in repos %}
+
+
{% endfor %}
+ {% if repo.logo_url %}
+ 
{% else %}
- {{ user.total_score|floatformat:0 }} Points
+
+
+ No Logo
+
{% endif %}
+
+
+ + {{ repo.name }} +
+ {% if repo.description %}{{ repo.description|truncatechars:150 }}
{% endif %} +
+ {% if repo.primary_language %}
+ {{ repo.primary_language }}
+ {% endif %}
+ {% if repo.stars %}
+
+
+ {{ repo.stars }}
+
+ {% endif %}
+ {% if repo.forks %}
+
+
+ {{ repo.forks }}
+
+ {% endif %}
+ {% if repo.open_issues %}
+
+
+ {{ repo.open_issues }}
+
+ {% endif %}
+
+
+
- View Profile
+ {% if repo.tags.all %}
+
+
+ Last Updated:
+ {{ repo.last_updated|date:"d M Y, H:i" }}
+
+
+
+ License:
+ {{ repo.license }}
+
+
+
+ Visits:
+ {{ repo.repo_visit_count }}
+
+ {% for tag in repo.tags.all %}
+
+ {{ tag.name }}
+
+ {% endfor %}
+
+ {% endif %}
-
+ {% endif %}
+ {% if not issues and not domains and not users and not organizations and not projects and not tags and not repos %}
+ Nothing Found!
+
+
+
+
- {% endif %}
- Nothing Found!