usbharu
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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

This commit is contained in:
syuilo 2022-01-11 00:05:33 +09:00
parent f2cbd26a85 8855a5fffb
commit 2f128bcd3c
11 changed files with 614 additions and 756 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
packages/client/src/components/abuse-report-window.vue
View File

@ -1,8 +1,8 @@
<template> <template>
<XWindow ref="window" :initial-width="400" :initial-height="500" :can-resize="true" @closed="$emit('closed')"> <XWindow ref="window" :initial-width="400" :initial-height="500" :can-resize="true" @closed="emit('closed')">
<template #header> <template #header>
<i class="fas fa-exclamation-circle" style="margin-right: 0.5em;"></i> <i class="fas fa-exclamation-circle" style="margin-right: 0.5em;"></i>
<I18n :src="$ts.reportAbuseOf" tag="span"> <I18n :src="i18n.locale.reportAbuseOf" tag="span">
<template #name> <template #name>
<b><MkAcct :user="user"/></b> <b><MkAcct :user="user"/></b>
</template> </template>
@ -11,65 +11,51 @@
<div class="dpvffvvy _monolithic_"> <div class="dpvffvvy _monolithic_">
<div class="_section"> <div class="_section">
<MkTextarea v-model="comment"> <MkTextarea v-model="comment">
<template #label>{{ $ts.details }}</template> <template #label>{{ i18n.locale.details }}</template>
<template #caption>{{ $ts.fillAbuseReportDescription }}</template> <template #caption>{{ i18n.locale.fillAbuseReportDescription }}</template>
</MkTextarea> </MkTextarea>
</div> </div>
<div class="_section"> <div class="_section">
<MkButton primary full :disabled="comment.length === 0" @click="send">{{ $ts.send }}</MkButton> <MkButton primary full :disabled="comment.length === 0" @click="send">{{ i18n.locale.send }}</MkButton>
</div> </div>
</div> </div>
</XWindow> </XWindow>
</template> </template>
<script lang="ts"> <script setup lang="ts">
import { defineComponent, markRaw } from 'vue'; import { ref } from 'vue';
import * as Misskey from 'misskey-js';
import XWindow from '@/components/ui/window.vue'; import XWindow from '@/components/ui/window.vue';
import MkTextarea from '@/components/form/textarea.vue'; import MkTextarea from '@/components/form/textarea.vue';
import MkButton from '@/components/ui/button.vue'; import MkButton from '@/components/ui/button.vue';
import * as os from '@/os'; import * as os from '@/os';
import { i18n } from '@/i18n';
export default defineComponent({ const props = defineProps<{
components: { user: Misskey.entities.User;
XWindow, initialComment?: string;
MkTextarea, }>();
MkButton,
},
props: { const emit = defineEmits<{
user: { (e: 'closed'): void;
type: Object, }>();
required: true,
},
initialComment: {
type: String,
required: false,
},
},
emits: ['closed'], const window = ref<InstanceType<typeof XWindow>>();
const comment = ref(props.initialComment || '');
data() { function send() {
return {
comment: this.initialComment || '',
};
},
methods: {
send() {
os.apiWithDialog('users/report-abuse', { os.apiWithDialog('users/report-abuse', {
userId: this.user.id, userId: props.user.id,
comment: this.comment, comment: comment.value,
}, undefined, res => { }, undefined).then(res => {
os.alert({ os.alert({
type: 'success', type: 'success',
text: this.$ts.abuseReported text: i18n.locale.abuseReported
}); });
this.$refs.window.close(); window.value?.close();
emit('closed');
}); });
} }
},
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

124
packages/client/src/components/analog-clock.vue
View File

@ -40,106 +40,64 @@
</svg> </svg>
</template> </template>
<script lang="ts"> <script lang="ts" setup>
import { defineComponent } from 'vue'; import { ref, computed, onMounted, onBeforeUnmount } from 'vue';
import * as tinycolor from 'tinycolor2'; import * as tinycolor from 'tinycolor2';
export default defineComponent({ withDefaults(defineProps<{
props: { thickness: number;
thickness: { }>(), {
type: Number, thickness: 0.1,
default: 0.1 });
}
},
data() { const now = ref(new Date());
return { const enabled = ref(true);
now: new Date(), const graduationsPadding = ref(0.5);
enabled: true, const handsPadding = ref(1);
const handsTailLength = ref(0.7);
const hHandLengthRatio = ref(0.75);
const mHandLengthRatio = ref(1);
const sHandLengthRatio = ref(1);
const computedStyle = getComputedStyle(document.documentElement);
graduationsPadding: 0.5, const dark = computed(() => tinycolor(computedStyle.getPropertyValue('--bg')).isDark());
handsPadding: 1, const majorGraduationColor = computed(() => dark.value ? 'rgba(255, 255, 255, 0.3)' : 'rgba(0, 0, 0, 0.3)');
handsTailLength: 0.7, const minorGraduationColor = computed(() => dark.value ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)');
hHandLengthRatio: 0.75, const sHandColor = computed(() => dark.value ? 'rgba(255, 255, 255, 0.5)' : 'rgba(0, 0, 0, 0.3)');
mHandLengthRatio: 1, const mHandColor = computed(() => tinycolor(computedStyle.getPropertyValue('--fg')).toHexString());
sHandLengthRatio: 1, const hHandColor = computed(() => tinycolor(computedStyle.getPropertyValue('--accent')).toHexString());
const s = computed(() => now.value.getSeconds());
computedStyle: getComputedStyle(document.documentElement) const m = computed(() => now.value.getMinutes());
}; const h = computed(() => now.value.getHours());
}, const hAngle = computed(() => Math.PI * (h.value % 12 + (m.value + s.value / 60) / 60) / 6);
const mAngle = computed(() => Math.PI * (m.value + s.value / 60) / 30);
computed: { const sAngle = computed(() => Math.PI * s.value / 30);
dark(): boolean { const graduations = computed(() => {
return tinycolor(this.computedStyle.getPropertyValue('--bg')).isDark(); const angles: number[] = [];
},
majorGraduationColor(): string {
return this.dark ? 'rgba(255, 255, 255, 0.3)' : 'rgba(0, 0, 0, 0.3)';
},
minorGraduationColor(): string {
return this.dark ? 'rgba(255, 255, 255, 0.2)' : 'rgba(0, 0, 0, 0.2)';
},
sHandColor(): string {
return this.dark ? 'rgba(255, 255, 255, 0.5)' : 'rgba(0, 0, 0, 0.3)';
},
mHandColor(): string {
return tinycolor(this.computedStyle.getPropertyValue('--fg')).toHexString();
},
hHandColor(): string {
return tinycolor(this.computedStyle.getPropertyValue('--accent')).toHexString();
},
s(): number {
return this.now.getSeconds();
},
m(): number {
return this.now.getMinutes();
},
h(): number {
return this.now.getHours();
},
hAngle(): number {
return Math.PI * (this.h % 12 + (this.m + this.s / 60) / 60) / 6;
},
mAngle(): number {
return Math.PI * (this.m + this.s / 60) / 30;
},
sAngle(): number {
return Math.PI * this.s / 30;
},
graduations(): any {
const angles = [];
for (let i = 0; i < 60; i++) { for (let i = 0; i < 60; i++) {
const angle = Math.PI * i / 30; const angle = Math.PI * i / 30;
angles.push(angle); angles.push(angle);
} }
return angles; return angles;
} });
},
mounted() { function tick() {
now.value = new Date();
}
onMounted(() => {
const update = () => { const update = () => {
if (this.enabled) { if (enabled.value) {
this.tick(); tick();
setTimeout(update, 1000); setTimeout(update, 1000);
} }
}; };
update(); update();
}, });
beforeUnmount() { onBeforeUnmount(() => {
this.enabled = false; enabled.value = false;
},
methods: {
tick() {
this.now = new Date();
}
}
}); });
</script> </script>

377
packages/client/src/components/autocomplete.vue
View File

@ -1,5 +1,5 @@
<template> <template>
<div class="swhvrteh _popup _shadow" :style="{ zIndex }" @contextmenu.prevent="() => {}"> <div ref="rootEl" class="swhvrteh _popup _shadow" :style="{ zIndex }" @contextmenu.prevent="() => {}">
<ol v-if="type === 'user'" ref="suggests" class="users"> <ol v-if="type === 'user'" ref="suggests" class="users">
<li v-for="user in users" tabindex="-1" class="user" @click="complete(type, user)" @keydown="onKeydown"> <li v-for="user in users" tabindex="-1" class="user" @click="complete(type, user)" @keydown="onKeydown">
<img class="avatar" :src="user.avatarUrl"/> <img class="avatar" :src="user.avatarUrl"/>
@ -8,7 +8,7 @@
</span> </span>
<span class="username">@{{ acct(user) }}</span> <span class="username">@{{ acct(user) }}</span>
</li> </li>
<li tabindex="-1" class="choose" @click="chooseUser()" @keydown="onKeydown">{{ $ts.selectUser }}</li> <li tabindex="-1" class="choose" @click="chooseUser()" @keydown="onKeydown">{{ i18n.locale.selectUser }}</li>
</ol> </ol>
<ol v-else-if="hashtags.length > 0" ref="suggests" class="hashtags"> <ol v-else-if="hashtags.length > 0" ref="suggests" class="hashtags">
<li v-for="hashtag in hashtags" tabindex="-1" @click="complete(type, hashtag)" @keydown="onKeydown"> <li v-for="hashtag in hashtags" tabindex="-1" @click="complete(type, hashtag)" @keydown="onKeydown">
@ -17,8 +17,8 @@
</ol> </ol>
<ol v-else-if="emojis.length > 0" ref="suggests" class="emojis"> <ol v-else-if="emojis.length > 0" ref="suggests" class="emojis">
<li v-for="emoji in emojis" tabindex="-1" @click="complete(type, emoji.emoji)" @keydown="onKeydown"> <li v-for="emoji in emojis" tabindex="-1" @click="complete(type, emoji.emoji)" @keydown="onKeydown">
<span v-if="emoji.isCustomEmoji" class="emoji"><img :src="$store.state.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url" :alt="emoji.emoji"/></span> <span v-if="emoji.isCustomEmoji" class="emoji"><img :src="defaultStore.state.disableShowingAnimatedImages ? getStaticImageUrl(emoji.url) : emoji.url" :alt="emoji.emoji"/></span>
<span v-else-if="!$store.state.useOsNativeEmojis" class="emoji"><img :src="emoji.url" :alt="emoji.emoji"/></span> <span v-else-if="!defaultStore.state.useOsNativeEmojis" class="emoji"><img :src="emoji.url" :alt="emoji.emoji"/></span>
<span v-else class="emoji">{{ emoji.emoji }}</span> <span v-else class="emoji">{{ emoji.emoji }}</span>
<span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span> <span class="name" v-html="emoji.name.replace(q, `<b>${q}</b>`)"></span>
<span v-if="emoji.aliasOf" class="alias">({{ emoji.aliasOf }})</span> <span v-if="emoji.aliasOf" class="alias">({{ emoji.aliasOf }})</span>
@ -33,15 +33,17 @@
</template> </template>
<script lang="ts"> <script lang="ts">
import { defineComponent, markRaw } from 'vue'; import { markRaw, ref, onUpdated, onMounted, onBeforeUnmount, nextTick, watch } from 'vue';
import { emojilist } from '@/scripts/emojilist';
import contains from '@/scripts/contains'; import contains from '@/scripts/contains';
import { twemojiSvgBase } from '@/scripts/twemoji-base';
import { getStaticImageUrl } from '@/scripts/get-static-image-url'; import { getStaticImageUrl } from '@/scripts/get-static-image-url';
import { acct } from '@/filters/user'; import { acct } from '@/filters/user';
import * as os from '@/os'; import * as os from '@/os';
import { instance } from '@/instance';
import { MFM_TAGS } from '@/scripts/mfm-tags'; import { MFM_TAGS } from '@/scripts/mfm-tags';
import { defaultStore } from '@/store';
import { emojilist } from '@/scripts/emojilist';
import { instance } from '@/instance';
import { twemojiSvgBase } from '@/scripts/twemoji-base';
import { i18n } from '@/i18n';
type EmojiDef = { type EmojiDef = {
emoji: string; emoji: string;
@ -54,16 +56,14 @@ type EmojiDef = {
const lib = emojilist.filter(x => x.category !== 'flags'); const lib = emojilist.filter(x => x.category !== 'flags');
const char2file = (char: string) => { const char2file = (char: string) => {
let codes = Array.from(char).map(x => x.codePointAt(0).toString(16)); let codes = Array.from(char).map(x => x.codePointAt(0)?.toString(16));
if (!codes.includes('200d')) codes = codes.filter(x => x != 'fe0f'); if (!codes.includes('200d')) codes = codes.filter(x => x != 'fe0f');
codes = codes.filter(x => x && x.length); return codes.filter(x => x && x.length).join('-');
return codes.join('-');
}; };
const emjdb: EmojiDef[] = lib.map(x => ({ const emjdb: EmojiDef[] = lib.map(x => ({
emoji: x.char, emoji: x.char,
name: x.name, name: x.name,
aliasOf: null,
url: `${twemojiSvgBase}/${char2file(x.char)}.svg` url: `${twemojiSvgBase}/${char2file(x.char)}.svg`
})); }));
@ -112,291 +112,270 @@ emojiDefinitions.sort((a, b) => a.name.length - b.name.length);
const emojiDb = markRaw(emojiDefinitions.concat(emjdb)); const emojiDb = markRaw(emojiDefinitions.concat(emjdb));
//#endregion //#endregion
export default defineComponent({ export default {
props: { emojiDb,
type: { emojiDefinitions,
type: String, emojilist,
required: true, customEmojis,
}, };
</script>
q: { <script lang="ts" setup>
type: String, const props = defineProps<{
required: false, type: string;
}, q: string | null;
textarea: HTMLTextAreaElement;
close: () => void;
x: number;
y: number;
}>();
textarea: { const emit = defineEmits<{
type: HTMLTextAreaElement, (e: 'done', v: { type: string; value: any }): void;
required: true, (e: 'closed'): void;
}, }>();
close: { const suggests = ref<Element>();
type: Function, const rootEl = ref<HTMLDivElement>();
required: true,
},
x: { const fetching = ref(true);
type: Number, const users = ref<any[]>([]);
required: true, const hashtags = ref<any[]>([]);
}, const emojis = ref<(EmojiDef)[]>([]);
const items = ref<Element[] | HTMLCollection>([]);
y: { const mfmTags = ref<string[]>([]);
type: Number, const select = ref(-1);
required: true, const zIndex = os.claimZIndex('high');
},
},
emits: ['done', 'closed'],
data() {
return {
getStaticImageUrl,
fetching: true,
users: [],
hashtags: [],
emojis: [],
items: [],
mfmTags: [],
select: -1,
zIndex: os.claimZIndex('high'),
}
},
updated() {
this.setPosition();
this.items = (this.$refs.suggests as Element | undefined)?.children || [];
},
mounted() {
this.setPosition();
this.textarea.addEventListener('keydown', this.onKeydown);
for (const el of Array.from(document.querySelectorAll('body *'))) {
el.addEventListener('mousedown', this.onMousedown);
}
this.$nextTick(() => {
this.exec();
this.$watch('q', () => {
this.$nextTick(() => {
this.exec();
});
});
});
},
beforeUnmount() {
this.textarea.removeEventListener('keydown', this.onKeydown);
for (const el of Array.from(document.querySelectorAll('body *'))) {
el.removeEventListener('mousedown', this.onMousedown);
}
},
methods: {
complete(type, value) {
this.$emit('done', { type, value });
this.$emit('closed');
function complete(type: string, value: any) {
emit('done', { type, value });
emit('closed');
if (type === 'emoji') { if (type === 'emoji') {
let recents = this.$store.state.recentlyUsedEmojis; let recents = defaultStore.state.recentlyUsedEmojis;
recents = recents.filter((e: any) => e !== value); recents = recents.filter((e: any) => e !== value);
recents.unshift(value); recents.unshift(value);
this.$store.set('recentlyUsedEmojis', recents.splice(0, 32)); defaultStore.set('recentlyUsedEmojis', recents.splice(0, 32));
}
} }
},
setPosition() { function setPosition() {
if (this.x + this.$el.offsetWidth > window.innerWidth) { if (!rootEl.value) return;
this.$el.style.left = (window.innerWidth - this.$el.offsetWidth) + 'px'; if (props.x + rootEl.value.offsetWidth > window.innerWidth) {
rootEl.value.style.left = (window.innerWidth - rootEl.value.offsetWidth) + 'px';
} else { } else {
this.$el.style.left = this.x + 'px'; rootEl.value.style.left = `${props.x}px`;
} }
if (props.y + rootEl.value.offsetHeight > window.innerHeight) {
if (this.y + this.$el.offsetHeight > window.innerHeight) { rootEl.value.style.top = (props.y - rootEl.value.offsetHeight) + 'px';
this.$el.style.top = (this.y - this.$el.offsetHeight) + 'px'; rootEl.value.style.marginTop = '0';
this.$el.style.marginTop = '0';
} else { } else {
this.$el.style.top = this.y + 'px'; rootEl.value.style.top = props.y + 'px';
this.$el.style.marginTop = 'calc(1em + 8px)'; rootEl.value.style.marginTop = 'calc(1em + 8px)';
}
} }
},
exec() { function exec() {
this.select = -1; select.value = -1;
if (this.$refs.suggests) { if (suggests.value) {
for (const el of Array.from(this.items)) { for (const el of Array.from(items.value)) {
el.removeAttribute('data-selected'); el.removeAttribute('data-selected');
} }
} }
if (props.type === 'user') {
if (this.type === 'user') { if (!props.q) {
if (this.q == null) { users.value = [];
this.users = []; fetching.value = false;
this.fetching = false;
return; return;
} }
const cacheKey = `autocomplete:user:${this.q}`; const cacheKey = `autocomplete:user:${props.q}`;
const cache = sessionStorage.getItem(cacheKey); const cache = sessionStorage.getItem(cacheKey);
if (cache) { if (cache) {
const users = JSON.parse(cache); const users = JSON.parse(cache);
this.users = users; users.value = users;
this.fetching = false; fetching.value = false;
} else { } else {
os.api('users/search-by-username-and-host', { os.api('users/search-by-username-and-host', {
username: this.q, username: props.q,
limit: 10, limit: 10,
detail: false detail: false
}).then(users => { }).then(searchedUsers => {
this.users = users; users.value = searchedUsers as any[];
this.fetching = false; fetching.value = false;
// キャッシュ // キャッシュ
sessionStorage.setItem(cacheKey, JSON.stringify(users)); sessionStorage.setItem(cacheKey, JSON.stringify(searchedUsers));
}); });
} }
} else if (this.type === 'hashtag') { } else if (props.type === 'hashtag') {
if (this.q == null || this.q == '') { if (!props.q || props.q == '') {
this.hashtags = JSON.parse(localStorage.getItem('hashtags') || '[]'); hashtags.value = JSON.parse(localStorage.getItem('hashtags') || '[]');
this.fetching = false; fetching.value = false;
} else { } else {
const cacheKey = `autocomplete:hashtag:${this.q}`; const cacheKey = `autocomplete:hashtag:${props.q}`;
const cache = sessionStorage.getItem(cacheKey); const cache = sessionStorage.getItem(cacheKey);
if (cache) { if (cache) {
const hashtags = JSON.parse(cache); const hashtags = JSON.parse(cache);
this.hashtags = hashtags; hashtags.value = hashtags;
this.fetching = false; fetching.value = false;
} else { } else {
os.api('hashtags/search', { os.api('hashtags/search', {
query: this.q, query: props.q,
limit: 30 limit: 30
}).then(hashtags => { }).then(searchedHashtags => {
this.hashtags = hashtags; hashtags.value = searchedHashtags as any[];
this.fetching = false; fetching.value = false;
// キャッシュ // キャッシュ
sessionStorage.setItem(cacheKey, JSON.stringify(hashtags)); sessionStorage.setItem(cacheKey, JSON.stringify(searchedHashtags));
}); });
} }
} }
} else if (this.type === 'emoji') { } else if (props.type === 'emoji') {
if (this.q == null || this.q == '') { if (!props.q || props.q == '') {
// 最近使った絵文字をサジェスト // 最近使った絵文字をサジェスト
this.emojis = this.$store.state.recentlyUsedEmojis.map(emoji => emojiDb.find(e => e.emoji == emoji)).filter(x => x != null); emojis.value = defaultStore.state.recentlyUsedEmojis.map(emoji => emojiDb.find(e => e.emoji == emoji)).filter(x => x) as EmojiDef[];
return; return;
} }
const matched = []; const matched: EmojiDef[] = [];
const max = 30; const max = 30;
emojiDb.some(x => { emojiDb.some(x => {
if (x.name.startsWith(this.q) && !x.aliasOf && !matched.some(y => y.emoji == x.emoji)) matched.push(x); if (x.name.startsWith(props.q || '') && !x.aliasOf && !matched.some(y => y.emoji == x.emoji)) matched.push(x);
return matched.length == max; return matched.length == max;
}); });
if (matched.length < max) { if (matched.length < max) {
emojiDb.some(x => { emojiDb.some(x => {
if (x.name.startsWith(this.q) && !matched.some(y => y.emoji == x.emoji)) matched.push(x); if (x.name.startsWith(props.q || '') && !matched.some(y => y.emoji == x.emoji)) matched.push(x);
return matched.length == max;
});
}
if (matched.length < max) {
emojiDb.some(x => {
if (x.name.includes(this.q) && !matched.some(y => y.emoji == x.emoji)) matched.push(x);
return matched.length == max; return matched.length == max;
}); });
} }
this.emojis = matched; if (matched.length < max) {
} else if (this.type === 'mfmTag') { emojiDb.some(x => {
if (this.q == null || this.q == '') { if (x.name.includes(props.q || '') && !matched.some(y => y.emoji == x.emoji)) matched.push(x);
this.mfmTags = MFM_TAGS; return matched.length == max;
});
}
emojis.value = matched;
} else if (props.type === 'mfmTag') {
if (!props.q || props.q == '') {
mfmTags.value = MFM_TAGS;
return; return;
} }
this.mfmTags = MFM_TAGS.filter(tag => tag.startsWith(this.q)); mfmTags.value = MFM_TAGS.filter(tag => tag.startsWith(props.q || ''));
}
} }
},
onMousedown(e) { function onMousedown(e: Event) {
if (!contains(this.$el, e.target) && (this.$el != e.target)) this.close(); if (!contains(rootEl.value, e.target) && (rootEl.value != e.target)) props.close();
}, }
onKeydown(e) { function onKeydown(e: KeyboardEvent) {
const cancel = () => { const cancel = () => {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
}; };
switch (e.which) { switch (e.key) {
case 10: // [ENTER] case 'Enter':
case 13: // [ENTER] if (select.value !== -1) {
if (this.select !== -1) {
cancel(); cancel();
(this.items[this.select] as any).click(); (items.value[select.value] as any).click();
} else { } else {
this.close(); props.close();
} }
break; break;
case 27: // [ESC] case 'Escape':
cancel(); cancel();
this.close(); props.close();
break; break;
case 38: // [↑] case 'ArrowUp':
if (this.select !== -1) { if (select.value !== -1) {
cancel(); cancel();
this.selectPrev(); selectPrev();
} else { } else {
this.close(); props.close();
} }
break; break;
case 9: // [TAB] case 'Tab':
case 40: // [↓] case 'ArrowDown':
cancel(); cancel();
this.selectNext(); selectNext();
break; break;
default: default:
e.stopPropagation(); e.stopPropagation();
this.textarea.focus(); props.textarea.focus();
}
} }
},
selectNext() { function selectNext() {
if (++this.select >= this.items.length) this.select = 0; if (++select.value >= items.value.length) select.value = 0;
if (this.items.length === 0) this.select = -1; if (items.value.length === 0) select.value = -1;
this.applySelect(); applySelect();
}, }
selectPrev() { function selectPrev() {
if (--this.select < 0) this.select = this.items.length - 1; if (--select.value < 0) select.value = items.value.length - 1;
this.applySelect(); applySelect();
}, }
applySelect() { function applySelect() {
for (const el of Array.from(this.items)) { for (const el of Array.from(items.value)) {
el.removeAttribute('data-selected'); el.removeAttribute('data-selected');
} }
if (this.select !== -1) { if (select.value !== -1) {
this.items[this.select].setAttribute('data-selected', 'true'); items.value[select.value].setAttribute('data-selected', 'true');
(this.items[this.select] as any).focus(); (items.value[select.value] as any).focus();
}
} }
},
chooseUser() { function chooseUser() {
this.close(); props.close();
os.selectUser().then(user => { os.selectUser().then(user => {
this.complete('user', user); complete('user', user);
this.textarea.focus(); props.textarea.focus();
}); });
}, }
acct onUpdated(() => {
setPosition();
items.value = suggests.value?.children || [];
});
onMounted(() => {
setPosition();
props.textarea.addEventListener('keydown', onKeydown);
for (const el of Array.from(document.querySelectorAll('body *'))) {
el.addEventListener('mousedown', onMousedown);
}
nextTick(() => {
exec();
watch(() => props.q, () => {
nextTick(() => {
exec();
});
});
});
});
onBeforeUnmount(() => {
props.textarea.removeEventListener('keydown', onKeydown);
for (const el of Array.from(document.querySelectorAll('body *'))) {
el.removeEventListener('mousedown', onMousedown);
} }
}); });
</script> </script>

142
packages/client/src/components/captcha.vue
View File

@ -1,12 +1,14 @@
<template> <template>
<div> <div>
<span v-if="!available">{{ $ts.waiting }}<MkEllipsis/></span> <span v-if="!available">{{ i18n.locale.waiting }}<MkEllipsis/></span>
<div ref="captcha"></div> <div ref="captchaEl"></div>
</div> </div>
</template> </template>
<script lang="ts"> <script lang="ts" setup>
import { defineComponent, PropType } from 'vue'; import { ref, computed, onMounted, onBeforeUnmount, watch } from 'vue';
import { defaultStore } from '@/store';
import { i18n } from '@/i18n';
type Captcha = { type Captcha = {
render(container: string | Node, options: { render(container: string | Node, options: {
@ -14,7 +16,7 @@ type Captcha = {
}): string; }): string;
remove(id: string): void; remove(id: string): void;
execute(id: string): void; execute(id: string): void;
reset(id: string): void; reset(id?: string): void;
getResponse(id: string): string; getResponse(id: string): string;
}; };
@ -29,95 +31,87 @@ declare global {
} }
} }
export default defineComponent({ const props = defineProps<{
props: { provider: CaptchaProvider;
provider: { sitekey: string;
type: String as PropType<CaptchaProvider>, modelValue?: string | null;
required: true, }>();
},
sitekey: {
type: String,
required: true,
},
modelValue: {
type: String,
},
},
data() { const emit = defineEmits<{
return { (e: 'update:modelValue', v: string | null): void;
available: false, }>();
};
},
computed: { const available = ref(false);
variable(): string {
switch (this.provider) { const captchaEl = ref<HTMLDivElement | undefined>();
const variable = computed(() => {
switch (props.provider) {
case 'hcaptcha': return 'hcaptcha'; case 'hcaptcha': return 'hcaptcha';
case 'recaptcha': return 'grecaptcha'; case 'recaptcha': return 'grecaptcha';
} }
}, });
loaded(): boolean {
return !!window[this.variable]; const loaded = computed(() => !!window[variable.value]);
},
src(): string { const src = computed(() => {
const endpoint = ({ const endpoint = ({
hcaptcha: 'https://hcaptcha.com/1', hcaptcha: 'https://hcaptcha.com/1',
recaptcha: 'https://www.recaptcha.net/recaptcha', recaptcha: 'https://www.recaptcha.net/recaptcha',
} as Record<CaptchaProvider, string>)[this.provider]; } as Record<CaptchaProvider, string>)[props.provider];
return `${typeof endpoint === 'string' ? endpoint : 'about:invalid'}/api.js?render=explicit`; return `${typeof endpoint === 'string' ? endpoint : 'about:invalid'}/api.js?render=explicit`;
}, });
captcha(): Captcha {
return window[this.variable] || {} as unknown as Captcha;
},
},
created() { const captcha = computed<Captcha>(() => window[variable.value] || {} as unknown as Captcha);
if (this.loaded) {
this.available = true; if (loaded.value) {
available.value = true;
} else { } else {
(document.getElementById(this.provider) || document.head.appendChild(Object.assign(document.createElement('script'), { (document.getElementById(props.provider) || document.head.appendChild(Object.assign(document.createElement('script'), {
async: true, async: true,
id: this.provider, id: props.provider,
src: this.src, src: src.value,
}))) })))
.addEventListener('load', () => this.available = true); .addEventListener('load', () => available.value = true);
} }
},
mounted() { function reset() {
if (this.available) { if (captcha.value?.reset) captcha.value.reset();
this.requestRender();
} else {
this.$watch('available', this.requestRender);
} }
},
beforeUnmount() { function requestRender() {
this.reset(); if (captcha.value.render && captchaEl.value instanceof Element) {
}, captcha.value.render(captchaEl.value, {
sitekey: props.sitekey,
methods: { theme: defaultStore.state.darkMode ? 'dark' : 'light',
reset() { callback: callback,
if (this.captcha?.reset) this.captcha.reset(); 'expired-callback': callback,
}, 'error-callback': callback,
requestRender() {
if (this.captcha.render && this.$refs.captcha instanceof Element) {
this.captcha.render(this.$refs.captcha, {
sitekey: this.sitekey,
theme: this.$store.state.darkMode ? 'dark' : 'light',
callback: this.callback,
'expired-callback': this.callback,
'error-callback': this.callback,
}); });
} else { } else {
setTimeout(this.requestRender.bind(this), 1); setTimeout(requestRender, 1);
}
}
function callback(response?: string) {
emit('update:modelValue', typeof response == 'string' ? response : null);
}
onMounted(() => {
if (available.value) {
requestRender();
} else {
watch(available, requestRender);
} }
},
callback(response?: string) {
this.$emit('update:modelValue', typeof response == 'string' ? response : null);
},
},
}); });
onBeforeUnmount(() => {
reset();
});
defineExpose({
reset,
});
</script> </script>

56
packages/client/src/components/channel-follow-button.vue
View File

@ -6,66 +6,54 @@
> >
<template v-if="!wait"> <template v-if="!wait">
<template v-if="isFollowing"> <template v-if="isFollowing">
<span v-if="full">{{ $ts.unfollow }}</span><i class="fas fa-minus"></i> <span v-if="full">{{ i18n.locale.unfollow }}</span><i class="fas fa-minus"></i>
</template> </template>
<template v-else> <template v-else>
<span v-if="full">{{ $ts.follow }}</span><i class="fas fa-plus"></i> <span v-if="full">{{ i18n.locale.follow }}</span><i class="fas fa-plus"></i>
</template> </template>
</template> </template>
<template v-else> <template v-else>
<span v-if="full">{{ $ts.processing }}</span><i class="fas fa-spinner fa-pulse fa-fw"></i> <span v-if="full">{{ i18n.locale.processing }}</span><i class="fas fa-spinner fa-pulse fa-fw"></i>
</template> </template>
</button> </button>
</template> </template>
<script lang="ts"> <script lang="ts" setup>
import { defineComponent } from 'vue'; import { ref } from 'vue';
import * as os from '@/os'; import * as os from '@/os';
import { i18n } from '@/i18n';
export default defineComponent({ const props = withDefaults(defineProps<{
props: { channel: Record<string, any>;
channel: { full?: boolean;
type: Object, }>(), {
required: true full: false,
}, });
full: {
type: Boolean,
required: false,
default: false,
},
},
data() { const isFollowing = ref<boolean>(props.channel.isFollowing);
return { const wait = ref(false);
isFollowing: this.channel.isFollowing,
wait: false,
};
},
methods: { async function onClick() {
async onClick() { wait.value = true;
this.wait = true;
try { try {
if (this.isFollowing) { if (isFollowing.value) {
await os.api('channels/unfollow', { await os.api('channels/unfollow', {
channelId: this.channel.id channelId: props.channel.id
}); });
this.isFollowing = false; isFollowing.value = false;
} else { } else {
await os.api('channels/follow', { await os.api('channels/follow', {
channelId: this.channel.id channelId: props.channel.id
}); });
this.isFollowing = true; isFollowing.value = true;
} }
} catch (e) { } catch (e) {
console.error(e); console.error(e);
} finally { } finally {
this.wait = false; wait.value = false;
} }
} }
}
});
</script> </script>
<style lang="scss" scoped> <style lang="scss" scoped>

35
packages/client/src/components/channel-preview.vue
View File

@ -6,7 +6,7 @@
<div class="status"> <div class="status">
<div> <div>
<i class="fas fa-users fa-fw"></i> <i class="fas fa-users fa-fw"></i>
<I18n :src="$ts._channel.usersCount" tag="span" style="margin-left: 4px;"> <I18n :src="i18n.locale._channel.usersCount" tag="span" style="margin-left: 4px;">
<template #n> <template #n>
<b>{{ channel.usersCount }}</b> <b>{{ channel.usersCount }}</b>
</template> </template>
@ -14,7 +14,7 @@
</div> </div>
<div> <div>
<i class="fas fa-pencil-alt fa-fw"></i> <i class="fas fa-pencil-alt fa-fw"></i>
<I18n :src="$ts._channel.notesCount" tag="span" style="margin-left: 4px;"> <I18n :src="i18n.locale._channel.notesCount" tag="span" style="margin-left: 4px;">
<template #n> <template #n>
<b>{{ channel.notesCount }}</b> <b>{{ channel.notesCount }}</b>
</template> </template>
@ -27,37 +27,26 @@
</article> </article>
<footer> <footer>
<span v-if="channel.lastNotedAt"> <span v-if="channel.lastNotedAt">
{{ $ts.updatedAt }}: <MkTime :time="channel.lastNotedAt"/> {{ i18n.locale.updatedAt }}: <MkTime :time="channel.lastNotedAt"/>
</span> </span>
</footer> </footer>
</MkA> </MkA>
</template> </template>
<script lang="ts"> <script lang="ts" setup>
import { defineComponent } from 'vue'; import { computed } from 'vue';
import { i18n } from '@/i18n';
export default defineComponent({ const props = defineProps<{
props: { channel: Record<string, any>;
channel: { }>();
type: Object,
required: true
},
},
data() { const bannerStyle = computed(() => {
return { if (props.channel.bannerUrl) {
}; return { backgroundImage: `url(${props.channel.bannerUrl})` };
},
computed: {
bannerStyle() {
if (this.channel.bannerUrl) {
return { backgroundImage: `url(${this.channel.bannerUrl})` };
} else { } else {
return { backgroundColor: '#4c5e6d' }; return { backgroundColor: '#4c5e6d' };
} }
}
},
}); });
</script> </script>

36
packages/client/src/components/code-core.vue
View File

@ -3,33 +3,17 @@
<pre v-else :class="`language-${prismLang}`"><code :class="`language-${prismLang}`" v-html="html"></code></pre> <pre v-else :class="`language-${prismLang}`"><code :class="`language-${prismLang}`" v-html="html"></code></pre>
</template> </template>
<script lang="ts"> <script lang="ts" setup>
import { defineComponent } from 'vue'; import { computed } from 'vue';
import 'prismjs'; import 'prismjs';
import 'prismjs/themes/prism-okaidia.css'; import 'prismjs/themes/prism-okaidia.css';
export default defineComponent({ const props = defineProps<{
props: { code: string;
code: { lang?: string;
type: String, inline?: boolean;
required: true }>();
},
lang: { const prismLang = computed(() => Prism.languages[props.lang] ? props.lang : 'js');
type: String, const html = computed(() => Prism.highlight(props.code, Prism.languages[prismLang.value], prismLang.value));
required: false
},
inline: {
type: Boolean,
required: false
}
},
computed: {
prismLang() {
return Prism.languages[this.lang] ? this.lang : 'js';
},
html() {
return Prism.highlight(this.code, Prism.languages[this.prismLang], this.prismLang);
}
}
});
</script> </script>

30
packages/client/src/components/code.vue
View File

@ -2,26 +2,14 @@
<XCode :code="code" :lang="lang" :inline="inline"/> <XCode :code="code" :lang="lang" :inline="inline"/>
</template> </template>
<script lang="ts"> <script lang="ts" setup>
import { defineComponent, defineAsyncComponent } from 'vue'; import { defineAsyncComponent } from 'vue';
export default defineComponent({ defineProps<{
components: { code: string;
XCode: defineAsyncComponent(() => import('./code-core.vue')) lang?: string;
}, inline?: boolean;
props: { }>();
code: {
type: String, const XCode = defineAsyncComponent(() => import('./code-core.vue'));
required: true
},
lang: {
type: String,
required: false
},
inline: {
type: Boolean,
required: false
}
}
});
</script> </script>

2
packages/client/src/components/cw-button.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<button class="nrvgflfu _button" @click="toggle"> <button class="nrvgflfu _button" @click="toggle">
<b>{{ modelValue ? $ts._cw.hide : $ts._cw.show }}</b> <b>{{ modelValue ? i18n.locale._cw.hide : i18n.locale._cw.show }}</b>
<span v-if="!modelValue">{{ label }}</span> <span v-if="!modelValue">{{ label }}</span>
</button> </button>
</template> </template>

45
packages/client/src/components/date-separated-list.vue
View File

@ -1,6 +1,8 @@
<script lang="ts"> <script lang="ts">
import { defineComponent, h, PropType, TransitionGroup } from 'vue'; import { defineComponent, h, PropType, TransitionGroup } from 'vue';
import MkAd from '@/components/global/ad.vue'; import MkAd from '@/components/global/ad.vue';
import { i18n } from '@/i18n';
import { defaultStore } from '@/store';
export default defineComponent({ export default defineComponent({
props: { props: {
@ -30,29 +32,29 @@ export default defineComponent({
}, },
}, },
methods: { setup(props, { slots, expose }) {
getDateText(time: string) { function getDateText(time: string) {
const date = new Date(time).getDate(); const date = new Date(time).getDate();
const month = new Date(time).getMonth() + 1; const month = new Date(time).getMonth() + 1;
return this.$t('monthAndDay', { return i18n.t('monthAndDay', {
month: month.toString(), month: month.toString(),
day: date.toString() day: date.toString()
}); });
} }
},
render() { if (props.items.length === 0) return;
if (this.items.length === 0) return;
const renderChildren = () => this.items.map((item, i) => { const renderChildren = () => props.items.map((item, i) => {
const el = this.$slots.default({ if (!slots || !slots.default) return;
const el = slots.default({
item: item item: item
})[0]; })[0];
if (el.key == null && item.id) el.key = item.id; if (el.key == null && item.id) el.key = item.id;
if ( if (
i != this.items.length - 1 && i != props.items.length - 1 &&
new Date(item.createdAt).getDate() != new Date(this.items[i + 1].createdAt).getDate() new Date(item.createdAt).getDate() != new Date(props.items[i + 1].createdAt).getDate()
) { ) {
const separator = h('div', { const separator = h('div', {
class: 'separator', class: 'separator',
@ -64,10 +66,10 @@ export default defineComponent({
h('i', { h('i', {
class: 'fas fa-angle-up icon', class: 'fas fa-angle-up icon',
}), }),
this.getDateText(item.createdAt) getDateText(item.createdAt)
]), ]),
h('span', [ h('span', [
this.getDateText(this.items[i + 1].createdAt), getDateText(props.items[i + 1].createdAt),
h('i', { h('i', {
class: 'fas fa-angle-down icon', class: 'fas fa-angle-down icon',
}) })
@ -76,7 +78,7 @@ export default defineComponent({
return [el, separator]; return [el, separator];
} else { } else {
if (this.ad && item._shouldInsertAd_) { if (props.ad && item._shouldInsertAd_) {
return [h(MkAd, { return [h(MkAd, {
class: 'a', // advertiseの意(ブロッカー対策) class: 'a', // advertiseの意(ブロッカー対策)
key: item.id + ':ad', key: item.id + ':ad',
@ -88,18 +90,19 @@ export default defineComponent({
} }
}); });
return h(this.$store.state.animation ? TransitionGroup : 'div', this.$store.state.animation ? { return () => h(
class: 'sqadhkmv' + (this.noGap ? ' noGap' : ''), defaultStore.state.animation ? TransitionGroup : 'div',
defaultStore.state.animation ? {
class: 'sqadhkmv' + (props.noGap ? ' noGap' : ''),
name: 'list', name: 'list',
tag: 'div', tag: 'div',
'data-direction': this.direction, 'data-direction': props.direction,
'data-reversed': this.reversed ? 'true' : 'false', 'data-reversed': props.reversed ? 'true' : 'false',
} : { } : {
class: 'sqadhkmv' + (this.noGap ? ' noGap' : ''), class: 'sqadhkmv' + (props.noGap ? ' noGap' : ''),
}, {
default: renderChildren
});
}, },
{ default: renderChildren });
}
}); });
</script> </script>

173
packages/client/src/components/dialog.vue
View File

@ -14,7 +14,7 @@
</div> </div>
<header v-if="title"><Mfm :text="title"/></header> <header v-if="title"><Mfm :text="title"/></header>
<div v-if="text" class="body"><Mfm :text="text"/></div> <div v-if="text" class="body"><Mfm :text="text"/></div>
<MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder" @keydown="onInputKeydown"> <MkInput v-if="input" v-model="inputValue" autofocus :type="input.type || 'text'" :placeholder="input.placeholder || undefined" @keydown="onInputKeydown">
<template v-if="input.type === 'password'" #prefix><i class="fas fa-lock"></i></template> <template v-if="input.type === 'password'" #prefix><i class="fas fa-lock"></i></template>
</MkInput> </MkInput>
<MkSelect v-if="select" v-model="selectedValue" autofocus> <MkSelect v-if="select" v-model="selectedValue" autofocus>
@ -38,118 +38,107 @@
</MkModal> </MkModal>
</template> </template>
<script lang="ts"> <script lang="ts" setup>
import { defineComponent } from 'vue'; import { onBeforeUnmount, onMounted, ref } from 'vue';
import MkModal from '@/components/ui/modal.vue'; import MkModal from '@/components/ui/modal.vue';
import MkButton from '@/components/ui/button.vue'; import MkButton from '@/components/ui/button.vue';
import MkInput from '@/components/form/input.vue'; import MkInput from '@/components/form/input.vue';
import MkSelect from '@/components/form/select.vue'; import MkSelect from '@/components/form/select.vue';
export default defineComponent({ type Input = {
components: { type: HTMLInputElement['type'];
MkModal, placeholder?: string | null;
MkButton, default: any | null;
MkInput,
MkSelect,
},
props: {
type: {
type: String,
required: false,
default: 'info'
},
title: {
type: String,
required: false
},
text: {
type: String,
required: false
},
input: {
required: false
},
select: {
required: false
},
icon: {
required: false
},
actions: {
required: false
},
showOkButton: {
type: Boolean,
default: true
},
showCancelButton: {
type: Boolean,
default: false
},
cancelableByBgClick: {
type: Boolean,
default: true
},
},
emits: ['done', 'closed'],
data() {
return {
inputValue: this.input && this.input.default ? this.input.default : null,
selectedValue: this.select ? this.select.default ? this.select.default : this.select.items ? this.select.items[0].value : this.select.groupedItems[0].items[0].value : null,
}; };
},
mounted() { type Select = {
document.addEventListener('keydown', this.onKeydown); items: {
}, value: string;
text: string;
}[];
groupedItems: {
label: string;
items: {
value: string;
text: string;
}[];
}[];
default: string | null;
};
beforeUnmount() { const props = withDefaults(defineProps<{
document.removeEventListener('keydown', this.onKeydown); type?: 'success' | 'error' | 'warning' | 'info' | 'question' | 'waiting';
}, title: string;
text?: string;
input?: Input;
select?: Select;
icon?: string;
actions?: {
text: string;
primary?: boolean,
callback: (...args: any[]) => void;
}[];
showOkButton?: boolean;
showCancelButton?: boolean;
cancelableByBgClick?: boolean;
}>(), {
type: 'info',
showOkButton: true,
showCancelButton: false,
cancelableByBgClick: true,
});
methods: { const emit = defineEmits<{
done(canceled, result?) { (e: 'done', v: { canceled: boolean; result: any }): void;
this.$emit('done', { canceled, result }); (e: 'closed'): void;
this.$refs.modal.close(); }>();
},
async ok() { const modal = ref<InstanceType<typeof MkModal>>();
if (!this.showOkButton) return;
const inputValue = ref(props.input?.default || null);
const selectedValue = ref(props.select?.default || null);
function done(canceled: boolean, result?) {
emit('done', { canceled, result });
modal.value?.close();
}
async function ok() {
if (!props.showOkButton) return;
const result = const result =
this.input ? this.inputValue : props.input ? inputValue.value :
this.select ? this.selectedValue : props.select ? selectedValue.value :
true; true;
this.done(false, result); done(false, result);
},
cancel() {
this.done(true);
},
onBgClick() {
if (this.cancelableByBgClick) {
this.cancel();
} }
},
onKeydown(e) { function cancel() {
if (e.which === 27) { // ESC done(true);
this.cancel(); }
/*
function onBgClick() {
if (props.cancelableByBgClick) cancel();
}
*/
function onKeydown(e: KeyboardEvent) {
if (e.key === 'Escape') cancel();
} }
},
onInputKeydown(e) { function onInputKeydown(e: KeyboardEvent) {
if (e.which === 13) { // Enter if (e.key === 'Enter') {
e.preventDefault(); e.preventDefault();
e.stopPropagation(); e.stopPropagation();
this.ok(); ok();
}
} }
} }
onMounted(() => {
document.addEventListener('keydown', onKeydown);
});
onBeforeUnmount(() => {
document.removeEventListener('keydown', onKeydown);
}); });
</script> </script>