Merge pull request #199 from zediious/0.5.5

Changes for 0.5.5

Author: zediious

raptorWeb/raptorbot/discordbot/bot.py

@@ -82,6 +82,9 @@ async def on_ready() -> None:
                 task_check.check_tasks.start(raptor_bot)
                 LOGGER.info("Started task check loop")
 
+                await presence.update_member_count(raptor_bot)
+                LOGGER.info('Updated Discord Guild to currently set guild.')
+
             except Exception as e:
                 LOGGER.error(e)
 

raptorWeb/raptorbot/discordbot/util/presence.py

@@ -58,10 +58,11 @@ async def update_member_count(bot_instance: commands.Bot) -> None:
             online_members += 1
 
     try:
-        await DiscordGuild.objects.aget(guild_id = server.id)
-        await DiscordGuild.objects.filter(guild_id = server.id).aupdate(
+        await DiscordGuild.objects.afirst().aupdate(
             total_members = member_total,
-            online_members = online_members
+            online_members = online_members,
+            guild_name = server.name,
+            guild_id = server.id,
         )
 
     except DiscordGuild.DoesNotExist:

raptorWeb/raptorbot/views.py

@@ -215,5 +215,6 @@ def post(self, request: HttpRequest, *args: tuple, **kwargs: dict) -> HttpRespon
             messages.error(request, "You cannot send commands to the Discord Bot when it is not running.")
             return HttpResponse(status=204)
 
+        botware.send_command_update_members()
         messages.success(request, "Member counts for the Discord Guild have been updated.")
         return HttpResponse(status=204)

raptorWeb/raptormc/models.py

@@ -10,6 +10,8 @@
 
 from django_resized import ResizedImageField
 
+from raptorWeb.raptorbot.models import DiscordBotTasks
+
 LOGGER: Logger = getLogger('raptormc.models')
 
 class DonationCurrencyChoices(models.TextChoices):
@@ -952,6 +954,11 @@ def post_save_site_info(sender, instance, *args, **kwargs):
                 instance.avatar_image)
             small_site_info.save()
             LOGGER.info("New Avatar Image detected, new favicon created from it.")
+
+    if instance.discord_global_announcement_channel or instance.discord_staff_role or instance.discord_guild:
+        tasks: DiscordBotTasks = DiscordBotTasks.objects.get_or_create(pk=1)[0]
+        tasks.update_members = True
+        tasks.save()
 
 @receiver(pre_save, sender=NotificationToast)
 def strip_script_tags(sender, instance, *args, **kwargs):

raptorWeb/raptormc/routes.py

@@ -100,7 +100,7 @@ def _get_main_routes():
                     continue
 
             gathered_text = informative_texts.filter(name=f'{str(pattern.name).title()} Information')
