musora-content-services 2.168.0 → 2.169.0

package/.claude/settings.local.json

@@ -0,0 +1,33 @@
+{
+  "permissions": {
+    "allow": [
+      "Bash(rg:*)",
+      "Bash(npm run lint:*)",
+      "Bash(ls:*)",
+      "Bash(npm test *)",
+      "Bash(npx jest *)"
+    ],
+    "deny": []
+  },
+  "enabledMcpjsonServers": [
+    "1password",
+    "atlassian",
+    "figma",
+    "google-workspace",
+    "snowflake",
+    "aws",
+    "hex",
+    "sanity",
+    "mysql",
+    "slack",
+    "langfuse",
+    "chrome-devtools",
+    "railway",
+    "github",
+    "asana",
+    "nightwatch",
+    "mysql-staging",
+    "mysql-local",
+    "mobile"
+  ]
+}

package/CHANGELOG.md

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+## [2.169.0](https://github.com/railroadmedia/musora-content-services/compare/v2.168.0...v2.169.0) (2026-08-04)
+
+
+### Features
+
+* **BEHSTP-415:** MCS public announcement fetch fn's ([#1010](https://github.com/railroadmedia/musora-content-services/issues/1010)) ([d504fb1](https://github.com/railroadmedia/musora-content-services/commit/d504fb105ba5303bfe7327ddef24fe468bdec374))
+
 ## [2.168.0](https://github.com/railroadmedia/musora-content-services/compare/v2.167.6...v2.168.0) (2026-07-30)
 
 

package/dist/services/api/types.js

@@ -0,0 +1,2 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "musora-content-services",
-  "version": "2.168.0",
+  "version": "2.169.0",
   "description": "A package for Musoras content services ",
   "main": "src/index.js",
   "type": "module",
