Merge branch 'develop' of git.digitaltelepresence.com:digital-telepresence/dtp-base into develop

app/controllers/admin/announcement.js

@@ -8,7 +8,7 @@ const express = require('express');
 
 const { SiteController } = require('../../../lib/site-lib');
 
-class AnnouncementAdminController extends SiteController {
+class AdminAnnouncementController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -160,6 +160,6 @@ class AnnouncementAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:announcement',
   index: 'adminAnnouncement',
-  className: 'AnnouncementAdminController',
-  create: async (dtp) => { return new AnnouncementAdminController(dtp); },
+  className: 'AdminAnnouncementController',
+  create: async (dtp) => { return new AdminAnnouncementController(dtp); },
 };

app/controllers/admin/attachment.js

@@ -8,7 +8,7 @@ const express = require('express');
 
 const { SiteController } = require('../../../lib/site-lib');
 
-class AttachmentAdminController extends SiteController {
+class AdminAttachmentController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -132,6 +132,6 @@ class AttachmentAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:attachment',
   index: 'adminAttachment',
-  className: 'AttachmentAdminController',
-  create: async (dtp) => { return new AttachmentAdminController(dtp); },
+  className: 'AdminAttachmentController',
+  create: async (dtp) => { return new AdminAttachmentController(dtp); },
 };

app/controllers/admin/content-report.js

@@ -8,7 +8,7 @@ const express = require('express');
 
 const { SiteController } = require('../../../lib/site-lib');
 
-class ContentReportAdminController extends SiteController {
+class AdminContentReportController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -89,6 +89,6 @@ class ContentReportAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:content-report',
   index: 'adminContentReport',
-  className: 'ContentReportAdminController',
-  create: async (dtp) => { return new ContentReportAdminController(dtp); },
+  className: 'AdminContentReportController',
+  create: async (dtp) => { return new AdminContentReportController(dtp); },
 };

app/controllers/admin/core-node.js

@@ -9,7 +9,7 @@ const express = require('express');
 
 const { SiteController, SiteError } = require('../../../lib/site-lib');
 
-class CoreNodeAdminController extends SiteController {
+class AdminCoreNodeController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -161,6 +161,6 @@ class CoreNodeAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:core-node',
   index: 'adminCoreNode',
-  className: 'CoreNodeAdminController',
-  create: async (dtp) => { return new CoreNodeAdminController(dtp); },
+  className: 'AdminCoreNodeController',
+  create: async (dtp) => { return new AdminCoreNodeController(dtp); },
 };

app/controllers/admin/core-user.js

@@ -9,7 +9,7 @@ const express = require('express');
 
 const { SiteController, SiteError } = require('../../../lib/site-lib');
 
-class CoreUserAdminController extends SiteController {
+class AdminCoreUserController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -90,6 +90,6 @@ class CoreUserAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:core-user',
   index: 'adminCoreUser',
-  className: 'CoreUserAdminController',
-  create: async (dtp) => { return new CoreUserAdminController(dtp); },
+  className: 'AdminCoreUserController',
+  create: async (dtp) => { return new AdminCoreUserController(dtp); },
 };

app/controllers/admin/host.js

@@ -12,7 +12,7 @@ const NetHostStats = mongoose.model('NetHostStats');
 
 const { /*SiteError,*/ SiteController } = require('../../../lib/site-lib');
 
-class HostAdminController extends SiteController {
+class AdminHostController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -118,6 +118,6 @@ class HostAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:host',
   index: 'adminHost',
-  className: 'HostAdminController',
-  create: async (dtp) => { return new HostAdminController(dtp); },
+  className: 'AdminHostController',
+  create: async (dtp) => { return new AdminHostController(dtp); },
 };

app/controllers/admin/image.js

@@ -8,7 +8,7 @@ const express = require('express');
 
 const { SiteController, SiteError } = require('../../../lib/site-lib');
 
-class ImageAdminController extends SiteController {
+class AdminImageController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -116,6 +116,6 @@ class ImageAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:image',
   index: 'adminImage',
-  className: 'ImageAdminController',
-  create: async (dtp) => { return new ImageAdminController(dtp); },
+  className: 'AdminImageController',
+  create: async (dtp) => { return new AdminImageController(dtp); },
 };

app/controllers/admin/job-queue.js

@@ -8,7 +8,7 @@ const express = require('express');
 
 const { SiteController, SiteError } = require('../../../lib/site-lib');
 
-class JobQueueAdminController extends SiteController {
+class AdminJobQueueController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -121,6 +121,6 @@ class JobQueueAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:job-queue',
   index: 'adminJobQueue',
-  className: 'JobQueueAdminController',
-  create: async (dtp) => { return new JobQueueAdminController(dtp); },
+  className: 'AdminJobQueueController',
+  create: async (dtp) => { return new AdminJobQueueController(dtp); },
 };

app/controllers/admin/log.js

@@ -8,7 +8,7 @@ const express = require('express');
 
 const { SiteController } = require('../../../lib/site-lib');
 
-class LogAdminController extends SiteController {
+class AdminLogController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -53,6 +53,6 @@ class LogAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:log',
   index: 'adminLog',
-  className: 'LogAdminController',
-  create: async (dtp) => { return new LogAdminController(dtp); },
+  className: 'AdminLogController',
+  create: async (dtp) => { return new AdminLogController(dtp); },
 };

app/controllers/admin/newsletter.js

@@ -8,7 +8,7 @@ const express = require('express');
 
 const { SiteController, SiteError } = require('../../../lib/site-lib');
 
