musora-content-services 2.169.0-0 → 2.169.0

package/.claude/settings.local.json

@@ -1,39 +1,16 @@
 {
   "permissions": {
     "allow": [
-      "Bash(npx jest *)",
-      "Bash(npx tsc *)",
-      "Skill(counselors)",
-      "Bash(counselors ls *)",
-      "Bash(counselors groups *)",
-      "Bash(counselors run *)",
+      "Bash(rg:*)",
+      "Bash(npm run lint:*)",
+      "Bash(ls:*)",
       "Bash(npm test *)",
-      "Bash(gh pr *)",
-      "Bash(gh api *)",
-      "Bash(mkdir -p /tmp/pr-review-v2)",
-      "Read(//tmp/pr-review-v2/**)",
-      "Bash(cat /home/alesevero/railenvironment/applications/musora-content-services/AGENTS.md)",
-      "Bash(echo \"no AGENTS.md\")",
-      "Bash(echo \"exit=$?\")",
-      "Bash(git checkout *)",
-      "Skill(pr)",
-      "Skill(create-decision)",
-      "mcp__github__pull_request_read",
-      "mcp__github__push_files",
-      "Bash(git push *)",
-      "mcp__github__create_pull_request",
-      "mcp__github__search_pull_requests",
-      "Bash(git commit *)",
-      "Bash(git add *)",
-      "mcp__github__list_pull_requests",
-      "mcp__sanity__get_schema",
-      "mcp__sanity__query_documents",
-      "Bash(git rm *)",
-      "Bash(git rebase *)"
-    ]
+      "Bash(npx jest *)"
+    ],
+    "deny": []
   },
-  "model": "sonnet",
   "enabledMcpjsonServers": [
+    "1password",
     "atlassian",
     "figma",
     "google-workspace",
@@ -47,14 +24,10 @@
     "chrome-devtools",
     "railway",
     "github",
-    "asana"
-  ],
-  "disabledMcpjsonServers": [
+    "asana",
     "nightwatch",
-    "1password",
     "mysql-staging",
     "mysql-local",
     "mobile"
-  ],
-  "effortLevel": "medium"
+  ]
 }

package/CHANGELOG.md

