change event display handle to accept other_handle, and only have Instagram link if display handle is an ig_handle

Author: ericahan22

backend/services/openai_service.py

@@ -9,9 +9,7 @@
 
 import json
 import os
-import time
 import traceback
-from copy import deepcopy
 from datetime import datetime
 
 from dotenv import load_dotenv
@@ -505,10 +503,10 @@ def generate_recommended_filters(self, events_data: list[dict]) -> list[list[str
             return []
 
 
-
 # Singleton instance
 openai_service = OpenAIService()
 
+
 # Backward compatibility - export functions that use the singleton
 generate_embedding = openai_service.generate_embedding
 extract_events_from_caption = openai_service.extract_events_from_caption

backend/utils/events_utils.py

@@ -29,8 +29,7 @@ def determine_display_handle(event):
     """
     Determine a display handle for an event.
     Accepts either a dict-like object (with .get) or a Django model instance (attributes).
-    Prefers social handles in order: ig, discord, x, tiktok, fb. Prepends '@' unless already present.
-    Falls back to event.school or "Wat2Do Event".
+    Prefers ig_handle, then other_handle, then event.school.
     """
 
     def _get(key):
@@ -40,18 +39,12 @@ def _get(key):
         # model instance / object
         return getattr(event, key, None)
 
-    social_handles = [
-        _get("ig_handle"),
-        _get("discord_handle"),
-        _get("x_handle"),
-        _get("tiktok_handle"),
-        _get("fb_handle"),
-    ]
-    social_handles = [h for h in social_handles if h]
-
-    if social_handles:
-        handle = social_handles[0]
-        handle_str = str(handle)
-        return handle_str
+    ig_handle = _get("ig_handle")
+    other_handle = _get("other_handle")
     school = _get("school")
+
+    if ig_handle:
+        return str(ig_handle)
+    if other_handle:
+        return str(other_handle)
     return school or "Wat2Do Event"

frontend/package-lock.json

@@ -91,21 +91,24 @@ const OrganizationBadge = ({
 }) => {
   if (!event.display_handle) return null;
 
+  // Only link if display_handle is an ig_handle
+  const isInstagram = !!event.ig_handle && event.display_handle === event.ig_handle;
+
   return (
     <BadgeMask variant="bottom-left">
       <Badge
         onMouseDown={() => {
-          if (!isSelectMode) {
+          if (!isSelectMode && isInstagram) {
             window.open(
               `https://www.instagram.com/${event.display_handle}/`,
               "_blank"
             );
           }
         }}
         variant="outline"
-        className="font-extrabold cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-800"
+        className={`font-extrabold${isInstagram ? " cursor-pointer hover:bg-gray-100 dark:hover:bg-gray-800" : ""}`}
       >
-        @{event.display_handle}
+        {isInstagram ? `@${event.display_handle}` : event.display_handle}
       </Badge>
     </BadgeMask>
   );