From d399e5b93bac92bcbe82a79e6aecb90a92f38fe7 Mon Sep 17 00:00:00 2001
From: Daniel Wagner-Hall <daniel@matrix.org>
Date: Wed, 9 Sep 2015 13:16:46 +0100
Subject: [PATCH] Use an alias object rather than flat fields

---
 templating/matrix_templates/units.py | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/templating/matrix_templates/units.py b/templating/matrix_templates/units.py
index 24fb3767..d8cc213d 100644
--- a/templating/matrix_templates/units.py
+++ b/templating/matrix_templates/units.py
@@ -248,14 +248,16 @@ class MatrixUnits(Units):
 
                 endpoints.append(endpoint)
 
-                for alias in single_api.get("x-aliases", []):
-                    alias_link = single_api.get("x-alias-link")
-                    endpoints.append({
-                        "method": method.upper(),
-                        "path": alias,
-                        "alias_for_path": full_path,
-                        "alias_link": alias_link
-                    })
+                aliases = single_api.get("x-alias", None)
+                if aliases:
+                    alias_link = aliases["canonical-link"]
+                    for alias in aliases["aliases"]:
+                        endpoints.append({
+                            "method": method.upper(),
+                            "path": alias,
+                            "alias_for_path": full_path,
+                            "alias_link": alias_link
+                        })
 
         return {
             "base": api.get("basePath"),