Commit Graph

20539 Commits

Author SHA1 Message Date
syuilo b62a050b2c Update CONTRIBUTING.md 2022-06-04 16:01:27 +09:00
syuilo 0946d50913 Update CONTRIBUTING.md 2022-06-04 16:01:11 +09:00
syuilo bb3c6785c9 Update CHANGELOG.md 2022-06-04 15:47:10 +09:00
syuilo 71150f21cd Revert "feat: option to collapse long notes (#8561)"
This reverts commit e675ffcf38.
2022-06-04 15:23:53 +09:00
syuilo 11afdf7e24 fix bug 2022-06-04 15:15:44 +09:00
syuilo 702edfd3d3 fix test 2022-06-04 14:25:30 +09:00
Balazs Nadasdi e675ffcf38
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 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
tamaina ac89f25b79 npm run => yarn 2022-06-03 22:39:07 +09:00
tamaina 9b727f6c2d add packageExtensions for chartjs_date-fns
Co-authored-by: acid-chicken <root@acid-chicken.com>
2022-06-03 22:06:36 +09:00
sn0w df3bbfb416
fix(client): correctly handle MiAuth URLs with query string (#8772) 2022-06-03 21:22:03 +09:00
tamaina 71538d4cbb add @rollup/pluginutils 2022-06-03 07:47:23 +00:00
tamaina 3e38e47b3a Fix yarn.lock
Co-authored-by: ishowta <ishowta@gmail.com>
2022-06-02 22:37:19 +09:00
tamaina 9264b50c32 continue-on-error: true 2022-06-02 10:51:29 +00:00
tamaina a53663f4df Merge branch 'develop' into pr/ThatOneCalculator/8764 2022-06-02 10:21:08 +00:00
Johann150 0263a783a6
fix(dev): no labels for l10n_develop 2022-06-01 09:34:40 +02:00
Johann150 118f354661
fix: server metrics widget 2022-06-01 08:51:00 +02:00
ThatOneCalculator 021a52cb40 ????? 2022-05-31 20:03:15 -07:00
ThatOneCalculator d34bb62dea test 2022-05-31 20:02:42 -07:00
ThatOneCalculator f4059eb6cb I don't know why github workflows hates me... 2022-05-31 19:59:15 -07:00
ThatOneCalculator e21919c296 :bowtie: 2022-05-31 19:51:54 -07:00
ThatOneCalculator 4d16fb70ce Fix changelog 2022-05-31 19:45:57 -07:00
ThatOneCalculator db0344e6ca pnpm = dont change paths 2022-05-31 19:44:04 -07:00
ThatOneCalculator 3820a0722d package.json names 2022-05-31 19:41:15 -07:00
ThatOneCalculator 66ab7591bf Make client/backend lints seperate workflows 2022-05-31 08:50:03 -07:00
ThatOneCalculator e489c5390e Merge branch 'yarn-3' of https://github.com/ThatOneCalculator/misskey into yarn-3 2022-05-31 08:44:49 -07:00
Kainoa Kanter 789d0f8201
Update test.yml 2022-05-31 08:38:27 -07:00
Kainoa Kanter e0c57cf1da
Update lint.yml 2022-05-31 08:37:15 -07:00
Kainoa Kanter 7bba4876af
Update .dockerignore 2022-05-31 08:33:03 -07:00
Johann150 121a1784a2
fix(lint): indentation 2022-05-31 16:22:00 +02:00
Johann150 025bf4a5e7
fix(mfm): remove duplicate br tag/newline (#8616) 2022-05-31 18:57:55 +09:00
Andreas Nedbal d3e242a7f2
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 95a3565d1c
Fix `Cannot find module` issue (#8770)
* Add --force to yarn in the installation script

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

* CHANGELOG

* Tune getIpHash
2022-05-31 17:44:22 +09:00
ThatOneCalculator e4dde132b4 uhh 2022-05-31 00:26:50 -07:00
ThatOneCalculator 2208df17cc New steps for test.yml too 2022-05-31 00:24:40 -07:00
ThatOneCalculator d5af0a6bc7 Skip extra install 2022-05-31 00:18:29 -07:00
ThatOneCalculator 099c62370c Add proper packages for eslint 2022-05-31 00:16:01 -07:00
ThatOneCalculator 75d2336d8e 🙏 2022-05-31 00:13:41 -07:00
ThatOneCalculator 33c58df79c Remove yarnrc for workspaces 2022-05-30 23:56:49 -07:00
ThatOneCalculator a872e6e3bb :godmode: 2022-05-30 23:55:47 -07:00
ThatOneCalculator 71a907007c :goberserk: 2022-05-30 21:03:11 -07:00
ThatOneCalculator 9daea49275 Merge branch 'yarn-3' of https://github.com/ThatOneCalculator/misskey into yarn-3 2022-05-30 20:57:49 -07:00
Kainoa Kanter 54ed997e53
Merge branch 'misskey-dev:develop' into yarn-3 2022-05-30 20:57:45 -07:00