Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop

This commit is contained in:
syuilo 2023-03-24 16:01:38 +09:00
commit 4a17906530
4 changed files with 39 additions and 22 deletions

View file

@ -1933,3 +1933,19 @@ _disabledTimeline:
_drivecleaner: _drivecleaner:
orderBySizeDesc: "サイズが大きい順" orderBySizeDesc: "サイズが大きい順"
orderByCreatedAtAsc: "追加日が古い順" orderByCreatedAtAsc: "追加日が古い順"
_webhookSettings:
createWebhook: "Webhookを作成"
name: "名前"
secret: "シークレット"
events: "Webhookを実行するタイミング"
active: "有効"
_events:
follow: "フォローしたとき"
followed: "フォローされたとき"
note: "ノートを投稿したとき"
reply: "返信されたとき"
renote: "Renoteされたとき"
reaction: "リアクションがあったとき"
mention: "メンションされたとき"

View file

@ -1,7 +1,7 @@
<template> <template>
<div class="_gaps_m"> <div class="_gaps_m">
<MkInput v-model="name"> <MkInput v-model="name">
<template #label>Name</template> <template #label>{{ i18n.ts._webhookSettings.name }}</template>
</MkInput> </MkInput>
<MkInput v-model="url" type="url"> <MkInput v-model="url" type="url">
@ -10,24 +10,24 @@
<MkInput v-model="secret"> <MkInput v-model="secret">
<template #prefix><i class="ti ti-lock"></i></template> <template #prefix><i class="ti ti-lock"></i></template>
<template #label>Secret</template> <template #label>{{ i18n.ts._webhookSettings.secret }}</template>
</MkInput> </MkInput>
<FormSection> <FormSection>
<template #label>Events</template> <template #label>{{ i18n.ts._webhookSettings.events }}</template>
<div class="_gaps_s"> <div class="_gaps_s">
<MkSwitch v-model="event_follow">Follow</MkSwitch> <MkSwitch v-model="event_follow">{{ i18n.ts._webhookSettings._events.follow }}</MkSwitch>
<MkSwitch v-model="event_followed">Followed</MkSwitch> <MkSwitch v-model="event_followed">{{ i18n.ts._webhookSettings._events.followed }}</MkSwitch>
<MkSwitch v-model="event_note">Note</MkSwitch> <MkSwitch v-model="event_note">{{ i18n.ts._webhookSettings._events.note }}</MkSwitch>
<MkSwitch v-model="event_reply">Reply</MkSwitch> <MkSwitch v-model="event_reply">{{ i18n.ts._webhookSettings._events.reply }}</MkSwitch>
<MkSwitch v-model="event_renote">Renote</MkSwitch> <MkSwitch v-model="event_renote">{{ i18n.ts._webhookSettings._events.renote }}</MkSwitch>
<MkSwitch v-model="event_reaction">Reaction</MkSwitch> <MkSwitch v-model="event_reaction">{{ i18n.ts._webhookSettings._events.reaction }}</MkSwitch>
<MkSwitch v-model="event_mention">Mention</MkSwitch> <MkSwitch v-model="event_mention">{{ i18n.ts._webhookSettings._events.mention }}</MkSwitch>
</div> </div>
</FormSection> </FormSection>
<MkSwitch v-model="active">Active</MkSwitch> <MkSwitch v-model="active">{{ i18n.ts._webhookSettings.active }}</MkSwitch>
<div class="_buttons"> <div class="_buttons">
<MkButton primary inline @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton> <MkButton primary inline @click="save"><i class="ti ti-check"></i> {{ i18n.ts.save }}</MkButton>

View file

@ -1,7 +1,7 @@
<template> <template>
<div class="_gaps_m"> <div class="_gaps_m">
<MkInput v-model="name"> <MkInput v-model="name">
<template #label>Name</template> <template #label>{{ i18n.ts._webhookSettings.name }}</template>
</MkInput> </MkInput>
<MkInput v-model="url" type="url"> <MkInput v-model="url" type="url">
@ -10,20 +10,20 @@
<MkInput v-model="secret"> <MkInput v-model="secret">
<template #prefix><i class="ti ti-lock"></i></template> <template #prefix><i class="ti ti-lock"></i></template>
<template #label>Secret</template> <template #label>{{ i18n.ts._webhookSettings.secret }}</template>
</MkInput> </MkInput>
<FormSection> <FormSection>
<template #label>Events</template> <template #label>{{ i18n.ts._webhookSettings.events }}</template>
<div class="_gaps_s"> <div class="_gaps_s">
<MkSwitch v-model="event_follow">Follow</MkSwitch> <MkSwitch v-model="event_follow">{{ i18n.ts._webhookSettings._events.follow }}</MkSwitch>
<MkSwitch v-model="event_followed">Followed</MkSwitch> <MkSwitch v-model="event_followed">{{ i18n.ts._webhookSettings._events.followed }}</MkSwitch>
<MkSwitch v-model="event_note">Note</MkSwitch> <MkSwitch v-model="event_note">{{ i18n.ts._webhookSettings._events.note }}</MkSwitch>
<MkSwitch v-model="event_reply">Reply</MkSwitch> <MkSwitch v-model="event_reply">{{ i18n.ts._webhookSettings._events.reply }}</MkSwitch>
<MkSwitch v-model="event_renote">Renote</MkSwitch> <MkSwitch v-model="event_renote">{{ i18n.ts._webhookSettings._events.renote }}</MkSwitch>
<MkSwitch v-model="event_reaction">Reaction</MkSwitch> <MkSwitch v-model="event_reaction">{{ i18n.ts._webhookSettings._events.reaction }}</MkSwitch>
<MkSwitch v-model="event_mention">Mention</MkSwitch> <MkSwitch v-model="event_mention">{{ i18n.ts._webhookSettings._events.mention }}</MkSwitch>
</div> </div>
</FormSection> </FormSection>

View file

@ -1,7 +1,7 @@
<template> <template>
<div class="_gaps_m"> <div class="_gaps_m">
<FormLink :to="`/settings/webhook/new`"> <FormLink :to="`/settings/webhook/new`">
Create webhook {{ i18n.ts._webhookSettings.createWebhook }}
</FormLink> </FormLink>
<FormSection> <FormSection>
@ -31,6 +31,7 @@ import MkPagination from '@/components/MkPagination.vue';
import FormSection from '@/components/form/section.vue'; import FormSection from '@/components/form/section.vue';
import FormLink from '@/components/form/link.vue'; import FormLink from '@/components/form/link.vue';
import { definePageMetadata } from '@/scripts/page-metadata'; import { definePageMetadata } from '@/scripts/page-metadata';
import { i18n } from '@/i18n';
const pagination = { const pagination = {
endpoint: 'i/webhooks/list' as const, endpoint: 'i/webhooks/list' as const,