Commit graph

831 commits

Author SHA1 Message Date
tamaina
fba88e110a https://github.com/misskey-dev/misskey/pull/8764#discussion_r885749892 2022-06-04 23:34:23 +09:00
tamaina
c0fea1c1ff fix 2022-06-04 08:44:36 +00:00
tamaina
09d1ba9f68 Merge branch 'develop' into pr/ThatOneCalculator/8764 2022-06-04 08:34:56 +00:00
syuilo
89419c05b2 use node 16 2022-06-04 17:26:56 +09:00
tamaina
fd5595724c fix http-signature 2022-06-04 08:26:36 +00:00
syuilo
abcd5bc951 update summaly 2022-06-04 17:24:41 +09:00
tamaina
41fadc9ae9 yarn node => node
依存関係の記載不足の解消がかなり多いため、yarn nodeは使わない
2022-06-04 08:07:27 +00:00
tamaina
1a837bbef4 wip 2022-06-04 08:01:02 +00: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
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
a53663f4df Merge branch 'develop' into pr/ThatOneCalculator/8764 2022-06-02 10:21:08 +00:00
Johann150
118f354661
fix: server metrics widget 2022-06-01 08:51:00 +02: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
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
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
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
Kainoa Kanter
54ed997e53
Merge branch 'misskey-dev:develop' into yarn-3 2022-05-30 20:57:45 -07:00
ThatOneCalculator
de29d9adb2 Change browser-image-resizer 2022-05-30 20:45:54 -07:00
ThatOneCalculator
95aff06dfc More yarn workspaces stuff 2022-05-30 17:31:24 -07:00
ThatOneCalculator
d76ec576b6 tbh 2022-05-30 15:02:52 -07:00
ThatOneCalculator
299ec96e0e tbh 2022-05-30 15:02:31 -07:00
tamaina
857055a9dd chore: fix import tinycolor 2022-05-30 12:09:22 +00:00
tamaina
465531d56c Merge branch 'develop' of https://github.com/misskey-dev/misskey into develop 2022-05-30 05:53:40 +00:00
tamaina
9759ca7d24 chore: remove packages/sw/webpack.config.js 2022-05-30 05:53:36 +00:00
ThatOneCalculator
dd1bfae823 fix the code that depends on node_modules 2022-05-29 22:19:40 -07:00
Kainoa Kanter
c05cc01191
Merge branch 'misskey-dev:develop' into yarn-3 2022-05-29 19:43:38 -07:00
Andreas Nedbal
3905185463
fix(client): import shared ESLint config in client package (#8761) 2022-05-30 11:37:34 +09:00
ThatOneCalculator
7bd65cf986 Remove packages/*/yarn.lock 2022-05-29 18:19:30 -07:00
ThatOneCalculator
5c7fca456c Yarn berry 2022-05-29 12:40:08 -07:00
Johann150
ebc2566130
fix: add missing import
fix #8756
2022-05-29 14:33:42 +02:00
futchitwo
d2784030ec
fix(client): fix popout url (#8494) 2022-05-29 12:21:36 +02:00
Johann150
804fa33535
refactor: improve code quality (#8751)
* remove unnecessary if

`Array.prototype.some` already returns a boolean so an if to return
true or false is completely unnecessary in this case.

* perf: use count instead of find

When using `count` instead of `findOneBy`, the data is not
unnecessarily loaded.

* remove duplicate null check

The variable is checked for null in the lines above and the function
returns if so. Therefore, it can not be null at this point.

* simplify `getJsonSchema`

Because the assigned value is `null` and the used keys are only
shallow, use of `nestedProperty.set` seems inappropriate. Because the
value is not read, the initial for loop can be replaced by a `for..in`
loop.

Since all keys will be assigned `null`, the condition of the ternary
expression in the nested function will always be true. Therefore the
recursion case will never happen. With this the nested function can be
eliminated.

* remove duplicate condition

The code above already checks `dragging` and returns if it is truthy.
Checking it again later is therefore unnecessary.

To make this more obvious the `return` is removed in favour of using
an if...else construct.

* remove impossible "unknown" time

The `ago` variable will always be a number and all non-negative numbers
are already covered by other cases, the negative case is handled with
`future` so there is no case when `unkown` could be achieved.
2022-05-29 15:15:52 +09:00
tamaina
f1d2398eac
fix(client): Vite related boot mechanism revision (#8753)
* preload app css

* remove salt

* APP_FETCH_FAILED error

* set max-age to 15s
2022-05-29 10:58:54 +09:00