From 427ca4e3f5ac7e83484bfd2e86c11d16d7382dfe Mon Sep 17 00:00:00 2001
From: changchiyou <changchiyou@gmail.com>
Date: Tue, 26 Mar 2024 15:45:36 +0800
Subject: [PATCH] refactor: dynamically swap `activitySubtitle` and
 `activityImage` if `CUSTOM_NAME` has been set

---
 backend/config.py        | 26 ++++++++++++--------------
 backend/utils/webhook.py |  6 +++---
 2 files changed, 15 insertions(+), 17 deletions(-)

diff --git a/backend/config.py b/backend/config.py
index 67edd3f4f..613b747a0 100644
--- a/backend/config.py
+++ b/backend/config.py
@@ -1,29 +1,27 @@
-import os
-import chromadb
-from chromadb import Settings
-from base64 import b64encode
-from bs4 import BeautifulSoup
-
-from pathlib import Path
 import json
-import yaml
+import os
+import shutil
+from base64 import b64encode
+from pathlib import Path
+from secrets import token_bytes
 
+import chromadb
 import markdown
 import requests
-import shutil
-
-from secrets import token_bytes
+import yaml
+from bs4 import BeautifulSoup
+from chromadb import Settings
 from constants import ERROR_MESSAGES
 
-
 try:
-    from dotenv import load_dotenv, find_dotenv
+    from dotenv import find_dotenv, load_dotenv
 
     load_dotenv(find_dotenv("../.env"))
 except ImportError:
     print("dotenv not installed, skipping...")
 
 WEBUI_NAME = "Open WebUI"
+WEBUI_FAVICON_URL = "https://openwebui.com/favicon.png"
 shutil.copyfile("../build/favicon.png", "./static/favicon.png")
 
 ####################################
@@ -111,7 +109,7 @@ if CUSTOM_NAME:
         data = r.json()
         if r.ok:
             if "logo" in data:
-                url = (
+                WEBUI_FAVICON_URL = url = (
                     f"https://api.openwebui.com{data['logo']}"
                     if data["logo"][0] == "/"
                     else data["logo"]
diff --git a/backend/utils/webhook.py b/backend/utils/webhook.py
index 51157a4e4..4cfa41640 100644
--- a/backend/utils/webhook.py
+++ b/backend/utils/webhook.py
@@ -1,7 +1,7 @@
 import json
 
 import requests
-from config import VERSION
+from config import VERSION, WEBUI_FAVICON_URL, WEBUI_NAME
 
 
 def post_webhook(url: str, message: str, event_data: dict) -> bool:
@@ -26,8 +26,8 @@ def post_webhook(url: str, message: str, event_data: dict) -> bool:
                 "sections": [
                     {
                         "activityTitle": message,
-                        "activitySubtitle": f"Open WebUI ({VERSION}) - {action}",
-                        "activityImage": "https://openwebui.com/favicon.png",
+                        "activitySubtitle": f"{WEBUI_NAME} ({VERSION}) - {action}",
+                        "activityImage": WEBUI_FAVICON_URL,
                         "facts": facts,
                         "markdown": True,
                     }