misty.cafe/mistykey
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

merge: Add buttons to accept/reject follow request from the requestor's profile (resolves #896) (!872)

Browse source 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/872

Closes #896

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Marie 2025-02-07 03:43:45 +00:00
commit de7ecdc487
2 changed files with 99 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

12
packages/frontend/src/components/MkFollowButton.vue
View file

@ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only
<button
class="_button"
:class="[$style.root, { [$style.wait]: wait, [$style.active]: isFollowing || hasPendingFollowRequestFromYou, [$style.full]: full, [$style.large]: large }]"
:disabled="wait"
:disabled="wait || disabled"
@click="onClick"
>
<template v-if="!wait">
@ -35,7 +35,7 @@ SPDX-License-Identifier: AGPL-3.0-only
</template>
<script lang="ts" setup>
import { onBeforeUnmount, onMounted, ref } from 'vue';
import { onBeforeUnmount, onMounted, ref, watch } from 'vue';
import * as Misskey from 'misskey-js';
import { host } from '@@/js/config.js';
import * as os from '@/os.js';
@ -51,13 +51,16 @@ const props = withDefaults(defineProps<{
user: Misskey.entities.UserDetailed,
full?: boolean,
large?: boolean,
disabled?: boolean,
}>(), {
full: false,
large: false,
disabled: false,
});
const emit = defineEmits<{
(_: 'update:user', value: Misskey.entities.UserDetailed): void
(_: 'update:user', value: Misskey.entities.UserDetailed): void,
(_: 'update:wait', value: boolean): void,
}>();
const isFollowing = ref(props.user.isFollowing);
@ -65,6 +68,9 @@ const hasPendingFollowRequestFromYou = ref(props.user.hasPendingFollowRequestFro
const wait = ref(false);
const connection = useStream().useChannel('main');
// Emit the "wait" status so external components can synchronize state
watch(wait, value => emit('update:wait', value));
if (props.user.isFollowing == null && $i) {
misskeyApi('users/show', {
userId: props.user.id,