Big 'ol set of patches and dep maintenance (#212)

Co-authored-by: FloatingGhost <hannah@coffee-and-dreams.uk> Reviewed-on: https://akkoma.dev/AkkomaGang/pleroma-fe/pulls/212
2022-11-15 15:47:32 +00:00 · 2022-11-15 15:47:32 +00:00 · db46879a8f
commit db46879a8f
parent 0770981a20
35 changed files with 2034 additions and 3411 deletions
--- a/src/boot/after_store.js
+++ b/src/boot/after_store.js
@ -170,10 +170,8 @@ const setSettings = async ({ apiConfig, staticConfig, store }) => {
  copyInstanceOption('redirectRootNoLogin')
  copyInstanceOption('redirectRootLogin')
  copyInstanceOption('showInstanceSpecificPanel')
-  copyInstanceOption('minimalScopesMode')
  copyInstanceOption('hideMutedPosts')
  copyInstanceOption('collapseMessageWithSubject')
-  copyInstanceOption('scopeCopy')
  copyInstanceOption('subjectLineBehavior')
  copyInstanceOption('postContentType')
  copyInstanceOption('alwaysShowSubjectInput')
--- a/src/components/attachment/attachment.js
+++ b/src/components/attachment/attachment.js
@ -227,7 +227,7 @@ const Attachment = {
      this.$emit('resize', newHeight)
    },
    postStatus (event) {
-      console.log(this.statusForm.postStatus(event, this.statusForm.newStatus))
+      this.statusForm.postStatus(event, this.statusForm.newStatus)
    }
  }
 }
