@@ -1052,6 +1053,10 @@ defineExpose({
background: var(--X4);
}
+.contentWarningCheckRule {
+ margin: 0 20px 16px 20px;
+}
+
.hasNotSpecifiedMentions {
margin: 0 20px 16px 20px;
}
diff --git a/packages/frontend/src/components/MkTimeline.vue b/packages/frontend/src/components/MkTimeline.vue
index 062d0bd87a..348bd5a3a4 100644
--- a/packages/frontend/src/components/MkTimeline.vue
+++ b/packages/frontend/src/components/MkTimeline.vue
@@ -74,6 +74,17 @@ if (props.src === 'antenna') {
withReplies: defaultStore.state.showTimelineReplies,
});
connection.on('note', prepend);
+} else if (props.src === 'media') {
+ endpoint = 'notes/hybrid-timeline';
+ query = {
+ withFiles: true,
+ withReplies: defaultStore.state.showTimelineReplies,
+ };
+ connection = stream.useChannel('hybridTimeline', {
+ withFiles: true,
+ withReplies: defaultStore.state.showTimelineReplies,
+ });
+ connection.on('note', prepend);
} else if (props.src === 'social') {
endpoint = 'notes/hybrid-timeline';
query = {
diff --git a/packages/frontend/src/pages/about-misskey.vue b/packages/frontend/src/pages/about-misskey.vue
index 6d2f7e155e..e8647ba432 100644
--- a/packages/frontend/src/pages/about-misskey.vue
+++ b/packages/frontend/src/pages/about-misskey.vue
@@ -24,11 +24,21 @@
-
+
{{ i18n.ts._aboutMisskey.source }}
GitHub
+
+
+ {{ i18n.ts._aboutMisskey.originalSource }}
+ GitHub
+
+
+
+ {{ i18n.ts._aboutMisskey.ioSource }}
+ GitHub
+
{{ i18n.ts._aboutMisskey.translation }}
diff --git a/packages/frontend/src/pages/timeline.vue b/packages/frontend/src/pages/timeline.vue
index a441c6f728..d085443290 100644
--- a/packages/frontend/src/pages/timeline.vue
+++ b/packages/frontend/src/pages/timeline.vue
@@ -128,6 +128,11 @@ const headerTabs = $computed(() => [{
title: i18n.ts._timelines.local,
icon: 'ti ti-planet',
iconOnly: true,
+}, {
+ key: 'media',
+ title: i18n.ts._timelines.media,
+ icon: 'ti ti-photo',
+ iconOnly: true,
}, {
key: 'social',
title: i18n.ts._timelines.social,
diff --git a/packages/frontend/src/ui/deck/deck-store.ts b/packages/frontend/src/ui/deck/deck-store.ts
index 4601207858..0e5534b102 100644
--- a/packages/frontend/src/ui/deck/deck-store.ts
+++ b/packages/frontend/src/ui/deck/deck-store.ts
@@ -24,7 +24,7 @@ export type Column = {
channelId?: string;
roleId?: string;
includingTypes?: typeof notificationTypes[number][];
- tl?: 'home' | 'local' | 'social' | 'global';
+ tl?: 'home' | 'local' | 'media' | 'social' | 'global';
};
export const deckStore = markRaw(new Storage('deck', {
diff --git a/packages/frontend/src/ui/deck/tl-column.vue b/packages/frontend/src/ui/deck/tl-column.vue
index 4844ad11ff..5e16956e38 100644
--- a/packages/frontend/src/ui/deck/tl-column.vue
+++ b/packages/frontend/src/ui/deck/tl-column.vue
@@ -4,6 +4,7 @@
+
{{ column.name }}
@@ -56,6 +57,8 @@ async function setType() {
value: 'home' as const, text: i18n.ts._timelines.home,
}, {
value: 'local' as const, text: i18n.ts._timelines.local,
+ }, {
+ value: 'media' as const, text: i18n.ts._timelines.media,
}, {
value: 'social' as const, text: i18n.ts._timelines.social,
}, {
diff --git a/packages/frontend/src/widgets/WidgetTimeline.vue b/packages/frontend/src/widgets/WidgetTimeline.vue
index 3d497c2e23..dea0a816a5 100644
--- a/packages/frontend/src/widgets/WidgetTimeline.vue
+++ b/packages/frontend/src/widgets/WidgetTimeline.vue
@@ -117,6 +117,10 @@ const choose = async (ev) => {
text: i18n.ts._timelines.local,
icon: 'ti ti-planet',
action: () => { setSrc('local'); },
+ }, {
+ text: i18n.ts._timelines.media,
+ icon: 'ti ti-photo',
+ action: () => { setSrc('media'); },
}, {
text: i18n.ts._timelines.social,
icon: 'ti ti-rocket',
diff --git a/locales/en-US.yml b/locales/en-US.yml
index 097aba76ba..ca53d413b5 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -1517,6 +1517,8 @@ _aboutMisskey:
contributors: "Main contributors"
allContributors: "All contributors"
source: "Source code"
+ originalSource: "Original source code"
+ ioSource: "Misskey.io's source code"
translation: "Translate Misskey"
donate: "Donate to Misskey"
morePatrons: "We also appreciate the support of many other helpers not listed here. Thank you! 🥰"
@@ -1882,6 +1884,7 @@ _instanceCharts:
_timelines:
home: "Home"
local: "Local"
+ media: "Media"
social: "Social"
global: "Global"
_play:
diff --git a/locales/index.d.ts b/locales/index.d.ts
index db7e3e9575..978931e867 100644
--- a/locales/index.d.ts
+++ b/locales/index.d.ts
@@ -996,6 +996,7 @@ export interface Locale {
"disableFederationConfirm": string;
"disableFederationConfirmWarn": string;
"disableFederationOk": string;
+ "contentWarningCheckRule": string;
"invitationRequiredToRegister": string;
"emailNotSupported": string;
"postToTheChannel": string;
@@ -1617,6 +1618,8 @@ export interface Locale {
"contributors": string;
"allContributors": string;
"source": string;
+ "originalSource": string;
+ "ioSource": string;
"translation": string;
"donate": string;
"morePatrons": string;
@@ -2012,6 +2015,7 @@ export interface Locale {
"_timelines": {
"home": string;
"local": string;
+ "media": string;
"social": string;
"global": string;
};
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index b2fa9c337e..cfde5f015b 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -993,6 +993,7 @@ letsLookAtTimeline: "タイムラインを見てみる"
disableFederationConfirm: "連合なしにしますか？"
disableFederationConfirmWarn: "連合なしにしても投稿は非公開になりません。ほとんどの場合、連合なしにする必要はありません。"
disableFederationOk: "連合なしにする"
+contentWarningCheckRule: "R18など、NSFWに相当する内容を投稿する場合は、注釈に投稿の内容に関する簡単な説明を記述してください。\n詳しくはルールをご覧ください。https://service.misskey.art"
invitationRequiredToRegister: "現在このサーバーは招待制です。招待コードをお持ちの方のみ登録できます。"
emailNotSupported: "このサーバーではメール配信はサポートされていません"
postToTheChannel: "チャンネルに投稿"
@@ -1535,6 +1536,8 @@ _aboutMisskey:
contributors: "主なコントリビューター"
allContributors: "全てのコントリビューター"
source: "ソースコード"
+ originalSource: "本家のソースコード"
+ ioSource: "Misskey.ioのソースコード"
translation: "Misskeyを翻訳"
donate: "Misskeyに寄付"
morePatrons: "他にも多くの方が支援してくれています。ありがとうございます🥰"
@@ -1928,6 +1931,7 @@ _instanceCharts:
_timelines:
home: "ホーム"
local: "ローカル"
+ media: "メディア"
social: "ソーシャル"
global: "グローバル"
diff --git a/package.json b/package.json
index 125a33f406..1b4e6a365a 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "misskey",
- "version": "13.14.2",
+ "version": "13.14.2-art+1.0",
"codename": "nasubi",
"repository": {
"type": "git",
diff --git a/packages/backend/assets/favicon.ico b/packages/backend/assets/favicon.ico
index 9be1ff6295..b813b8cc28 100644
Binary files a/packages/backend/assets/favicon.ico and b/packages/backend/assets/favicon.ico differ
diff --git a/packages/backend/assets/favicon.png b/packages/backend/assets/favicon.png
index b4eb18a5cb..110e0e0707 100644
Binary files a/packages/backend/assets/favicon.png and b/packages/backend/assets/favicon.png differ
diff --git a/packages/backend/assets/icons/192.png b/packages/backend/assets/icons/192.png
deleted file mode 100644
index 15fd1e3731..0000000000
Binary files a/packages/backend/assets/icons/192.png and /dev/null differ
diff --git a/packages/backend/assets/icons/192art.png b/packages/backend/assets/icons/192art.png
new file mode 100644
index 0000000000..ab5c4f51bd
Binary files /dev/null and b/packages/backend/assets/icons/192art.png differ
diff --git a/packages/backend/assets/icons/512.png b/packages/backend/assets/icons/512.png
deleted file mode 100644
index f2169ec9b0..0000000000
Binary files a/packages/backend/assets/icons/512.png and /dev/null differ
diff --git a/packages/backend/assets/icons/512art.png b/packages/backend/assets/icons/512art.png
new file mode 100644
index 0000000000..9ddc462b9f
Binary files /dev/null and b/packages/backend/assets/icons/512art.png differ
diff --git a/packages/backend/assets/icons/mi-art.png b/packages/backend/assets/icons/mi-art.png
new file mode 100644
index 0000000000..9ddc462b9f
Binary files /dev/null and b/packages/backend/assets/icons/mi-art.png differ
diff --git a/packages/backend/assets/splash.png b/packages/backend/assets/splash.png
index 3430e6efe7..4d84283787 100644
Binary files a/packages/backend/assets/splash.png and b/packages/backend/assets/splash.png differ
diff --git a/packages/backend/src/server/api/stream/channels/global-timeline.ts b/packages/backend/src/server/api/stream/channels/global-timeline.ts
index d3339072c1..77d4f0592a 100644
--- a/packages/backend/src/server/api/stream/channels/global-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/global-timeline.ts
@@ -14,6 +14,7 @@ class GlobalTimelineChannel extends Channel {
public static shouldShare = true;
public static requireCredential = false;
private withReplies: boolean;
+ private withFiles: boolean;
constructor(
private metaService: MetaService,
@@ -33,6 +34,7 @@ class GlobalTimelineChannel extends Channel {
if (!policies.gtlAvailable) return;
this.withReplies = params.withReplies as boolean;
+ this.withFiles = params.withFiles as boolean;
// Subscribe events
this.subscriber.on('notesStream', this.onNote);
@@ -43,6 +45,9 @@ class GlobalTimelineChannel extends Channel {
if (note.visibility !== 'public') return;
if (note.channelId != null) return;
+ // ファイルを含まない投稿は除外
+ if (this.withFiles && (note.files === undefined || note.files.length === 0)) return;
+
// リプライなら再pack
if (note.replyId != null) {
note.reply = await this.noteEntityService.pack(note.replyId, this.user, {
diff --git a/packages/backend/src/server/api/stream/channels/home-timeline.ts b/packages/backend/src/server/api/stream/channels/home-timeline.ts
index fe0cc37b6b..d740b2efb7 100644
--- a/packages/backend/src/server/api/stream/channels/home-timeline.ts
+++ b/packages/backend/src/server/api/stream/channels/home-timeline.ts
@@ -12,6 +12,7 @@ class HomeTimelineChannel extends Channel {
public static shouldShare = true;
public static requireCredential = true;
private withReplies: boolean;
+ private withFiles: boolean;
constructor(
private noteEntityService: NoteEntityService,
@@ -26,6 +27,7 @@ class HomeTimelineChannel extends Channel {
@bindThis
public async init(params: any) {
this.withReplies = params.withReplies as boolean;
+ this.withFiles = params.withFiles as boolean;
this.subscriber.on('notesStream', this.onNote);
}
@@ -42,6 +44,9 @@ class HomeTimelineChannel extends Channel {
// Ignore notes from instances the user has muted
if (isInstanceMuted(note, new Set