-class NewsletterAdminController extends SiteController {
+class AdminNewsletterController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -169,6 +169,6 @@ class NewsletterAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:newsletter',
   index: 'adminNewsletter',
-  className: 'NewsletterAdminController',
-  create: async (dtp) => { return new NewsletterAdminController(dtp); },
+  className: 'AdminNewsletterController',
+  create: async (dtp) => { return new AdminNewsletterController(dtp); },
 };

app/controllers/admin/newsroom.js

@@ -8,7 +8,7 @@ const express = require('express');
 
 const { SiteController, SiteError } = require('../../../lib/site-lib');
 
-class NewsroomAdminController extends SiteController {
+class AdminNewsroomController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -160,6 +160,6 @@ class NewsroomAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:newsroom',
   index: 'adminNewsroomAdmin',
-  className: 'NewsroomAdminController',
-  create: async (dtp) => { return new NewsroomAdminController(dtp); },
+  className: 'AdminNewsroomController',
+  create: async (dtp) => { return new AdminNewsroomController(dtp); },
 };

app/controllers/admin/otp.js

@@ -9,7 +9,7 @@ const express = require('express');
 
 const { SiteController, SiteError } = require('../../../lib/site-lib');
 
-class OtpAdminController extends SiteController {
+class AdminOtpController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -51,6 +51,6 @@ class OtpAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:otp',
   index: 'adminOtp',
-  className: 'OtpAdminController',
-  create: async (dtp) => { return new OtpAdminController(dtp); },
+  className: 'AdminOtpController',
+  create: async (dtp) => { return new AdminOtpController(dtp); },
 };

app/controllers/admin/service-node.js

@@ -8,7 +8,7 @@ const express = require('express');
 
 const { SiteController, SiteError } = require('../../../lib/site-lib');
 
-class ServiceNodeAdminController extends SiteController {
+class AdminServiceNodeController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -130,6 +130,6 @@ class ServiceNodeAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:service-node',
   index: 'adminServiceNode',
-  className: 'ServiceNodeAdminController',
-  create: async (dtp) => { return new ServiceNodeAdminController(dtp); },
+  className: 'AdminServiceNodeController',
+  create: async (dtp) => { return new AdminServiceNodeController(dtp); },
 };

app/controllers/admin/settings.js

@@ -8,7 +8,7 @@ const express = require('express');
 
 const { SiteController } = require('../../../lib/site-lib');
 
-class SettingsAdminController extends SiteController {
+class AdminSettingsController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -121,12 +121,11 @@ class SettingsAdminController extends SiteController {
       });
     }
   }
-
 }
 
 module.exports = {
   logId: 'ctl:admin:settings',
   index: 'adminSettings',
-  className: 'SettingsAdminController',
-  create: async (dtp) => { return new SettingsAdminController(dtp); },
+  className: 'AdminSettingsController',
+  create: async (dtp) => { return new AdminSettingsController(dtp); },
 };

app/controllers/admin/user.js

@@ -8,7 +8,7 @@ const express = require('express');
 
 const { SiteController, SiteError } = require('../../../lib/site-lib');
 
-class UserAdminController extends SiteController {
+class AdminUserController extends SiteController {
 
   constructor (dtp) {
     super(dtp, module.exports);
@@ -340,6 +340,6 @@ class UserAdminController extends SiteController {
 module.exports = {
   logId: 'ctl:admin:user',
   index: 'adminUser',
-  className: 'UserAdminController',
-  create: async (dtp) => { return new UserAdminController(dtp); },
+  className: 'AdminUserController',
+  create: async (dtp) => { return new AdminUserController(dtp); },
 };

app/workers/newsroom.js

@@ -55,7 +55,7 @@ class NewsroomWorker extends SiteWorker {
     const NOW = new Date();
     const { feed: feedService } = this.dtp.services;
     try {
-      this.log.info('loading latest feed data', {
+      this.log.info('loading latest feed data and favicon', {
         feed: {
           _id: feed._id,
           title: feed.title,
@@ -65,8 +65,10 @@ class NewsroomWorker extends SiteWorker {
           },
         },
       });
+
       await feedService.updateFavicon(feed);
       const response = await feedReader(feed.url);
+
       await SiteAsync.each(response.entries, async (entry) => {
         await Feed.updateOne({ _id: feed._id }, { $set: { published: feed.published || NOW }});
         await feedService.createEntry(feed, entry);

package.json

@@ -29,7 +29,7 @@
     "disposable-email-provider-domains": "^1.0.9",
     "dotenv": "^16.0.0",
     "dtp-jshint-reporter": "git+https://git.digitaltelepresence.com/digital-telepresence/dtp-jshint-reporter.git#master",
-    "dtp-logan-api": "^0.3.2",
+    "dtp-logan-api": "^0.4.1",
     "ein-validator": "^1.0.1",
     "email-domain-check": "^1.1.4",
     "email-validator": "^2.0.4",

yarn.lock

@@ -3274,10 +3274,10 @@ drange@^1.0.2:
   dependencies:
     chalk "^4.1.1"
 
-dtp-logan-api@^0.3.2:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/dtp-logan-api/-/dtp-logan-api-0.3.2.tgz#354c184ce9ea8a31c57bf0592278f5861fe672d2"
-  integrity sha512-7mORjmktZY0xpUNecXVLiHvRkBbJxQkjRom2QFzb+5NLQxml2u28cPegINNIlnFKjduXme7a+MQm0msuCmHYtA==
+dtp-logan-api@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/dtp-logan-api/-/dtp-logan-api-0.4.1.tgz#407aacb9fef9d2e9902fc28b2adf9f6c426c184d"
+  integrity sha512-idw0u8M5/Edg5jTnwTv8w3R8TuM0st/MRrrd9xCJoxcA0fE/xtaOZYV8xzJAyX04e17FXjgTNFE4w2aRxIFHww==
   dependencies:
     bull "^4.10.4"
     ioredis "^5.3.2"