Implement following system, bio, ~notifications~, profanity checking and generic UI updates

README.md

@@ -73,6 +73,9 @@ please [report it! ](https://github.com/splashcat-ink/splashcat/issues/new "repo
 If it's a security vulnerability please contact [email protected] or use GitHub's tools for reporting
 security issues. Do **not** use a public GitHub issue.
 
+## Upload battles to local instance of Splashcat
+To upload battle data to a local debug instance of splashcat follow [this guide](https://github.com/splashcat-ink/splashcat/blob/main/UPLOADING-BATTLES.md)
+
 ## Donating
 
 Sponsoring me will support Splashcat and its server costs. Getting the $5+ monthly tier also gives you some little

UPLOADING-BATTLES.md

@@ -0,0 +1,36 @@
+## How to upload battles (For Development)
+This guide is for uploading battles to Splashcat in a local debug instance. The guide for uploading it to the production website is [here](https://splashcat.ink/uploaders-information/)
+
+Ensure that you are running Splashcat in **debug** mode and at address `http://127.0.0.1:8000`
+1.  Enter poetry shell
+```bash
+cd *splashcat directory*
+poetry shell
+```
+2. Download the required SplatNet 3 assets (Note: This might take a long time if you have a slow internet connection and it is important you do it in the order below)
+```bash
+python manage.py updateall
+```
+3. Install [Deno](https://deno.land/) (if it isn't installed)
+
+4. Upload battles to Splashcat
+```bash
+python manage.py runserver
+deno run -Ar https://raw.githubusercontent.com/bentheminernz/s3si.ts-local-splashcat/main/s3si.ts -e splashcat
+```
+
+5. Follow the instuctions to setup s3si.ts and afterwards your battles should just upload to Splashcat!
+
+### Manually Update SplatNet 3 assets
+Use this if updateall isn't working or you want to update individual asset types.
+```bash
+./manage.py updatelocalizationstrings
+./manage.py updategear
+./manage.py updatesplashtags
+./manage.py updatestages
+./manage.py updateweapons
+./manage.py updatetitles
+./manage.py updateawards
+./manage.py updatechallenges
+./manage.py updatesplatfests
+```

battles/templates/battles/global_data_export.html

@@ -1,7 +1,7 @@
 {% extends "base.html" %}
 
 {% block content %}
-    <h1 class="text-3xl font-splatoon1">
+    <h1 class="text-3xl font-splatoon1 ">
         {% block title %}
             Global Data Exports
         {% endblock %}
@@ -12,7 +12,7 @@ <h1 class="text-3xl font-splatoon1">
 
     {% if user.is_verified_for_export_download %}
         <a href="{% url 'battles:redirect_global_data_export' %}"
-           class="p-4 rounded bg-pink-600 hover:bg-pink-700 block w-fit">Download</a>
+           class="px-4 py-2 my-3 rounded bg-pink-600 hover:bg-pink-700 block w-fit">Download</a>
     {% else %}
         <div>
             Your account does not meet the requirements to download the data. Splashcat has some basic requirements for
@@ -191,7 +191,7 @@ <h3 class="text-lg">
         </tbody>
     </table>
 
-    <h3 class="text-lg">
+    <h3 class="text-lg mt-4">
         Players
     </h3>
 

battles/templates/battles/view_battle.html

@@ -172,26 +172,6 @@ <h1 class="text-3xl font-splatoon1">
             {% endfor %}
         </div>
 
-        <div class="row-start-1 row-end-2 lg:col-start-1 lg:col-end-4 lg:row-start-4 lg:row-end-5 px-4 text-center text-gray-50 flex flex-col gap-2 justify-end [text-shadow:1px_1px_black]">
-            <span>
-                <span>{{ battle.played_time }}</span>
-                <span>{{ battle.duration|duration }}</span>
-            </span>
-
-            <span>
-                <span>{{ battle.player.paint }}p</span>
-                {% if battle.power %}
-                    Power: {{ battle.power|format_power }}
-                {% endif %}
-                {% if battle.splatfest_clout_contribution %}
-                    <span>Clout: {{ battle.splatfest_clout_contribution }}</span>
-                {% endif %}
-                {% if battle.splatfest_festival_shells %}
-                    <span>Festival Shells: {{ battle.splatfest_festival_shells }}</span>
-                {% endif %}
-            </span>
-        </div>
-
         <div class="row-start-2 row-end-3 lg:col-start-1 lg:col-end-4 lg:row-start-5 lg:row-end-6 bg-gray-800/50 relative bg-[url('../images/tapes-transparent.png')] bg-contain rounded-lg px-4 py-2 mx-4 mb-4 flex flex-col gap-2">
             <div class="flex gap-4">
                 <span class="text-xl md:text-3xl font-splatoon1">

groups/migrations/0006_alter_group_description_alter_group_name.py

@@ -0,0 +1,24 @@
+# Generated by Django 5.1.1 on 2024-09-30 00:36
+
+import groups.models
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('groups', '0005_alter_group_pending_invites_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name='group',
+            name='description',
+            field=models.TextField(blank=True, default='', validators=[groups.models.validate_no_profanity]),
+        ),
+        migrations.AlterField(
+            model_name='group',
+            name='name',
+            field=models.CharField(max_length=255, validators=[groups.models.validate_no_profanity]),
+        ),
+    ]

groups/models.py

@@ -1,17 +1,23 @@
 from django.db import models
 from django.urls import reverse
 
+from better_profanity import profanity
+from django.core.exceptions import ValidationError
 
 # Create your models here.
 
+def validate_no_profanity(value):
+        if profanity.contains_profanity(value):
+            raise ValidationError(("This text contains inappropriate language."))
+
 class Group(models.Model):
     class PrivacyLevels(models.TextChoices):
         PUBLIC = 'PUBLIC', 'Public'
         RESTRICTED = 'RESTRICTED', 'Restricted'
         PRIVATE = 'PRIVATE', 'Private'
 
-    name = models.CharField(max_length=255)
-    description = models.TextField(blank=True, default='')
+    name = models.CharField(max_length=255, validators=[validate_no_profanity])
+    description = models.TextField(blank=True, default='', validators=[validate_no_profanity])
     members = models.ManyToManyField('users.User', through='Membership')
     owner = models.ForeignKey('users.User', related_name='groups_owned', on_delete=models.CASCADE)
     pending_invites = models.ManyToManyField('users.User', related_name='pending_group_invites', blank=True)

groups/templates/groups/admin/index.html

@@ -42,6 +42,16 @@ <h1 class="text-3xl font-splatoon1 mb-2">
         </div>
 
         <div class="form-div-cards">
+            <div>
+                <h1 class="text-xl font-splatoon1 mt-1">Delete Group</h1>
+                <p class="mb-4">Note: All members will be kicked, this is <b>irreversible!</b></p>
+                <a hx-post="{% url 'groups:delete_group' group.id %}"
+                   hx-confirm="Are you sure you want to delete this group?"
+                   class="bg-red-700 py-2 px-4 rounded w-fit cursor-pointer">
+                    Delete Group
+                </a>    
+            </div>
+
             {% if group.privacy_level == group.PrivacyLevels.RESTRICTED %}
                 <div>
                     <h1 class="text-xl font-splatoon1">Pending Join Requests</h1>

groups/templates/groups/view.html

@@ -16,7 +16,7 @@ <h1 class="font-splatoon1 text-3xl pb-2">
         {% endif %}
         {% if is_group_member and group.owner != user %}
             <a hx-post="{% url 'groups:leave_group' group.id %}"
-               hx-confirm="Are you sure you want to leave {{ group.name }}?" class="bg-purple-700 p-2 rounded w-fit">
+               hx-confirm="Are you sure you want to leave {{ group.name }}?" class="bg-purple-700 p-2 rounded w-fit cursor-pointer">
                 Leave Group
             </a>
         {% endif %}

groups/urls.py

@@ -1,13 +1,14 @@
 from django.urls import path
 
 from groups.views import view_group, groups_index, group_admin, answer_join_request, invite_to_group, \
-    answer_group_invite, request_join_group, join_group, leave_group, create_group
+    answer_group_invite, request_join_group, join_group, leave_group, create_group, delete_group
 
 app_name = "groups"
 urlpatterns = [
     path("", groups_index, name="index"),
     path("<int:group_id>/", view_group, name="view_group"),
     path("<int:group_id>/admin/", group_admin, name="group_admin"),
+    path("<int:group_id>/admin/delete/", delete_group, name="delete_group"),
     path("create/", create_group, name="create_group"),
     path("<int:group_id>/request/", request_join_group, name="request_join_group"),
     path("<int:group_id>/request/answer/", answer_join_request, name="answer_join_request"),

groups/views.py

@@ -189,3 +189,12 @@ def leave_group(request, group_id):
         group.members.remove(request.user)
         messages.success(request, f'Left {group.name}.')
     return HttpResponseClientRedirect(reverse('groups:index'))
+
+@require_POST
+def delete_group(request, group_id):
+    group = get_object_or_404(Group, pk=group_id)
+    if group.owner != request.user:
+        return HttpResponseForbidden()
+    group.delete()
+    messages.success(request, 'Group deleted.')
+    return HttpResponseClientRedirect(reverse('groups:index'))