AkkomaGang/akkoma-fe
4
13
Fork 56
Code Issues 75 Pull requests 18 Projects Releases 1 Wiki Activity

Auto-approve followbacks (frontend part) #365

Merged
floatingghost merged 1 commit from Oneric/akkoma-fe:followbacks-fe into develop 2024-02-20 16:24:37 +00:00
Conversation 1 Commits 1 Files changed 5 +21
5 changed files with 21 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/components/settings_modal/tabs/profile_tab.js
View file

@ -33,6 +33,7 @@ const ProfileTab = {
newName: this.$store.state.users.currentUser.name_unescaped,
newBio: unescape(this.$store.state.users.currentUser.description),
newLocked: this.$store.state.users.currentUser.locked,
newPermitFollowback: this.$store.state.users.currentUser.permit_followback,
newFields: this.$store.state.users.currentUser.fields.map(field => ({ name: field.name, value: field.value })),
showRole: this.$store.state.users.currentUser.show_role,
role: this.$store.state.users.currentUser.role,
@ -135,6 +136,7 @@ const ProfileTab = {
bot: this.bot,
show_role: this.showRole,
status_ttl_days: this.expirePosts ? this.newPostTTLDays : -1,
permit_followback: this.permit_followback,
accepts_direct_messages_from: this.userAcceptsDirectMessagesFrom
/* eslint-enable camelcase */
}

13
src/components/settings_modal/tabs/profile_tab.vue
View file

@ -259,6 +259,19 @@
<BooleanSetting path="serverSide_locked">
{{ $t('settings.lock_account_description') }}
</BooleanSetting>
<ul
class="setting-list suboptions"
:class="[{disabled: !serverSide_locked}]"
>
<li>
<BooleanSetting
path="serverSide_permitFollowback"
:disabled="!serverSide_locked"
>
{{ $t('settings.permit_followback_description') }}
</BooleanSetting>
</li>
</ul>
</li>
<li>
<BooleanSetting path="serverSide_discoverable">

1
src/i18n/en.json
View file

@ -601,6 +601,7 @@
"list_aliases_error": "Error fetching aliases: {error}",
"list_backups_error": "Error fetching backup list: {error}",
"lock_account_description": "Restrict your account to approved followers only",
Oneric marked this conversation as resolved Outdated
katafrakt commented 2024-02-03 11:21:45 +00:00
Outdated
Review
Copy link

This is a nitpick, but I wonder if the message here is clear enough. Perhaps something like this would be more precise:

Automatically approve follow requests from users you already follow

?

This is a nitpick, but I wonder if the message here is clear enough. Perhaps something like this would be more precise: > Automatically approve follow requests from users you already follow ?
Oneric commented 2024-02-03 15:26:38 +00:00
Outdated
Review
Copy link

Thanks for the suggestions, this is probably a bit easier to read, yeah

However, with “Automatically” the description gets longer than any other description currently on this page leading to linebreaks at widths which (at least in English) previously didn’t need any.
Just swapping “Automatically” for “Always” gets the text a bit below the current longest again though; for now I pushed this. Does this seem good or was “Automatically”-“Always” part of the confusing bit?

Alternatively the "follow request" part could be implied and “Automatically approve requests from already followed users” will also be short enough. Or maybe I’m just worrying too much about the linebreak and we should just use your original suggestion

Thanks for the suggestions, this is probably a bit easier to read, yeah However, with “Automatically” the description gets longer than any other description currently on this page leading to linebreaks at widths which (at least in English) previously didn’t need any. Just swapping “Automatically” for “Always” gets the text a bit below the current longest again though; for now I pushed this. Does this seem good or was “Automatically”-“Always” part of the confusing bit? Alternatively the "*follow* request" part could be implied and *“Automatically approve requests from already followed users”* will also be short enough. Or maybe I’m just worrying too much about the linebreak and we should just use your original suggestion
katafrakt commented 2024-02-04 20:35:16 +00:00
Outdated
Review
Copy link

I think it's actually "Automatic" vs "Always" that makes it a bit unclear. Not sure if the line length is that important here. "Automatically approve requests from already followed users" sounds good IMO.

I think it's actually "Automatic" vs "Always" that makes it a bit unclear. Not sure if the line length is that important here. "Automatically approve requests from already followed users" sounds good IMO.
Oneric commented 2024-02-04 21:20:04 +00:00
Outdated
Review
Copy link

oki, changed it to the latter

(as for line length: on a typical desktop all of the discussed options are equally fine, but on tablets or phones using the mobile interface it might become relevant)

oki, changed it to the latter (as for line length: on a typical desktop all of the discussed options are equally fine, but on tablets or phones using the mobile interface it might become relevant)
"permit_followback_description": "Automatically approve requests from already followed users",
"loop_video": "Loop videos",
"loop_video_silent_only": "Loop only videos without sound (i.e. Mastodon's \"gifs\")",
"mascot": "Mastodon FE Mascot",

4
src/modules/serverSideConfig.js
View file

@ -47,6 +47,10 @@ export const settingsMap = {
},
// Privacy
'locked': 'locked',
'permitFollowback': {
get: 'akkoma.permit_followback',
set: 'permit_followback'
},
'allowFollowingMove': {
get: 'pleroma.allow_following_move',
set: 'allow_following_move'

1
src/services/entity_normalizer/entity_normalizer.service.js
View file

@ -95,6 +95,7 @@ export const parseUser = (data) => {
if (data.akkoma) {
output.instance = data.akkoma.instance
output.status_ttl_days = data.akkoma.status_ttl_days
output.permit_followback = data.akkoma.permit_followback
}
if (data.pleroma) {