Commit graph

1384 commits

Author SHA1 Message Date
dakkar
949664147e fill myReaction in more cases - may fix !944
* first of all, fetch from the buffer all the notes we may
	need (including replied-to ones)
* then, distinguish between "we know there's no myReaction" and "we
  don't know if there's any myReaction"
* finally, look at both a note and the note it's replying to
2025-02-16 11:41:32 +00:00
Hazelnoot
ec29e12c97 Merge branch 'develop' into merge/2024-02-03
# Conflicts:
#	packages/backend/src/core/SearchService.ts
2025-02-15 11:30:26 -05:00
Marie
dc6f13728c merge: Fix timeout when searching notes by host without meilisearch (resolves #940) (!896)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/896

Closes #940

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-15 11:00:33 +00:00
Hazelnoot
c67d985254 Merge branch 'develop' into merge/2024-02-03
# Conflicts:
#	packages/backend/src/core/SearchService.ts
#	packages/misskey-js/src/autogen/types.ts
2025-02-14 23:48:36 -05:00
Hazelnoot
493000290b fix performance of SQL LIKE note search 2025-02-14 20:16:39 -05:00
Hazelnoot
c8bb7b9816 fix error when searching without a specified host 2025-02-13 17:40:32 -05:00
Hazelnoot
667262dcfb Merge branch 'develop' into merge/2024-02-03
# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/SearchService.ts
#	packages/frontend/src/pages/search.note.vue
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml
2025-02-13 17:04:50 -05:00
Hazelnoot
a95bfb7241 search notes with denormalized userHost field 2025-02-13 16:56:32 -05:00
Hazelnoot
ed981a6970 add new note search file types (module, flash) and optimize file type query 2025-02-13 09:28:46 -05:00
Hazelnoot
fb058410f6 fix pgroona note.text query 2025-02-12 11:01:26 -05:00
Hazelnoot
feb80ee992 Merge branch 'develop' into merge/2024-02-03 2025-02-11 10:52:52 -05:00
Hazelnoot
5276d6024d merge: Cleanup and bulk fixes to Mastodon API (resolves #495, #509, #707, #714, #721, #804, #811, #865, and partially #492) (!879)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/879

Closes #495, #509, #707, #714, #721, #804, #811, #865, and #492

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
2025-02-10 16:28:32 +00:00
Hazelnoot
2f84d151f5 merge: Allow user-initiated object lookups (/ap/show endpoint) to follow cross-domain redirects (resolves #820) (!878)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/878

Closes #820

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-10 16:22:20 +00:00
Hazelnoot
5a1d1394d4 add memo and isInstanceMuted to UserRelation API entity 2025-02-08 13:17:47 -05:00
Hazelnoot
7e1b4b259a Merge branch 'develop' into merge/2024-02-03
# Conflicts:
#	packages/backend/src/server/ActivityPubServerService.ts
#	pnpm-lock.yaml
2025-02-08 13:16:37 -05:00
Hazelnoot
50a3e55be4 merge: Rework rate limit factors and add caching (resolves #884) (!884)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/884

Closes #884

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-08 15:05:01 +00:00
Marie
9731a614a1 merge: Enable FreeBSD to be used for deployment (!887)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/887

Closes #928

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
2025-02-07 20:37:50 +00:00
dakkar
09128ef399 pick lints 2025-02-07 18:33:24 +00:00
dakkar
d426e2a7ef fix our ruby/group hack 2025-02-07 18:22:45 +00:00
Hazelnoot
f36029f795 Merge branch 'develop' into merge/2024-02-03
# Conflicts:
#	locales/index.d.ts
#	packages/backend/src/core/entities/UserEntityService.ts
#	packages/frontend/src/_dev_boot_.ts
#	packages/misskey-js/src/autogen/types.ts
#	sharkey-locales/en-US.yml
2025-02-07 11:57:44 -05:00
Marie
ef90b2e5a7
chore: add quotes to RoleService 2025-02-07 15:09:53 +01:00
Marie
d629b882b0 merge: Allow users to set a default content warning for their new posts (resolves #901) (!881)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/881

Closes #901

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
2025-02-07 03:47:20 +00:00
Marie
2928ccf1e4 merge: handle more complex ruby from/to html - fixes #605 (!866)
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/866

Closes #605

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
2025-02-07 03:40:55 +00:00
Marie
24528ed0c3 fix: Allow FreeBSD to start Backend without any issues 2025-02-06 22:54:47 +01:00
Hazelnoot
c8f8a61a00 add MiUserProfile.defaultCWPriority property and API 2025-02-05 14:22:50 -05:00
Hazelnoot
74407bc8ee add MiUserProfile.defaultCW property and API 2025-02-05 14:22:50 -05:00
Hazelnoot
d831c168aa support Mastodon's version of "alternate links" 2025-02-05 14:21:38 -05:00
Hazelnoot
88dd36ce83 narrow return type for signedGet 2025-02-05 14:21:38 -05:00
Hazelnoot
9a7a9e3461 loosen parameter types for getApId and getNullableApId 2025-02-05 14:21:38 -05:00
Hazelnoot
09669d72e7 lookup and cache rate limit factors directly within SkRateLimiterService 2025-02-05 11:20:25 -05:00
Hazelnoot
176db52d88 fix formatting in SignupService.ts 2025-02-04 09:49:43 -05:00
Hazelnoot
c1a8654f0d fix import order in FederatedInstanceService.ts 2025-02-04 09:20:55 -05:00
Hazelnoot
baff0605e0 fix import order in UserEntityService.ts 2025-02-04 09:16:35 -05:00
Hazelnoot
a8e4ad28b3 remove unused DI parameter 2025-02-04 09:15:14 -05:00
Hazelnoot
ce8374bdc9 remove spurious newline 2025-02-04 09:13:49 -05:00
Hazelnoot
21667a0422 convert private field to constructor param 2025-02-04 09:13:03 -05:00
Hazelnoot
878b4d3899 remove spurious code style / formatting changes in ApRequestService.ts 2025-02-04 09:10:52 -05:00
Hazelnoot
47bf96988c fix meilisearch merge 2025-02-03 18:27:09 -05:00
Hazelnoot
8c1d5281a9 remove unused import in FileInfoService.ts 2025-02-03 18:21:32 -05:00
Hazelnoot
19d3cdfa37 fix "delete file when updating emoji" logic 2025-02-03 18:20:26 -05:00
Hazelnoot
5781e99861 port FriendlyCaptcha to the new captcha infrastructure 2025-02-03 18:17:12 -05:00
Hazelnoot
b5ff784b1c remove unused AiService.ts 2025-02-03 15:08:47 -05:00
Hazelnoot
3391c2414b add IdentifiableError.isRetryable to ensure that Identifiable Errors can still terminate a batch process 2025-02-03 15:03:42 -05:00
Hazelnoot
3f80138c70 fix lint error in ApRendererService.ts 2025-02-03 14:50:00 -05:00
Hazelnoot
70d8ea8464 copy changes to NoteEditService.ts 2025-02-03 14:41:16 -05:00
Hazelnoot
a4e86758c1 merge upstream 2025-02-03 2025-02-03 14:36:09 -05:00
Kinetix
bf1f263d72 Merge remote-tracking branch 'upstream/develop' into configrobotstxt 2025-01-29 09:30:21 -08:00
Kinetix
993532bc1f Adding robots.txt override via admin control panel
This is a requested low priority feature in #418 - I created the changes
to follow similarly to how the Instance Description is handled.
2025-01-28 15:57:45 -08:00
969a34b4c3 🎉 First Commit (.config/cypress-devcontainer.yml, .config/docker_e...) 2025-01-28 18:51:00 +09:00
Hazelnoot
4ec2ef2921 handle null values for discoverable property 2025-01-27 18:13:49 -05:00