Merge pull request #76 from ppfeufer/development

Fix issue #74

CHANGELOG.md

@@ -9,6 +9,13 @@ and this project adheres to [Semantic Versioning](http://semver.org/).
 ## [In Development] - Unreleased
 
 
+## [2.13.2] - 2022-04-21
+
+### Fixed
+
+- Issue: Custom ping targets not auto-linking in Discord properly. #74
+
+
 ## [2.13.1] - 2022-04-17
 
 ### Added

fleetpings/__init__.py

@@ -2,5 +2,5 @@
 A couple of variables to use throughout the app
 """
 
-__version__ = "2.13.1"
+__version__ = "2.13.2"
 __title__ = "Fleet Pings"

fleetpings/helper/ping_context.py

@@ -15,18 +15,6 @@
 from fleetpings.models import DiscordPingTargets, Webhook
 
 
-def _get_at_mention_from_ping_target(ping_target: str) -> str:
-    """
-    Returning the @-mention for a ping target
-    :param ping_target:
-    :return:
-    """
-
-    return (
-        str(ping_target) if str(ping_target).startswith("@") else "@" + str(ping_target)
-    )
-
-
 def get_ping_context_from_form_data(form_data: dict) -> dict:
     """
     Getting ping context from form data
@@ -43,9 +31,7 @@ def get_ping_context_from_form_data(form_data: dict) -> dict:
             form_data["ping_target"] == "@here"
             or form_data["ping_target"] == "@everyone"
         ):
-            ping_target_at_mention = _get_at_mention_from_ping_target(
-                form_data["ping_target"]
-            )
+            ping_target_at_mention = str(form_data["ping_target"])
         else:
             try:
                 # Check if we deal with a custom ping target
@@ -58,8 +44,10 @@ def get_ping_context_from_form_data(form_data: dict) -> dict:
                 # We deal with a custom ping target, gather the information we need
                 ping_target_group_id = int(ping_target.discord_id)
                 ping_target_group_name = str(ping_target.name)
-                ping_target_at_mention = _get_at_mention_from_ping_target(
-                    ping_target.name
+                ping_target_at_mention = (
+                    str(ping_target.name)
+                    if str(ping_target.name).startswith("@")
+                    else f"@{ping_target.name}"
                 )
 
     # Check for webhooks
@@ -129,9 +117,13 @@ def _get_webhook_ping_context(ping_context: dict) -> dict:
     webhook_ping_target = ""
 
     # Ping target
-    if ping_context["ping_target"]["at_mention"]:
-        webhook_ping_text_header += ping_context["ping_target"]["at_mention"]
-        webhook_ping_text_header += " :: "
+    if ping_context["ping_target"]["group_id"]:
+        ping_target_at_mention = f'<@&{ping_context["ping_target"]["group_id"]}>'
+    else:
+        ping_target_at_mention = str(ping_context["ping_target"]["at_mention"])
+
+    webhook_ping_text_header += ping_target_at_mention
+    webhook_ping_text_header += " :: "
 
     webhook_ping_text_header += "**"
 

fleetpings/templates/fleetpings/form/pingTargets.html

@@ -6,7 +6,7 @@
 
 {% if ping_targets %}
     <option value="" disabled></option>
-    <optgroup label="{% translate 'Additionally configured ping targets (Discord only)' %}">
+    <optgroup label="{% translate 'Additionally configured ping targets' %}">
         {% for ping_target in ping_targets %}
             <option value="{{ ping_target.discord_id }}">@{{ ping_target.name }}</option>
         {% endfor %}