Commit Graph

168 Commits

Author SHA1 Message Date
Effy Elden 94e4f1323f
Set quoteUri in rendered ActivityPub objects 2023-01-04 13:32:06 +11:00
Effy Elden 1d45bdbfdc
Support quotes provided as 'quoteUri' field 2023-01-04 12:08:09 +11:00
ThatOneCalculator c0cf1e2bf4
fixes 2023-01-03 09:12:26 -08:00
Daikei! 76d71a39db add .js to the end of two type-scripts, fixing a critical error that crashes calckey 2022-12-27 15:38:05 +00:00
Johann150 d7390e09ff
activitypub: block check for resolving collections 2022-12-25 15:10:44 -05:00
Francis Dinh d2066d0d86
add checks to resolver and performOneActivity 2022-12-25 15:10:33 -05:00
Francis Dinh d9b7219404
Block subdomains of blocked hosts 2022-12-24 14:46:09 -05:00
Cleo b1933d00b9 Merge pull request '[Chore] Partial translating of ActivityPub/Boot code + Formatting' (#9229) from prettykool/calckey:develop into develop
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9229
2022-12-18 21:01:22 +00:00
PK 83c7abd9b4
Make indentation not completely suck 2022-12-15 18:09:00 -06:00
PK 9894b203c9
Formatting 2022-12-15 16:13:48 -06:00
PK 845dfc3838
Translate portions of `backend/src/remote/activitypub`, the `suspend-user` service, and the boot process.
Some of these weren't translated so I thought I'd do 'em cause why not ¯\_(ツ)_/¯
2022-12-15 12:44:03 -06:00
cutestnekoaqua 8a7da9eaa0
fix federation of moved to to pleroma
because it expects it to be non-existant if its null.
2022-12-14 17:19:31 +01:00
cutestnekoaqua 5a2bd3d379 add local move follower migration 2022-12-12 21:09:51 +01:00
cutestnekoaqua 25fc88afd6 federation 💀 2022-12-12 21:09:51 +01:00
ThatOneCalculator 1f9ad0f61b
fix alsoKnownAs federation 2022-12-12 11:25:28 -08:00
ThatOneCalculator 50cb7c6de1
Bug fixes, use calckey.js 2022-12-11 19:24:12 -08:00
ThatOneCalculator f9615f233f
Reserve merge conflict 2022-12-11 17:07:57 -08:00
cutestnekoaqua 016c328d28 fix queue?
maybe pls

debug log

fixed stupidness again

fix ??

fix import

im a idiot lol

make remote mig work
2022-12-12 01:54:41 +01:00
cutestnekoaqua 178a39347e change move sql query 2022-12-12 01:54:41 +01:00
cutestnekoaqua ccb1269991 fix remote move queue 2022-12-12 01:54:36 +01:00
cutestnekoaqua b967316d6b make remote mig work 2022-12-09 01:57:15 +01:00
cutestnekoaqua ac887c8999 im a idiot lol 2022-12-09 01:35:15 +01:00
cutestnekoaqua a9d446f9bf fix import 2022-12-09 01:20:30 +01:00
cutestnekoaqua 30597c747f fix ?? 2022-12-09 01:17:31 +01:00
cutestnekoaqua 7dd540bf43 fixed stupidness again 2022-12-09 00:11:37 +01:00
cutestnekoaqua 41c9cd5c75 debug log 2022-12-09 00:08:33 +01:00
cutestnekoaqua ddc477438a maybe pls 2022-12-08 20:02:55 +01:00
cutestnekoaqua 964fdefdae fix queue? 2022-12-08 19:28:48 +01:00
cutestnekoaqua cce58503e4 change move sql query 2022-12-08 15:53:37 +01:00
cutestnekoaqua 2694baf85d fix remote move queue 2022-12-07 18:16:37 +01:00
cutestnekoaqua ef707b01bc update person model 2022-12-06 23:49:21 +01:00
cutestnekoaqua 2051bec543 fix ap person to db model
fixed entries of movedToUri and added entries of alsoKnownAs
2022-12-06 18:05:36 +01:00
Cleo 170957ef05 Merge pull request 'just using merge bc easier' (#9185) from recieve_moveto into account_migration
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9185
2022-12-06 16:56:12 +00:00
cutestnekoaqua 8ff823eca6 commit 1 of 2 of fixing the Account migration to Calckey 2022-12-06 17:46:08 +01:00
ThatOneCalculator 83f56e4543 fixes 2022-12-04 17:24:27 -08:00
ThatOneCalculator 7ff11d0b52 fix 2022-12-04 17:23:43 -08:00
ThatOneCalculator 77d088ee12 movedTo -> movedToUri 2022-12-04 17:20:36 -08:00
ThatOneCalculator 2ef9011b8d fix import once and for all 2022-12-04 13:06:49 -08:00
ThatOneCalculator eaf070f20d ? 2022-12-04 13:03:17 -08:00
ThatOneCalculator 51431a887f more jb cleanups 2022-12-04 13:01:00 -08:00
ThatOneCalculator 3d75ccf24a pov: cleo uses jetbrains 2022-12-04 12:57:43 -08:00
ThatOneCalculator df1359e392 fix imports 2022-12-04 12:46:10 -08:00
Kainoa Kanter 0e8b155e07 Merge pull request 'develop' (#9178) from develop into account_migration
Reviewed-on: https://codeberg.org/thatonecalculator/calckey/pulls/9178
2022-12-04 06:26:26 +00:00
cutestnekoaqua ed23b0bd6f Implement recieve moveTo
Untested, hopefully it works..

Signed-off-by: cutestnekoaqua <waterdev@galaxycrow.de>
2022-12-03 01:23:02 +01:00
skeh 3ff6433fab Merge pull request 'hotfix/misskey-forkbomb' (#8) from hotfix/misskey-forkbomb into stage
Reviewed-on: https://code.vtopia.live/Vtopia/MissV/pulls/8
2022-12-01 00:30:55 -08:00
cutestnekoaqua 2f04d5f915 Create move type 2022-11-23 21:49:52 +01:00
ThatOneCalculator aa66bded69 init 2022-11-17 13:54:25 -08:00
Johann150 5a691f7e98 server: avoid adding suspended instances to deliver queue
This should reduce the performance hit when adding large numbers of
instances to the deliver queue by making the check for suspended and
dead instances a bulk operation.

Changelog: Changed
Reviewed-on: https://akkoma.dev/FoundKeyGang/FoundKey/pulls/215
2022-11-09 17:19:29 -08:00
ThatOneCalculator b383c904b2 change to click.self 2022-10-28 10:52:13 -07:00
ThatOneCalculator 59f80c60b9 Merge remote-tracking branch 'nullobsi/secure-fetch' into develop 2022-09-13 20:23:22 -07:00
nullobsi a03f13fb3f
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-09-06 20:46:41 -07:00
ThatOneCalculator 899d7b42b5 Always `signToActivityPubGet` 2022-08-22 23:44:26 -07:00
ThatOneCalculator 497675c49e import order 2022-08-04 18:13:56 -07:00
ThatOneCalculator 4cae839bfa thumbs up or star trggers pleroma like 2022-08-04 18:12:57 -07:00
Johann150 74cf3d887c backend: fix lint "no-throw-literal" 2022-08-04 13:36:37 -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 d88f07f431 Properly apply star is like patch 2022-07-19 15:23:26 -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
yzhe819 9107de63b4
chore: fix lint errors (#8981) 2022-07-10 19:47:29 +09:00
Johann150 a5241379af
fix lints 2022-06-24 12:44:22 +02: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
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
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
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
Johann150 e54aa56ee1
chore: remove unused imports 2022-05-28 21:17:23 +02:00
Johann150 6b109c7b0f
fix: wrong type for isVisibleForMe 2022-05-24 10:12:42 +02:00
Johann150 edfded7fb7
fix(activitypub): add authorization checks (#8534)
* fix spelling

* fix(activitypub): add authorization checks
2022-05-19 20:40:16 +09:00
syuilo ce51ef5df5 refactor 2022-04-17 21:01:02 +09:00
syuilo 31e5c5f69a refactor
Resolve #8467
2022-04-17 20:58:37 +09:00
syuilo 02bb36cdc4 refactor: fix type 2022-04-17 20:44:21 +09:00
syuilo 2d2b3edaaf refactor: fix type 2022-04-17 13:26:31 +09:00
syuilo ddd655c0c1 refactor: fix type 2022-04-17 13:14:29 +09:00
syuilo d39465085c refactor: fix type 2022-04-17 12:59:41 +09:00
syuilo 4907dc91f7 lint 2022-04-16 17:18:51 +09:00
syuilo 7f5d189528 fix type 2022-04-03 16:40:47 +09:00
syuilo ff9a074ab6 fix type 2022-04-03 16:35:36 +09:00
syuilo 91f4ec3747 fix types 2022-04-03 16:30:22 +09:00
syuilo 41c2aed7dc chore: fix lint 2022-04-03 15:33:22 +09:00
syuilo 6b6464a659 fix syntax error 2022-04-02 15:31:11 +09:00
Johann150 1033e8e57f
fix(federation): avoid duplicate activity delivery (#8429)
* prefer shared inbox over individual inbox

* no new shared inbox for direct recipes

* fix type error
2022-04-02 15:16:35 +09:00
syuilo 17589843da perf(server): use cached user info in getUserFromApId 2022-03-26 19:09:57 +09:00
syuilo 8cbfc047bb refactor 2022-03-26 18:42:37 +09:00
syuilo 3cac8e0f6f perf(server): improve deliver performance 2022-03-26 17:43:08 +09:00
syuilo 1c67c26bd8
refactor: migrate to typeorm 3.0 (#8443)
* wip

* wip

* wip

* Update following.ts

* wip

* wip

* wip

* Update resolve-user.ts

* maxQueryExecutionTime

* wip

* wip
2022-03-26 15:34:00 +09:00
syuilo ac8c66f5ab perf(server): refactor and performance improvements 2022-03-25 16:27:41 +09:00
Johann150 725b78349a
recognize null in _misskey_content for notes (#8440) 2022-03-23 03:16:04 +09:00
MeiMei ba9563b983
Use unique id for Undo (#8434) 2022-03-22 00:39:00 +09:00
syuilo 21de5c4a9c perf(server): reduce db query 2022-03-21 05:42:11 +09:00
syuilo aebd77ad38 perf(server): reduce db query 2022-03-20 15:44:49 +09:00
xianon 0a6c9a00bd
リレーが動作するように修正する (#8396) 2022-03-12 13:21:04 +09:00
syuilo 51517cf96c fix esm 2022-03-01 01:26:32 +09:00
syuilo 4701127946 fix esm 2022-03-01 01:24:50 +09:00
tamaina e314be5b59
Fix avatar/banner proxy (#8346)
* Fix avatar/banner proxy

Co-authored-by: mei23 <m@m544.net>

* use getAvatarUrl

* fix

* join avatar and banner to improve performance

* join

* Update hybrid-timeline.ts

* fix

Co-authored-by: mei23 <m@m544.net>
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
2022-02-27 13:59:10 +09:00
syuilo d071d18dd7
refactor: Use ESM (#8358)
* wip

* wip

* fix

* clean up

* Update tsconfig.json

* Update activitypub.ts

* wip
2022-02-27 11:07:39 +09:00
syuilo b6db709e02 refacator: fix typw 2022-02-19 14:53:33 +09:00