Skip to content
Snippets Groups Projects

Afterstore refactor

Merged Afterstore refactor
afterstore-refactor into develop
1 unresolved thread
Merged lain requested to merge afterstore-refactor into develop
1 unresolved thread

Refactors afterstore to be more readable and do more error handling.

Merge request reports

Pipeline #8923 passed

Stage: lint
Stage: build
Stage: test

Pipeline passed for 48ac96cf on afterstore-refactor

Approval is optional

Merged by lainlain 6 years ago (Mar 13, 2019 12:08pm UTC)

Merge details

  • Changes merged into develop with 9fd44e4a.
  • Deleted the source branch.

Pipeline #8924 passed

Stage: lint
Stage: build
Stage: test

Pipeline passed for 9fd44e4a on develop

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • HJ
    HJ @hj started a thread on the diff
    • src/boot/after_store.js
    13 store.dispatch('setInstanceOption', { name: 'name', value: name })
    14 store.dispatch('setInstanceOption', { name: 'registrationOpen', value: (registrationClosed === '0') })
    15 store.dispatch('setInstanceOption', { name: 'textlimit', value: parseInt(textlimit) })
    16 store.dispatch('setInstanceOption', { name: 'server', value: server })
    17
    18 // TODO: default values for this stuff, added if to not make it break on
    19 // my dev config out of the box.
    20 if (uploadlimit) {
    21 store.dispatch('setInstanceOption', { name: 'uploadlimit', value: parseInt(uploadlimit.uploadlimit) })
    22 store.dispatch('setInstanceOption', { name: 'avatarlimit', value: parseInt(uploadlimit.avatarlimit) })
    23 store.dispatch('setInstanceOption', { name: 'backgroundlimit', value: parseInt(uploadlimit.backgroundlimit) })
    24 store.dispatch('setInstanceOption', { name: 'bannerlimit', value: parseInt(uploadlimit.bannerlimit) })
    25 }
    7 const getStatusnetConfig = async ({ store }) => {
    8 try {
    9 const res = await window.fetch('/api/statusnet/config.json')
    • HJ
      HJ @hj ·
      Maintainer

      from what I read you can just

      const data = await (await window.fetch('/api/statusnet/config.json')).json()
    • Please register or sign in to reply
  • lain
    lain @lambadalambda ·
    Author Owner

    ah, there's actually a bug in there, now that i look at it. the .ok property needs to be checked.

  • lain added 1 commit

    added 1 commit

    • 48ac96cf - afterStoreSetup: Handle 404 cases.

    Compare with previous version

  • HJ
    HJ @hj ·
    Maintainer

    Still not sure if using async/await with fetch API looks better or worse, but other than that, looks better.

    LGTM after you fix the bug

  • lain mentioned in commit 9fd44e4a

    mentioned in commit 9fd44e4a

  • lain merged

    merged

    • Please register or sign in to reply