1
1
mirror of https://github.com/kokonect-link/cherrypick synced 2025-01-19 16:23:08 +09:00
Commit Graph

1413 Commits

Author SHA1 Message Date
NoriDev
e6c296ebc0 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-27 15:24:39 +09:00
Kagami Sascha Rosylight
d48172e9d1
refactor(backend/test): add interface UserToken (#11050) 2023-06-27 08:07:20 +09:00
NoriDev
b6979b0437 Merge remote-branch 'misskey/develop' 2023-06-26 16:52:07 +09:00
Kagami Sascha Rosylight
d23ad8b511
fix(backend): APIエラーのHTTP status code変更 (#11047) 2023-06-26 10:09:12 +09:00
syuilo
8099bc24e1
refactor(backend): use node16 for moduleResolution (#10938)
* refactor(backend): use node16 for moduleResolution

* update deps

* Update tsconfig.json

* ✌️

* revive KEYWORD

* restore strict-event-emitter-types dependency

* restore ms dependency

* cancel redundant import reorder

* fix

* Delete ms.ts

* remove rndstr

---------

Co-authored-by: Kagami Sascha Rosylight <saschanaz@outlook.com>
2023-06-25 21:13:15 +09:00
Kagami Sascha Rosylight
ef354e94f2
refactor(backend): replace rndstr with secureRndstr (#11044)
* refactor(backend): replace rndstr with secureRndstr

* Update pnpm-lock.yaml

* .js
2023-06-25 11:04:33 +09:00
Kagami Sascha Rosylight
7bb8c71543
chore(backend, misskey-js): add type for signup (#11043)
* chore(backend, misskey-js): add type for signup

* rerun
2023-06-25 08:34:18 +09:00
Kagami Sascha Rosylight
a2c0573f84
refactor(backend): replace private-ip with ipaddr.js (#11041)
* refactor(backend): replace private-ip with ipaddr.js

* restore ip-cidr
2023-06-25 06:35:09 +09:00
syuilo
60cc7f62e6 update deps 2023-06-24 13:11:53 +09:00
NoriDev
351cea0b52 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-23 16:35:24 +09:00
Caipira
e8c5117b2d
fix(backend): Resolve missing parseObjectId in IdService (#11039) 2023-06-23 16:30:47 +09:00
NoriDev
d6f18f6584 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-23 15:37:24 +09:00
NoriDev
9598552367 feat: メディアタイムラインを改善 2023-06-22 17:00:32 +09:00
NoriDev
5e02db855e feat: キャットタイムラインを追加 2023-06-22 16:44:37 +09:00
Balazs Nadasdi
e2261b63e9
fix: clear queue endpoint error with redis script (#11037)
Error message:
```
ReplyError: ERR value is not an integer or out of range script: 720d973b3877f92b4fb3285ced83c97cdd204979, on @user_script:209.
```

The whole error can be tracked back to one of the arguments, which is
`Infinity` in the codebase, but it has to be a number.

The documentation in bullmq says `0` is unlimited[^1], and bullmq tries to
parse the argument with `tonumber` which returns with `-9223372036854775808` if
the argument is `"Infinity"` which is out of bound.

```
127.0.0.1:6379> eval 'return tonumber(ARGV[3])' '2' 'slippy.xyz:queue:inbox:inbox:delayed' 'slippy.xyz:queue:inbox:inbox:events' 'slippy.xyz:queue:inbox:inbox:' '1687183763944' Infinity 'delayed'
(integer) -9223372036854775808
127.0.0.1:6379>
```

[^1]: https://github.com/taskforcesh/bullmq/blob/master/src/commands/cleanJobsInSet-2.lua#L10

Signed-off-by: Efertone <efertone@pm.me>
2023-06-22 15:56:40 +09:00
NoriDev
f95e11ce57 Update favicon.ico 2023-06-20 17:36:34 +09:00
NoriDev
43addcbd00 CherryPick🍒 2023-06-20 17:29:46 +09:00
NoriDev
fec18294e0 fix test 2023-06-20 04:30:34 +09:00
NoriDev
030597e572 fix jest 2023-06-19 20:03:56 +09:00
NoriDev
38ab7141f2 fix jest 2023-06-19 19:06:09 +09:00
NoriDev
7107bf2fc1 Merge commit 'refs/pull/10628/head' of https://github.com/misskey-dev/misskey into develop 2023-06-19 16:54:53 +09:00
NoriDev
eba092e319 fix lint 2023-06-19 16:44:56 +09:00
NoriDev
5ff28f08a9 fix jest 2023-06-19 04:04:24 +09:00
ssmucny
a5dcc8264d update event types for federation 2023-06-18 13:39:43 -04:00
NoriDev
42cc15d7f8 tweak 0491042d 2023-06-19 01:12:56 +09:00
NoriDev
54545fb501 Merge pull request #10949 from misskey-dev 2023-06-18 19:37:54 +09:00
caipira113
47d0116a8e tweak 610780c8 2023-06-18 19:13:08 +09:00
caipira113
d04df47f7d Add Cloud Logging Support 2023-06-18 19:11:42 +09:00
NoriDev
c1f6c3ac83 Merge pull request #10628 from misskey-dev/develop 2023-06-18 04:51:25 +09:00
Sam Smucny
30f43e771e
Merge branch 'develop' into ssmucny-events 2023-06-17 15:32:34 -04:00
caipira113
ebbd759a03
fix(backend): Resolve issue with UserGroupInvitation in notifications
This commit resolves the issue of `Internal error occurred in i/notifications: Could not find any entity of type "UserGroupInvitation"`.
2023-06-17 04:09:58 +09:00
NoriDev
3ccefa7b00 delete description 2023-06-17 03:12:24 +09:00
NoriDev
9eb989af1f Update package.json 2023-06-16 22:31:02 +09:00
NoriDev
245ec7a68a Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-14 21:17:35 +09:00
syuilo
f5dfb64a52 ユーザー統計表示機能を削除
Resolve #10998
2023-06-13 14:13:33 +09:00
NoriDev
53a4e4054d misskey-js -> cherrypick-js 2023-06-12 16:35:30 +09:00
NoriDev
fc413756e3 feat(client): プロフィールを翻訳する機能を追加 2023-06-11 21:55:01 +09:00
Chocolate Pie
f495296a77
Merge branch 'develop' into flash-request-token 2023-06-11 15:55:15 +09:00
Chocolate Pie
0329b7acab Revert "Merge remote-tracking branch 'upstream/develop' into flash-request-token"
This reverts commit e045aa2661.
2023-06-11 15:53:13 +09:00
Chocolate Pie
e045aa2661 Merge remote-tracking branch 'upstream/develop' into flash-request-token 2023-06-11 15:50:38 +09:00
NoriDev
6723ef9052 ノートの検索をローカル/リモート/全てで分けられるように変更 2023-06-10 20:44:27 +09:00
tamo-morita
5c0e14f436 ノートの検索をローカル/リモート/全てで分けられるように変更 2023-06-10 20:44:10 +09:00
Nyamori
f45745af5a メディアタイムライン追加 2023-06-10 20:23:45 +09:00
NoriDev
25029ac671 Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2023-06-10 19:19:36 +09:00
NoriDev
1955628dd9 CherryPick🍒 2023-06-10 19:18:49 +09:00
syuilo
46222d0258 tweak of f3a16bcd6 2023-06-10 17:41:52 +09:00
nenohi
f3a16bcd6d
ロールのユーザーリストを非公開にできるように (#10987)
* ロールのユーザーリストを非公開にできるように

* Changelog update
2023-06-10 17:26:48 +09:00
syuilo
e8420ad90b fix(backend): キャッシュが溜まり続けないように
Related #10984
2023-06-10 13:45:11 +09:00
Chocolate Pie
5ae91f5f23 Merge remote-tracking branch 'upstream/develop' into flash-request-token 2023-06-10 10:38:43 +09:00
NoriDev
142245980a Update icon 2023-06-09 23:11:35 +09:00