Merge branch 'dev'

CHANGELOG.md

@@ -6,6 +6,12 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [5.0.3] - 2022-11-23
+
+### Fixed
+- Don't send emails or push notifications for Announcements when notifications are turned off in a group
+- Bug that prevented saving group settings sometimes
+
 ## [5.0.2] - 2022-11-13
 
 ### Added

api/models/Activity.js

@@ -280,11 +280,13 @@ module.exports = bookshelf.Model.extend({
     const emailable = membershipsPermitting('sendEmail')
     const pushable = membershipsPermitting('sendPushNotifications')
 
-    if ((!isEmpty(emailable) && !isJustNewPost(activity)) || isAnnouncement(activity)) {
+    // Send emails if email notifications on and is announcement or "not just a new post" notification
+    if (!isEmpty(emailable) && (!isJustNewPost(activity) || isAnnouncement(activity))) {
       notifications.push(Notification.MEDIUM.Email)
     }
 
-    if (isTopic(activity) || !isEmpty(pushable) || isAnnouncement(activity)) {
+    // XXX: right now all notification types get sent as a push notification. Is this what we want?
+    if (!isEmpty(pushable)) {
       notifications.push(Notification.MEDIUM.Push)
     }
 

api/models/mixins/HasSettings.js

@@ -5,7 +5,7 @@ export default {
     this.set('settings', merge({}, this.get('settings'), value))
     if (save) {
       const options = { patch: true }
-      if (transacting) settings['transacting'] = transacting
+      if (transacting) options['transacting'] = transacting
       return this.save({settings: this.get('settings')}, options)
     }
     return this

package.json

@@ -5,7 +5,7 @@
   "author": "Tibet Sprague <[email protected]>",
   "license": "GNU AFFERO GENERAL PUBLIC LICENSE v3",
   "private": true,
-  "version": "5.0.2",
+  "version": "5.0.3",
   "repository": {
     "type": "git",
     "url": "git://github.com/Hylozoic/hylo-node.git"