[pull] main from elk-zone:main

app/components/account/AccountFollowButton.vue

@@ -95,15 +95,15 @@ const buttonStyle = computed(() => {
         <span hidden elk-group-hover="inline">{{ $t('account.unmute') }}</span>
       </template>
       <template v-else-if="relationship ? relationship.following : context === 'following'">
-        <span elk-group-hover="hidden">{{ relationship?.followedBy ? $t('account.mutuals') : $t('account.following') }}</span>
+        <span elk-group-hover="hidden">{{ relationship?.followedBy ? $t('account.unfollow') : $t('account.following') }}</span>
         <span hidden elk-group-hover="inline">{{ $t('account.unfollow') }}</span>
       </template>
       <template v-else-if="relationship?.requested">
         <span elk-group-hover="hidden">{{ $t('account.follow_requested') }}</span>
         <span hidden elk-group-hover="inline">{{ $t('account.withdraw_follow_request') }}</span>
       </template>
       <template v-else-if="relationship ? relationship.followedBy : context === 'followedBy'">
-        <span elk-group-hover="hidden">{{ $t('account.follows_you') }}</span>
+        <span elk-group-hover="hidden">{{ account.locked ? $t('account.request_follow') : $t('account.follow_back') }}</span>
         <span hidden elk-group-hover="inline">{{ account.locked ? $t('account.request_follow') : $t('account.follow_back') }}</span>
       </template>
       <template v-else>

app/components/account/AccountHeader.vue

@@ -191,6 +191,7 @@ async function copyAccountName() {
             <AccountDisplayName :account="account" font-bold sm:text-2xl text-xl />
             <AccountLockIndicator v-if="account.locked" show-label />
             <AccountBotIndicator v-if="account.bot" show-label />
+            <AccountRelationshipIndicator v-if="relationship" :relationship="relationship" />
           </div>
 
           <div flex items-center gap-1>

app/components/account/AccountRelationshipIndicator.vue

@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import type { mastodon } from 'masto'
+
+defineProps<{
+  relationship: mastodon.v1.Relationship
+}>()
+
+const { t } = useI18n()
+</script>
+
+<template>
+  <span
+    v-if="relationship.followedBy"
+    border border-base rounded-md px-2 text-secondary-light
+  >
+    {{ relationship.following ? t('account.mutuals') : t('account.follows_you') }}
+  </span>
+</template>

app/components/notification/NotificationGroupedLikes.vue

@@ -18,7 +18,13 @@ const likesTimeAgo = useTimeAgo(() => likesTimeAgoCreatedAt.value ?? '', timeAgo
 
 <template>
   <article flex flex-col relative>
-    <StatusLink :status="group.status!" pb4 pt5>
+    <StatusLink
+      cursor-pointer
+      hover-bg-active
+      rounded-3
+      transition-100
+      :status="group.status!" pb4 pt5
+    >
       <div flex flex-col gap-3>
         <div v-if="reblogs.length" flex="~ gap-1">
           <div i-ri:repeat-fill text-xl me-2 color-green />

app/components/status/StatusCard.vue

@@ -75,7 +75,13 @@ const forceShow = ref(false)
 </script>
 
 <template>
-  <StatusLink :status="status" :hover="hover" :disable-link="disableLink">
+  <StatusLink
+    cursor-pointer
+    hover-bg-active
+    rounded-3
+    transition-100
+    :status="status" :hover="hover" :disable-link="disableLink"
+  >
     <!-- Upper border -->
     <div :h="showUpperBorder ? '1px' : '0'" w-auto bg-border mb-1 z--1 />
 

package.json

@@ -135,22 +135,22 @@
   },
   "devDependencies": {
     "@antfu/eslint-config": "^7.7.2",
-    "@types/chroma-js": "^3.1.1",
+    "@types/chroma-js": "^3.1.2",
     "@types/file-saver": "^2.0.7",
     "@types/fnando__sparkline": "^0.3.7",
     "@types/fs-extra": "^11.0.4",
-    "@types/wicg-file-system-access": "^2023.10.6",
+    "@types/wicg-file-system-access": "^2023.10.7",
     "@types/ws": "^8.18.1",
-    "@unocss/eslint-config": "^66.4.2",
+    "@unocss/eslint-config": "^66.6.6",
     "@vue/test-utils": "2.4.6",
-    "bumpp": "^10.2.3",
+    "bumpp": "^10.4.1",
     "consola": "^3.4.2",
     "eslint": "^9.39.4",
-    "eslint-plugin-format": "^1.0.1",
+    "eslint-plugin-format": "^1.5.0",
     "flat": "^6.0.1",
     "nano-staged": "^0.9.0",
     "prettier": "^3.8.1",
-    "sharp": "^0.34.3",
+    "sharp": "^0.34.5",
     "sharp-ico": "^0.1.5",
     "simple-git-hooks": "^2.13.1",
     "typescript": "^5.4.4",