OpenSource/Sharkey
OpenSource/Sharkey
1
0
Fork 0
mirror of https://activitypub.software/TransFem-org/Sharkey.git synced 2024-12-15 00:55:48 +01:00
Code Issues Projects Releases Packages Wiki Activity
28604 commits 56 branches 924 tags 271 MiB
Commit graph

3004 commits

Author SHA1 Message Date
Hazel K
fea993f6b2 correct name of SkLatestNote 2024-10-15 14:16:46 -04:00
Hazelnoot
86a693b182 factor out tuple logic into from-tuple.ts 2024-10-15 14:03:57 -04:00
Hazelnoot
4e592fb1c9 federate Flag.object as an array to fix Pleroma compatibility 2024-10-15 13:54:28 -04:00
Hazelnoot
652cc8602c refresh locales after any change, not just a version update 2024-10-15 12:23:18 -04:00
Hazelnoot
2cd41228d8 Merge branch 'develop' into feature/2024.9.0 2024-10-13 11:35:10 -04:00
Lhc_fl
0e6ba9ccd4 ux: should not show follow requests tab when have no pending sent follow req 2024-10-13 01:04:40 -04:00
Lhc_fl
1eacf0772c FEAT: Allow users to view pending follow requests they sent 
This commit implements the `following/requests/sent` interface firstly
implemented on Firefish, and provides a UI interface to view the pending
follow requests users sent.
 2024-10-13 01:04:40 -04:00
Marie
45974a53f8 merge: try to avoid insert races in FederatedInstanceService (!683) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/683

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-13 00:17:16 +00:00
dakkar
80fdb595a6 fix editing notes 2024-10-12 19:45:47 +01:00
dakkar
06bd29f209 try to avoid insert races in FederatedInstanceService 
Despite the cache, different processes can race to insert a row for
the same remote host.

This is particularly apparent in our unit tests, with
`test/unit/activitypub.ts` randomly failing.

This is a (somewhat clumsy) attempt at working around that race: trap
the "duplicate key value" error, and fetch the record.

Tests pass, with or without values in the cache.
 2024-10-12 10:57:57 +01:00
