natty
/
calckey
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

fix: show follow requests even if not locked

This commit is contained in:
ThatOneCalculator 2023-05-19 22:52:14 -07:00
parent 7a75ba477d
commit 973b1837a6
No known key found for this signature in database
GPG Key ID: 8703CACD01000000
3 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
locales/en-US.yml
View File

@ -1088,6 +1088,7 @@ preventAiLearning: "Prevent AI bot scraping"
preventAiLearningDescription: "Request third-party AI language models not to study\ preventAiLearningDescription: "Request third-party AI language models not to study\
\ content you upload, such as posts and images." \ content you upload, such as posts and images."
noGraze: "Please disable the \"Graze for Mastodon\" browser extension, as it interferes with Calckey." noGraze: "Please disable the \"Graze for Mastodon\" browser extension, as it interferes with Calckey."
silencedWarning: "This page is showing because these usera are from servers your admin silenced, so they may potentially be spam."
_sensitiveMediaDetection: _sensitiveMediaDetection:
description: "Reduces the effort of server moderation through automatically recognizing\ description: "Reduces the effort of server moderation through automatically recognizing\

2
packages/client/src/navbar.ts
View File

@ -34,7 +34,7 @@ export const navbarItemDef = reactive({
followRequests: { followRequests: {
title: "followRequests", title: "followRequests",
icon: "ph-hand-waving ph-bold ph-lg", icon: "ph-hand-waving ph-bold ph-lg",
show: computed(() => $i?.isLocked), show: computed(() => $i?.isLocked || $i?.hasPendingReceivedFollowRequest),
indicated: computed(() => $i?.hasPendingReceivedFollowRequest), indicated: computed(() => $i?.hasPendingReceivedFollowRequest),
to: "/my/follow-requests", to: "/my/follow-requests",
}, },

8
packages/client/src/pages/follow-requests.vue
View File

@ -7,12 +7,19 @@
<div class="_fullinfo"> <div class="_fullinfo">
<img <img
src="/static-assets/badges/info.png" src="/static-assets/badges/info.png"
aria-label="none"
class="_ghost" class="_ghost"
/> />
<div>{{ i18n.ts.noFollowRequests }}</div> <div>{{ i18n.ts.noFollowRequests }}</div>
</div> </div>
</template> </template>
<template #default="{ items }"> <template #default="{ items }">
<MkInfo
v-if="$i?.isLocked === false"
warn
class="info"
>{{ i18n.ts.silencedWarning }}
</MkInfo>
<div class="mk-follow-requests"> <div class="mk-follow-requests">
<div <div
v-for="req in items" v-for="req in items"
@ -82,6 +89,7 @@ import { userPage, acct } from "@/filters/user";
import * as os from "@/os"; import * as os from "@/os";
import { i18n } from "@/i18n"; import { i18n } from "@/i18n";
import { definePageMetadata } from "@/scripts/page-metadata"; import { definePageMetadata } from "@/scripts/page-metadata";
import { $i } from "@/account";
const paginationComponent = ref<InstanceType<typeof MkPagination>>(); const paginationComponent = ref<InstanceType<typeof MkPagination>>();