From 0da185e6894d82f6156ca3fe82e20e718206332c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Matej=20Ba=C4=8Do?= <matejbaco2000@gmail.com>
Date: Wed, 15 Apr 2026 18:17:55 +0200
Subject: [PATCH] Refactor fixes

---
 app/controllers/api/account.php               |  4 +--
 app/controllers/api/projects.php              |  3 +-
 app/init/models.php                           |  2 --
 src/Appwrite/SDK/Specification/Format.php     | 10 ------
 src/Appwrite/Utopia/Response.php              |  1 -
 .../Utopia/Response/Model/TemplateSMS.php     | 32 -------------------
 6 files changed, 4 insertions(+), 48 deletions(-)
 delete mode 100644 src/Appwrite/Utopia/Response/Model/TemplateSMS.php

diff --git a/app/controllers/api/account.php b/app/controllers/api/account.php
index 357c071c85..a913a3bd90 100644
--- a/app/controllers/api/account.php
+++ b/app/controllers/api/account.php
@@ -2267,8 +2267,8 @@ Http::post('/v1/account/tokens/magic-url')
         $preview = $locale->getText("emails.magicSession.preview");
         
         $customTemplate =
-            $project->getAttribute('templates', [])['email.magicSession-' . $locale->default] ?? 
-            $project->getAttribute('templates', [])['email.magicSession-' . 'worldwide'] ?? [];
+            $project->getAttribute('templates', [])['email.magicSession-' . $locale->default] ??
+            $project->getAttribute('templates', [])['email.magicSession-worldwide'] ?? [];
 
         $detector = new Detector($request->getUserAgent('UNKNOWN'));
         $agentOs = $detector->getOS();
diff --git a/app/controllers/api/projects.php b/app/controllers/api/projects.php
index 3b83c37acd..0cd5a27c3a 100644
--- a/app/controllers/api/projects.php
+++ b/app/controllers/api/projects.php
@@ -865,7 +865,8 @@ Http::get('/v1/projects/:projectId/templates/email/:type/:locale')
         }
 
         $templates = $project->getAttribute('templates', []);
-        $template  = $templates['email.' . $type . '-' . $locale] ?? null;
+        $template  = $templates['email.' . $type . '-' . $locale]
+            ?? ($locale !== 'worldwide' ? ($templates['email.' . $type . '-worldwide'] ?? null) : null);
 
         $localeObj = new Locale($locale);
         $localeObj->setFallback(System::getEnv('_APP_LOCALE', 'en'));
diff --git a/app/init/models.php b/app/init/models.php
index dd97b03652..9aa21e992b 100644
--- a/app/init/models.php
+++ b/app/init/models.php
@@ -135,7 +135,6 @@ use Appwrite\Utopia\Response\Model\TemplateFramework;
 use Appwrite\Utopia\Response\Model\TemplateFunction;
 use Appwrite\Utopia\Response\Model\TemplateRuntime;
 use Appwrite\Utopia\Response\Model\TemplateSite;
-use Appwrite\Utopia\Response\Model\TemplateSMS;
 use Appwrite\Utopia\Response\Model\TemplateVariable;
 use Appwrite\Utopia\Response\Model\Token;
 use Appwrite\Utopia\Response\Model\Topic;
@@ -373,7 +372,6 @@ Response::setModel(new Headers());
 Response::setModel(new Specification());
 Response::setModel(new Rule());
 Response::setModel(new Schedule());
-Response::setModel(new TemplateSMS());
 Response::setModel(new TemplateEmail());
 Response::setModel(new ConsoleVariables());
 Response::setModel(new MFAChallenge());
diff --git a/src/Appwrite/SDK/Specification/Format.php b/src/Appwrite/SDK/Specification/Format.php
index 91b090a9f6..eb1b45142e 100644
--- a/src/Appwrite/SDK/Specification/Format.php
+++ b/src/Appwrite/SDK/Specification/Format.php
@@ -595,16 +595,6 @@ abstract class Format
                                 return 'EmailTemplateLocale';
                         }
                         break;
-                    case 'getSmsTemplate':
-                    case 'updateSmsTemplate':
-                    case 'deleteSmsTemplate':
-                        switch ($param) {
-                            case 'type':
-                                return 'SmsTemplateType';
-                            case 'locale':
-                                return 'SmsTemplateLocale';
-                        }
-                        break;
                     case 'createPlatform':
                         switch ($param) {
                             case 'type':
diff --git a/src/Appwrite/Utopia/Response.php b/src/Appwrite/Utopia/Response.php
index 04d2813e30..d747373b59 100644
--- a/src/Appwrite/Utopia/Response.php
+++ b/src/Appwrite/Utopia/Response.php
@@ -265,7 +265,6 @@ class Response extends SwooleResponse
     public const MODEL_VARIABLE = 'variable';
     public const MODEL_VARIABLE_LIST = 'variableList';
     public const MODEL_VCS = 'vcs';
-    public const MODEL_SMS_TEMPLATE = 'smsTemplate';
     public const MODEL_EMAIL_TEMPLATE = 'emailTemplate';
 
     // Health
diff --git a/src/Appwrite/Utopia/Response/Model/TemplateSMS.php b/src/Appwrite/Utopia/Response/Model/TemplateSMS.php
deleted file mode 100644
index 2b19ef4878..0000000000
--- a/src/Appwrite/Utopia/Response/Model/TemplateSMS.php
+++ /dev/null
@@ -1,32 +0,0 @@
-<?php
-
-namespace Appwrite\Utopia\Response\Model;
-
-use Appwrite\Utopia\Response;
-
-class TemplateSMS extends Template
-{
-    public function __construct()
-    {
-        parent::__construct();
-    }
-    /**
-     * Get Name
-     *
-     * @return string
-     */
-    public function getName(): string
-    {
-        return 'SmsTemplate';
-    }
-
-    /**
-     * Get Type
-     *
-     * @return string
-     */
-    public function getType(): string
-    {
-        return Response::MODEL_SMS_TEMPLATE;
-    }
-}