Skip to content

Commit 568f0be

Browse files
authored
chore: remove request to follow functionality (#50)
resolve #41
1 parent eccabeb commit 568f0be

38 files changed

+23
-346
lines changed

components/account/AccountFollowButton.vue

+2-6
Original file line numberDiff line numberDiff line change
@@ -98,16 +98,12 @@ const buttonStyle = computed(() => {
9898
<span nimbus-group-hover="hidden">{{ relationship?.followedBy ? $t('account.mutuals') : $t('account.following') }}</span>
9999
<span hidden nimbus-group-hover="inline">{{ $t('account.unfollow') }}</span>
100100
</template>
101-
<template v-else-if="relationship?.requested">
102-
<span nimbus-group-hover="hidden">{{ $t('account.follow_requested') }}</span>
103-
<span hidden nimbus-group-hover="inline">{{ $t('account.withdraw_follow_request') }}</span>
104-
</template>
105101
<template v-else-if="relationship ? relationship.followedBy : context === 'followedBy'">
106102
<span nimbus-group-hover="hidden">{{ $t('account.follows_you') }}</span>
107-
<span hidden nimbus-group-hover="inline">{{ account.locked ? $t('account.request_follow') : $t('account.follow_back') }}</span>
103+
<span hidden nimbus-group-hover="inline">{{ $t('account.follow_back') }}</span>
108104
</template>
109105
<template v-else>
110-
<span>{{ account.locked ? $t('account.request_follow') : $t('account.follow') }}</span>
106+
<span>{{ $t('account.follow') }}</span>
111107
</template>
112108
</template>
113109
</button>

components/account/AccountFollowRequestButton.vue

-68
This file was deleted.

components/account/AccountHeader.vue

-4
Original file line numberDiff line numberDiff line change
@@ -127,10 +127,6 @@ async function copyAccountName() {
127127

128128
<template>
129129
<div flex flex-col>
130-
<div v-if="relationship?.requestedBy" p-4 flex justify-between items-center bg-card>
131-
<span text-primary font-bold>{{ $t('account.requested', [account.displayName]) }}</span>
132-
<AccountFollowRequestButton :account="account" :relationship="relationship" />
133-
</div>
134130
<component :is="hasHeader ? 'button' : 'div'" border="b base" z-1 @click="hasHeader ? previewHeader() : undefined">
135131
<img h-50 height="200" w-full object-cover :src="account.header" :alt="t('account.profile_description', [account.username])">
136132
</component>

components/notification/NotificationCard.vue

-15
Original file line numberDiff line numberDiff line change
@@ -64,21 +64,6 @@ if (unsupportedEmojiReactionTypes.includes(notification.type))
6464
</div>
6565
</NuxtLink>
6666
</template>
67-
<template v-else-if="notification.type === 'follow_request'">
68-
<div flex px-3 py-2>
69-
<div i-ri-user-shared-line text-xl me-3 color-blue />
70-
<AccountDisplayName
71-
:account="notification.account"
72-
text-primary me-1 font-bold line-clamp-1 ws-pre-wrap break-all
73-
/>
74-
<span me-1 ws-nowrap>
75-
{{ $t('notification.request_to_follow') }}
76-
</span>
77-
</div>
78-
<AccountCard p="s-2 e-4 b-2" hover-card :account="notification.account">
79-
<AccountFollowRequestButton :account="notification.account" />
80-
</AccountCard>
81-
</template>
8267
<template v-else-if="notification.type === 'update'">
8368
<StatusCard :status="notification.status!" :in-notification="true" :actions="false">
8469
<template #meta>

locales/ar.json

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
"route_loaded": "تم تحميل الصفحة {0}"
88
},
99
"account": {
10-
"authorize": "إعطاء إذن المتابعة",
11-
"authorized": "لقد أعطيت إذن المتابعة",
1210
"avatar_description": "صورة حساب {0}",
1311
"blocked_by": "تم حظرك من قبل هذا المستخدم",
1412
"blocked_domains": "النطاقات المحظورة",
@@ -19,7 +17,6 @@
1917
"favourites": "المفضلة",
2018
"follow": "إتبع",
2119
"follow_back": "إعادة متابعة",
22-
"follow_requested": "طلبت المتابعة",
2320
"followers": "متابِعون",
2421
"followers_count": "لا يوجد متابعون|{0} متابِع|{0} متابِعين|{0} متابِعون|{0} متابِع|{0} متابِع",
2522
"following": "مُتابَع",
@@ -39,16 +36,11 @@
3936
"profile_description": "{0} رأسية حساب",
4037
"profile_personal_note": "ملاحظة شخصية",
4138
"profile_unavailable": "حساب غير متوفر",
42-
"reject": "رفض طلب المتابعة",
43-
"rejected": "لقد رفضت طلب المتابعة",
44-
"request_follow": "طلب متابعة",
45-
"requested": "لقد طلب(ت) {0} متابعتك",
4639
"unblock": "إلغاء حظر",
4740
"unfollow": "إلغاء متابعة",
4841
"unmute": "إلغاء كتم",
4942
"view_other_followers": "قد لا يتم عرض المتابعين من خوادم مختلفين عن الخاص بك.",
50-
"view_other_following": "قد لا يتم عرض من تتابع من خوادم مختلفين عن الخاص بك.",
51-
"withdraw_follow_request": "إلغاء طلب المتابعة"
43+
"view_other_following": "قد لا يتم عرض من تتابع من خوادم مختلفين عن الخاص بك."
5244
},
5345
"action": {
5446
"apply": "تطبيق",
@@ -309,7 +301,6 @@
309301
"missing_type": "MISSING notification.type:",
310302
"reblogged_post": "اعاد نشر منشورك",
311303
"reported": "تم الإبلاغ من {0} عن {1}",
312-
"request_to_follow": "طلب(ت) متابعتك",
313304
"signed_up": "تسجل",
314305
"update_status": "قام(ت) بتحديث حالته(ا)"
315306
},
@@ -602,7 +593,6 @@
602593
"notifications_all": "كل شىء",
603594
"notifications_favourite": "اضافة الى المفضلة",
604595
"notifications_follow": "اتبع",
605-
"notifications_follow_request": "طلب المتابعة",
606596
"notifications_mention": "موجهة إلي",
607597
"notifications_more_tooltip": "تصفية الإخطارات حسب النوع",
608598
"notifications_reblog": "إعادة المدونات",

locales/ca-valencia.json

-2
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
"blocked_domains": "Domini bloquejat",
1212
"favourites": "Preferit",
1313
"follow_back": "Segueix també",
14-
"follow_requested": "Sol·licitat",
1514
"go_to_profile": "Ves al perfil",
1615
"joined": "Data d'unió",
1716
"moved_title": "ha indicat que el seu compte és ara:",
@@ -161,7 +160,6 @@
161160
"followed_you_count": "{0} persones t'han seguit|{0} persona t'ha seguit|{0} persones t'han seguit",
162161
"missing_type": "MISSING notification.type:",
163162
"reblogged_post": "t'ha impulsat",
164-
"request_to_follow": "ha demanat seguir-te",
165163
"signed_up": "s'ha registrat",
166164
"update_status": "ha actualitzat la publicació"
167165
},

locales/ca.json

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
"route_loaded": "S'ha carregat la pàgina {0}"
88
},
99
"account": {
10-
"authorize": "Autoritza seguiment",
11-
"authorized": "Has autoritzat la sol·licitud",
1210
"avatar_description": "Avatar de {0}",
1311
"blocked_by": "Estàs bloquejat per aquest usuari.",
1412
"blocked_domains": "Dominis bloquejats",
@@ -19,7 +17,6 @@
1917
"favourites": "Preferits",
2018
"follow": "Segueix",
2119
"follow_back": "Segueix de tornada",
22-
"follow_requested": "Demanat",
2320
"followers": "Seguidors",
2421
"followers_count": "{0} Seguidors|{0} Seguidor|{0} Seguidors",
2522
"following": "Seguint",
@@ -40,16 +37,11 @@
4037
"profile_description": "Capçalera del perfil de {0}",
4138
"profile_personal_note": "Nota Personal",
4239
"profile_unavailable": "Perfil no disponible",
43-
"reject": "rebutja seguiment",
44-
"rejected": "Has rebutjat la sol·licitud",
45-
"request_follow": "Sol·licitud de seguiment",
46-
"requested": "{0} ha sol·licitat seguir-te",
4740
"unblock": "Desbloqueja",
4841
"unfollow": "Deixa de seguir",
4942
"unmute": "Activa el so",
5043
"view_other_followers": "És possible que no es mostrin els seguidors d'altres instàncies.",
51-
"view_other_following": "És possible que no es mostrin els seguits d'altres instàncies.",
52-
"withdraw follow request": "Retira la sol·licitud de seguiment"
44+
"view_other_following": "És possible que no es mostrin els seguits d'altres instàncies."
5345
},
5446
"action": {
5547
"apply": "Aplicar",
@@ -340,7 +332,6 @@
340332
"missing_type": "FALTA notificació.tipus:",
341333
"reblogged_post": "ha reblogjat la teva publicació",
342334
"reported": "{0} va denunciar {1}",
343-
"request_to_follow": "demanat que us segueixi",
344335
"signed_up": "registrat",
345336
"update_status": "ha actualitzat la seva publicació"
346337
},
@@ -665,7 +656,6 @@
665656
"notifications_all": "Totes",
666657
"notifications_favourite": "Preferides",
667658
"notifications_follow": "T'han seguit",
668-
"notifications_follow_request": "Sol·licituds de seguiment",
669659
"notifications_mention": "Esmentes",
670660
"notifications_more_tooltip": "Filtrar notificacions per tipus",
671661
"notifications_poll": "Enquestes",

locales/ckb.json

-3
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"favourites": "دڵخواز",
1717
"follow": "بەدواداچوون",
1818
"follow_back": "دوا بکەوە",
19-
"follow_requested": "داواکراوە",
2019
"followers": "هۆگران",
2120
"followers_count": "هۆگر {0}|هۆگر {0}|{0} هۆگر",
2221
"following": "شوێنکەوتوو",
@@ -36,7 +35,6 @@
3635
"profile_description": "سەردێڕی پڕۆفایلی {0}",
3736
"profile_personal_note": "تێبینی کەسی",
3837
"profile_unavailable": "پڕۆفایلی بەردەست نییە",
39-
"request_follow": "داواکاری بۆ بەدواداچوون",
4038
"unblock": "بلۆک بکەرەوە",
4139
"unfollow": "بەدوایدا مەچۆ",
4240
"unmute": "بێدەنگی لابەرە",
@@ -298,7 +296,6 @@
298296
"missing_type": "MISSING notification.type:",
299297
"reblogged_post": "هاوبەشیکردنی بابەتی تۆ",
300298
"reported": "{0} گوزارشی {1}",
301-
"request_to_follow": "داوای کردووە کە شوێنتان بکەوێت ",
302299
"signed_up": "بوو به ئه ندام",
303300
"update_status": "بابەتەکەیان نوێکردەوە"
304301
},

