DatseMultimediaSites
/
Sharkey
mirror of https://activitypub.software/TransFem-org/Sharkey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
28,436 Commits 60 Branches 923 Tags 254 MiB
Commit Graph

6853 Commits

Author SHA1 Message Date
dakkar c5ff081557 fix MkUrlWarningDialog imports 2024-10-09 15:52:42 +01:00
dakkar 7519f98462 copy changes from MkNoteDetailed to SkNoteDetailed 2024-10-09 15:52:42 +01:00
dakkar 3fca2ba2f6 copy changes from MkNote to SkNote 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 b4c53687b4 oops, missed a closing tag 2024-10-09 15:27:05 +01:00
dakkar f00576bce6 Merge remote-tracking branch 'misskey/master' into feature/2024.9.0 2024-10-09 15:17:22 +01:00
dakkar 2d6f1ed464 Merge branch 'merge-requests/668' into feature/2024.9.0 2024-10-09 10:41: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
piuvas 672c4f746c
inform users about sharkey specific localization 2024-10-08 00:33:16 -03:00
Hazel K eb5a2b023e count CW for character limit 2024-10-07 19:25:03 -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
Hazel K 5f435f7250 restore sorting of pinned notes 2024-10-07 16:26:30 -04:00
Hazel K c783ccf8cb sort pinned notes by date 2024-10-07 16:20:40 -04:00
Hazel K 35114df6d4 always default to latest notes instead of pins 2024-10-07 16:20:40 -04:00
Hazel K 3003affe6a fix extra gap above user notes 2024-10-07 16:20:40 -04:00
Hazel K 60ec877d3c on user profiles, move pinned notes down with the other notes 2024-10-07 16:20:40 -04:00
codingneko 3defc831c3 Fix formatting issues 2024-10-07 21:51:55 +02: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
Hazel K 9137ae1eef update autogen types 2024-10-07 11:21:52 -04:00
Hazel K 6cfadb1f61 add prefix to components 2024-10-07 11:21:37 -04:00
Hazel K 12de9fcb18 fix error display 2024-10-07 11:18:08 -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 adc7b91e3b fix UI hiding on admin-user.vue 2024-10-07 10:41:41 -04:00
Hazel K c77e90d98a update autogen types 2024-10-07 10:41:18 -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 bfd812720e Move styling to MkA elements 2024-10-07 12:46:28 +02:00
PrivateGER 80cbf00eac Add following and follower relationship view 2024-10-07 12:30:49 +02:00
PrivateGER a292e46f84 Pack other side of relation into response as well 2024-10-07 11:56:18 +02:00
codingneko 347dc25bb8 Add show bots toggle 2024-10-07 03:12:29 +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
PrivateGER f028795483 Move text into translation files 2024-10-06 20:31:41 +02: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
PrivateGER 941a200f35 Move button into button group 2024-10-06 19:53:10 +02:00
Marie 939f07fa55
upd: fix returns 2024-10-06 19:08:32 +02: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 60d0e3df7b preserve refresh button on mobile UI 2024-10-06 12:20:06 -04:00
Hazel K 01fb606fee fix weird left-alignment 2024-10-06 12:18:15 -04:00
Hazel K d016ef7675 fix display size reactivity 2024-10-06 12:02:56 -04:00
Marie 6d7c7357ab merge: Warn when a domain is implicitly blocked because a base domain is blocked (resolves #564) (!661) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/661

Closes #564

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 15:54:46 +00:00
Hazelnoot 702bb9e5e0 merge: Set visitor dashboard's menu button z-index to 50 (!656) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/656

Approved-by: Marie <github@yuugi.dev>
Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-06 15:44:57 +00: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
Hazel K 605c22b55e add lockout for isMediaSilenced 2024-10-06 10:58:27 -04:00
Hazel K 008ac89672 fix translation string 2024-10-06 10:58:06 -04:00
Hazel K 9b11aead5a Merge branch 'develop' into hazelnoot/564-warn-when-base-domain-is-blocked 2024-10-06 10:48:20 -04:00
Hazel K 2bc9ce93b8 add missing import 2024-10-06 10:47:55 -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 5f7730bd5c merge: Show yes/no options instead of ok/cancel when pasting long text (resolves #584) (!658) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/658

Closes #584

Approved-by: Marie <github@yuugi.dev>
Approved-by: dakkar <dakkar@thenautilus.net>
 2024-10-06 10:51:22 +00:00
Marie 88f3f0c7eb merge: Indicate that a user is blocked / muted (resolves #557) (!659) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/659

Closes #557

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 10:48:48 +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
Marie f77eb34225 merge: Check if time-based achievements are unlocked before initializing them in main-boot (!657) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/657

Approved-by: Hazelnoot <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-06 10:38:51 +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 b23d650a15 warn when a domain is hard-blocked by a base domain 2024-10-05 20:42:31 -04:00
Hazel K c315f9ccf5 include Mastodon's "indexable" property on federated user profiles 2024-10-05 19:48:35 -04:00
Hazel K e622ab7cc7 indicate if a user is blocked / muted by the current user 2024-10-05 19:13:09 -04:00
Hazel K c635992616 restore primary highlighting 2024-10-05 18:47:50 -04:00
Hazel K ca98107eee respect following privacy settings 2024-10-05 18:25:13 -04:00
Evan Paterakis c0702fd92f
Check if time-based achievements are unlocked before initializing them in main-boot 2024-10-05 22:58:43 +03:00
Evan Paterakis 5cd44433a0
Set visitor dashboard's menu button z-index to 50 2024-10-05 21:10:33 +03: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
PrivateGER 99a0f756ff Expose instance-moderation endpoints in UI 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
Hazel K fb7bc2ff01 preserve scroll positions when navigating 2024-10-04 08:58:32 -04:00
Hazel K 4273640530 fix extra scroll bar on mobile 2024-10-04 08:31:25 -04:00
Marie 4b31004c2b
upd: apply suggestions 2024-10-04 08:41:23 +02:00
Marie 323c075483
fix: add props before url 2024-10-04 02:34:34 +02:00
Marie 67d739cf71
upd: add script and check to MkUrl 2024-10-04 02:34:01 +02: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
CenTdemeern1 9b130b3390 Update automatically generated API type definitions 2024-10-03 22:27:14 +02:00
Marie aedc5fba81 merge: Disabling cat speak on the client (!609) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/609

Closes #604

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-03 19:51:35 +00:00
Hazel K bdd8e54be9 add missing copyright header 2024-10-03 15:19:05 -04:00
Hazel K fddf078b52 improve per-user view on mobile 2024-10-03 15:16:07 -04: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 ef002e00b6 cover case of author speaking as cat while not being cat 
as @Marie pointed out, if you disable "is cat" without first disabling
"speak as cat", you don't want to speak as a cat!
 2024-10-03 18:51:05 +01: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
Marie 0f71dc6a07 merge: fix #332 - classic view navbar now respects "side (icon only)" (!630) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/630

Closes #332

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-03 17:39:32 +00:00
Marie 66ddf965b5 merge: alert when searching notes from widget, and search is disabled - fixes #275 (!629) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/629

Closes #275

Approved-by: fEmber <acomputerdog@gmail.com>
Approved-by: Marie <github@yuugi.dev>
 2024-10-03 17:32:20 +00:00
CenTdemeern1 cb264dae75 Use negative z-index to position decorations behind the avatar 
Co-authored-by: dakkar <dakkar@thenautilus.net>
 2024-10-03 19:12:10 +02:00
Hazel K d82c0ddba9 fix "fetch user info during animation sync" 2024-10-03 12:03:21 -04:00
dakkar fa71e54812 backup/restore `disableCatSpeak` 2024-10-03 16:59:08 +01:00
dakkar 491a499c58 store `disableCatSpeak` per account 2024-10-03 16:59:08 +01:00
Leah 49eb673c40 fix nyaize line 2024-10-03 16:59:08 +01:00
Leah d55c86548d You can now disable cat speak in settings (client side) 2024-10-03 16:58:49 +01:00
dakkar bc8c6592ea merge: make MkAbuseReport more friendly for smaller screen sizes (!646) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/646

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-10-03 15:57:19 +00:00
fEmber e2beec33f8 merge: Minor issue fixes on the frontend (!625) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/625

Closes #659, #656, #651, #661, #632, and #710

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: fEmber <acomputerdog@gmail.com>
 2024-10-03 15:52:00 +00:00
dakkar 8b7482f9c0 fix linting 2024-10-03 16:49:20 +01:00
blueb 04c729e504 fix: lint error in MkAbuseReport 2024-10-03 11:43:04 -04:00
Hazel K 21b935aa78 add toggle for "only with files" 2024-10-03 11:33:03 -04:00
Hazel K 2fbb697bf9 fetch user info during animation sync 2024-10-03 11:32:51 -04:00
Hazel K 9b572be0df use standard mute logic 2024-10-03 11:32:23 -04:00
CenTdemeern1 e43c58a955 Simplify the getDecorationZIndex function 2024-10-03 16:55:24 +02:00
blueb 5ef58c90ae replace brs with margin in MkAbuseReport 2024-10-03 09:12:25 -04:00
Hazel K 7ad36d33e9 add comments for mute logic 2024-10-03 00:49:47 -04:00
Hazel K 72d59b459a respect word mutes 2024-10-03 00:45:49 -04:00
Hazel K fcb1218bbc add missing import 2024-10-03 00:43:45 -04:00
blueb cbecaad5ae don't make MkAbuseReport harder to see if resolved 2024-10-03 00:06:20 -04:00
blueb a32a8e0404 improvement: make MkAbuseReport more friendly for smaller screen sizes 2024-10-03 00:02:04 -04:00
Hazel K 64c737036f more lint fixes 2024-10-02 23:35:40 -04:00
Hazel K 40179a5591 lint fixes 2024-10-02 22:00:32 -04:00
Hazel K 5c87ed8488 add missing import 2024-10-02 20:32:54 -04:00
Hazel K 444b02ecdd reload user info when switching tabs 2024-10-02 20:26:22 -04:00
Hazel K 508e76b672 scroll both columns separately 2024-10-02 20:20:51 -04:00
CenTdemeern1 28aa99b273 Implement "Show Below Avatar" for Avatar Decorations 2024-10-02 23:49:30 +02:00
Hazel K 9ddab63a6a hide actions in mobile layout 2024-10-02 17:08:12 -04: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 007384c536
upd: fix random bg on post button in classic view 
This does basically nothing in classic view besides breaking the custom wallpapers function
 2024-10-02 20:40:58 +02:00
Marie da7a5add33
upd: use @click.prevent instead of @click 2024-10-02 20:11:41 +02:00
dakkar a357e9bca2 merge: fix exception when logging IP addresses (!644) 
View MR for information: https://activitypub.software/TransFem-org/Sharkey/-/merge_requests/644

Approved-by: dakkar <dakkar@thenautilus.net>
Approved-by: Marie <github@yuugi.dev>
 2024-10-02 17:59:03 +00: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 49e00c39cf Merge branch 'develop' into hazelnoot/following-timeline 2024-10-02 13:23:04 -04: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
Marie e2010caaff
Merge branch 'develop' into upd/instancesponsor 2024-10-02 18:57:49 +02:00
Marie a87ced64ca
chore: lint 2024-10-02 18:51:07 +02:00
Hazel K 3defed6a19 fix exception when logging IP addresses 2024-10-02 12:47:01 -04:00
Hazel K f43cb514b0 add menu to toggle user replies / boosts 2024-10-02 12:41:08 -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