Merge branch 'dev'

Author: tibetsprague

apps/backend/CHANGELOG.md

@@ -6,6 +6,11 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## Unreleased
 
+## [6.0.2] - 2025-04-03
+
+### Added
+- Email settings URL to chat digest and comment digest notification emails
+
 ## [6.0.0] - 2025-03-14
 
 Major Hylo redesign! After 6 months of work, we've redesigned the entire app more reliable, more functional,and easier to use.

apps/backend/api/models/TagFollow.js

@@ -198,6 +198,13 @@ module.exports = bookshelf.Model.extend(Object.assign({
       if (!tagFollow.relations.user?.get('email')) continue
 
       const locale = mapLocaleToSendWithUS(tagFollow.relations.user?.get('settings')?.locale || 'en-US')
+
+      const clickthroughParams = '?' + new URLSearchParams({
+        ctt: 'chat_digest_email',
+        cti: tagFollow.relations.user.id,
+        ctcn: tagFollow.relations.group.get('name')
+      }).toString()
+
       const result = await Email.sendChatDigest({
         version: 'Redesign 2025',
         email: tagFollow.relations.user.get('email'),
@@ -206,10 +213,11 @@ module.exports = bookshelf.Model.extend(Object.assign({
           count: postData.length,
           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),
+          chat_room_url: Frontend.Route.post(posts.models[posts.models.length - 1], tagFollow.relations.group) + clickthroughParams,
           // date: TextHelpers.formatDatePair(posts[0].get('created_at'), false, false, 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'),
+          group_avatar_url: tagFollow.relations.group.get('avatar_url') + clickthroughParams,
           posts: postData
         }
       })

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

@@ -105,16 +105,23 @@ export const sendDigests = async () => {
           ? otherNames[0]
           : otherNames.slice(0, otherNames.length - 1).join(', ') + ' & ' + otherNames[otherNames.length - 1]
 
+        const clickthroughParams = '?' + new URLSearchParams({
+          ctt: 'message_digest_email',
+          cti: user.id,
+          ctcn: firstGroup.get('name')
+        }).toString()
+
         return Email.sendMessageDigest({
           email: user.get('email'),
           locale,
           data: {
             count: filtered.length,
             date: TextHelpers.formatDatePair(filtered[0].get('created_at'), false, false),
+            email_settings_url: Frontend.Route.notificationsSettings(clickthroughParams, user),
             participant_avatars: otherAvatarUrls[0],
             participant_names: participantNames,
             other_names: otherNames,
-            thread_url: Frontend.Route.thread(post),
+            thread_url: Frontend.Route.thread(post) + clickthroughParams,
             messages: filtered.map(presentComment)
           },
           sender: {
@@ -128,15 +135,22 @@ export const sendDigests = async () => {
         const hasMention = ({ text }) =>
           RichText.getUserMentions(text).includes(user.id)
 
+        const clickthroughParams = '?' + new URLSearchParams({
+          ctt: 'comment_digest_email',
+          cti: user.id,
+          ctcn: firstGroup.get('name')
+        }).toString()
+
         return Email.sendCommentDigest({
           email: user.get('email'),
           locale,
           data: {
             count: commentData.length,
             date: TextHelpers.formatDatePair(filtered[0].get('created_at'), false, false, post.get('timezone')),
+            email_settings_url: Frontend.Route.notificationsSettings(clickthroughParams, user),
             post_title: post.summary(),
-            post_creator_avatar_url: post.relations.user.get('avatar_url'),
-            thread_url: Frontend.Route.comment({ comment: filtered[0], group: firstGroup, post }),
+            post_creator_avatar_url: post.relations.user.get('avatar_url') + clickthroughParams,
+            thread_url: Frontend.Route.comment({ comment: filtered[0], group: firstGroup, post }) + clickthroughParams,
             comments: commentData,
             subject_prefix: some(hasMention, commentData)
               ? 'You were mentioned in'

apps/backend/package.json

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

apps/mobile/README.md

@@ -66,7 +66,7 @@ Here are the common scenarios in which we should run the `bump-version` command:
   - Upload the APK file downloaded from Bitrise and tested above
   - Add release notes
   - Submit for review/release
-- Once the release is accepted by both the stores run `yarn bump-version version prereleaase` on `dev`, commit the changes, then `git push --tags` to setup the next prerelease build versioning.
+- Once the release is accepted by both the stores run `yarn bump-version prepatch` and commit the changes to `dev` to setup the next patch version in a pre-release state (necessary for Apple to accept beta build after the current version is in production).
 - Open a new Milestone with the current pre-release version:
   - Look to `package.json#version` to get the new version, but leave off the `-0`
 
@@ -76,4 +76,11 @@ Sentry error reporting is always on in production, and optionally enabled in dev
 
 ### Debugging, quirks, work-arounds
 
-You’ll want to get familiar with the tooling for debugging actual WebView loads: https://github.com/react-native-webview/react-native-webview/blob/master/docs/Debugging.md#debugging-webview-contents
+###### Webview
+
+We use webviews a lot. These allow us to point at pieces of the web app in mobile screens. It is both very cool and has quirks.
+
+You’ll want to get familiar with the tooling for debugging actual WebView loads: https://github.com/react-native-webview/react-native-webview/blob/master/docs/Debugging.md#debugging-webview-contents
+
+###### Urql
+We use urql for most of our graphQL and data fetching/handling needs. Its good to get familiar with the devtools for this. https://github.com/urql-graphql/urql-devtools-exchange#usage

apps/mobile/android/app/build.gradle

@@ -90,8 +90,8 @@ android {
         applicationId "com.hylo.hyloandroid"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 297
-        versionName "6.0.1"
+        versionCode 298
+        versionName "6.0.2-0"
     }
     signingConfigs {
         debug {

apps/mobile/ios/HyloReactNative/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0.1</string>
+	<string>6.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleURLTypes</key>
@@ -40,7 +40,7 @@
 			<key>CFBundleTypeRole</key>
 			<string>Editor</string>
 			<key>CFBundleURLIconFile</key>
-			<string></string>
+			<string />
 			<key>CFBundleURLName</key>
 			<string>hyloapp</string>
 			<key>CFBundleURLSchemes</key>
@@ -50,19 +50,19 @@
 		</dict>
 	</array>
 	<key>CFBundleVersion</key>
-	<string>10000</string>
+	<string>10001</string>
 	<key>FacebookAdvertiserIDCollectionEnabled</key>
-	<false/>
+	<false />
 	<key>FacebookAppID</key>
 	<string>$(FACEBOOK_APP_ID)</string>
 	<key>FacebookAutoLogAppEventsEnabled</key>
-	<false/>
+	<false />
 	<key>FacebookClientToken</key>
 	<string>$(FACEBOOK_CLIENT_TOKEN)</string>
 	<key>FacebookDisplayName</key>
 	<string>Hylo</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
-	<false/>
+	<false />
 	<key>LSApplicationQueriesSchemes</key>
 	<array>
 		<string>fbapi</string>
@@ -71,13 +71,13 @@
 		<string>fbshareextension</string>
 	</array>
 	<key>LSRequiresIPhoneOS</key>
-	<true/>
+	<true />
 	<key>NSAppTransportSecurity</key>
 	<dict>
 		<key>NSAllowsArbitraryLoads</key>
-		<false/>
+		<false />
 		<key>NSAllowsLocalNetworking</key>
-		<true/>
+		<true />
 	</dict>
 	<key>NSCameraUsageDescription</key>
 	<string>Take photos to add to your posts</string>
@@ -134,6 +134,6 @@
 	<key>UIUserInterfaceStyle</key>
 	<string>Light</string>
 	<key>UIViewControllerBasedStatusBarAppearance</key>
-	<false/>
+	<false />
 </dict>
 </plist>

apps/mobile/ios/HyloReactNativeTests/Info.plist

@@ -15,10 +15,10 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0.1</string>
+	<string>6.0.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>217</string>
+	<string>218</string>
 </dict>
 </plist>

apps/mobile/ios/OneSignalNotificationServiceExtension/Info.plist

@@ -17,9 +17,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>6.0.1</string>
+	<string>6.0.2</string>
 	<key>CFBundleVersion</key>
-	<string>217</string>
+	<string>218</string>
 	<key>NSExtension</key>
 	<dict>
 		<key>NSExtensionPointIdentifier</key>

apps/mobile/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mobile",
-  "version": "6.0.1",
+  "version": "6.0.2-0",
   "private": true,
   "scripts": {
     "android": "adb reverse tcp:3001 tcp:3001 && adb reverse tcp:3000 tcp:3000 && react-native run-android",