Merge pull request #347 from KryptedGaming/development

Release: 4.2.0

Author: porowns

.gitignore

@@ -103,6 +103,7 @@ ENV/
 # settings
 settings.py
 db.sqlite3
+*.sqlite
 *.db
 .DS_Store
 
@@ -123,3 +124,8 @@ old/
 
 # vscode
 .vscode/
+
+# ignore packages 
+app/packages/*
+!app/packages/.gitkeep
+

.gitmodules

@@ -1,9 +0,0 @@
-[submodule "app/packages/django-eveonline-connector"]
-	path = app/packages/django-eveonline-connector
-	url = https://github.com/KryptedGaming/django-eveonline-connector
-[submodule "app/packages/django-discord-connector"]
-	path = app/packages/django-discord-connector
-	url = https://github.com/KryptedGaming/django-discord-connector.git
-[submodule "app/packages/django-discourse-connector"]
-	path = app/packages/django-discourse-connector
-	url = https://github.com/KryptedGaming/django-discourse-connector

app/accounts/models.py

@@ -25,14 +25,16 @@ def display_name(self):
 
     def display_avatar(self):
         if "django_eveonline_connector" in settings.INSTALLED_APPS:
-            if self.get_eveonline_character():
-                return "https://imageserver.eveonline.com/Character/%s_128.jpg" % self.get_eveonline_character().external_id
+            from django_eveonline_connector.models import EveCharacter
+            character = EveCharacter.get_primary_character(self.user)
+            if character:
+                return "https://imageserver.eveonline.com/Character/%s_128.jpg" % character.external_id
         return "https://api.adorable.io/avatars/160/%s.png" % self.user.username
 
-    def get_eveonline_character(self):
-        if "django_eveonline_connector" not in settings.INSTALLED_APPS:
-            return None
-        if self.user.eve_tokens.all().count() > 0:
-            return self.user.eve_tokens.all()[0].get_primary_character()
+    def get_primary_character(self):
+        if "django_eveonline_connector" in settings.INSTALLED_APPS:
+            from django_eveonline_connector.models import EveCharacter
+            character = EveCharacter.get_primary_character(self.user)
+            return character 
         else:
-            return None
+            return None 

app/accounts/templates/accounts/user_view.html

@@ -82,15 +82,15 @@ <h3 class="profile-username text-center">{{user.info.display_name}}</h3>
                         {% if "django_eveonline_connector" in INSTALLED_APPS %}
                         <li class="list-group-item">
                             <b>EVE Character</b>
-                            {% if user.info.get_eveonline_character %}
+                            {% if user.info.get_primary_character %}
                             <p class="pull-right">
-                                {{user.info.get_eveonline_character.name}}
-                                <a class="text-danger"
-                                    href="{% url 'django-eveonline-connector-sso-token-remove' user.info.get_eveonline_character.token.pk %}"><i
-                                        class="fa fa-times pull-right"></i></a>
+                                {{user.info.get_primary_character.name}}
+                                <a class="text-success"
+                                    href="{% url 'django-eveonline-connector-character-select-primary' %}"><i
+                                        class="fa fa-refresh pull-right"></i></a>
                             </p>
                             {% else %}
-                            <p class="pull-right"><b><a href="{% url 'django-eveonline-connector-sso-token-add' %}">Add
+                            <p class="pull-right"><b><a href="{% url 'django-eveonline-connector-character-select-primary' %}">Select
                                         Main Character</a></b></p>
                             {% endif %}
                         </li>

app/app/__init__.py

@@ -8,7 +8,7 @@
 #         \/        \/ \/                                    \/         \/   #
 
 __title__ = 'Krypted'
-__version__ = '4.1.0'
+__version__ = '4.2.0'
 __author__ = 'Krypted Gaming'
 __license__ = 'MIT License'
 __copyright__ = 'Copyright © 2017-2020 Krypted Gaming. All rights reserved.'

app/app/templates/403.html

@@ -0,0 +1,16 @@
+{% extends "base.html" %}
+{% block title %}
+Permission Denied
+{% endblock %}
+
+{% block header %}
+Permission Denied
+{% endblock %}
+
+{% block description %}
+
+{% endblock %}
+
+{% block content %}
+<p>You were denied access for that action. If you think this was a mistake, contact your administrator.</p>
+{% endblock %}

app/app/views.py

@@ -7,12 +7,17 @@
 from django.contrib.auth.decorators import permission_required, login_required
 from django.urls import reverse_lazy
 from django.views.generic.edit import FormView
+from django.conf import settings
 
 
 @login_required
 def dashboard(request):
+    if 'django_eveonline_connector' in settings.INSTALLED_APPS:
+        from django_eveonline_connector.models import PrimaryEveCharacterAssociation
+        if request.user.eve_tokens.all().count() > 1 and not PrimaryEveCharacterAssociation.objects.filter(user=request.user).exists():
+            messages.warning(request, "You need to select a primary EVE Online character.")
+            return redirect('django-eveonline-connector-character-select-primary')
     return redirect('accounts-user', username=request.user.username)
-
-
+    
 def handler500(request):
     return render(request, '500.html', status=505)

app/applications/apps.py

@@ -1,7 +1,23 @@
 from django.apps import AppConfig
+import os
+import logging
 
 
+logger = logging.getLogger(__name__)
+
 class ApplicationsConfig(AppConfig):
     name = 'applications'
     verbose_name = "Applications"
     url_slug = 'applications'
+
+    APPLICATIONS_NOTIFICATION_CHANNEL = os.environ.get(
+        'APPLICATIONS_NOTIFICATION_CHANNEL', None)
+
+    def ready(self):
+        from django.db.models.signals import post_save
+        from .models import Application
+        from .signals import notify_discord_channel
+        from django.conf import settings 
+        if 'django_discord_connector' in settings.INSTALLED_APPS and self.APPLICATIONS_NOTIFICATION_CHANNEL:
+            logger.info("Application notifications are enabled")
+            post_save.connect(notify_discord_channel, sender=Application)

app/applications/decorators.py

@@ -5,12 +5,18 @@
 
 def user_can_manage_application(function):
     def wrap(request, *args, **kwargs):
+        if 'application_id' in kwargs:
+            application_id = kwargs.get('application_id')
+        elif 'pk' in kwargs:
+            application_id = kwargs.get('pk')
         try:
-            application = Application.objects.get(pk=kwargs['application_id'])
-        except Exception as e:
-            application = Application.objects.get(pk=kwargs['pk'])
+            application = Application.objects.get(pk=application_id)
+        except Application.DoesNotExist:
+            messages.warning(request, "That application no longer exists.")
+            return redirect('application-list')
+
         if application.template not in get_manageable_application_templates(request.user):
             messages.warning(request, "You cannot manage that application, it requires a particular group.")
             return redirect('application-list')
         return function(request, *args, **kwargs)
-    return wrap 
+    return wrap 

app/applications/signals.py

@@ -0,0 +1,43 @@
+from django.dispatch import receiver
+from django.urls import reverse
+from django.db.models.signals import post_save
+from django.apps import apps 
+from django.conf import settings
+from .models import Application
+import logging 
+logger = logging.getLogger(__name__)
+
+@receiver(post_save, sender=Application)
+def notify_discord_channel(sender, **kwargs):
+    if 'created' not in kwargs or not kwargs.get('created'):
+        return
+    try:
+        from django_discord_connector.request import DiscordRequest
+        channel = apps.get_app_config(
+            'applications').APPLICATIONS_NOTIFICATION_CHANNEL
+        application = kwargs.get('instance')
+        
+        application_url = reverse('application-detail', kwargs={'pk': application.pk})
+        url = f"{settings.SITE_PROTOCOL}{settings.SITE_DOMAIN}{application_url}"
+
+        message = {
+            'title': f"New Application - {application.template.name}",
+            'fields': [
+                {
+                    'name' : "Description",
+                    'value': f"There is a new application by {application.request_user}"
+                },
+                {
+                    'name' : "View Application",
+                    'value': f"[Click here to view the application]({url})"
+                },
+            ],
+        }
+
+        response = DiscordRequest.get_instance().send_channel_message(
+            channel, 
+            embed=message
+        )
+
+    except Exception as e:
+        logger.error(f"Failed to notify Discord channel of new application. {e}")