Commit Graph

525 Commits

Author SHA1 Message Date
ThatOneCalculator
0eb25b5ab4 fix import 2022-07-25 13:59:12 -07:00
ThatOneCalculator
6bf10ccfbc im stuff 2022-07-25 13:57:13 -07:00
Johann150
15f06a1d50 enable to fetch replies recursively 2022-07-25 13:40:37 -07:00
Johann150
86342538aa pack children without detail 2022-07-25 13:40:22 -07:00
Johann150
d6a95797d8 remove ms dependency 2022-07-25 13:38:31 -07:00
Johann150
20763a84ee Merge: enhance privacy of notes
https://akkoma.dev/FoundKeyGang/FoundKey/pulls/14
2022-07-25 13:36:44 -07:00
Johann150
3b40c7d081 remove unnecessary joins
These joins are no longer necessary as of commit
c35372a20d22cddb75e93a0b407f2b652cd7faf0. It seems they are bad enough
for performance to break installs.
2022-07-25 13:28:57 -07:00
ThatOneCalculator
e90d5b23db More #31748f 2022-07-24 18:36:55 -07:00
ThatOneCalculator
2b1e707f8c Merge remote-tracking branch 'misskey/develop' into develop 2022-07-24 18:07:18 -07:00
syuilo
9f5c8f42e0
tweak rate limit 2022-07-24 17:56:48 +09:00
ThatOneCalculator
e4a72f8de3 🎨 2022-07-23 22:10:07 -07:00
ThatOneCalculator
bf8a82bf67 Less cluttered notifications 2022-07-23 21:30:42 -07:00
ThatOneCalculator
4230e289da more rpine stuff 2022-07-23 21:23:04 -07:00
ThatOneCalculator
a866d49b6f Merge remote-tracking branch 'johann150/mk/bearer-authentication' into develop 2022-07-23 19:05:35 -07:00
ThatOneCalculator
d2b0367e8f Merge remote-tracking branch 'misskey/develop' into develop 2022-07-21 23:43:30 -07:00
xianon
b6556c7ff1
リモートユーザーを正しくブロックできるように修正する (#9027) 2022-07-22 15:41:31 +09:00
ThatOneCalculator
db97dff0cb b3 2022-07-21 12:48:23 -07:00
syuilo
53d24c2ba1 chore: improve error message of boot 2022-07-21 22:30:36 +09:00
ThatOneCalculator
d88f07f431 Properly apply star is like patch 2022-07-19 15:23:26 -07:00
ThatOneCalculator
3149b93de2 indentation 2022-07-19 12:01:45 -07:00
ThatOneCalculator
4d0f511fa1 Better ASCII art 2022-07-19 11:18:44 -07:00
ThatOneCalculator
64ef31f8db Calckey as software name, finally! 2022-07-19 10:49:43 -07:00
ThatOneCalculator
de6c93ceb6 Calckey in launch strings 2022-07-19 10:18:05 -07:00
ThatOneCalculator
b1efe26c89 More Calckey strings 2022-07-19 10:13:17 -07:00
ThatOneCalculator
eaf31f78ad Merge remote-tracking branch 'misskey/develop' into develop 2022-07-19 09:04:29 -07:00
syuilo
2497499d63 Merge branch 'develop' into pr/9021 2022-07-19 23:53:08 +09:00
Acid Chicken (硫酸鶏)
a3c2dbbfb5
fix(server): make sure getFileInfo doesn't fail if detectSensitivity ever fails (#9020) 2022-07-19 17:09:21 +09:00
Johann150
c4e2a222f0
handle authentication errors in stream API 2022-07-19 09:32:46 +02:00
Johann150
0131ec4a58
update openapi spec generator
Properly document GET API endpoints.
Added Bearer token authentication.
2022-07-19 09:32:01 +02:00
Johann150
4ca48908be
improve authentication errors 2022-07-19 09:29:04 +02:00
Johann150
29f7eb4482
add OAuth 2.0 Bearer Token authentication 2022-07-19 09:29:04 +02:00
ThatOneCalculator
c0b42fd3be tabs 2022-07-18 23:21:08 -07:00
ThatOneCalculator
3632eec20b calckey ascii art 2022-07-18 23:07:18 -07:00
ThatOneCalculator
09b78cb1ab MOTD 2022-07-18 21:47:32 -07:00
ThatOneCalculator
0c46bb96b1 The annoying orange 2022-07-18 21:32:02 -07:00
ThatOneCalculator
fcb91702d9 Merge remote-tracking branch 'nullobsi/secure-fetch' into develop 2022-07-18 20:50:15 -07:00
ThatOneCalculator
4bfc6f2457 Merge remote-tracking branch 'thatonecalculator/self-host-images' into develop 2022-07-18 20:34:37 -07:00
ThatOneCalculator
f63e725a90 Merge remote-tracking branch 'thatonecalculator/repair-style' into develop 2022-07-18 20:34:06 -07:00
ThatOneCalculator
3609c2784d Calckey 2022-07-18 19:00:45 -07:00
nullobsi
3f14e23431
Hide private data in pug when private mode is enabled 2022-07-17 15:25:40 -07:00
nullobsi
a69557f193
Add secure mode settings to Security tab 2022-07-17 15:25:40 -07:00
nullobsi
e7f20affc9
In private mode, block access to many public APIs 2022-07-17 15:25:40 -07:00
nullobsi
2bf2eac765
Add Secure Mode and Private Mode
- Add instance actor
- Add private mode, which uses an allowlist
- Add Secure Mode, restricts access to blocked instances
2022-07-17 15:25:39 -07:00
syuilo
c1c8c9c37c
fix(server): fix bind of method
Fix #9006
2022-07-16 19:03:41 +09:00
syuilo
44f560b453 tweak boot.js 2022-07-14 22:25:57 +09:00
syuilo
f2e91f4d62 tweak boot.js 2022-07-14 22:04:16 +09:00
syuilo
10f4815d34 tweak boot.js 2022-07-14 21:52:58 +09:00
syuilo
d78faf1134 chore: use tab 2022-07-14 21:02:45 +09:00
syuilo
cb00786f1e improve error handling of client boot 2022-07-14 20:41:17 +09:00
syuilo
61e26696aa log error while client boot 2022-07-14 20:29:45 +09:00
tamaina
ae92378689
fix(sw, notification): Don't issue an event if there is no affect (#8979)
* test

* ]v]
2022-07-13 21:07:49 +09:00
Johann150
714c80bf3f
enhance: read theme color nodeinfo (#8977)
* provide theme color in nodeinfo metadata

* read theme color from nodeinfo

Prefer to read the theme color from the nodeinfo since it is more
performant than performing selector search on a DOM.
2022-07-13 21:06:24 +09:00
syuilo
4550a4459b feat: support <plain> syntax for mfm 2022-07-12 12:03:38 +09:00
MeiMei
660781afd9
Fix crash at startup if TensorFlow is not supported (#8984)
* Lazy loading tensorflow

* CHANGELOG

* CHANGELOG

* Check CPU flags

* .
2022-07-12 10:38:57 +09:00
syuilo
a5648fb07f re: update mfm-js 0.23.0-canary.1 2022-07-11 23:13:23 +09:00
yzhe819
9107de63b4
chore: fix lint errors (#8981) 2022-07-10 19:47:29 +09:00
tamaina
83ebe79a3f
enhance(sw): If receiving a push notification issued more than a day, ignore it. (#8980)
* enhance(sw): ignore old push notification

* ✌️

* 半日

* !==

* 1日
2022-07-10 15:15:21 +09:00
dogcraft
d92200a6d6
fix: QueryFailedError when logging user's IPs (#8973)
* fix QueryFailedError when logging user's IPs

* use `orIgnore` to fix
2022-07-10 11:02:46 +09:00
MeiMei
53e54c22fa
Fix Attempts to update all notifications (#8974)
* Fix massive update notification parameters

* CHANGELOG

* CHANGELOG
2022-07-09 18:18:39 +09:00
syuilo
75d516011b enhance: make active email validation configurable 2022-07-09 15:05:55 +09:00
syuilo
522ddba3d7 enhance(server): tweak identicon generation 2022-07-09 13:22:35 +09:00
Kainoa Kanter
b355c21e36
v 2022-07-08 12:57:59 -07:00
Kainoa Kanter
eebdb35dda
Merge branch 'misskey-dev:develop' into repair-style 2022-07-08 12:57:21 -07:00
syuilo
e560601815
feat: auto nsfw detection (#8840)
* feat: auto nsfw detection

* ✌️

* Update ja-JP.yml

* Update ja-JP.yml

* ポルノ判定のしきい値を高めに

* エラーハンドリングちゃんとした

* Update ja-JP.yml

* 感度設定を強化

* refactor

* feat: add video support for auto nsfw detection

* rename: image -> media

* .js

* fix: add missing error handling

* fix: use valid pathname instead of using filename due to invalid usage

* perf(nsfw-detection): decode frames

* disable detection of video for some reasons

* perf(nsfw-detection): streamify detection process for video

* disable disallowUploadWhenPredictedAsPorn option

* fix(nsfw-detection): improve reliability

* fix(nsfw-detection): use Math.ceil instead of Math.round

* perf(nsfw-detection): delete tmp frames after used

* fix(nsfw-detection): FSWatcher does not emit ready event

* perf(nsfw-detection): skip black frames

* refactor: strip exists check

* Update package.json

* めっちゃ変えた

* lint

* Update COPYING

* オプションで動画解析できるように

* Update yarn.lock

* Update CHANGELOG.md

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
2022-07-07 21:06:37 +09:00
syuilo
da239b8362 chore(server): tweak api for admin 2022-07-07 19:08:18 +09:00
syuilo
423e7692db chore(server): tweak api for admin 2022-07-07 18:09:50 +09:00
Kainoa Kanter
a23f59b996
enhance: Styled error screen (#8946)
* Styled error screen

* Make details margin auto

* Update boot.css

* Replace fontawesome with tabler svg

* Remove hr

* Add new style to flush screen

* Rename to `error.css`

* Fix

* Update base.pug

* Finally fix!

* Wrap details in `<code>`

* Add style to flush

* Fix

* BIOS -> Repair tool

* Fix

* Typo

* Adjust style

* Adjust text

* Flush -> Clear

* Revert flush changes

* Responsive

* Also hide splash
2022-07-07 17:35:56 +09:00
ThatOneCalculator
e53a5baa36 🎨 2022-07-06 23:23:37 -07:00
ThatOneCalculator
e51af57fb7 Responsive 2022-07-06 23:16:15 -07:00
ThatOneCalculator
1c15e127a7 Actually fix :godmode: 2022-07-06 21:50:48 -07:00
ThatOneCalculator
38048208ed Typo 2022-07-06 21:47:01 -07:00
ThatOneCalculator
decea5e7f5 Merge branch 'repair-style' of https://github.com/ThatOneCalculator/misskey into repair-style 2022-07-06 21:46:28 -07:00
ThatOneCalculator
3e9a6d07d2 Fix flush 2022-07-06 21:46:04 -07:00
Kainoa Kanter
a162526539
Merge branch 'develop' into repair-style 2022-07-06 21:40:18 -07:00
ThatOneCalculator
2ae42b5824 🎨 2022-07-06 21:39:41 -07:00
ThatOneCalculator
1a366293f7 Formatting error 2022-07-06 21:36:25 -07:00
ThatOneCalculator
e4459dada4 Change script location 2022-07-06 21:34:57 -07:00
ThatOneCalculator
e92b279c15 Typo 2022-07-06 21:32:03 -07:00
ThatOneCalculator
0789fd3ae1 Flush style 2022-07-06 21:24:39 -07:00
ThatOneCalculator
189b1bff38 Tweak bios 2022-07-06 21:15:47 -07:00
ThatOneCalculator
787d593b8f Adjust cli 2022-07-06 21:13:32 -07:00
ThatOneCalculator
7fb09407bb Add bios style 2022-07-06 21:10:31 -07:00
ThatOneCalculator
68941063f9 Styled CLI 2022-07-06 21:01:34 -07:00
syuilo
b35c3114c8 revert: feat: styled error screen (#8930) 2022-07-06 06:36:14 +09:00
syuilo
972b03f842 perf: allow get for notes/reactions 2022-07-05 19:16:21 +09:00
syuilo
cb246d3459 rename: BIOS -> Repair Tool 2022-07-05 17:46:17 +09:00
Kainoa Kanter
40656e3ee2
feat: styled error screen (#8930)
* Styled error screen

* Make details margin auto

* Update boot.css

* Replace fontawesome with tabler svg

* Remove hr

* Add new style to flush screen

* Rename to `error.css`
2022-07-05 17:44:05 +09:00
CyberRex
cd07eb222e
Add additional drive capacity change support (#8867)
* Add additional drive capacity change support

* Update packages/backend/src/server/api/endpoints/admin/drive-capacity-override.ts

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

* 🎨

* show instance default capacity in placeholder

* fix

* update api/drive

* fix

* remove :

* fix lint

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
Co-authored-by: tamaina <tamaina@hotmail.co.jp>
2022-07-05 00:21:01 +09:00
syuilo
26c89e053d fix typo 2022-07-03 19:01:08 +09:00
syuilo
dd426735a0 feat: moderation note 2022-07-03 00:15:03 +09:00
syuilo
949dbb3918 feat(server): add fetch-rss api to reduce dependency of external apis 2022-07-02 21:26:33 +09:00
syuilo
eccc90c843
feat: Log user ips (#8872)
* wip

* store ip and headers

* Update admin-file.vue

* require admin for view ip/headers

* IP (recent) 消した

* admin必須

* opt in

* clean ips periodically

* respect logging setting in drive/files/create
2022-07-02 15:12:11 +09:00
syuilo
52a1ec9af1 enhance(server): アンケートを新しい順にソート 2022-07-02 12:34:22 +09:00
syuilo
b773d516d3 chore(client): tweak ui 2022-07-02 12:22:52 +09:00
MeiMei
2f65d91ea8
migrate parse5 to 7.0.0 (#8916)
* migrate parse5 to 7.0.0

* fix
2022-07-01 13:48:03 +09:00
syuilo
b846ebeb97 use parse5 6.0.1
Fix #8914
2022-07-01 11:07:14 +09:00
Johann150
66b27bdc97
fix typo
Co-authored-by: mei23 <m@m544.net>
2022-06-30 22:03:04 +02:00
syuilo
e3bf53ea84 update deps 2022-07-01 00:21:25 +09:00
syuilo
ed41d542bb chore(client): tweak ui 2022-06-30 20:15:14 +09:00
syuilo
324f5525b5 fix(server): cannot show users 2022-06-30 15:36:09 +09:00
syuilo
6f3e64f13e chore(client): tweak client 2022-06-30 15:32:11 +09:00
ThatOneCalculator
9ac1a527dc Self host error/info/not-found images 2022-06-28 19:33:32 -07:00
syuilo
5c3e782d29 improve instance doughnut charts 2022-06-28 13:05:20 +09:00
syuilo
7d8a70f99e fix(api): fix instance schema 2022-06-28 12:16:11 +09:00
syuilo
c04d3d22af feat(api): add federation/stats endpoint 2022-06-28 10:41:22 +09:00
syuilo
164d4a9825 fix(api): add missing themeColor property of instance 2022-06-28 10:40:49 +09:00
syuilo
329f055a97 feat: make possible to delete an account by admin
Resolve #8830
2022-06-27 23:49:16 +09:00
Johann150
bc3ae901cc
refactor: remove duplicate code (#8895) 2022-06-27 21:48:10 +09:00
MeiMei
f834d6a813
fix: mocha テストが動かないのを修正 v2 (#8892)
* on push

* Fix mute test

* fix note test

* api

* inc timeout

* uploadUrl

* Revert "on push"

This reverts commit 778a58df61ff9a22421f8ec5dcce96b364eab38d.

* lint

* waitFire

* Wrap connectStream

* return
2022-06-26 19:16:32 +09:00
syuilo
4634920866 fix #8894 2022-06-26 17:38:50 +09:00
tamaina
2366f568b9
enhance(client): Enhance boot error display (#8879)
* Change boot error message

* fix

* ✌️

* fix
2022-06-26 12:47:43 +09:00
syuilo
58e83f8e4f feat: allow GET for some endpoints
Resolve #8263
2022-06-25 18:26:31 +09:00
Johann150
5728350267
fix: always respect instance mutes (#8854)
* fix: muted user query also checks instances

This way it can be ensured that the instance mute is used everywhere it
is required without checking the whole codebase again. Muted users and
muted instances should be used together anyways.

* fix lint
2022-06-25 14:23:59 +09:00
syuilo
696e8add00 feat: 管理者が特定ユーザーのアップロードしたファイル一覧を見れるように 2022-06-24 21:43:28 +09:00
Johann150
a5241379af
fix lints 2022-06-24 12:44:22 +02:00
MeiMei
6f8e3fe366
enhance: Redisをioredisに統一してIPv6サポート (#8869)
* Use ioredis, Supports IPv6 host

https://github.com/misskey-dev/misskey/issues/8862

* Fix import

* order

* a

* i

* fix

* flushdb

* family

* CHANGELOG

* redis_version

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-06-24 19:22:19 +09:00
Johann150
4f4d2b7c53
refactor: simplify ap/show with DbResolver (#8838)
Using the existing code in DbResolver we can avoid separate code for
parsing the URIs in this endpoint.

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-06-23 21:32:17 +09:00
Johann150
ecdaeea94f
enhance: word mute checks CW (#8873) 2022-06-23 20:26:47 +09:00
syuilo
f880d0631c tweak client 2022-06-21 17:55:38 +09:00
syuilo
4efee455b1 fix(server): faviconUrl of federated instance is missing 2022-06-21 14:28:43 +09:00
tamaina
b70473ed60
feat: Add Badge Image to Push Notification (#8012)
* fix

* nanka iroiro

* wip

* wip

* fix lint

* fix loginId

* fix

* refactor

* refactor

* remove follow action

* clean up

* Revert "remove follow action"

This reverts commit defbb416480905af2150d1c92f10d8e1d1288c0a.

* Revert "clean up"

This reverts commit f94919cb9cff41e274044fc69c56ad36a33974f2.

* remove fetch specification

* renoteの条件追加

* apiFetch => cli

* bypass fetch?

* fix

* refactor: use path alias

* temp: add submodule

* remove submodule

* enhane: unison-reloadに指定したパスに移動できるように

* null

* null

* feat: ログインするアカウントのIDをクエリ文字列で指定する機能

* null

* await?

* rename

* rename

* Update read.ts

* merge

* get-note-summary

* fix

* swパッケージに

* add missing packages

* fix getNoteSummary

* add webpack-cli

* ✌️

* remove plugins

* sw-inject分離したがテストしてない

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix notification.vue

* remove a blank line

* disconnect intersection observer

* disconnect2

* fix

* ✌️

* clean up config

* typesを戻した

* backend/src/web/index.ts

* notification-badges

* add scripts

* change create-notification.ts

* Update packages/client/src/components/notification.vue

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>

* disconnect

* oops

* Failed to load the script unexpectedly回避
sw.jsとlib.tsを分離してみた

* truncate notification

* Update packages/client/src/ui/_common_/common.vue

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>

* clean up

* clean up

* refactor

* キャッシュ対策

* Truncate push notification message

* fix

* クライアントがあったらストリームに接続しているということなので通知しない判定の位置を修正

* components/drive-file-thumbnail.vue

* components/drive-select-dialog.vue

* components/drive-window.vue

* merge

* fix

* Service Workerのビルドにesbuildを使うようにする

* return createEmptyNotification()

* fix

* fix

* i18n.ts

* update

* ✌️

* remove ts-loader

* fix

* fix

* enhance: Service Workerを常に登録するように

* pollEnded

* pollEnded

* URLをsw.jsに戻す

* clean up

* fix lint

* changelog

* alpha-test

* also with twemoji

* add isMimeImage function

* catch

* Colour => Color

* char2file => char2filePath

* Update autocomplete.vue

* remove clone?

Co-authored-by: Acid Chicken (硫酸鶏) <root@acid-chicken.com>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-06-20 00:33:46 +09:00
futchitwo
5b7595d9d7
Improve: unclip (#8823)
* Refactor clip page to use Composition API

* Refactor clip page

* Refactor clip page

* Refactor clip page

* Improve: unclip

* Fix unclip

* Fix unclip

* chore: better type and name

* Fix

* Fix clipPage vue provider

Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-06-18 18:27:09 +09:00
Johann150
6078c986d3
fix: render empty note content correctly
Instead of coercing to `null`, coercing to an empty string should simplify handling.
2022-06-16 12:51:44 +02:00
Johann150
b54f906605
fix: correctly render note text
Fix a regression from #8787 that was previously fixed in #8440.
2022-06-16 12:32:09 +02:00
MeiMei
1d8ec102f1
fix: GenerateVideoThumbnail (#8825)
* fix: GenerateVideoThumbnail

* CHANGELOG

* fix cleanup

* Revert "fix cleanup"

This reverts commit d54cf8262ac01a3deb6b8dd7689ec144d4d09ea8.
2022-06-14 23:02:14 +09:00
Johann150
3a42fe50c6
fix: tmpdir cleanup removes contained files (#8826) 2022-06-14 23:00:10 +09:00
syuilo
e4dc25dd5c enhance(server): モデレーターであってもレートリミットを有効に 2022-06-14 22:59:19 +09:00
tamaina
f1e6fa8ee2
fix: add limit to i/notifications (#8836)
* fix: add limit to i/notifications

* ms

* remove ms
2022-06-14 22:55:58 +09:00
Johann150
10d979bd65
fix(docs): use correct description property 2022-06-14 11:55:58 +02:00
Johann150
b5390c0922
fix: remove unused parameter 2022-06-14 11:54:55 +02:00
syuilo
963f538728 lint fixes 2022-06-14 18:01:23 +09:00
Johann150
963758d8ec
fix: missing file name parameter (#8820) 2022-06-13 00:25:06 +09:00
tamaina
11a6bd890c
fix: some fixes of multiple notification read (#8819)
* fix: limit multiple notification read

* fix

* fix
2022-06-12 19:28:13 +09:00
Johann150
7db09103e7
chore: synchronize visibility checks (#8687)
* reuse single meId parameter

* unify code style

Use template string to avoid having to use escaped quote marks.

* fix: follower only notes are visible to mentioned users

This synchronizes the visibility rules with the Notes.isVisibleForMe
method from packages/backend/src/models/repositories/note.ts

* add comment
2022-06-11 16:14:44 +09:00
syuilo
b9c64053e8 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-10 14:56:07 +09:00
syuilo
f5ba73e7c8 chore: tweak logo 2022-06-10 14:56:05 +09:00
Johann150
a683a7092d
enhance(federation): use ActivityPub defined property in favour of proprietary property. (#8787)
* add activitypub `source` property

* parse MFM from new `source` attribute
2022-06-10 14:31:58 +09:00
Johann150
78df3dc484
enhance: improve documentation for /users/ endpoints (#8790)
* docs: category & description for reset password

* docs: category & description for testing

* docs: descriptions for groups endpoints

* docs: descriptions for drive file endpoints

* docs: descriptions for sw endpoints

* docs: descriptions for user list endpoints

* docs: descriptions & result type for gallery posts

* docs: descriptions & result type for user endpoints

* docs: add return type for stats
2022-06-10 14:25:20 +09:00
Johann150
0fa2a52fac
refactor: use awaitAll to reduce duplication (#8791)
* refactor: use awaitAll to reduce duplication

* fix lint

* fix typo
2022-06-08 17:59:48 +09:00
syuilo
d17298d3b5 fix(test): make chart tests working 2022-06-05 20:37:24 +09:00
syuilo
89419c05b2 use node 16 2022-06-04 17:26:56 +09:00
syuilo
11afdf7e24 fix bug 2022-06-04 15:15:44 +09:00
Johann150
32dff28460
fix: add id for activitypub follows (#8689)
* add id for activitypub follows

* fix lint

* fix: follower must be local, followee must be remote

Misskey will only use ActivityPub follow requests for users that are local
and are requesting to follow a remote user. This check is to ensure that
this endpoint can not be used by other services or instances.

* fix: missing import

* render block with id

* fix comment
2022-06-04 13:52:42 +09:00
Johann150
9954c054a7
fix: ensure resolver does not fetch local resources via HTTP(S) (#8733)
* refactor: parseUri types and checks

The type has been refined to better represent what it actually is. Uses of
parseUri are now also checking the parsed object type before resolving.

* cannot resolve URLs with fragments

* also take remaining part of URL into account

Needed for parsing the follows URIs.

* Resolver uses DbResolver for local

* remove unnecessary use of DbResolver

Using DbResolver would mean that the URL is parsed and handled again.
This duplicated processing can be avoided by querying the database directly.

* fix missing property name
2022-06-04 11:29:20 +09:00
Johann150
81109b14b5
fix: correctly render empty note text (#8746)
Ensure that the _misskey_content attribute will always exist. Because
the API endpoint does not require the existence of the `text` field,
that field may be `undefined`. By using `?? null` it can be ensured
that the value is at least `null`.

Furthermore, the rendered HTML of a note with empty text will also be
the empty string. From git blame it seems that this behaviour was added
because of a Mastodon bug that might have previously existed. Hoever,
this seems to be no longer the case as I can find mastodon posts that
have empty content.

The code could be made a bit more succinct by using the null coercion
operator.
2022-06-03 23:18:44 +09:00
PikaDude
6061937996
User moderation details (#8762)
* add more user details for admins to see

* fix some issues

* small style fix

as suggested by Johann150

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

* fix

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>

Co-authored-by: Johann150 <johann@qwertqwefsday.eu>
2022-06-03 23:14:50 +09:00
syuilo
71c230b7b7 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-03 23:08:18 +09:00
syuilo
a3fed7d0fb fix(test): reset redis in e2e test
#7986
2022-06-03 23:08:15 +09:00
Johann150
025bf4a5e7
fix(mfm): remove duplicate br tag/newline (#8616) 2022-05-31 18:57:55 +09:00
Johann150
c56e45ecef
fix: always remove completed tasks (#8771) 2022-05-31 17:54:02 +09:00