HoovesSocial/hippofish
2
0
Fork 0
Code Issues 3 Pull requests 1 Projects Releases Packages Wiki Activity Actions
27936 commits 62 branches 1619 tags 544 MiB
Commit graph

997 commits

Author SHA1 Message Date
dakkar
b2cbd507fe Merge branch 'develop' into future-2024-05-31 2024-06-13 09:06:24 +01:00
Marie
4a9260a432 upd: seperate H2/H3 into own case 2024-06-08 18:53:42 +00:00
Marie
0c3690a8ba upd: bold some Header tags 2024-06-08 18:00:29 +00:00
dakkar
11af7e6587 fix indents 2024-06-08 16:57:17 +01:00
dakkar
5dc8c2827c Merge branch 'develop' into future-2024-05-31 2024-06-08 16:45:53 +01:00
おさむのひと
61fae45390
feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする (#13758) 
* feat: 通報を受けた際にメールまたはWebhookで通知を送出出来るようにする

* モデログに対応＆エンドポイントを単一オブジェクトでのサポートに変更（API経由で大量に作るシチュエーションもないと思うので）

* fix spdx

* fix migration

* fix migration

* fix models

* add e2e webhook

* tweak

* fix modlog

* fix bugs

* add tests and fix bugs

* add tests and fix bugs

* add tests

* fix path

* regenerate locale

* 混入除去

* 混入除去

* add abuseReportResolved

* fix pnpm-lock.yaml

* add abuseReportResolved test

* fix bugs

* fix ui

* add tests

* fix CHANGELOG.md

* add tests

* add RoleService.getModeratorIds tests

* WebhookServiceをUserとSystemに分割

* fix CHANGELOG.md

* fix test

* insertOneを使う用に

* fix

* regenerate locales

* revert version

* separate webhook job queue

* fix

* 🎨

* Update QueueProcessorService.ts

---------

Co-authored-by: osamu <46447427+sam-osamu@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-06-08 15:34:19 +09:00
taichan
00157864e9
fix(backend): チャート生成時にinstance.isSuspendedが読まれてしまう問題の修正 (#13951) 
* fix(backend): use sustensionState instead of isSuspended

* Update CHANGELOG.md
 2024-06-07 09:00:01 +09:00
syuilo
dbf9e1194b refactor(backend): remove unused logger option 2024-06-06 10:01:50 +09:00
Marie
b2088e60b7 merge: use the current resolver for quotes - #524 (!536) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/536

Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
Approved-by: Marie <marie@kaifa.ch>
 2024-06-03 16:54:51 +00:00
Amelia Yukii
23b1c29a0b merge: allow setting separate timeout / max size for imports - fixes #479 (!519) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/519

Closes #479

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-06-03 16:29:19 +00:00
dakkar
082e1d1afb allow setting separate timeout / max size for imports - fixes #479 2024-06-03 16:29:19 +00:00
Acid Chicken
2b8056a852
fix(backend): use insertOne insteadof insert/findOneOrFail combination (#13908) 
* fix(backend): use insertOne insteadof insert/findOneOrFail combination

* fix: typo

* fix(backend): inherit mainAlias?

* refactor(backend): use extend

* fix(backend): invalid entityTarget

* fix(backend): fake where

* chore: debug

* chore: debug

* test: log

* fix(backend): column names

* fix(backend): remove dummy from

* revert: log

* fix(backend): position

* fix(backend): automatic aliasing

* chore(backend): alias

* chore(backend): remove from

* fix(backend): type

* fix(backend): avoid pure name

* test(backend): fix type

* chore(backend): use cte

* fix(backend): avoid useless alias

* fix(backend): fix typo

* fix(backend): __disambiguation__

* fix(backend): quote

* chore(backend): t

* chore(backend): accessible

* chore(backend): concrete returning

* fix(backend): quote

* chore: log more

* chore: log metadata

* chore(backend): use raw

* fix(backend): returning column name

* fix(backend): transform

* build(backend): wanna logging

* build(backend): transform empty

* build(backend): build alias

* build(backend): restore name

* chore: return entity

* fix: test case

* test(backend): 204

* chore(backend): log sql

* chore(backend): assert user joined

* fix(backend): typo

* chore(backend): log long sql

* chore(backend): log join

* chore(backend): log join depth null

* chore(backend): joinAttributes

* chore(backend): override createJoinExpression

* chore: join log

* fix(backend): escape

* test(backend): log log

* chore(backend): join gonna success?

* chore(backend): relations

* chore(backend): undefined

* chore(backend): target

* chore(backend): remove log

* chore(backend): log chart update

* chore(backend): log columns

* chore(backend): check hasMetadata

* chore(backend): unshift id when not included

* chore(backend): missing select

* chore(backend): remove debug code
 2024-06-01 11:16:44 +09:00
Marie
86ccbd9487 merge: Fix/fixing mastodon api search mfm (!532) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/532

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-31 18:32:51 +00:00
dakkar
38ff7fa3e5 *probably* fix FederationChart re: suspended instances 
this is a misskey bug, they'll probably fix it soon, hopefully the
same way
 2024-05-31 13:31:49 +01:00
dakkar
bf710428eb various fixes after the merge 2024-05-31 12:55:53 +01:00
dakkar
326b2c254a copy upstream NoteCreateService changes to NoteEditService 2024-05-31 12:32:31 +01:00
dakkar
3372e0ffe1 Merge remote-tracking branch 'misskey/release/2024.5.0' into future 2024-05-31 12:26:07 +01:00
dakkar
7b630b48b5 Merge branch 'develop' into future 2024-05-31 11:43:09 +01:00
dakkar
11aac8253d merge: look inside url when checking activity origin - #512 (!521) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/521

Closes #512

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-05-31 10:37:54 +00:00
dakkar
ad8d916775 minimal fixes, thanks tests 2024-05-31 11:36:47 +01:00
dakkar
4ddee7b01e Merge branch 'develop' into future 2024-05-31 11:24:00 +01:00
KevinWh0
1656c02536 renamed toMastoHtml to toMastoApiHtml to clear up what it does 2024-05-31 12:21:25 +02:00
KevinWh0
145c4ba132 fixed the search url 2024-05-31 12:19:18 +02:00
zyoshoka
514a65e453
perf(backend): avoid N+1 selects from user table when packing many entities (#13911) 
* perf(backend): avoid N+1 selects from `user` table when packing many entities

* perf(backend): use `packMany` instead of mapping to `pack`
 2024-05-31 15:32:42 +09:00
syuilo
5b8f8e7087 fix(backend): fix backward compatibility of antenna 2024-05-31 11:24:17 +09:00
syuilo
be11fd7508 enhance: サーバーのお問い合わせ先URLを設定できるように 2024-05-31 10:12:23 +09:00
Marie
9bde071f42 merge: feat: send edit events to servers that interacted (!515) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/515

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-05-30 19:16:10 +00:00
Amelia Yukii
55fc2879f3 merge: set the correct "marked an NSFW" when loading admin-user (!483) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/483

Approved-by: Marie <marie@kaifa.ch>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-05-30 14:22:00 +00:00
dakkar
3050dcbef7 set the correct "marked an NSFW" when loading admin-user 2024-05-30 14:22:00 +00:00
dakkar
dc0bd3c2ee merge: feat: allow using wildcards in antenna (!114) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/114

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Leah <kevinlukej@gmail.com>
 2024-05-30 09:14:21 +00:00
Kisaragi
cf670e8a3d
refactor(backend): avoid as any on CustomEmojiService.ts (#13903) 2024-05-29 07:12:50 +09:00
Kisaragi
e57ce4fa0f
chore(backend): rename local variable (#13904) 
much -> matched
 2024-05-29 07:12:20 +09:00
Kisaragi
44cafbb9f2
refactor: avoid as any[] on FetchInstanceMetadataService.ts (#13905) 
* refactor: avoid `as any[]` on FetchInstanceMetadataService.ts

* apply suggestion

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-05-29 07:11:29 +09:00
tamaina
89b27d8587
fix(federation): InboxにきたCreate, AnnounceのobjectがBearcaps urlだった際はスキップするように (#13610) 
* fix(federation): AnnounceのobjectがLike出なかったらキューにためない
Fix https://github.com/misskey-dev/misskey/issues/13552

* revert

* better reason handlings

* result

* improve announce handling

* skip bearcaps

* also announce
 2024-05-28 14:36:06 +09:00
anatawa12
4579be0f54
新着ノートをサウンドで通知する機能をdeck UIに追加 (#13867) 
* feat(deck-ui): implement note notification

* chore: remove notify in antenna

* docs(changelog): 新着ノートをサウンドで通知する機能をdeck UIに追加

* fix: type error in test

* lint: key order

* fix: remove notify column

* test: remove test for notify

* chore: make sound selectable

* fix: add license header

* fix: add license header again

* Unnecessary await

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

* ファイルを選択してください -> ファイルが選択されていません

* fix: i18n忘れ

* fix: i18n忘れ

* pleaseSelectFile > fileNotSelected

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
 2024-05-27 20:54:53 +09:00
anatawa12
a7a8dc4dbb
もともとセンシティブではないと連合されていたファイルがセンシティブとして連合された場合にセンシティブとしてそのファイルを扱うように (#13879) 
* feat(backend): mark an file as sensitive if the file was newly federated as sensitive

* docs(changelog): もともとセンシティブではないと連合されていたファイルがセンシティブとして連合された場合にセンシティブとしてそのファイルを扱うように

* fix: change way to update federated image

* Update packages/backend/src/core/DriveService.ts

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>

* update isSensitive of existing record object

---------

Co-authored-by: Sayamame-beans <61457993+Sayamame-beans@users.noreply.github.com>
 2024-05-27 20:12:25 +09:00
かっこかり
3ffbf6296f
feat: 個別のお知らせにリンクで飛べるように (#13885) 
* feat(announcement): 個別のお知らせにリンクで飛べるように (MisskeyIO#639)

(cherry picked from commit f6bf7f992a78e54d86a4701dbd1e4fda7ef4eb27)

* fix

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>

* fix

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>

* 一覧ページではお知らせpanel全体を押せるように

* お知らせバーは個別ページに飛ばすように

* Update Changelog

* spdx

* attempt to fox test

* remove unnecessary thong

* `announcement` → `announcements/show`

* リンクを押せる場所をタイトルと日付部分のみに変更

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-05-27 17:15:11 +09:00
anatawa12
83a9aa4533
feat: suspend instance improvements (#13861) 
* feat(backend): dead instance detection

* feat(backend): suspend type detection

* feat(frontend): show suspend reason on frontend

* feat(backend): resume federation automatically if the server is automatically suspended

* docs(changelog): 配信停止まわりの改善

* lint: fix lint errors

* Update packages/frontend/src/pages/instance-info.vue

* lint: fix lint error

* chore: suspendedState => suspensionState

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-05-23 15:55:47 +09:00
anatawa12
f6df94070b
Exclude channel notes from featured polls (#13838) 
* feat(backend): add `channelId` to `MiPoll` as a Denormalized field

* feat(backend): option to exclude polls in channels

* chore: exclude channel notes from featured polls

* docs(changelog): みつけるのアンケート欄にてチャンネルのアンケートが含まれてしまう問題を修正

* fix: missing license header
 2024-05-20 18:08:20 +09:00
anatawa12
acf84a2516
FTTが有効かつsinceIdのみを指定した場合に帰って来るレスポンスが逆順である問題を修正 (#13837) 
* fix: FTTが有効かつsinceIdのみを指定した場合に帰って来るレスポンスが逆順である問題

* docs(changelog): FTTが有効かつsinceIdのみを指定した場合に帰って来るレスポンスが逆順である問題を修正
 2024-05-20 08:28:28 +09:00
dakkar
c05cc63e24 look inside url when checking activity origin - #512 
The previous assertion that:

> if it's a complicated thing and the `activity.id` doesn't match, I
> think we're fine rejecting the activity

was wrong: at least peertube sends activities that have `url` as an
array of objects.

Notice that this does *not*, in fact, fix #512: the peertube activity
does not contain its short URL (`https://example.com/w/someid`), so
there's no way to confirm that it is the activity we requested.
 2024-05-18 16:48:10 +01:00
dakkar
2d89b08a08 use the current resolver for quotes - #524 
this might solve the loop problem, if the protection already in place
for replies was enough
 2024-05-15 16:47:06 +01:00
dakkar
42d9da161b first basic protection - #524 2024-05-14 16:58:06 +01:00
dakkar
4e28004d0e copy changes from createNote to updateNote 2024-05-11 14:21:17 +01:00
dakkar
451b0ecc9b Merge remote-tracking branch 'misskey/release/2024.5.0' into future-2024-04-25-post 2024-05-11 14:13:07 +01:00
dakkar
30bd7768d6 Merge branch 'develop' into future-2024-04-25-post 2024-05-11 13:11:07 +01:00
Sugar
194d8a5527 feat: send edit events to servers that interacted 
a server replied to, renoted or reacted to a note knows about a note,
and as such it should get notified about it being edited.

this matches similar logic in mastodon.
 2024-05-11 09:44:03 +02:00
おさむのひと
f6af6d9679
fix(backend): UserEntityService.getRelationsの取得処理を軽量化 (#13811) 
* fix(backend): UserEntityService.getRelationsの取得処理を軽量化

* rollback
 2024-05-10 15:33:25 +09:00
おさむのひと
b298897bde
fix(backend): 不要なUserProfileの取得を修正 (#13812) 
* fix(backend): 不要なuserProfileの取得を修正

* fix: pnpm@9.0.6 to pnpm@9.1.0

* Revert "fix: pnpm@9.0.6 to pnpm@9.1.0"

This reverts commit eaf265ec2cf255cadeaa516d5b668134bc397211.
 2024-05-10 15:32:23 +09:00
dakkar
cd5686f9ab fix spacing 2024-05-09 17:37:22 +01:00
dakkar
89f412c696 merge: Send default reactions as Like activities to Iceshrimp.NET instances (!505) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/505

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-09 07:59:46 +00:00
Ember
ed91663672 merge: don't count "system" local accounts in user chart - fixes #451 (!500) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/500

Closes #451

Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-07 20:17:54 +00:00
dakkar
89f4f0e5f4 don't count "system" local accounts in user chart - fixes #451 2024-05-07 20:17:53 +00:00
Ember
58ff225c4e merge: really edit notes in more cases - fixes #424 (!504) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/504

Closes #424

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Ember <acomputerdog@gmail.com>
 2024-05-07 20:16:39 +00:00
dakkar
eab690a5e3 really edit notes in more cases - fixes #424 2024-05-07 20:16:38 +00:00
Tess K
5e20de45d7 merge: Compact LD-signed activities against well-known context (!503) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/503

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Tess K <me@thvxl.se>
 2024-05-04 17:19:42 +00:00
syuilo
2b21c19362
update deps (#13624) 
* update deps

* Update package.json

* update deps

* build: pass --strip-leading-paths to restore 0.2.x behavior (#13684)

* ✌️

* ✌️

* pureimageの代わりに@napi-rs/canvasを使う (#13748)

* pureimageの代わりに@napi-rs/canvasを使う

* remove writestream

* remove createtemp

* wip

* Update ClientServerService.ts

* update pnpm to 9.x

* update deps

* re: update pnpm to 9.x

* update node

* ✌️

---------

Co-authored-by: anatawa12 <anatawa12@icloud.com>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
 2024-05-04 20:56:14 +09:00
Essem
f843bf6c17
fix: Add unicode flag to custom emoji regexes 2024-05-03 11:48:00 -05:00
dakkar
d0a2708f91 merge: handle non-ASCII emoji names (!464) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/464

Approved-by: Leah <kevinlukej@gmail.com>
Approved-by: Ember <acomputerdog@gmail.com>
Approved-by: Marie <marie@kaifa.ch>
 2024-05-02 21:06:10 +00:00
ShittyKopper
e333283905 Send default reactions as Like activities to Iceshrimp.NET instances 2024-05-02 02:37:59 +03:00
dakkar
45182c17e2 fix imports 2024-05-01 17:41:33 +01:00
Kisaragi
c530a46e54
enhance(backend): ドライブのファイルがNSFWかどうか個別に連合されるように (#13756) 
* fix(backend): ノートのattachmentにおいて、attach.sensitiveが元から存在する場合はそれを尊重する

* docs: update changelog (per misskey-dev#13756)

* feat(backend,apub): renderDocumentがsensitiveを連合するようにする
per https://github.com/misskey-dev/misskey/issues/13755#issuecomment-2081303014

* chore(backend): 追加したコメントを削除

* docs: changelogをより丁寧にする

* docs: changelogの項目名をPRに合わせる

* docs: tweak

apply suggestion from mei23
 2024-05-01 17:13:20 +09:00
Daiki Mizukami
d2a5bb39e3
Merge pull request from GHSA-2vxv-pv3m-3wvj 
* fix: normalize incoming signed activities

* Tweak style

* Update CHANGELOG.md

* Log compacted activity as well

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-05-01 16:33:58 +09:00
dakkar
6ae01e28aa Compact LD-signed activities against well-known context 
This should defend against some spoofing attacks, see also
https://nvd.nist.gov/vuln/detail/CVE-2022-24307 for Mastodon,
febb499fcb
from Iceshrimp and
e790d6be90
for Firefish

Thanks to @tesaguri@fedibird.com for reporting and providing the patch.
 2024-04-30 10:16:57 +01:00
MeiMei
c7d7da8fc5
AP Link等は添付ファイル扱いしないようになど (#13754) 
* Linkは添付ファイルではない

* CHANGELOG
 2024-04-28 10:53:33 +09:00
anatawa12
fe1172fbb6
fix: ハイフンを含むリモート絵文字が描画されない (#13715) 2024-04-27 20:41:55 +09:00
ikasoba
20eb4bc296
Fix(backend): ActivityPubでのHTMLへのシリアライズを修正 (#13752) 
* devモードでもActivityPub系エンドポイントへアクセスできるように

* ActivityPubでのHTMLのシリアライズを修正

* ハードコードしていたurlを`httpUrl`へ修正

* テストの追加
 2024-04-27 20:26:55 +09:00
dakkar
7606bce362 sync NoteEditService from NoteCreateService 2024-04-25 11:44:24 +01:00
dakkar
183cf962a0 sync NoteCreateService.create with .import 
again, git merged on the wrong function
 2024-04-25 11:44:24 +01:00
dakkar
4fe8a26081 Merge remote-tracking branch 'misskey/develop' into future-2024-04-25 2024-04-25 11:44:24 +01:00
dakkar
0f3764ff71 teach ReactionService about non-ASCII emoji names 2024-04-23 14:42:02 +01:00
anatawa12
f9aed8f2bf
fix: 正規化されていない状態のhashtagが連合されてきたhtmlに含まれているとhashtagが正しくhashtagに復元されない問題を修正 (#13733) 2024-04-19 19:42:01 +09:00
おさむのひと
cd7f7271ca
enhance: 新しいコンディショナルロール条件の実装 (#13732) 
* enhance: 新しいコンディショナルロールの実装

* fix: CHANGELOG.md
 2024-04-19 15:22:23 +09:00
anatawa12
e423b8ce4b
細かいミュートの処理の修正 (#13695) 
* fix: some replies are removed from global timeline

* refactor: 各チャンネルのミュートとブロックの処理をまとめる

* fix: リノートをミュートでその人のノートのリノートをミュートしていたを修正

* refactor: isPureRenotePackedを他のところでも使う

* docs(changelog): CHANGELOGを更新

* test: withReplies = falseでフォローしてる人によるリプライが流れてくる

* test: ノートミュートしているユーザーの通常ノートのリノートが流れてくる/含まれる
 2024-04-17 14:23:41 +09:00
かっこかり
bba3097765
enhance: クリップのノート数を表示するように (#13686) 
* enhance: クリップのノート数を表示できるように

* Update Changelog
 2024-04-14 21:30:24 +09:00
zyoshoka
8c5d9a6295
fix(backend): incorrect logic for determining whether Quote or not (#13700) 
* fix(backend): incorrect logic for determining whether Quote or not

* Update CHANGELOG.md

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-04-14 10:23:48 +09:00
dakkar
a3b4ca782a Merge remote-tracking branch 'misskey/develop' into future-2024-04-10 2024-04-11 13:39:55 +01:00
dakkar
a58f4a6fed Merge branch 'develop' into future-2024-03-23-post 2024-04-11 13:22:57 +01:00
zyoshoka
959cc8ff37
refactor(general): use Date.now() instead of creating a new Date instance (#13671) 2024-04-07 21:14:13 +09:00
かっこかり
efafa02f68
enhance(backend): ビデオファイルにビデオトラックがあるかを確認するように (#13568) 
* enhance(backend): ビデオファイルにビデオトラックがあるかを確認するように

(cherry picked from commit 23d38a2d6492a2b24e9b2c031d66c3e8a5d382ef)

* Update Changelog

* Update Changelog

* Revert "Update Changelog"

This reverts commit 93fd996932b87ef550c38b48bd0678060f3ed1af.

* fix(test) ffmpegをインストールするように

* 入れる方間違えた

* fix test

* 拡張子変わらなかったのでそのまま行く

* ログを出力するように

* msg

* remove unused import

* add log

* attempt to fix test error

* Revert "attempt to fix test error"

This reverts commit d9d6524cadd655e6d8e9398b26fdfef332f30f4d.

* Update FileInfoService.ts

* oggも検査の対象にする
 2024-03-31 12:43:39 +09:00
dakkar
074de82bf7 some validation fixes 2024-03-30 11:05:58 +00:00
dakkar
7374218a33 fix UserEntityService 
upstream has removed the Drive bits, but we're still using them, to
update avatar / banner / background URLs
 2024-03-24 12:14:05 +00:00
dakkar
bc531ac414 Merge remote-tracking branch 'misskey/develop' into future-2024-03-23 2024-03-24 11:53:52 +00:00
おさむのひと
831c74a25b
fix: URLプレビューの動作改善＋動作設定を可能にする (#13579) 
* wip

* support new version

* URLプレビュー無効化時、フロント側も非表示にしてリクエストをしないようにする

* fix lint

* fix lint

* tweak preview request error handles

* fix: CHANGELOG.md

* fix

* fix

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-03-21 18:46:42 +09:00
かっこかり
f4838e50b4
enhance(antenna): Botの投稿を除外できるように (#13603) 
* enhance(antenna): Botの投稿を除外できるように (MisskeyIO#545)

(cherry picked from commit a95ce067c6cf0a93647e358aabc984bdbe99e952)

* Update Changelog

* remove translations

* spdx

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-03-21 07:51:01 +09:00
かっこかり
a38646bd0f
fix(backend): フォローリクエストを作成する際に既存のものは削除するように (#13588) 
* fix: delete old follow request (if exists) before creating new

(cherry picked from commit ea948ccadc)

* Update Changelog

* Update Changelog

---------

Co-authored-by: Kaity A <kaity@atikayda.au>
 2024-03-18 14:20:28 +09:00
syuilo
282cfae1b2 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-03-17 10:34:15 +09:00
syuilo
7e63ab0f56 refactor(backend): refactor chart engine 2024-03-17 10:34:13 +09:00
dakkar
9478fc0095 Merge remote-tracking branch 'misskey/develop' into future-2024-03-14 2024-03-14 16:28:56 +00:00
zyoshoka
29f6ba6310
chore: add missing SPDX ID and workflow check (#13570) 
* chore: add workflow which checks if SPDX ID exists

* chore: add missing SPDX ID in some files

* chore: change trigger condition

* chore: trigger on push

* lint
 2024-03-13 22:37:18 +09:00
おさむのひと
5c1d86b796
refactor(backend): UserEntityService.packMany()の高速化 (#13550) 
* refactor(backend): UserEntityService.packMany()の高速化

* 修正
 2024-03-12 14:31:34 +09:00
tamaina
1b064d7e30 chore(backend): validateNoteの結果Errorはそのままthrowする 
理由がわからないため
 2024-03-09 04:10:17 +00:00
dakkar
dfff4d2073 Merge remote-tracking branch 'misskey/develop' into future 2024-03-07 16:09:36 +00:00
かっこかり
7ead98cbe5
enhance(frontend): リアクションの総数を表示するように (#13532) 
* enhance(frontend): リアクションの総数を表示するように

* Update Changelog

* リアクション選択済の色をaccentに
 2024-03-06 21:08:42 +09:00
dakkar
ff0117a1a5 check prohibited words when creating notes 
some small differences (between Misskey and us) inside the `create`
method made `git` put all the changes inside the `import` method… I
thought I had copied them all, but I had missed one, and it's a pretty
important one: prohibited words were not being checked!
 2024-03-05 16:52:05 +00:00
かっこかり
08d618bb8b
enhance(frontend): 自分のノートの添付ファイルから直接ファイルの詳細ページに飛べるようにする (#13520) 
* enhance(frontend): 自分のノートの添付ファイルから直接ファイルの詳細ページに飛べるようにする

* 他のファイルタイプにも対応

* Update Changelog

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-03-05 18:06:57 +09:00
tamaina
9542cb8d62
fix(backend): リモートサーバーの情報が更新できなくなっていた問題を修正 (#13507) 
* fix(backend): fetchInstanceMetadataのLockが永遠に解除されない問題を修正

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>

* fix test

* fix

* comment

* comment

* improve test

---------

Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-03-04 13:48:57 +09:00
dakkar
af548d05ca merge upstream for 2024.2.1 2024-03-02 16:36:49 +00:00
tamaina
eb60460d28
enhance: 禁止ワードチェック強化 (#27) 
* enhance: 禁止ワードチェック強化
* リモートの禁止ワードチェックを添付ファイルとユーザーを登録する前に行うなど
  Resolve https://github.com/misskey-dev/misskey/issues/13374
* 禁止ワートの対象の見直し

* performActivityで特定のエラーが出た際にDelayedに追加しないように

* use IdentifiableError

* NoteCreateService.checkProhibitedWords

* https://github.com/misskey-dev/misskey-private/pull/27/files#r1507416135

* remove comment
 2024-03-01 20:16:32 +09:00
Yuriha
26d4c5fd94
メンションの最大数をロールごとに設定可能にする (#13343) 
* Add new role policy: maximum mentions per note

* fix

* Reviewを反映

* fix

* Add ChangeLog

* Update type definitions

* Add E2E test

* CHANGELOG に説明を追加

---------

Co-authored-by: taichan <40626578+tai-cha@users.noreply.github.com>
 2024-02-29 20:48:02 +09:00
かっこかり
39d6af135f
enhance: 通知の履歴をリセットできるように (#13335) 
* enhance: 通知の履歴をリセットできるように

* Update Changelog

* 通知欄も連動して更新するように

* revert some changes

* Update CHANGELOG.md

* Remove unused part

* fix
 2024-02-29 20:03:30 +09:00
syuilo
98934b6738 fix type 2024-02-29 17:54:32 +09:00
taichan
5f43c2faa2
enhance(backend): 通知がミュート・凍結を考慮するようにする (#13412) 
* 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.

(cherry picked from commit 421f8d49e5)

* Update Changelog

* Update CHANGELOG.md

* enhance: 通知がミュートを考慮するようにする

* enhance: 通知が凍結も考慮するようにする

* fix: notifierIdがない通知が消えてしまう問題

* Add tests (通知がミュートを考慮しているかどうか)

* fix: notifierIdがない通知が消えてしまう問題 (grouped)

* Remove unused import

* Fix: typo

* Revert "enhance: 通知が凍結も考慮するようにする"

This reverts commit b1e57e571dfd9a7d8b2430294473c2053cc3ea33.

* Revert API handling

* Remove unused imports

* enhance: Check if notifierId is valid in NotificationEntityService

* 通知作成時にpackしてnullになったらあとの処理をやめる

* Remove duplication of valid notifier check

* add filter notification is not null

* Revert "Remove duplication of valid notifier check"

This reverts commit 239a6952f717add53d52c3e701e7362eb1987645.

* Improve performance

* Fix packGrouped

* Refactor: 判定部分を共通化

* Fix condition

* use isNotNull

* Update CHANGELOG.md

* filterの改善

* Refactor: DONT REPEAT YOURSELF
Note: GroupedNotificationはNotificationの拡張なのでその例外だけ書けば基本的に共通の処理になり複雑な個別の処理は増えにくいと思われる

* Add groupedNotificationTypes

* Update misskey-js typedef

* Refactor: less sql calls

* refactor

* clean up

* filter notes to mark as read

* packed noteがmapなのでそちらを使う

* if (notesToRead.size > 0)

* if (notes.length === 0) return;

* fix

* Revert "if (notes.length === 0) return;"

This reverts commit 22e2324f9633bddba50769ef838bc5ddb4564c88.

* 🎨

* console.error

* err

* remove try-catch

* 不要なジェネリクスを除去

* Revert  (既読処理をpack内で行うものを元に戻す)

* Clean

* Update packages/backend/src/core/entities/NotificationEntityService.ts

* Update packages/backend/src/core/entities/NotificationEntityService.ts

* Update packages/backend/src/core/entities/NotificationEntityService.ts

* Update packages/backend/src/core/entities/NotificationEntityService.ts

* Update packages/backend/src/core/NotificationService.ts

* Clean

---------

Co-authored-by: dakkar <dakkar@thenautilus.net>
Co-authored-by: kakkokari-gtyih <daisho7308+f@gmail.com>
Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-28 21:26:26 +09:00
zyoshoka
0d47877db1
enhance(backend): フォロー・フォロワー関連の通知の受信設定の強化 (#13468) 
* enhance(backend): 通知の受信設定に「フォロー中またはフォロワー」を追加

* fix(backend): 通知の受信設定で「相互フォロー」が正しく動作しない問題を修正

* Update CHANGELOG.md
 2024-02-28 09:49:34 +09:00
zawa-ch
f906ad6ca7
Enhance: コンディショナルロールの条件に「マニュアルロールへのアサイン」を追加 (#13463) 
* コンディショナルロールの条件に「マニュアルロールへのアサイン」を追加

* コメント修正
 2024-02-27 18:45:46 +09:00
FineArchs
dd48366ed8
admin/emoji/updateの必須項目を減らす　等 (#13449) 
* admin/emoji/update enhancement

* add CustomEmojiService.getEmojiByName

* update endpoint

* fix

* Update update.ts

* Update autogen files

* type assertion

* Update CHANGELOG.md
 2024-02-25 18:06:26 +09:00
tamaina
2c6f25b710
fix: 古いキャッシュを使うのを修正 (#13453) 2024-02-25 12:36:10 +09:00
Marie
1b65c06d60 merge: fix: delete old follow request (if exists) before creating new (!440) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/440

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <marie@kaifa.ch>
 2024-02-24 18:16:16 +00:00
Kaity A
def2e8dff0
Merge remote-tracking branch 'origin/develop' into fix/failed-follow 2024-02-24 05:05:25 +00:00
Kaity A
ea948ccadc
fix: delete old follow request (if exists) before creating new 2024-02-24 04:38:01 +00:00
syuilo
41747b6ee2 refactor 2024-02-24 11:50:10 +09:00
Marie
d1b787192a
fix: align note edit errors with note create errors 2024-02-23 17:01:35 +01:00
Marie
15d2319011
merge: upstream 2024-02-23 13:42:52 +01:00
tamaina
c0156b740b
enhance?: DeleteAccountServiceでユーザーを削除する際にuserChangeDeletedStateを発行する (#13382) 2024-02-23 18:15:39 +09:00
tamaina
600d91beda
enhance: リモートのフォロワーから再度Followが来た場合、acceptを返してあげる (#13388) 
* enhance: リモートのフォロワーから再度Followが来た場合、acceptを返してあげる

* nanka meccha kaeta

* ブロックチェックの後にフォロー関係の存在チェックをする
 2024-02-23 18:04:30 +09:00
tamaina
b8d8b359bc
fix: プッシュ通知の変更が1時間ほど反映されない問題を修正 (#13407) 
* fix: プッシュ通知の変更が1時間ほど反映されない問題を修正

* 410 to refresh

* refreshCache
 2024-02-23 17:19:08 +09:00
okayurisotto
64953fadc9
refactor(backend): Array.prototype.filterでの非null確認ではisNotNull関数を使うように (#13442) 
* `Array.prototype.filter`での非null確認では`isNotNull`関数を使うように

* `{}` -> `NonNullable<unknown>`
 2024-02-23 14:12:57 +09:00
かっこかり
d20542c495
enhance: metaをSSR HTMLに埋め込む (#13436) 
* enhance: `meta`をSSR HTMLに埋め込む

* HTML Metaの有効時間を指定

* １時間

* MetaEntityService

* JSONをPackするように

* ✌️

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-23 10:47:17 +09:00
dakkar
4afbf3b91e some fixes for note edits 2024-02-22 18:23:46 +00:00
tamaina
4d6fab06de
refactor: Refactor NoteReadService.read (#13429) 
* refactor: Refactor NoteReadService.read

* clean up

* Update packages/backend/src/core/NoteReadService.ts

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-02-22 21:10:28 +09:00
syuilo
2bd9f05a92 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2024-02-22 20:59:57 +09:00
syuilo
26c8b53f70 enhance: サーバーごとにモデレーションノートを残せるように 2024-02-22 20:59:52 +09:00
anatawa12
b36e6b1a77
fix: 禁止キーワードを含むノートがDelayed Queueに追加されて再処理される問題 (#13428) 
* refactor: use IdentifiableError instead of NoteCreateService.ContainsProhibitedWordsError

* fix: notes with prohibited words are reprocessed with delay

* docs(changelog): 禁止キーワードを含むノートがDelayed Queueに追加されて再処理される問題

* lint: fix lint errors

* fix: rethrowするべきなのにrethrowし忘れていたのを修正
 2024-02-22 00:59:59 +09:00
tamaina
ae27085f69
fix: Bump sharp to 0.33.2 (#13391) 2024-02-21 14:42:37 +09:00
okayurisotto
750d262604
refactor(backend): ReactionService.prototype.convertLegacyReactions (#13375) 
* add unit tests

* cleanup unnecessary type assertions

* `convertedReaction`変数の定義と変換表に対する存在確認処理の整理

* `count`変数の定義とループ処理での`Object.entries()`の活用

* 条件式の整理

* `Array.prototype.reduce`を使うように

* `Array.prototype.reduce`を使うように

* 配列操作を1つのメソッドチェーンに整理

これまでの実装では、`decodeReaction`の返り値が同一になる異なる入力値が同時に複数個存在した場合、後ろのもので上書きされてしまっていたはず。
これからの実装では、後ろのものは前のものに加算される。
（実際にこの挙動の変更が問題になるシチュエーションはまずないはず。）

* add unit test

* ドキュメントコメントの追加と型定義の調整
 2024-02-21 14:31:50 +09:00
Marie
4a13508da0 Note Edited notification type 2024-02-20 15:10:41 +00:00
Marie
6931f50af5 merge: check prohibited words when editing note (!429) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/429

Approved-by: Marie <marie@kaifa.ch>
Approved-by: Amelia Yukii <amelia.yukii@shourai.de>
 2024-02-19 19:19:27 +00:00
dakkar
9c1437bdf9 check prohibited words when editing note 2024-02-19 14:27:10 +00:00
Marie
10bfc61670
merge: upstream 2024-02-19 10:47:42 +01: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
syuilo
01de1519dd fix of 9a70ce8f5e 
Co-Authored-By: RyotaK <49341894+Ry0taK@users.noreply.github.com>
 2024-02-17 14:26:48 +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
zyoshoka
37959bab1d
refactor(backend): remove/replace deprecated type deps (#13252) 2024-02-16 20:09:07 +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
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
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
tamaina
32c5c43b6d
enhance: 禁止ワードはリモートノートも対象に (#13280) 
Resolve #13279
 2024-02-13 04:54:01 +09:00
syuilo
9b5aeb76d8 update SPDX-FileCopyrightText 2024-02-12 11:37:45 +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
Marie
2e7df3297c
fix: diff between NoteCreateService and NoteEditService 2024-02-09 19:51:41 +01:00
Marie
85355813ad
merge: latest changes 2024-02-09 19:22:06 +01:00
おさむのひと
614c9a0fc6
fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加 (#13210) 
* fix: 特定文字列を含むノートを投稿できないようにする管理画面用設定項目を追加

* Serviceでチェックするように変更
 2024-02-09 10:07:18 +09:00