Commit Graph

3265 Commits

Author SHA1 Message Date
rinpatch 1e3dda9b1d Actually fix upload limit on OTP releases
Closes #1109
2020-02-09 01:14:39 +03:00
rinpatch 31dc669de6 fix not being able to pin polls 2020-02-09 01:05:07 +03:00
Haelwenn 1e74bbc495 Merge branch 'fix-streaming-reblog' into 'develop'
Streamer: Correctly handle reblog mutes

Closes #1129 and #1438

See merge request pleroma/pleroma!2156
2020-02-09 01:02:06 +03:00
Maksim Pechnikov f486556346 fixed Metadata.Utils.scrub_html_and_truncate 2020-02-09 00:52:56 +03:00
rinpatch a87843693b Fix never matching clause
`length/1` is only used with lists.
2020-02-09 00:44:29 +03:00
href 865cd2c7c4 report federating status in nodeinfo 2019-12-13 21:20:09 +03:00
rinpatch 66563f93fd Set better Cache-Control header for static content
Closes #1382
2019-12-13 21:19:55 +03:00
rinpatch 2199d15000 OTP: Fix runtime upload limit config being ignored
Closes #1109
2019-12-13 21:16:26 +03:00
lain 4079ed3b75 OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug 2019-11-19 19:24:13 +03:00
AkiraFukushima df22197755 Check client and token in GET /oauth/authorize 2019-11-19 19:15:14 +03:00
rinpatch b74f4260ae Fix rendering conversations when there's a malformed status 2019-11-19 19:14:35 +03:00
Ariadne Conill 6a151e7c7f streamer: use direct object for filter checks when there is no valid child object in an activity
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.

Closes #1291
2019-11-04 16:25:05 +01:00
rinpatch a1c4a5d7cf Fix a migration wiping user info of users that don't have any mutes
And introduce safe_jsonb_set
2019-10-18 14:11:30 +03:00
Ariadne Conill 3e1d2ace73 mastodon api: fix exclude_replies (closes #1287) 2019-10-07 13:01:05 +00:00
eugenijm 790ae8e189 Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`) 2019-10-07 11:28:51 +00:00
kaniini f6ff19e074 Merge branch 'backport/custom-field-update' into 'maint/1.1'
Backport: custom field update

See merge request pleroma/pleroma!1805
2019-10-06 15:33:33 +00:00
rinpatch b5e6ba323d Merge branch 'backport/key-moveout-1.1' into 'maint/1.1'
Backport moving out keys from user info to 1.1

See merge request pleroma/pleroma!1801
2019-10-06 15:32:33 +00:00
kPherox c5338764df Extract if block into private function 2019-10-06 15:14:53 +00:00
kPherox db6c5aa66a Change to delete empty name field 2019-10-06 15:14:31 +00:00
kPherox 313b134fac Fix type of fields_attributes
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
2019-10-06 15:14:27 +00:00
kPherox 81abee22b6 Rename fields to fields_attributes 2019-10-06 15:14:21 +00:00
rinpatch 845e8ad5f6 Move object internal fields to a constant 2019-10-06 14:53:34 +00:00
rinpatch eae9a6d34d Initial poll refresh support
Implement refreshing the object with an interval and call the function
when getting the poll.
2019-10-06 14:53:11 +00:00
rinpatch c58da11182 Move local keys out of `user.info` 2019-10-06 17:36:24 +03:00
lain b97a7709c7 CommonAPI: Create profile updates as public.
This saves us lots of sending out because we can use sharedInbox.
2019-10-05 19:31:11 +00:00
lain 4d85e07e9e ActivityPub / Transmogrifier: Correctly store incoming Update id. 2019-10-05 19:31:03 +00:00
Haelwenn (lanodan) Monnier dbd78de176 notification_view.ex: Make sure `account` isn’t empty
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
2019-10-04 22:27:07 +00:00
Egor Kislitsyn 67d772dd73 Replace `Pleroma.FlakeId` with `flake_id` hex package 2019-10-04 21:59:17 +00:00
Maksim Pechnikov 16a1f95623 removed legacy api: "/objects/:uuid/likes" 2019-10-04 21:36:04 +00:00
lain b7d2ca0372 ActivityPub: Change addressing of Undo. 2019-10-04 21:17:46 +00:00
Ariadne Conill abb967671a streamer: worker: actually use should_send? consistently 2019-10-04 16:06:20 +00:00
Ariadne Conill d0e874c7f2 streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist 2019-10-04 16:06:14 +00:00
Ariadne Conill 51b317a602 streamer: add missing copyright headers 2019-10-04 16:06:08 +00:00
Steven Fuchs a2e92a1b8a remove remaining errors from tests 2019-10-04 16:05:22 +00:00
Egor Kislitsyn 7d5f20b50f Revert "Merge branch 'revert-4fabf83a' into 'develop'"
This reverts commit fe7fd33126, reversing
changes made to 4fabf83ad0.
2019-10-04 16:01:31 +00:00
lain 565b8d02c8 Transmogrifier: Handle compact objects in undos. 2019-09-30 16:25:26 +00:00
rinpatch 4c6e5639d3 Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex 2019-09-26 03:46:33 +03:00
rinpatch cfd9f73f0d Credo considered harmful 2019-09-26 03:46:26 +03:00
rinpatch 9d32f38b39 Remove useless with clause 2019-09-26 03:46:17 +03:00
rinpatch 22a16a3e81 Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex 2019-09-26 03:46:10 +03:00
rinpatch d4a76b0a6f Don't embed the first page in inboxes/outboxes and refactor the views to
follow View/Controller pattern

Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
2019-09-26 03:45:58 +03:00
rinpatch 056780fd8e Mastodon API: Respect post privacy in favourited/reblogged endpoints 2019-09-14 15:21:15 +03:00
lain 53a3ad6043 Merge branch 'cleanup-activity' into 'develop'
Cleanup `Pleroma.Activity` and add more tests

See merge request pleroma/pleroma!1623
2019-09-13 14:48:00 +00:00
Haelwenn 0d9609894f Merge branch 'feature/change-email' into 'develop'
Add email change endpoint

Closes #1156

See merge request pleroma/pleroma!1580
2019-09-13 12:46:16 +00:00
rinpatch f884987ace Merge branch 'admin-config-description' into 'develop'
Admin config description

Closes #1178 and #1209

See merge request pleroma/pleroma!1611
2019-09-13 12:36:24 +00:00
Egor Kislitsyn 25d8216804 Add email change endpoint 2019-09-13 13:09:35 +07:00
Egor Kislitsyn 39dc9b470c Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils 2019-09-13 12:44:59 +07:00
Mark Felder 74e4c72c4a Fix double quotes in error logs
Example:

pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca"", error: nil
2019-09-11 16:16:09 -05:00
Haelwenn 46ae62d159 Merge branch 'patch-5' into 'develop'
Mastodon API: URI encode hashtag name in generated URLs

See merge request pleroma/pleroma!1642
2019-09-11 17:47:19 +00:00
lain fb7332aec7 Merge branch 'fix/oom-parallel-rendering' into 'develop'
Revert "Parallelize template rendering"

See merge request pleroma/pleroma!1654
2019-09-11 11:21:03 +00:00