Move random alias generation into :postinit handler.

1 files changed, 5 insertions, 10 deletions

diff --git a/aliases.txr b/aliases.txr
index 0cb49ad..8684ac1 100644
--- a/aliases.txr
+++ b/aliases.txr
@@ -3,7 +3,10 @@
      address memo creation-time
      (:postinit (alias)
        (ifa (stringp alias.creation-time)
-         (set it (int-str it))))
+         (set it (int-str it)))
+       (ifa (eq alias.address :random)
+         (set it (format nil `~,03s-~,03s-~,04s`
+                         (rand 1000) (rand 1000) (rand 10000)))))
      (:method equal (alias) alias.address)
      (:method alt-addresses (alias)
          (list (regsub #/-/ "." alias.address)
@@ -93,13 +96,6 @@
 @  (end)
 @(end)
 @;
-@(define invent-alias (alias))
-@(bind alias @(let ((n1 (rand 1000))
-                    (n2 (rand 1000))
-                    (n3 (rand 10000)))
-                (format nil `~,03s-~,03s-~,04s` n1 n2 n3)))
-@(end)
-@;
 @(define update-aliases (userid postdata))
 @  (local memo aliases delaliases)
 @  (bind url-args @(split-str postdata "&"))
@@ -116,8 +112,7 @@ memo=@memo
 @    (skip)
 create=@(skip)
 @    (load-aliases userid aliases)
-@    (invent-alias new-address)
-@    (do (push (new (alias new-address memo (time))) aliases))
+@    (do (push (new (alias :random memo (time))) aliases))
 @    (store-aliases userid aliases)
 @  (or)
 @    (load-aliases userid aliases)