public-mirrors/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2025-04-13 09:44:40 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: Make confirm follow prompt not show up when cancelling a follow request (!941)

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

Closes #822

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
This commit is contained in:
Marie 2025-03-21 16:46:47 +00:00
commit aa1691295b
3 changed files with 16 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
locales/index.d.ts vendored
View file

@ -11637,6 +11637,10 @@ export interface Locale extends ILocale {
* Pending follow requests * Pending follow requests
*/ */
"pendingFollowRequests": string; "pendingFollowRequests": string;
/**
* Are you sure you want to cancel your follow request?
*/
"undoFollowRequestConfirm": string;
/** /**
* Show quotes * Show quotes
*/ */

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

@ -106,7 +106,7 @@ async function onClick() {
userId: props.user.id, userId: props.user.id,
}); });
} else { } else {
if (defaultStore.state.alwaysConfirmFollow) { if (defaultStore.state.alwaysConfirmFollow && !hasPendingFollowRequestFromYou.value) {
const { canceled } = await os.confirm({ const { canceled } = await os.confirm({
type: 'question', type: 'question',
text: i18n.tsx.followConfirm({ name: props.user.name || props.user.username }), text: i18n.tsx.followConfirm({ name: props.user.name || props.user.username }),
@ -119,6 +119,16 @@ async function onClick() {
} }
if (hasPendingFollowRequestFromYou.value) { if (hasPendingFollowRequestFromYou.value) {
const { canceled } = await os.confirm({
type: 'question',
text: i18n.ts.undoFollowRequestConfirm,
});
if (canceled) {
wait.value = false;
return;
}
await misskeyApi('following/requests/cancel', { await misskeyApi('following/requests/cancel', {
userId: props.user.id, userId: props.user.id,
}); });

1
sharkey-locales/en-US.yml
View file

@ -161,6 +161,7 @@ severAllFollowRelations: "Break following relationships"
severAllFollowRelationsConfirm: "Really break all follow relationships? This is irreversible! This will break {followingCount} following and {followersCount} follower relations on {instanceName}!" severAllFollowRelationsConfirm: "Really break all follow relationships? This is irreversible! This will break {followingCount} following and {followersCount} follower relations on {instanceName}!"
severAllFollowRelationsQueued: "Severing all follow relations with {host} queued." severAllFollowRelationsQueued: "Severing all follow relations with {host} queued."
pendingFollowRequests: "Pending follow requests" pendingFollowRequests: "Pending follow requests"
undoFollowRequestConfirm: "Are you sure you want to cancel your follow request?"
showQuotes: "Show quotes" showQuotes: "Show quotes"
showReplies: "Show replies" showReplies: "Show replies"
showNonPublicNotes: "Show non-public" showNonPublicNotes: "Show non-public"