Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

いろいろかえた

Browse source
This commit is contained in:
mattyatea 2024-01-29 01:08:54 +09:00
parent 7a3eb26c4d
commit 9031d41812
3 changed files with 32 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
locales/index.d.ts vendored
View file

@ -2916,11 +2916,14 @@ export interface Locale extends ILocale {
* 送信 * 送信
*/ */
"send": string; "send": string;
"reportedNote": string;
/** /**
* ファイル付きのみ * ファイル付きのみ
*/ */
"fileAttachedOnly": string; "fileAttachedOnly": string;
/**
* 通報されたノート
*/
"reportedNote": string;
/** /**
* 対応済みにする * 対応済みにする
*/ */
@ -3702,9 +3705,12 @@ export interface Locale extends ILocale {
*/ */
"emailRequiredForSignup": string; "emailRequiredForSignup": string;
/** /**
* 未読 * GDPRモードを有効にする
*/ */
"enableGDPRMode": string; "enableGDPRMode": string;
/**
* 未読
*/
"unread": string; "unread": string;
/** /**
* フィルタ * フィルタ

3
packages/backend/src/server/api/endpoints/notes/user-list-timeline.ts
View file

@ -93,6 +93,9 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
const list = await this.userListsRepository.findOneBy({ const list = await this.userListsRepository.findOneBy({
id: ps.listId, id: ps.listId,
isPublic: true, isPublic: true,
}) ?? await this.userListsRepository.findOneBy({
id: ps.listId,
userId: me.id,
}); });
if (list == null) { if (list == null) {

43
packages/frontend/src/ui/universal.widgets.vue
View file

@ -7,17 +7,16 @@ SPDX-License-Identifier: AGPL-3.0-only
<div> <div>
<XWidgets :edit="editMode" :widgets="widgets" @addWidget="addWidget" @removeWidget="removeWidget" @updateWidget="updateWidget" @updateWidgets="updateWidgets" @exit="editMode = false"/> <XWidgets :edit="editMode" :widgets="widgets" @addWidget="addWidget" @removeWidget="removeWidget" @updateWidget="updateWidget" @updateWidgets="updateWidgets" @exit="editMode = false"/>
<button v-if="editMode" class="_textButton" style="font-size: 0.9em;" :class="{[$style.gamingDark]: gaming === 'dark',[$style.gamingLight]: gaming === 'light' }" @click="editMode = false"><i class="ti ti-check"></i> {{ i18n.ts.editWidgetsExit }}</button> <button v-if="editMode" class="_textButton" style="font-size: 0.9em;" :class="{[$style.gamingDark]: gaming === 'dark',[$style.gamingLight]: gaming === 'light' }" @click="editMode = false"><i class="ti ti-check"></i> {{ i18n.ts.editWidgetsExit }}</button>
<button v-else class="_textButton" data-cy-widget-edit :class="$style.edit, {[$style.gamingDark]: gaming === 'dark',[$style.gamingLight]: gaming === 'light' }" style="font-size: 0.9em;" @click="editMode = true"><i class="ti ti-pencil"></i> {{ i18n.ts.editWidgets }}</button> <button v-else class="_textButton" data-cy-widget-edit :class="$style.edit, {[$style.gamingDark]: gaming === 'dark',[$style.gamingLight]: gaming === 'light' }" style="font-size: 0.9em;" @click="editMode = true"><i class="ti ti-pencil"></i> {{ i18n.ts.editWidgets }}</button>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts">
import { computed, ref } from 'vue'; import { computed, ref, watch } from 'vue';
const editMode = ref(false); const editMode = ref(false);
</script> </script>
<script lang="ts" setup> <script lang="ts" setup>
import { ref , computed , watch} from 'vue';
import XWidgets from '@/components/MkWidgets.vue'; import XWidgets from '@/components/MkWidgets.vue';
import { i18n } from '@/i18n.js'; import { i18n } from '@/i18n.js';
import { defaultStore } from '@/store.js'; import { defaultStore } from '@/store.js';
@ -27,32 +26,32 @@ let gaming = ref('');
const gamingMode = computed(defaultStore.makeGetterSetter('gamingMode')); const gamingMode = computed(defaultStore.makeGetterSetter('gamingMode'));
const darkMode = computed(defaultStore.makeGetterSetter('darkMode')); const darkMode = computed(defaultStore.makeGetterSetter('darkMode'));
if (darkMode.value && gamingMode.value == true) { if (darkMode.value && gamingMode.value == true) {
gaming.value = 'dark'; gaming.value = 'dark';
} else if (!darkMode.value && gamingMode.value == true) { } else if (!darkMode.value && gamingMode.value == true) {
gaming.value = 'light'; gaming.value = 'light';
} else { } else {
gaming.value = ''; gaming.value = '';
} }
watch(darkMode, () => { watch(darkMode, () => {
if (darkMode.value && gamingMode.value == true) { if (darkMode.value && gamingMode.value == true) {
gaming.value = 'dark'; gaming.value = 'dark';
} else if (!darkMode.value && gamingMode.value == true) { } else if (!darkMode.value && gamingMode.value == true) {
gaming.value = 'light'; gaming.value = 'light';
} else { } else {
gaming.value = ''; gaming.value = '';
} }
}) });
watch(gamingMode, () => { watch(gamingMode, () => {
if (darkMode.value && gamingMode.value == true) { if (darkMode.value && gamingMode.value == true) {
gaming.value = 'dark'; gaming.value = 'dark';
} else if (!darkMode.value && gamingMode.value == true) { } else if (!darkMode.value && gamingMode.value == true) {
gaming.value = 'light'; gaming.value = 'light';
} else { } else {
gaming.value = ''; gaming.value = '';
} }
}) });
const props = withDefaults(defineProps<{ const props = withDefaults(defineProps<{
// null = 全てのウィジェットを表示 // null = 全てのウィジェットを表示
// left = place: leftだけを表示 // left = place: leftだけを表示