feat(glean): remove env check

MozillaSocial · Nov 29, 2023 · 90ef3ca · 90ef3ca
1 parent 229829f
commit 90ef3ca
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 7 deletions.
diff --git a/modules/glean/runtime/glean-plugin.client.ts b/modules/glean/runtime/glean-plugin.client.ts
@@ -11,13 +11,11 @@ export default defineNuxtPlugin((nuxtApp) => {
  log.info('Glean: App mounted, start initing glean')
 
  const GLEAN_APP_ID = 'moso-mastodon-web'
- const env = useAppConfig().env
- const devMode = env === ('dev' || 'canary' || 'preview')
- const prodMode = env === 'release'
- const gleanEnabled = (devMode || prodMode)
+ const env = useBuildInfo().env
+ const devMode = env === 'dev'
  const userSettings = useUserSettings()
  const userAllowGlean = getPreferences(userSettings.value, 'allowGlean')
- const uploadEnabled = gleanEnabled && userAllowGlean
+ const uploadEnabled = userAllowGlean
 
  Glean.initialize(GLEAN_APP_ID, uploadEnabled, { channel: env })
  userAgent.set(navigator.userAgent)

diff --git a/pages/settings.vue b/pages/settings.vue
@@ -12,7 +12,6 @@ useHydratedHead({
 const route = useRoute()
 
 const isRootPath = computedEager(() => route.name === 'settings')
-const devMode = useAppConfig().env === ('dev' || 'canary' || 'preview')
 </script>
 
 <template>
@@ -65,7 +64,6 @@ const devMode = useAppConfig().env === ('dev' || 'canary' || 'preview')
  :match="$route.path.startsWith('/settings/preferences/')"
  />
  <SettingsItem
- v-if="devMode"
  command
  icon="i-ri-lock-line"
  :text="isHydrated ? $t('settings.privacy.label') : ''"