Published freedombase:[email protected].

Freedombase · Apr 28, 2024 · a1b4dbe · a1b4dbe
1 parent 6e772da
commit a1b4dbe
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 44 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -10,6 +10,20 @@
 
 ### Deprecated
 
+## v0.7.0 - 2024-04-28
+
+### Breaking changes
+* Replaced `simpl-schema` with `meteor/aldeed:simple-schema`
+
+### Fixes
+* Fix common display issues
+* Added version range for Meteor `3.0-rc.0`
+
+## v0.6.1 - 2024-01-02
+
+### Fixes
+* Add `ddp` dependency which is needed for properly working with Meteor 3.0
+
 ## v0.6.0 - 2023-12-30
 
 ### Breaking changes

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "meteor-freedombase-flashnews",
-  "version": "0.6.0",
+  "version": "0.7.0",
   "private": true,
   "description": "Template Meteor package for FOSS",
   "main": "package/freedombase-flashnews/package.js",

diff --git a/package/freedombase-flashnews/.versions b/package/freedombase-flashnews/.versions
@@ -21,13 +21,13 @@ [email protected]
 [email protected]
 [email protected]
 [email protected]
-freedombase:flashnews@0.6.0
+freedombase:flashnews@0.7.0
 [email protected]
 [email protected]
 [email protected]
 [email protected]
 matb33:[email protected]
-[email protected].4
+[email protected].5
 [email protected]
 [email protected]
 [email protected]
@@ -51,6 +51,6 @@ [email protected]
 tmeasday:[email protected]
 [email protected]
 [email protected]
-underscore@1.0.13
-[email protected].6
+underscore@1.6.0
+[email protected].8
 [email protected]
diff --git a/package/freedombase-flashnews/common.ts b/package/freedombase-flashnews/common.ts
@@ -1,4 +1,4 @@
-import SimpleSchema from 'simpl-schema'
+import SimpleSchema from 'meteor/aldeed:simple-schema'
 import { Mongo } from 'meteor/mongo'
 import { Meteor } from 'meteor/meteor'
 import { check, Match } from 'meteor/check'
@@ -7,15 +7,30 @@ import { BaseModel } from 'meteor/socialize:base-model'
 
 export const APP_NEWS = 'meteorAppNews'
 