locales/cs-CZ.json

-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
"favourites": "Oblíbené",
1010
"follow": "Sledovat",
1111
"follow_back": "Taky sledovat",
12-
"follow_requested": "Požádáno o sledování",
1312
"followers": "Sledující",
1413
"followers_count": "{0} sledujících",
1514
"following": "Sleduji",
@@ -133,7 +132,6 @@
133132
"followed_you_count": "{n} osoba vás začala sledovat|{n} lidí vás začalo sledovat",
134133
"missing_type": "MISSING notification.type:",
135134
"reblogged_post": "přeposlal váš příspěvek",
136-
"request_to_follow": "požádal o sledování",
137135
"update_status": "aktualizoval svůj status"
138136
},
139137
"placeholder": {

locales/cy.json

-2
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
"favourites": "Ffefrynnau",
1717
"follow": "Dilyn",
1818
"follow_back": "Dilyn yn ôl",
19-
"follow_requested": "Wedi gofyn i ddilyn",
2019
"followers": "Dilynwyr",
2120
"followers_count": "{0} Dilynwr",
2221
"following": "Yn dilyn",
@@ -191,7 +190,6 @@
191190
"followed_you_count": "Gwnaeth {0} person eich dilyn",
192191
"missing_type": "HEB notification.type:",
193192
"reblogged_post": "bŵstiodd eich tŵt",
194-
"request_to_follow": "gofynwyd i eich dilyn",
195193
"signed_up": "wedi ymuno",
196194
"update_status": "wedi golygu ei tŵt"
197195
},