@@ -2,12 +2,12 @@
 
 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-0](https://github.com/railroadmedia/musora-content-services/compare/v2.168.0...v2.169.0-0) (2026-07-31)
+## [2.169.0](https://github.com/railroadmedia/musora-content-services/compare/v2.168.0...v2.169.0) (2026-08-04)
 
 
 ### Features
 
-* **TP-1300:** add badge field to Liker, ForumUser, and User interfaces ([8a3ee80](https://github.com/railroadmedia/musora-content-services/commit/8a3ee802722a0d9dcd41a6a3998ff2a7a3352aeb))
+* **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.169.0-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/filterBuilder.js

@@ -95,7 +95,7 @@ export class FilterBuilder {
     // This must be run before _applyPublishDateRestrictions()
     if (this.bypassStatuses) return this
     if (this.availableContentStatuses.length === 0) {
-      if (this.userData.hasAllContentAccess) {
+      if (this.userData.isAdmin) {
         this.availableContentStatuses = [
           this.STATUS_DRAFT,
           this.STATUS_SCHEDULED,
@@ -136,7 +136,7 @@ export class FilterBuilder {
     if (this.bypassPermissions && !this.showOnlyOwnedContent) return this
     const adapter = getPermissionsAdapter()
     // Check if admin (admins bypass permissions)
-    if (adapter.hasAllContentAccess(this.userData) && !this.showOnlyOwnedContent) return this
+    if (adapter.isAdmin(this.userData) && !this.showOnlyOwnedContent) return this
 
     // Generate permissions filter using adapter
     const permissionsFilter = adapter.generatePermissionsFilter(this.userData, {

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/lib/sanity/decorators/examples.ts

@@ -27,9 +27,6 @@ const perms: UserPermissions = {
   isAdmin: false,
   isModerator: false,
   isABasicMember: true,
-  hasAllContentAccess: false,
-  isForumModerator: false,
-  isCommentModerator: false,
 }
 
 const rows: ContentRow[] = [

package/src/lib/sanity/decorators/need-lifetime-upgrade.ts

@@ -22,7 +22,7 @@ export function lifetimeUpgradeDecorator(
   return {
     field: NEED_LIFETIME_UPGRADE_FIELD,
     compute: (item) => {
-      if (userPermissions?.hasAllContentAccess || !hasLifetime || hasPlus) return false
+      if (userPermissions?.isAdmin || !hasLifetime || hasPlus) return false
       if (!item.need_access) return false
       return item.membership_tier === 'plus'
       },

package/src/lib/sanity/filter.ts

@@ -23,7 +23,7 @@ export interface StatusConfig {
   statuses?: string[]
   bypassStatuses?: boolean
   isSingle?: boolean
-  hasAllContentAccess?: boolean
+  isAdmin?: boolean
   prefix?: Prefix
 }
 
@@ -349,7 +349,7 @@ export class Filters {
     const adapter = getPermissionsAdapter()
     const userData = config.userData || (await adapter.fetchUserPermissions())
 
-    if (adapter.hasAllContentAccess(userData)) return ''
+    if (adapter.isAdmin(userData)) return ''
 
     const permissionsFilter = adapter.generatePermissionsFilter(userData, {
       prefix: config.prefix || '',
@@ -373,9 +373,9 @@ export class Filters {
     // Auto-determine statuses if not provided
     if (statuses.length === 0) {
       const userData = await getPermissionsAdapter().fetchUserPermissions()
-      const hasAllContentAccess = getPermissionsAdapter().hasAllContentAccess(userData)
+      const isAdmin = getPermissionsAdapter().isAdmin(userData)
 
-      if (config.hasAllContentAccess || hasAllContentAccess) {
+      if (config.isAdmin || isAdmin) {
         statuses = [
           STATUS_DRAFT,
           STATUS_SCHEDULED,

package/src/services/endScreen/endScreen.ts

@@ -34,8 +34,7 @@ export async function getEndScreen({
   brand
 }: GetEndScreenParams): Promise<EndScreenResult> {
   const userData = await getUserData()
-
-  const isAdmin = userData?.has_all_content_access ?? false
+  const isAdmin = userData?.is_admin ?? false
 
   if (playlist) {
     const nextItem = next_item ??

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/forums/types.ts

@@ -10,7 +10,6 @@ export interface Liker {
   access_level: string
   liked_at: string
   liked_at_diff: string | null
-  badge: string | null
 }
 
 export interface WhoLikedResponse {
@@ -28,7 +27,6 @@ export interface ForumUser {
   profile_picture_url: string | null
   access_level: string
   signature: string | null
-  badge: string | null
 }
 
 export interface ForumPost {

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/services/permissions/PermissionsAdapter.ts

@@ -106,28 +106,4 @@ export abstract class PermissionsAdapter {
   isModerator(userPermissions: UserPermissions): boolean {
     return userPermissions?.isModerator ?? false
   }
-
-  hasAllContentAccess(userPermissions: UserPermissions): boolean {
-    return userPermissions?.hasAllContentAccess ?? false
-  }
-
-  /**
-   * Check if user is a forum moderator.
-   *
-   * @param userPermissions - The user's permissions
-   * @returns True if user is a forum moderator
-   */
-  isForumModerator(userPermissions: UserPermissions): boolean {
-    return userPermissions?.isForumModerator ?? false
-  }
-
-  /**
-   * Check if user is a comment moderator.
-   *
-   * @param userPermissions - The user's permissions
-   * @returns True if user is a comment moderator
-   */
-  isCommentModerator(userPermissions: UserPermissions): boolean {
-    return userPermissions?.isCommentModerator ?? false
-  }
 }

package/src/services/permissions/PermissionsV1Adapter.ts

@@ -52,7 +52,7 @@ export class PermissionsV1Adapter extends PermissionsAdapter {
    */
   doesUserNeedAccess(content: ContentItem, userPermissions: UserPermissions): boolean {
     // Admins always have access
-    if (this.hasAllContentAccess(userPermissions)) {
+    if (this.isAdmin(userPermissions)) {
       return false
     }
 
@@ -102,7 +102,7 @@ export class PermissionsV1Adapter extends PermissionsAdapter {
     } = options
 
     // Admins bypass permission filter
-    if (this.hasAllContentAccess(userPermissions)) {
+    if (this.isAdmin(userPermissions)) {
       return null
     }
 

package/src/services/permissions/PermissionsV2Adapter.ts

@@ -47,7 +47,7 @@ export class PermissionsV2Adapter extends PermissionsAdapter {
    */
   doesUserNeedAccess(content: ContentItem, userPermissions: UserPermissions): boolean {
     // Admins always have access
-    if (this.hasAllContentAccess(userPermissions)) {
+    if (this.isAdmin(userPermissions)) {
       return false
     }
 
@@ -108,7 +108,7 @@ export class PermissionsV2Adapter extends PermissionsAdapter {
     }
 
     // Admins bypass permission filter
-    if (this.hasAllContentAccess(userPermissions)) {
+    if (this.isAdmin(userPermissions)) {
       return null
     }
 

package/src/services/permissions/permissions.ts

@@ -38,7 +38,7 @@ export async function reset(): Promise<void> {
 export function isUserFreeTier(userPermissions: UserPermissions): boolean {
   const permissions = userPermissions.permissions
 
-  if (userPermissions.hasAllContentAccess) return false
+  if (userPermissions.isAdmin) return false
 
   return permissions.includes(MEMBERSHIP_PERMISSIONS.free)
     && !permissions.some(p => [MEMBERSHIP_PERMISSIONS.base, MEMBERSHIP_PERMISSIONS.plus].includes(p))
@@ -46,7 +46,7 @@ export function isUserFreeTier(userPermissions: UserPermissions): boolean {
 
 export function doesUserHaveMembership(userPermissions: UserPermissions): boolean {
   const permissions = userPermissions.permissions
-  return userPermissions.hasAllContentAccess
+  return userPermissions.isAdmin
   || permissions.includes(MEMBERSHIP_PERMISSIONS.base)
   || permissions.includes(MEMBERSHIP_PERMISSIONS.plus)
 }

package/src/services/permissions/types.d.ts

@@ -3,7 +3,4 @@ export interface UserPermissions {
   isAdmin: boolean // Whether the user is an admin
   isModerator: boolean // Whether the user is a moderator
   isABasicMember: boolean // Whether the user has basic membership
-  hasAllContentAccess: boolean
-  isForumModerator: boolean
-  isCommentModerator: boolean
 }

package/src/services/sanity.js

@@ -899,14 +899,14 @@ export async function fetchAllFilterOptions(
   const progressFilter = progressIds ? `&& railcontent_id in [${progressIds.join(',')}]` : ''
   const adapter = getPermissionsAdapter()
   const userPermissionsData = await adapter.fetchUserPermissions()
-  const hasAllContentAccess = adapter.hasAllContentAccess(userPermissionsData)
+  const isAdmin = adapter.isAdmin(userPermissionsData)
 
   const constructCommonFilter = (excludeFilter) => {
     const filterWithoutOption = excludeFilter
       ? filtersToGroq(filters, excludeFilter)
       : includedFieldsFilter
     const statusFilter = ' && status == "published"'
-    const includeStatusFilter = !hasAllContentAccess && !['instructor', 'artist', 'genre'].includes(contentType)
+    const includeStatusFilter = !isAdmin && !['instructor', 'artist', 'genre'].includes(contentType)
 
     return coachId
       ? `brand == '${brand}' && status == "published" && references(*[_type=='instructor' && railcontent_id == ${coachId}]._id) ${filterWithoutOption || ''} ${term ? ` && (title match "${term}" || album match "${term}" || artist->name match "${term}" || genre[]->name match "${term}")` : ''}`
@@ -2117,14 +2117,14 @@ export async function fetchTabData(
   // Check if user is admin to determine available content statuses
   const adapter = getPermissionsAdapter()
   const userData = await adapter.fetchUserPermissions()
-  const hasAllContentAccess = adapter.hasAllContentAccess(userData)
+  const isAdminORModerator = adapter.isAdmin(userData) || adapter.isModerator(userData)
 
   const filterWithRestrictions = await new FilterBuilder(filter, {
     showMembershipRestrictedContent: true,
-    availableContentStatuses: hasAllContentAccess
+    availableContentStatuses: isAdminORModerator
       ? CONTENT_STATUSES.ADMIN_ALL
       : CONTENT_STATUSES.PUBLISHED_ONLY,
-    pullFutureContent: hasAllContentAccess
+    pullFutureContent: isAdminORModerator ? true : false,
   }).buildFilter()
   query = buildEntityAndTotalQuery(filterWithRestrictions, entityFieldsString, {
     sortOrder: sortOrder,

package/src/services/user/types.d.ts

@@ -89,7 +89,6 @@ export interface User {
   first_access_at: string
   is_challenge_owner: number
   login_as_users: boolean
-  badge: string | null
 }
 
 export interface AuthResponse {

package/src/version-info.js

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