commit e74741bd72dc3d64544e392e219b5835bfc621ec
author Adrien Béraud <adrien.beraud@savoirfairelinux.com> Mon Apr 19 13:22:54 2021 -0400
committer Adrien Béraud <adrien.beraud@savoirfairelinux.com> Mon Apr 19 13:22:54 2021 -0400
tree 4baa80d4292b782e940242e175ef7efe1a1a3564
parent 3b5d9a64359fafd91b152bbae8a49eca77430e8c

use ESM, add server setup, cleanup

Change-Id: Iafac35c2082523ae98c31017d9bad5c4d6e18ef3

model/Account.js

diff --git a/model/Account.js b/model/Account.js
index 1f70c33..46f96ed 100644
--- a/model/Account.js
+++ b/model/Account.js
@@ -1,4 +1,4 @@
-const Contact = require('./Contact')
+import Contact from './Contact.js'
 
 class Account {
     constructor(id, details, volatileDetails) {
@@ -52,6 +52,10 @@
         return this.getRegisteredName() || this.getUri()
     }
 
+    getDisplayNameNoFallback() {
+        return this.details["Account.displayName"] || this.getRegisteredName()
+    }
+
     getConversationIds() {
         return Object.keys(this.conversations)
     }
@@ -91,4 +95,4 @@
 Account.BOOL_TRUE = "true"
 Account.BOOL_FALSE = "false"
 
-module.exports = Account
+export default Account

model/Contact.js

diff --git a/model/Contact.js b/model/Contact.js
index 9d00098..8fa26b2 100644
--- a/model/Contact.js
+++ b/model/Contact.js
@@ -30,4 +30,4 @@
     }
 }
 
-module.exports = Contact;
+export default Contact

model/Conversation.js

diff --git a/model/Conversation.js b/model/Conversation.js
index 22dc477..09fb76f 100644
--- a/model/Conversation.js
+++ b/model/Conversation.js
@@ -1,4 +1,4 @@
-const Contact = require('./Contact')
+import Contact from './Contact.js'
 
 class Conversation {
     constructor(id, accountId, members) {
@@ -62,4 +62,4 @@
     }
 }
 
-module.exports = Conversation;
+export default Conversation;