Separate fallback name from name.

1 files changed, 17 insertions, 21 deletions

diff --git a/lib/Matrix/Client/Room.pm6 b/lib/Matrix/Client/Room.pm6
index 4c51be6..e0b14a2 100644
--- a/lib/Matrix/Client/Room.pm6
+++ b/lib/Matrix/Client/Room.pm6
@@ -12,26 +12,11 @@ submethod TWEAK {
     $!url-prefix = "/rooms/$!id";
 }
 
-method !format-name-from-members {
-    my @members = $.joined-members.kv.map(
-        -> $k, %v {
-            %v<display_name> // $k
-        }
-    );
-
-    $!name = do given @members.elems {
-        when 1 { @members.first }
-        when 2 { @members[0] ~ " and " ~ @members[1] }
-        when * > 2 { @members.first ~ " and {@members.elems - 1} others" }
-        default { "Empty room" }
-    };
-}
-
 method !get-name() {
     CATCH {
         when X::Matrix::Response {
             .code ~~ /M_NOT_FOUND/
-            ?? self!format-name-from-members
+            ?? ($!name = '')
             !! fail
         }
         default { fail }
@@ -45,16 +30,27 @@ method joined-members {
     %data<joined>
 }
 
-method name() {
-    if $!name {
-        return $!name;
-    }
-
+method name {
     self!get-name;
 
     $!name
 }
 
+method fallback-name(--> Str) {
+    my @members = $.joined-members.kv.map(
+        -> $k, %v {
+            %v<display_name> // $k
+        }
+    );
+
+    $!name = do given @members.elems {
+        when 1 { @members.first }
+        when 2 { @members[0] ~ " and " ~ @members[1] }
+        when * > 2 { @members.first ~ " and {@members.elems - 1} others" }
+        default { "Empty room" }
+    };
+}
+
 method messages() {
     my $res = $.get("/messages");
     my $data = from-json($res.content);