[pull] main from elk-zone:main

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -0,0 +1,85 @@
+name: 🐞 Bug report
+description: Report an issue
+labels: ['s: pending triage', 'c: bug']
+type: bug
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this bug report!
+  - type: textarea
+    id: description
+    attributes:
+      label: Describe the bug
+      description: A clear and concise description of what the bug is.
+    validations:
+      required: true
+  - type: textarea
+    id: reproduction-steps
+    attributes:
+      label: To Reproduce
+      description: Steps to reproduce the behavior
+      placeholder: |
+        1. Go to '...'
+        2. Click on '....'
+        3. Scroll down to '....'
+        4. See error
+  - type: textarea
+    id: expectations
+    attributes:
+      label: Expected behavior
+      description: What did you expect to happen but did not?
+  - type: upload
+    id: screenshots
+    attributes:
+      label: Upload screenshots
+      description: If applicable, add screenshots to help explain your problem.
+  - type: markdown
+    attributes:
+      value: |
+        To help us debug the problem, please complete relevant information as much as you can:
+  - type: input
+    id: elk-url
+    attributes:
+      label: Elk information
+      placeholder: https://elk.zone, https://main.elk.zone
+  - type: input
+    id: elk-version
+    attributes:
+      label: Elk version
+      placeholder: v1.0.0
+  - type: input
+    id: server-url
+    attributes:
+      label: Mastodon Server URL
+      placeholder: https://mastodon.social
+  - type: input
+    id: server-version
+    attributes:
+      label: Mastodon Server version
+      placeholder: v4.6.0
+  - type: input
+    id: relevant-post
+    attributes:
+      label: Link to relevant posts (separate by comma)
+      placeholder: https://mastodon.social/@Gargron/1
+  - type: input
+    id: browser
+    attributes:
+      label: Browser used, and its version
+      placeholder: Chrome v112, Safari v112
+  - type: textarea
+    id: device
+    attributes:
+      label: Device used
+      placeholder: |
+        - Device: (e.g. iPhone6)
+        - OS: (e.g. iOS8.1)
+        - Browser: (e.g. Chrome, Safari)
+        - Version: (e.g. 22)
+  - type: textarea
+    id: additional-context
+    attributes:
+      label: Additional context
+      placeholder: |
+        Add any other context about the problem here.

.github/ISSUE_TEMPLATE/feature_request.yaml

@@ -0,0 +1,16 @@
+name: 🚀 New feature proposal
+description: Propose a new feature
+labels: ['s: pending triage']
+type: feature
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to request a new feature!
+  - type: textarea
+    id: feature-request
+    attributes:
+      label: Feature description
+      description: Tell us about your idea :)
+    validations:
+      required: true

.github/workflows/ci.yml

@@ -17,12 +17,12 @@ jobs:
     runs-on: ubuntu-latest
 
     steps:
-      - uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
       # workaround for npm registry key change
       # ref. `pnpm@10.1.0` / `pnpm@9.15.4` cannot be installed due to key id mismatch · Issue #612 · nodejs/corepack
       # - https://github.com/nodejs/corepack/issues/612#issuecomment-2629496091
       - run: npm i -g corepack@latest && corepack enable
-      - uses: actions/setup-node@53b83947a5a98c8d113130e565377fae1a50d02f # v6.3.0
+      - uses: actions/setup-node@48b55a011bda9f5d6aeb4c2d9c7362e8dae4041e # v6.4.0
         with:
           node-version-file: .nvmrc
 

.github/workflows/docker.yml

@@ -23,29 +23,29 @@ jobs:
       packages: write
     steps:
       - name: Checkout
-        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6
+        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6
 
       - name: Docker meta
         id: meta
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
         with:
           images: ghcr.io/${{ github.repository }}
           flavor: |
             suffix=-${{ matrix.platform == 'linux/arm64' && 'arm64' || 'amd64' }}
 
       - name: Set up Docker
-        uses: docker/setup-docker-action@e43656e248c0bd0647d3f5c195d116aacf6fcaf4 # v4
+        uses: docker/setup-docker-action@0234bb73ccb40f0c430b795634f9247e2b5c2d23 # v5
 
       - name: Login to GitHub Container Registry
         if: github.event_name != 'pull_request'
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ github.token }}
 
       - name: Build and push arch-specific image
-        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6
+        uses: docker/build-push-action@f9f3042f7e2789586610d6e8b85c8f03e5195baf # v7
         with:
           context: .
           platforms: ${{ matrix.platform }}
