mirrors/barkey
1
0
Fork 0
mirror of https://codeberg.org/yeentown/barkey.git synced 2025-07-06 20:16:57 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

merge: Always show bubble controls (!1023)

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

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
This commit is contained in:
Hazelnoot 2025-05-12 18:52:54 +00:00
commit 90e4ea765a
3 changed files with 25 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
locales/index.d.ts vendored
View file

@ -13029,6 +13029,18 @@ export interface Locale extends ILocale {
* Text does not match any patterns. * Text does not match any patterns.
*/ */
"wordMuteTestNoMatch": string; "wordMuteTestNoMatch": string;
/**
* Bubble timeline
*/
"bubbleTimeline": string;
/**
* Choose which instances should be displayed in the bubble.
*/
"bubbleTimelineDescription": string;
/**
* Note: the bubble timeline is hidden by default, and must be enabled via roles.
*/
"bubbleTimelineMustBeEnabled": string;
} }
declare const locales: { declare const locales: {
[lang: string]: Locale; [lang: string]: Locale;

15
packages/frontend/src/pages/admin/moderation.vue
View file

@ -26,15 +26,19 @@ SPDX-License-Identifier: AGPL-3.0-only
<FormLink to="/admin/server-rules">{{ i18n.ts.serverRules }}</FormLink> <FormLink to="/admin/server-rules">{{ i18n.ts.serverRules }}</FormLink>
<!-- TODO translate --> <MkFolder>
<MkFolder v-if="bubbleTimelineEnabled">
<template #icon><i class="ph-drop ph-bold ph-lg"></i></template> <template #icon><i class="ph-drop ph-bold ph-lg"></i></template>
<template #label>Bubble timeline</template> <template #label>{{ i18n.ts.bubbleTimeline }}</template>
<div class="_gaps"> <div class="_gaps">
<div v-if="!$i.policies.btlAvailable">
<i class="ti ti-alert-triangle"></i> {{ i18n.ts.bubbleTimelineMustBeEnabled }}
</div>
<MkTextarea v-model="bubbleTimeline"> <MkTextarea v-model="bubbleTimeline">
<template #caption>Choose which instances should be displayed in the bubble.</template> <template #caption>{{ i18n.ts.bubbleTimelineDescription }}</template>
</MkTextarea> </MkTextarea>
<MkButton primary @click="save_bubbleTimeline">{{ i18n.ts.save }}</MkButton> <MkButton primary @click="save_bubbleTimeline">{{ i18n.ts.save }}</MkButton>
</div> </div>
</MkFolder> </MkFolder>
@ -179,11 +183,11 @@ import MkButton from '@/components/MkButton.vue';
import FormLink from '@/components/form/link.vue'; import FormLink from '@/components/form/link.vue';
import MkFolder from '@/components/MkFolder.vue'; import MkFolder from '@/components/MkFolder.vue';
import SkPatternTest from '@/components/SkPatternTest.vue'; import SkPatternTest from '@/components/SkPatternTest.vue';
import { $i } from '@/i';
const enableRegistration = ref<boolean>(false); const enableRegistration = ref<boolean>(false);
const emailRequiredForSignup = ref<boolean>(false); const emailRequiredForSignup = ref<boolean>(false);
const approvalRequiredForSignup = ref<boolean>(false); const approvalRequiredForSignup = ref<boolean>(false);
const bubbleTimelineEnabled = ref<boolean>(false);
const sensitiveWords = ref<string>(''); const sensitiveWords = ref<string>('');
const prohibitedWords = ref<string>(''); const prohibitedWords = ref<string>('');
const prohibitedWordsForNameOfUser = ref<string>(''); const prohibitedWordsForNameOfUser = ref<string>('');
@ -206,7 +210,6 @@ async function init() {
hiddenTags.value = meta.hiddenTags.join('\n'); hiddenTags.value = meta.hiddenTags.join('\n');
preservedUsernames.value = meta.preservedUsernames.join('\n'); preservedUsernames.value = meta.preservedUsernames.join('\n');
bubbleTimeline.value = meta.bubbleInstances.join('\n'); bubbleTimeline.value = meta.bubbleInstances.join('\n');
bubbleTimelineEnabled.value = meta.policies.btlAvailable;
trustedLinkUrlPatterns.value = meta.trustedLinkUrlPatterns.join('\n'); trustedLinkUrlPatterns.value = meta.trustedLinkUrlPatterns.join('\n');
blockedHosts.value = meta.blockedHosts.join('\n'); blockedHosts.value = meta.blockedHosts.join('\n');
silencedHosts.value = meta.silencedHosts?.join('\n') ?? ''; silencedHosts.value = meta.silencedHosts?.join('\n') ?? '';

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

@ -559,3 +559,7 @@ wordMuteTestTest: "Test"
wordMuteTestMatch: "Matched words: {words}" wordMuteTestMatch: "Matched words: {words}"
wordMuteTestNoResults: "No results yet, enter some text and click \"Test\" to check it." wordMuteTestNoResults: "No results yet, enter some text and click \"Test\" to check it."
wordMuteTestNoMatch: "Text does not match any patterns." wordMuteTestNoMatch: "Text does not match any patterns."
bubbleTimeline: "Bubble timeline"
bubbleTimelineDescription: "Choose which instances should be displayed in the bubble."
bubbleTimelineMustBeEnabled: "Note: the bubble timeline is hidden by default, and must be enabled via roles."