Commit Graph

5409 Commits

Author SHA1 Message Date
Marie 10bfc61670
merge: upstream 2024-02-19 10:47:42 +01:00
Marie 764bbcf05b merge: Bridged error message for when you try search for a post and it fails (!421)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/421

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
2024-02-19 08:33:10 +00:00
Marie 6ef2d471e9 merge: fix: keep alt text of file if present (!418)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/418

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-02-19 01:27:08 +00:00
1Step621 034f47205e
Fix(frontend): オートコンプリートが出るべき状況で出ないことがあるのを修正 (#13376)
* オートコンプリートが出るべき状況で出ないことがあるのを修正

* update CHANGELOG.md
2024-02-19 08:36:06 +09:00
anatawa12 1b1046bcdb
fix: syuilo/misskey時代から使用してるサーバーが改変したバージョンだと誤判定される問題 (DB migrationで修正) (#13389) 2024-02-19 08:34:31 +09:00
anatawa12 0b636d1bf9
fix: nodeinfoにenableMcaptchaとenableTurnstileが無い (#13387) 2024-02-19 08:33:36 +09:00
Amelia Yukii ec8a7b28a8 merge: rework boost visibility #388 (!420)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/420

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
2024-02-18 16:26:07 +00:00
Moe Poi eedd8fd698 Add missing turnstile-response 2024-02-17 19:14:38 +00:00
syuilo 7562d233c5 fix of 9a70ce8f5e
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
2024-02-17 13:09:16 +00:00
tamaina 0a8ffd9cfa Merge pull request from GHSA-qqrm-9grj-6v32
* maybe ok

* fix

* test wip

* ✌️

* fix

* if (res.ok)

* validateContentTypeSetAsJsonLD

* 条件を考慮し直す

* その他の+json接尾辞が付いているメディアタイプも受け容れる

* https://github.com/misskey-dev/misskey-ghsa-qqrm-9grj-6v32/pull/1#discussion_r1490999009

* add `; profile="https://www.w3.org/ns/activitystreams"`

* application/ld+json;
2024-02-17 13:09:08 +00:00
KevinWh0 2024030ebb Added break so it doesnt prompt you per image 2024-02-17 12:55:27 +01:00
Cocoa Hoto b0030d148d
fix: allow moderators see role assigned users; fix #13301 (#13315) 2024-02-17 14:41:18 +09:00
anatawa12 b3aa793f42
chore: 通報ページのユーザをクリックした際にユーザをウィンドウで開くように (#13348)
* chore: 通報ページのユーザをクリックした際にユーザをウィンドウで開くように

* docs(changelog): 通報ページのユーザをクリックした際にユーザをウィンドウで開くように

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-17 14:28:34 +09:00
syuilo 01de1519dd fix of 9a70ce8f5e
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
2024-02-17 14:26:48 +09:00
syuilo 875069c6b0 Update package.json 2024-02-17 13:43:04 +09:00
Acid Chicken (硫酸鶏) acba96c1d3
feat: license violation protection (#13285)
* spec(frontend): aboutページにリポジトリ・フィードバックのURLを表示させる

Cherry-picked from MisskeyIO#441
Cherry-picked from MisskeyIO#438

* feat: license violation protection

* build: fix typo

* build: fix typo

* fix: farewell to the static type land

* fix: key typo

* fix: import typo

* fix: properly interpret `prominently`

* docs: add disclaimer

* docs: update CHANGELOG

* chore: add gap

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-17 13:34:50 +09:00
anatawa12 fa243276c5
feat: add link to local note in initial comment of abuse note (#13347)
* feat: add link to local note in initial comment of abuse note

* docs(changelog): ノートの通報時にリモートのノートであっても自インスタンスにおけるノートのリンクを含むように
2024-02-17 12:43:39 +09:00
tamaina 9a70ce8f5e
Merge pull request from GHSA-qqrm-9grj-6v32
* maybe ok

* fix

* test wip

* ✌️

* fix

* if (res.ok)

* validateContentTypeSetAsJsonLD

* 条件を考慮し直す

* その他の+json接尾辞が付いているメディアタイプも受け容れる

* https://github.com/misskey-dev/misskey-ghsa-qqrm-9grj-6v32/pull/1#discussion_r1490999009

* add `; profile="https://www.w3.org/ns/activitystreams"`

* application/ld+json;
2024-02-17 12:41:19 +09:00
KevinWh0 c6e29f6882 Cleaned up some code 2024-02-17 01:28:55 +01:00
KevinWh0 11cb134d4d It works, Just figuring out some ts errors hopefully 2024-02-16 21:53:27 +01:00
KevinWh0 6240f78c83 Seemed to have fixed it 2024-02-16 19:01:54 +01:00
tamaina 8c1a582348 2024.2.0-beta.13 2024-02-16 15:04:12 +00:00
dakkar aa72db76c4 rework boost visibility #388
* only show allowed visibilities
* "local only" is a switch

notice that the backend will limit the visibility, too
2024-02-16 13:26:13 +00:00
zyoshoka 37959bab1d
refactor(backend): remove/replace deprecated type deps (#13252) 2024-02-16 20:09:07 +09:00
dakkar b5cfd92e2b point default repo/feedback URLs to our repos
the migration will update instances that have the old defaults, too
2024-02-16 10:54:33 +00:00
かっこかり 5e317eac8c
fix misskey-js version 2024-02-16 19:17:37 +09:00
taiy 860e8bb5d8
fix(frontend/pageMetadata): ページタイトルが更新されない問題 (#13289)
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-16 16:17:09 +09:00
かっこかり f5459a25df
fix(frontend): vue v3.4.16以降でタイムラインが正常に表示できない問題を修正 (#13248)
* fix(frontend): vue v3.4.16でタイムラインが正常に表示できない問題を修正

* type

* Revert "fix: downgrade vue to 3.4.15"

This reverts commit e12369ac13.

* Update pnpm-lock.yaml

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
2024-02-16 15:39:48 +09:00
syuilo f8ac072bc3 fix type 2024-02-16 15:19:55 +09:00
syuilo 7cfe7da73d fix 2024-02-16 15:09:05 +09:00
syuilo f55e1ee138 refactor(backend): misc/cacheをシンプルな実装に戻した 2024-02-16 15:07:12 +09:00
MeiMei cfa573a3a1
リモートユーザーが復活してもキャッシュにより該当ユーザーのActivityが受け入れられないのを修正 Fix #13273 (#13275)
* リモートユーザーが復活してもキャッシュにより該当ユーザーのActivityが受け入れられないのを修正 Fix #13273

* CHAGELOG

* Use Redis event

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2024-02-16 14:30:53 +09:00
zyoshoka 40bbae3d6c
fix(backend): add missing schemas and fix incorrect schemas (#13295)
* fix(backend): add missing schemas and fix incorrect schemas

* fix: ci

* fix: ci (本命)

* fix: run `pnpm build-misskey-js-with-types`

* fix: typos

* fix: role-condition-formula-value contains `id`

* fix: incorrect schema
2024-02-16 14:27:33 +09:00
Kisaragi 147e8f1e3e
feat(backend): likeOnlyなどでハートにフォールバックする際異体字セレクタがない方に揃える (#13299)
* feat(backend): likeOnlyなどでハートにフォールバックする際異体字セレクタがない方に揃える

close #13298

* Update ReactionService.ts

* chore(backend): prefer single quote for string literal
2024-02-16 14:25:48 +09:00
Amelia Yukii be36a793cd merge: Fix Note Edits being federated incorrectly (!417)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/417

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-02-15 22:18:58 +00:00
Acid Chicken (硫酸鶏) b8800b8b95
build: upgrade Storybook to 8 beta (#13297)
* chore: upgrade Storybook to 8

* ci: restore Storybook workflow

* build: createRequire

* ci: TurboSnap life extension
2024-02-14 18:48:25 +09:00
Acid Chicken (硫酸鶏) 19e3753202
fix: TypeAssertionExpression breaks Storybook builds 2024-02-14 13:56:13 +09:00
taiy b82821074b
fix(frontend): エラーページのトラブルシューティングがリンク切れしている問題 (#176) (#13288) 2024-02-14 13:10:36 +09:00
Marie 8f6dfa611e fix: keep alt text of file if present 2024-02-13 22:01:53 +00:00
Marie 8b90c6c045 merge: Never return broken notifications #409 (!415)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/415

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-02-13 18:23:37 +00:00
tamaina c1514ce91d (re) update SPDX-FileCopyrightText
Fix  #13290
2024-02-13 15:59:27 +00:00
tamaina 311c2172d7 Revert "update SPDX-FileCopyrightText"
This reverts commit 9b5aeb76d8.
2024-02-13 15:50:11 +00:00
dakkar 1015901a9d avoid parsing undefined
I don't understand why upstream wouldn't have this same problem ☹

We already have this same conditional in `ApRenderService.renderNote`
and `ApRenderService.renderUpNote`, and Misskey doesn't
2024-02-13 14:04:07 +00:00
Marie fef5dbb6e2 fix: note edits being federated incorrectly 2024-02-13 13:08:44 +00:00
Marie 0f1fc41632 merge: allow disabling achievement notifications #319 (!412)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/412

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-02-13 09:19:22 +00:00
Acid Chicken (硫酸鶏) 309a943528
perf: omit search for immutable static requests (#13265)
* perf: omit search for immutable static requests

* perf: also applies to /files

* fix: exclude /proxy

* /files/:key/*を301 redirectに

---------

Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2024-02-13 10:43:06 +09:00
Marie 4007fbb8d8 merge: Merge Upstream Changes (!408)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/408

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
2024-02-12 23:14:55 +00:00
tamaina 32c5c43b6d
enhance: 禁止ワードはリモートノートも対象に (#13280)
Resolve #13279
2024-02-13 04:54:01 +09:00
tamaina e12369ac13 fix: downgrade vue to 3.4.15 2024-02-12 19:16:44 +00:00
Kisaragi b95e25004f
refactor(msjs): avoid any (part 1) (#13247)
* refactor(msjs): avoid any

* run api extractor

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: kakkokari-gtyih <daisho7308+f@gmail.com>
2024-02-12 11:38:16 +09:00
syuilo a1e12c0ec3 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-02-12 11:37:55 +09:00
syuilo 9b5aeb76d8 update SPDX-FileCopyrightText 2024-02-12 11:37:45 +09:00
Acid Chicken (硫酸鶏) 3dc095d1c9
feat: provide tarball (#13260)
* feat: provide tarball

* build: pack on build-assets

* chore: use ignore-walk

* chore: debug

* build: dependencies
2024-02-12 10:02:27 +09:00
dakkar 421f8d49e5 Never return broken notifications #409
Since notifications are stored in Redis, we can't expect relational
integrity: deleting a user will *not* delete notifications that
mention it.

But if we return notifications with missing bits (a `follow` without a
`user`, for example), the frontend will get very confused and throw an
exception while trying to render them.

This change makes sure we never expose those broken notifications. For
uniformity, I've applied the same logic to notes and roles mentioned
in notifications, even if nobody reported breakage in those cases.

Tested by creating a few types of notifications with a `notifierId`,
then deleting their user.
2024-02-11 12:25:50 +00:00
syuilo 674fd0bdd0 Update about-misskey.vue 2024-02-11 21:05:34 +09:00
Marie 2e7df3297c
fix: diff between NoteCreateService and NoteEditService 2024-02-09 19:51:41 +01:00
Marie 48c1f94dc5
fix: downgrade vue 2024-02-09 19:39:58 +01:00
Marie 85355813ad
merge: latest changes 2024-02-09 19:22:06 +01:00
Marie 2d125137a5 merge: fix: Update l-sushi.json5 to ensure the hashtag colour matches the main accent colour (!406)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/406

Approved-by: Marie <marie@kaifa.ch>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-02-09 17:45:22 +00:00
dakkar b029738ec0 sanitise some admin-controlled HTML #406
this protects from rogue admins injecting bad HTML in
rules/descriptions
2024-02-09 12:19:19 +00:00
dakkar 7e05e4c0d9 allow disabling achievement notifications #319
This is currently the only configurable notification type that can
only be set to "all" or "none", all the others allow filtering by
sender user, so I had to tweak the drop-down

This opens the way to also eaisly make `note`, `roleAssigned` and
`followRequestAccepted` configurable.

Tested using the API console and sending requests to
`i/claim-achievement`. When the setting was "all", the achievement was
notified and it appeared in `/my/achievements`; when the setting was
"none", the achievement only appeared in `/my/achievements` but no
notification was generated.
2024-02-09 11:34:44 +00:00
かっこかり 7a8cf274ca
fix misskey-js version 2024-02-09 18:08:08 +09:00
syuilo 7fc1d77893 update deps 2024-02-09 17:10:16 +09:00
syuilo c23c97d303 perf(frontend): splash screenのdomが消えない場合があるのを修正
https://github.com/misskey-dev/misskey/issues/10805
2024-02-09 16:25:58 +09:00
おさむのひと 614c9a0fc6
fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加 (#13210)
* fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加

* Serviceでチェックするように変更
2024-02-09 10:07:18 +09:00
tamaina c0cb76f0ec chore: use vite@5.1.0 / pnpm@8.15.1 2024-02-08 17:24:51 +00:00
かっこかり d40612ac52
fix(frontend): aiscriptのコードブロックでのハイライト指定を修正 (#13208) 2024-02-09 00:08:33 +09:00
かっこかり 0f7918c51b
refactor(backend): exist -> exists (#13203)
* refactor(backend): exist -> exists

* fix
2024-02-08 16:04:41 +09:00
かっこかり 90b633b5a6
fix(frontend) misskey-js type (#13202) 2024-02-08 14:15:56 +09:00
zyoshoka 5299d17060
test(frontend): migrate MSW in Storybook to v2 (#13195) 2024-02-08 13:28:49 +09:00
MeiMei 82c34f7f45
Fix: Summaly proxy利用時にプレイヤーが動作しないことがあるのを修正 (#13196)
* Fix: Summaly proxy利用時にプレイヤーが動作しないことがあるのを修正

* CHANGELOG
2024-02-08 13:16:22 +09:00
Marie af5ebdfced
merge: more upstream changes 2024-02-07 21:52:27 +01:00
syuilo 52bf808d89 typo 2024-02-07 20:52:23 +09:00
かっこかり 155896a851
enhance(frontend/HorizontalSwipe): 操作性の改善 (#13038)
* Update swipe thresholds and touch-action

* スワイプ中にPullToRefreshが反応しないように

* 横スワイプに関与する可能性のある要素がある場合はスワイプを発火しないように

* update threshold

* isSwipingを外部化

* rename

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2024-02-07 20:02:29 +09:00
MeiMei 313ce82192
正しい 2024.2.0-beta.10 改版手順? (#13173)
* 正しい 2024.2.0-beta.10 改版手順?

* run build-misskey-js-with-types
2024-02-07 19:59:06 +09:00
1Step621 56d7f58626
Fix(frontend): MkCodeEditorで行がずれていくのを修正 (#13188)
* MkCodeEditorで行がずれていくのを修正

* update CHANGELOG.md
2024-02-07 19:58:21 +09:00
MeiMei e89d760240
Enhance: 連合向けのノート配信を軽量化 (#13192)
* AP HTML表現をシンプルに

* a

* CHANGELOG

* リンク
2024-02-07 19:57:59 +09:00
Marie 1fa347390a
fix: add missing diff between SkNote* and MkNote* 2024-02-06 21:27:42 +01:00
Marie 6a94a52131
merge: upstream 2024-02-06 21:23:37 +01:00
おさむのひと c81b61eb2e
fix(misskey-js): 自動生成物の冒頭からバージョンと日付を削除 (#13185) 2024-02-06 21:03:29 +09:00
かっこかり 500ea793b3
fix(bubble-game): 共有用画像のコメントにnullが入る問題を修正 (#13183) 2024-02-06 19:24:52 +09:00
Kisaragi 93e711d8a9
chore(frontend): reword possible typo (#13182) 2024-02-06 17:17:52 +09:00
MeiMei d6cb68b091
AP Key の JSON-LD 表現を修正 (#13170) 2024-02-06 16:51:14 +09:00
かっこかり 6829ecb509
enhance(frontend): リモートへの引用リノートと同一のリンクにはリンクプレビューを表示しないように (#13178)
* enhance(frontend): リモートへの引用リノートと同一のリンクにはリンクプレビューを表示しないように

* Update Changelog

---------

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2024-02-06 16:49:57 +09:00
Soli 4bf3974abd
fix(frontend): エラー画像URLを設定した後解除すると,デフォルトの画像が表示されない問題の修正 (#13172)
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
2024-02-06 16:47:17 +09:00
1Step621 74245df382
Enhance(frontend): フロント側でもリアクション権限のチェックをするように (#13134)
* フロント側でもリアクション権限のチェックをするように

* update CHANGELOG.md

* lint fixes

* remove unrelated diffs

* deny -> reject
denyは「(信用しないことを理由に)拒否する」という意味らしい

* allow -> accept

* EmojiSimpleにlocalOnlyを含めるように

* リアクション権限のない絵文字は打てないように(ダイアログを出すのではなく)

* regenerate type definitions

* lint fix

* remove unused locales

* remove unnecessary async
2024-02-06 16:45:21 +09:00
かっこかり edb39a089d
enhance(frontend): KeepAliveのページキャッシュを削除できるように (#13180)
* enhance(frontend): 内部のページキャッシュを削除できるように

* Update Changelog
2024-02-06 16:26:03 +09:00
かっこかり 16eccad492
enhance(frontend): シンタックスハイライトにテーマを適用できるように (#13175)
* enhance(frontend): シンタックスハイライトにテーマを適用できるように

* Update Changelog

* こっちも

* テーマの値がディープマージされるように

* 常にテーマ設定に準じるように

* テーマ更新時に新しいshikiテーマを読み込むように
2024-02-06 15:03:07 +09:00
Marie 0aadc302c3 fix: quote being returned as null instead of false on mastodon api 2024-02-05 19:38:00 +00:00
Susan S a26ac74bf0 Update l-sushi.json5 to ensure the hashtag colour matches the main accent colour 2024-02-05 14:39:01 +00:00
Amelia Yukii 31a74dc591 merge: upd: shorten navbars to save space on mobile (!404)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/404

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
2024-02-05 11:55:01 +00:00
blueb 9b0d078fba upd: replace pencil icon, widget icon 2024-02-05 06:39:15 -05:00
blueb 327d4b3e88 upd: shorten navbars to save space on mobile 2024-02-05 06:27:29 -05:00
zyoshoka 0df069494e
refactor(frontend): `os.popup()`の`events`の型チェックを有効化 (#13165) 2024-02-05 15:02:30 +09:00
taichan ddfc3b8a6a
Fix(frontend): クロップ後の解像度が異様に低くなる問題の修正&クロップに失敗する問題&コメントにnullという文字列が入る問題の修正 (#13162)
* Fix(frontend): Fix resolution of cropped image (misskey-dev#11489)

* CHANGELOG

* Fix(frontend): クロップの際、folderIdがnullだと文字列のnullが送られ検索できない問題

* Fix: キャプションが存在しないときにクロップすると'null'がキャプションに入ってしまう問題 (misskey-dev#11813)

* Update CHANGELOG
2024-02-05 15:01:31 +09:00
syuilo 03351cec0c update patrons 2024-02-05 11:03:12 +09:00
ShittyKopper 27ce301f45 fix: reply hover effect 2024-02-04 16:42:43 +03:00
ShittyKopper 592f77371f upd: rename SkNoteSub property 2024-02-04 15:21:57 +03:00
ShittyKopper 3107345d3c fix: local instance ticker bug that fails to render notes in dev mode 2024-02-04 15:21:57 +03:00
ShittyKopper 5ef8e3123b upd: only enable hover effect on SkNoteDetailed and replies 2024-02-04 15:21:57 +03:00