-            if gathered_text is not None:
+            if gathered_text.exists():
                 current_routes.append(
                     Route(
                         name=pattern.name,
@@ -165,7 +165,7 @@ def _verify_route(current_route):
     main_routes = _get_main_routes()
     if len(found_route) > 0:
 
-        if main_routes.name == 'main_with_text':
+        if main_routes.route_type == 'main_with_text':
             return {
                 "og_color": site_info.main_color,
                 "og_url": f"{WEB_PROTO}://{DOMAIN_NAME}/{request_path}",

raptorWeb/templates/panel/crud/completeddonation_view.html

@@ -2,41 +2,51 @@
     <title>{{ site_info_model.brand_name }} | Completed Donation from {{object.minecraft_username}} on {{object.donation_datetime}}</title>
 </head>
 
+<div class="card bg-dark text-center text-white p-3 mb-2">
+    <p class='fs-5 text-wrap' data-bs-toggle="tooltip" data-bs-title="{{ object.donation_datetime|date }} at {{ object.donation_datetime|time }}">
+        <span class="fs-3">{{ object.donation_datetime|timesince }} ago</span>
+    </p>
+</div>
+
 <div class='card bg-dark text-white p-3'>
     <div class='d-flex flex-wrap justify-content-evenly m-3 text-center gap-1'>
-        {% if completeddonation.donating_user %}
-        <p class='fs-5 badge bg-secondary'>
-            <a style="color: #ffffff" target="_blank" href="{{completeddonation.donating_user.get_absolute_url}}">{{completeddonation.donating_user}}</a>
-        </p>
-        {% endif %}
-        <p class='fs-5 badge bg-secondary'>
-            Minecraft Username: {{ object.minecraft_username }}
-        </p>
-        <p class='fs-5 badge bg-secondary'>
-            Discord Username: {%if object.discord_username%}{{object.discord_username}}{%else%}Discord Username: None{%endif%}
-        </p>
-        <p class='fs-5 badge bg-primary'>
-            Date: {{ object.donation_datetime|date }} | {{ object.donation_datetime|time }}
-        </p>
+        <div class="card-header">
+            {% if completeddonation.donating_user %}
+            <p class='fs-5 badge bg-secondary text-wrap'>
+                <a style="color: #ffffff" target="_blank" href="{{completeddonation.donating_user.get_absolute_url}}">Site User: <span class="fs-3">{{completeddonation.donating_user}}</span></a>
+            </p>
+            {% endif %}
+            <p class='fs-5 badge bg-secondary text-wrap'>
+                Minecraft Username: <span class="fs-3">{{ object.minecraft_username }}</span>
+            </p>
+            {% if completeddonation.discord_username %}
+            <p class='fs-5 badge bg-secondary text-wrap'>
+                Discord Username: <span class="fs-3">{{object.discord_username}}</span>
+            </p>
+            {% endif %}
+        </div>
+    </div>
+    <div class='d-flex flex-wrap justify-content-evenly m-3 text-center gap-1'>
         {% if completeddonation.completed %}
         <p class='fs-5 badge bg-success'>
         {% else %}
         <p class='fs-5 badge bg-warning'>
         {% endif %}
-            <a style="color: #ffffff" target="_blank" href="{{completeddonation.bought_package.get_absolute_url}}">Package: {{completeddonation.bought_package}}</a>
+            <a style="color: #ffffff" target="_blank" href="{{completeddonation.bought_package.get_absolute_url}}">Package: <span class="fs-3">{{completeddonation.bought_package}}</span></a>
         </p>
         {% if completeddonation.completed %}
         <p class='fs-5 badge bg-success'>
-            Spent: {{completeddonation.spent}}
+            Spent: <span class="fs-3 text-wrap">{{completeddonation.spent}}</span>
         </p>
         {% endif %}
         {% if completeddonation.completed %}
         <p class='fs-5 badge bg-success'>
-            Status: Complete
+            Status: <span class="fs-3 text-wrap">Complete</span>
         </p>
         {% else %}
         <p class='fs-5 badge bg-danger'>
-            Status: Incomplete
+            Status: <span class="fs-3 text-wrap">Incomplete</span>
+            
         </p>
         {% endif %}
     </div>
@@ -45,22 +55,43 @@
         {% if perms.donations.resendbenefits_completeddonation %}
         <form>
             {% csrf_token %}
-            <a role='button' class='btn btn-warning'
+            <a role='button' class='btn btn-warning' data-bs-toggle="tooltip" data-bs-title="Re-send the commands given for this donation to the assigned gameservers.&#013;WARNING: This can potentially be destructive!"
                     hx-post="{% url 'donations:resend' %}?pk={{object.pk}}&do_commands=true&do_roles=false"
+                    hx-confirm="Are you sure you want to re-send gameserver commands for this donation?"
+                    hx-disabled-elt="this"
                     hx-swap='none'
             >
                 Re-send Commands
             </a>
         </form>
         <form>
             {% csrf_token %}
-            <a role='button' class='btn btn-warning'
+            <a role='button' class='btn btn-warning' data-bs-toggle="tooltip" data-bs-title="Re-give the Discord roles given for this donation to the assigned Discord users.&#013;WARNING: This can potentially be destructive!"
                     hx-post="{% url 'donations:resend' %}?pk={{object.pk}}&do_commands=false&do_roles=true"
+                    hx-confirm="Are you sure you want to re-give Discord roles for this donation?"
+                    hx-disabled-elt="this"
                     hx-swap='none'
             >
                 Re-give Roles
             </a>
         </form>
         {% endif %}
     </div>
-</div>
+    <div class='d-flex flex-wrap justify-content-evenly m-3 text-center gap-1'>
+        <p class='fs-5 badge bg-success text-wrap'>
+            Times commands sent: <span class="fs-3 text-wrap">{{completeddonation.sent_commands_count}}</span>
+        </p>
+        <p class='fs-5 badge bg-success text-wrap'>
+            Times roles given: <span class="fs-3 text-wrap">{{completeddonation.gave_roles_count}}</span>
+        </p>
+    </div>
+</div>
+
+<script>
+    try {
+        tooltipTriggerList
+    } catch (error) {
+        const tooltipTriggerList = document.querySelectorAll('[data-bs-toggle="tooltip"]')
+        const tooltipList = [...tooltipTriggerList].map(tooltipTriggerEl => new bootstrap.Tooltip(tooltipTriggerEl))
+    }
+</script>