graphite/Sharkey
1
0
Fork 0
mirror of https://git.joinsharkey.org/Sharkey/Sharkey.git synced 2024-11-08 22:13:08 +02:00
Code Issues Projects Releases Packages Wiki Activity
26482 commits 62 branches 916 tags 154 MiB
Commit graph

26482 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Marie
20a2c17882 merge: Add missing turnstile-response (!427) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/427

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-18 14:05:25 +00:00
Moe Poi
eedd8fd698 Add missing turnstile-response 2024-02-17 19:14:38 +00:00
Amelia Yukii
7b7de4cdb3 merge: ssrf fix for our develop (!426) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/426

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-17 13:15:50 +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
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
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
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
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
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
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
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
Marie
0487d5ea4c merge: sanitise some admin-controlled HTML #406 (!413) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/413

Approved-by: Julia Johannesen <julia@insertdomain.name>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-09 17:14:58 +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
639f14f713 2024.2.0-beta.11 2024-02-09 17:10:31 +09:00
syuilo
7fc1d77893 update deps 2024-02-09 17:10:16 +09:00
syuilo
b5b31bfd5b
New Crowdin updates (#13179) 
* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (Catalan)

* New translations ja-jp.yml (German)

* New translations ja-jp.yml (Korean)

* New translations ja-jp.yml (Chinese Simplified)

* New translations ja-jp.yml (Spanish)

* New translations ja-jp.yml (Czech)

* New translations ja-jp.yml (Italian)

* New translations ja-jp.yml (Russian)

* New translations ja-jp.yml (Chinese Traditional)

* New translations ja-jp.yml (English)

* New translations ja-jp.yml (Indonesian)

* New translations ja-jp.yml (Thai)

* New translations ja-jp.yml (Japanese, Kansai)

* New translations ja-jp.yml (Catalan)
 2024-02-09 17:05:37 +09:00
dependabot[bot]
37d83df075
chore(deps): bump pnpm/action-setup from 2 to 3 (#13215) 
Bumps [pnpm/action-setup](https://github.com/pnpm/action-setup) from 2 to 3.
- [Release notes](https://github.com/pnpm/action-setup/releases)
- [Commits](https://github.com/pnpm/action-setup/compare/v2...v3)

---
updated-dependencies:
- dependency-name: pnpm/action-setup
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
 2024-02-09 17:05:25 +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
Amelia Yukii
34b4646b9f merge: fix: quote being returned as null instead of false on mastodon api (!407) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/407

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-02-06 19:49:12 +00: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
1Step621
653ca7e708
CHANGELOGを修正 (#13181) 2024-02-06 16:55:21 +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