Merge branch 'dev'

Author: tibetsprague

CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [5.9.1] - 2024-09-19
+
+### Added
+- Track editedAt timestamp for posts and comments
+
+### Changed
+- New users have the default notification setting of all posts, meaning they will now receive notifications for all posts in groups they are a member of, instead of just important ones.
+
 ## [5.9.0] - 2024-07-23
 
 ### Added

api/graphql/makeModels.js

@@ -270,6 +270,7 @@ export default function makeModels (userId, isAdmin, apiClient) {
         'commentsTotal',
         'created_at',
         'donations_link',
+        'edited_at',
         'end_time',
         'fulfilled_at',
         'is_public',
@@ -814,7 +815,8 @@ export default function makeModels (userId, isAdmin, apiClient) {
     Comment: {
       model: Comment,
       attributes: [
-        'created_at'
+        'created_at',
+        'edited_at'
       ],
       relations: [
         'post',

api/graphql/schema.graphql

@@ -473,6 +473,8 @@ type Comment {
   createdFrom: String
   # The Person who wrote the comment
   creator: Person
+  # When the text was last edited
+  editedAt: Date
   # For threaded comments what's the parent of this one
   parentComment: Comment
   # The Post this comment is on
@@ -1758,6 +1760,8 @@ type Post {
   details: String
   # Link to a donation page, only used for projects only right now
   donationsLink: String
+  # When this post was last significantly edited (such as title and details)
+  editedAt: Date
   # When this post "ends". Used for events, resources, projects, requests and offers right now
   endTime: Date
   # Number of people following this post (when someone comments on or reacts to a post they follow it)

api/models/User.js

@@ -556,16 +556,16 @@ module.exports = bookshelf.Model.extend(merge({
 
   unlinkAccount (provider) {
     const fieldName = {
-      'facebook': 'facebook_url',
-      'linkedin': 'linkedin_url',
-      'twitter': 'twitter_name'
+      facebook: 'facebook_url',
+      linkedin: 'linkedin_url',
+      twitter: 'twitter_name'
     }[provider]
 
   if (!fieldName) throw new Error(`${provider} not a supported provider`)
 
     return Promise.join(
-      LinkedAccount.query().where({'user_id': this.id, provider_key: provider}).del(),
-      this.save({[fieldName]: null})
+      LinkedAccount.query().where({ user_id: this.id, provider_key: provider }).del(),
+      this.save({ [fieldName]: null })
     )
   },
 
@@ -614,35 +614,35 @@ module.exports = bookshelf.Model.extend(merge({
   AXOLOTL_ID: '13986',
 
   authenticate: Promise.method(function (email, password) {
-    var compare = Promise.promisify(bcrypt.compare, bcrypt)
+    const compare = Promise.promisify(bcrypt.compare, bcrypt)
 
     if (!email) throw new GraphQLYogaError('no email provided')
     if (!password) throw new GraphQLYogaError('no password provided')
 
     return User.query('whereRaw', 'lower(email) = lower(?)', email)
-    .fetch({withRelated: ['linkedAccounts']})
-    .then(function (user) {
-      if (!user) throw new GraphQLYogaError('email not found')
+      .fetch({ withRelated: ['linkedAccounts'] })
+      .then(function (user) {
+        if (!user) throw new GraphQLYogaError('email not found')
 
-      var account = user.relations.linkedAccounts.find(a => a.get('provider_key') === 'password')
+        const account = user.relations.linkedAccounts.find(a => a.get('provider_key') === 'password')
 
-      if (!account) {
-        var keys = user.relations.linkedAccounts.pluck('provider_key')
-        throw new GraphQLYogaError(`password account not found. available: [${keys.join(',')}]`)
-      }
+        if (!account) {
+          const keys = user.relations.linkedAccounts.pluck('provider_key')
+          throw new GraphQLYogaError(`password account not found. available: [${keys.join(',')}]`)
+        }
 
-      return compare(password, account.get('provider_user_id')).then(function (match) {
-        if (!match) throw new GraphQLYogaError('password does not match')
+        return compare(password, account.get('provider_user_id')).then(function (match) {
+          if (!match) throw new GraphQLYogaError('password does not match')
 
-        return user
+          return user
+        })
       })
-    })
   }),
 
   clearSessionsFor: async function({ userId, sessionId }) {
     const redisClient = await RedisClient.create()
     for await (const key of redisClient.scanIterator({ MATCH: `sess:${userId}:*` })) {
-      if (key !== "sess:" + sessionId) {
+      if (key !== 'sess:' + sessionId) {
         await redisClient.del(key)
       }
     }
@@ -659,7 +659,8 @@ module.exports = bookshelf.Model.extend(merge({
         digest_frequency: 'daily',
         signup_in_progress: true,
         dm_notifications: 'both',
-        comment_notifications: 'both'
+        comment_notifications: 'both',
+        post_notifications: 'all'
       },
       active: true
     }, omit(attributes, 'account', 'group', 'role'))

api/models/comment/updateComment.js

@@ -1,5 +1,5 @@
 const { GraphQLYogaError } = require('@graphql-yoga/node')
-import { difference, uniq } from 'lodash'
+import { difference, uniq, isEqual } from 'lodash'
 import { updateMedia } from './util'
 
 export default async function updateComment (commenterId, id, params) {
@@ -17,6 +17,10 @@ export default async function updateComment (commenterId, id, params) {
   const existingFollowers = await post.followers().fetch().then(f => f.pluck('id'))
   const newFollowers = difference(uniq(mentioned.concat(commenterId)), existingFollowers)
 
+  if (!isEqual(comment.text(), params.text)) {
+    attrs.edited_at = new Date()
+  }
+
   return bookshelf.transaction(trx =>
     comment.save(attrs, {transacting: trx})
       .then(() => updateMedia(comment, attachments, trx))

api/models/comment/updateComment.test.js

@@ -0,0 +1,58 @@
+import factories from '../../../test/setup/factories'
+import updateComment from './updateComment'
+
+describe('updateComment', () => {
+  let user, post, comment
+
+  before(() => {
+    user = factories.user()
+    return user.save()
+    .then(() => {
+      post = factories.post({type: Post.Type.THREAD, user_id: user.id})
+      return post.save()
+    })
+    .then(() => {
+      comment = factories.comment({user_id: user.id, post_id: post.id})
+      return comment.save()
+    })
+  })
+
+  it('fails without ID', () => {
+    return updateComment(user.id, null, {text: 'foo'})
+    .then(() => {
+      expect.fail('should reject')
+    })
+    .catch(err => {
+      expect(err.message).to.equal('updateComment called with no ID')
+    })
+  })
+
+  it('prevents updating non-existent comments', () => {
+    const id = `${comment.id}0`
+    return updateComment(user.id, id, {text: 'foo'})
+    .then(() => {
+      expect.fail('should reject')
+    })
+    .catch(err => {
+      expect(err.message).to.equal('cannot find comment with ID')
+    })
+  })
+
+  it('does not set edited_at field if text does not change', async () => {
+    const recent = false
+    updateComment(user.id, comment.id, {recent})
+    .then(async () => {
+      comment = await Comment.find(comment.id)
+      expect(comment.edited_at).to.equal(undefined)
+    })
+  })
+
+  it('sets edited_at field when text changes', async () => {
+    const text = `${comment.text}, so say I!`
+    updateComment(user.id, comment.id, {text})
+    .then(async () => {
+      comment = await Comment.find(comment.id)
+      expect(comment.edited_at).not.to.equal(undefined)
+    })
+  })
+})

api/models/post/updatePost.js

@@ -1,6 +1,7 @@
 const { GraphQLYogaError } = require('@graphql-yoga/node')
 import setupPostAttrs from './setupPostAttrs'
 import updateChildren from './updateChildren'
+import { isEqual } from 'lodash'
 import {
   updateGroups,
   updateAllMedia,
@@ -27,6 +28,10 @@ export default function updatePost (userId, id, params) {
           throw new GraphQLYogaError("This post can't be modified")
         }
 
+        if (!isEqual(post.details(), params.description) || !isEqual(post.title(), params.name)) {
+          attrs.edited_at = new Date()
+        }
+
         return post.save(attrs, { patch: true, transacting })
           .tap(updatedPost => afterUpdatingPost(updatedPost, { params, userId, transacting }))
       })))

api/models/post/updatePost.test.js

@@ -14,6 +14,31 @@ describe('updatePost', () => {
     })
   })
 
+  it('fails without ID', () => {
+    try {
+      return updatePost(user.id, null, {name: 'foo'})
+      .then(() => {
+        expect.fail('should reject')
+      })
+      .catch(err => {
+        expect(err.message).to.equal('updatePost called with no ID')
+      })
+    } catch(err) {
+      expect(err.message).to.equal('updatePost called with no ID')
+    }
+  })
+
+  it('prevents updating non-existent posts', () => {
+    const id = `${post.id}0`
+    return updatePost(user.id, id, {name: 'foo'})
+    .then(() => {
+      expect.fail('should reject')
+    })
+    .catch(err => {
+      expect(err.message).to.equal('Post not found')
+    })
+  })
+
   it('prevents updating of certain post types', () => {
     return updatePost(user.id, post.id, {name: 'foo'})
     .then(() => {
@@ -23,6 +48,33 @@ describe('updatePost', () => {
       expect(err.message).to.equal("This post can't be modified")
     })
   })
+
+  it('does not set edited_at field if name or description does not change', async () => {
+    const location_id = '12345'
+    updatePost(user.id, post.id, {location_id})
+    .then(async () => {
+      post = await Post.find(post.id)
+      expect(post.get('edited_at')).to.equal(undefined)
+    })
+  })
+
+  it('sets edited_at field when name changes', async () => {
+    const name = `${post.name}, what ho, Bertie.`
+    updatePost(user.id, post.id, {name})
+    .then(async () => {
+      post = await Post.find(post.id)
+      expect(post.get('edited_at').getTime()).to.be.closeTo(new Date().getTime(), 2000)
+    })
+  })
+
+  it('sets edited_at field when description changes', async () => {
+    const description = `${post.description}, I say, Jeeves!`
+    updatePost(user.id, post.id, {description})
+    .then(async () => {
+      post = await Post.find(post.id)
+      expect(post.get('edited_at').getTime()).to.be.closeTo(new Date().getTime(), 2000)
+    })
+  })
 })
 
 describe('afterUpdatingPost', () => {

migrations/20240709073701_add-editedat-to-posts-and-comments.js

@@ -0,0 +1,20 @@
+
+exports.up = async function(knex) {
+  await knex.schema.table('posts', t => {
+    t.timestamp('edited_at')
+  })
+
+  await knex.schema.table('comments', t => {
+    t.timestamp('edited_at')
+  })
+}
+
+exports.down = async function(knex) {
+  await knex.schema.table('posts', t => {
+    t.dropColumn('edited_at')
+  })
+
+  await knex.schema.table('comments', t => {
+    t.dropColumn('edited_at')
+  })
+}

migrations/schema.sql

@@ -239,7 +239,8 @@ CREATE TABLE public.comments (
     deactivated_at timestamp with time zone,
     recent boolean,
     created_from character varying(255),
-    comment_id bigint
+    comment_id bigint,
+    edited_at timestamp with time zone
 );
 
 
@@ -1958,7 +1959,7 @@ CREATE TABLE public.posts (
     voting_method text,
     anonymous_voting text,
     proposal_vote_limit integer,
-    proposal_strict boolean DEFAULT false
+    edited_at timestamp with time zone
 );