Merge branch 'dev'

Author: tibetsprague

README.md

@@ -1,8 +1,55 @@
 # Hylo Monorepo
 
-**THIS REPOS IN ITS CURRENT STATE WAS THE RESULT OF THESE COMMANDS:**
+Thanks for checking out our code. The documentation below may be incomplete or incorrect. We welcome pull requests! But we're a very small team, so we can't guarantee timely responses.
 
-~~ Is that even true? ~~
+:heart:, [Tibet](https://github.com/tibetsprague), [Loren](https://github.com/lorenjohnson), [Tom](https://github.com/thomasgwatson)
+
+[![Code Climate](https://codeclimate.com/github/Hylozoic/hylo-node/badges/gpa.svg)](https://codeclimate.com/github/Hylozoic/hylo-node) [![Test Coverage](https://codeclimate.com/github/Hylozoic/hylo-node/badges/coverage.svg)](https://codeclimate.com/github/Hylozoic/hylo-node/coverage)
+
+## Quick Start
+
+1. Use nvm to install the correct version of node. Once installed you can just do `nvm install` to ensure the correct version is installed and then `nvm use`
+
+2. Install yarn and foreman
+
+```shell
+npm install -g yarn foreman
+```
+
+3. Install dependencies
+
+```shell
+yarn install
+```
+
+4. Build shared packages
+
+```shell
+yarn build-packages
+```
+
+5. Backend specific setup [here](./apps/backend/README.md)
+
+6. Web/frontend specific setup [here](./apps/web/README.md)
+
+7. Once the back-end and front-end are setup you can run the app locally with:
+Terminal 1:
+```shell
+yarn backend:dev
+```
+
+Terminal 2:
+```shell
+yarn web:dev
+```
+
+8. Mobile specific setup [here](./apps/mobile/README.md)
+
+9. Desktop specific setup [here](./apps/desktop/README.md)
+
+## Details on the setup of this Monorepo
+
+How we got here:
 
 1. Created bare nx monorepo:
 
@@ -47,17 +94,13 @@ git merge <backend|web|mobile|shared>/monorepo-setup --allow-unrelated-histories
 * Question: pnpm is somewhat the new hotness and shouldn't be difficult to switch to, also pnpm+nx is said to be a great combination. Do we switch to this?
 
 Remaining work:
-* Get apps/backend (hylo-node) working in a modules environment as it is a blended CommonJS and ESM project currently
-* Get apps/mobile issues resolved around babel parsing emoji data, etc
 * Update CircleCI configuration for web and backend, including getting yarn berry working there
 * CircleCI and Bitrise triggers, etc configuration update for new paths
 
 ----
 
-# WILL THE REAL README PLEASE STAND UP?
-
 ### Linting
 
 Since this is a monorepo, your IDE will need to be setup to make sure the linting files for each of the apps and packages is respected.
 
-For example, for VS Code based IDEs: https://stackoverflow.com/questions/60178254/vscode-eslint-configuration-for-a-two-projects-workspace
+For example, for VS Code based IDEs: https://stackoverflow.com/questions/60178254/vscode-eslint-configuration-for-a-two-projects-workspace

apps/backend/CHANGELOG.md

@@ -6,6 +6,13 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [6.1.15] - 2025-08-21
+
+### Fixed
+- Display of times for upcoming events in digest emails
+- Times for event RSPV ical attachements
+- Bug where deleting a comment would remove the tag froms the parent post!
+
 ## [6.1.14] - 2025-08-14
 
 ### Fixed

apps/backend/README.md

@@ -1,14 +1,12 @@
-### hylo-node
+### Hylo Backend
 
 Thanks for checking out our code. The documentation below may be incomplete or incorrect. We welcome pull requests! But we're a very small team, so we can't guarantee timely responses.
 
 :heart:, [Tibet](https://github.com/tibetsprague), [Loren](https://github.com/lorenjohnson), [Tom](https://github.com/thomasgwatson)
 
 [![Code Climate](https://codeclimate.com/github/Hylozoic/hylo-node/badges/gpa.svg)](https://codeclimate.com/github/Hylozoic/hylo-node) [![Test Coverage](https://codeclimate.com/github/Hylozoic/hylo-node/badges/coverage.svg)](https://codeclimate.com/github/Hylozoic/hylo-node/coverage)
 
-### setup
-
-Use nvm to install the correct version of node. Once installed you can just do `nvm install` to ensure the correct version is installed and then `nvm use`
+### Setup
 
 You need to install redis locally, then follow the steps to launch it on startup (on the default port of 6379). For OSX/MacOS:
 
@@ -32,13 +30,6 @@ sudo systemctl enable redis
 sudo systemctl start redis
 ```
 
-Next install the node modules (and Yarn, if you don't already have it available):
-
-```shell
-npm install -g foreman yarn
-yarn install
-```
-
 Create a `.env` file in the root directory by copying .env.example. Values below are team specific and should be supplied as needed:
 
 ```
@@ -205,7 +196,7 @@ knex migrate:make my_migration_name
 
 (You can either install knex globally with `npm install -g knex`, or run the version in your `node_modules` with `./node_modules/.bin/knex`.)
 
-Run migrations with `npm run migrate` and rollback the last one with `npm run rollback`.
+Run migrations with `yarn migrate` and rollback the last one with `yarn rollback`.
 
 ### loading database snapshots
 

apps/backend/api/models/Post.js

@@ -357,8 +357,8 @@ module.exports = bookshelf.Model.extend(Object.assign({
       summary: this.title(),
       description: TextHelpers.presentHTMLToText(this.details(forUserId)),
       location: this.get('location'),
-      start: this.get('start_time'),
-      end: this.get('end_time'),
+      start: DateTimeHelpers.toDateTime(this.get('start_time'), { timezone: this.get('timezone') }),
+      end: DateTimeHelpers.toDateTime(this.get('end_time'), { timezone: this.get('timezone') }),
       timezone: this.get('timezone'),
       status: eventInvitation.notGoing() ? ICalEventStatus.CANCELLED : ICalEventStatus.CONFIRMED,
       method: eventInvitation.notGoing() ? ICalCalendarMethod.CANCEL : ICalCalendarMethod.REQUEST,
@@ -405,15 +405,15 @@ module.exports = bookshelf.Model.extend(Object.assign({
       comments: [],
       day: type !== 'oneline' && this.get('start_time') && DateTimeHelpers.getDayFromDate(this.get('start_time'), this.get('timezone')),
       details: type !== 'oneline' && RichText.qualifyLinks(this.details(), slug),
-      end_time: type === 'oneline' && this.get('end_time') && DateTimeHelpers.formatDatePair(this.get('end_time'), null, false, this.get('timezone'), locale),
+      end_time: type === 'oneline' && this.get('end_time') && DateTimeHelpers.formatDatePair({ start: this.get('end_time'), timezone: this.get('timezone'), locale }),
       link_preview: type !== 'oneline' && linkPreview && linkPreview.id &&
         linkPreview.pick('title', 'description', 'url', 'image_url'),
       location: type !== 'oneline' && this.get('location'),
       image_url: type !== 'oneline' && media?.filter(m => m.get('type') === 'image')?.[0]?.get(type === 'full' ? 'url' : 'thumbnail_url'), // Thumbail for digest
       month: type !== 'oneline' && this.get('start_time') && DateTimeHelpers.getMonthFromDate(this.get('start_time'), this.get('timezone')),
       topic_name: type !== 'oneline' && this.get('type') === 'chat' ? tags?.first()?.get('name') : '',
       type: this.get('type'),
-      start_time: type === 'oneline' && this.get('start_time') && DateTimeHelpers.formatDatePair(this.get('start_time'), null, false, this.get('timezone'), locale),
+      start_time: type === 'oneline' && this.get('start_time') && DateTimeHelpers.formatDatePair({ start: this.get('start_time'), timezone: this.get('timezone'), locale }),
       title: this.summary(),
       unfollow_url: Frontend.Route.unfollow(this, group) + clickthroughParams,
       user: {

apps/backend/api/models/TagFollow.js

@@ -216,7 +216,7 @@ module.exports = bookshelf.Model.extend(Object.assign({
           chat_topic: tagFollow.relations.tag.get('name'),
           // For the overall chat room URL use the URL of the last post in the email digest
           chat_room_url: Frontend.Route.post(posts.models[posts.models.length - 1], tagFollow.relations.group) + clickthroughParams,
-          // date: DateTimeHelpers.formatDatePair(posts[0].get('created_at'), false, false, posts[0].get('timezone')),
+          // date: DateTimeHelpers.formatDatePair({ start: posts[0].get('created_at'), timezone: posts[0].get('timezone') }),
           email_settings_url: Frontend.Route.notificationsSettings(clickthroughParams, tagFollow.relations.user),
           group_name: tagFollow.relations.group.get('name'),
           group_avatar_url: tagFollow.relations.group.get('avatar_url') + clickthroughParams,

apps/backend/api/models/comment/deleteComment.js

@@ -15,7 +15,5 @@ export default function deleteComment (comment, userId) {
       num_comments: post.get('num_comments') - 1,
       num_commenters: await post.getCommentersTotal()
     }, { transaction: trx })
-
-    await Tag.updateForPost(post, null, null, null, trx)
   })
 }

apps/backend/package.json

@@ -5,7 +5,7 @@
   "author": "Hylo <hello@hylo.com>",
   "license": "Apache-2.0",
   "private": true,
-  "version": "6.1.14",
+  "version": "6.1.15",
   "nyc": {
     "sourceMap": false,
     "instrument": false,

apps/backend/seeds/dummy/dummy.js

@@ -3,6 +3,7 @@ const { faker } = require('@faker-js/faker')
 const promisify = require('bluebird').promisify
 const hash = promisify(bcrypt.hash, bcrypt)
 const readline = require('readline')
+const { URL } = require('url')
 
 const n = {
   groups: 50,
@@ -22,16 +23,28 @@ const group = 'Test Group'
 const groupSlug = 'test'
 let provider_user_id = ''
 
-function warning () {
+function warning (knex) {
   const rl = readline.createInterface({
     input: process.stdin,
     output: process.stdout
   })
 
   return new Promise((resolve, reject) => {
+    const connection = knex && knex.client && knex.client.config && knex.client.config.connection
+    let dbName = '(unknown)'
+    if (connection) {
+      if (typeof connection === 'string') {
+        try {
+          const parsed = new URL(connection)
+          dbName = (parsed.pathname || '').replace(/^\//, '')
+        } catch (e) {}
+      } else if (connection.database) {
+        dbName = connection.database
+      }
+    }
     rl.question(`
       WARNING: Running the dummy seed will COMPLETELY WIPE anything you cared about
-      in the database. If you're sure that's what you want, type 'yes'. Anything else
+      in the database "${dbName}". If you're sure that's what you want, type 'yes'. Anything else
       will result in this script terminating.
 
     `, answer => {
@@ -46,7 +59,7 @@ function warning () {
   })
 }
 
-exports.seed = (knex) => warning()
+exports.seed = (knex) => warning(knex)
   .then(() => truncateAll(knex))
   .then(() => seed('users', knex))
   .then(() => hash(password, 10))
@@ -154,7 +167,7 @@ function addPostsToGroups (knex) {
 function seed (entity, knex, fake = fakeLookup, iterations = n) { // Default to the fakeLookup and n in this file, if none is passed in
   console.info(`  --> ${entity}`)
   return Promise.all(
-    [ ...new Array(iterations[entity]) ].map(
+    [...new Array(iterations[entity])].map(
       () => fake[entity](knex).then(row => knex(entity).insert(row))
     )
   )
@@ -295,7 +308,8 @@ function fakeTag () {
   })
 }
 
-function fakeUser (email) {
+function fakeUser (maybeEmail) {
+  const email = typeof maybeEmail === 'string' ? maybeEmail : null
   return Promise.resolve({
     email: email || faker.internet.email(),
     name: `${faker.name.firstName()} ${faker.name.lastName()}`,

apps/mobile/CHANGELOG

@@ -4,6 +4,13 @@ All notable changes to HyloReactNative (the Hylo mobile app) will be documented
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+### [6.1.10] - 2025-08-29
+
+### [6.1.9] - 2025-08-20
+- Fix notifications list crashing
+- Fix location permissions
+- Allow any url link in post location field (zoom links, luma links, etc)
+
 ### [6.1.8] - 2025-08-13
 - Fix authenication bug for real-time updates
 - Reduce query size to speed up response

apps/mobile/android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         applicationId "com.hylo.hyloandroid"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 306
-        versionName "6.1.8"
+        versionCode 308
+        versionName "6.1.10"
     }
     signingConfigs {
         debug {