diff --git a/src/digest.js b/src/digest.js
index f5a89bbc5..b717a07b0 100644
--- a/src/digest.js
+++ b/src/digest.js
@@ -28,42 +28,36 @@ function maybeSend(callback) {
var pendingAppUpdates = updateInfo.apps || {};
pendingAppUpdates = Object.keys(pendingAppUpdates).map(function (key) { return pendingAppUpdates[key]; });
- appstore.getSubscription(function (error, subscription) {
- if (error) debug('Error getting subscription:', error);
+ eventlog.getByCreationTime(new Date(new Date() - 7*86400000), function (error, events) {
+ if (error) return callback(error);
- eventlog.getByCreationTime(new Date(new Date() - 7*86400000), function (error, events) {
- if (error) return callback(error);
+ var appUpdates = events.filter(function (e) { return e.action === eventlog.ACTION_APP_UPDATE; }).map(function (e) { return e.data; });
+ var boxUpdates = events.filter(function (e) { return e.action === eventlog.ACTION_UPDATE; }).map(function (e) { return e.data; });
+ var certRenewals = events.filter(function (e) { return e.action === eventlog.ACTION_CERTIFICATE_RENEWAL; }).map(function (e) { return e.data; });
+ var usersAdded = events.filter(function (e) { return e.action === eventlog.ACTION_USER_ADD; }).map(function (e) { return e.data; });
+ var usersRemoved = events.filter(function (e) { return e.action === eventlog.ACTION_USER_REMOVE; }).map(function (e) { return e.data; });
+ var finishedBackups = events.filter(function (e) { return e.action === eventlog.ACTION_BACKUP_FINISH && !e.errorMessage; }).map(function (e) { return e.data; });
- var appUpdates = events.filter(function (e) { return e.action === eventlog.ACTION_APP_UPDATE; }).map(function (e) { return e.data; });
- var boxUpdates = events.filter(function (e) { return e.action === eventlog.ACTION_UPDATE; }).map(function (e) { return e.data; });
- var certRenewals = events.filter(function (e) { return e.action === eventlog.ACTION_CERTIFICATE_RENEWAL; }).map(function (e) { return e.data; });
- var usersAdded = events.filter(function (e) { return e.action === eventlog.ACTION_USER_ADD; }).map(function (e) { return e.data; });
- var usersRemoved = events.filter(function (e) { return e.action === eventlog.ACTION_USER_REMOVE; }).map(function (e) { return e.data; });
- var finishedBackups = events.filter(function (e) { return e.action === eventlog.ACTION_BACKUP_FINISH && !e.errorMessage; }).map(function (e) { return e.data; });
+ if (error) return callback(error);
- if (error) return callback(error);
+ var info = {
+ pendingAppUpdates: pendingAppUpdates,
+ pendingBoxUpdate: updateInfo.box || null,
- var info = {
- hasSubscription: !appstore.isFreePlan(subscription),
+ finishedAppUpdates: appUpdates,
+ finishedBoxUpdates: boxUpdates,
- pendingAppUpdates: pendingAppUpdates,
- pendingBoxUpdate: updateInfo.box || null,
+ certRenewals: certRenewals,
+ finishedBackups: finishedBackups, // only the successful backups
+ usersAdded: usersAdded,
+ usersRemoved: usersRemoved // unused because we don't have username to work with
+ };
- finishedAppUpdates: appUpdates,
- finishedBoxUpdates: boxUpdates,
+ // always send digest for backup failure notification
+ debug('maybeSend: sending digest email', info);
+ mailer.sendDigest(info);
- certRenewals: certRenewals,
- finishedBackups: finishedBackups, // only the successful backups
- usersAdded: usersAdded,
- usersRemoved: usersRemoved // unused because we don't have username to work with
- };
-
- // always send digest for backup failure notification
- debug('maybeSend: sending digest email', info);
- mailer.sendDigest(info);
-
- callback();
- });
+ callback();
});
});
}
diff --git a/src/mail_templates/digest.ejs b/src/mail_templates/digest.ejs
index 31d38d993..13673936c 100644
--- a/src/mail_templates/digest.ejs
+++ b/src/mail_templates/digest.ejs
@@ -53,11 +53,6 @@ Last successful backup: <%- info.finishedBackups[0].backupId || info.finishedBac
This Cloudron did **not** backup successfully in the last week!
<% } -%>
-<% if (!info.hasSubscription) { -%>
-
-*Keep your Cloudron automatically up-to-date and secure by upgrading to a paid plan at* <%= webadminUrl %>/#/settings
-<% } -%>
-
Powered by https://cloudron.io
Sent at: <%= new Date().toUTCString() %>
@@ -156,12 +151,6 @@ Sent at: <%= new Date().toUTCString() %>
<% } %>
-
- <% if (!info.hasSubscription) { %>
- Keep your Cloudron automatically up-to-date and secure by upgrading to a paid plan.
- <% } %>
-
-