locales/de-DE.json

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
"route_loaded": "Seite {0} geladen"
88
},
99
"account": {
10-
"authorize": "Erlauben zu folgen",
11-
"authorized": "Du hast die Folgeanfrage erlaubt",
1210
"avatar_description": "Avatar von {0}",
1311
"blocked_by": "Du wurdest von diesem Account geblockt",
1412
"blocked_domains": "Geblockte Bluesky-Instanzen",
@@ -19,7 +17,6 @@
1917
"favourites": "Favoriten",
2018
"follow": "Folgen",
2119
"follow_back": "Zurück folgen",
22-
"follow_requested": "Angefragt",
2320
"followers": "Follower",
2421
"followers_count": "{0} Follower",
2522
"following": "Du folgst",
@@ -40,16 +37,11 @@
4037
"profile_description": "Profil von {0}",
4138
"profile_personal_note": "Persönliche Notiz",
4239
"profile_unavailable": "Profil nicht verfügbar",
43-
"reject": "Folgeanfrage ablehnen",
44-
"rejected": "Du hast den Antrag abgelehnt",
45-
"request_follow": "Folgeanfrage senden",
46-
"requested": "{0} will dir folgen",
4740
"unblock": "Entblocken",
4841
"unfollow": "Entfolgen",
4942
"unmute": "Stummschaltung aufheben",
5043
"view_other_followers": "Follower aus anderen Instanzen werden möglicherweise nicht angezeigt.",
51-
"view_other_following": "Das Folgen von anderen Instanzen wird möglicherweise nicht angezeigt.",
52-
"withdraw_follow_request": "Folgeanfrage zurückziehen"
44+
"view_other_following": "Das Folgen von anderen Instanzen wird möglicherweise nicht angezeigt."
5345
},
5446
"action": {
5547
"apply": "Anwenden",
@@ -341,7 +333,6 @@
341333
"missing_type": "Fehlender notification.type:",
342334
"reblogged_post": "hat deinen Beitrag geteilt",
343335
"reported": "{0} hat {1} gemeldet",
344-
"request_to_follow": "möchte dir folgen",
345336
"signed_up": "hat sich registriert",
346337
"update_status": "hat diesen Beitrag aktualisiert"
347338
},
@@ -646,7 +637,6 @@
646637
"notifications_all": "Alle",
647638
"notifications_favourite": "Favorisiert",
648639
"notifications_follow": "Folgen",
649-
"notifications_follow_request": "Folgeanfrage",
650640
"notifications_mention": "Erwähnung",
651641
"notifications_more_tooltip": "Benachrichtigungen nach Typ filtern",
652642
"notifications_reblog": "Geteilt",

