Release: 0.2.0

.devcontainer/devcontainer.yml

@@ -6,7 +6,7 @@
 #───┘ URL └─────────────────────────────────────────────────────
 
 # Final accessible URL seen by a user.
-url: http://127.0.0.1:3000/
+url: http://127.0.0.1:3030/
 
 # ONCE YOU HAVE STARTED THE INSTANCE, DO NOT CHANGE THE
 # URL SETTINGS AFTER THAT!

CHANGELOG_engawa.md

@@ -1,5 +1,5 @@
 <!--
-## 202x.x.x (unreleased)
+## engawa-x.x.x (unreleased)
 
 ### General
 -
@@ -10,9 +10,23 @@
 ### Server
 -
 
-### Others
+### Misc
 
 -->
+## engawa-0.2.0 (unreleased)
+
+### General
+- メディアタイムラインの実装
+ - グローバルタイムラインを閲覧できる場合に閲覧できます
+
+### Misc
+- CHANGELOG_engawaを昇順に修正
+- OthersをMiscに変更
+
+## engawa-0.1.1 (2024-03-09)
+
+### Client
+- ロケール変更
 
 ## engawa-0.1.0 (2024-03-09)
 
@@ -27,7 +41,6 @@
 ### Others
 - フォークへの切り替え
 
-## engawa-0.1.1 (2024-03-09)
 
-### Client
-- ロケール変更
+
+

locales/en-US.yml

@@ -2495,6 +2495,7 @@ _instanceCharts:
 _timelines:
   home: "Home"
   local: "Local"
+  media: "Media"
   social: "Social"
   global: "Global"
 _play:

locales/index.d.ts

