Merge branch 'master' into notification-fixes

plugins/talk-plugin-local-auth/server/mutators.js

@@ -55,9 +55,9 @@ async function updateUserEmailAddress(ctx, email, confirmPassword) {
   }
 
   // Get some context for the email to be sent.
-  const { organizationContactEmail } = await Settings.load([
-    'organizationContactEmail',
-  ]);
+  const { organizationContactEmail } = await Settings.select(
+    'organizationContactEmail'
+  );
 
   // Send off the email to the old email address that we have changed it.
   await Mailer.send({

plugins/talk-plugin-notifications/server/util.js

@@ -3,7 +3,7 @@ const getOrganizationName = async ctx => {
   const { loaders: { Settings } } = ctx;
 
   // Get the settings.
-  const { organizationName = null } = await Settings.load('organizationName');
+  const { organizationName = null } = await Settings.select('organizationName');
 
   return organizationName;
 };

plugins/talk-plugin-profile-data/server/connect.js

@@ -36,10 +36,10 @@ module.exports = connectors => {
         const {
           organizationName,
           organizationContactEmail,
-        } = await Settings.load([
+        } = await Settings.select(
           'organizationName',
-          'organizationContactEmail',
-        ]);
+          'organizationContactEmail'
+        );
 
         // rescheduledDeletionDate is the date in the future that we'll set the
         // user's account to be deleted on if this delete fails.

plugins/talk-plugin-profile-data/server/mutators.js

@@ -81,7 +81,7 @@ async function sendDownloadLink(ctx) {
   // Generate the download links.
   const { downloadLandingURL } = await generateDownloadLinks(ctx, user.id);
 
-  const { organizationName } = await Settings.load('organizationName');
+  const { organizationName } = await Settings.select('organizationName');
 
   // Send the download link via the user's attached email account.
   await Users.sendEmail(user, {
@@ -130,7 +130,7 @@ async function requestDeletion({
     }
   );
 
-  const { organizationName } = await Settings.load('organizationName');
+  const { organizationName } = await Settings.select('organizationName');
 
   // Send the download link via the user's attached email account.
   await Users.sendEmail(user, {
@@ -171,7 +171,7 @@ async function cancelDeletion({
     { $unset: { 'metadata.scheduledDeletionDate': 1 } }
   );
 
-  const { organizationName } = await Settings.load('organizationName');
+  const { organizationName } = await Settings.select('organizationName');
 
   // Send the download link via the user's attached email account.
   await Users.sendEmail(user, {