locales/el-GR.json

+1-11
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,6 @@
77
"route_loaded": "Η σελίδα {0} φορτώθηκε"
88
},
99
"account": {
10-
"authorize": "Εξουσιοδότησε για να ακολουθήσεις",
11-
"authorized": "You have Authorized the request",
1210
"avatar_description": "το άβαταρ του χρήστη {0}",
1311
"blocked_by": "Είσαι αποκλεισμένος από αυτόν τον χρήστη.",
1412
"blocked_domains": "Αποκλεισμένοι τομείς",
@@ -19,7 +17,6 @@
1917
"favourites": "Αγαπημένα",
2018
"follow": "Ακολούθησε",
2119
"follow_back": "Ακολούθησε και συ",
22-
"follow_requested": "Αιτήθηκε",
2320
"followers": "Ακόλουθοι",
2421
"followers_count": "{0} Ακόλουθοι|{0} Ακόλουθος|{0} Ακόλουθοι",
2522
"following": "Ακολουθεί",
@@ -40,16 +37,11 @@
4037
"profile_description": "Κεφαλίδα προφίλ του χρήστη {0}",
4138
"profile_personal_note": "Προσωπική Σημείωση",
4239
"profile_unavailable": "Μη διαθέσιμο προφίλ",
43-
"reject": "Άρνηση ακολούθησης",
44-
"rejected": "Αρνήθηκες το αίτημα",
45-
"request_follow": "Αίτημα ακολούθησης",
46-
"requested": "Ο χρήστης {0} ζήτησε να σε ακολουθήσει",
4740
"unblock": "Άρση αποκλεισμού",
4841
"unfollow": "Άρση ακολούθησης",
4942
"unmute": "Άρση σίγασης",
5043
"view_other_followers": "Οι ακόλουθοι από άλλες οντότητες μπορεί να μην εμφανίζονται.",
51-
"view_other_following": "Αυτοί που ακολουθείς από άλλες οντότητες μπορεί να μην εμφανίζονται.",
52-
"withdraw_follow_request": "Ανάκληση αιτήματος ακολούθησης"
44+
"view_other_following": "Αυτοί που ακολουθείς από άλλες οντότητες μπορεί να μην εμφανίζονται."
5345
},
5446
"action": {
5547
"apply": "Εφαρμογή",
@@ -334,7 +326,6 @@
334326
"missing_type": "ΛΕΙΠΕΙ ειδοποίηση.τύπος:",
335327
"reblogged_post": "ενίσχυσε την ανάρτησή σου",
336328
"reported": "Ο χρήστης {0} ανέφερε {1}",
337-
"request_to_follow": "αιτήθηκε να σε ακολουθήσει",
338329
"signed_up": "έκανε εγγραφή",
339330
"update_status": "ενημέρωσε την ανάρτησή του"
340331
},
@@ -632,7 +623,6 @@
632623
"notifications_all": "Όλα",
633624
"notifications_favourite": "Αγαπημένα",
634625
"notifications_follow": "Ακολουθείς",
635-
"notifications_follow_request": "Αιτήματα ακολούθησης",
636626
"notifications_mention": "Αναφορές",
637627
"notifications_more_tooltip": "Φιλτράρισμα ειδοποιήσεων βάσει τύπου",
638628
"notifications_reblog": "Ενίσχυση",

0 commit comments

Comments
 (0)