@@ -9733,6 +9733,10 @@ export interface Locale extends ILocale {
          * ローカル
          */
         "local": string;
+				/**
+				 * メディア
+				 */
+				"media": string;
         /**
          * ソーシャル
          */

locales/ja-JP.yml

@@ -2569,6 +2569,7 @@ _instanceCharts:
 _timelines:
   home: "ホーム"
   local: "ローカル"
+  media: "メディア"
   social: "ソーシャル"
   global: "グローバル"
 

package.json

@@ -1,6 +1,6 @@
 {
 	"name": "cherrypick",
-	"version": "4.7.0-beta.3+engawa0.1.1",
+	"version": "4.7.0-beta.3+engawa0.2.0",
 	"basedMisskeyVersion": "2024.2.0",
 	"codename": "nasubi",
 	"repository": {

packages/backend/src/core/activitypub/ApInboxService.ts

@@ -333,14 +333,12 @@ export class ApInboxService {
 						this.logger.warn(`Ignored announce target ${targetUri} - ${err.statusCode}`);
 						return;
 					}
-
 					this.logger.warn(`Error in announce target ${targetUri} - ${err.statusCode}`);
 				} else if (err.message === 'actor has been suspended') {
 					this.logger.warn('skip: actor has been suspended');
 				} else {
 					throw err;
 				}
-
 			}
 
 			if (!await this.noteEntityService.isVisibleForMe(renote, actor.id)) {
@@ -849,7 +847,7 @@ export class ApInboxService {
 		} catch (err) {
 			if (err instanceof StatusError && err.isClientError) {
 				return `skip ${err.statusCode}`;
-			} else if(err.message === 'actor has been suspended') {
+			} else if (err.message === 'actor has been suspended') {
 				return 'skip: actor has been suspended';
 			} else {
 				throw err;

packages/backend/src/server/api/stream/ChannelsService.ts

@@ -55,6 +55,7 @@ export class ChannelsService {
 			case 'main': return this.mainChannelService;
 			case 'homeTimeline': return this.homeTimelineChannelService;
 			case 'localTimeline': return this.localTimelineChannelService;
+			case 'mediaTimeline': return this.mediaTimelineChannelService;
 			case 'hybridTimeline': return this.hybridTimelineChannelService;
 			case 'globalTimeline': return this.globalTimelineChannelService;
 			case 'userList': return this.userListChannelService;

packages/cherrypick-js/package.json

@@ -1,7 +1,7 @@
 {
 	"type": "module",
 	"name": "cherrypick-js",
-	"version": "4.7.0-beta.3+engawa0.1.1",
+	"version": "4.7.0-beta.3+engawa0.2.0",
 	"basedMisskeyVersion": "2024.2.0",
 	"description": "CherryPick SDK for JavaScript",
 	"types": "./built/dts/index.d.ts",

packages/frontend/src/components/MkTimeline.vue

@@ -118,7 +118,17 @@
 			withFiles: props.onlyFiles ? true : undefined,
 			withCats: props.onlyCats,
 		});
-	} else if (props.src === 'social') {
+	} else if (props.src === 'media') {
+		connection = stream.useChannel('globalTimeline', {
+			withRenotes: props.withRenotes,
+			withReplies: props.withReplies,
+			withFiles: true,
+			withCats: props.onlyCats,
+		}
+		);
+	}
+
+	else if (props.src === 'social') {
 		connection = stream.useChannel('hybridTimeline', {
 			withRenotes: props.withRenotes,
 			withReplies: props.withReplies,
@@ -193,7 +203,17 @@
 			withFiles: props.onlyFiles ? true : undefined,
 			withCats: props.onlyCats,
 		};
-	} else if (props.src === 'social') {
+	} else if (props.src === 'media') {
+		endpoint = 'notes/global-timeline';
+		query = {
+			withRenotes: props.withRenotes,
+			withReplies: props.withReplies,
+			withFiles: true,
+			withCats: props.onlyCats,
+		};
+	}
+
+	else if (props.src === 'social') {
 		endpoint = 'notes/hybrid-timeline';
 		query = {
 			withRenotes: props.withRenotes,

packages/frontend/src/pages/timeline.vue

@@ -389,7 +389,12 @@ const headerTabs = computed(() => [...(defaultStore.reactiveState.pinnedUserList
 	title: i18n.ts._timelines.global,
 	icon: 'ti ti-world',
 	iconOnly: true,
-}] : []), ...(defaultStore.state.enableListTimeline ? [{
+}, ...(defaultStore.state.enableMediaTimeline ? [{
+	key: 'media',
+	title: i18n.ts._timelines.media,
+	icon: 'ti ti-photo',
+	iconOnly: true,
+}] : [])] : []), ...(defaultStore.state.enableListTimeline ? [{
 	icon: 'ti ti-list',
 	title: i18n.ts.lists,
 	iconOnly: true,

packages/frontend/src/store.ts

@@ -603,6 +603,10 @@ export const defaultStore = markRaw(new Storage('base', {
 		where: 'device',
 		default: true,
 	},
+	enableMediaTimeline: {
+		where: 'device',
+		default: true,
+	},
 	enableListTimeline: {
 		where: 'device',
 		default: true,

packages/frontend/src/ui/deck/deck-store.ts

@@ -29,7 +29,7 @@ export type Column = {
 	channelId?: string;
 	roleId?: string;
 	excludeTypes?: typeof notificationTypes[number][];
-	tl?: 'home' | 'local' | 'social' | 'global';
+	tl?: 'home' | 'local' | 'media' |'social' | 'global';
 	withRenotes?: boolean;
 	withReplies?: boolean;
 	onlyFiles?: boolean;

packages/frontend/src/ui/deck/tl-column.vue

@@ -8,6 +8,7 @@ SPDX-License-Identifier: AGPL-3.0-only
 	<template #header>
 		<i v-if="column.tl === 'home'" class="ti ti-home"></i>
 		<i v-else-if="column.tl === 'local'" class="ti ti-planet"></i>
+		<i v-else-if="column.tl === 'media'" class="ti ti-photo"></i>
 		<i v-else-if="column.tl === 'social'" class="ti ti-universe"></i>
 		<i v-else-if="column.tl === 'global'" class="ti ti-world"></i>
 		<span style="margin-left: 8px;">{{ column.name }}</span>
@@ -42,6 +43,7 @@ import * as os from '@/os.js';
 import { $i } from '@/account.js';
 import { i18n } from '@/i18n.js';
 import { instance } from '@/instance.js';
+import column from './column.vue';
 
 const props = defineProps<{
 	column: Column;
@@ -100,6 +102,9 @@ async function setType() {
 		}, {
 			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,
 		}, {
 			value: 'global' as const, text: i18n.ts._timelines.global,

packages/frontend/src/widgets/WidgetTimeline.vue

@@ -124,6 +124,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-universe',