@@ -45,6 +45,7 @@
     "ts-jest": "^29.2.4"
   },
   "dependencies": {
+    "@portabletext/to-html": "^2.0.14",
     "@sanity/client": "^5.4.2",
     "dayjs": "^1.11.13",
     "docdash": "^2.0.2",

package/src/index.d.ts

@@ -235,6 +235,28 @@ import {
 	updateMultiUserAccount
 } from './services/multi-user-accounts/multi-user-accounts.ts';
 
+import {
+	deleteAllNotifications,
+	deleteNotification,
+	fetchLiveEventPollingState,
+	fetchNotificationSettings,
+	fetchNotifications,
+	fetchUnreadCount,
+	markAllNotificationsAsRead,
+	markNotificationAsRead,
+	markNotificationAsUnread,
+	pauseLiveEventPolling,
+	restoreNotification,
+	startLiveEventPolling,
+	updateNotificationSetting
+} from './services/notifications/notifications.js';
+
+import {
+	blockContentToHtml,
+	fetchAllPublicAnnouncements,
+	fetchPublicAnnouncement
+} from './services/notifications/public-announcements.ts';
+
 import {
 	getRecentActivityOffline
 } from './services/offline/activities.ts';
@@ -439,22 +461,6 @@ import {
 	upgradeSubscription
 } from './services/user/memberships.ts';
 
-import {
-	deleteAllNotifications,
-	deleteNotification,
-	fetchLiveEventPollingState,
-	fetchNotificationSettings,
-	fetchNotifications,
-	fetchUnreadCount,
-	markAllNotificationsAsRead,
-	markNotificationAsRead,
-	markNotificationAsUnread,
-	pauseLiveEventPolling,
-	restoreNotification,
-	startLiveEventPolling,
-	updateNotificationSetting
-} from './services/user/notifications.js';
-
 import {
 	getOnboardingRecommendedContent,
 	getOnboardingStatus,
@@ -534,6 +540,7 @@ declare module 'musora-content-services' {
 		applyCloudflareWrapper,
 		applySanityTransformations,
 		assignModeratorToComment,
+		blockContentToHtml,
 		blockUser,
 		blockedUsers,
 		buildEntityAndTotalQuery,
@@ -585,6 +592,7 @@ declare module 'musora-content-services' {
 		extractSanityUrl,
 		fetchAll,
 		fetchAllFilterOptions,
+		fetchAllPublicAnnouncements,
 		fetchArtistBySlug,
 		fetchArtistLessons,
 		fetchArtists,
@@ -649,6 +657,7 @@ declare module 'musora-content-services' {
 		fetchPost,
 		fetchPosts,
 		fetchPracticeGoals,
+		fetchPublicAnnouncement,
 		fetchRecent,
 		fetchRecentActivitiesActiveTabs,
 		fetchRecentUserActivities,

package/src/index.js

@@ -239,6 +239,28 @@ import {
 	updateMultiUserAccount
 } from './services/multi-user-accounts/multi-user-accounts.ts';
 
+import {
+	deleteAllNotifications,
+	deleteNotification,
+	fetchLiveEventPollingState,
+	fetchNotificationSettings,
+	fetchNotifications,
+	fetchUnreadCount,
+	markAllNotificationsAsRead,
+	markNotificationAsRead,
+	markNotificationAsUnread,
+	pauseLiveEventPolling,
+	restoreNotification,
+	startLiveEventPolling,
+	updateNotificationSetting
+} from './services/notifications/notifications.js';
+
+import {
+	blockContentToHtml,
+	fetchAllPublicAnnouncements,
+	fetchPublicAnnouncement
+} from './services/notifications/public-announcements.ts';
+
 import {
 	getRecentActivityOffline
 } from './services/offline/activities.ts';
@@ -443,22 +465,6 @@ import {
 	upgradeSubscription
 } from './services/user/memberships.ts';
 
-import {
-	deleteAllNotifications,
-	deleteNotification,
-	fetchLiveEventPollingState,
-	fetchNotificationSettings,
-	fetchNotifications,
-	fetchUnreadCount,
-	markAllNotificationsAsRead,
-	markNotificationAsRead,
-	markNotificationAsUnread,
-	pauseLiveEventPolling,
-	restoreNotification,
-	startLiveEventPolling,
-	updateNotificationSetting
-} from './services/user/notifications.js';
-
 import {
 	getOnboardingRecommendedContent,
 	getOnboardingStatus,
@@ -533,6 +539,7 @@ export {
 	applyCloudflareWrapper,
 	applySanityTransformations,
 	assignModeratorToComment,
+	blockContentToHtml,
 	blockUser,
 	blockedUsers,
 	buildEntityAndTotalQuery,
@@ -584,6 +591,7 @@ export {
 	extractSanityUrl,
 	fetchAll,
 	fetchAllFilterOptions,
+	fetchAllPublicAnnouncements,
 	fetchArtistBySlug,
 	fetchArtistLessons,
 	fetchArtists,
@@ -648,6 +656,7 @@ export {
 	fetchPost,
 	fetchPosts,
 	fetchPracticeGoals,
+	fetchPublicAnnouncement,
 	fetchRecent,
 	fetchRecentActivitiesActiveTabs,
 	fetchRecentUserActivities,

package/src/services/eventsAPI.js

@@ -1,4 +1,4 @@
-import {fetchLiveEventPollingState, fetchUnreadCount, pauseLiveEventPolling} from "./user/notifications"
+import {fetchLiveEventPollingState, fetchUnreadCount, pauseLiveEventPolling} from "./notifications/notifications.js"
 import {fetchLiveEvent} from "./sanity"
 import { DataContext, PollingStateVersionKey } from './dataContext'
 

package/src/services/{user → notifications}/notifications.js

@@ -3,9 +3,9 @@
  */
 import { GET, PUT, DELETE } from '../../infrastructure/http/HttpClient.ts'
 import  eventsAPI from '../eventsAPI.js'
-import './types.js'
-import {globalConfig} from "../config";
-import {fetchLiveEvent} from "../sanity";
+import '../user/types.js'
+import {globalConfig} from "../config.js";
+import {fetchLiveEvent} from "../sanity.js";
 
 const baseUrl = `/api/notifications`
 

package/src/services/notifications/public-announcements.ts

@@ -0,0 +1,234 @@
+import { fetchSanity, getSanityDate } from '../sanity.js'
+import { globalConfig } from '../config.js'
+
+interface PublicAnnouncement {
+  title: string
+  slug: string
+  published_on: string
+  description: string
+  message: string
+  forum_data?: Record<string, ForumData>
+}
+
+interface ForumData {
+  category_id: string
+  forum_id: string
+  url: string
+}
+
+/**
+ * Fetches a specific public announcement by slug, or by default the most recent published one.
+ * @param {string|null} slug
+ * @returns {Promise<PublicAnnouncement|null>} The public announcement object, or null if not found
+ */
+export async function fetchPublicAnnouncement(slug?: string): Promise<PublicAnnouncement | null> {
+  const now = getSanityDate(new Date())
+
+  const slugString = slug ? `&& slug.current == '${slug}'` : ''
+
+  // grab the specific one by slug, or the most recent one if no slug is provided
+  const query = `*[_type == 'public-announcement' && published_on <= '${now}' ${slugString}]
+    {
+      title,
+      'slug': slug.current,
+      published_on,
+      description,
+      message,
+      forum_data
+    }
+    | order(published_on desc)`
+
+  const result = await fetchSanity(query, false, {processNeedAccess: false, processPageType: false})
+
+  if (result?.message) {
+    result.message = blockContentToHtml(result.message)
+  }
+
+  return result
+}
+
+/**
+ * Fetches all public announcements published within the last `spanDays` days (default 1 year).
+ * @param {number|null} spanDays - Number of days to look back for public announcements (default: 1 year)
+ * @returns {Promise<PublicAnnouncement[]|null>} Array of public announcement objects, or null if none found
+ */
+export async function fetchAllPublicAnnouncements(spanDays: number = 365): Promise<PublicAnnouncement[] | null> {
+  const rawNowDate = new Date()
+  const rawNow = new Date().getTime()
+  const nowDate = getSanityDate(rawNowDate)
+  const startDate = getSanityDate(new Date(rawNow - spanDays * 24 * 60 * 60 * 1000))
+
+  const query = `*[_type == 'public-announcement' && published_on >= '${startDate}' && published_on <= '${nowDate}']
+    {
+      title,
+      'slug': slug.current,
+      published_on
+    }
+    | order(published_on desc)`
+
+  return await fetchSanity(query, true, {processNeedAccess: false, processPageType: false})
+}
+
+interface ListStackEntry {
+  tag: 'ul' | 'ol'
+  level: number
+}
+
+/**
+ * @param {Array<Object>} blocks - Sanity Portable Text / block content array
+ * @returns {string} HTML string
+ */
+export function blockContentToHtml(blocks: any[]): string {
+  if (!blocks) {
+    return ''
+  }
+
+  let html = ''
+  const listStack: ListStackEntry[] = []
+
+  for (const block of blocks) {
+    const listItem = block.listItem ?? null
+
+    if (!listItem) {
+      html += closeLists(listStack, 0)
+      html += block._type === 'image' ? renderImage(block) : renderBlock(block)
+      continue
+    }
+
+    const level = block.level ?? 1
+    const tag: 'ul' | 'ol' = listItem === 'number' ? 'ol' : 'ul'
+
+    while (
+      listStack.length &&
+      (listStack[listStack.length - 1].level > level ||
+        (listStack[listStack.length - 1].level === level && listStack[listStack.length - 1].tag !== tag))
+    ) {
+      const closed = listStack.pop()
+      html += `</${closed.tag}>`
+    }
+
+    while (!listStack.length || listStack[listStack.length - 1].level < level) {
+      listStack.push({ tag, level: listStack.length + 1 })
+      html += `<${tag}>`
+    }
+
+    html += `<li>${renderInline(block)}</li>`
+  }
+
+  html += closeLists(listStack, 0)
+  return html
+}
+
+function closeLists(listStack: ListStackEntry[], downToLevel: number): string {
+  let html = ''
+  while (listStack.length && listStack[listStack.length - 1].level > downToLevel) {
+    const closed = listStack.pop()
+    html += `</${closed.tag}>`
+  }
+  return html
+}
+
+function renderInline(block: any): string {
+  const markDefsByKey: Record<string, any> = {}
+  for (const markDef of block.markDefs ?? []) {
+    markDefsByKey[markDef._key] = markDef
+  }
+
+  let inner = ''
+  for (const child of block.children ?? []) {
+    inner += renderSpan(child, markDefsByKey)
+  }
+
+  return inner === '' ? '&nbsp;' : inner
+}
+
+function renderBlock(block: any): string {
+  const tag = ((): string => {
+    switch (block.style ?? 'normal') {
+      case 'h1':
+        return 'h1'
+      case 'h2':
+        return 'h2'
+      case 'h3':
+        return 'h3'
+      case 'h4':
+        return 'h4'
+      case 'blockquote':
+        return 'blockquote'
+      default:
+        return 'p'
+    }
+  })()
+
+  const inner = renderInline(block)
+
+  return `<${tag}>${inner}</${tag}>`
+}
+
+function renderSpan(child: any, markDefsByKey: Record<string, any>): string {
+  let text = escapeHtml(child.text ?? '')
+  text = text.replace(/\n/g, '<br />')
+
+  for (const mark of child.marks ?? []) {
+    switch (true) {
+      case mark === 'strong':
+        text = `<strong>${text}</strong>`
+        break
+      case mark === 'em':
+        text = `<em>${text}</em>`
+        break
+      case mark === 'underline':
+        text = `<u>${text}</u>`
+        break
+      case mark === 'code':
+        text = `<code>${text}</code>`
+        break
+      case markDefsByKey[mark] !== undefined:
+        text = renderMarkDef(markDefsByKey[mark], text)
+        break
+    }
+  }
+
+  return text
+}
+
+function renderMarkDef(markDef: any, text: string): string {
+  if (markDef?._type !== 'link') {
+    return text
+  }
+  const href = escapeHtml(markDef.href ?? '')
+  return `<a href="${href}">${text}</a>`
+}
+
+function renderImage(block: any): string {
+  const ref = block.asset?._ref ?? null
+  const percent = block.display_width_percent ?? 100
+
+  const url = sanityImageRefToUrl(ref)
+  if (!url) {
+    return ''
+  }
+
+  return percent < 100
+    ? `<img src="${url}" style="width:${percent}%;max-width:100%;" />`
+    : `<img src="${url}" />`
+}
+
+function escapeHtml(text: string): string {
+  return text
+    .replace(/&/g, '&amp;')
+    .replace(/"/g, '&quot;')
+    .replace(/'/g, '&#039;')
+    .replace(/</g, '&lt;')
+    .replace(/>/g, '&gt;')
+}
+
+function sanityImageRefToUrl(ref: string | null | undefined): string | null {
+  const match = ref?.match(/^image-([a-f0-9]+)-(\d+x\d+)-(\w+)$/)
+  if (!match) {
+    return null
+  }
+  const [, assetId, dimensions, format] = match
+  const { projectId, dataset } = globalConfig.sanityConfig
+  return `https://cdn.sanity.io/images/${projectId}/${dataset}/${assetId}-${dimensions}.${format}`
+}

package/src/version-info.js

@@ -1 +1 @@
-export const MCS_VERSION = '2.168.0'
+export const MCS_VERSION = '2.169.0'

package/.idea/codeStyles/Project.xml

@@ -1,61 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <code_scheme name="Project" version="173">
-    <HTMLCodeStyleSettings>
-      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
-    </HTMLCodeStyleSettings>
-    <JSCodeStyleSettings version="0">
-      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </JSCodeStyleSettings>
-    <TypeScriptCodeStyleSettings version="0">
-      <option name="USE_SEMICOLON_AFTER_STATEMENT" value="false" />
-      <option name="FORCE_SEMICOLON_STYLE" value="true" />
-      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
-      <option name="USE_DOUBLE_QUOTES" value="false" />
-      <option name="FORCE_QUOTE_STYlE" value="true" />
-      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
-      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
-      <option name="SPACES_WITHIN_IMPORTS" value="true" />
-    </TypeScriptCodeStyleSettings>
-    <VueCodeStyleSettings>
-      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
-      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
-    </VueCodeStyleSettings>
-    <codeStyleSettings language="HTML">
-      <option name="SOFT_MARGINS" value="100" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="JavaScript">
-      <option name="SOFT_MARGINS" value="100" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="TypeScript">
-      <option name="SOFT_MARGINS" value="100" />
-      <indentOptions>
-        <option name="INDENT_SIZE" value="2" />
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-        <option name="TAB_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-    <codeStyleSettings language="Vue">
-      <option name="SOFT_MARGINS" value="100" />
-      <indentOptions>
-        <option name="CONTINUATION_INDENT_SIZE" value="2" />
-      </indentOptions>
-    </codeStyleSettings>
-  </code_scheme>
-</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -1,5 +0,0 @@
-<component name="ProjectCodeStyleConfiguration">
-  <state>
-    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
-  </state>
-</component>

package/.idea/modules.xml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="ProjectModuleManager">
-    <modules>
-      <module fileurl="file://$PROJECT_DIR$/.idea/musora-content-services.iml" filepath="$PROJECT_DIR$/.idea/musora-content-services.iml" />
-    </modules>
-  </component>
-</project>

package/.idea/musora-content-services.iml

@@ -1,8 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<module type="WEB_MODULE" version="4">
-  <component name="NewModuleRootManager">
-    <content url="file://$MODULE_DIR$" />
-    <orderEntry type="inheritedJdk" />
-    <orderEntry type="sourceFolder" forTests="false" />
-  </component>
-</module>

package/.idea/php.xml

@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="MessDetectorOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCSFixerOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PHPCodeSnifferOptionsConfiguration">
-    <option name="highlightLevel" value="WARNING" />
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PhpStanOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-  <component name="PsalmOptionsConfiguration">
-    <option name="transferred" value="true" />
-  </component>
-</project>

package/.idea/prettier.xml

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="PrettierConfiguration">
-    <option name="myConfigurationMode" value="AUTOMATIC" />
-  </component>
-</project>

package/.idea/vcs.xml

@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
-  <component name="VcsDirectoryMappings">
-    <mapping directory="" vcs="Git" />
-    <mapping directory="$PROJECT_DIR$" vcs="Git" />
-  </component>
-</project>