Merge remote-branch 'misskey/develop'
This commit is contained in:
commit
5d95dc789f
|
@ -39,11 +39,14 @@
|
|||
- Fix: ロールタイムラインにて全ての投稿が流れてしまう問題の修正
|
||||
- Fix: 「アクセストークンの管理」画面でアプリの情報が表示されない問題の修正
|
||||
- Fix: Firefoxにおける絵文字ピッカーのTabキーフォーカス問題の修正
|
||||
- Fix: フォローボタンがテーマのカラースキームによって視認性が悪くなる問題を修正
|
||||
- 新しいプロパティ `fgOnWhite` が追加されました
|
||||
|
||||
### Server
|
||||
- bullをbull-mqにアップグレードし、ジョブキューのパフォーマンスを改善
|
||||
- ストリーミングのパフォーマンスを改善
|
||||
- Fix: お知らせの画像URLを空にできない問題を修正
|
||||
- Fix: i/notificationsのsinceIdが機能しない問題を修正
|
||||
|
||||
## 13.12.2
|
||||
|
||||
|
|
|
@ -91,18 +91,18 @@ export default class extends Endpoint<typeof meta, typeof paramDef> {
|
|||
const includeTypes = ps.includeTypes && ps.includeTypes.filter(type => !(obsoleteNotificationTypes).includes(type as any)) as typeof notificationTypes[number][];
|
||||
const excludeTypes = ps.excludeTypes && ps.excludeTypes.filter(type => !(obsoleteNotificationTypes).includes(type as any)) as typeof notificationTypes[number][];
|
||||
|
||||
const limit = ps.limit + (ps.untilId ? 1 : 0); // untilIdに指定したものも含まれるため+1
|
||||
const limit = ps.limit + (ps.untilId ? 1 : 0) + (ps.sinceId ? 1 : 0); // untilIdに指定したものも含まれるため+1
|
||||
const notificationsRes = await this.redisClient.xrevrange(
|
||||
`notificationTimeline:${me.id}`,
|
||||
ps.untilId ? this.idService.parse(ps.untilId).date.getTime() : '+',
|
||||
'-',
|
||||
ps.sinceId ? this.idService.parse(ps.sinceId).date.getTime() : '-',
|
||||
'COUNT', limit);
|
||||
|
||||
if (notificationsRes.length === 0) {
|
||||
return [];
|
||||
}
|
||||
|
||||
let notifications = notificationsRes.map(x => JSON.parse(x[1][1])).filter(x => x.id !== ps.untilId) as Notification[];
|
||||
let notifications = notificationsRes.map(x => JSON.parse(x[1][1])).filter(x => x.id !== ps.untilId && x !== ps.sinceId) as Notification[];
|
||||
|
||||
if (includeTypes && includeTypes.length > 0) {
|
||||
notifications = notifications.filter(notification => includeTypes.includes(notification.type));
|
||||
|
|
|
@ -131,8 +131,7 @@ onBeforeUnmount(() => {
|
|||
position: relative;
|
||||
display: inline-block;
|
||||
font-weight: bold;
|
||||
color: var(--accent);
|
||||
background: transparent;
|
||||
color: var(--fgOnWhite);
|
||||
border: solid 1px var(--accent);
|
||||
padding: 0;
|
||||
height: 31px;
|
||||
|
|
|
@ -20,7 +20,8 @@
|
|||
fgTransparentWeak: ':alpha<0.75<@fg',
|
||||
fgTransparent: ':alpha<0.5<@fg',
|
||||
fgHighlighted: ':lighten<3<@fg',
|
||||
fgOnAccent: '#000',
|
||||
fgOnAccent: '#fff',
|
||||
fgOnWhite: '#333',
|
||||
divider: 'rgba(255, 255, 255, 0.1)',
|
||||
indicator: '@accent',
|
||||
panel: ':lighten<3<@bg',
|
||||
|
|
|
@ -21,6 +21,7 @@
|
|||
fgTransparent: ':alpha<0.5<@fg',
|
||||
fgHighlighted: ':darken<3<@fg',
|
||||
fgOnAccent: '#fff',
|
||||
fgOnWhite: '#333',
|
||||
divider: 'rgba(0, 0, 0, 0.1)',
|
||||
indicator: '@accent',
|
||||
panel: ':lighten<3<@bg',
|
||||
|
|
|
@ -53,6 +53,7 @@
|
|||
panelHeaderBg: ':lighten<3<@panel',
|
||||
panelHeaderFg: '@fg',
|
||||
htmlThemeColor: '@bg',
|
||||
fgOnWhite: '@accent',
|
||||
panelHighlight: ':lighten<3<@panel',
|
||||
listItemHoverBg: 'rgba(255, 255, 255, 0.03)',
|
||||
scrollbarHandle: 'rgba(255, 255, 255, 0.2)',
|
||||
|
|
|
@ -6,6 +6,7 @@
|
|||
props: {
|
||||
accent: '#1d9bf0',
|
||||
bg: '#000',
|
||||
fgOnWhite: '@accent',
|
||||
link: '#1d9bf0',
|
||||
hashtag: '#1d9bf0',
|
||||
renote: '#71767b',
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
bg: 'rgb(37, 38, 36)',
|
||||
fg: 'rgb(216, 212, 199)',
|
||||
fgHighlighted: '#fff',
|
||||
fgOnWhite: '@accent',
|
||||
divider: 'rgba(255, 255, 255, 0.14)',
|
||||
panel: 'rgb(47, 47, 44)',
|
||||
panelHeaderDivider: 'rgba(0, 0, 0, 0)',
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
accent: 'rgb(255, 89, 117)',
|
||||
bg: 'rgb(28, 28, 37)',
|
||||
fg: 'rgb(236, 239, 244)',
|
||||
fgOnWhite: '@accent',
|
||||
panel: 'rgb(35, 35, 47)',
|
||||
renote: '@accent',
|
||||
link: '@accent',
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
bg: 'rgb(28, 28, 37)',
|
||||
fg: 'rgb(236, 239, 244)',
|
||||
fgHighlighted: '#fff',
|
||||
fgOnWhite: '@accent',
|
||||
divider: 'rgb(63, 63, 80)',
|
||||
panel: 'rgb(35, 35, 47)',
|
||||
panelHeaderBg: 'rgb(45, 45, 66)',
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
bg: '#232323',
|
||||
fg: 'rgb(199, 209, 216)',
|
||||
fgHighlighted: '#fff',
|
||||
fgOnWhite: '@accent',
|
||||
divider: 'rgba(255, 255, 255, 0.14)',
|
||||
panel: '#2d2d2d',
|
||||
panelHeaderDivider: 'rgba(0, 0, 0, 0)',
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
fg: '#D5D5D6',
|
||||
fgHighlighted: '#fff',
|
||||
fgOnAccent: '#000',
|
||||
fgOnWhite: '@accent',
|
||||
divider: 'rgba(255, 255, 255, 0.1)',
|
||||
panel: '#18181c',
|
||||
panelHeaderDivider: 'rgba(0, 0, 0, 0)',
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
fg: '#dee7e4',
|
||||
fgHighlighted: '#fff',
|
||||
fgOnAccent: '#192320',
|
||||
fgOnWhite: '@accent',
|
||||
divider: '#e7fffb24',
|
||||
panel: '#192320',
|
||||
panelHeaderDivider: 'rgba(0, 0, 0, 0)',
|
||||
|
|
|
@ -12,6 +12,7 @@
|
|||
fg: '#dee7e4',
|
||||
fgHighlighted: '#fff',
|
||||
fgOnAccent: '#192320',
|
||||
fgOnWhite: '@accent',
|
||||
divider: '#e7fffb24',
|
||||
panel: '#192320',
|
||||
panelHeaderDivider: 'rgba(0, 0, 0, 0)',
|
||||
|
|
|
@ -8,6 +8,7 @@
|
|||
|
||||
props: {
|
||||
accent: '#47BFE8',
|
||||
fgOnWhite: '@accent',
|
||||
bg: '#212526',
|
||||
},
|
||||
}
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
bg: 'rgb(31, 33, 31)',
|
||||
fg: '#cdd8c7',
|
||||
fgHighlighted: '#fff',
|
||||
fgOnWhite: '@accent',
|
||||
divider: 'rgba(255, 255, 255, 0.14)',
|
||||
panel: 'rgb(41, 43, 41)',
|
||||
infoFg: '@fg',
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
bg: '$mstdnBase',
|
||||
acrylicBg: '$mstdnUI',
|
||||
fg: '#eee',
|
||||
fgOnWhite: '@accent',
|
||||
divider: '#2e3340',
|
||||
panel: '$mstdnUI',
|
||||
panelHighlight: '$mstdnBg',
|
||||
|
|
|
@ -55,6 +55,7 @@
|
|||
codeNumber: '#cfff9e',
|
||||
codeString: '#ffb675',
|
||||
fgOnAccent: '#fff',
|
||||
fgOnWhite: '@accent',
|
||||
infoWarnBg: '#42321c',
|
||||
infoWarnFg: '#ffbd3e',
|
||||
navHoverFg: ':lighten<17<@fg',
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
accent: 'rgb(234, 154, 82)',
|
||||
bg: '#e6e5e2',
|
||||
fg: 'rgb(149, 143, 139)',
|
||||
fgOnWhite: '@accent',
|
||||
panel: '#EEECE8',
|
||||
renote: '@accent',
|
||||
link: '@accent',
|
||||
|
|
|
@ -5,6 +5,7 @@
|
|||
name: 'Birdsite Pure white',
|
||||
props: {
|
||||
bg: '#fff',
|
||||
fgOnWhite: '@accent',
|
||||
link: '#1d9bf0',
|
||||
accent: '#1d9bf0',
|
||||
renote: '#536472',
|
||||
|
|
|
@ -11,6 +11,7 @@
|
|||
bg: 'e2deda',
|
||||
fg: '#3d3d3d',
|
||||
fgHighlighted: '#6bc9a0',
|
||||
fgOnWhite: '@accent',
|
||||
divider: '#cfcfcf',
|
||||
panel: '@X14',
|
||||
panelHeaderBg: '@panel',
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
accent: 'rgb(219, 96, 114)',
|
||||
bg: 'rgb(254, 248, 249)',
|
||||
fg: 'rgb(152, 13, 26)',
|
||||
fgOnWhite: '@accent',
|
||||
panel: 'rgb(255, 255, 255)',
|
||||
renote: '@accent',
|
||||
link: 'rgb(156, 187, 5)',
|
||||
|
|
|
@ -9,6 +9,7 @@
|
|||
accent: '#6ba5e3',
|
||||
bg: 'rgb(238, 241, 252)',
|
||||
fg: '#577096',
|
||||
fgOnWhite: '@accent',
|
||||
divider: 'rgb(223, 223, 223)',
|
||||
acrylicPanel: ':alpha<0.5<@panel',
|
||||
header: '@bg',
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
accent: '#9f8989',
|
||||
bg: '#f5f3f3',
|
||||
fg: '#7f6666',
|
||||
fgOnWhite: '@accent',
|
||||
panel: '#fff',
|
||||
divider: 'rgba(87, 68, 68, 0.1)',
|
||||
renote: 'rgb(160, 172, 125)',
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
props: {
|
||||
bg: '#f9f9f9',
|
||||
fg: '#676767',
|
||||
fgOnWhite: '@accent',
|
||||
divider: '#e8e8e8',
|
||||
header: ':alpha<0.7<@panel',
|
||||
navBg: '#fff',
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
accent: '#5db0da',
|
||||
bg: 'rgb(246 248 249)',
|
||||
fg: '#636b71',
|
||||
fgOnWhite: '@accent',
|
||||
panel: '#fff',
|
||||
divider: 'rgb(230 233 234)',
|
||||
panelHeaderDivider: '@divider',
|
||||
|
|
|
@ -10,6 +10,7 @@
|
|||
accent: '#e36749',
|
||||
bg: '#f0eee9',
|
||||
fg: '#5f5f5f',
|
||||
fgOnWhite: '@accent',
|
||||
renote: '@accent',
|
||||
link: '@accent',
|
||||
mention: '@accent',
|
||||
|
|
|
@ -55,6 +55,7 @@
|
|||
codeNumber: '#cfff9e',
|
||||
codeString: '#ffb675',
|
||||
fgOnAccent: '#fff',
|
||||
fgOnWhite: '@accent',
|
||||
infoWarnBg: '#42321c',
|
||||
infoWarnFg: '#ffbd3e',
|
||||
navHoverFg: ':lighten<17<@fg',
|
||||
|
|
|
@ -52,6 +52,7 @@
|
|||
driveFolderBg: ':alpha<0.3<@accent',
|
||||
fgHighlighted: ':darken<3<@fg',
|
||||
fgTransparent: ':alpha<0.5<@fg',
|
||||
fgOnWhite: '@accent',
|
||||
panelHeaderBg: ':lighten<3<@panel',
|
||||
panelHeaderFg: '@fg',
|
||||
htmlThemeColor: '@bg',
|
||||
|
|
Loading…
Reference in a new issue