Fix issue where posts that hadnt already started were showing as ending soon

Always show year in datetime strings if the year is not the current year

Lint fixes

Author: tibetsprague

apps/backend/api/models/Post.js

@@ -50,7 +50,7 @@ module.exports = bookshelf.Model.extend(Object.assign({
   requireFetch: false,
   hasTimestamps: true,
 
-  _localId: null,  // Used to store the localId of the post coming from the client and passed back to the client, for optimistic updates
+  _localId: null, // Used to store the localId of the post coming from the client and passed back to the client, for optimistic updates
 
   // Instance Methods
 
@@ -152,10 +152,12 @@ module.exports = bookshelf.Model.extend(Object.assign({
   },
 
   comments: function () {
-    return this.hasMany(Comment, 'post_id').query({ where: {
-      'comments.active': true,
-      'comments.comment_id': null
-    }})
+    return this.hasMany(Comment, 'post_id').query({
+      where: {
+        'comments.active': true,
+        'comments.comment_id': null
+      }
+    })
   },
 
   linkPreview: function () {
@@ -256,13 +258,13 @@ module.exports = bookshelf.Model.extend(Object.assign({
 
   getCommentersTotal: function (currentUserId) {
     return countTotal(User.query(commentersQuery(null, this, currentUserId)).query(), 'users')
-    .then(result => {
-      if (isEmpty(result)) {
-        return 0
-      } else {
-        return result[0].total
-      }
-    })
+      .then(result => {
+        if (isEmpty(result)) {
+          return 0
+        } else {
+          return result[0].total
+        }
+      })
   },
 
   // Emulate the graphql request for a post in the feed so the feed can be
@@ -272,8 +274,8 @@ module.exports = bookshelf.Model.extend(Object.assign({
   getNewPostSocketPayload: function () {
     const { media, groups, linkPreview, tags, user, proposalOptions } = this.relations
 
-    const creator = refineOne(user, [ 'id', 'name', 'avatar_url' ])
-    const topics = refineMany(tags, [ 'id', 'name' ])
+    const creator = refineOne(user, ['id', 'name', 'avatar_url'])
+    const topics = refineMany(tags, ['id', 'name'])
 
     // TODO: Sanitization -- sanitize details here if not passing through `text` getter
     return Object.assign({},
@@ -301,14 +303,14 @@ module.exports = bookshelf.Model.extend(Object.assign({
         { name: 'title', num_people_reacts: 'peopleReactedTotal', num_votes: 'votesTotal' }
       ),
       {
-        attachments: refineMany(media, [ 'id', 'type', 'url' ]),
+        attachments: refineMany(media, ['id', 'type', 'url']),
         // Shouldn't have commenters immediately after creation
         commenters: [],
         commentsTotal: 0,
         creator,
         details: this.details(),
-        groups: refineMany(groups, [ 'id', 'name', 'slug' ]),
-        linkPreview: refineOne(linkPreview, [ 'id', 'image_url', 'title', 'description', 'url' ]),
+        groups: refineMany(groups, ['id', 'name', 'slug']),
+        linkPreview: refineOne(linkPreview, ['id', 'image_url', 'title', 'description', 'url']),
         proposalOptions,
         proposalVotes: [],
         topics
@@ -369,11 +371,11 @@ module.exports = bookshelf.Model.extend(Object.assign({
 
   unreadCountForUser: function (userId) {
     return this.lastReadAtForUser(userId)
-    .then(date => {
-      if (date > this.get('updated_at')) return 0
-      return Aggregate.count(this.comments().query(q =>
-        q.where('created_at', '>', date)))
-    })
+      .then(date => {
+        if (date > this.get('updated_at')) return 0
+        return Aggregate.count(this.comments().query(q =>
+          q.where('created_at', '>', date)))
+      })
   },
 
   // ****** Setters ******//
@@ -391,11 +393,11 @@ module.exports = bookshelf.Model.extend(Object.assign({
     const newUserIds = difference(userIds, existingUserIds)
     const updatedFollowers = await this.updateFollowers(existingUserIds, updatedAttribs, { transacting })
     const newFollowers = []
-    for (let id of newUserIds) {
+    for (const id of newUserIds) {
       const follower = await this.postUsers().create(
         Object.assign({}, updatedAttribs, {
           user_id: id,
-          created_at: new Date(),
+          created_at: new Date()
         }), { transacting })
       newFollowers.push(follower)
     }
@@ -498,11 +500,11 @@ module.exports = bookshelf.Model.extend(Object.assign({
   },
 
   pushTypingToSockets: function (userId, userName, isTyping, socketToExclude) {
-    pushToSockets(postRoom(this.id), 'userTyping', {userId, userName, isTyping}, socketToExclude)
+    pushToSockets(postRoom(this.id), 'userTyping', { userId, userName, isTyping }, socketToExclude)
   },
 
   copy: function (attrs) {
-    var that = this.clone()
+    const that = this.clone()
     _.merge(that.attributes, Post.newPostAttrs(), attrs)
     delete that.id
     delete that.attributes.id
@@ -517,7 +519,7 @@ module.exports = bookshelf.Model.extend(Object.assign({
     let activitiesToCreate = []
 
     const mentions = RichText.getUserMentions(this.details())
-    let mentioned = mentions.map(userId => ({
+    const mentioned = mentions.map(userId => ({
       reader_id: userId,
       post_id: this.id,
       actor_id: this.get('user_id'),
@@ -534,20 +536,20 @@ module.exports = bookshelf.Model.extend(Object.assign({
         qb.whereIn('tag_id', tags.map('id'))
         qb.whereIn('tag_follows.group_id', groups.map('id'))
       })
-      .fetchAll({ withRelated: ['tag'], transacting: trx })
+        .fetchAll({ withRelated: ['tag'], transacting: trx })
 
       const tagFollowers = tagFollows.map(tagFollow => ({
         reader_id: tagFollow.get('user_id'),
         post_id: this.id,
-          actor_id: this.get('user_id'),
-          group_id: tagFollow.get('group_id'),
-          reason: `chat: ${tagFollow.relations.tag.get('name')}`
-        }))
+        actor_id: this.get('user_id'),
+        group_id: tagFollow.get('group_id'),
+        reason: `chat: ${tagFollow.relations.tag.get('name')}`
+      }))
 
       activitiesToCreate = activitiesToCreate.concat(tagFollowers)
     } else {
       // Non-chat posts are sent to all members of the groups the post is in
-      let members = await Promise.all(groups.map(async group => {
+      const members = await Promise.all(groups.map(async group => {
         const userIds = await group.members().fetch().then(u => u.pluck('id'))
         const newPosts = userIds.map(userId => ({
           reader_id: userId,
@@ -579,7 +581,7 @@ module.exports = bookshelf.Model.extend(Object.assign({
     const eventInvitations = await EventInvitation.query(qb => {
       qb.where('event_id', this.id)
     })
-    .fetchAll({transacting: trx})
+      .fetchAll({ transacting: trx })
 
     const invitees = eventInvitations.map(eventInvitation => ({
       reader_id: eventInvitation.get('user_id'),
@@ -683,7 +685,7 @@ module.exports = bookshelf.Model.extend(Object.assign({
   },
 
   updateProposalOutcome: function (proposalOutcome) {
-    return Post.where({ id: this.id }).query().update({ proposal_outcome: proposalOutcome})
+    return Post.where({ id: this.id }).query().update({ proposal_outcome: proposalOutcome })
   },
 
   removeFromGroup: function (idOrSlug) {
@@ -738,7 +740,7 @@ module.exports = bookshelf.Model.extend(Object.assign({
   },
 
   countForUser: function (user, type) {
-    const attrs = {user_id: user.id, 'posts.active': true}
+    const attrs = { user_id: user.id, 'posts.active': true }
     if (type) attrs.type = type
     return this.query().count().where(attrs).then(rows => rows[0].count)
   },
@@ -749,13 +751,13 @@ module.exports = bookshelf.Model.extend(Object.assign({
       q.join('tags', 'tags.id', 'posts_tags.tag_id')
       q.whereIn('tags.name', ['request', 'offer', 'resource'])
       q.groupBy('tags.name')
-      q.where({'posts.user_id': user.id, 'posts.active': true})
+      q.where({ 'posts.user_id': user.id, 'posts.active': true })
       q.select('tags.name')
     }).query().count()
-    .then(rows => rows.reduce((m, n) => {
-      m[n.name] = n.count
-      return m
-    }, {}))
+      .then(rows => rows.reduce((m, n) => {
+        m[n.name] = n.count
+        return m
+      }, {}))
   },
 
   havingExactFollowers (userIds) {
@@ -764,7 +766,7 @@ module.exports = bookshelf.Model.extend(Object.assign({
       q.join('posts_users', 'posts.id', 'posts_users.post_id')
       q.where('posts_users.active', true)
       q.groupBy('posts.id')
-      q.having(bookshelf.knex.raw(`array_agg(posts_users.user_id order by posts_users.user_id) = ?`, [userIds]))
+      q.having(bookshelf.knex.raw('array_agg(posts_users.user_id order by posts_users.user_id) = ?', [userIds]))
     })
   },
 
@@ -821,16 +823,16 @@ module.exports = bookshelf.Model.extend(Object.assign({
     })
   },
 
-  upcomingPostReminders: function (collection, digestType) {
+  upcomingPostReminders: async function (group, digestType) {
     const startTime = DateTime.now().setZone(defaultTimezone).toISO()
     // If daily digest show posts that have reminders in the next 2 days
     // If weekly digest show posts that have reminders in the next 7 days
     const endTime = digestType === 'daily'
       ? DateTime.now().setZone(defaultTimezone).plus({ days: 2 }).endOf('day').toISO()
       : DateTime.now().setZone(defaultTimezone).plus({ days: 7 }).endOf('day').toISO()
 
-    const startingSoon = collection.query(function (qb) {
-      qb.whereRaw('posts.start_time between ? and ?', [startTime, endTime])
+    const startingSoon = await group.posts().query(function (qb) {
+      qb.whereRaw('(posts.start_time between ? and ?)', [startTime, endTime])
       qb.whereIn('posts.type', ['event', 'offer', 'project', 'proposal', 'resource', 'request'])
       qb.where('posts.fulfilled_at', null)
       qb.where('posts.active', true)
@@ -839,9 +841,9 @@ module.exports = bookshelf.Model.extend(Object.assign({
       .fetch({ withRelated: ['user'] })
       .then(get('models'))
 
-    const endingSoon = collection.query(function (qb) {
-      qb.whereRaw('posts.end_time between ? and ?', [startTime, endTime])
-      qb.whereRaw('start_time < ?', [startTime]) // Only show posts as ending soon that have already started
+    const endingSoon = await group.posts().query(function (qb) {
+      qb.whereRaw('(posts.end_time between ? and ?)', [startTime, endTime])
+      qb.whereRaw('(posts.start_time < ?)', startTime) // Explicitly cast to timestamp with time zone
       qb.whereIn('posts.type', ['event', 'offer', 'project', 'proposal', 'resource', 'request'])
       qb.where('posts.fulfilled_at', null)
       qb.where('posts.active', true)
@@ -850,10 +852,10 @@ module.exports = bookshelf.Model.extend(Object.assign({
       .fetch({ withRelated: ['user'] })
       .then(get('models'))
 
-    return Promise.all([startingSoon, endingSoon]).then(([startingSoon, endingSoon]) => ({
+    return {
       startingSoon,
       endingSoon
-    }))
+    }
   },
 
   newPostAttrs: () => ({
@@ -870,17 +872,17 @@ module.exports = bookshelf.Model.extend(Object.assign({
   },
 
   async updateFromNewComment ({ postId, commentId }) {
-    const where = {post_id: postId, 'comments.active': true}
+    const where = { post_id: postId, 'comments.active': true }
     const now = new Date()
 
     return Promise.all([
       Comment.query().where(where).orderBy('created_at', 'desc').limit(2)
-      .pluck('id').then(ids => Promise.all([
-        Comment.query().whereIn('id', ids).update('recent', true),
-        Comment.query().whereNotIn('id', ids)
-        .where({recent: true, post_id: postId})
-        .update('recent', false)
-      ])),
+        .pluck('id').then(ids => Promise.all([
+          Comment.query().whereIn('id', ids).update('recent', true),
+          Comment.query().whereNotIn('id', ids)
+            .where({ recent: true, post_id: postId })
+            .update('recent', false)
+        ])),
 
       // update num_comments and updated_at (only update the latter when
       // creating a comment, not deleting one)
@@ -892,16 +894,16 @@ module.exports = bookshelf.Model.extend(Object.assign({
 
       // when creating a comment, mark post as read for the commenter
       commentId && Comment.where('id', commentId).query().pluck('user_id')
-      .then(([ userId ]) => Post.find(postId)
-        .then(post => post.markAsRead(userId)))
+        .then(([userId]) => Post.find(postId)
+          .then(post => post.markAsRead(userId)))
     ])
   },
 
   deactivate: postId =>
     bookshelf.transaction(trx =>
       Promise.join(
         Activity.removeForPost(postId, trx),
-        Post.where('id', postId).query().update({active: false}).transacting(trx)
+        Post.where('id', postId).query().update({ active: false }).transacting(trx)
       )),
 
   createActivities: (opts) =>

apps/backend/cron.js

@@ -11,7 +11,7 @@ const savedSearches = require('./lib/group/digest2/savedSearches')
 
 const sendAndLogDigests = type =>
   digest2.sendAllDigests(type)
-    .then(results => { sails.log.debug(`Sent digests to: ${results}`); return results })
+    .then(results => { sails.log.debug(`Sent digests for: ${results}`); return results })
 
 const sendSavedSearchDigests = userId =>
   savedSearches.sendAllDigests(userId)

apps/backend/lib/group/digest2/util.js

@@ -50,7 +50,7 @@ export const getPostsAndComments = async (group, startTime, endTime, digestType)
     })
     .then(get('models'))
 
-  const upcomingPostReminders = await Post.upcomingPostReminders(group.posts(), digestType)
+  const upcomingPostReminders = await Post.upcomingPostReminders(group, digestType)
 
   const comments = await Comment.createdInTimeRange(group.comments(), startTime, endTime)
     .query(q => {
@@ -68,7 +68,7 @@ export const getPostsAndComments = async (group, startTime, endTime, digestType)
     })
     .then(get('models'))
 
-  if (posts.length === 0 && comments.length === 0 && upcomingPostReminders.length === 0) {
+  if (posts.length === 0 && comments.length === 0 && upcomingPostReminders?.startingSoon?.length === 0 && upcomingPostReminders?.endingSoon?.length === 0) {
     return false
   }
 

packages/shared/src/TextHelpers.js

@@ -161,16 +161,15 @@ export const formatDatePair = (startTime, endTime, returnAsObj, timezone) => {
 
   const now = DateTime.now()
 
-  const isPastYear = start.get('year') < now.get('year')
   const isSameDay = end && start.get('day') === end.get('day') &&
                     start.get('month') === end.get('month') &&
                     start.get('year') === end.get('year')
 
   let to = ''
   let from = ''
 
-  // Format the start date - only include year if it's in the past
-  if (isPastYear) {
+  // Format the start date - only include year if it's not this year
+  if (start.get('year') !== now.get('year')) {
     from = start.toFormat("ccc MMM d, yyyy '•' t")
   } else {
     from = start.toFormat("ccc MMM d '•' t")