From ff71e06ad1ede135b8929c46c4b55a7dd3b65dc8 Mon Sep 17 00:00:00 2001
From: Chocobozzz <me@florianbigard.com>
Date: Mon, 23 Jan 2023 11:08:42 +0100
Subject: Add user registration policy info

---
 .../shared-instance/instance-features-table.component.html       | 7 +++----
 .../shared/shared-instance/instance-features-table.component.ts  | 9 +++++++++
 server/tests/helpers/version.ts                                  | 5 +++++
 3 files changed, 17 insertions(+), 4 deletions(-)

diff --git a/client/src/app/shared/shared-instance/instance-features-table.component.html b/client/src/app/shared/shared-instance/instance-features-table.component.html
index 6c05764df..205f2bc97 100644
--- a/client/src/app/shared/shared-instance/instance-features-table.component.html
+++ b/client/src/app/shared/shared-instance/instance-features-table.component.html
@@ -18,10 +18,9 @@
     </tr>
 
     <tr>
-      <th i18n class="label" scope="row">User registration allowed</th>
-      <td>
-        <my-feature-boolean [value]="serverConfig.signup.allowed"></my-feature-boolean>
-      </td>
+      <th i18n class="label" scope="row">User registration</th>
+
+      <td class="value">{{ buildRegistrationLabel() }}</td>
     </tr>
 
     <tr>
diff --git a/client/src/app/shared/shared-instance/instance-features-table.component.ts b/client/src/app/shared/shared-instance/instance-features-table.component.ts
index e405c5790..c3df7c594 100644
--- a/client/src/app/shared/shared-instance/instance-features-table.component.ts
+++ b/client/src/app/shared/shared-instance/instance-features-table.component.ts
@@ -56,6 +56,15 @@ export class InstanceFeaturesTableComponent implements OnInit {
     if (policy === 'display') return $localize`Displayed`
   }
 
+  buildRegistrationLabel () {
+    const config = this.serverConfig.signup
+
+    if (config.allowed !== true) return $localize`Disabled`
+    if (config.requiresApproval === true) return $localize`Requires approval by moderators`
+
+    return $localize`Enabled`
+  }
+
   getServerVersionAndCommit () {
     return this.serverService.getServerVersionAndCommit()
   }
diff --git a/server/tests/helpers/version.ts b/server/tests/helpers/version.ts
index 7d5600715..2a90efba3 100644
--- a/server/tests/helpers/version.ts
+++ b/server/tests/helpers/version.ts
@@ -21,11 +21,16 @@ describe('Version', function () {
     expect(compareSemVer('3.4.0-alpha.1', '3.4.0-beta.1')).to.be.below(0)
     expect(compareSemVer('3.4.0-beta.1', '3.4.0-beta.2')).to.be.below(0)
     expect(compareSemVer('3.4.0-beta.1', '3.5.0-alpha.1')).to.be.below(0)
+
+    expect(compareSemVer('3.4.0-alpha.1', '3.4.0-nightly.4')).to.be.below(0)
+    expect(compareSemVer('3.4.0-nightly.3', '3.4.0-nightly.4')).to.be.below(0)
+    expect(compareSemVer('3.3.0-nightly.5', '3.4.0-nightly.4')).to.be.below(0)
   })
 
   it('Should correctly compare a stable and unstable versions', async function () {
     expect(compareSemVer('3.4.0', '3.4.1-beta.1')).to.be.below(0)
     expect(compareSemVer('3.4.0-beta.1', '3.4.0-beta.2')).to.be.below(0)
     expect(compareSemVer('3.4.0-beta.1', '3.4.0')).to.be.below(0)
+    expect(compareSemVer('3.4.0-nightly.4', '3.4.0')).to.be.below(0)
   })
 })
-- 
cgit v1.2.3