Commit Graph

20261 Commits

Author SHA1 Message Date
tamaina
cee971c1b1 fix 2022-06-04 08:36:50 +00:00
tamaina
2665322b23 Merge branch 'develop' into pr/ThatOneCalculator/8764 2022-06-04 08:34:56 +00:00
syuilo
3f4101d17b use node 16 2022-06-04 17:26:56 +09:00
tamaina
ac4d6e1ac2 fix http-signature 2022-06-04 08:26:36 +00:00
syuilo
c9cd88a9db update summaly 2022-06-04 17:24:41 +09:00
tamaina
7d1cb31d13 fix 2022-06-04 08:09:38 +00:00
tamaina
f595c068f9 yarn node => node
依存関係の記載不足の解消がかなり多いため、yarn nodeは使わない
2022-06-04 08:07:27 +00:00
tamaina
13d924b804 wip 2022-06-04 08:01:02 +00:00
syuilo
e8dea6c79b Update CHANGELOG.md 2022-06-04 16:04:59 +09:00
syuilo
552f488a25 Update CONTRIBUTING.md 2022-06-04 16:01:27 +09:00
syuilo
db96a8dd83 Update CONTRIBUTING.md 2022-06-04 16:01:11 +09:00
syuilo
14a0143767 Update CHANGELOG.md 2022-06-04 15:47:10 +09:00
syuilo
b262e19742 Revert "feat: option to collapse long notes (#8561)"
This reverts commit e675ffcf38b07f5c70d00b49c171c7ab3460e810.
2022-06-04 15:23:53 +09:00
syuilo
3661d1bc33 fix bug 2022-06-04 15:15:44 +09:00
syuilo
4bf3ed6c1e fix test 2022-06-04 14:25:30 +09:00
Balazs Nadasdi
170ea0f6c2 feat: option to collapse long notes (#8561)
* feat: option to collapse long notes

Closes #8559

* do not collapse if cw exists

* use '閉じる' to close / show less.

* make it sticky

* Change style of the Show less button
2022-06-04 13:57:09 +09:00
Johann150
102012aa9d 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
86c04c4489 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
336eea9d93 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
186cac05a2 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
e0fb88f9fe Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-06-03 23:08:18 +09:00
syuilo
dbab6abde4 fix(test): reset redis in e2e test
#7986
2022-06-03 23:08:15 +09:00
tamaina
064c81bcfe npm run => yarn 2022-06-03 22:39:07 +09:00
tamaina
a31de36d63 add packageExtensions for chartjs_date-fns
Co-authored-by: acid-chicken <root@acid-chicken.com>
2022-06-03 22:06:36 +09:00
sn0w
42e436459c fix(client): correctly handle MiAuth URLs with query string (#8772) 2022-06-03 21:22:03 +09:00
tamaina
aecd48f59b add @rollup/pluginutils 2022-06-03 07:47:23 +00:00
tamaina
74e0d2a0f5 Fix yarn.lock
Co-authored-by: ishowta <ishowta@gmail.com>
2022-06-02 22:37:19 +09:00
tamaina
8462fb2933 continue-on-error: true 2022-06-02 10:51:29 +00:00
tamaina
8a92d4139d Merge branch 'develop' into pr/ThatOneCalculator/8764 2022-06-02 10:21:08 +00:00
Johann150
5447012352 fix(dev): no labels for l10n_develop 2022-06-01 09:34:40 +02:00
Johann150
58752fab0b fix: server metrics widget 2022-06-01 08:51:00 +02:00
ThatOneCalculator
f2a371c4d3 ????? 2022-05-31 20:03:15 -07:00
ThatOneCalculator
a71bdad55c test 2022-05-31 20:02:42 -07:00
ThatOneCalculator
3fb7986425 I don't know why github workflows hates me... 2022-05-31 19:59:15 -07:00
ThatOneCalculator
8cda9e496d :bowtie: 2022-05-31 19:51:54 -07:00
ThatOneCalculator
fe5f848ee5 Fix changelog 2022-05-31 19:45:57 -07:00
ThatOneCalculator
3cff4e6144 pnpm = dont change paths 2022-05-31 19:44:04 -07:00
ThatOneCalculator
1aa7bce3ff package.json names 2022-05-31 19:41:15 -07:00
ThatOneCalculator
c306c2a4e6 Make client/backend lints seperate workflows 2022-05-31 08:50:03 -07:00
ThatOneCalculator
abb1e025f5 Merge branch 'yarn-3' of https://github.com/ThatOneCalculator/misskey into yarn-3 2022-05-31 08:44:49 -07:00
Kainoa Kanter
83a6e9daf5 Update test.yml 2022-05-31 08:38:27 -07:00
Kainoa Kanter
0714881f4d Update lint.yml 2022-05-31 08:37:15 -07:00
Kainoa Kanter
57fe5759ab Update .dockerignore 2022-05-31 08:33:03 -07:00
Johann150
d3e65bc8b7 fix(lint): indentation 2022-05-31 16:22:00 +02:00
Johann150
7c9d07cd53 fix(mfm): remove duplicate br tag/newline (#8616) 2022-05-31 18:57:55 +09:00
Andreas Nedbal
f0b27fa22b Extract commonly used test logic to commands (#8767)
* meta(tests): enable workflows to run in branch

* feat(tests): move commonly used logic to Cypress commands

* chore(tests): replace more code with commands

* meta(tests): disable workflows to run in branch
2022-05-31 17:57:01 +09:00
MeiMei
857b9cab2b Fix Cannot find module issue (#8770)
* Add --force to yarn in the installation script

* CHAGELOG
2022-05-31 17:55:07 +09:00
Johann150
8e296b2398 fix: always remove completed tasks (#8771) 2022-05-31 17:54:02 +09:00
MeiMei
f59e364a85 Fix IP address rate limit (#8758)
* Fix IP address rate limit

* CHANGELOG

* Tune getIpHash
2022-05-31 17:44:22 +09:00
ThatOneCalculator
b5d8a40d73 uhh 2022-05-31 00:26:50 -07:00