{{ $t('theme') }}
-
- {{ $t('theme') }}
+
+
+
+
+
+
+
+ {{ $t('themeForLightMode') }}
@@ -11,6 +33,18 @@
+
+ {{ $t('themeForDarkMode') }}
+
+
+
+
+
+ {{ $t('syncDeviceDarkMode') }}
{{ $t('setWallpaper') }}
@@ -25,9 +59,11 @@ import { faPalette } from '@fortawesome/free-solid-svg-icons';
import MkInput from '../../components/ui/input.vue';
import MkButton from '../../components/ui/button.vue';
import MkSelect from '../../components/ui/select.vue';
+import MkSwitch from '../../components/ui/switch.vue';
import i18n from '../../i18n';
import { Theme, builtinThemes, applyTheme } from '../../theme';
import { selectFile } from '../../scripts/select-file';
+import { isDeviceDarkmode } from '../../scripts/is-device-darkmode';
export default Vue.extend({
i18n,
@@ -36,6 +72,7 @@ export default Vue.extend({
MkInput,
MkButton,
MkSelect,
+ MkSwitch,
},
data() {
@@ -62,15 +99,44 @@ export default Vue.extend({
return this.themes.filter(t => t.base == 'light' || t.kind == 'light');
},
- theme: {
- get() { return this.$store.state.device.theme; },
- set(value) { this.$store.commit('device/set', { key: 'theme', value }); }
+ darkTheme: {
+ get() { return this.$store.state.device.darkTheme; },
+ set(value) { this.$store.commit('device/set', { key: 'darkTheme', value }); }
+ },
+
+ lightTheme: {
+ get() { return this.$store.state.device.lightTheme; },
+ set(value) { this.$store.commit('device/set', { key: 'lightTheme', value }); }
+ },
+
+ darkMode: {
+ get() { return this.$store.state.device.darkMode; },
+ set(value) { this.$store.commit('device/set', { key: 'darkMode', value }); }
+ },
+
+ syncDeviceDarkMode: {
+ get() { return this.$store.state.device.syncDeviceDarkMode; },
+ set(value) { this.$store.commit('device/set', { key: 'syncDeviceDarkMode', value }); }
},
},
watch: {
- theme() {
- applyTheme(this.themes.find(x => x.id === this.theme));
+ darkTheme() {
+ if (this.$store.state.device.darkMode) {
+ applyTheme(this.themes.find(x => x.id === this.darkTheme));
+ }
+ },
+
+ lightTheme() {
+ if (!this.$store.state.device.darkMode) {
+ applyTheme(this.themes.find(x => x.id === this.lightTheme));
+ }
+ },
+
+ syncDeviceDarkMode() {
+ if (this.$store.state.device.syncDeviceDarkMode) {
+ this.$store.commit('device/set', { key: 'darkMode', value: isDeviceDarkmode() });
+ }
},
wallpaper() {
@@ -92,3 +158,230 @@ export default Vue.extend({
}
});
+
+
diff --git a/src/client/scripts/is-device-darkmode.ts b/src/client/scripts/is-device-darkmode.ts
new file mode 100644
index 0000000000..21c26823c7
--- /dev/null
+++ b/src/client/scripts/is-device-darkmode.ts
@@ -0,0 +1,3 @@
+export function isDeviceDarkmode() {
+ return window.matchMedia && window.matchMedia('(prefers-color-scheme: dark)').matches;
+}
diff --git a/src/client/store.ts b/src/client/store.ts
index 29709096ee..35b932d624 100644
--- a/src/client/store.ts
+++ b/src/client/store.ts
@@ -35,7 +35,10 @@ const defaultDeviceSettings = {
accounts: [],
recentEmojis: [],
themes: [],
- theme: 'light',
+ darkTheme: '8c539dc1-0fab-4d47-9194-39c508e9bfe1',
+ lightTheme: '4eea646f-7afa-4645-83e9-83af0333cd37',
+ darkMode: false,
+ syncDeviceDarkMode: true,
animation: true,
animatedMfm: true,
imageNewTab: false,
diff --git a/src/client/theme.ts b/src/client/theme.ts
index 576096cf70..2a6adbffcc 100644
--- a/src/client/theme.ts
+++ b/src/client/theme.ts
@@ -13,8 +13,8 @@ export const lightTheme: Theme = require('./themes/_light.json5');
export const darkTheme: Theme = require('./themes/_dark.json5');
export const builtinThemes = [
- lightTheme,
- darkTheme,
+ require('./themes/white.json5'),
+ require('./themes/black.json5'),
require('./themes/lavender.json5'),
require('./themes/halloween.json5'),
require('./themes/garden.json5'),
@@ -44,7 +44,7 @@ export function applyTheme(theme: Theme, persist = true) {
const _theme = JSON.parse(JSON.stringify(theme));
if (_theme.base) {
- const base = [lightTheme, darkTheme].find(x => x.id == _theme.base);
+ const base = [lightTheme, darkTheme].find(x => x.id === _theme.base);
_theme.props = Object.assign({}, base.props, _theme.props);
}
diff --git a/src/client/themes/black.json5 b/src/client/themes/black.json5
new file mode 100644
index 0000000000..22dfeda5a0
--- /dev/null
+++ b/src/client/themes/black.json5
@@ -0,0 +1,14 @@
+{
+ id: '8c539dc1-0fab-4d47-9194-39c508e9bfe1',
+
+ name: 'Black',
+ author: 'syuilo',
+ desc: 'Basic dark theme',
+
+ base: 'dark',
+
+ props: {
+ divider: '#2d2d2d',
+ messageBg: '#1d1d1d',
+ },
+}
diff --git a/src/client/themes/white.json5 b/src/client/themes/white.json5
new file mode 100644
index 0000000000..0e35a8232e
--- /dev/null
+++ b/src/client/themes/white.json5
@@ -0,0 +1,13 @@
+{
+ id: '4eea646f-7afa-4645-83e9-83af0333cd37',
+
+ name: 'White',
+ author: 'syuilo',
+ desc: 'Basic light theme',
+
+ base: 'light',
+
+ props: {
+ messageBg: '#dedede',
+ },
+}
diff --git a/src/docs/pages.ja-JP.md b/src/docs/pages.ja-JP.md
new file mode 100644
index 0000000000..3804c5a5c2
--- /dev/null
+++ b/src/docs/pages.ja-JP.md
@@ -0,0 +1,10 @@
+# Pages
+
+## 変数
+変数を使うことで動的なページを作成できます。テキスト内で { 変数名 } と書くとそこに変数の値を埋め込めます。例えば Hello { thing } world! というテキストで、変数(thing)の値が ai だった場合、テキストは Hello ai world! になります。
+
+変数の評価(値を算出すること)は上から下に行われるので、ある変数の中で自分より下の変数を参照することはできません。例えば上から A、B、C と3つの変数を定義したとき、Cの中でAやBを参照することはできますが、Aの中でBやCを参照することはできません。
+
+ユーザーからの入力を受け取るには、ページに「ユーザー入力」ブロックを設置し、「変数名」に入力を格納したい変数名を設定します(変数は自動で作成されます)。その変数を使ってユーザー入力に応じた動作を行えます。
+
+関数を使うと、値の算出処理を再利用可能な形にまとめることができます。関数を作るには、「関数」タイプの変数を作成します。関数にはスロット(引数)を設定することができ、スロットの値は関数内で変数として利用可能です。また、AiScript標準で関数を引数に取る関数(高階関数と呼ばれます)も存在します。関数は予め定義しておくほかに、このような高階関数のスロットに即席でセットすることもできます。
diff --git a/src/prelude/time.ts b/src/prelude/time.ts
index a65366d74a..34e8b6b17c 100644
--- a/src/prelude/time.ts
+++ b/src/prelude/time.ts
@@ -5,7 +5,17 @@ const dateTimeIntervals = {
};
export function dateUTC(time: number[]): Date {
- return new Date(Date.UTC(...time));
+ const d = time.length === 2 ? Date.UTC(time[0], time[1])
+ : time.length === 3 ? Date.UTC(time[0], time[1], time[2])
+ : time.length === 4 ? Date.UTC(time[0], time[1], time[2], time[3])
+ : time.length === 5 ? Date.UTC(time[0], time[1], time[2], time[3], time[4])
+ : time.length === 6 ? Date.UTC(time[0], time[1], time[2], time[3], time[4], time[5])
+ : time.length === 7 ? Date.UTC(time[0], time[1], time[2], time[3], time[4], time[5], time[6])
+ : null;
+
+ if (!d) throw 'wrong number of arguments';
+
+ return new Date(d);
}
export function isTimeSame(a: Date, b: Date): boolean {
diff --git a/src/server/api/endpoints/users/search-by-username-and-host.ts b/src/server/api/endpoints/users/search-by-username-and-host.ts
index bc68f44094..b6ba09d0c0 100644
--- a/src/server/api/endpoints/users/search-by-username-and-host.ts
+++ b/src/server/api/endpoints/users/search-by-username-and-host.ts
@@ -72,6 +72,7 @@ export default define(meta, async (ps, me) => {
q.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' })
}
+ q.andWhere('user.updatedAt IS NOT NULL');
q.orderBy('user.updatedAt', 'DESC');
const users = await q.take(ps.limit!).skip(ps.offset).getMany();
@@ -82,6 +83,7 @@ export default define(meta, async (ps, me) => {
.where('user.host IS NULL')
.andWhere('user.isSuspended = FALSE')
.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' })
+ .andWhere('user.updatedAt IS NOT NULL')
.orderBy('user.updatedAt', 'DESC')
.take(ps.limit!)
.skip(ps.offset)
@@ -92,6 +94,7 @@ export default define(meta, async (ps, me) => {
.where('user.host IS NOT NULL')
.andWhere('user.isSuspended = FALSE')
.andWhere('user.usernameLower like :username', { username: ps.username.toLowerCase() + '%' })
+ .andWhere('user.updatedAt IS NOT NULL')
.orderBy('user.updatedAt', 'DESC')
.take(ps.limit! - users.length)
.getMany();
diff --git a/src/server/api/endpoints/users/search.ts b/src/server/api/endpoints/users/search.ts
index c01f355d8c..7733b1a6bf 100644
--- a/src/server/api/endpoints/users/search.ts
+++ b/src/server/api/endpoints/users/search.ts
@@ -74,6 +74,7 @@ export default define(meta, async (ps, me) => {
.where('user.host IS NULL')
.andWhere('user.isSuspended = FALSE')
.andWhere('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
+ .andWhere('user.updatedAt IS NOT NULL')
.orderBy('user.updatedAt', 'DESC')
.take(ps.limit!)
.skip(ps.offset)
@@ -84,6 +85,7 @@ export default define(meta, async (ps, me) => {
.where('user.host IS NOT NULL')
.andWhere('user.isSuspended = FALSE')
.andWhere('user.usernameLower like :username', { username: ps.query.replace('@', '').toLowerCase() + '%' })
+ .andWhere('user.updatedAt IS NOT NULL')
.orderBy('user.updatedAt', 'DESC')
.take(ps.limit! - users.length)
.getMany();