dakkar
98f1f30e72 fix "federation allowed" check in our code 2024-10-12 09:35:45 +01:00
Marie
f68c0ac05d fix: broken error images 2024-10-11 22:06:37 +00:00
Hazelnoot
a39f5c92b4 add missing rejectReports field to show-instance response 2024-10-11 10:21:32 -04:00
dakkar
fb9b6b1208 thank you linters 2024-10-11 12:20:08 +01:00
dakkar
02d36c4518 Merge branch 'develop' into feature/2024.9.0 2024-10-11 10:10:16 +01:00
dakkar
a12815eabe fix some (all?) Misskey references 2024-10-11 09:59:21 +01:00
Hazelnoot
ffff1dfc7d merge: Reduce federation log spam (maybe resolves #689) (!649) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/649

Closes #689

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-10 19:43:39 +00:00
dakkar
9ea618c4a5 fix some DI mistakes after the merge 2024-10-10 13:55:52 +01:00
dakkar
ebe5f678f6 fix imports in channels bubble-timeline 2024-10-09 17:57:58 +01:00
dakkar
dec81d32d3 fix type in channel.ts 2024-10-09 17:56:40 +01:00
dakkar
671d71b3ba probably use correct icons in embeds 2024-10-09 17:24:33 +01:00
dakkar
43bdae4cc4 use injected meta in search-by-tag 2024-10-09 17:19:50 +01:00
dakkar
3b3bd68645 use injected meta in MastodonApiServerService 2024-10-09 17:18:38 +01:00
dakkar
9200d35f57 use injected meta in stream bubble-timeline 2024-10-09 17:17:27 +01:00
dakkar
7b7bc8b7b3 use injected meta in claim-achievement.ts 2024-10-09 17:15:27 +01:00
dakkar
96e77f8d39 use injected meta in like.ts 
also, add extra errors copied from reactions/create.ts
 2024-10-09 17:15:04 +01:00
dakkar
81376bcd1b use injected meta in SigninApiService 2024-10-09 17:10:02 +01:00
dakkar
ee439f9c7f remove MetaService from ActivityPubServerService 2024-10-09 17:07:43 +01:00
dakkar
f449e8ffe6 use injected meta is ApRendererService 2024-10-09 17:05:59 +01:00
dakkar
c31ee21485 fix meta in SignupService 2024-10-09 17:04:31 +01:00
dakkar
e6a78d8027 use injected meta in SponsorsService 2024-10-09 17:03:46 +01:00
dakkar
b04568f378 use injected meta in bubble-timeline 2024-10-09 17:00:38 +01:00
dakkar
ad33886bbb always use this.meta in SignupApiService 2024-10-09 16:53:46 +01:00
dakkar
afbed7f605 check redisForReactions at startup 2024-10-09 16:49:49 +01:00
dakkar
11e3c95026 replace isBlockedHost with isFederationAllowedHost 2024-10-09 16:39:24 +01:00
dakkar
5856858f49 try to fix icons 2024-10-09 15:52:42 +01:00
dakkar
1a656e8eb5 copy changes from NoteCreateService to NoteEditService 2024-10-09 15:40:00 +01:00
dakkar
f00576bce6 Merge remote-tracking branch 'misskey/master' into feature/2024.9.0 2024-10-09 15:17:22 +01:00
Marie
72a0f16b38 merge: Show instance sponsors if OC is set as donation url (!642) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/642

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Julia <julia@insertdomain.name>
 2024-10-08 18:07:58 +00:00
Hazel K
a5316c06ed don't log job name unless it has one 2024-10-08 11:01:24 -04:00
Hazel K
5171ba7113 collapse AbortErrors 2024-10-08 10:43:58 -04:00
Hazel K
d867c2089b further condense error details 2024-10-08 10:43:51 -04:00
Hazel K
d8e1e4890d normalize ID logging 2024-10-08 10:33:48 -04:00
Hazel K
f62cd8941c condense error info 2024-10-08 10:33:34 -04:00
Hazel K
b4d10aa8f8 fix maxAttempts calculation 2024-10-08 10:29:03 -04:00
Hazel K
786702e076 condense job info 2024-10-08 10:27:55 -04:00
Hazel K
83869e1c47 fix lint errors 2024-10-08 10:14:33 -04:00
Hazel K
20dd66f735 improve error summaries 2024-10-08 10:14:26 -04:00
Hazel K
ed0570110b reduce federation log spam 
* Don't record stack trace for unrecoverable errors.
* Avoid logging duplicate stace traces.
 2024-10-08 09:30:08 -04:00
Hazelnoot
a90b4d487a merge: Increase character hard limits (resolves #686 and #696) (!647) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/647

Closes #686 and #696

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-07 23:20:14 +00:00
Marie
ba5eec2129 merge: Prevent deletion or suspension of system accounts (resolves #625) (!666) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/666

Closes #625

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-07 19:34:26 +00:00
Marie
f7e9ffb99a merge: Display instance follow/following relationships in instance view (partial implementation of 648) (!665) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/665

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-07 19:30:48 +00:00
Hazel K
cd9bce3072 prevent login and password reset for system accounts 2024-10-07 14:58:39 -04:00
Hazel K
126a2fcf15 Merge branch 'develop' into hazelnoot/625-protect-system-accounts 2024-10-07 14:10:45 -04:00
Hazel K
39214431f4 check for host 2024-10-07 11:45:58 -04:00
PrivateGER
46e53e294e
Parameterize followee as well 2024-10-07 16:47:15 +02:00
Hazel K
0da7f9b3f6 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-07 10:45:16 -04:00
Hazel K
844dfaaf5d model missing "approved" property in show-user response 2024-10-07 10:40:44 -04:00
PrivateGER
1c3495ef59
Make including followers in response a parameter 2024-10-07 16:23:24 +02:00
Hazel K
a790fef261 prevent deletion or suspension of system accounts 2024-10-07 10:02:55 -04:00
PrivateGER
a292e46f84 Pack other side of relation into response as well 2024-10-07 11:56:18 +02:00
PrivateGER
fadae347ff Merge branch 'develop' of https://activitypub.software/TransFem-org/Sharkey into feat/instance-admin-ui 2024-10-06 23:13:10 +02:00
Marie
28bfd87537 merge: Add option to reject reports from an instance (Resolves #579, #715, #716) (!662) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/662

Closes #579, #715, and #716

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 19:39:38 +00:00
Hazelnoot
42dbe999e1 merge: Change the recent external url warning popup to the one from Cherrypick/MisskeyIO (!648) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/648

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
 2024-10-06 17:56:36 +00:00
Hazel K
047563bdde Merge branch 'develop' into hazelnoot/579-reject-reports 
# Conflicts:
#	packages/frontend/src/pages/instance-info.vue
 2024-10-06 12:26:25 -04:00
Hazel K
4ca27692ac Merge branch 'develop' into hazelnoot/following-timeline 2024-10-06 11:16:43 -04:00
Hazel K
eec4a5082d fix OpenAPI definition for admin/meta.silencedHosts 2024-10-06 11:03:28 -04:00
Hazelnoot
ad4054f4e4 merge: Dont mark backfetched notes as silent (!655) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/655

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-06 13:56:44 +00:00
Marie
17617b6355 merge: Include Mastodon's "indexable" property on federated user profiles (resolves #713) (!660) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/660

Closes #713

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-06 10:47:14 +00:00
Hazel K
7dd296017b fix modlog and translations for "Mark as NSFW" 2024-10-05 22:43:34 -04:00
Hazel K
61124699da fix lint errors 2024-10-05 22:21:00 -04:00
Hazel K
4da0d4be71 add option to reject reports from an instance 2024-10-05 22:01:55 -04:00
Hazel K
c315f9ccf5 include Mastodon's "indexable" property on federated user profiles 2024-10-05 19:48:35 -04:00
PrivateGER
996d079476 Make remove-all-following remove follows in both directions 2024-10-05 19:59:50 +02:00
PrivateGER
1410f8d501 Experimental: dont mark backfetched notes as silent 2024-10-05 19:17:49 +02:00
PrivateGER
b3f925c426 Fix breaking follow relationships + add warning counts to dialogue 2024-10-05 19:06:05 +02:00
Evan Paterakis
d633fe41bc
Don't depend on launcher.moe for status assets 2024-10-05 14:49:29 +03:00
Hazel K
95a0e814bc remove numeric separators 2024-10-04 09:15:12 -04:00
Hazel K
8da3b064b7 fix lint errors 2024-10-04 09:14:17 -04:00
Marie
d5b372f7a9
upd&merge: Merge Cherrypick/MisskeyIO's external url popup, delete old popup warning and modify script to handle undefined domains 2024-10-04 02:31:22 +02:00
Hazel K
3842a1ee8c fix length validation 2024-10-03 20:05:15 -04:00
Hazel K
063b2ff266 increase character limits and share between text and CW 2024-10-03 19:53:57 -04:00
Marie
ac1e5a0fb5 merge: Feat: Implement "Show Below Avatar" for Avatar Decorations (!645) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/645

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-03 20:40:34 +00:00
Marie
4d011e7fe0
chore: change typing, remove unusued imports 2024-10-03 20:02:55 +02:00
Hazel K
97a16c2ebc Merge branch 'develop' into hazelnoot/following-timeline 2024-10-03 14:00:06 -04:00
dakkar
c2cc718f03 extract SponsorsService, use RedisKVCache 
Please someone add types…
 2024-10-03 18:48:11 +01:00
Marie
f6e0a04053 merge: maybe fix #510 - try to not edit visibility (!631) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/631

Closes #510

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-03 17:45:26 +00:00
Hazel K
40179a5591 lint fixes 2024-10-02 22:00:32 -04:00
CenTdemeern1
28aa99b273 Implement "Show Below Avatar" for Avatar Decorations 2024-10-02 23:49:30 +02:00
Hazel K
484a39c658 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 15:02:29 -04:00
Hazel K
19d7d44d0e use QueryService for blocks and mutes 2024-10-02 15:02:22 -04:00
Marie
f08ef28d54
upd: fix broken returns and change if statement 2024-10-02 19:39:06 +02:00
Marie
9dd51bc9eb
upd: fix donationUrl check position 2024-10-02 19:31:46 +02:00
Marie
6b459be117
upd: move totalSponsors and donationUrl check 2024-10-02 19:27:26 +02:00
Hazel K
d7f1e3f823 respect blocks and mutes for replies and renotes 2024-10-02 13:23:01 -04:00
Marie
34cbf55239
upd: apply suggestion 2024-10-02 19:16:54 +02:00
Hazel K
3defed6a19 fix exception when logging IP addresses 2024-10-02 12:47:01 -04:00
Marie
0897458c72
Merge branch 'develop' into upd/instancesponsor 2024-10-02 18:39:45 +02:00
Hazel K
7603ecddac respect domain mutes 2024-10-02 12:28:41 -04:00
Marie
dcd6eee627
upd: cache instance sponsors 2024-10-02 18:27:11 +02:00
Marie
3529042cb1
fix: api returns all backers on users so check if tier exists 2024-10-02 18:25:06 +02:00
Hazel K
7b2bc12ff9 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 12:18:29 -04:00
Marie
2e036d14c5
fix: sidebarLogoUrl type 2024-10-02 17:53:44 +02:00
Hazel K
705ae79eb1 Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 11:45:09 -04:00
Hazel K
ef7cde6bc6 fixes from peer review 2024-10-02 11:38:21 -04:00
Marie
1e0d372eb5
upd(backend): add support for instance oc urls 2024-10-02 17:20:30 +02:00
dakkar
0bd6d48c7e merge: Customize Sidebar/Visitor/About separately from app icon. (!632) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/632

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-02 14:55:20 +00:00
Hazel K
c0583e5d5c don't leak boost / quote / reply contents when CW is in effect 2024-10-02 00:54:35 -04:00
Hazel K
19204851a0 Revert "respect CWs in note summaries" 
This reverts commit cf49701c2a.
 2024-10-02 00:49:26 -04:00
Hazel K
5a36c91bf1 Revert "avoid TS errors in get-note-summary" 
This reverts commit 6785996960.
 2024-10-02 00:49:25 -04:00
Hazel K
2cad08001a Revert "preserve non-text details in note summaries" 
This reverts commit 23659ab013.
 2024-10-02 00:49:25 -04:00
Hazel K
cb10fe91bb preserve non-text details in note summaries 2024-10-01 18:28:25 -04:00
Hazel K
23659ab013 preserve non-text details in note summaries 2024-10-01 18:26:59 -04:00
Hazel K
94ce7272a7 avoid TS errors in get-note-summary 2024-10-01 14:47:06 -04:00
Hazel K
34aeeb0862 respect CWs in note summaries 2024-10-01 14:47:06 -04:00
Hazel K
6785996960 avoid TS errors in get-note-summary 2024-10-01 14:44:34 -04:00
Hazel K
cf49701c2a respect CWs in note summaries 2024-10-01 14:44:16 -04:00
Hazel K
acc0c7867f exclude boosts from featured timeline 2024-09-30 13:29:15 -04:00
Hazel K
8d3367dee3 fix more copyright headers 2024-09-30 12:14:00 -04:00
Hazel K
168ff64b03 fix copyright header 2024-09-30 12:06:44 -04:00
Hazel K
3479c2c13a add mutuals-only option 2024-09-30 01:12:29 -04:00
Hazel K
072f4b4608 add /notes/following endpoint 2024-09-30 00:49:45 -04:00
Hazel K
ebff2eec87 track latest note for each user 2024-09-29 23:24:22 -04:00
Hazel K
7b104ffe94 fix crash during startup 2024-09-29 23:22:58 -04:00
Hazel K
01ec9635c1 remove duplicate generated columns from LatestNote 2024-09-29 22:51:24 -04:00
Hazel K
0a09e6d86a clean up copy constructor 2024-09-29 22:50:39 -04:00
Hazel K
d1b5b54bad remove extra space 2024-09-29 22:50:29 -04:00
Hazel K
06932710f0 move migration to correct folder 2024-09-29 22:39:06 -04:00
Hazel K
a3d67b58ed add copy constructor to LatestNote 2024-09-29 21:52:57 -04:00
Hazel K
80b3da531e fix name of LatestNotesRepository 2024-09-29 21:52:43 -04:00
Hazel K
f8b55d357d add latest_note table 2024-09-29 21:27:38 -04:00
zyoshoka
1184436461
fix(backend): update and re-enable Bull Dashboard (#14648) 2024-09-29 18:44:55 +09:00
syuilo
f0d0cd2e50
wip (#14643) 2024-09-28 18:15:32 +09:00
syuilo
afbba1ff1c Update WebhookTestService.ts 2024-09-28 16:45:57 +09:00
syuilo
9e9198086d enhance(backend): add user.score for moderation purpose 2024-09-28 11:54:40 +09:00
syuilo
28e9d4e483
feat: フォローされた際のメッセージを設定できるようにする (#14430) 
* feat: フォローされた際のメッセージを設定できるようにする

Resolve #14425

* Update CHANGELOG.md

* 既にフォローしているユーザーのメッセージも見れるように

* Update packages/frontend/src/components/MkNotification.vue

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>

* fix indent

* Update users.ts

* wip

* Update users.ts

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
 2024-09-28 09:55:21 +09:00
Yuri Lee
b83a2f33ff
test(backend): Add test for Passkey API (#14635) 2024-09-28 08:09:30 +09:00
かっこかり
d8a2eeb7ed
feat: エクスポート完了時に通知を発行するように (#14484) 
* feat: エクスポート完了時に通知を発行するように

* Update Changelog

* entitity -> entity

* fix: ペイロードを含むように

* fix icon

* exportableEntities -> userExportableEntities
 2024-09-26 14:15:03 +09:00
KOBA789
7134d24c1f
perf(backend): Defer instance metadata update (#14558) 
* Defer instance metadata update

* Fix last new line

* Fix typo

* Add license notice

* Fix syntax

* Perform deferred jobs on shutdown

* Fix missing async/await

* Fix typo :)

* Update collapsed-queue.ts

---------

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-09-26 10:25:20 +09:00
Yuri Lee
d8dd1683c9
Add Sign in with passkey Button (#14577) 
* Sign in with passkey (PoC)

* 💄 Added "Login with Passkey" Button

* refactor: Improve error response when WebAuthn challenge fails

* signinResponse should be placed under the SigninWithPasskeyResponse object.

* Frontend fix

* Fix: Rate limiting key for passkey signin

Use specific rate limiting key: 'signin-with-passkey'  for passkey sign-in API to avoid collisions with signin rate-limit.

* Refactor: enhance Passkey sign-in flow and error handling

- Increased the rate limit for Passkey sign-in attempts to accommodate the two API calls needed per sign-in.
- Improved error messages and handling in both the `WebAuthnService` and the `SigninWithPasskeyApiService`, providing more context and better usability.
- Updated error messages to provide more specific and helpful details to the user.

These changes aim to enhance the Passkey sign-in experience by providing more robust error handling, improving security by limiting API calls, and delivering a more user-friendly interface.

* Refactor: Streamline 2FA flow and remove redundant Passkey button.

- Separate the flow of 1FA and 2FA.
- Remove duplicate passkey buttons

* Fix: Add error messages to MkSignin

* chore: Hide passkey button if the entered user does not use passkey login

* Update CHANGELOG.md

* Refactor: Rename functions and Add comments

* Update locales/ja-JP.yml

Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>

* Fix: Update translation

- update index.d.ts
- update ko-KR.yml, en-US.yml
- Fix: Reflect Changed i18n key on MkSignin

---------

Co-authored-by: Squarecat-meow <kw7551@gmail.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-09-26 08:25:33 +09:00
かっこかり
aee984813d
fix(backend): embedの動作に必要な値を復活させる (#14633) 2024-09-25 19:27:50 +09:00
かっこかり
dd124a8aed
Fix: <link rel="alternate">を追って照会するのはOKレスポンスが返却された場合のみに (#14627) 
* Only accept HTML `<link rel="alternate">` on success

(cherry picked from commit 6ea48be84a)

* Use `res.ok` instead of 200-299

(cherry picked from commit b667a68bd4)

* jsdomに戻す

* Update Changelog

* Revert "jsdomに戻す"

This reverts commit c03603611b74d16df52e77e44c558e958a82f3f4.

* 🎨

---------

Co-authored-by: Julia Johannesen <julia@insertdomain.name>
 2024-09-25 12:31:37 +09:00
かっこかり
6a1a2bef43
fix(backend): RBTの修正 (#14621) 
* fix(backend): 絵文字の変換処理が不十分なのを修正

* enhance: リアクションバッファリングが無効になったら即bakeするように

* attempt to fix test

* fix
 2024-09-24 18:29:02 +09:00
かっこかり
3674e9b1cb
feat: adminのファイル一覧画面で、ファイルが添付されているノートを一覧できるように (#14403) 
* enhance(moderation): モデレーターがファイルが添付されているノートを照会できるように (MisskeyIO#680)

Co-authored-by: riku6460 <17585784+riku6460@users.noreply.github.com>
Co-authored-by: nenohi <kimutipartylove@gmail.com>
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
(cherry picked from commit b059162324d2cfc697d1af9f3b6fb49fad2734e0)

* Update Changelog

* ✌️

Co-authored-by: riku6460 <17585784+riku6460@users.noreply.github.com>
Co-authored-by: nenohi <kimutipartylove@gmail.com>
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>

---------

Co-authored-by: Yuuki <yukikum57@gmail.com>
Co-authored-by: riku6460 <17585784+riku6460@users.noreply.github.com>
Co-authored-by: nenohi <kimutipartylove@gmail.com>
Co-authored-by: まっちゃとーにゅ <17376330+u1-liquid@users.noreply.github.com>
 2024-09-24 10:11:09 +09:00
Aleteoryx
689848943b
Fix: Continue importing from file if single emoji import fails (#14461) 
* Fix: Continue importing from file if single emoji import fails

* Fix indentation

---------

Co-authored-by: かっこかり <67428053+kakkokari-gtyih@users.noreply.github.com>
Co-authored-by: syuilo <4439005+syuilo@users.noreply.github.com>
 2024-09-24 09:50:00 +09:00
dakkar
69efba9366 merge: Fetch sponsors from OC (!624) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/624

Closes #653

Approved-by: Julia <julia@insertdomain.name>
Approved-by: Tess K <me@thvxl.se>
 2024-09-23 17:57:39 +00:00
Julia
c94f6994dd merge: Only accept HTML <link rel="alternate"> on successful HTTP statuses (!633) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/633

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Tess K <me@thvxl.se>
Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-09-23 17:51:26 +00:00
Julia
30c1c7c24d merge: simpler RateLimitService, might help with the leaks (!627) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/627

Approved-by: Julia <julia@insertdomain.name>
Approved-by: Marie <github@yuugi.dev>
Approved-by: Tess K <me@thvxl.se>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-09-23 16:51:39 +00:00
piuvas silly
41edc4cfbd Update 4 files 
- /packages/frontend/src/pages/admin/branding.vue
- /packages/backend/src/models/Meta.ts
- /packages/backend/src/server/api/endpoints/admin/meta.ts
- /packages/backend/src/server/api/endpoints/admin/update-meta.ts
 2024-09-23 16:34:29 +00:00
piuvas silly
6c916af4ee Update InstanceEntityService.ts 2024-09-23 16:23:57 +00:00