diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-10-29 16:09:20 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-10-29 16:09:20 +0900 |
| commit | 7436e0da18bbf2284ad95a1094141653a4188783 (patch) | |
| tree | 82fd514699481bcac40e5f5813757cd37d802d43 /packages/frontend/src/pages | |
| parent | Fix: notes/timelineにフォローしているチャンネルのノートを... (diff) | |
| download | misskey-7436e0da18bbf2284ad95a1094141653a4188783.tar.gz misskey-7436e0da18bbf2284ad95a1094141653a4188783.tar.bz2 misskey-7436e0da18bbf2284ad95a1094141653a4188783.zip | |
lint fixes
Diffstat (limited to 'packages/frontend/src/pages')
| -rw-r--r-- | packages/frontend/src/pages/admin/ads.vue | 22 | ||||
| -rw-r--r-- | packages/frontend/src/pages/instance-info.vue | 22 | ||||
| -rw-r--r-- | packages/frontend/src/pages/settings/general.vue | 3 | ||||
| -rw-r--r-- | packages/frontend/src/pages/settings/webhook.edit.vue | 1 |
4 files changed, 31 insertions, 17 deletions
diff --git a/packages/frontend/src/pages/admin/ads.vue b/packages/frontend/src/pages/admin/ads.vue index 6aa0cf0427..d64e78236a 100644 --- a/packages/frontend/src/pages/admin/ads.vue +++ b/packages/frontend/src/pages/admin/ads.vue @@ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only <template> <MkStickyContainer> <template #header> - <XHeader :actions="headerActions" :tabs="headerTabs" /> + <XHeader :actions="headerActions" :tabs="headerTabs"/> </template> <MkSpacer :contentMax="900"> <MkSwitch :modelValue="publishing" @update:modelValue="onChangePublishing"> @@ -14,7 +14,7 @@ SPDX-License-Identifier: AGPL-3.0-only </MkSwitch> <div> <div v-for="ad in ads" class="_panel _gaps_m" :class="$style.ad"> - <MkAd v-if="ad.url" :specify="ad" /> + <MkAd v-if="ad.url" :specify="ad"/> <MkInput v-model="ad.url" type="url"> <template #label>URL</template> </MkInput> @@ -51,8 +51,10 @@ SPDX-License-Identifier: AGPL-3.0-only <span> {{ i18n.ts._ad.timezoneinfo }} <div v-for="(day, index) in daysOfWeek" :key="index"> - <input :id="`ad${ad.id}-${index}`" type="checkbox" :checked="(ad.dayOfWeek & (1 << index)) !== 0" - @change="toggleDayOfWeek(ad, index)"> + <input + :id="`ad${ad.id}-${index}`" type="checkbox" :checked="(ad.dayOfWeek & (1 << index)) !== 0" + @change="toggleDayOfWeek(ad, index)" + > <label :for="`ad${ad.id}-${index}`">{{ day }}</label> </div> </span> @@ -61,9 +63,13 @@ SPDX-License-Identifier: AGPL-3.0-only <template #label>{{ i18n.ts.memo }}</template> </MkTextarea> <div class="buttons"> - <MkButton class="button" inline primary style="margin-right: 12px;" @click="save(ad)"><i - class="ti ti-device-floppy"></i> {{ i18n.ts.save }}</MkButton> - <MkButton class="button" inline danger @click="remove(ad)"><i class="ti ti-trash"></i> {{ i18n.ts.remove }} + <MkButton class="button" inline primary style="margin-right: 12px;" @click="save(ad)"> + <i + class="ti ti-device-floppy" + ></i> {{ i18n.ts.save }} + </MkButton> + <MkButton class="button" inline danger @click="remove(ad)"> + <i class="ti ti-trash"></i> {{ i18n.ts.remove }} </MkButton> </div> </div> @@ -115,6 +121,7 @@ const onChangePublishing = (v) => { publishing = v; refresh(); }; + // 選択された曜日(index)のビットフラグを操作する function toggleDayOfWeek(ad, index) { ad.dayOfWeek ^= 1 << index; @@ -187,6 +194,7 @@ function save(ad) { }); } } + function more() { os.api('admin/ad/list', { untilId: ads.reduce((acc, ad) => ad.id != null ? ad : acc).id, publishing: publishing }).then(adsResponse => { ads = ads.concat(adsResponse.map(r => { diff --git a/packages/frontend/src/pages/instance-info.vue b/packages/frontend/src/pages/instance-info.vue index fb93637e00..1ed25c9a47 100644 --- a/packages/frontend/src/pages/instance-info.vue +++ b/packages/frontend/src/pages/instance-info.vue @@ -36,8 +36,8 @@ SPDX-License-Identifier: AGPL-3.0-only <div class="_gaps_s"> <MkSwitch v-model="suspended" :disabled="!instance" @update:modelValue="toggleSuspend">{{ i18n.ts.stopActivityDelivery }}</MkSwitch> <MkSwitch v-model="isBlocked" :disabled="!meta || !instance" @update:modelValue="toggleBlock">{{ i18n.ts.blockThisInstance }}</MkSwitch> - <MkSwitch v-model="isSilenced" :disabled="!meta || !instance" @update:modelValue="toggleSilenced">{{ i18n.ts.silenceThisInstance }}</MkSwitch> - <MkButton @click="refreshMetadata"><i class="ti ti-refresh"></i> Refresh metadata</MkButton> + <MkSwitch v-model="isSilenced" :disabled="!meta || !instance" @update:modelValue="toggleSilenced">{{ i18n.ts.silenceThisInstance }}</MkSwitch> + <MkButton @click="refreshMetadata"><i class="ti ti-refresh"></i> Refresh metadata</MkButton> </div> </FormSection> @@ -171,8 +171,8 @@ async function fetch(): Promise<void> { }); suspended = instance.isSuspended; isBlocked = instance.isBlocked; - isSilenced = instance.isSilenced; - faviconUrl = getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.iconUrl, 'preview'); + isSilenced = instance.isSilenced; + faviconUrl = getProxiedImageUrlNullable(instance.faviconUrl, 'preview') ?? getProxiedImageUrlNullable(instance.iconUrl, 'preview'); } async function toggleBlock(): Promise<void> { @@ -183,14 +183,16 @@ async function toggleBlock(): Promise<void> { blockedHosts: isBlocked ? meta.blockedHosts.concat([host]) : meta.blockedHosts.filter(x => x !== host), }); } + async function toggleSilenced(): Promise<void> { - if (!meta) throw new Error('No meta?'); - if (!instance) throw new Error('No instance?'); - const { host } = instance; - await os.api('admin/update-meta', { - silencedHosts: isSilenced ? meta.silencedHosts.concat([host]) : meta.silencedHosts.filter(x => x !== host), - }); + if (!meta) throw new Error('No meta?'); + if (!instance) throw new Error('No instance?'); + const { host } = instance; + await os.api('admin/update-meta', { + silencedHosts: isSilenced ? meta.silencedHosts.concat([host]) : meta.silencedHosts.filter(x => x !== host), + }); } + async function toggleSuspend(): Promise<void> { if (!instance) throw new Error('No instance?'); await os.api('admin/federation/update-instance', { diff --git a/packages/frontend/src/pages/settings/general.vue b/packages/frontend/src/pages/settings/general.vue index 9508e04e1b..323dfc0722 100644 --- a/packages/frontend/src/pages/settings/general.vue +++ b/packages/frontend/src/pages/settings/general.vue @@ -298,12 +298,14 @@ const emojiIndexLangs = ['en-US']; function downloadEmojiIndex(lang: string) { async function main() { const currentIndexes = defaultStore.state.additionalUnicodeEmojiIndexes; + function download() { switch (lang) { case 'en-US': return import('../../unicode-emoji-indexes/en-US.json').then(x => x.default); default: throw new Error('unrecognized lang: ' + lang); } } + currentIndexes[lang] = await download(); await defaultStore.set('additionalUnicodeEmojiIndexes', currentIndexes); } @@ -340,6 +342,7 @@ function removePinnedList() { let smashCount = 0; let smashTimer: number | null = null; + function testNotification(): void { const notification: Misskey.entities.Notification = { id: Math.random().toString(), diff --git a/packages/frontend/src/pages/settings/webhook.edit.vue b/packages/frontend/src/pages/settings/webhook.edit.vue index 86b8f60c99..3301732c88 100644 --- a/packages/frontend/src/pages/settings/webhook.edit.vue +++ b/packages/frontend/src/pages/settings/webhook.edit.vue @@ -108,6 +108,7 @@ async function del(): Promise<void> { router.push('/settings/webhook'); } + const headerActions = $computed(() => []); const headerTabs = $computed(() => []); |