aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma
AgeCommit message (Collapse)Author
2020-11-17Merge branch 'remove/fedsockets' into 'develop'feld
Remove FedSockets See merge request pleroma/pleroma!3155
2020-11-17Merge branch 'develop' into frontend-admin-apiEgor Kislitsyn
2020-11-17Merge branch 'develop' into hide-muted-reactionsEgor Kislitsyn
2020-11-17Remove FedSocketsrinpatch
Current FedSocket implementation has a bunch of problems. It doesn't have proper error handling (in case of an error the server just doesn't respond until the connection is closed, while the client doesn't match any error messages and just assumes there has been an error after 15s) and the code is full of bad descisions (see: fetch registry which uses uuids for no reason and waits for a response by recursively querying a ets table until the value changes, or double JSON encoding). Sometime ago I almost completed rewriting fedsockets from scrach to adress these issues. However, while doing so, I realized that fedsockets are just too overkill for what they were trying to accomplish, which is reduce the overhead of federation by not signing every message. This could be done without reimplementing failure states and endpoint logic we already have with HTTP by, for example, using TLS cert auth, or switching to a more performant signature algorithm. I opened https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further discussion on alternatives to fedsockets. From discussions I had with other Pleroma developers it seems like they would approve the descision to remove them as well, therefore I am submitting this patch.
2020-11-17Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/local-only-scope
2020-11-17ActivityPubController: Don't return local only objectslain
2020-11-16Use absolute URLs to thumbnail and background in /api/v1/instanceMark Felder
2020-11-16added testMaksim Pechnikov
2020-11-16Hide reactions from muted and blocked usersEgor Kislitsyn
2020-11-16fix testsMaksim Pechnikov
2020-11-14Merge remote-tracking branch 'upstream/develop' into registration-workflowAlex Gleason
2020-11-14added testMaksim Pechnikov
2020-11-13Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into ↵lain
'develop' fixes 2034 Make notifs view work for reports Closes #2034 See merge request pleroma/pleroma!2912
2020-11-13Make notifs view work for reportsIlja
* These are the first small steps for issue 2034 "Reports should send a notification to admins". * I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later) * I added the new type to the notification_controller * I made the view return the notification. It doesn't include the report itself (yet)
2020-11-13added error messages for posix error codeMaksim Pechnikov
2020-11-12Fix object spoofing vulnerability in attachmentsrinpatch
Validate the content-type of the response when fetching an object, according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects. content-type headers had to be added to many mocks in order to support this, some of this was done with a regex. While I did go over the resulting files to check I didn't modify anything unrelated, there is a possibility I missed something. Closes pleroma#1948
2020-11-12Merge branch 'title-injection-change' into 'develop'Haelwenn
Title injection change See merge request pleroma/pleroma!3132
2020-11-11Ingest blurhash field during transmogrificationMark Felder
2020-11-11Render blurhashes in Mastodon APIMark Felder
2020-11-11Ingest blurhash for attachments if they were federatedMark Felder
2020-11-11Change endpoint pathEgor Kislitsyn
2020-11-11Remove FrontendInstallerWorkerEgor Kislitsyn
2020-11-11RedirectController: Don't replace title, but inject into the metalain
2020-11-11Merge branch 'develop' into frontend-admin-apiEgor Kislitsyn
2020-11-11little changes for MRF config descriptionsAlexander Strizhakov
- log level reduction, if policy doesn't implement config_description method - docs in dev.md
2020-11-11Fix formattingEgor Kislitsyn
2020-11-11Add `local` visibilityEgor Kislitsyn
2020-11-11Merge branch 'feature/2222-config-descriptions-for-custom-modules' into ↵feld
'develop' Config descriptions for custom MRF policies Closes #2222 See merge request pleroma/pleroma!3128
2020-11-11Moving some background jobs into simple tasksAlexander Strizhakov
- fetching activity data - attachment prefetching - using limiter to prevent overload
2020-11-11making credo happy and test fixAlexander Strizhakov
2020-11-11fix for adminFEAlexander Strizhakov
- revert UserAllowPolicy description - MRF descriptions order
2020-11-10config descriptions for custom MRF policiesAlexander Strizhakov
2020-11-10Merge branch '2260-wrong-report-link' into 'develop'lain
Resolve "Wrong user link in Report email" Closes #2260 See merge request pleroma/pleroma!3121
2020-11-10Merge branch 'fix/html-title-load' into 'develop'lain
Fix title on load of Pleroma HTML, fixes #2281 Closes #2281 See merge request pleroma/pleroma!3125
2020-11-10escaping summary and other fields in xml templatesAlexander Strizhakov
2020-11-08Fix title on load of Pleroma HTMLSean King
2020-11-05Merge branch 'feature/expire-mutes' into 'develop'lain
Expiring mutes for users and activities Closes #1817 See merge request pleroma/pleroma!2971
2020-11-04AdminEmail: Use AP id as user url.lain
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
stats-genserver-fix
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/expire-mutes
2020-11-04Merge branch 'features/federation-status' into 'develop'lain
Add a federation_status endpoint showing unreachable instances See merge request pleroma/pleroma!3086
2020-11-04Merge branch 'restrict-domain' into 'develop'lain
View a remote server's timeline See merge request pleroma/pleroma!2713
2020-11-04Merge remote-tracking branch 'remotes/origin/develop' into auth-improvementsIvan Tashkinov
2020-11-04Merge branch '2284-voters-count' into 'develop'Haelwenn
Always return voters_count in polls See merge request pleroma/pleroma!3120
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
features/federation-status
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
alexgleason/pleroma-restrict-domain
2020-11-04Merge branch 'hide-muted-chats' into 'develop'lain
Hide chats from muted users Closes #2230 See merge request pleroma/pleroma!3116
2020-11-04Add `with_muted` param to ChatController.index/2Egor Kislitsyn
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
frontend-admin-api
2020-11-04Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into ↵lain
feature/local-only-scope
generated by cgit v1.2.3 (git 2.26.2) at 2025-04-24 02:10:00 +0000