Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions CHANGELOG_MISAKI.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,3 +27,20 @@

### Backend / Client
- ユーザーのリアクションをポリシーで制限できるようになりました。

## 4.17.0-misaki

### Backend / Client
- CherryPick 4.17.0に追従しました。

### Backend
- 非公開(非表示)の投稿を表示されないようになりました。

## 4.17.0-misaki.1

### Frontend
- 軽微なバグを修正しました。
- YouTubeの短縮リンクにでもプレビュー表示できるように修正しました。

### Backend
- レベルロールのメンバーが取得できない問題を修正しました。
4 changes: 2 additions & 2 deletions locales/en-US.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3836,8 +3836,6 @@ _deliveryTargetControl:
deliveryTargetsExclude: "Not public to some servers"
hasDeliveryTargets: "Delivery targets are selected"

noSendActivity: "Don't send activity"

ipAddress: "IP Address"
searchIpAddress: "Search IP Address"

Expand Down Expand Up @@ -3865,3 +3863,5 @@ _experience:

_hideReason:
privateNote: "This note is private."

noSendActivity: "Don't send activity"
8 changes: 4 additions & 4 deletions locales/index.d.ts
Original file line number Diff line number Diff line change
Expand Up @@ -14960,10 +14960,6 @@ export interface Locale extends ILocale {
* 配送先が選択されています
*/
"hasDeliveryTargets": string;
/**
* アクティビティを送信しない
*/
"noSendActivity": string;
};
/**
* IPアドレス
Expand Down Expand Up @@ -15055,6 +15051,10 @@ export interface Locale extends ILocale {
*/
"privateNote": string;
};
/**
* アクティビティを送信しない
*/
"noSendActivity": string;
}
declare const locales: {
[lang: string]: Locale;
Expand Down
4 changes: 2 additions & 2 deletions locales/ja-JP.yml
Original file line number Diff line number Diff line change
Expand Up @@ -3997,8 +3997,6 @@ _deliveryTargetControl:
deliveryTargetsExclude: "一部のサーバーに非公開"
hasDeliveryTargets: "配送先が選択されています"

noSendActivity: "アクティビティを送信しない"

ipAddress: "IPアドレス"
searchIpAddress: "IPアドレスを検索"

Expand Down Expand Up @@ -4026,3 +4024,5 @@ _experience:

_hideReason:
privateNote: "この投稿は非公開です"

noSendActivity: "アクティビティを送信しない"
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "cherrypick",
"version": "4.17.0-misaki",
"version": "4.17.0-misaki.1",
"basedMisskeyVersion": "2025.10.2",
"codename": "nasubi",
"repository": {
Expand Down
2 changes: 1 addition & 1 deletion packages/backend/src/server/api/endpoints/roles/users.ts
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ export default class extends Endpoint<typeof meta, typeof paramDef> { // eslint-
throw new ApiError(meta.errors.noSuchRole);
}

const query = this.queryService.makePaginationQuery(this.roleAssignmentsRepository.createQueryBuilder('assign'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
let query = this.queryService.makePaginationQuery(this.roleAssignmentsRepository.createQueryBuilder('assign'), ps.sinceId, ps.untilId, ps.sinceDate, ps.untilDate)
.andWhere('assign.roleId = :roleId', { roleId: role.id })
.andWhere(new Brackets(qb => {
qb
Expand Down
14 changes: 14 additions & 0 deletions packages/frontend/src/components/MkUrlPreview.vue
Original file line number Diff line number Diff line change
Expand Up @@ -188,6 +188,20 @@ if (requestUrl.hostname === 'music.youtube.com' && requestUrl.pathname.match('^/
requestUrl.hostname = 'www.youtube.com';
}

if (requestUrl.hostname === 'youtu.be') {
const videoId = requestUrl.pathname.slice(1);
const params = new URLSearchParams(requestUrl.search);
requestUrl.hostname = 'www.youtube.com';
requestUrl.pathname = '/watch';
requestUrl.search = '';
requestUrl.searchParams.set('v', videoId);
params.forEach((value, key) => {
if (key !== 'v') {
requestUrl.searchParams.set(key, value);
}
});
}

requestUrl.hash = '';

window.fetch(`/url?url=${encodeURIComponent(requestUrl.href)}&lang=${versatileLang}`)
Expand Down
6 changes: 3 additions & 3 deletions packages/frontend/src/utility/get-user-menu.ts
Original file line number Diff line number Diff line change
Expand Up @@ -505,11 +505,11 @@ export function getUserMenu(user: Misskey.entities.UserDetailed, router: Router
const { canceled, result: setMode } = await os.select({
title: i18n.ts.experience + ': ' + r.name,
items: [{
value: 'add', text: i18n.ts._experience._calcs.additional,
value: 'add', label: i18n.ts._experience._calcs.additional,
}, {
value: 'multiplier', text: i18n.ts._experience._calcs.multiplier,
value: 'multiplier', label: i18n.ts._experience._calcs.multiplier,
}, {
value: 'set', text: i18n.ts._experience._calcs.set,
value: 'set', label: i18n.ts._experience._calcs.set,
}],
default: 'add',
});
Expand Down
Loading