Compare commits

...

10 Commits

Author SHA1 Message Date
syuilo 234007f98c tweak 2023-11-10 17:46:21 +09:00
syuilo 65af4ae6c8 Merge branch 'develop' into pr/12274 2023-11-10 17:44:03 +09:00
ikasoba 54870d067b
aiscript-vscodeのバージョンを更新 (#12299) 2023-11-10 17:18:23 +09:00
おさむのひと 7701bf0642
「この機能が解決すべき具体的な問題またはニーズ、および誰がそれに役立つと考えているかを説明してください。」という旨の項目を追加 (#12253)
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
2023-11-10 15:08:12 +09:00
GrapeApple0 28e394eddc
fix: 投稿通知がオンでもダイレクト投稿はユーザーに通知されないように (#12263)
* fix: 投稿通知がオンでもダイレクト投稿はユーザーに通知されないように

* Update CHANGELOG.md
2023-11-09 21:35:07 +09:00
Nya Candy e2cac3d949
fix: show real instance url (#12273)
* Update CHANGELOG.md

* fix: show real instance url

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: atsuchan <83960488+atsu1125@users.noreply.github.com>
Co-authored-by: Masaya Suzuki <15100604+massongit@users.noreply.github.com>
Co-authored-by: Kagami Sascha Rosylight <saschanaz@outlook.com>
Co-authored-by: taiy <53635909+taiyme@users.noreply.github.com>
Co-authored-by: xianon <xianon@hotmail.co.jp>
Co-authored-by: kabo2468 <28654659+kabo2468@users.noreply.github.com>
Co-authored-by: YS <47836716+yszkst@users.noreply.github.com>
Co-authored-by: Khsmty <me@khsmty.com>
Co-authored-by: Soni L <EnderMoneyMod@gmail.com>
Co-authored-by: mei23 <m@m544.net>
Co-authored-by: daima3629 <52790780+daima3629@users.noreply.github.com>
Co-authored-by: Windymelt <1113940+windymelt@users.noreply.github.com>
Co-authored-by: Ebise Lutica <7106976+EbiseLutica@users.noreply.github.com>
Co-authored-by: nenohi <kimutipartylove@gmail.com>
Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: rinsuki <428rinsuki+git@gmail.com>
Co-authored-by: FineArchs <133759614+FineArchs@users.noreply.github.com>
2023-11-09 21:21:39 +09:00
おさむのひと 879f2d2b7e
ref化したnoteの変更通知がMfmコンポーネントまで到達してないのを修正 (#12282)
Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
2023-11-09 21:15:48 +09:00
syuilo b02f724475
Update CHANGELOG.md 2023-11-08 21:11:30 +09:00
zyoshoka 2834e54e78
fix(backend): make token nullable (#12280) 2023-11-08 21:10:41 +09:00
おさむのひと 828749be64
fix #12266 (#12267)
ポップアップの表示後、MkNoteとMkNoteDetailedでそれぞれが持つfocusメソッドを呼び出していたのをやめた

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
2023-11-06 19:26:17 +09:00
12 changed files with 45 additions and 23 deletions

View File

@ -9,3 +9,9 @@ body:
description: Tell us what the suggestion is
validations:
required: true
- type: textarea
attributes:
label: Purpose
description: Describe the specific problem or need you think this feature will solve, and who it will help.
validations:
required: true

View File

@ -12,6 +12,18 @@
-->
## 2023.x.x (unreleased)
### General
-
### Client
-
### Server
- Fix: トークンのないプラグインをアンインストールするときにエラーが出ないように
- Fix: 投稿通知がオンでもダイレクト投稿はユーザーに通知されないようにされました
## 2023.11.0
### Note

View File

@ -521,11 +521,13 @@ export class NoteCreateService implements OnApplicationShutdown {
followeeId: user.id,
notify: 'normal',
}).then(followings => {
for (const following of followings) {
// TODO: ワードミュート考慮
this.notificationService.createNotification(following.followerId, 'note', {
noteId: note.id,
}, user.id);
if (note.visibility !== 'specified') {
for (const following of followings) {
// TODO: ワードミュート考慮
this.notificationService.createNotification(following.followerId, 'note', {
noteId: note.id,
}, user.id);
}
}
});
}

View File

@ -18,7 +18,7 @@ export const paramDef = {
type: 'object',
properties: {
tokenId: { type: 'string', format: 'misskey:id' },
token: { type: 'string' },
token: { type: 'string', nullable: true },
},
anyOf: [
{ required: ['tokenId'] },

View File

@ -175,6 +175,7 @@ export class ClientServerService {
serverErrorImageUrl: meta.serverErrorImageUrl ?? 'https://xn--931a.moe/assets/error.jpg',
infoImageUrl: meta.infoImageUrl ?? 'https://xn--931a.moe/assets/info.jpg',
notFoundImageUrl: meta.notFoundImageUrl ?? 'https://xn--931a.moe/assets/not-found.jpg',
instanceUrl: this.config.url,
};
}

View File

@ -26,6 +26,7 @@ html
meta(name='theme-color' content= themeColor || '#86b300')
meta(name='theme-color-orig' content= themeColor || '#86b300')
meta(property='og:site_name' content= instanceName || 'Misskey')
meta(property='instance_url' content= instanceUrl)
meta(name='viewport' content='width=device-width, initial-scale=1')
link(rel='icon' href= icon || '/favicon.ico')
link(rel='apple-touch-icon' href= appleTouchIcon || '/apple-touch-icon.png')

View File

@ -29,7 +29,7 @@
"@vue/compiler-sfc": "3.3.7",
"astring": "1.8.6",
"autosize": "6.0.1",
"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.0.5",
"aiscript-vscode": "github:aiscript-dev/aiscript-vscode#v0.0.6",
"broadcast-channel": "6.0.0",
"browser-image-resizer": "github:misskey-dev/browser-image-resizer#v2.2.1-misskey.3",
"buraha": "0.0.1",

View File

@ -234,8 +234,8 @@ const clipButton = shallowRef<HTMLElement>();
let appearNote = $computed(() => isRenote ? note.renote as Misskey.entities.Note : note);
const isMyRenote = $i && ($i.id === note.userId);
const showContent = ref(false);
const parsed = appearNote.text ? mfm.parse(appearNote.text) : null;
const urls = parsed ? extractUrlFromMfm(parsed) : null;
const parsed = $computed(() => appearNote.text ? mfm.parse(appearNote.text) : null);
const urls = $computed(() => parsed ? extractUrlFromMfm(parsed) : null);
const isLong = shouldCollapsed(appearNote, urls ?? []);
const collapsed = ref(appearNote.cw == null && isLong);
const isDeleted = ref(false);
@ -304,7 +304,7 @@ function renote(viaKeyboard = false) {
const { menu } = getRenoteMenu({ note: note, renoteButton, mock: props.mock });
os.popupMenu(menu, renoteButton.value, {
viaKeyboard,
}).then(focus);
});
}
function reply(viaKeyboard = false): void {

View File

@ -350,7 +350,7 @@ function renote(viaKeyboard = false) {
const { menu } = getRenoteMenu({ note: note, renoteButton });
os.popupMenu(menu, renoteButton.value, {
viaKeyboard,
}).then(focus);
});
}
function reply(viaKeyboard = false): void {

View File

@ -5,7 +5,7 @@
import { miLocalStorage } from '@/local-storage.js';
const address = new URL(location.href);
const address = new URL(document.querySelector<HTMLMetaElement>('meta[property="instance_url"]')?.content || location.href);
const siteName = document.querySelector<HTMLMetaElement>('meta[property="og:site_name"]')?.content;
export const host = address.host;

View File

@ -179,6 +179,11 @@ function getMenu() {
},
}];
if (props.menu) {
items.unshift(null);
items = props.menu.concat(items);
}
if (props.refresher) {
items = [{
icon: 'ti ti-refresh',
@ -191,11 +196,6 @@ function getMenu() {
}, ...items];
}
if (props.menu) {
items.unshift(null);
items = props.menu.concat(items);
}
return items;
}

View File

@ -674,8 +674,8 @@ importers:
specifier: 3.3.7
version: 3.3.7
aiscript-vscode:
specifier: github:aiscript-dev/aiscript-vscode#v0.0.5
version: github.com/aiscript-dev/aiscript-vscode/a8fa5bb41885391cdb6a6e3165eaa6e4868da86e
specifier: github:aiscript-dev/aiscript-vscode#v0.0.6
version: github.com/aiscript-dev/aiscript-vscode/b5a8aa0ad927831a0b867d1c183460a14e6c48cd
astring:
specifier: 1.8.6
version: 1.8.6
@ -6931,7 +6931,7 @@ packages:
hasBin: true
peerDependencies:
'@swc/core': ^1.2.66
chokidar: 3.5.3
chokidar: ^3.5.1
peerDependenciesMeta:
chokidar:
optional: true
@ -19784,10 +19784,10 @@ packages:
readable-stream: 3.6.0
dev: false
github.com/aiscript-dev/aiscript-vscode/a8fa5bb41885391cdb6a6e3165eaa6e4868da86e:
resolution: {tarball: https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/a8fa5bb41885391cdb6a6e3165eaa6e4868da86e}
github.com/aiscript-dev/aiscript-vscode/b5a8aa0ad927831a0b867d1c183460a14e6c48cd:
resolution: {tarball: https://codeload.github.com/aiscript-dev/aiscript-vscode/tar.gz/b5a8aa0ad927831a0b867d1c183460a14e6c48cd}
name: aiscript-vscode
version: 0.0.5
version: 0.0.6
engines: {vscode: ^1.83.0}
dev: false