--- a/src/components/features_panel/features_panel.js
+++ b/src/components/features_panel/features_panel.js
@ -4,7 +4,6 @@ const FeaturesPanel = {
  computed: {
    whoToFollow: function () { return this.$store.state.instance.suggestionsEnabled },
    mediaProxy: function () { return this.$store.state.instance.mediaProxyAvailable },
-    minimalScopesMode: function () { return this.$store.state.instance.minimalScopesMode },
    textlimit: function () { return this.$store.state.instance.textlimit },
    uploadlimit: function () { return fileSizeFormatService.fileSizeFormat(this.$store.state.instance.uploadlimit) }
  }
--- a/src/components/post_status_form/post_status_form.js
+++ b/src/components/post_status_form/post_status_form.js
@ -181,9 +181,6 @@ const PostStatusForm = {
    userDefaultScope () {
      return this.$store.state.users.currentUser.default_scope
    },
-    showAllScopes () {
-      return !this.mergedConfig.minimalScopesMode
-    },
    emojiUserSuggestor () {
      return suggestor({
        emoji: [
@ -225,9 +222,6 @@ const PostStatusForm = {
    isOverLengthLimit () {
      return this.hasStatusLengthLimit && (this.charactersLeft < 0)
    },
-    minimalScopesMode () {
-      return this.$store.state.instance.minimalScopesMode
-    },
    alwaysShowSubject () {
      return this.mergedConfig.alwaysShowSubjectInput
    },
@ -647,10 +641,8 @@ const PostStatusForm = {
        if (this.copyMessageScope === 'direct') {
          return this.copyMessageScope
        }
-        if (this.$store.getters.mergedConfig.scopeCopy) {
-          if (this.copyMessageScope !== 'public' && this.$store.state.users.currentUser.default_scope !== 'private') {
-            return this.copyMessageScope
-          }
+        if (this.copyMessageScope !== 'public' && this.$store.state.users.currentUser.default_scope !== 'private') {
+          return this.copyMessageScope
        }
      }
      return this.$store.state.users.currentUser.default_scope
--- a/src/components/post_status_form/post_status_form.vue
+++ b/src/components/post_status_form/post_status_form.vue
@ -188,7 +188,6 @@
        >
          <scope-selector
            v-if="!disableVisibilitySelector"
-            :show-all="showAllScopes"
            :user-default="userDefaultScope"
            :original-scope="copyMessageScope"
            :initial-scope="newStatus.visibility"
--- a/src/components/rich_content/rich_content.jsx
+++ b/src/components/rich_content/rich_content.jsx
@ -138,12 +138,6 @@ export default {
          )
        })
      }
-
-      marked.use(markedMfm, {
-        mangle: false,
-        gfm: false,
-        breaks: true
-      })
      const mfmHtml = document.createElement('template')
      mfmHtml.innerHTML = marked.parse(content)

--- a/src/components/scope_selector/scope_selector.js
+++ b/src/components/scope_selector/scope_selector.js
@ -13,6 +13,14 @@ library.add(
  faLockOpen
 )

+const SCOPE_LEVELS = {
+  'direct': 0,
+  'private': 1,
+  'local': 2,
+  'unlisted': 2,
+  'public': 3
+}
+
 const ScopeSelector = {
  props: [
    'showAll',
@ -57,11 +65,15 @@ const ScopeSelector = {
  },
  methods: {
    shouldShow (scope) {
-      return this.showAll ||
-        this.currentScope === scope ||
-        this.originalScope === scope ||
-        this.userDefault === scope ||
-        scope === 'direct'
+      if (!this.originalScope) {
+        return true
+      }
+
+      if (this.originalScope === 'local') {
+        return scope === 'direct' || scope === 'local'
+      }
+
+      return SCOPE_LEVELS[scope] <= SCOPE_LEVELS[this.originalScope]
    },
    changeVis (scope) {
      this.currentScope = scope
--- a/src/components/settings_modal/settings_modal.js
+++ b/src/components/settings_modal/settings_modal.js
@ -175,7 +175,6 @@ const SettingsModal = {
        return this.$store.state.config.expertLevel > 0
      },
      set (value) {
-        console.log(value)
        this.$store.dispatch('setOption', { name: 'expertLevel', value: value ? 1 : 0 })
      }
    }
--- a/src/components/settings_modal/tabs/general_tab.vue
+++ b/src/components/settings_modal/tabs/general_tab.vue
@ -537,18 +537,12 @@
            {{ $t('settings.default_vis') }} <ServerSideIndicator :server-side="true" />
            <ScopeSelector
              class="scope-selector"
-              :show-all="true"
              :user-default="serverSide_defaultScope"
              :initial-scope="serverSide_defaultScope"
              :on-scope-change="changeDefaultScope"
            />
          </label>
        </li>
-        <li>
-          <BooleanSetting path="minimalScopesMode">
-            {{ $t('settings.minimal_scopes_mode') }}
-          </BooleanSetting>
-        </li>
        <li>
          <BooleanSetting path="sensitiveByDefault">
            {{ $t('settings.sensitive_by_default') }}
@ -559,14 +553,6 @@
            {{ $t('settings.sensitive_if_subject') }}
          </BooleanSetting>
        </li>
-        <li>
-          <BooleanSetting
-            path="scopeCopy"
-            expert="1"
-          >
-            {{ $t('settings.scope_copy') }}
-          </BooleanSetting>
-        </li>
        <li>
          <BooleanSetting
            path="alwaysShowSubjectInput"
@ -594,14 +580,6 @@
            {{ $t('settings.post_status_content_type') }}
          </ChoiceSetting>
        </li>
-        <li>
-          <BooleanSetting
-            path="minimalScopesMode"
-            expert="1"
-          >
-            {{ $t('settings.minimal_scopes_mode') }}
-          </BooleanSetting>
-        </li>
        <li>
          <BooleanSetting
            path="alwaysShowNewPostButton"
--- a/src/components/settings_modal/tabs/theme_tab/theme_tab.js
+++ b/src/components/settings_modal/tabs/theme_tab/theme_tab.js
@ -753,7 +753,6 @@ export default {
    selected () {
      this.selectedTheme = Object.entries(this.availableStyles).find(([k, s]) => {
        if (Array.isArray(s)) {
-          console.log(s[0] === this.selected, this.selected)
          return s[0] === this.selected
        } else {
          return s.name === this.selected
--- a/src/components/timeline/timeline.js
+++ b/src/components/timeline/timeline.js
@ -126,7 +126,7 @@ const Timeline = {
    this.$store.commit('setLoading', { timeline: this.timelineName, value: false })
  },
  methods: {
-    stopBlockingClicks: debounce(function () {
+    stopBlockingClicks: debounce( function()  {
      this.blockingClicks = false
    }, 1000),
    blockClicksTemporarily () {
@ -154,7 +154,7 @@ const Timeline = {
        window.scrollTo({ top: 0 })
      }
    },
-    fetchOlderStatuses: throttle(function () {
+    fetchOlderStatuses: throttle( function () {
      const store = this.$store
      const credentials = store.state.users.currentUser.credentials
      store.commit('setLoading', { timeline: this.timelineName, value: true })
@ -188,7 +188,7 @@ const Timeline = {

      const centerOfScreen = window.pageYOffset + (window.innerHeight * 0.5)

-      // Start from approximating the index of some visible status by using the
+      // Start from approximating the index of some visible status by using
      // the center of the screen on the timeline.
      let approxIndex = Math.floor(statuses.length * (centerOfScreen / height))
      let err = statuses[approxIndex].getBoundingClientRect().y
@ -226,7 +226,7 @@ const Timeline = {
        this.fetchOlderStatuses()
      }
    },
-    handleScroll: throttle(function (e) {
+    handleScroll: throttle( function (e)  {
      this.determineVisibleStatuses()
      this.scrollLoad(e)
    }, 200),
--- a/src/components/user_card/user_card.js
+++ b/src/components/user_card/user_card.js
@ -71,7 +71,6 @@ export default {
      return `${serverUrl.protocol}//${serverUrl.host}/main/ostatus`
    },
    loggedIn () {
-      console.log({ ...this.$store.state.users.currentUser })
      return this.$store.state.users.currentUser
    },
    dailyAvg () {
--- a/src/lib/persisted_state.js
+++ b/src/lib/persisted_state.js
@ -62,7 +62,7 @@ export default function createPersistedState ({
        }
        loaded = true
      } catch (e) {
-        console.log("Couldn't load state")
+        console.error("Couldn't load state")
        console.error(e)
        loaded = true
      }
@ -83,8 +83,8 @@ export default function createPersistedState ({
              })
          }
        } catch (e) {
-          console.log("Couldn't persist state:")
-          console.log(e)
+          console.error("Couldn't persist state:")
+          console.error(e)
        }
      })
    }
--- a/src/modules/config.js
+++ b/src/modules/config.js
@ -76,11 +76,9 @@ export const defaultState = {
  hideScopeNotice: false,
  useStreamingApi: false,
  sidebarRight: undefined, // instance default
-  scopeCopy: undefined, // instance default
  subjectLineBehavior: undefined, // instance default
  alwaysShowSubjectInput: undefined, // instance default
  postContentType: undefined, // instance default
-  minimalScopesMode: undefined, // instance default
  // This hides statuses filtered via a word filter
  hideFilteredStatuses: undefined, // instance default
  modalOnRepeat: undefined, // instance default
--- a/src/modules/instance.js
+++ b/src/modules/instance.js
@ -53,12 +53,10 @@ const defaultState = {
  logoMargin: '.2em',
  logoMask: true,
  logoLeft: false,
-  minimalScopesMode: false,
  nsfwCensorImage: undefined,
  postContentType: 'text/plain',
  redirectRootLogin: '/main/friends',
  redirectRootNoLogin: '/main/all',
-  scopeCopy: true,
  showFeaturesPanel: true,
  showInstanceSpecificPanel: false,
  showNavShortcuts: true,
--- a/src/services/config_fetcher/config_fetcher.service.js
+++ b/src/services/config_fetcher/config_fetcher.service.js
@ -1,7 +1,6 @@
 import { promiseInterval } from '../promise_interval/promise_interval.js'

 const startFetching = ({ credentials, store }) => {
-  console.log('startFetching: Config')
  const boundFetchAndUpdate = () => store.dispatch('getSettingsProfile')
  boundFetchAndUpdate()
  return promiseInterval(boundFetchAndUpdate, 10 * 60000)
--- a/src/services/push/push.js
+++ b/src/services/push/push.js
@ -1,5 +1,3 @@
-import runtime from 'serviceworker-webpack-plugin/lib/runtime'
-
 function urlBase64ToUint8Array (base64String) {
  const padding = '='.repeat((4 - base64String.length % 4) % 4)
  const base64 = (base64String + padding)
@ -15,7 +13,7 @@ function isPushSupported () {
 }

 function getOrCreateServiceWorker () {
-  return runtime.register()
+  return navigator.serviceWorker.register('/sw-pleroma.js')
    .catch((err) => console.error('Unable to get or create a service worker.', err))
 }

--- a/src/sw.js
+++ b/src/sw.js
@ -5,7 +5,9 @@ import { parseNotification } from './services/entity_normalizer/entity_normalize
 import { prepareNotificationObject } from './services/notification_utils/notification_utils.js'
 import { createI18n } from 'vue-i18n'
 import messages from './i18n/service_worker_messages.js'
+import { precacheAndRoute } from 'workbox-precaching/precacheAndRoute';

+precacheAndRoute(self.__WB_MANIFEST);
 const i18n = createI18n({
  // By default, use the browser locale, we will update it if neccessary
  locale: 'en',