From 6340ad348c0a88153a572ac8a36237f2e2d90075 Mon Sep 17 00:00:00 2001
From: Inex Code <inex.code@selfprivacy.org>
Date: Wed, 11 Sep 2024 13:15:32 +0300
Subject: [PATCH] chore: Recover fixes destroyed by force push

Please don't do this again
---
 selfprivacy_api/services/__init__.py | 16 ++++++++--------
 selfprivacy_api/services/api_icon.py |  5 +++++
 selfprivacy_api/services/service.py  |  2 +-
 3 files changed, 14 insertions(+), 9 deletions(-)
 create mode 100644 selfprivacy_api/services/api_icon.py

diff --git a/selfprivacy_api/services/__init__.py b/selfprivacy_api/services/__init__.py
index 6602530..aa67bfa 100644
--- a/selfprivacy_api/services/__init__.py
+++ b/selfprivacy_api/services/__init__.py
@@ -3,11 +3,10 @@
 import base64
 import typing
 from typing import List
-from os import path, mkdir, remove
+from os import path, remove
 from os import makedirs
 from os import listdir
 from os.path import join
-from pathlib import Path
 
 from selfprivacy_api.services.bitwarden import Bitwarden
 from selfprivacy_api.services.forgejo import Forgejo
@@ -23,8 +22,8 @@ from selfprivacy_api.services.service import Service, ServiceDnsRecord
 from selfprivacy_api.services.service import ServiceStatus
 import selfprivacy_api.utils.network as network_utils
 
-from selfprivacy_api.services.test_service.icon import BITWARDEN_ICON
-from selfprivacy_api.utils import USERDATA_FILE, DKIM_DIR, SECRETS_FILE
+from selfprivacy_api.services.api_icon import API_ICON
+from selfprivacy_api.utils import USERDATA_FILE, DKIM_DIR, SECRETS_FILE, get_domain
 from selfprivacy_api.utils.block_devices import BlockDevices
 from shutil import copyfile, copytree, rmtree
 
@@ -105,17 +104,18 @@ class ServiceManager(Service):
     def get_svg_icon() -> str:
         """Read SVG icon from file and return it as base64 encoded string."""
         # return ""
-        return base64.b64encode(BITWARDEN_ICON.encode("utf-8")).decode("utf-8")
+        return base64.b64encode(API_ICON.encode("utf-8")).decode("utf-8")
 
     @staticmethod
     def get_url() -> typing.Optional[str]:
         """Return service url."""
-        # TODO : placeholder, get actual domain here
-        return f"https://domain"
+        domain = get_domain()
+        subdomain = ServiceManager.get_subdomain()
+        return f"https://{subdomain}.{domain}" if subdomain else None
 
     @staticmethod
     def get_subdomain() -> typing.Optional[str]:
-        return None
+        return "api"
 
     @staticmethod
     def is_always_active() -> bool:
diff --git a/selfprivacy_api/services/api_icon.py b/selfprivacy_api/services/api_icon.py
new file mode 100644
index 0000000..e29aebd
--- /dev/null
+++ b/selfprivacy_api/services/api_icon.py
@@ -0,0 +1,5 @@
+API_ICON = """
+<svg width="33" height="33" viewBox="0 0 33 33" fill="none" xmlns="http://www.w3.org/2000/svg">
+<path fill-rule="evenodd" clip-rule="evenodd" d="M0.98671 4.79425C0.98671 2.58511 2.77757 0.79425 4.98671 0.79425H28.9867C31.1958 0.79425 32.9867 2.58511 32.9867 4.79425V28.7943C32.9867 31.0034 31.1958 32.7943 28.9867 32.7943H4.98671C2.77757 32.7943 0.98671 31.0034 0.98671 28.7943V4.79425ZM26.9867 21.1483L24.734 18.8956V18.8198H24.6582L22.5047 16.6674V18.8198H11.358V23.2785H22.5047V25.6315L26.9867 21.1483ZM9.23944 10.1584H9.26842L11.4688 7.95697V10.1584H22.6154V14.6171H11.4688V16.9233L6.98671 12.439L9.23944 10.1863V10.1584Z" fill="black"/>
+</svg>
+"""
diff --git a/selfprivacy_api/services/service.py b/selfprivacy_api/services/service.py
index 3295c04..e013bd7 100644
--- a/selfprivacy_api/services/service.py
+++ b/selfprivacy_api/services/service.py
@@ -427,7 +427,7 @@ class Service(ABC):
             Jobs.update(
                 job=job,
                 status=JobStatus.FINISHED,
-                result=f"{service_name} moved successfully(no folders).",
+                result=f"{service_name} moved successfully (no folders).",
                 status_text=f"NOT starting {service_name}",
                 progress=100,
             )