From 8af7dbc35ad75ac428abf1ea8a834d8a0dc5d585 Mon Sep 17 00:00:00 2001
From: Girish Ramakrishnan <girish@cloudron.io>
Date: Fri, 23 Aug 2019 15:09:06 -0700
Subject: [PATCH] group -> list

---
 src/ldap.js               |  2 +-
 src/mail.js               |  6 +++---
 src/mailboxdb.js          | 12 ++++++------
 src/test/database-test.js |  2 +-
 src/test/groups-test.js   |  2 +-
 src/test/ldap-test.js     |  2 +-
 6 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/ldap.js b/src/ldap.js
index 0d4107005..f9ff73163 100644
--- a/src/ldap.js
+++ b/src/ldap.js
@@ -371,7 +371,7 @@ function mailingListSearch(req, res, next) {
     var parts = email.split('@');
     if (parts.length !== 2) return next(new ldap.NoSuchObjectError(req.dn.toString()));
 
-    mailboxdb.getGroup(parts[0], parts[1], function (error, group) {
+    mailboxdb.getList(parts[0], parts[1], function (error, group) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return next(new ldap.NoSuchObjectError(req.dn.toString()));
         if (error) return next(new ldap.OperationsError(error.toString()));
 
diff --git a/src/mail.js b/src/mail.js
index f4cdef808..42b059c0d 100644
--- a/src/mail.js
+++ b/src/mail.js
@@ -1203,7 +1203,7 @@ function getLists(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    mailboxdb.listGroups(domain, function (error, result) {
+    mailboxdb.getLists(domain, function (error, result) {
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
         callback(null, result);
@@ -1215,7 +1215,7 @@ function getList(domain, listName, callback) {
     assert.strictEqual(typeof listName, 'string');
     assert.strictEqual(typeof callback, 'function');
 
-    mailboxdb.getGroup(listName, domain, function (error, result) {
+    mailboxdb.getList(listName, domain, function (error, result) {
         if (error && error.reason === DatabaseError.NOT_FOUND) return callback(new MailError(MailError.NOT_FOUND, 'no such list'));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
@@ -1242,7 +1242,7 @@ function addList(name, domain, members, auditSource, callback) {
         if (error) return callback(error);
     }
 
-    mailboxdb.addGroup(name, domain, members, function (error) {
+    mailboxdb.addList(name, domain, members, function (error) {
         if (error && error.reason === DatabaseError.ALREADY_EXISTS) return callback(new MailError(MailError.ALREADY_EXISTS, 'list already exits'));
         if (error) return callback(new MailError(MailError.INTERNAL_ERROR, error));
 
diff --git a/src/mailboxdb.js b/src/mailboxdb.js
index 41313f58e..18d8cf45b 100644
--- a/src/mailboxdb.js
+++ b/src/mailboxdb.js
@@ -2,7 +2,7 @@
 
 exports = module.exports = {
     addMailbox: addMailbox,
-    addGroup: addGroup,
+    addList: addList,
 
     updateMailboxOwner: updateMailboxOwner,
     updateList: updateList,
@@ -10,10 +10,10 @@ exports = module.exports = {
 
     listAliases: listAliases,
     listMailboxes: listMailboxes,
-    listGroups: listGroups,
+    getLists: getLists,
 
     getMailbox: getMailbox,
-    getGroup: getGroup,
+    getList: getList,
     getAlias: getAlias,
 
     getAliasesForName: getAliasesForName,
@@ -75,7 +75,7 @@ function updateMailboxOwner(name, domain, ownerId, callback) {
     });
 }
 
-function addGroup(name, domain, members, callback) {
+function addList(name, domain, members, callback) {
     assert.strictEqual(typeof name, 'string');
     assert.strictEqual(typeof domain, 'string');
     assert(Array.isArray(members));
@@ -197,7 +197,7 @@ function listMailboxes(domain, callback) {
         });
 }
 
-function listGroups(domain, callback) {
+function getLists(domain, callback) {
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
 
@@ -211,7 +211,7 @@ function listGroups(domain, callback) {
         });
 }
 
-function getGroup(name, domain, callback) {
+function getList(name, domain, callback) {
     assert.strictEqual(typeof name, 'string');
     assert.strictEqual(typeof domain, 'string');
     assert.strictEqual(typeof callback, 'function');
diff --git a/src/test/database-test.js b/src/test/database-test.js
index 4c9fee826..d6248e5b0 100644
--- a/src/test/database-test.js
+++ b/src/test/database-test.js
@@ -2127,7 +2127,7 @@ describe('database', function () {
         });
 
         it('cannot get non-existing group', function (done) {
-            mailboxdb.getGroup('random', DOMAIN_0.domain, function (error) {
+            mailboxdb.getList('random', DOMAIN_0.domain, function (error) {
                 expect(error.reason).to.be(DatabaseError.NOT_FOUND);
                 done();
             });
diff --git a/src/test/groups-test.js b/src/test/groups-test.js
index f0e88486f..90e0efaac 100644
--- a/src/test/groups-test.js
+++ b/src/test/groups-test.js
@@ -163,7 +163,7 @@ describe('Groups', function () {
     });
 
     it('did delete mailbox', function (done) {
-        mailboxdb.getGroup(GROUP0_NAME.toLowerCase(), DOMAIN_0.domain, function (error) {
+        mailboxdb.getList(GROUP0_NAME.toLowerCase(), DOMAIN_0.domain, function (error) {
             expect(error.reason).to.be(DatabaseError.NOT_FOUND);
             done();
         });
diff --git a/src/test/ldap-test.js b/src/test/ldap-test.js
index 59dfc4e41..1342790d3 100644
--- a/src/test/ldap-test.js
+++ b/src/test/ldap-test.js
@@ -787,7 +787,7 @@ describe('Ldap', function () {
 
     describe('search mailing list', function () {
         before(function (done) {
-            mailboxdb.addGroup('devs', DOMAIN_0.domain, [ USER_0.username.toLowerCase(), USER_1.username.toLowerCase() ], done);
+            mailboxdb.addList('devs', DOMAIN_0.domain, [ USER_0.username.toLowerCase(), USER_1.username.toLowerCase() ], done);
         });
 
         it('get specific list', function (done) {