@@ -69,15 +69,15 @@ jobs:
     steps:
       - name: Docker meta for final tags
         id: meta
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5
+        uses: docker/metadata-action@80c7e94dd9b9319bd5eb7a0e0fe9291e23a2a2e9 # v6
         with:
           images: ghcr.io/${{ github.repository }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3
+        uses: docker/setup-buildx-action@d7f5e7f509e45cec5c76c4d5afdd7de93d0b3df5 # v4
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3
+        uses: docker/login-action@650006c6eb7dba73a995cc03b0b2d7f5ca915bee # v4
         with:
           registry: ghcr.io
           username: ${{ github.actor }}
@@ -99,7 +99,7 @@ jobs:
           echo "digest=$DIGEST" >> "$GITHUB_OUTPUT"
 
       - name: Attest
-        uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3
+        uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4
         id: attest
         with:
           subject-name: ghcr.io/${{ github.repository }}

CONTRIBUTING.md

@@ -22,11 +22,11 @@ If you have [nvm](https://github.com/nvm-sh/nvm), you can run `nvm i` to install
 git checkout -b my-new-branch
 ```
 
-1. Run `pnpm i` in Elk's root folder
+5. Run `pnpm i` in Elk's root folder
 
-2. Run `pnpm nuxi prepare` in Elk's root folder
+6. Run `pnpm nuxi prepare` in Elk's root folder
 
-3. Run `pnpm dev` in Elk's root folder to start dev server or `pnpm dev:mocked` to start dev server with `@elkdev@universeodon.com` user.
+7. Run `pnpm dev` in Elk's root folder to start dev server or `pnpm dev:mocked` to start dev server with `@elkdev@universeodon.com` user.
 
 We recommend installing [ni](https://github.com/antfu/ni#ni), that will use the right package manager in each of your projects. If `ni` is installed, you can instead run:
 
@@ -39,7 +39,10 @@ nr dev
 
 Elk uses [Vitest](https://vitest.dev). You can run the test suite with:
 
-```
+```shell
+pnpm test
+
+# or if you installed ni
 nr test
 ```
 
@@ -58,16 +61,16 @@ If not using private browsing mode, you will need to uninstall the PWA applicati
 - Click on `Clear site data` button
 - Go to `Application > Service Workers` and check if the current `service worker` is missing or has the state `deleted` or `redundant`
 
-## CI errors
-
-Sometimes when you push your changes to create a new pull request (PR), the CI can fail, but we cannot check the logs to see what went wrong.
+## Before Submitting Pull Requests
 
-If you are getting **Semantic Pull Request** error, please check the [Semantic Pull Request](https://www.conventionalcommits.org/en/v1.0.0/#summary) documentation.
-
-You can run the following commands on your local environment to fix CI errors:
+When you are ready to submit a Pull Request (PR), run the following commands on your local environment to fix CI errors:
 - `pnpm test:unit` to run unit tests, maybe you also need to update snapshots
 - `pnpm test:typecheck` to run TypeScript checks run on CI
 
+Sometimes when you push your changes to create a new pull request (PR), the CI can fail, but the reviewers cannot see the logs to check what went wrong.
+
+If you get a **Semantic Pull Request** error, please check the [Semantic Pull Request](https://www.conventionalcommits.org/en/v1.0.0/#summary) documentation.
+
 ## RTL Support
 
 Elk supports `right-to-left` languages, we need to make sure that the UI is working correctly in both directions.

Dockerfile

@@ -17,6 +17,7 @@ RUN apk add git --no-cache
 
 # Prepare build deps ( ignore postinstall scripts for now )
 COPY package.json ./
+COPY pnpm-workspace.yaml ./
 COPY pnpm-lock.yaml ./
 RUN pnpm i --frozen-lockfile --ignore-scripts
 

README.md

@@ -154,4 +154,4 @@ You can consult the [PWA documentation](https://docs.elk.zone/pwa) to learn more
 
 ## 📄 License
 
-[MIT](./LICENSE) © 2022-PRESENT Elk contributors
+[MIT](./LICENSE) © 2022-PRESENT Elk contributors :)

app/components/account/AccountFollowButton.vue

@@ -90,7 +90,7 @@ const buttonStyle = computed(() => {
         <span elk-group-hover="hidden">{{ $t('account.blocking') }}</span>
         <span hidden elk-group-hover="inline">{{ $t('account.unblock') }}</span>
       </template>
-      <template v-if="relationship?.muting">
+      <template v-else-if="relationship?.muting">
         <span elk-group-hover="hidden">{{ $t('account.muting') }}</span>
         <span hidden elk-group-hover="inline">{{ $t('account.unmute') }}</span>
       </template>

app/components/common/CommonPaginator.vue

@@ -83,7 +83,7 @@ defineExpose({ createEntry, removeEntry, updateEntry })
         <WindowVirtualizer v-slot="{ item, index }" :data="items">
           <slot
             v-bind="{ key: (item as any)[keyProp] }"
-            :item="item"
+            :item="item as U"
             :older="items[index + 1] as U"
             :newer="items[index - 1] as U"
             :index="index"

app/components/content/ContentRich.vue

@@ -0,0 +1,40 @@
+<script lang="ts">
+import type { mastodon } from 'masto'
+import type { PropType } from 'vue'
+import { defineComponent, h } from 'vue'
+
+export default defineComponent({
+  name: 'ContentRich',
+  props: {
+    content: {
+      type: String,
+      required: true,
+    },
+    emojis: {
+      type: Array as PropType<mastodon.v1.CustomEmoji[]>,
+      default: undefined,
+    },
+    hideEmojis: {
+      type: Boolean,
+      default: false,
+    },
+    markdown: {
+      type: Boolean,
+      default: true,
+    },
+  },
+  setup(props) {
+    const emojisObject = useEmojisFallback(() => props.emojis)
+
+    return () => h(
+      'span',
+      { class: 'content-rich', dir: 'auto' },
+      contentToVNode(props.content, {
+        emojis: emojisObject.value,
+        hideEmojis: props.hideEmojis,
+        markdown: props.markdown,
+      }),
+    )
+  },
+})
+</script>

app/components/timeline/TimelineHome.vue

@@ -14,8 +14,14 @@ function preprocess(items: mastodon.v1.Status[]) {
 let followedTags: mastodon.v1.Tag[]
 if (currentUser.value !== undefined) {
   const { client } = useMasto()
-  const paginator = client.value.v1.followedTags.list()
-  followedTags = (await paginator.values().next()).value ?? []
+  try {
+    const paginator = client.value.v1.followedTags.list()
+    followedTags = (await paginator.values().next()).value ?? []
+  }
+  catch (e) {
+    console.error('Failed to fetch followed tags', e)
+    followedTags = []
+  }
 }
 </script>