Commit Graph

4101 Commits

Author SHA1 Message Date
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
kaniini 8a52f30356 Merge branch 'backport/feature-poll-refresh' into 'maint/1.1'
backport: poll refreshing

See merge request pleroma/pleroma!1804
2019-10-06 15:07:38 +00:00
rinpatch c7313c8dfb Fix credo issues 2019-10-06 14:53:55 +00:00
rinpatch 40c7d6fa17 Do not refetch local objects 2019-10-06 14:53:48 +00:00
rinpatch 644bc1e64a Preserve internal fields when reinjecting 2019-10-06 14:53:40 +00:00
rinpatch 845e8ad5f6 Move object internal fields to a constant 2019-10-06 14:53:34 +00:00
rinpatch b9cdead076 Set updated_at even if the object stayed the same 2019-10-06 14:53:29 +00:00
rinpatch 8be9a9b5bb Fix wrong argument order when calling NaiveDateTime.diff 2019-10-06 14:53:23 +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
feld 2a2d834ff7 Use the user.id instead of nickname in report URLs
Ensures links to profiles of remote users work.
2019-10-06 14:48:37 +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
kaniini 43be47c161 Merge branch 'backport/hex-flake-id' into 'maint/1.1'
backport: hex `flake_id` support

See merge request pleroma/pleroma!1793
2019-10-04 22:11:34 +00:00
kaniini 15513f02d0 Merge branch 'backport/feature-track-reverse-proxy-failures' into 'maint/1.1'
backport: Track failed proxy urls and don't request them again

See merge request pleroma/pleroma!1792
2019-10-04 22:01:38 +00:00
Egor Kislitsyn 67d772dd73 Replace `Pleroma.FlakeId` with `flake_id` hex package 2019-10-04 21:59:17 +00:00
Sergey Suprunenko 7307d7d676 Track failed proxy urls and don't request them again 2019-10-04 21:49:51 +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
kaniini ca6f1644aa Merge branch 'bugfix/widen-streamer-blocks-for-1.1' into 'maint/1.1'
widen streaming API blocks (for 1.1)

See merge request pleroma/pleroma!1785
2019-10-04 17:39:28 +00:00
rinpatch 6b7cd7d850 Fix get_cached_by_nickname_or_id not allowing to get local users by
nickname

Closes #1293
2019-10-04 20:26:48 +03:00
Ariadne Conill 17fed5ae52 application: fix up after_supervisor_start removal backport 2019-10-04 16:15:54 +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 ea1867f48e Merge branch 'config-changes' into 'develop'
two separate files for config.md and generated config.md

See merge request pleroma/pleroma!1666

(cherry picked from commit 9c64a25713)

69faec03 markdown generation to the new file
c625fe6f config.md back
4da0da9a don't track generated_config.md
2019-09-14 17:27:08 +00: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
Haelwenn 51609217c2 Merge branch 'fix/error-log-double-quotes' into 'develop'
Fix double quotes in error logs

See merge request pleroma/pleroma!1656
2019-09-12 20:21:56 +00: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