From b60f9fbc0089ade0b9dce3902489917ca8a57d42 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 7 May 2021 14:22:13 +0900 Subject: Improve ad --- src/server/api/endpoints/admin/ad/create.ts | 4 ++++ src/server/api/endpoints/admin/ad/update.ts | 4 ++++ src/server/api/endpoints/meta.ts | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) (limited to 'src/server/api/endpoints') diff --git a/src/server/api/endpoints/admin/ad/create.ts b/src/server/api/endpoints/admin/ad/create.ts index 7777e95e6e..337114a3fa 100644 --- a/src/server/api/endpoints/admin/ad/create.ts +++ b/src/server/api/endpoints/admin/ad/create.ts @@ -22,6 +22,9 @@ export const meta = { priority: { validator: $.str }, + ratio: { + validator: $.num.int().min(0) + }, expiresAt: { validator: $.num.int() }, @@ -39,6 +42,7 @@ export default define(meta, async (ps) => { url: ps.url, imageUrl: ps.imageUrl, priority: ps.priority, + ratio: ps.ratio, place: ps.place, memo: ps.memo, }); diff --git a/src/server/api/endpoints/admin/ad/update.ts b/src/server/api/endpoints/admin/ad/update.ts index 694af98394..71e6054a88 100644 --- a/src/server/api/endpoints/admin/ad/update.ts +++ b/src/server/api/endpoints/admin/ad/update.ts @@ -29,6 +29,9 @@ export const meta = { priority: { validator: $.str }, + ratio: { + validator: $.num.int().min(0) + }, expiresAt: { validator: $.num.int() }, @@ -52,6 +55,7 @@ export default define(meta, async (ps, me) => { url: ps.url, place: ps.place, priority: ps.priority, + ratio: ps.ratio, memo: ps.memo, imageUrl: ps.imageUrl, expiresAt: new Date(ps.expiresAt), diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index 5b7292ef16..d170317f1c 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -511,7 +511,7 @@ export default define(meta, async (ps, me) => { ads: ads.map(ad => ({ url: ad.url, place: ad.place, - priority: ad.priority, + ratio: ad.ratio, imageUrl: ad.imageUrl, })), enableEmail: instance.enableEmail, -- cgit v1.2.3-freya From 47fa7bb22a77379c8090e618ecb8a9db60b50a68 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 8 May 2021 12:50:11 +0900 Subject: Improve ad --- locales/ja-JP.yml | 4 ++++ src/client/components/global/ad.vue | 34 +++++++++++++++++++++++++++++----- src/client/instance.ts | 1 + src/client/store.ts | 4 ++++ src/server/api/endpoints/meta.ts | 1 + 5 files changed, 39 insertions(+), 5 deletions(-) (limited to 'src/server/api/endpoints') diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 31b02821bf..e869f5b015 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -758,6 +758,10 @@ low: "低" emailNotConfiguredWarning: "メールアドレスの設定がされていません。" ratio: "比率" +_ad: + back: "戻る" + reduceFrequencyOfThisAd: "この広告の表示頻度を下げる" + _forgotPassword: enterEmail: "アカウントに登録したメールアドレスを入力してください。そのアドレス宛てに、パスワードリセット用のリンクが送信されます。" ifNoEmail: "メールアドレスを登録していない場合は、管理者までお問い合わせください。" diff --git a/src/client/components/global/ad.vue b/src/client/components/global/ad.vue index e340f846ee..8397b2229e 100644 --- a/src/client/components/global/ad.vue +++ b/src/client/components/global/ad.vue @@ -9,8 +9,9 @@
Ads by {{ host }}
- - + + {{ $ts._ad.reduceFrequencyOfThisAd }} +
@@ -22,6 +23,8 @@ import { defineComponent, ref } from 'vue'; import { Instance, instance } from '@client/instance'; import { host } from '@client/config'; import MkButton from '@client/components/ui/button.vue'; +import { defaultStore } from '@client/store'; +import * as os from '@client/os'; export default defineComponent({ components: { @@ -50,10 +53,15 @@ export default defineComponent({ return props.specify as Instance['ads'][number]; } - let ads = instance.ads.filter(ad => props.prefer.includes(ad.place)); + const allAds = instance.ads.map(ad => defaultStore.state.mutedAds.includes(ad.id) ? { + ...ad, + ratio: 0 + } : ad); + + let ads = allAds.filter(ad => props.prefer.includes(ad.place)); if (ads.length === 0) { - ads = instance.ads.filter(ad => ad.place === 'square'); + ads = allAds.filter(ad => ad.place === 'square'); } const lowPriorityAds = ads.filter(ad => ad.ratio === 0); @@ -82,11 +90,23 @@ export default defineComponent({ return null; }; + const chosen = ref(choseAd()); + + const reduceFrequency = () => { + if (chosen.value == null) return; + if (defaultStore.state.mutedAds.includes(chosen.value.id)) return; + defaultStore.push('mutedAds', chosen.value.id); + os.success(); + chosen.value = choseAd(); + showMenu.value = false; + }; + return { - ad: choseAd(), + ad: chosen, showMenu, toggleMenu, host, + reduceFrequency, }; } }); @@ -170,6 +190,10 @@ export default defineComponent({ margin: 0 auto; max-width: 400px; border: solid 1px var(--divider); + + > .button { + margin: 8px auto; + } } } } diff --git a/src/client/instance.ts b/src/client/instance.ts index ad9e1a95fd..024ff1acbd 100644 --- a/src/client/instance.ts +++ b/src/client/instance.ts @@ -8,6 +8,7 @@ export type Instance = { category: string; }[]; ads: { + id: string; ratio: number; place: string; url: string; diff --git a/src/client/store.ts b/src/client/store.ts index 376135a99d..1a3286554d 100644 --- a/src/client/store.ts +++ b/src/client/store.ts @@ -55,6 +55,10 @@ export const defaultStore = markRaw(new Storage('base', { where: 'account', default: [] }, + mutedAds: { + where: 'account', + default: [] as string[] + }, menu: { where: 'deviceAccount', diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts index d170317f1c..26d9110ea9 100644 --- a/src/server/api/endpoints/meta.ts +++ b/src/server/api/endpoints/meta.ts @@ -509,6 +509,7 @@ export default define(meta, async (ps, me) => { maxNoteTextLength: Math.min(instance.maxNoteTextLength, DB_MAX_NOTE_TEXT_LENGTH), emojis: await Emojis.packMany(emojis), ads: ads.map(ad => ({ + id: ad.id, url: ad.url, place: ad.place, ratio: ad.ratio, -- cgit v1.2.3-freya From 164959a0c59822dac66d2280b6b344226350cd66 Mon Sep 17 00:00:00 2001 From: syuilo Date: Sat, 8 May 2021 12:51:23 +0900 Subject: Create get-index-stats.ts --- src/server/api/endpoints/admin/get-index-stats.ts | 26 +++++++++++++++++++++++ 1 file changed, 26 insertions(+) create mode 100644 src/server/api/endpoints/admin/get-index-stats.ts (limited to 'src/server/api/endpoints') diff --git a/src/server/api/endpoints/admin/get-index-stats.ts b/src/server/api/endpoints/admin/get-index-stats.ts new file mode 100644 index 0000000000..f2b06d0ef2 --- /dev/null +++ b/src/server/api/endpoints/admin/get-index-stats.ts @@ -0,0 +1,26 @@ +import define from '../../define'; +import { getConnection } from 'typeorm'; + +export const meta = { + requireCredential: true as const, + requireModerator: true, + + tags: ['admin'], + + params: { + }, +}; + +export default define(meta, async () => { + const stats = await + getConnection().query(`SELECT * FROM pg_indexes;`) + .then(recs => { + const res = [] as { tablename: string; indexname: string; }[]; + for (const rec of recs) { + res.push(rec); + } + return res; + }); + + return stats; +}); -- cgit v1.2.3-freya