-export const currentFlashNewsSelector = (now?: Date) => {
+export const currentFlashNewsSelector = (now?: Date, language) => {
   if (now || Meteor.isClient) {
+    // const twoWeeks = 1000 * 60 * 60 * 24 * 14
+    // const twoWeeksAgo = new Date(new Date().getTime() - twoWeeks)
+
     if (Meteor.isClient && !now) now = new Date()
     return {
-      startsAt: { $lte: now },
-      $or: [
-        { endsAt: { $gte: new Date() } },
-        { endsAt: null },
-        { endsAt: { $exists: false } }
+      startsAt: { $lte: now /*, $gte: twoWeeksAgo */ },
+      $and: [
+        {
+          $or: [
+            { endsAt: { $gte: new Date() } },
+            { endsAt: null },
+            { endsAt: { $exists: false } }
+          ]
+        },
+        {
+          $or: [
+            { onlyDisplayOn: { $in: [language] } },
+            { onlyDisplayOn: { $exists: false } },
+            { onlyDisplayOn: [] },
+            { onlyDisplayOn: null }
+          ]
+        }
       ]
     }
   }

diff --git a/package/freedombase-flashnews/package.js b/package/freedombase-flashnews/package.js
@@ -1,7 +1,7 @@
 /* global Package */
 Package.describe({
   name: 'freedombase:flashnews',
-  version: '0.6.0',
+  version: '0.7.0',
   // Brief, one-line summary of the package.
   summary: 'Timed and localized flash messages for your Meteor app ',
   // URL to the Git repository containing the source code for this package.
@@ -12,10 +12,10 @@ Package.describe({
 })
 
 Package.onUse(function (api) {
-  api.versionsFrom(['2.8.1', '3.0-beta.0'])
-  api.use(['ecmascript', 'typescript', 'mongo', 'callback-hook'])
+  api.versionsFrom(['2.8.1', '3.0-rc.0'])
+  api.use(['ecmascript', 'typescript', 'mongo', 'ddp', 'callback-hook'])
   api.use([
-    'aldeed:collection2@4.0.0-beta.6',
+    'aldeed:collection2@3.4.1',
     'socialize:[email protected]'
   ])
   api.mainModule('common.ts', 'client')

diff --git a/package/freedombase-flashnews/server/index.ts b/package/freedombase-flashnews/server/index.ts
@@ -1,13 +1,13 @@
 import { Meteor } from 'meteor/meteor'
 import { check, Match } from 'meteor/check'
 import {
-  APP_NEWS,
-  FlashNewsCollection,
   afterFlashNewsInsert,
+  APP_NEWS,
   beforeFlashNewsInsert,
-  setSanitizationFunction,
+  currentFlashNewsSelector,
+  FlashNewsCollection,
   FlashNewsSchema,
-  currentFlashNewsSelector
+  setSanitizationFunction
 } from '../common'
 
 export {
@@ -22,13 +22,6 @@ export {
 
 export type { FlashNewsType } from '../common'
 
-// Indexes creation
-FlashNewsCollection.createIndexAsync({ objectType: 1, endsAt: -1, onlyDisplayOn: 1 })
-FlashNewsCollection.createIndexAsync({ objectType: 1, startsAt: -1, endsAt: -1, onlyDisplayOn: 1 })
-FlashNewsCollection.createIndexAsync({ objectId: 1, objectType: 1, endsAt: -1, onlyDisplayOn: 1 })
-FlashNewsCollection.createIndexAsync({ objectId: 1, objectType: 1, startsAt: -1, endsAt: -1, onlyDisplayOn: 1 })
-FlashNewsCollection.createIndexAsync({ objectId: 1, objectType: 1 })
-
 /**
  * Gets current flash news for the site
  * @param limit {Number}
@@ -37,19 +30,15 @@ FlashNewsCollection.createIndexAsync({ objectId: 1, objectType: 1 })
  */
 Meteor.publish(
   'freedombase:flashnews-getMain',
-  async (limit = 3, language = 'en', clientTime?: Date) => {
+  async function (limit = 3, language = 'en', clientTime?: Date) {
+    this.unblock()
     check(limit, Match.Maybe(Number))
     check(language, Match.Maybe(String))
     check(clientTime, Match.Maybe(Date))
     return FlashNewsCollection.find(
       {
-        objectType: APP_NEWS,
-        ...currentFlashNewsSelector(clientTime),
-        $or: [
-          { onlyDisplayOn: { $in: [language] } },
-          { onlyDisplayOn: { $exists: false } },
-          { onlyDisplayOn: null }
-        ]
+        ...currentFlashNewsSelector(clientTime, language),
+        objectType: APP_NEWS
       },
       { limit, sort: { startsAt: -1, createdAt: -1 } }
     )
@@ -66,28 +55,25 @@ Meteor.publish(
  */
 Meteor.publish(
   'freedombase:flashnews-getFor',
-  (
+  function (
     objectType: String,
     objectId: String,
     limit = 5,
     language = 'en',
     clientTime?: Date
-  ) => {
+  ) {
+    this.unblock()
     check(objectType, String)
     check(objectId, Match.Maybe(String))
     check(limit, Match.Maybe(Number))
     check(language, Match.Maybe(String))
     check(clientTime, Match.Maybe(Date))
+
     return FlashNewsCollection.find(
       {
-        objectId,
+        ...currentFlashNewsSelector(clientTime, language),
         objectType,
-        ...currentFlashNewsSelector(clientTime),
-        $or: [
-          { onlyDisplayOn: { $in: [language] } },
-          { onlyDisplayOn: { $exists: false } },
-          { onlyDisplayOn: null }
-        ]
+        objectId
       },
       { limit, sort: { startsAt: -1, createdAt: -1 } }
     )