bd6e2b300f
Add spec for AccountController.followers
2020-04-13 18:17:07 +04:00
03124c96cc
Add spec for AccountController.statuses
2020-04-13 18:17:07 +04:00
278b3fa0ad
Add spec for AccountController.show
2020-04-13 18:16:07 +04:00
d7d6a83233
Add spec for AccountController.relationships
2020-04-13 18:16:07 +04:00
ab400b2ddb
Add specs for ActorType and VisibilityScope
2020-04-13 18:16:07 +04:00
260cbddc94
Add spec for AccountController.update_credentials
2020-04-13 18:16:07 +04:00
f80116125f
Add spec for AccountController.verify_credentials
2020-04-13 17:38:59 +04:00
b08ded6c2f
Add spec for AccountController.create
2020-04-13 17:38:59 +04:00
99b0bc1989
[ #1364 ] Resolved merge conflicts with `develop`. Refactoring.
2020-04-13 13:24:31 +03:00
dc8fa04192
Merge branch 'develop' into global-status-expiration
2020-04-13 14:12:51 +04:00
f00ff20768
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/following_relationship.ex
2020-04-13 09:23:50 +03:00
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
a050f3e015
fix for logger configuration through admin-fe
2020-04-13 08:56:28 +03:00
c5c09fc61b
fix mediaType of object
2020-04-13 07:02:57 +03:00
9a3c74b244
Always accept deletions through SimplePolicy
2020-04-12 20:26:35 -05:00
c556efb761
[ #1364 ] Enabled notifications on followed domain-blocked users' activities.
2020-04-12 21:53:03 +03:00
7ee35eb9a6
Merge branch 'fix/mix-tasks-failing-otp' into 'develop'
...
Fix mix tasks failing on OTP releases
Closes #1678
See merge request pleroma/pleroma!2369
2020-04-12 16:00:15 +00:00
2ba754ffe1
Fix mix tasks failing on OTP releases
...
No idea why this was even added.
Closes #1678
2020-04-12 18:49:31 +03:00
5e365448f3
Merge branch 'following-relationships-optimizations' into 'develop'
...
FollowingRelationship storage & performance optimizations
See merge request pleroma/pleroma!2332
2020-04-11 19:46:04 +00:00
c077ad0b33
Remove User.upgrade_changeset in favor of remote_user_creation
...
The two changesets had the same purpose, yet some changes were updated
in one, but not the other (`uri`, for example).
Also makes `Transmogrifier.upgrade_user_from_ap_id` be called from
`ActivityPub.make_user_from_ap_id` only when the user is actually
not AP enabled yet.
I did not bother rewriting tests that used `User.insert_or_update`
to use the changeset instead because they seemed to just test the implementation,
rather than behavior.
2020-04-11 22:31:46 +03:00
88b16fdfb7
[ #1364 ] Disabled notifications on activities from blocked domains.
2020-04-11 16:01:09 +03:00
dd612f86ae
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-04-10 20:00:05 +04:00
64c78581fe
Chat: Only create them for valid users for now.
2020-04-10 14:47:56 +02:00
7f692343c8
Merge branch 'develop' into global-status-expiration
2020-04-10 14:20:48 +04:00
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
2020-04-10 14:18:57 +04:00
4d33e0bd50
Merge branch 'bugfix/apc2s_upload_activity' into 'develop'
...
bugfix: AP C2S activity with attachments
See merge request pleroma/pleroma!2316
2020-04-10 04:31:13 +00:00
e89078ac2a
User: remove source_data
2020-04-10 06:20:03 +02:00
3420dec494
Remove User.fields/1
2020-04-10 06:20:02 +02:00
9172d719cc
profile emojis in User.emoji instead of source_data
2020-04-10 06:20:02 +02:00
62656ab259
User: Move inbox & shared_inbox to own fields
2020-04-10 06:20:02 +02:00
369c03834c
formatter: Use user.uri instead of user.source_data.uri
2020-04-10 06:20:02 +02:00
b6bed1a284
Types.URI: New
2020-04-10 06:20:02 +02:00
19eedb3d04
User: Move public_key from source_data to own field
2020-04-10 06:16:18 +02:00
5628984df4
User: remove source_data use for follower_address and following_address
2020-04-10 06:16:18 +02:00
2cc6841424
ChatController: Basic message posting.
2020-04-09 17:18:31 +02:00
e8fd0dd689
ChatController: Basic support for returning messages.
2020-04-09 16:59:49 +02:00
68abea313d
ChatController: Add creation and return of chats.
2020-04-09 15:13:55 +02:00
d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
2020-04-09 17:08:43 +04:00
ac672a9d6b
[ #1559 ] Addressed code review requests.
2020-04-09 15:13:37 +03:00
d35e114acd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-09 13:25:27 +02:00
8e637ae1a7
CommonAPI: Basic ChatMessage support.
2020-04-09 13:20:16 +02:00
2e78686686
SideEffects: Handle ChatMessage creation.
2020-04-09 12:44:20 +02:00
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
2020-04-09 10:42:43 +00:00
f20a19de85
typo fix
2020-04-09 13:28:54 +03:00
1cf0d5ab0d
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
2020-04-09 10:17:36 +00:00
4c60fdcbb1
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
2020-04-09 10:17:31 +00:00
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
2020-04-09 09:48:56 +00:00
564f3f01ca
Merge branch 'formatter-html-safe' into 'develop'
...
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
See merge request pleroma/pleroma!2357
2020-04-09 09:47:07 +00:00
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
2020-04-09 04:36:39 +02:00
d067eaa7b3
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
...
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
2020-04-08 22:58:31 +03:00
5739c498c0
fix for gun connections pool
2020-04-08 18:46:01 +03:00
3775683a04
ChatMessage: Basic incoming handling.
2020-04-08 15:55:43 +02:00
94240cac4e
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
...
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
2020-04-08 00:29:19 +03:00
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-07 21:52:32 +03:00
dd4d10b275
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
...
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
2020-04-07 11:41:10 +00:00
2b7d7bbd2d
Merge branch 'develop' into issue/1276
2020-04-07 14:09:43 +03:00
19335be24c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-06 17:50:31 +02:00
03eebabe8e
Add Pleroma.Web.ApiSpec.Helpers
2020-04-06 17:11:00 +04:00
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
2020-04-06 12:51:35 +00:00
96ee0aadbf
Merge branch 'improving-test-coverage' into 'develop'
...
Tests for emoji mix task
See merge request pleroma/pleroma!2350
2020-04-06 12:49:17 +00:00
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
2020-04-06 11:59:01 +00:00
772bc258cd
ObjectID Validator: Refactor.
2020-04-06 13:53:24 +02:00
e67cde0ed6
Transmogrifier: Refactoring / Renaming.
2020-04-06 13:46:34 +02:00
b59ac37b2c
tests for emoji mix task
2020-04-06 11:13:59 +03:00
fc81e5a49c
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
2020-04-06 10:20:44 +03:00
b0a9a02af3
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-04-02 23:00:23 +03:00
01a3f145d5
Merge branch 'bugfix/funkwhale-channel' into 'develop'
...
Fix profile url for funkwhale channels, removes one source_data use
Closes #1653
See merge request pleroma/pleroma!2333
2020-04-02 22:55:09 +03:00
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
2020-04-02 19:38:39 +03:00
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
2020-04-02 19:23:30 +03:00
0aa24a150b
Add oAuth
2020-04-02 17:33:23 +04:00
fd97b0e634
Chats: Basic implementation.
2020-04-02 15:19:09 +02:00
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
23219e6fb3
Add OpenAPI
2020-04-01 23:13:08 +04:00
2d64500a9d
error improvement for email_invite endpoint
2020-04-01 20:26:33 +03:00
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
2020-04-01 20:08:14 +03:00
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
2020-04-01 17:05:09 +00:00
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01 19:49:09 +03:00
037b49c415
Validators: Correct ObjectID filename
2020-04-01 16:10:17 +02:00
bfec45bf74
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
...
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
2020-04-01 12:55:52 +00:00
94ddbe4098
restrict remote users from indexing
2020-04-01 09:57:12 +03:00
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
2020-03-31 23:55:29 +02:00
b30fb1f3bb
User: Fix use of source_data in profile_url/1
2020-03-31 23:54:20 +02:00
7408f003a6
Use `Pleroma.Formatter.linkify` instead of `AutoLinker.link`
2020-04-01 02:52:30 +09:00
c982093cc2
Transmogrifier: Fix BAD code by RINPATCH
2020-03-31 19:33:41 +02:00
1b323ce1c6
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:28:18 +00:00
ecac57732a
Transmogrifier: Only add context if it really is onne.
2020-03-31 19:16:45 +02:00
51fc504705
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-31 19:06:08 +02:00
288f2b5a7c
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:00:55 +00:00
0be1fa0a86
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:00:48 +00:00
057438a657
CommonAPI: DRY up a bit.
2020-03-31 17:56:05 +02:00
643f15e77b
Validators: ObjectID is an http uri.
2020-03-31 16:11:38 +02:00
d191b0942f
Remove no longer used function
2020-03-31 22:50:18 +09:00
f6835333be
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 12:55:25 +00:00
e99e2a86af
Merge branch 'bugfix/profile-bio-newline' into 'develop'
...
AccountView: fix for other forms of <br> in bio
Closes #1643
See merge request pleroma/pleroma!2322
2020-03-31 13:42:02 +03:00
c4d3ccc7b9
Merge branch 'admin-api-change-password' into 'develop'
...
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
2020-03-31 13:41:47 +03:00
10b7b2b4a4
Merge branch 'fix/activity-deletion' into 'develop'
...
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
2020-03-31 13:40:28 +03:00
0e92aa0025
Merge branch '1364-notifications-sending-control' into 'develop'
...
[#1364 ] Ability to opt-out of notifications (in all clients)
Closes #1364
See merge request pleroma/pleroma!2301
2020-03-31 13:39:58 +03:00
ea9c57b26e
[ #2332 ] Misc. improvements per code change requests.
2020-03-31 09:21:42 +03:00
9c94b6a327
[ #2332 ] Misc. fixes per code change requests.
2020-03-30 19:08:37 +03:00
8bd5ad8664
Merge branch 'benchmark-improvements' into 'develop'
...
Benchmark improvements
See merge request pleroma/pleroma!2308
2020-03-30 14:48:00 +00:00
b607ae1a1c
removing grouped reports admin api endpoint
2020-03-30 13:51:45 +03:00
1fcdcb12a7
updating gun with bug fix
...
https://github.com/ninenines/gun/issues/222
2020-03-30 12:47:12 +03:00
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
1f29ecdcd7
sync with develop
2020-03-30 11:42:25 +03:00
eb9744cade
activities generation tasks
2020-03-30 11:42:25 +03:00
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-03-29 19:18:22 +00:00
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
2020-03-28 18:49:03 +03:00
dfbc05d496
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
2020-03-27 08:01:03 +03:00
6b793d3f83
Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
2020-03-26 21:54:01 +03:00
29ab1d9f8d
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-26 17:24:10 +01:00
69fc1dd69f
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
2020-03-26 14:45:28 +00:00
0c60c0a76a
Validators: Use correct type for IDs.
2020-03-26 15:44:14 +01:00
0adaab8e75
Bump copyright dates.
2020-03-26 15:37:42 +01:00
eaacc64839
Refactors.
2020-03-26 15:33:10 +01:00
ee979dd6d7
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-26 15:24:06 +01:00
d7aa0b645b
Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex
2020-03-26 14:23:19 +00:00
4cf1007a7d
ActivityPub: Small refactor.
2020-03-26 15:16:54 +01:00
94a6590e3c
Partially restore `/api/statusnet/config.json`
2020-03-26 17:59:45 +04:00
1c3f3a12ed
Add `characterLimit` and `vapidPublicKey` to nodeinfo
2020-03-26 16:20:20 +04:00
112101ca52
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
...
# Conflicts:
# lib/pleroma/thread_mute.ex
2020-03-26 09:43:58 +03:00
af820f8cf1
Merge branch 'benchmark_timeline' into 'develop'
...
Benchmarks: Add timeline benchmark
See merge request pleroma/pleroma!2325
2020-03-25 18:06:00 +00:00
460e41585c
Further preloading (more endpoints), refactoring, tests.
2020-03-25 20:33:34 +03:00
be5e2c4dbb
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
2020-03-25 17:01:45 +03:00
3fa3d45dbe
[ #1364 ] Minor improvements / comments.
...
Further fixes of incorrect usage of "relations" as a short form of "relationships".
2020-03-25 13:05:00 +03:00
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-25 09:05:17 +03:00
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
2020-03-25 09:04:00 +03:00
212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
2020-03-24 20:32:49 +01:00
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-24 22:15:37 +03:00
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
2020-03-24 22:14:26 +03:00
8eebc75c15
Merge branch 'fix/activity-deletion' into 'develop'
...
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
2020-03-24 19:10:32 +00:00
f316882464
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
2020-03-24 18:37:53 +00:00
aaf00f1ff5
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
2020-03-24 18:24:09 +00:00
74560e888e
Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex
2020-03-24 18:20:58 +00:00
1d75d0ed7a
Merge branch 'admin-api-change-password' into 'develop'
...
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
2020-03-24 17:34:13 +00:00
4a2538967c
Support pagination in conversations
2020-03-24 20:18:27 +04:00
d1a9716a98
Fix activity deletion
2020-03-24 17:38:18 +04:00
3189c44a0c
Remove some TwitterAPI endpoints
2020-03-24 15:21:40 +04:00
fbf02a3722
Merge branch 'bugfix/profile-bio-newline' into 'develop'
...
AccountView: fix for other forms of <br> in bio
Closes #1643
See merge request pleroma/pleroma!2322
2020-03-23 19:32:01 +00:00
3bd2829e5c
Benchmarks: Add timeline benchmark
2020-03-23 18:56:01 +01:00
86f2fbc81e
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-23 14:34:58 +03:00
5a34dca8ed
Add emoji support in statuses in staticfe
2020-03-23 14:03:31 +04:00
3c78e5f327
Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
2020-03-23 12:01:11 +03:00
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
c2e415143b
WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
2020-03-22 21:51:44 +03:00
15be6ba9c2
AccountView: fix for other forms of <br> in bio
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-03-22 16:41:01 +01:00
981e015f1b
Mastodon API Account view: Remove an outdated hack
...
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
2020-03-22 17:10:37 +03:00
80e1571610
Merge branch 'develop' into global-status-expiration
2020-03-20 22:08:34 +04:00
9bae9b1b1b
Merge branch 'develop' into gun
2020-03-20 20:47:54 +03:00
cb8236cda6
Add embeddable posts
2020-03-20 21:46:26 +04:00
d74405fc1a
Merge branch 'fix-feed-pagination' into 'develop'
...
Fix for feed page pagination
Closes #1605
See merge request pleroma/pleroma!2281
2020-03-20 16:57:51 +00:00
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-20 14:52:58 +01:00
fe15f0ba15
restrict_unauthenticated setting
2020-03-20 16:36:20 +03:00
98a60df41f
include_types parameter in /api/v1/notifications
2020-03-20 13:18:12 +03:00
a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
2020-03-19 19:25:50 +01:00
c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR
2020-03-19 19:10:03 +01:00
9b9d67bbec
Fix linting.
2020-03-19 18:16:12 +01:00
3c2c32b460
Merge branch 'remake-remodel' into develop
2020-03-19 18:00:55 +01:00
7d275970ab
Add emoji reactions to features in nodeinfo
2020-03-19 10:08:11 -05:00
f9d622d25a
WIP
2020-03-19 15:39:11 +01:00
f9ecb513fa
Merge branch 'develop' into gun
2020-03-18 14:08:21 +03:00
7438833685
[ #1364 ] Improved notification-related tests.
2020-03-16 21:58:10 +03:00
13cce9c0de
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
2020-03-16 20:42:37 +03:00
d198e7fa2a
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
2020-03-16 20:32:07 +03:00
f3791add99
removing with_move parameter
2020-03-16 20:07:45 +03:00
0e07c5ef57
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-16 17:58:42 +03:00
bf474ca3c1
fix
2020-03-16 16:23:49 +03:00
35471205f8
temp fix for `:gun.info` MatchError
2020-03-16 15:47:25 +03:00
421e35b578
Merge branch 'develop' into global-status-expiration
2020-03-16 15:31:31 +04:00
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
89e4b3ebbd
fix for content-type header for tag feed
2020-03-16 12:59:18 +03:00
91870c8995
adding rss for user feed
2020-03-16 12:45:31 +03:00
26e2076659
fix for feed page pagination
2020-03-16 12:33:55 +03:00
c46d035f7b
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
...
The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.
Also closes #1620
2020-03-16 00:15:21 +03:00
9d09755291
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
2020-03-16 00:15:11 +03:00
fcf51a77ba
Merge branch 'features/staticfe-sanitization' into 'develop'
...
static_fe: Sanitize HTML
Closes #1614
See merge request pleroma/pleroma!2299
2020-03-16 00:14:04 +03:00
8176ca9e40
static_fe: Sanitize HTML in users
2020-03-15 20:44:04 +01:00
0ac6e29654
static_fe: Sanitize HTML in posts
...
Note: Seems to have different sanitization with TwitterCard generator giving
the following:
<meta content=\"“alert('xss')”\" property=\"twitter:description\">
2020-03-15 20:44:04 +01:00
fa4ec17c84
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
...
[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
2020-03-15 19:15:20 +00:00
7c8003c3fc
[ #1364 ] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
2020-03-15 21:00:12 +03:00
d84670b9e1
Merge branch 'f' into 'develop'
...
rip out fetch_initial_posts
Closes #1422 and #1595
See merge request pleroma/pleroma!2297
2020-03-15 16:14:54 +00:00
67a27825b1
Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
...
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
Closes #1620
See merge request pleroma/pleroma!2296
2020-03-15 14:22:10 +00:00
306d633b40
pleroma_api_controller.ex: Improve conversations error reporting
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-15 17:01:33 +03:00
0b823755a2
Merge branch 'fix/cache-control-headers' into 'develop'
...
Fix Cache Control headers on media
See merge request pleroma/pleroma!2295
2020-03-15 17:01:04 +03:00
3f54215219
auth_controller.ex: Add admin scope to MastoFE
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
2020-03-15 17:00:41 +03:00
ffd636f109
Fix hashtags WebSocket streaming
2020-03-15 17:00:18 +03:00
bd80ff9a6c
Fix static FE plug to handle missing Accept header.
2020-03-15 17:00:06 +03:00
5f9fbd7d33
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-15 16:59:52 +03:00
80bc8c2cc9
Revert "Set better Cache-Control header for static content"
...
On furher investigation it seems like all that did was cause unintuitive
behavior. The emoji request flood that was the reason for introducing it
isn't really that big of a deal either, since Plug.Static only needs to
read file modification time and size to determine the ETag.
Closes #1613
2020-03-15 16:59:39 +03:00
e7837bc14e
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
2020-03-15 16:58:51 +03:00
f8dc597c51
Fix enforcement of character limits
2020-03-15 16:58:13 +03:00
423cfaf141
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
...
Merging default release config on app start
Closes #1610
See merge request pleroma/pleroma!2288
2020-03-15 16:57:59 +03:00
7cf7083076
relay list shows hosts without accepted follow
2020-03-15 16:55:20 +03:00
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
2020-03-15 15:59:17 +03:00
8f7bc07ebc
pleroma_api_controller.ex: Improve conversations error reporting
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-15 12:35:23 +01:00
ecb7809e92
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex
2020-03-14 15:37:02 +03:00
d88c8a9614
Merge branch 'fix/cache-control-headers' into 'develop'
...
Fix Cache Control headers on media
See merge request pleroma/pleroma!2295
2020-03-14 11:19:42 +00:00
6a28c198af
uploaded media plug: do not inject compile-time params on every request
2020-03-13 22:12:33 +03:00
38f796a5c6
Merge branch 'feature/mastofe-admin-scope' into 'develop'
...
auth_controller.ex: Add admin scope to MastoFE
See merge request pleroma/pleroma!2256
2020-03-13 18:58:52 +00:00
994ac4357c
Merge branch 'fix/hashtags-streaming' into 'develop'
...
Fix hashtags WebSocket streaming
Closes #1593
See merge request pleroma/pleroma!2294
2020-03-13 18:50:17 +00:00
658f30c0b3
Merge branch 'static-accept-missing' into 'develop'
...
Fix static FE plug to handle missing Accept header.
See merge request pleroma/pleroma!2260
2020-03-13 18:46:54 +00:00
fc4496d4fa
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
...
The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.
Also closes #1620
2020-03-13 21:41:17 +03:00
3e0f05f08e
Merge branch 'bugfix/br-vs-newline' into 'develop'
...
Formatting: Do not use \n and prefer <br> instead
Closes #1374 and #1375
See merge request pleroma/pleroma!2204
2020-03-13 18:22:55 +00:00
c6eb1c1b92
Merge branch 'develop' into fix/cache-control-headers
2020-03-13 12:54:06 -05:00
7321429a2e
Lint
2020-03-13 12:42:06 -05:00
3b1b183b42
Synchronize cache-control header for local media with the mediaproxy
2020-03-13 12:27:50 -05:00
413177c8f0
Set correct Cache-Control header for local media
2020-03-13 12:02:58 -05:00
c62195127d
Update comment to reflect what the code is actually doing
2020-03-13 11:46:40 -05:00
ad31d0726a
Do not trust remote Cache-Control headers for mediaproxy
2020-03-13 11:30:27 -05:00
096c5c52e0
Merge branch 'revert/cache-control' into 'develop'
...
Revert "Set better Cache-Control header for static content"
Closes #1613
See merge request pleroma/pleroma!2290
2020-03-13 16:25:10 +00:00
fffc382f13
Fix hashtags WebSocket streaming
2020-03-13 19:30:42 +04:00
d1379c4de8
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-13 16:07:17 +01:00
98ed0d1c4b
more clean up
2020-03-13 09:37:57 +03:00
802b991814
Merge branch 'exclude-posts-visible-to-admin' into 'develop'
...
Exclude private and direct statuses visible to the admin when using godmode
Closes #1599
See merge request pleroma/pleroma!2272
2020-03-12 20:29:51 +00:00
39ed608b13
Merge branch 'develop' into gun
2020-03-12 18:31:10 +03:00
1306b92997
clean up
2020-03-12 18:29:07 +03:00
d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-12 16:02:24 +04:00
bd40880fa0
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
2020-03-12 12:07:07 +03:00
2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
2020-03-11 16:53:05 +00:00
7cdabdc0df
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
...
Merging default release config on app start
Closes #1610
See merge request pleroma/pleroma!2288
2020-03-11 15:16:18 +00:00
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
2020-03-11 15:10:09 +00:00
c3b9fbd3a7
Revert "Set better Cache-Control header for static content"
...
On furher investigation it seems like all that did was cause unintuitive
behavior. The emoji request flood that was the reason for introducing it
isn't really that big of a deal either, since Plug.Static only needs to
read file modification time and size to determine the ETag.
Closes #1613
2020-03-11 17:58:25 +03:00
fce090c1de
using Pleroma.Config instead of ets
2020-03-11 17:22:50 +03:00
193d67cde5
compile fix
2020-03-11 16:43:58 +03:00
282a93554f
merging release default config on app start
2020-03-11 16:25:53 +03:00
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
2020-03-11 13:46:42 +01:00
5b696a8ac1
[ #1560 ] Enforced authentication for non-federating instances in StaticFEController.
2020-03-11 14:05:56 +03:00
972889550d
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-11 09:15:55 +03:00
5af798f246
Fix enforcement of character limits
2020-03-10 13:08:00 -05:00
f39e1b9eff
add verify tls_opts only when we open connection
...
for other requests tesla will add tls_opts
2020-03-10 15:54:11 +03:00
426f5ee48a
tesla adapter can't be changed in adminFE
2020-03-10 15:31:44 +03:00
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
2020-03-09 20:51:44 +03:00
d9f8941dac
Merge branch 'develop' into gun
2020-03-09 10:56:33 +03:00
edb659dc57
Merge branch 'develop' into issue/1276
2020-03-08 14:10:59 +03:00
6cf1958b02
moderation log: fix improperly migrated data
...
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.
Closes #1606
2020-03-07 17:00:58 +03:00
474ef512df
wait in mix task while pleroma is rebooted
2020-03-07 16:02:55 +03:00
b2eb1124d1
Merge branch 'develop' into gun
2020-03-07 12:41:37 +03:00
6d797b9928
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
...
Wait in mix task while pleroma is rebooted
See merge request pleroma/pleroma!2225
2020-03-07 09:32:29 +00:00
5f42ecc4c7
start gun upload pool, if proxy_remote is enabled
2020-03-07 12:24:39 +03:00
78282dc983
little polishing
2020-03-06 21:24:19 +03:00
c93c3096d5
little refactor
2020-03-06 21:04:18 +03:00
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-06 11:48:30 +03:00
40765875d4
[ #1560 ] Misc. improvements in ActivityPubController federation state restrictions.
2020-03-05 21:19:21 +03:00
058c9b01ac
returning, not needed
2020-03-05 18:28:04 +03:00
f0753eed0f
removing try block in tesla request
...
added mocks for tests which fail with Tesla.Mock.Error
2020-03-05 17:31:06 +03:00
ad22e94f33
Exclude private and direct statuses visible to the admin when using godmode
2020-03-05 15:15:27 +03:00
47604907c9
Merge branch 'proper_error_messages' into 'develop'
...
MastodonController: Return 404 errors correctly.
See merge request pleroma/pleroma!2270
2020-03-05 11:49:51 +00:00
927079e2ff
Merge branch 'fix/stats-on-startup' into 'develop'
...
Generate instance stats on startup
Closes #1598
See merge request pleroma/pleroma!2271
2020-03-05 07:25:23 +00:00
eb324467d9
removing try block in getting gun info
2020-03-05 09:51:52 +03:00
cdb05633a6
Generate instance stats on startup
2020-03-04 13:33:26 -06:00
9b740cfb23
Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
...
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes #1596
See merge request pleroma/pleroma!2267
2020-03-04 18:22:37 +00:00
4bce13fa2f
MastodonController: Return 404 errors correctly.
2020-03-04 18:09:06 +01:00
d6bebd4f9c
moving some logic to tesla adapter
...
- checking original inside gun adapter
- flushing streams on max_body error
2020-03-04 18:13:24 +03:00
6f7a8c43a2
Merge branch 'fix/no-email-no-fail' into 'develop'
...
Do not fail when user has no email
See merge request pleroma/pleroma!2249
2020-03-04 12:43:06 +00:00
22d52f5691
same copyright date format
2020-03-04 09:41:23 +03:00
6b2fb9160c
otp version
2020-03-04 09:23:42 +03:00
d9c5ae7c09
Update Copyrights for gun related files
2020-03-03 17:16:24 -06:00
4427161ca3
Merge branch 'develop' into gun
2020-03-03 17:15:49 -06:00
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
b6fc98d9cd
[ #1560 ] ActivityPubController federation state restrictions adjustments. Adjusted tests.
2020-03-03 22:22:02 +03:00
884d9710b2
refactoring for gun api modules
2020-03-03 19:24:14 +03:00
f98ee730f0
adapter renaming to adapter_helper
2020-03-03 18:53:44 +03:00
8854770fc4
retry and retry_timeout settings default change
2020-03-03 18:01:35 +03:00
1ad34bfdba
no try block in checkout connection
2020-03-03 17:44:04 +03:00
24bf5c4e89
remove try block from pool request
2020-03-03 17:27:56 +03:00
aaa879ce75
proxy parsing errors
2020-03-03 17:27:22 +03:00
6ebf389d6e
poolboy timeout fix
2020-03-03 16:51:49 +03:00
8fc00b7cbf
return error if connection failed to open
2020-03-03 16:42:24 +03:00
7d68924e4f
naming
2020-03-03 16:42:24 +03:00
e605e79df9
simplification of formatting host method
...
case for format_proxy method
2020-03-03 16:42:03 +03:00
ee8071f0d5
removing unused method
2020-03-03 15:12:09 +03:00
05429730e4
unnecessary with
2020-03-03 15:11:48 +03:00
d0e4d3ca3b
removing unnecessary with
...
comment in tesla client impovement
2020-03-03 14:56:49 +03:00
24d1ac125c
hiding raise error logic to otp_version module
2020-03-03 13:24:19 +03:00
28ed4b41d0
naming for checkin from pool timeout
2020-03-03 13:05:28 +03:00
151dc4e387
Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex
2020-03-03 09:53:37 +00:00
7eb6592992
Apply suggestion to lib/pleroma/pool/connections.ex
2020-03-03 09:53:31 +00:00
a21a66972f
Apply suggestion to lib/pleroma/http/http.ex
2020-03-03 09:52:01 +00:00
614e3934f9
Apply suggestion to lib/pleroma/http/http.ex
2020-03-03 09:50:42 +00:00
d30ff35d94
Apply suggestion to lib/pleroma/http/request_builder.ex
2020-03-03 09:46:53 +00:00
a3ad028973
Apply suggestion to lib/pleroma/http/adapter.ex
2020-03-03 09:34:36 +00:00
2c8d80dc0a
Apply suggestion to lib/pleroma/pool/connections.ex
2020-03-03 09:29:57 +00:00
097ad10d02
Apply suggestion to lib/pleroma/pool/connections.ex
2020-03-03 09:29:51 +00:00
4c8569d403
otp_version refactor
2020-03-03 12:21:10 +03:00
509c81e4b1
Merge branch 'develop' into gun
2020-03-03 10:08:07 +03:00
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-03 00:32:34 +04:00
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-02 18:41:12 +03:00
7af431c150
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
2020-03-02 16:47:31 +03:00
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
2020-03-02 15:35:49 +04:00
764a50f8a6
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
...
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
2020-03-02 07:58:01 +00:00
cc98d010ed
relay list shows hosts without accepted follow
2020-03-02 09:27:20 +03:00
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
d9e4b77f8b
Merge branch 'develop' into gun
2020-03-01 12:48:49 +03:00
400fbc7629
wait in mix task while pleroma is rebooted
2020-03-01 12:36:09 +03:00
34f1d09f3a
spec fix
2020-03-01 12:01:39 +03:00
ba87ed7335
fix for compiling
2020-03-01 12:01:39 +03:00
32d1e04817
ActivityPub actions & side-effects in transaction
2020-03-01 12:01:39 +03:00
523f73dccd
Fix static FE plug to handle missing Accept header.
2020-02-29 18:53:49 -08:00
b5465bf385
timeline controller: add a TODO for replacing copypaste with a macro
2020-03-01 02:03:46 +03:00
ffcebe7e22
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
2020-03-01 01:13:08 +03:00
4d416343fa
rate limiter: Fix a race condition
...
When multiple requests are processed by rate limiter plug at the same
time and the bucket is not yet initialized, both would try to initialize
the bucket resulting in an internal server error.
2020-03-01 01:13:07 +03:00
df2173343a
pagination: limit the number of elements returned at one time to 40
2020-03-01 01:11:54 +03:00
19e559fe51
Merge branch 'rate-limiter-runtime-settings' into 'develop'
...
RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250
2020-02-29 21:52:33 +00:00
c747260989
[ #2250 ] Tiny refactoring per merge request review.
2020-02-29 22:04:09 +03:00
814b275af7
Merge branch 'develop' into gun
2020-02-29 11:34:50 +03:00
3ef2ff3e47
auth_controller.ex: Add admin scope to MastoFE
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
2020-02-29 01:25:14 +01:00
3759b146c4
Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex
2020-02-28 13:33:42 +00:00
f2216287a7
Merge branch 'admin-status-list' into 'develop'
...
Admin API: `/api/pleroma/admin/statuses` (accepts `godmode` and `local_only`)
Closes #1550
See merge request pleroma/pleroma!2192
2020-02-27 18:11:04 +00:00
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
2020-02-27 18:46:05 +03:00
cb60a9c42f
Do not fail when user has no email
2020-02-27 17:27:49 +04:00
4ab07cf0d5
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
2020-02-26 22:35:57 +03:00
e2a6a40367
Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
2020-02-26 20:21:38 +03:00
f446744a6a
Allow account registration without an email
2020-02-26 20:13:53 +04:00
fda6f35a46
Merge branch 'feat/instance-gen-improvements' into 'develop'
...
small instance.gen task improvements
See merge request pleroma/pleroma!2245
2020-02-26 08:26:16 +00:00
3bbfebd1c2
instance.gen task: make example instance name less confusing
...
See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217
2020-02-26 00:32:34 +03:00
359faa8645
instance.gen task: remind to transfer the config to the database after
...
migrations
2020-02-25 22:13:08 +03:00
cfa28dee32
instance.gen task: make instance name default to the domain
2020-02-25 21:59:37 +03:00
22018adae6
Fix Dialyzer warnings
2020-02-25 18:34:56 +04:00
10f452ad1f
Merge branch 'develop' into issue/1276
2020-02-25 07:22:56 +03:00
035c2c1415
Merge branch 'fix/instance-gen-custom-static' into 'develop'
...
instance.gen task: fix crash when using custom static directory
Closes #1082
See merge request pleroma/pleroma!2237
2020-02-24 20:52:10 +00:00
5e4fe0e8f7
instance.gen task: fix crash when using custom static directory
...
Closes #1082
2020-02-24 23:42:24 +03:00
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
2020-02-24 21:46:37 +03:00
8efae966b1
open conn in separate task
2020-02-24 19:56:27 +03:00
81f29e7c6a
Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
...
Bugfix: return invalid when answer_data is nil
Closes #1585
See merge request pleroma/pleroma!2236
2020-02-24 14:54:22 +00:00
f9fe6a9e30
Captcha: return invalid when answer_data is nil
2020-02-24 02:49:53 +01:00
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
2020-02-22 19:48:41 +03:00
8f0ca19b9c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# CHANGELOG.md
# config/config.exs
2020-02-22 09:31:43 +03:00
d44f9e3b6c
fix for timeout clause
2020-02-21 16:56:55 +03:00
f604f9e470
hackney pool timeout
2020-02-21 14:33:55 +03:00
6806df80dd
don't log info ssl messages
2020-02-21 14:28:16 +03:00
011ede4536
Update documentation
2020-02-21 14:42:43 +04:00
ad8f26c0a4
more info in Connections.checkin timout errors
2020-02-21 12:53:40 +03:00
a03c420b84
by default don't use gun retries
...
remove conn depends on retry setting from config
2020-02-21 12:32:42 +03:00
13918cb545
Merge branch 'develop' into gun
2020-02-21 10:02:37 +03:00
c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
2020-02-20 23:50:40 +00:00
819cd46717
Auto-expire Create activities only
2020-02-20 22:04:02 +04:00
3eddd9caa6
Merge branch 'require-signature' into 'develop'
...
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
2020-02-20 12:13:21 +00:00
c69b04c490
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
...
remote_follow_controller.ex: Redirect to the user page on success
Closes #1245
See merge request pleroma/pleroma!2123
2020-02-20 12:04:29 +00:00
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
2020-02-20 15:00:48 +03:00
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
2020-02-20 11:58:37 +00:00
3432294657
[ #1505 ] Fixed @spec for Queries.by_object_in_reply_to_id/3
2020-02-20 14:48:46 +03:00
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
2020-02-19 17:16:45 +01:00
c9db0507f8
removing retry option and changing some logger messages levels
2020-02-19 12:26:57 +03:00
7d73e7a09a
Spelling
2020-02-18 09:18:09 -06:00
cf94349287
Merge branch 'develop' into gun
2020-02-18 09:06:27 -06:00
cf8307e71c
Merge branch 'fix/status-view/expires_at' into 'develop'
...
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
2020-02-18 14:56:59 +00:00
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-18 17:46:09 +03:00
3fa2ac68df
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
...
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
2020-02-18 14:36:10 +00:00
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
2020-02-18 14:32:03 +00:00
2ef70b55f5
Fix `status.expires_at` type
2020-02-18 14:52:11 +04:00
514c899275
adding gun adapter
2020-02-18 08:19:01 +03:00
28701c08ad
Merge branch 'develop' into issue/1276
2020-02-17 08:56:03 +03:00
472132215e
Use floki's new APIs for parsing fragments
2020-02-16 01:55:26 +03:00
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
2020-02-15 20:41:38 +03:00
1257331291
MastodonAPI.StatusView: Do not use site_name
...
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg " />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/ ">
2020-02-15 00:36:09 +01:00
478619782b
Standardize @behaviour usage in MRFs
2020-02-14 11:02:24 -06:00
57878f8708
Improve readability
2020-02-14 15:50:31 +04:00
4d459b0e99
Move ActivityExpiration creation from CommonApi.post/2 to ActivityPub.insert/4
2020-02-13 22:27:10 +04:00
241a3d744a
Add ActivityExpirationPolicy
2020-02-13 22:27:10 +04:00
9906c6fb6f
Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'
...
NodeInfo: Fix federating status not being reported when MRF transparency is disabled
Closes #1568
See merge request pleroma/pleroma!2206
2020-02-13 18:08:43 +00:00
6f9839c73c
Merge branch 'develop' into issue/1276
2020-02-13 20:43:34 +03:00
23049a077e
NodeInfo: Fix federating status not being reported when MRF
...
transparency is disabled
Closes #1568
2020-02-13 19:53:39 +03:00
b312c36b8e
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
...
# Conflicts:
# config/description.exs
2020-02-13 14:37:55 +00:00
da44ee5b0f
Merge branch 'develop' into issue/1276
2020-02-13 09:20:34 +03:00
19516af74e
Fix `status.expires_in` validation
2020-02-12 20:20:44 +04:00
ff9fd4ca89
Fix the confusingly named and inverted logic of "no_attachment_links"
...
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
2020-02-11 15:39:19 -06:00
50d9fcbe29
Hotlink logo instead of attachment
2020-02-11 23:33:05 +04:00
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
ea1631d7e6
Make Floki use fast_html
2020-02-11 16:17:21 +03:00
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
2020-02-11 13:58:36 +01:00
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
2020-02-11 13:54:55 +04:00
58574ef156
Merge branch 'develop' into issue/1276
2020-02-11 08:35:26 +03:00
94e5ca1105
Merge branch 'issue/1383' into 'develop'
...
[#1383 ] Switch periodic jobs from quantum to oban
See merge request pleroma/pleroma!2015
2020-02-11 00:04:06 +00:00
6813c0302c
Merge branch 'develop' into issue/1383
2020-02-10 20:49:20 +03:00
c55301e760
Fix a compilation error under certain circumstances
...
I've noticed that sometimes when switching from develop to stable and back,
develop fails to compile and rm -r ing the _build and deps dirs doesn't
help at all.
This is due to Admin API controller needing to generate JSON description
of the config at compile time. Evaluating `config/description.exs`
calls `Generator.list_modules_in_dir/2`, which in turn predicts the
module names of files in the directory and tries to convert the
predicted name to *existing* atoms. Sometimes the compiler will
call that function before compiling the modules in the said directory,
so the conversion will of course fail.
This fixes it by removing the requirement of the atoms being existent.
The function is not subjected to any untrusted user input so this should
be safe. An ideal fix would be to block the compilation of docs before
all modules are compiled and then get a list of compiled elixir modules
under the namespace we want instead of directory hacks, but I have not
been able to figure out how to do that.
2020-02-10 18:41:02 +03:00
3830cb538b
removed a comments
2020-02-10 09:14:15 +03:00
cd040691bd
maked `unread_count` as virtual field
2020-02-10 09:01:45 +03:00
b87533760b
Merge branch 'develop' into issue/1276
2020-02-10 07:59:52 +03:00
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.
2020-02-09 17:34:48 +03:00
6ea3c06d8d
[ #1505 ] Minor refactoring.
2020-02-09 14:09:01 +03:00
7c3991f59e
[ #1505 ] Fixed `replies` serialization (included objects' ids instead of activities' ids).
2020-02-09 10:17:21 +03:00
8fda6303ba
Fix email mix task on OTP releases
...
Closes pleroma#1548
2020-02-09 03:27:29 +03:00
4e6bbdc7b5
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-08 19:59:37 +03:00
d458f4fdca
[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
2020-02-08 19:58:02 +03:00
964b4d82a0
Merge branch 'fix/upload-limit-otp' into 'develop'
...
Actually fix upload limit on OTP releases
Closes #1109
See merge request pleroma/pleroma!2185
2020-02-08 14:02:36 +00:00
dad23e3766
need_reboot flag
2020-02-08 13:00:02 +03:00
15ea75cd2a
Actually fix upload limit on OTP releases
...
Closes #1109
2020-02-07 20:14:06 +03:00
1262357ddb
Merge branch 'cancel-follow-request' into 'develop'
...
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
2020-02-07 16:10:43 +00:00
d85bcc8627
Questions: Add timezone to `closed` property
2020-02-07 16:57:46 +01:00
4538a1ee01
EmojiReactions: Remove old API endpoints
2020-02-07 15:01:45 +01:00
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
2020-02-07 14:52:13 +01:00
bc2e98b200
Add User.get_follow_state/2
2020-02-07 16:17:34 +04:00
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
df0b00b32d
Merge branch 'mastoapi-non-html-strings' into 'develop'
...
mastodon API: do not sanitize html in non-html fields
See merge request pleroma/pleroma!2167
2020-02-06 16:08:23 +00:00
8b9742ecf5
Cancellation of a follow request for a remote user
2020-02-06 18:02:33 +04:00
c85aa6e87f
removing confusing error
2020-02-06 12:50:36 +03:00
15cb1f6804
Merge branch 'fix/unpinnable-polls' into 'develop'
...
fix not being able to pin polls
See merge request pleroma/pleroma!2172
2020-02-05 21:04:16 +00:00
72d767998c
Merge branch 'removing-admin-api-endpoint' into 'develop'
...
Removing migrate_from_db endpoint from admin api
See merge request pleroma/pleroma!2177
2020-02-05 21:03:56 +00:00
b21e59da5f
Merge branch 'remove-linker-scheme-option' into 'develop'
...
Remove AutoLinker `scheme` option from the config
See merge request pleroma/pleroma!2176
2020-02-05 20:32:45 +00:00
5db6ac8ee4
removing migrate_from_db endpoint from admin api
2020-02-05 20:36:21 +03:00
3909b5b7b3
Remove AutoLinker `scheme` option from the config
2020-02-05 21:13:56 +04:00
49e80a1537
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
...
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
2020-02-05 16:59:21 +00:00
8c71f7e11a
Add support for cancellation of a follow request
2020-02-05 20:22:15 +04:00
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-05 07:56:36 +03:00
2c40c8b4a2
Merge branch 'develop' into issue/1383
2020-02-03 21:42:36 +03:00
50f5a92021
fix not being able to pin polls
2020-02-02 14:55:06 +03:00
983a87175e
mastodon API: do not sanitize html in non-html fields
2020-02-02 14:46:32 +03:00
8057157ee3
Make attachments cleanup optional
2020-01-31 01:20:37 +03:00
c27d1d65bf
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
...
Disable rate limiter for socket/localhost
Closes #1380
See merge request pleroma/pleroma!2064
2020-01-30 19:24:04 +00:00
5b62acf6e9
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
2020-01-30 22:16:55 +03:00
774cba84f5
Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
...
Re-enable rate limiter and enable remote ip
See merge request pleroma/pleroma!2164
2020-01-30 18:47:44 +00:00
a0d9d42eaa
Emoji Reactions: Actually use the validation.
2020-01-30 16:07:37 +01:00
e2f2602fdc
Merge branch 'emoji-api-errors' into 'develop'
...
Emoji api error if emoji dir is not writable
Closes admin-fe#62
See merge request pleroma/pleroma!2161
2020-01-30 14:13:40 +00:00
df200ea7a4
Merge branch 'http-security-warning' into 'develop'
...
Warn if HTTPSecurityPlug is disabled
Closes #1528
See merge request pleroma/pleroma!2155
2020-01-30 14:11:29 +00:00
b3e9c87724
Update emoji_api_controller.ex
2020-01-30 14:09:41 +00:00
36becd5573
Update http_security_plug.ex
2020-01-30 14:07:41 +00:00
263abe3ba5
Merge branch 'emoji-reactions-reacted' into 'develop'
...
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
2020-01-30 13:16:04 +00:00
889965141a
RemoteIp: only trust X-Forwarded-For
...
Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.
2020-01-30 00:06:58 +03:00
946de2299c
Merge branch 'fix-streaming-reblog' into 'develop'
...
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
2020-01-29 20:21:32 +00:00
e07e7888d7
Fix credo warning
2020-01-29 18:53:43 +04:00
2bd4d6289b
Make the warning more scarier
2020-01-29 18:43:23 +04:00
e7fee0d6fa
emoji api error on not writable dir
2020-01-29 15:31:34 +03:00
b3a877d6c9
Emoji Reactions: Correctly handle deleted users
2020-01-29 11:43:36 +01:00
a802e07241
Emoji Reactions: Add `reacted` field to emoji reactions
2020-01-29 11:39:06 +01:00
1f4fbe9d98
title parse improvement
2020-01-29 11:13:34 +03:00
ba5e8a6444
Merge branch 'develop' into issue/1276
2020-01-28 21:11:13 +03:00
21a2a05407
Merge branch 'develop' into issue/1383
2020-01-28 20:39:20 +03:00
cedee2793d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
2020-01-28 17:52:42 +01:00
12b6fcdb8c
Merge branch 'features/task-test-email' into 'develop'
...
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
2020-01-28 16:42:57 +00:00
2c121b2623
Merge branch 'fix/1524-link_preview' into 'develop'
...
Meta tags parser respects first title tag
Closes #1524
See merge request pleroma/pleroma!2157
2020-01-28 16:38:14 +00:00
7bd4c14581
meta tag parser respect first title header
2020-01-28 19:29:27 +03:00
d385789a45
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
2020-01-28 17:06:36 +01:00
271935953a
Merge branch 'whole-db-removal' into 'develop'
...
Remove `whole_db` parameter everywhere, it's not used anymore
See merge request pleroma/pleroma!2152
2020-01-28 15:51:45 +00:00
4eb935be78
Create pleroma.email mix task
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
2020-01-28 16:49:38 +01:00
77f24525ca
Streamer: Correctly handle reblog mutes
2020-01-28 16:40:44 +01:00
6302b40791
Warn if HTTPSecurityPlug is disabled
2020-01-28 19:14:09 +04:00
d9cb8acd3e
Merge branch 'fix/attachments-cleanup' into 'develop'
...
Fix attachments cleanup with custom base_url
See merge request pleroma/pleroma!2154
2020-01-28 14:52:57 +00:00
d18a2e4e36
Add test for custom base_url when deleting an attachment
2020-01-28 17:22:24 +03:00
804a702f97
Fix base_url string trimming
2020-01-28 17:07:46 +03:00
dea968463d
Add logging
2020-01-28 16:52:20 +03:00
46915207b6
Remove `whole_db` parameter everywhere, it's not used anymore
2020-01-28 14:40:40 +01:00
e3fae3380e
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
2020-01-28 13:38:49 +00:00
7f78bd7e37
Fix __MODULE__ usage
2020-01-28 16:38:44 +03:00
95afcae194
Merge branch 'support/update_ecto' into 'develop'
...
updated ecto and fixed warning
See merge request pleroma/pleroma!2150
2020-01-28 12:49:22 +00:00
4f004ab92e
Merge branch 'fix/attachments-cleanup' into 'develop'
...
Fix/attachments cleanup
See merge request pleroma/pleroma!2148
2020-01-28 12:40:00 +00:00
02c3dd2e3d
update ecto
2020-01-28 10:43:47 +03:00
eb4870e1cd
Remove unused var
2020-01-28 03:54:54 +03:00
52e08ec9fd
explicitly describe perform op in AttachmentsClenupWorker
2020-01-28 03:52:50 +03:00
bcffa662dc
Merge branch 'develop' into feature/tag_feed
2020-01-27 21:13:13 +03:00
dabd535e43
Remove user recommendation by third party engine
2020-01-27 13:21:50 +00:00
e442ea5722
Merge branch 'develop' into issue/1276
2020-01-27 15:20:47 +03:00
bfc70fdf29
Merge branch 'develop' into issue/1383
2020-01-27 08:48:19 +03:00
86c4b76bf0
Fix typo
2020-01-27 04:01:50 +03:00
36838b516f
Merge branch 'fix/runtime-config' into 'develop'
...
Fixes for runtime config
See merge request pleroma/pleroma!2143
2020-01-26 17:35:21 +00:00
d770cffce0
Merge branch 'develop' into issue/1280
2020-01-26 11:23:05 -06:00
e93cc561cd
restarting pleroma from outside application
2020-01-25 18:42:04 +03:00
86e4d23acb
[ #1505 ] Background fetching of incoming activities' `replies` collections.
2020-01-25 10:47:30 +03:00
de4102b247
can be changed in runtime
2020-01-25 10:39:10 +03:00
6252e82f85
respect settings from database in mix tasks
2020-01-25 10:33:27 +03:00
99c0a11c58
added atom feed
2020-01-24 22:12:23 +03:00
055edd3d72
Merge branch 'develop' into feature/tag_feed
2020-01-24 21:46:57 +03:00
8533b63d1f
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
...
Fix for non existing atom
Closes #1532
See merge request pleroma/pleroma!2139
2020-01-24 11:33:02 +00:00
0fceeb44b3
Merge branch 'emoji-reaction-sanity-check' into 'develop'
...
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
2020-01-24 11:32:25 +00:00
347f3ed2c6
Emoji reactions: Change api format once more
2020-01-24 10:52:24 +01:00
6a0f0ac4a2
fix for non existing atom
2020-01-24 12:22:26 +03:00
293281fcbd
Merge branch 'develop' into feature/tag_feed
2020-01-24 08:58:07 +03:00
6cd2e851d9
parsing Swoosh modules
2020-01-23 18:21:29 +03:00
e8e57e398f
restart config id after truncate
2020-01-23 17:48:45 +03:00
4344c5d5b9
truncate config table on migrate to db task
2020-01-23 17:23:02 +03:00
8589632d09
fixed delete ScheduledActivity
2020-01-23 17:18:23 +03:00
34fc0ca053
Emoji reactions: Add sanity checks for the cache
2020-01-23 12:34:34 +01:00
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
2020-01-23 11:42:10 +03:00
5fc2fa8908
Merge branch 'develop' into issue/1383
2020-01-23 11:11:18 +03:00
ce7c887a27
removed try/rescue
2020-01-23 11:05:08 +03:00
6f77b77428
Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex
2020-01-23 05:49:00 +00:00
dddebee047
Merge branch 'emoji-notifications' into 'develop'
...
Emoji notifications
See merge request pleroma/pleroma!2130
2020-01-23 02:12:03 +00:00
e151dea276
Merge branch 'develop' into feature/new-registrations-digest
2020-01-22 15:59:24 -06:00
ae78059ff4
Merge branch 'develop' into features/remote-follow-userpage-redirect
2020-01-22 15:05:39 -06:00
615b72238e
Notifications: Add emoji reaction notifications
2020-01-22 20:06:12 +01:00
cf96c40057
[ #1505 ] Added Mastodon-compatible `replies` collection to Note federated representation.
2020-01-22 21:10:17 +03:00
6e6f1ead31
Merge branch 'no-error-404' into 'develop'
...
Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066
2020-01-22 17:55:49 +00:00
cf19bf3c7c
Merge branch 'develop' into issue/1383
2020-01-22 20:20:39 +03:00
7c0ac54437
Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
2020-01-22 17:18:55 +00:00
5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest
2020-01-22 21:18:27 +04:00
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
2020-01-22 17:13:17 +00:00
b6f5b326e7
Fix credo warnings
2020-01-22 20:59:58 +04:00
aa0f0d4edd
Disable NewUsersDigestEmail by default
2020-01-22 20:53:06 +04:00
df0b8f1d08
Add new users digest email
2020-01-22 20:31:42 +04:00
34aa0c542b
Merge branch 'emoji-reaction-extensions-2' into 'develop'
...
Emoji Reactions: In the API, sort them by first emoji insertion date
See merge request pleroma/pleroma!2126
2020-01-22 14:11:01 +00:00
dd3fc50ea4
Emoji reactions: Change cache and reply format
2020-01-22 13:57:42 +01:00
d5f8a88a37
support for updating env after settings deletion
2020-01-22 15:14:11 +03:00
32a643a159
Merge branch 'develop' into admin-be
2020-01-22 11:22:31 +03:00
b8d5c09f48
Merge branch 'develop' into issue/1383
2020-01-22 09:30:30 +03:00
5ea8596448
Merge branch 'develop' into feature/tag_feed
2020-01-21 20:56:49 +03:00
22e94bb2c7
Merge branch 'develop' into fix/attachments-cleanup
2020-01-21 19:45:13 +03:00
7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
2020-01-21 16:46:16 +01:00
f01ab6cd29
some refactor and tests
2020-01-21 18:42:00 +03:00
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
2020-01-21 13:13:17 +00:00
503d966e9f
Merge branch 'develop' into admin-be
2020-01-21 10:32:27 +03:00
dcae5914d1
fix for db key
2020-01-21 10:14:48 +03:00
41e2332007
Merge branch 'develop' into feature/tag_feed
2020-01-21 09:23:35 +03:00
6e88a7e591
exclude blocked user posts from search results
2020-01-21 07:40:13 +03:00
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
2020-01-20 18:10:55 +01:00
00d08c9231
Merge branch 'favoritng-responses' into 'develop'
...
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
2020-01-20 16:31:43 +00:00
8023fa48db
merge fix
2020-01-20 18:25:00 +03:00
4c5b5f14dc
StatusView: Add `emoji_reactions`
2020-01-20 16:24:20 +01:00
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
2020-01-20 14:42:43 +00:00
42ea480e95
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
...
Pleroma API: `emoji_reactions_by` does not need authorization
See merge request pleroma/pleroma!2117
2020-01-20 13:49:06 +00:00
510776ba31
CommonAPI: Don't error out on double favs/repeats
2020-01-20 14:27:59 +01:00
c814f22030
Merge branch 'fix-admin-api-scope' into 'develop'
...
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
2020-01-20 12:07:12 +00:00
5fddf988ea
Pleroma API: `emoji_reactions_by` does not need authorization
2020-01-20 13:05:35 +01:00
e8759cb5ba
Merge branch 'hashtag-benchmarks' into 'develop'
...
Hashtag benchmarks
See merge request pleroma/pleroma!2116
2020-01-20 11:26:07 +00:00
5c533e10e7
Bump credo to 1.1.5
2020-01-20 12:17:14 +01:00
9367b70f37
Merge branch 'features/cleanup-incoming-actor' into 'develop'
...
transmogrifier.ex: simplify handle_incoming of actors
See merge request pleroma/pleroma!2114
2020-01-20 10:25:17 +00:00
dc0498ab2b
Check for unapplied migrations on startup
...
Closes #1328
2020-01-20 12:20:26 +03:00
cde828ff7d
Fix credo warning
2020-01-19 22:09:47 +03:00
d6a532bf0f
Delete attachments asynchronously
2020-01-19 19:45:20 +03:00
6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
2020-01-19 07:06:15 +01:00
efb8ef5abe
releases support
2020-01-18 17:14:50 +03:00
e699861690
full update for some subkeys
2020-01-18 12:25:56 +03:00
81133702d4
Delete attachments after object and cache cleanup
2020-01-17 20:20:37 +03:00
89e93fb33f
return db key on update requests
2020-01-17 18:15:41 +03:00
7676ed8239
some clean up
2020-01-17 16:28:44 +03:00
ce027fd0ef
revert non needable
2020-01-17 15:13:24 +03:00
9e10b90b5b
configure only console backend
2020-01-17 15:06:42 +03:00
108a39c876
updated error messages for authentication process
2020-01-17 15:01:37 +03:00
b310feeccb
compile fix
2020-01-17 15:00:20 +03:00
58e8963824
fix for config loader
2020-01-17 11:54:22 +03:00
60ba2339a2
saving to DB only added by user settings
2020-01-17 11:45:44 +03:00
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
2020-01-16 08:50:27 +03:00
a5db044e57
Merge branch 'develop' into feature/tag_feed
2020-01-15 19:11:13 +03:00
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
2020-01-15 18:12:08 +03:00
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
2020-01-15 14:29:56 +00:00
59ba5c80b9
little cleanup
2020-01-15 17:10:33 +03:00
66de2b159b
don't migrate Pleroma.Web.EndPoint settings
...
don't set Logger level to all tasks
2020-01-15 17:08:45 +03:00
3849053c6a
Merge branch 'develop' into notifications-from-account
2020-01-15 16:49:45 +04:00
167e9c45ec
Benchmarks: Move to correct folder
2020-01-15 12:37:50 +01:00
76c1948880
[ #1478 ] Adjusted AdminAPIController admin subscope requirements.
2020-01-15 12:11:23 +03:00
c9f45edeac
Merge branch 'develop' into feature/tag_feed
2020-01-14 21:29:14 +03:00
0709757e47
Check if object->data is array when looking up attachment objects to delete
2020-01-14 19:53:28 +03:00
2ee6754095
Mix Tasks: Add pleroma.benchmarks.tags
2020-01-14 17:24:26 +01:00
70c7a26de8
Merge branch 'develop' into admin-be
2020-01-14 14:52:00 +03:00
b7908844f2
Merge branch 'develop' into issue/1383
2020-01-13 12:41:07 +03:00
88f0eed0f2
Delete attachments when status is deleted
2020-01-12 18:48:58 +00:00
8b4d81609d
Merge branch 'updated-at-on-conversation-read' into 'develop'
...
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
2020-01-12 18:37:52 +00:00
bb5862ea2f
Merge branch 'issue/1354' into 'develop'
...
[#1354 ] fix remote follow
See merge request pleroma/pleroma!2079
2020-01-12 18:20:31 +00:00
2f5b8fbeb3
Merge branch 'develop' into issue/1354
2020-01-12 12:12:15 -06:00
ea4a462858
Merge branch 'issue/1487' into 'develop'
...
[#1487 ] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
2020-01-12 17:25:25 +00:00
0c9c62509d
Remove MDII uploader
2020-01-11 17:19:54 +00:00
1630ecaa20
Merge branch 'develop' into admin-be
2020-01-11 12:15:42 +03:00
3453b27015
don't migrate prometheus settings
2020-01-10 21:24:06 +03:00
d933fd3d61
more renamings
2020-01-10 19:51:32 +03:00
eadb674c41
don't migrate configurable_from_database setting
2020-01-10 19:44:30 +03:00
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
2020-01-10 19:34:19 +03:00
958d0452e4
fix for pleroma assets group update
2020-01-10 18:18:09 +03:00
39ce894a07
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
...
# Conflicts:
# lib/pleroma/user.ex
2020-01-10 16:18:32 +03:00
05ca420c09
Merge branch 'issue/1490' into 'develop'
...
[#1490 ] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
2020-01-10 13:14:20 +00:00
88a16bb9fc
deep merge in config update
2020-01-10 15:52:02 +03:00
c841174de8
flag for delete fix
2020-01-10 15:52:02 +03:00
0b02040327
little fixes and typos fix
2020-01-10 15:52:02 +03:00
9c1f3bfeff
fixes for logger backends
2020-01-10 15:52:01 +03:00
cda2c1fc63
fix for subgroup tuple
...
added settings for swoosh adapters local
2020-01-10 15:52:01 +03:00
063ab6d911
logger backends fix
2020-01-10 15:52:01 +03:00
583cee4607
parsing proxy url setting
2020-01-10 15:52:01 +03:00
a71393dd29
fix for endpoints after env update
2020-01-10 15:52:00 +03:00
fea734ca70
errors on endpoints
2020-01-10 15:52:00 +03:00
5cacb988b9
partially settings update
2020-01-10 15:52:00 +03:00
0656816c77
tests for setttings without an explicit key
2020-01-10 15:51:59 +03:00
2753285b77
config editing through database
2020-01-10 15:51:59 +03:00
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
2020-01-10 10:52:21 +03:00
70410dfafd
fix create service actor
2020-01-08 16:40:49 +03:00
0b6d1292d2
Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
2020-01-05 17:38:51 +03:00
fa7d8e77e6
fixed Metadata.Utils.scrub_html_and_truncate
2020-01-03 16:28:13 +03:00
badd0a96ea
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
2020-01-02 13:03:33 +03:00
933dc12043
added code of mr#2067
2019-12-25 15:12:43 +03:00
385356aad0
fix oauth scopes for AdminApi#reports_update
2019-12-24 20:51:52 +03:00
bdd71669da
update test
2019-12-22 21:21:31 +03:00
4c505bc615
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
2019-12-22 17:58:54 +00:00
c9a44ec4a6
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
2019-12-22 17:58:45 +00:00
5b84156013
moved remote follow in separate controller
2019-12-21 21:27:42 +03:00
54c9db38c8
Merge branch 'develop' into issue/1383
2019-12-21 20:38:59 +03:00
c51e93978e
Merge branch 'feature/custom-runtime-modules' into 'develop'
...
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
2019-12-21 11:56:24 +00:00
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
2019-12-21 11:41:19 +00:00
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
2019-12-20 16:32:04 -06:00
a54aa5af43
Merge branch 'feature/status-counts-by-scope' into 'develop'
...
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
2019-12-20 16:30:26 +00:00
7bd0bca2ab
fixed remote follow
2019-12-20 16:33:44 +03:00
5fc84552d3
Fix all count
2019-12-19 19:52:55 +03:00
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
2019-12-19 17:24:08 +03:00
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
2019-12-19 17:23:27 +03:00
34d85f8a54
Return 404 if account to filter notifications from is not found
2019-12-19 20:45:44 +07:00
775212121c
Verify HTTP signatures only when request accepts "activity+json" type
2019-12-19 20:17:18 +07:00
432b3067d4
Do not crash when remote user follower and following counters are hidden
2019-12-19 19:26:46 +07:00
404a9ccb9a
Stats: return status counts by scope
2019-12-18 23:17:34 +03:00
b53573a837
add tag feeds
2019-12-18 09:19:37 +03:00
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17 16:16:21 +01:00
6c39fa20b1
Add support for `account_id` param to filter notifications by the account
2019-12-17 17:00:46 +07:00
45180d4c60
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
2019-12-17 12:36:56 +03:00
8f79f433bc
Hide follower counter when hiding is activated
2019-12-17 13:34:07 +07:00
a879c396bb
Merge branch 'develop' into feature/tag_feed
2019-12-17 09:24:08 +03:00
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-16 22:34:21 +07:00
a12b6454bb
Add an option to require fetches to be signed
2019-12-16 22:24:03 +07:00
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
2019-12-15 22:32:42 +03:00
67cb46e15d
Merge branch 'develop' into issue/1383
2019-12-14 21:44:10 +03:00
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
2019-12-14 03:06:43 +03:00
02c3031e99
Don't log when users or objects are deleted.
2019-12-13 12:05:53 -08:00
bcd16676a7
Publisher: check out a connection for inserting publish_one jobs
...
Related to #1474 , federation of one post on my istance creates in
best-case 360 jobs, so if they for some reason take a while to insert,
it will exhaust the connection pool. This fixes it by checking out one
dedicated connection for inserting them.
2019-12-13 14:27:10 +03:00
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-13 01:51:52 +07:00
2f31cef71f
Merge branch 'feature/native-captcha' into 'develop'
...
Add native captcha and enable it by default.
Closes #1017 and #1405
See merge request pleroma/pleroma!2060
2019-12-12 18:43:21 +00:00
81b05340e9
[ #1427 ] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
...
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
2019-12-12 16:00:06 +03:00
e536796984
Add native captcha and enable it by default.
2019-12-12 17:39:39 +07:00
8cb852523a
Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
...
AdminAPI: Merge account views for list instance statuses
See merge request pleroma/pleroma!2054
2019-12-12 09:28:27 +00:00
3ecf131511
Merge branch 'develop' into feature/report-notes
2019-12-12 02:16:23 +03:00
9ef912aecf
Merge branch 'develop' into issue/1411
2019-12-11 15:02:53 -06:00
82fae3e23f
AdminAPI: Merge account views for list instance statuses
2019-12-11 18:57:36 +03:00
ee6805850c
Set log level to debug for not important messages
2019-12-11 17:47:19 +07:00
72f3b22134
Merge branch 'domain-block-precedence' into 'develop'
...
make follows take precedence over domain blocks
See merge request pleroma/pleroma!2019
2019-12-11 09:57:00 +00:00
1ad96d667a
remove single-step pipe
2019-12-11 09:08:20 +00:00
1f498ba2bb
Merge branch '1427-oauth-admin-scopes' into 'develop'
...
[#1427 ] Fixed `:admin` option handling in OAuthScopesPlug, added tests
Closes #1427
See merge request pleroma/pleroma!2053
2019-12-11 08:50:43 +00:00
3920244be5
[ #1427 ] Fixed `:admin` option handling in OAuthScopesPlug, added tests.
2019-12-11 11:42:02 +03:00
457821adb0
Apply suggestion to lib/pleroma/user.ex
2019-12-10 18:49:41 +00:00
67a478d709
Merge branch 'fix/unsubscribe-route' into 'develop'
...
Do not apply http signature pipeline to the unsubscribe route
See merge request pleroma/pleroma!2052
2019-12-10 17:25:56 +00:00
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-10 16:54:25 +00:00
25f774f7c1
format activity_pub.ex
2019-12-10 16:41:43 +00:00
19d228cc58
modify SQL to include followed-but-domain-blocked activities
2019-12-10 16:40:12 +00:00
75b419d7c8
Do not apply http signature pipeline to the unsubscribe route
2019-12-10 22:36:03 +07:00
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:38:25 +00:00
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:34:54 +00:00
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
a37bd5c255
Change log level
2019-12-10 15:08:57 +07:00
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
2019-12-10 08:55:14 +03:00
9dfaa0b832
fix loads config variable with large value from db
2019-12-09 22:29:44 +03:00
37c34ccec3
Merge branch 'fix/prefer-url-over-search' into 'develop'
...
status search: prefer the status fetched by url over other results
See merge request pleroma/pleroma!2050
2019-12-09 17:55:48 +00:00
f4b7f32d51
status search: prefer the status fetched by url over other results
2019-12-09 20:45:04 +03:00
b7a57d8e38
Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0
2019-12-10 00:38:01 +07:00
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-10 00:16:43 +07:00
2b821036c4
Merge branch 'develop' into issue/1383
2019-12-09 19:41:43 +03:00
0d2c13a119
Merge branch 'fix/otp-parsers' into 'develop'
...
OTP: Fix runtime upload limit config being ignored
Closes #1109
See merge request pleroma/pleroma!2045
2019-12-09 15:10:05 +00:00
b3c80b8404
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
...
Fix exclude_visibilities filter for followers-only Like notifications
See merge request pleroma/pleroma!1957
2019-12-09 14:55:42 +00:00
f3c2363f4a
Merge branch 'fix/user-list-task' into 'develop'
...
Fix `mix pleroma.user list` task
See merge request pleroma/pleroma!2029
2019-12-09 14:44:56 +00:00
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
2019-12-09 14:30:35 +00:00
a5e28bf214
Merge branch 'develop' into 'fix/oauth-compile-time'
...
# Conflicts:
# CHANGELOG.md
2019-12-09 13:52:01 +00:00
78299ab182
Set Plug.Logger to log at `:debug` level
2019-12-09 19:12:24 +07:00
ed92784e7c
Set Logger level to :info in prod
2019-12-09 19:11:54 +07:00
84f891ea3e
Add Pleroma.Utils.compile_dir/1
2019-12-09 18:23:07 +07:00
d4bafabfd1
Beginnings of the create validator
2019-12-09 10:39:14 +01:00
95e6a2acd9
Merge branch 'develop' into issue/1342
2019-12-08 21:25:26 +03:00
3c45ed4f47
OTP: Fix runtime upload limit config being ignored
...
Closes #1109
2019-12-08 21:08:25 +03:00
d6c89068f3
HTML: Compile Scrubbers on boot
...
This makes it possible to configure their behavior on OTP releases.
2019-12-08 20:35:41 +03:00
6fbafb1cdc
Merge branch 'develop' into issue/1276
2019-12-08 20:14:28 +03:00
bd3aa8500c
OAuth token cleanup: Get rid of compile-time configuration
2019-12-08 20:03:33 +03:00
5876a9cb79
Merge branch 'develop' into issue/1383
2019-12-08 19:52:46 +03:00
af5fef1f22
Merge branch 'fix/clause-never-matches' into 'develop'
...
Fix never matching clause
See merge request pleroma/pleroma!2042
2019-12-08 13:50:57 +00:00
a21340caa1
Fix never matching clause
...
`length/1` is only used with lists.
2019-12-08 16:46:18 +03:00
8404f8c8fb
Merge branch 'improve-move-notificaions-api' into 'develop'
...
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
2019-12-08 13:07:05 +00:00
29a3f70cba
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
...
ActivityPub: For user timelines, respects blocks.
Closes #1463
See merge request pleroma/pleroma!2041
2019-12-08 11:23:31 +00:00
a7f77785c2
Implement report notes destruction
2019-12-08 11:27:23 +03:00
1770602747
[ #1427 ] Extra check that admin OAuth scope is used by admin. Adjusted tests.
2019-12-07 17:49:53 +03:00
40e1817f70
[ #1427 ] Fixes / improvements of admin scopes support. Added tests.
2019-12-06 20:33:47 +03:00
6cb31edd76
Merge branch 'feature/1455-chat-character-limit' into 'develop'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
2019-12-06 15:36:30 +00:00
93a80ee915
[ #1427 ] Bugfix for `enforce_oauth_admin_scope_usage`. Admin API documentation entry.
2019-12-06 16:56:23 +03:00
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
2019-12-06 14:25:13 +01:00
a75d4a41e0
Add a test for custom runtime modules
2019-12-06 17:05:09 +07:00
08c89fd2b8
Fix incorrect report count
2019-12-06 17:17:24 +09:00
e4292cbfad
Use Kernel.inspect/2 to print loaded custom modules
2019-12-06 15:16:39 +07:00
157bceeda9
Move runtime configuration from `:instance` to `:modules`
2019-12-06 15:04:46 +07:00
22fc271e23
init tag feed
2019-12-06 09:33:40 +03:00
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
2019-12-06 00:26:31 +03:00
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
2019-12-06 00:25:44 +03:00
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
2019-12-06 00:12:21 +03:00
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
2019-12-05 21:45:57 +03:00
67d8df04a4
Merge branch '1335-user-api-id-fields-relations' into 'develop'
...
[#1335 ] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
2019-12-05 17:16:23 +00:00
d0bd4348b3
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
...
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
2019-12-05 13:34:34 +00:00
1216b546c6
Fix credo warning
2019-12-05 20:29:17 +07:00
48ae3c4347
Add support for custom modules
2019-12-05 20:18:25 +07:00
3fe7a1fd35
Merge branch 'develop' into issue/1342
2019-12-05 15:46:27 +03:00
1993d7096d
Validators: Add a type for the datetime used in AP.
2019-12-05 12:33:06 +01:00
49bb0a130f
Merge branch 'develop' into issue/1276
2019-12-05 12:22:19 +03:00
e21afdb7c7
Merge branch 'develop' into issue/1411
2019-12-05 12:18:59 +03:00
3c3bba0b7c
fix ScheduledActivity
2019-12-04 21:18:05 +03:00
d3bce89edd
[ #1335 ] Merge issue fix.
2019-12-04 19:41:14 +03:00
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
e9993acdbb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-12-04 16:35:59 +01:00
aa97fe8f17
ChatChannel: Ignore messages that are too long.
2019-12-04 12:48:34 +01:00
3a0a400fe1
add @type to ScheduledActivity
2019-12-04 09:53:01 +03:00
29a98b86b7
Merge branch 'develop' into issue/1383
2019-12-04 09:34:44 +03:00
652cc6ba4b
updated ScheduledActivity
2019-12-04 09:12:17 +03:00
05fb8d0084
Fix Pleroma.FollowingRelationship.move_following/2
2019-12-03 22:31:12 +07:00
4b60d41db9
Add report notes
2019-12-04 00:26:37 +09:00
624e720aa4
Add `with_move` query param to the notifications API
2019-12-03 22:13:38 +07:00
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
356a936ecb
Fix `mix pleroma.user list` task
2019-12-02 18:11:45 +07:00
cf52106e05
Update Floki dependency
2019-12-02 13:38:35 +07:00
88f7cf51d4
Merge branch 'develop' into issue/1411
2019-12-01 16:18:16 +03:00
0d24ab04c5
Merge branch 'remove-info-from-users' into 'develop'
...
Removed users.info field
See merge request pleroma/pleroma!2006
2019-11-30 10:42:51 +00:00
0326683932
hide follower/following for friendica
2019-11-30 15:43:05 +09:00
51111e286b
[ #1427 ] Initial support for OAuth admin scopes.
2019-11-29 18:57:19 +03:00
a98cda7758
Fix Pleroma.HTML.extract_first_external_url/2
2019-11-29 15:49:35 +07:00
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
2019-11-29 10:17:59 +03:00
a36607c27e
add mix task to set\unset privacy option of notification
2019-11-28 22:13:28 +03:00
04a8ffbe84
added privacy option to push notifications
2019-11-28 22:13:11 +03:00
a52da55eb9
added User.NotificationSetting struct
2019-11-28 22:08:30 +03:00
b7c449118b
Merge branch 'develop' into issue/1383
2019-11-28 21:27:01 +03:00
c7cc80a9ee
obligatory format commit
2019-11-28 10:40:50 +00:00
fa97eddf8a
make follows take precedence over domain blocks
2019-11-28 10:38:38 +00:00
fcabcab443
Fetch account from report, not from status (it might be deleted)
2019-11-28 00:09:00 +09:00
5135656f57
Handle reopened reports with deleted statuses
2019-11-27 22:54:12 +09:00
50b152766f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
2019-11-27 14:48:28 +01:00
f36724efb1
User: Never return nil for user follower counts.
2019-11-27 14:13:36 +01:00
a4f834a687
moved DigestEmail to Oban Periodic jobs
2019-11-27 15:59:13 +03:00
f595cfe623
Remove User.user_info/2
2019-11-27 19:43:47 +07:00
1fc28a4b44
Add a view for the move notification
2019-11-27 17:52:02 +07:00
c5766a8100
moved ActivityExpiration to Oban Periodic jobs
2019-11-27 13:36:03 +03:00
6f202a401b
moved ScheduledActivity to Oban Periodic jobs
2019-11-27 09:26:37 +03:00
4af69f047d
Remove `account` field from web push payload
2019-11-27 02:32:55 +07:00
80ededc04f
Add `direct_conversation_id` to web push payload
2019-11-26 19:53:43 +07:00
ac3abb5414
moved Pleroma.Stats to Oban Periodic jobs
2019-11-26 10:54:30 +03:00
c8d3c3bfec
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
2019-11-26 10:42:36 +03:00
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
2019-11-26 00:25:43 +09:00
dc9090810d
Merge branch 'fix/ap-disable-remote-render' into 'develop'
...
Disable rendering AP representation for remote users and objects
See merge request pleroma/pleroma!2010
2019-11-25 15:23:45 +00:00
b3b4e5ca80
AdminAPI: Grouped reports old/new fix
...
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
2019-11-26 00:20:46 +09:00
1364d303f8
AdminAPI: Fix grouped reports for closed/resolved reports
2019-11-26 00:13:11 +09:00
4b10804f21
OStatus controller: don't serve json at /notice/, redirect instead
2019-11-25 17:55:17 +03:00
02f7383891
ActivityPub controller: do not render remote users
2019-11-25 17:19:33 +03:00
5f981178d0
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
...
Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981
2019-11-25 13:29:53 +00:00
9374b52756
Merge branch 'fix/update-reports-old-format' into 'develop'
...
Admin API: Fix error when trying to update reports in the "old" format
See merge request pleroma/pleroma!1986
2019-11-25 13:29:22 +00:00
0e9be6bafa
moved OAuth.Token.CleanWorker to Oban Periodic jobs
2019-11-25 14:32:20 +03:00
d3656c2725
add ability to set a custom user-agent string
2019-11-25 09:53:11 +00:00
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-25 01:46:18 +09:00
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-25 01:43:11 +09:00
40059c9b1e
Typo
2019-11-25 00:05:52 +09:00
2b341627da
Admin API: Render whole status in grouped reports
2019-11-25 00:04:29 +09:00
9f29930440
fetcher: move local object checking into a reusable function
2019-11-23 22:55:41 +03:00
1636cc5b7e
Removed users.info and remaining usages.
2019-11-23 14:06:19 +03:00
bd62946020
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
...
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
2019-11-22 15:39:19 +00:00
b64c7b35d4
Swap map with each
2019-11-22 09:11:36 +09:00
c2ad9fd5f9
Merge branch 'list-users' into 'develop'
...
Add CLI list users command
See merge request pleroma/pleroma!1990
2019-11-21 20:33:11 +00:00
fbc379d689
Add CLI list users command
2019-11-21 21:07:06 +01:00
19b727bf8f
Merge branch 'fix/mix-task-logging' into 'develop'
...
Allow mix tasks to always run with debug logging
See merge request pleroma/pleroma!1997
2019-11-21 15:04:19 +00:00
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
2019-11-21 16:47:52 +03:00
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
2019-11-21 13:13:14 +00:00
320690f7a5
Object: Use inspect to log missing preload.
2019-11-21 14:03:01 +01:00
d38ab4bb89
Fix user.following_count
2019-11-21 16:31:13 +07:00
edaae845af
Some tasks try to set log level in test environment, but we were stripping logs belog :warn.
...
Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose.
2019-11-20 11:55:30 -06:00
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
2019-11-20 15:46:11 +03:00
555edd01ab
[ #1335 ] User AP ID relations fetching performance optimizations.
2019-11-20 12:19:07 +03:00
ff9133b978
Allow mix tasks to always run with debug logging
2019-11-19 16:01:17 -06:00
565f261338
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-19 23:22:47 +03:00
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19 23:22:10 +03:00
708fd234bd
fix order favorites activites
2019-11-19 20:19:41 +03:00
46eb160135
AdminAPI: Confirm user account, resend confirmation email
2019-11-19 20:14:02 +09:00
36686f5245
Support authentication via `x-admin-token` HTTP header
2019-11-19 15:58:20 +07:00
5cee51fac5
fix `order by` for fetch_favorites
2019-11-18 21:34:54 +03:00
3aaf3aa2c2
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-18 20:43:19 +03:00
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
2019-11-18 20:38:56 +03:00
0937895182
updated fetch_favorites
2019-11-18 16:56:47 +03:00
9da4c88b49
fix test
2019-11-18 10:00:48 +03:00
4beb3ce5c5
/api/v1/favourites: added sorting for activites by adds to favorites
2019-11-18 09:44:08 +03:00
c506cc48ef
Admin API: Error when trying to update reports in the "old" format
2019-11-16 18:44:48 +09:00
81cba405af
Merge branch 'nodeinfo-fields-limit' into 'develop'
...
Add fieldsLimit to metadata of nodeinfo
See merge request pleroma/pleroma!1983
2019-11-15 20:29:38 +00:00
b9041c2097
added recount unread notifications to markers
2019-11-15 22:46:58 +03:00
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-15 21:40:14 +03:00
c31ddce51e
[ #1335 ] Reorganized `users.mutes` as relation to UserMute entity.
2019-11-15 21:38:54 +03:00
22554ac5ca
Merge branch 'bugfix/1395-email-activation' into 'develop'
...
Bugfix/1395 email activation
Closes #1395
See merge request pleroma/pleroma!1965
2019-11-15 14:11:48 +00:00
f17e0f8e4f
OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
2019-11-15 14:13:21 +01:00
72d2557e11
Add fieldsLimit to metadata of nodeinfo
2019-11-15 18:52:31 +09:00
eecd64cc07
object age policy: remove debug logging
2019-11-14 19:56:14 -06:00
5705cf0e3e
MRF: add ObjectAgePolicy which deals with old posts being imported
2019-11-14 19:48:10 -06:00
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-14 23:45:29 +09:00
30af5da330
Admin API: list all statuses from a given instance
2019-11-14 23:44:07 +09:00
09b4f7269e
Merge branch 'fix/conversations-rendering' into 'develop'
...
Fix rendering conversations when there's a malformed status
Closes #1401
See merge request pleroma/pleroma!1973
2019-11-14 14:40:37 +00:00
94f1cfced8
format the code
2019-11-14 17:26:59 +03:00
1afeaf82fa
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
...
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
2019-11-14 13:35:41 +00:00
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
2019-11-14 08:47:10 +00:00
3c60adbc1f
Support redirecting by activity UUID in static FE as well.
2019-11-13 08:22:11 -08:00
0867cb083e
Support redirecting by object ID in static FE.
...
This matches the behavior of pleroma-fe better.
Fixes #1412 .
2019-11-13 08:02:02 -08:00
facc37aaa6
Merge branch 'static-remote-redirect' into 'develop'
...
For remote notices, redirect to the original instead of 404 in static-fe
See merge request pleroma/pleroma!1974
2019-11-13 10:16:00 +00:00
62f3a93049
For remote notices, redirect to the original instead of 404.
...
We shouldn't treat these like local statuses, but I don't think a 404
is the right choice either here, because within pleroma-fe, these are
valid URLs. So with remote notices you have the awkward situation
where clicking a link will behave differently depending on whether you
open it in a new tab or not; the new tab will 404 if it hits static-fe.
This new redirecting behavior should improve that situation.
2019-11-12 09:40:29 -08:00
b5b62f42b2
update Marker.multi_set_unread_count
2019-11-12 15:59:34 +03:00
768c1a5de1
Fix tests
2019-11-12 19:13:19 +07:00
27cd1374e3
Add a notification for Move activities
2019-11-12 18:48:14 +07:00
e6d7e27bd6
Add `allow_following_move` setting to User
2019-11-12 18:45:28 +07:00
e835cd97f6
Containment: Add a catch-all clause to contain_origin.
2019-11-12 12:07:17 +01:00
7d101bc9c5
Fix rendering conversations when there's a malformed status
2019-11-11 18:29:55 -06:00
f86a7d5d8b
Fix exclude_visibilities filter for followers-only Like notifications
2019-11-11 23:57:30 +03:00
e27d78e768
Merge branch 'nodeinfo-federation-enabled' into 'develop'
...
report federating status in nodeinfo
See merge request pleroma/pleroma!1971
2019-11-11 19:14:06 +00:00
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
2019-11-11 19:10:44 +00:00
b39b49cc14
report federating status in nodeinfo
2019-11-11 19:03:43 +01:00
ddbfc995ac
clean sql query
2019-11-11 17:06:41 +03:00
1ca7b877a1
Merge branch 'iss-1376' into 'develop'
...
Check client and token in GET /oauth/authorize
See merge request pleroma/pleroma!1940
2019-11-11 12:27:33 +00:00
417f9a782f
Merge branch 'fix/1399' into 'develop'
...
fix for migrate config to db task
Closes #1399
See merge request pleroma/pleroma!1964
2019-11-11 12:13:45 +00:00
94627baa5c
New rate limiter
2019-11-11 12:13:06 +00:00
f6056e9c9c
UserEnabledPlug: Don't authenticate unconfirmed users.
2019-11-11 12:43:46 +01:00
8521553ad9
User: Don't let deactivated users authenticate.
2019-11-11 12:37:38 +01:00
5cf2c7422b
[ #1335 ] Applied code review suggestions.
2019-11-11 14:16:57 +03:00
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-11 19:18:12 +09:00
31343e4321
Code style fixes
2019-11-11 19:06:09 +09:00
6a4201e0b4
fix for migrate task
2019-11-10 22:54:37 +03:00
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
2019-11-10 16:30:21 +03:00
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-11-10 11:32:50 +00:00
3a1aaadc18
Merge branch 'issue/1339' into 'develop'
...
[#1339 ] add subject to atom feed
See merge request pleroma/pleroma!1961
2019-11-10 11:20:20 +00:00
9d0b989521
add subject to atom feed
2019-11-10 11:10:20 +03:00
3cc49cdb78
Formatter moved to new module.
2019-11-09 18:30:23 -08:00
ef7c3bdc7a
Add some further test cases.
...
Including like ... private visibility, cos that's super important.
2019-11-09 18:08:45 -08:00
4729027f91
Prevent non-local notices from rendering.
2019-11-09 18:08:45 -08:00
886a07ba57
Move static_fe config to its own section instead of in :instance.
2019-11-09 18:08:45 -08:00
b0080fa730
Render errors in HTML, not with JS.
2019-11-09 18:08:08 -08:00
e27c61218d
Expand subject content automatically when config is set.
2019-11-09 18:08:08 -08:00
bfd5d79826
Include metadata in static FE conversations and profiles.
2019-11-09 18:08:08 -08:00
828259fb65
Catch 404s.
2019-11-09 18:08:08 -08:00
df2f59be91
Pagination for user profiles.
2019-11-09 18:08:08 -08:00
8969c5522d
Make many of the improvements suggested in review.
2019-11-09 18:08:08 -08:00
e8bee35578
Static FE plug should only respond to text/html requests.
2019-11-09 18:08:08 -08:00
dc3b87d153
Move static FE routing into its own plug.
...
Previously it was piggybacking on FallbackRedirectController for users
and OStatusController for notices; now it's all in one place.
2019-11-09 18:08:08 -08:00
c6c706161e
Make sure notice link is remote if the post is remote.
2019-11-09 18:08:08 -08:00
274cc18e8a
Visually separate header.
2019-11-09 18:08:08 -08:00
2ac1ece652
Fix a bug where reblogs were displayed under the wrong user.
2019-11-09 18:08:08 -08:00
5d7c44266b
Change date formatting.
2019-11-09 18:08:08 -08:00
1dc785b74b
Move static-fe CSS to a separate file.
2019-11-09 18:07:50 -08:00
e4b9784c39
Show counts for replies, likes, and announces for selected notice.
...
Using text instead of an icon, for now.
2019-11-09 18:07:50 -08:00
93e9c0cedf
Format dates using CommonAPI utils.
2019-11-09 18:07:50 -08:00
918e1353f6
Add header to profile/notice pages linking to pleroma-fe.
2019-11-09 18:07:50 -08:00
33a26b61c3
Remove activity/user representer; move logic to controller.
2019-11-09 18:07:50 -08:00
41fde63def
Get rid of @data in views and use separate fields.
2019-11-09 18:07:50 -08:00
e944a2213d
Use gettext for sensitive media warning.
2019-11-09 18:07:50 -08:00
2d1897e8a7
Apply all suggested changes from reviewers.
2019-11-09 18:07:50 -08:00
cc1b07132f
Notices should show entire thread from context.
2019-11-09 18:07:08 -08:00
748d800acb
Show images, video, and audio attachments to notices.
2019-11-09 18:07:08 -08:00
1d8950798c
Fix activity_representer to work with User.get_or_fetch returning tuple.
2019-11-09 18:06:51 -08:00
0cf04e1088
Fix OStatus controller to know about StaticFEController.
...
But only when it's configured to be on.
2019-11-09 18:06:51 -08:00
e79d8985ab
Don't show 404 in static-fe controller unless it's actually not found.
2019-11-09 18:06:51 -08:00
c1fc139986
Add permalinks to the static-fe notice rendering.
2019-11-09 18:06:51 -08:00
d1320160f4
Looks like source_data is on user directly now.
2019-11-09 18:06:51 -08:00
ca5ef201ef
static fe: add remote follow button
2019-11-09 18:06:51 -08:00
b33fbd58e3
static fe: add support for message subjects
2019-11-09 18:06:51 -08:00
e2904b5777
static fe: reformat activity representer
2019-11-09 18:06:51 -08:00
2b5bd5236d
static fe: add user profile rendering
2019-11-09 18:06:51 -08:00
8f08da750a
static fe: use a generic activity representer to render activities
2019-11-09 18:06:51 -08:00
ff8d0902f3
static fe: formatting
2019-11-09 18:06:51 -08:00
a4d3a8ec03
static fe: proof of concept
2019-11-09 18:06:51 -08:00
5b60d82592
object containment: handle all cases where ID is invalid (missing, nil, non-string)
2019-11-08 14:51:28 -06:00
532fd38b12
nodeinfo: add multifetch feature (ref pleroma-fe!977).
2019-11-08 12:48:28 -06:00
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
2019-11-08 13:27:11 +01:00
b14bf9044f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-08 18:30:49 +09:00
7258db023e
Support old flag format
2019-11-08 18:21:29 +09:00
7888803ffe
Mastodon API: Add the `recipients` parameter to `GET /api/v1/conversations`
2019-11-07 08:26:24 +03:00
32afa07995
Fetcher: fix local check returning unwrapped object
...
This resulted in error messages about failed refetches being logged.
2019-11-07 01:40:55 +03:00
802d249827
Merge branch 'fix/trailing-format-plug-oauth' into 'develop'
...
Fix TrailingFormatPlug not being active for /api/oauth_tokens
Closes #1385
See merge request pleroma/pleroma!1944
2019-11-06 14:47:34 +00:00
365657320c
Fix TrailingFormatPlug not being active for /api/oauth_tokens
2019-11-06 17:22:23 +03:00
84175fe30e
Set better Cache-Control header for static content
...
Closes #1382
2019-11-06 16:41:19 +03:00
8b19464176
Merge branch 'feature/multiple-users-force-password-reset' into 'develop'
...
Force password reset for multiple users
Closes admin-fe#46
See merge request pleroma/pleroma!1928
2019-11-06 12:24:41 +00:00
f171095960
Grouped reports with status data baked in
2019-11-06 21:25:46 +10:00
54746c6c26
Object Fetcher: set cache after reinjecting
...
Probably fixes the issue hj had, where polls would have different
counters between endpoints.
2019-11-06 14:00:03 +03:00
e1fc6cb78f
Check client and token in GET /oauth/authorize
2019-11-05 23:52:47 +09:00
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-11-05 15:21:00 +01:00
faced6236b
NoteValidator: Add very basic validator for Note objects.
2019-11-05 15:02:31 +01:00
3d1b445cbf
Object Validators: Extract common validations.
2019-11-05 15:02:09 +01:00
e52955c961
update following_relationship.ex
2019-11-05 10:50:03 +03:00
62bc0657e7
excluded invisible users from search results
2019-11-05 08:55:41 +03:00
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
2019-11-05 11:36:47 +10:00
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-05 02:12:48 +03:00
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
2019-11-04 20:44:24 +03:00
ff6c727739
Merge branch 'develop' into issue/1276
2019-11-04 20:24:53 +03:00
fee1276963
Merge branch 'failing-search-fixes' into 'develop'
...
User Search: Remove superfluous setweight and random test.
See merge request pleroma/pleroma!1935
2019-11-04 16:28:55 +00:00
4e53520917
User Search: Remove superfluous setweight and random test.
...
The test tested for a behavior that isn't actually enforced anymore.
2019-11-04 16:57:41 +01:00
ed29be24cb
Mastodon API, streaming: Add `pleroma.direct_conversation_id` to the `conversation` stream event payload.
2019-11-04 18:36:16 +03:00
5271bbcf11
add missing tesla mocks
2019-11-04 15:18:32 +00:00
06cc77e6fb
Merge branch 'faster-user-deactivation' into 'develop'
...
User: Don't pull remote users follower count immediately after deactivating.
Closes #1369
See merge request pleroma/pleroma!1933
2019-11-04 14:24:21 +00:00
556da92902
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
...
Store status data inside flag activity
See merge request pleroma/pleroma!1849
2019-11-04 14:11:44 +00:00
0c31258616
User: Don't pull remote users follower count immediately after deactivating.
...
The other instance doesn't necessarily know that anything changed yet, and it
will be fixed up at the next user pull anyway.
Closes #1369
2019-11-04 14:36:54 +01:00
57995fa8cf
fix migrate
...
update migrate
2019-11-03 20:44:59 +03:00
8dd7c099a7
Merge branch 'bugfix/streamer-follows' into 'develop'
...
streamer: use direct object for filter checks when there is no valid child object in an activity
Closes #1291
See merge request pleroma/pleroma!1931
2019-11-03 17:09:57 +00:00
74135e1318
Merge branch 'feature/omit-relay-user' into 'develop'
...
AdminAPI: Omit relay user from users list
Closes #1349
See merge request pleroma/pleroma!1924
2019-11-03 16:19:27 +00:00
61bcd4595f
Merge branch 'feature/fast_sanitize' into 'develop'
...
Switching to FastSanitize
See merge request pleroma/pleroma!1916
2019-11-03 16:18:19 +00:00
4bf942583f
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-03 09:05:12 -06:00
1b83a0694a
Fix moderation log crash
2019-11-01 19:13:29 +03:00
743b622b7b
Force password reset for multiple users
2019-11-01 18:45:47 +03:00
d75934b0d0
Undo dialyzer fix
2019-11-01 15:14:43 +03:00
1b3a942a84
fix format
2019-10-31 17:38:12 +03:00
ced9f92327
Fix count
2019-10-31 15:34:49 +03:00
6f9d3d30fa
AdminAPI: Omit relay user from users list
2019-10-31 02:26:02 +03:00
59a149c69a
Fix "the call ... will never return" warning
2019-10-31 02:25:15 +03:00
fcea6a9d2c
Merge branch 'develop' into feature/fast_sanitize
2019-10-30 17:51:15 -05:00
209319c8d2
update marker api
2019-10-30 23:49:05 +03:00
1b82eb6d41
move sql (update_markers) from migrate to mix task
2019-10-30 23:22:38 +03:00
61fc739ab8
Handle "Move" activity
2019-10-30 18:21:49 +07:00
363e76d4da
Fix duplicate recipients
2019-10-30 15:40:25 +09:00
ae59b38203
Rip out the rest of htmlsanitizeex
2019-10-30 09:20:13 +03:00
b27a92e8fa
Merge branch 'develop' into issue/1276
2019-10-29 22:23:19 +03:00
77cfb08b8c
Remove commented-out code
2019-10-29 20:58:54 +03:00
0c361eeb25
Add pending to handle incoming for Follow activity
2019-10-29 17:12:49 +09:00
08f6837065
Switch from HtmlSanitizeEx to FastSanitize
2019-10-29 01:18:08 +03:00
4270861085
Merge branch 'develop' into feature/move-activity
2019-10-28 15:10:47 +07:00
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
2019-10-28 07:27:45 +00:00
d56bc62275
Fix report parsing
2019-10-27 16:33:58 +03:00
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
2019-10-27 16:11:25 +03:00
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
2019-10-27 16:05:32 +03:00
0580654485
Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`.
...
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
2019-10-26 02:29:18 +03:00
653054d301
Merge branch 'remove-unsed-info-fields-fn' into 'develop'
...
Remove unused Pleroma.User.info_fields/0
See merge request pleroma/pleroma!1882
2019-10-25 14:51:02 +00:00
b777083f3f
Add `also_known_as` field to Pleroma.User
2019-10-25 19:14:18 +07:00
dbee53c2df
Remove unused Pleroma.User.info_fields/0
2019-10-25 16:48:01 +07:00
2ab072f949
object fetcher error handling
2019-10-24 12:08:34 -04:00
922e3d082c
add test
2019-10-24 12:17:50 +03:00
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
2019-10-24 14:55:36 +07:00
99cf1ef9be
Merge branch 'develop' into issue/1276
2019-10-24 09:23:59 +03:00
d3fb9e02cc
add tests
2019-10-23 22:48:04 +03:00
b08b1d5d91
Store status data inside Flag activity
2019-10-23 21:27:22 +02:00
aa64b3108b
fix migrate
2019-10-23 22:02:59 +03:00
c0246309a5
[ #1304 ] Extra bullet-proofing.
2019-10-23 19:30:02 +03:00
065e9fac12
[ #1304 ] Adjusted User.Info references from Notification.
2019-10-23 17:31:02 +03:00
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
2019-10-23 17:22:42 +03:00
11cd994425
[ #1304 ] Fixed null::jsonb handling in User.Info migration.
2019-10-23 17:15:48 +03:00
1adafa0966
Credo fixes.
2019-10-23 12:18:05 +02:00
97d5c79aa0
Add Pipeline module, test for federation.
2019-10-23 11:52:27 +02:00
9a4afbd2a0
added update unread_count for notifications
2019-10-23 11:22:48 +03:00
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
2019-10-22 20:50:46 -05:00
d4270397dc
Marker: added unread_count field
2019-10-22 14:51:46 +03:00
6281e4795a
Merge branch 'feature/push-subject-for-dm' into 'develop'
...
Direct messages should provide a distinct push notification subject
See merge request pleroma/pleroma!1864
2019-10-21 23:50:01 +00:00
6712b6e4de
Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
...
Do not include notifications from blocked users when with_muted is set
See merge request pleroma/pleroma!1869
2019-10-21 16:44:17 +00:00
2dbee29cf5
Do not include notifications from blocked users when with_muted is set
...
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
2019-10-21 19:27:38 +03:00
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
2019-10-21 11:58:22 +03:00
243719a965
Merge branch 'develop' into feature/masto_api_markers
2019-10-21 11:32:28 +03:00
a11a7176d5
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21 11:05:09 +03:00
c6fba62666
Fix Relay
2019-10-21 14:47:07 +07:00
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
2019-10-21 14:19:15 +07:00
ee04fbc35a
[ #1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
2019-10-20 22:29:56 +03:00
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
2019-10-20 20:43:18 +03:00
b4cbf0568b
[ #1304 ] Analysis issue fix.
2019-10-20 13:58:27 +03:00
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
2019-10-20 13:42:42 +03:00
c9280b9730
rework to use properties instead of compound typing, per SocialCG
2019-10-19 23:21:37 +00:00
ef659331b0
implement invisible support for remote users
2019-10-19 23:21:37 +00:00
95871cb462
user: implement User.invisible?/1
2019-10-19 23:21:37 +00:00
1469a084d4
relay: set invisible to true
2019-10-19 23:21:37 +00:00
e7333db72a
user info: add invisible field
2019-10-19 23:21:37 +00:00
f01dbc450c
Merge branch 'feature/mastofe-pwa' into 'develop'
...
MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834
2019-10-19 20:11:58 +00:00
52ed2f8f2d
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
2019-10-19 15:24:06 +03:00
Jill H.
638457ba94
MastoFE: Add PWA manifest.
2019-10-19 12:15:14 +02:00
fd6d05dc45
Merge branch 'mix-emoji-task-pack-json' into 'develop'
...
For pleroma.emoji downloaded packs, generate pack.json instead
See merge request pleroma/pleroma!1748
2019-10-19 08:51:03 +00:00
dcb23a85b6
Merge branch 'develop' into feature/push-subject-for-dm
2019-10-18 17:56:15 -05:00
152caef51d
Direct messages should provide a distinct push notification subject
2019-10-18 17:51:34 -05:00
019147f115
Merge branch 'develop' into feature/relay-list
2019-10-18 18:35:58 +02:00
44e64af5e7
object: containment: simplify the pattern match for OStatus testsuite hack
2019-10-18 15:39:15 +00:00
e99fdfc32d
object: containment: only allow OStatus references in test suite environment
2019-10-18 15:37:14 +00:00
3c785b85a6
object: fetcher: fix up formatting
2019-10-18 14:50:10 +00:00
bae96de273
activitypub: tag containment checks for better error tracing
2019-10-18 14:50:10 +00:00
7295a05cee
object: containment: also allow OStatus object IDs through when comparing origins
2019-10-18 14:50:10 +00:00
a177f22e02
object: fetcher: improve error reporting
2019-10-18 14:50:10 +00:00
bf2107743f
object: containment: don't try to contain ostatus objects
2019-10-18 14:50:10 +00:00
6f110fc04c
object fetcher: fix up error handling
2019-10-18 14:50:09 +00:00
48059c03c9
fix up some tests
2019-10-18 14:50:09 +00:00
d379b48769
kill almost all of the OStatus module
2019-10-18 14:50:09 +00:00
6a1f4c5145
federator: remove OStatus incoming document support
2019-10-18 14:50:09 +00:00
835ad52378
remove Salmon module
2019-10-18 14:50:09 +00:00
beb9861f9d
router: disconnect Salmon
2019-10-18 14:50:09 +00:00
a7b92bba68
webfinger: stop pulling Salmon data out of WebFinger
2019-10-18 14:50:09 +00:00
c00ae10af8
feed: don't advertise salmon endpoint
2019-10-18 14:50:09 +00:00
adb639db56
publisher: move remote_users() from Salmon module
2019-10-18 14:50:09 +00:00
4f82e42e4e
websub: remove entirely
2019-10-18 14:50:09 +00:00
b16a460916
federator: remove websub stuff
2019-10-18 14:50:09 +00:00
25b7ff56c3
application: don't start Federator.init/1 anymore
2019-10-18 14:50:09 +00:00
39e996528c
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
2019-10-18 15:22:07 +03:00
3c6fd0bb99
upload.ex: Remove deprecated configuration
2019-10-18 12:34:09 +02:00
2473702be2
Merge branch 'develop' into feature/relay-list
2019-10-18 10:24:29 +02:00
7511f3d192
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
...
Fix streaming websocket handshake with `Sec-WebSocket-Protocol`
See merge request pleroma/pleroma!1847
2019-10-18 04:42:02 +00:00
733b73b71c
Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
2019-10-18 04:36:37 +00:00
203d61b950
Transmogrifier: Make proper use of the LikeValidator.
2019-10-17 19:35:31 +02:00
66452f518f
ObjectValidator: Rewrite LikeValidator with Ecto.
2019-10-17 18:36:52 +02:00
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
2019-10-17 16:49:39 +03:00
66b5d0ff55
add Markers /api/v1/markers
2019-10-17 15:26:59 +03:00
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
081e8206ab
Transmogrifier: Use new ingestion pipeline for Likes.
2019-10-16 17:03:21 +02:00
6e4f52f8a2
Introduce new ingestion pipeline structure, implement internal Likes with it.
2019-10-16 16:16:39 +02:00
1bfdf57fc7
Merge branch 'user-search-experiments' into 'develop'
...
User search: Remove trigram and refactor the module
See merge request pleroma/pleroma!1850
2019-10-16 12:29:08 +00:00
21f0757b0d
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
...
Ability to toggle activation status, permission group & delete multiple users
Closes admin-fe#39
See merge request pleroma/pleroma!1825
2019-10-16 12:14:47 +00:00
6977cddff9
Merge branch 'benchmark-finishing' into 'develop'
...
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
2019-10-16 11:54:49 +00:00
0a5175ecbb
Order fts results by trigram
2019-10-16 13:49:33 +03:00
c10ce113d4
User search: Remove trigram and refactor the module
...
- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees
2019-10-16 12:52:47 +03:00
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
2019-10-15 17:33:29 +02:00
90d516d42b
Store status data inside flag activity
2019-10-15 16:52:41 +02:00
e7bb762ec2
don't stream in benchmark env
2019-10-15 15:16:17 +03:00
5bd0717de2
Add `Sec-WebSocket-Protocol` to response header
2019-10-15 21:09:44 +09:00
fbe5a00475
For pleroma.emoji downloaded packs, generate pack.json instead
2019-10-15 09:53:28 +03:00
1d46944fbd
Do not add `follower_address` to `following` for non local users
2019-10-14 13:50:43 +07:00
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
2019-10-14 02:57:21 +03:00
e3b4a3e96b
Merge branch 'incoming-id-fixes' into 'develop'
...
Assorted transmogrifier fixes
See merge request pleroma/pleroma!1831
2019-10-13 15:37:49 +00:00
9bdbf0811b
Make MediaProxy failure tracking less brutal
...
The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds.
2019-10-11 22:52:38 +03:00
cc6875b582
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
2019-10-11 19:12:29 +03:00
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
2019-10-11 15:59:35 +03:00
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
2019-10-11 15:58:45 +03:00
422aa6befe
Ostatus DeleteHandler: Fix for new option format.
2019-10-11 12:53:09 +02:00
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
2019-10-11 11:48:58 +02:00
9b963064eb
Transmogrifier: Actually store who deleted a note.
2019-10-11 11:25:45 +02:00
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
2019-10-11 00:24:31 +03:00
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
2019-10-11 02:35:32 +07:00
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
2019-10-10 17:17:33 +02:00
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
2019-10-10 14:40:59 +02:00
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-10 12:38:51 +00:00
24eecc3cb4
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-10-10 03:33:55 +03:00
1357ec1a10
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
...
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`
See merge request pleroma/pleroma!1822
2019-10-09 15:10:08 +00:00
ad42837244
Ability to toggle activation status and permission group for a group of users
2019-10-09 17:03:54 +03:00
d537bfd4e1
Add a task to re-count statuses for all users
2019-10-09 13:11:57 +07:00
580a67f5ca
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
2019-10-09 07:27:09 +03:00
aa7fd616c7
Line is too long!
2019-10-07 16:03:23 +03:00
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-10-07 15:41:41 +03:00
7aceaa517b
Admin API: Reports, grouped by status
2019-10-07 15:39:07 +03:00
6c278cfe09
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-07 12:31:51 +00:00
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
2019-10-07 12:29:33 +00:00
4b3f77a99f
Extract RSS Feed functionality from OStatus
2019-10-07 12:20:41 +00:00
d580eedfe9
Linting.
2019-10-07 12:40:33 +02:00
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-07 12:30:59 +02:00
93bdc55306
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
...
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
2019-10-07 10:19:24 +00:00
28fb98d69e
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-10-07 11:06:30 +03:00
91e90aa807
Merge branch 'misskey-compat' into 'reactions'
...
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783
2019-10-07 07:25:27 +00:00
b4f3c16885
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
...
[#1234 ] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
2019-10-07 02:14:45 +00:00
58aeabd020
mrf/simple_policy: check actor against accept/reject
2019-10-07 03:49:57 +02:00
2411d09215
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
...
Move local keys out of `user.info`
See merge request pleroma/pleroma!1799
2019-10-06 14:32:56 +00:00
1d8e956c32
Use the user.id instead of nickname in report URLs
...
Ensures links to profiles of remote users work.
2019-10-06 14:13:04 +00:00
b93856874d
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
2019-10-06 17:12:17 +03:00
fefbd31c6e
Move local keys out of `user.info`
2019-10-06 16:56:36 +03:00
06b3bb54c5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
2019-10-06 11:43:49 +03:00
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-06 08:11:47 +00:00
f459aabdfa
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-10-06 09:30:49 +03:00
9e34919dcd
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
...
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
2019-10-06 04:41:06 +00:00
7a318d74e6
Merge branch 'split-masto-api/leftovers' into 'develop'
...
[#1278 ] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
2019-10-05 19:28:53 +00:00
45b7f03f89
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
2019-10-05 19:28:29 +00:00
17ff4b43cb
Merge branch 'unread-conversation-count' into 'develop'
...
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
2019-10-05 19:28:07 +00:00
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
2019-10-05 20:12:00 +03:00
1ed8fbc4d9
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-05 15:10:57 +02:00
276a520163
CommonAPI: Create profile updates as public.
...
This saves us lots of sending out because we can use sharedInbox.
2019-10-05 14:53:50 +02:00
4b8524f392
ActivityPub / Transmogrifier: Correctly store incoming Update id.
2019-10-05 14:49:45 +02:00
791d93ff0e
Make credo happy
2019-10-05 13:56:40 +02:00
977e711e22
Import object from self-Announce whenever possible
2019-10-05 13:56:40 +02:00
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
2019-10-05 10:00:05 +00:00
6a85f7d1ea
Transmogrifier: Extend misskey like compatibility.
2019-10-05 10:45:42 +02:00
d9aaea44ff
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-05 10:42:29 +02:00
83631752af
removed legacy api: "/objects/:uuid/likes"
2019-10-04 22:35:26 +03:00
e0c0ea9f13
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
...
widen streaming API block effects
See merge request pleroma/pleroma!1784
2019-10-04 17:39:06 +00:00
5c04e81724
Merge branch 'user-info-unread-direct-conversation' into 'develop'
...
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
2019-10-04 17:33:18 +00:00
8dcc2f9f5e
Admin API: Allow changing the state of multiple reports at once
2019-10-04 19:00:58 +03:00
d1d058bf85
streamer: worker: actually use should_send? consistently
2019-10-04 15:42:25 +00:00
5a0c018d2a
streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
2019-10-04 15:41:55 +00:00
2417b633ed
streamer: add missing copyright headers
2019-10-04 15:21:45 +00:00
43a211bcb1
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
2019-10-04 17:01:04 +02:00
568a995d64
ActivityPub: Change addressing of Undo.
2019-10-04 16:32:42 +02:00
27110793a7
Merge branch 'featrue/job-monitor' into 'develop'
...
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
2019-10-04 12:52:11 +00:00
27e914955e
Merge branch 'fix/nickname-fail' into 'develop'
...
Fix get_cached_by_nickname_or_id not allowing to get local users by nickname
Closes #1293
See merge request pleroma/pleroma!1777
2019-10-04 11:54:05 +00:00
8217292085
Fix get_cached_by_nickname_or_id not allowing to get local users by
...
nickname
Closes #1293
2019-10-04 14:44:09 +03:00
01da6344b9
Merge branch 'bugfix/notification-nil-actor' into 'develop'
...
notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779
2019-10-04 11:28:20 +00:00
d3ac4e8083
Fix OAuthController
2019-10-04 13:30:46 +07:00
5dc14c89ce
notification_view.ex: Make sure `account` isn’t empty
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
2019-10-04 07:11:53 +02:00
06d9df79c5
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
2019-10-04 00:53:23 +03:00
c9043c6c80
Transmogrifier: Handle incoming Undos for EmojiReactions.
2019-10-03 18:37:23 +02:00
1cae564b5d
Move config task docs to a separate file and mark it as WIP
2019-10-03 14:12:57 +03:00
e00403af23
Mix tasks: derive moduledoc from doc files
2019-10-03 14:00:23 +03:00
6baa037903
Move database maintenance tasks docs to a separate file
2019-10-03 11:17:29 +03:00
b4ca864c6b
Move user tasks docs to a separate file
2019-10-03 10:15:24 +03:00
d39ccc2e7f
Move uploads task docs to a separate file
2019-10-03 09:35:21 +03:00
808d0a0170
Move relay docs to a separate file
2019-10-03 09:10:31 +03:00
6435ba83cd
Move instance CLI task docs to a text file
2019-10-03 09:06:06 +03:00
869ea2ab90
Move digest email docs to a separate file and improve styling
2019-10-03 01:10:36 +03:00
bd9c7807fb
Move emoji task docs to a separate file
2019-10-03 01:03:47 +03:00
64095961fe
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
2019-10-02 20:42:40 +03:00
4cb603e1df
PleromaAPI: Add unreacting.
2019-10-02 18:19:16 +02:00
391c736292
PleromaAPI: Fix emoji_reactions_by
2019-10-02 18:13:10 +02:00
e0c68eeb02
Move `:favourites` and `:bookmarks` actions to StatusController
2019-10-02 21:31:19 +07:00
7f2bc57725
Move `follows`, `mutes` and `blocks` actions to AccountController
2019-10-02 21:22:21 +07:00
9cfe9a57c5
CommonAPI: Add unreactions.
2019-10-02 15:38:57 +02:00
d3c404af12
Add MastoFEController
2019-10-02 20:36:08 +07:00
dfe5c958eb
ActivityPub: Add undo for emoji reactions.
2019-10-02 15:08:20 +02:00
1c6e1055c8
Add CustomEmojiController
2019-10-02 19:16:34 +07:00
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-02 13:27:55 +02:00
433f2c0f68
Merge branch 'split-masto-api/instance' into 'develop'
...
Extract instance actions from `MastodonAPIController` to `InstanceController`
See merge request pleroma/pleroma!1760
2019-10-02 10:46:14 +00:00
debd0a3066
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Inline object when Announcing a self-owned private object
See merge request pleroma/pleroma!1769
2019-10-02 10:45:55 +00:00
86880b9821
Inline object when Announcing a self-owned private object
2019-10-02 12:15:06 +02:00
3d61efa7c9
Rename misleading `get_announce_visibility` to `public_announce?`
2019-10-02 10:48:34 +02:00
26693292f4
Remove `:enqueued` counter
2019-10-02 14:50:25 +07:00
c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController`
2019-10-02 14:13:52 +07:00
89ab673d00
Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
...
Send an identifier alongside with error message in OAuthController
See merge request pleroma/pleroma!1765
2019-10-02 07:04:33 +00:00
8557176808
Merge branch 'split-masto-api/auth' into 'develop'
...
Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759
2019-10-02 07:02:56 +00:00
9b38bf4af4
Merge branch 'features/private-reblogs' into 'develop'
...
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
2019-10-02 07:02:24 +00:00
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
2019-10-01 22:16:29 +00:00
427d0c2a00
Store private announcements in object.data["announcements"], filter them on display
2019-10-01 22:39:25 +02:00
c541b83bef
Track failed proxy urls and don't request them again
2019-10-01 20:00:27 +00:00
43e3db0951
Fix returned visibility of announces in MastodonAPI
2019-10-01 20:38:29 +02:00
4c1f158f5d
Allow users to announce privately, including own private notes
2019-10-01 20:00:59 +02:00
b2273c695e
Discard identifier, if empty
2019-10-01 19:43:22 +03:00
fe538973dd
Ensure self-announces do not widen the audience of the original post
2019-10-01 18:38:57 +02:00
1f0be71ea4
Make activity announceable by its author.
2019-10-01 17:47:43 +02:00
0f9c2c8b87
Send an identifier alongside with error message in OAuthController
2019-10-01 18:10:04 +03:00
af690d1033
Extract auth actions from `MastodonAPIController` to `AuthController`
2019-10-01 15:54:45 +07:00
2dad6dd020
Extract apps actions from `MastodonAPIController` to `AppController`
2019-10-01 15:21:46 +07:00
39695c4436
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
2019-10-01 15:07:49 +07:00
585bc57edb
Extract media actions from `MastodonAPIController` to `MediaController`
2019-10-01 14:36:35 +07:00
36a34c36fe
Extract poll actions from `MastodonAPIController` to `PollController`
2019-10-01 11:44:34 +07:00
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
2019-10-01 01:40:33 +09:00
dae744478e
Transmogrifier: Handle compact objects in undos.
2019-09-30 18:13:05 +02:00
6ffa2b5f66
[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-09-30 17:41:20 +03:00
19bc0b8c79
.
2019-09-30 16:38:19 +02:00
08256e9299
ActivityPub: Federate reactions.
2019-09-30 15:51:09 +02:00
6068d2254e
PleromaAPIController: Fixes and refactoring.
2019-09-30 15:13:25 +02:00
04a2910f33
Pleroma.Constants: Fix typo.
2019-09-30 15:13:05 +02:00
0c6009dd2e
Extract mascot actions from `MastodonAPIController` to MascotController
2019-09-30 19:32:43 +07:00
987e0b8be8
Move update_credentials to MastodonAPI.AccountController
2019-09-30 19:10:56 +07:00
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
2019-09-30 19:10:55 +07:00
3c5ecb70b4
Add PleromaAPI.AccountController
2019-09-30 19:10:55 +07:00
e7aef27c00
Fix merge
2019-09-30 19:10:54 +07:00
a7f22c6e93
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-30 13:58:14 +02:00
b923842e96
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-30 13:57:54 +02:00
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
2019-09-30 11:21:49 +00:00
0e356cc800
Merge branch 'split-masto-api/reports' into 'develop'
...
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
2019-09-30 11:17:30 +00:00
74d8fadf37
Merge branch 'split-masto-api/conversations' into 'develop'
...
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
2019-09-30 10:49:40 +00:00
b7f27a4f58
Extract report actions from `MastodonAPIController` to `ReportController`
...
Update MastodonAPI.ReportView
2019-09-30 17:44:10 +07:00
1d7cbdaf7b
change new scrobble endpoint
2019-09-30 10:39:48 +00:00
e653edd182
split scrobble functions into their own controller
2019-09-30 10:39:48 +00:00
a6e1469767
router: change scrobble timeline route from now-playing to scrobbles
2019-09-30 10:39:48 +00:00
8b34b221cb
common api: add some missing IR bits for listen activities' children
2019-09-30 10:39:48 +00:00
84712c35f9
activitypub: object view: include child object for Listen activities
2019-09-30 10:39:48 +00:00
71eff09e56
common api: make sure the generated IR is actually federatable
2019-09-30 10:39:48 +00:00
7cad6ea67a
pleroma api: hook up scrobbler controller
2019-09-30 10:39:17 +00:00
2c82d8603b
common api: implement scrobbling
2019-09-30 10:39:17 +00:00
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
2019-09-30 10:39:17 +00:00
1f9de2a8cd
activitypub: implement IR-level considerations for Listen activities
2019-09-30 10:39:17 +00:00
b7877e9b1c
mastodon api: implement rendering of listen activities
2019-09-30 10:39:17 +00:00
d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
2019-09-30 16:52:07 +07:00
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
2019-09-29 18:43:27 +03:00
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
2019-09-29 11:44:31 +00:00
1053319cd6
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-28 10:36:04 +03:00
9202904da9
status_controller.ex: Posting media status without content defined
2019-09-28 01:53:41 +02:00
374f83d29b
Fix not being able to post empty statuses with attachments
...
Attachment field was filled in after the empty status check
2019-09-28 01:58:06 +03:00
f9380289eb
Add `remote_ip` plug
2019-09-27 21:59:23 +00:00
92d08d4113
Merge branch 'split-masto-api/follow-requests' into 'develop'
...
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730
2019-09-27 07:54:54 +00:00
68bf99baf2
Merge branch 'split-masto-api/domain-blocks' into 'develop'
...
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
2019-09-27 07:54:08 +00:00
27a3221d57
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
...
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
2019-09-27 07:53:22 +00:00
408750b94e
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
2019-09-27 14:28:05 +07:00
99c5a35890
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
2019-09-27 14:25:17 +07:00
8d31530119
Cleanup ScheduledActivityView
2019-09-27 13:36:28 +07:00
0a5b106ddd
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
2019-09-27 13:36:28 +07:00
621377f378
Extract filter actions from `MastodonAPIController` to `FilterController`
2019-09-27 13:06:25 +07:00
6c7c35dbe1
Fix SubscriptionNotificationView
2019-09-27 11:55:47 +07:00
91e2bcf218
Merge branch 'refactor/status-controller' into 'develop'
...
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
2019-09-27 04:37:48 +00:00
14294243a2
mastodon api: implement follow_requests_count
2019-09-27 04:22:40 +00:00
5ea5c58a85
Move view logic from StatusController.context to StatusView and add a test
2019-09-27 10:52:47 +07:00
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
2019-09-27 03:51:24 +00:00
98d1347a4e
Extract status actions from `MastodonAPIController` into `StatusController`
2019-09-27 10:51:15 +07:00
219771288c
Merge branch 'refactor/common_api' into 'develop'
...
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
2019-09-27 03:46:02 +00:00
dc0fdb5e84
Merge branch 'refactor/timeline-controller' into 'develop'
...
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
2019-09-27 03:42:30 +00:00
73ae38ca04
add deprecated tag
2019-09-26 21:08:04 +03:00
b4fc96f640
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-26 20:56:59 +03:00
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
2019-09-26 19:01:54 +03:00
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-26 16:16:30 +03:00
75290cbfbd
Add Pleroma.JobQueueMonitor
2019-09-26 18:49:57 +07:00
b4b147000c
Merge develop
2019-09-26 10:38:54 +03:00
3572cf29b7
Extract timeline actions from `MastodonAPIController` into `TimelineController`
2019-09-26 10:53:42 +07:00
c57ad0a402
Cleanup CommonAPI
2019-09-26 10:33:13 +07:00
de3e90e536
Add ActivityDraft.with_valid/2
2019-09-26 10:29:34 +07:00
eed774d058
Add CommonAPI.ActivityDraft
2019-09-26 10:29:34 +07:00
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
2019-09-26 03:13:22 +00:00
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
2019-09-26 03:12:03 +00:00
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
2019-09-26 03:00:38 +00:00
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
2019-09-26 02:51:54 +00:00
beabc49e35
Merge branch 'feature/activities-pagination-by-offset' into 'develop'
...
Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714
2019-09-26 02:49:45 +00:00
1b9cd4c866
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
...
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern
See merge request pleroma/pleroma!1716
2019-09-26 00:03:47 +00:00
f92d7d52c2
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
2019-09-25 13:38:45 +00:00
f2880d7d29
Credo considered harmful
2019-09-25 16:36:46 +03:00
c7d8ccd0c4
Remove useless with clause
2019-09-25 16:26:47 +03:00
1ddd403339
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-25 13:20:48 +00:00
d87be2ec96
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-25 15:59:04 +03:00
1fd9c60f87
Fix emoji tags for shareable packs to be "pack:{name}"
2019-09-25 12:34:03 +02:00
118d6dcdf4
Fix nodeinfo handling
2019-09-25 12:32:19 +02:00
ba9d35a904
Add an API endpoint for listing remote packs
2019-09-25 12:32:19 +02:00
a6e85215e1
Credo fix (remove parens on function definition)
2019-09-25 12:32:19 +02:00
f21dbbc021
Move emoji_dir_path & cache_seconds_per_file
2019-09-25 12:32:19 +02:00
cdbe7cd37a
When listing emoji packs, be sure to create the directory
2019-09-25 12:32:19 +02:00
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
2019-09-25 17:14:31 +07:00
1a858134ed
Merge branch 'develop' into issue/1218
2019-09-25 12:24:12 +03:00
60cbea5bb2
Allow activities pagination via limit/offset
2019-09-25 01:25:42 +03:00
0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
2019-09-24 19:03:06 +02:00
035f22f784
Fix Credo warnings
2019-09-24 19:50:09 +07:00
1bea67cb5e
Cleanup Pleroma.User
2019-09-24 19:50:09 +07:00
209395c7e6
Add User.change_info/2 and User.update_info/2
2019-09-24 19:50:07 +07:00
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-24 13:00:48 +03:00
a66a7a328f
Extract notification actions from `MastodonAPIController` into `NotificationController`
2019-09-24 15:16:44 +07:00
79b25be4e1
Do not return tuple when unneeded
2019-09-24 15:03:20 +07:00
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-24 08:06:04 +03:00
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
2019-09-23 22:42:34 +00:00
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
2019-09-23 22:41:31 +00:00
760df67a7b
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
...
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes #1223
See merge request pleroma/pleroma!1703
2019-09-23 22:35:09 +00:00
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
2019-09-23 22:34:52 +00:00
e1d2d69c87
Clean up views
2019-09-23 22:33:59 +00:00
e63f167f01
Also pretty print pack.json
2019-09-24 00:37:27 +03:00
63af6951fa
add tunable for stream uploads, as needed for jortage to work.
2019-09-23 20:38:53 +00:00
494bb6bac6
updated tests
2019-09-23 22:37:30 +03:00
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-23 21:41:57 +03:00
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-23 21:32:50 +03:00
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
2019-09-23 18:20:08 +00:00
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
2019-09-23 21:14:51 +03:00
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
2019-09-23 20:00:12 +02:00
2ad50583f0
Document and test /api/ap/whoami
2019-09-23 19:47:35 +02:00
d72d4757a8
Format
2019-09-22 23:13:48 +03:00
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-22 16:58:39 +03:00
72a01f1350
Use router helper to generate reset password link
2019-09-22 16:36:59 +03:00
6f25668215
Admin API: Add ability to force user's password reset
2019-09-22 16:08:07 +03:00
7cf1252455
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-09-20 18:27:00 +03:00
b80c41a14f
Merge branch 'outbox_pagination' into 'develop'
...
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
2019-09-19 16:53:59 +00:00
0e6085da10
Fix pagination in AP outbox.json
2019-09-19 16:09:07 +02:00
1d285e6fad
moving to separate dir
2019-09-19 14:02:27 +03:00
924d7e6aa6
generating remote activities
2019-09-19 12:59:36 +03:00
6f67aed3ac
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
2019-09-19 10:59:09 +03:00
95c948110c
Add `rel="ugc"` to hashtags and mentions
2019-09-19 14:56:10 +07:00
cf3041220a
Add support for `rel="ugc"`
2019-09-19 14:56:10 +07:00
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
2019-09-19 08:59:25 +03:00
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-19 07:35:34 +03:00
f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
2019-09-18 22:28:10 +00:00
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
2019-09-18 21:57:49 +00:00
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
2019-09-18 23:21:11 +02:00
b585134c90
Get the nodeinfo address from the well-known
2019-09-19 00:16:34 +03:00
a1325d5fd9
Change path from nodeinfo to metadata->features
2019-09-19 00:16:34 +03:00
d51e5e447e
Move emoji reloading to admin api
2019-09-19 00:16:33 +03:00
7680aec17d
Move emoji api to pleroma api dir
2019-09-19 00:16:33 +03:00
36f2275dc9
A feature for shareable emoji packs, use it in download_from & tests
2019-09-19 00:16:33 +03:00
74fb6d8647
Move EmojiAPIController from EmojiAPI to PleromaAPI
2019-09-19 00:16:33 +03:00
6cd651a38b
Make the emoji controller api more RESTy
2019-09-19 00:16:33 +03:00
3971bf9c5f
Change :sha to :checksum
2019-09-19 00:16:33 +03:00
7c784128fd
Change emoji api responses to JSON
2019-09-19 00:16:33 +03:00
f24731788e
Move emoji pack list from /list to /
2019-09-19 00:16:33 +03:00
cb125ffaf7
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
2019-09-19 00:16:33 +03:00
8f509e6d1e
Use with w/ pack_info_res
2019-09-19 00:16:33 +03:00
8790365fef
Remove unused variable
2019-09-19 00:16:33 +03:00
b8a214b0ab
Split list_packs
2019-09-19 00:16:33 +03:00
f251225cae
Apply suggestions to emoji_api_controller.ex
2019-09-19 00:16:33 +03:00
c049c32270
Fixed a typo in create_archive_and_cache
2019-09-19 00:16:33 +03:00
163082de6f
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
2019-09-19 00:16:33 +03:00
f6d4acc871
Fix credo warnings
2019-09-19 00:16:33 +03:00
87057101b0
Add documentation for the emoji api endpoints
2019-09-19 00:16:33 +03:00
9eb2ee4df0
Allow importing old (emoji.txt / plain) packs from the filesystem
2019-09-19 00:16:33 +03:00
13cd93a0d3
Use && insted of "and" for checking shared-files for packs
...
share-files can be nil and "and" does not like that
2019-09-19 00:16:33 +03:00
f5131540dc
Add a way to create emoji packs via an endpoint
2019-09-19 00:16:33 +03:00
8dbdd5c280
Allow uploading new emojis to packs from URLs
2019-09-19 00:16:33 +03:00
16edfef12e
Handle empty shortcode/filename/new_shortcode/new_filename
2019-09-19 00:16:33 +03:00
9afe7258dd
Implememt emoji pack file updating + write tests
2019-09-19 00:16:33 +03:00
261d92f9c2
Update the pack fallback-src sha generation condition
...
The old one would not regenerate sha when fallback src changed
2019-09-19 00:16:33 +03:00
bcc0bfd0c5
Add an endpoint for emoji pack metadata updating
2019-09-19 00:16:33 +03:00
b78973d27f
fallback can't have pack.json, reflect that in code
...
having pacj.json and sha256 in a fallback pack would cause a circular dependency of itself
2019-09-19 00:16:33 +03:00
2a94eca096
Change YAML to JSON
2019-09-19 00:16:33 +03:00
b0ecd412f5
Clean out old emojis on reload
2019-09-19 00:16:33 +03:00
2d4b8f3d20
Add an endpoint for deleting emoji packs
2019-09-19 00:16:33 +03:00
3a8669b487
Fix responses for emoji pack controlller
2019-09-19 00:16:33 +03:00
7a0c755d0a
Send ok for emoji reloading as text, not as json
2019-09-19 00:16:33 +03:00
ee620ecbf1
Add caching for emoji pack sharing
2019-09-19 00:16:33 +03:00
7fb7dd9e0e
Only find SHA256 for packs that are shared
2019-09-19 00:16:33 +03:00
54b8e683bc
Swap TOML for YAML to get YAML generation for packs from fallbacks
...
If fallback url doesn't have a pack.yml file, one from the source will
be used
2019-09-19 00:16:33 +03:00
b791a08656
Implement API actions on packs
...
That incldues listing them and downloading them from other instances
or from the remote url
2019-09-19 00:16:33 +03:00
6a42641b8d
Add pack.toml loading
2019-09-19 00:16:33 +03:00
ab2ca3038f
Merge branch 'hide-follower-following-count' into 'develop'
...
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
2019-09-18 21:13:15 +00:00
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
2019-09-18 21:11:37 +00:00
e32d099a3a
Merge branch 'feature/poll-refresh' into 'develop'
...
Poll refetching
See merge request pleroma/pleroma!1694
2019-09-18 20:58:53 +00:00
5028b7b578
Fix credo issues
2019-09-18 22:09:03 +03:00
c096dd86e5
Do not refetch local objects
2019-09-18 20:01:26 +03:00
eb87a86b5b
Preserve internal fields when reinjecting
2019-09-18 19:53:51 +03:00
d32894ae51
Move object internal fields to a constant
2019-09-18 19:24:20 +03:00
e3f902b3a1
Set updated_at even if the object stayed the same
2019-09-18 19:07:25 +03:00
a9c700ff15
Fix wrong argument order when calling NaiveDateTime.diff
2019-09-18 18:52:33 +03:00
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
2019-09-18 18:13:21 +03:00
384b7dd40d
Fix response
2019-09-18 18:06:49 +03:00
f89728ad95
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-18 16:44:11 +03:00
e4f3d7f69d
Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex
2019-09-18 10:31:10 +00:00
551f2fa59e
[ #1234 ] Added changelog entry, removed admin OAuth scopes.
2019-09-18 12:31:33 +03:00
c98e761d28
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
2019-09-18 12:06:38 +03:00
a18f1e7cd7
namings
2019-09-18 10:49:14 +03:00
2263c8b6b9
little fixes
2019-09-18 10:49:14 +03:00
4faf2b1555
post for creating invite tokens in admin api
2019-09-18 10:49:14 +03:00
e501c822c9
markdown.ex: put two-spaces before the description-newline
2019-09-17 23:05:27 +02:00
4785596a2c
markdown.ex: end suggestions list with a newline
...
Otherwise we end up with suggestion on the same level as the childs
Markdown is a fuck…
2019-09-17 23:05:27 +02:00
d2097fd0f5
markdown.ex: \n\n on >1 suggestions, 2-spaces on one
2019-09-17 23:05:27 +02:00
d6182a3c8f
markdown.ex: Make suggestion(s) plural only if on >1
2019-09-17 23:05:27 +02:00
c0c5628200
description.exs: remove empty strings on descriptions
2019-09-17 23:05:26 +02:00
106afaed58
markdown.ex: do not fail if there is no children
2019-09-17 23:05:26 +02:00
e0d8c8897e
docs/markdown.ex: do no print empty suggestions
2019-09-17 23:05:26 +02:00
b4d775161c
[ #1234 ] Undone reordering-related changes in router.ex.
2019-09-17 23:24:55 +03:00
f9dd121ad3
Admin API: Return link alongside with token on password reset
2019-09-17 23:09:08 +03:00
01c1078015
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-17 22:53:26 +03:00
7f211a48e0
docs/markdown.ex: child header as "- key (type): description"
2019-09-17 21:47:32 +02:00
0447c42715
Merge branch 'develop' into issue/733
2019-09-17 22:20:39 +03:00
76068873db
[ #1234 ] Defined admin OAuth scopes, refined other scopes. Added tests.
2019-09-17 22:19:39 +03:00
ef2e2c5e12
Merge branch 'feature/return-total-for-reports' into 'develop'
...
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
2019-09-17 19:09:56 +00:00
7dd51652f9
Merge branch 'develop' into issue/733
2019-09-17 21:20:08 +03:00
6193157f19
Fix notification warnings
2019-09-17 18:12:27 +00:00
2301de3d75
Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
...
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
See merge request pleroma/pleroma!1677
2019-09-17 17:16:39 +00:00
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
2019-09-17 14:47:26 +00:00
80c5c3495b
remove remaining errors from tests
2019-09-17 14:44:52 +00:00
9fa2586abd
Refactor SubscriptionNotificationView
2019-09-17 17:44:10 +03:00
e9f69a3eb7
Move pleroma_api controllers into controllers sub-folders
2019-09-17 16:52:23 +03:00
7d1773bc6b
Rename SubscriptionNotificationController list and get actions to index and show
2019-09-17 16:48:24 +03:00
a76168e743
Cleanup PleromaAPIController
2019-09-17 16:44:54 +03:00
a81f80233d
Apply suggestion to lib/pleroma/web/router.ex
2019-09-17 13:43:10 +00:00
f9be517c7f
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17 13:42:40 +00:00
c0f776faec
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17 13:42:36 +00:00
2688b876ab
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17 13:42:28 +00:00
e7afb67c5c
[ #1260 ] Rate-limiting for create authentication and related requests.
2019-09-17 16:16:11 +03:00
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
2019-09-17 14:45:47 +03:00
a21584556f
Update oban to 0.8.1
...
This version uses a different locking mechanism, which gets rid of
`WARNING: you don't own a lock of type ShareLock` log spam
2019-09-17 13:04:43 +03:00
6042e21b25
Move subscription notifications to a separate controller
2019-09-16 21:59:49 +03:00
56b60798c2
Code style fixes
2019-09-16 20:50:14 +03:00
76c3e290fc
Merge develop
2019-09-16 20:30:42 +03:00
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
2019-09-16 19:44:06 +03:00
085d014f08
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
2019-09-16 19:26:00 +07:00
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
2019-09-16 14:40:17 +03:00
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
2019-09-16 17:55:04 +07:00
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
2019-09-16 07:39:58 +00:00
d1a84ceec8
Merge branch 'feature/optimize_rich_media_parser' into 'develop'
...
added prepare html for RichMedia.Parser
See merge request pleroma/pleroma!1672
2019-09-16 07:37:54 +00:00
d75bc728e7
Merge branch 'develop' into issue/733
2019-09-16 07:34:22 +03:00
efbc2edba1
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
# lib/pleroma/web/router.ex
2019-09-15 18:52:27 +03:00
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
2019-09-15 18:22:08 +03:00
b4cf74c106
added prepare html for RichMedia.Parser
2019-09-15 14:53:58 +03:00
8751809e1e
Merge branch 'develop' into support/tests
2019-09-15 14:22:15 +03:00
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
2019-09-15 10:12:24 +03:00
9c64a25713
Merge branch 'config-changes' into 'develop'
...
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
2019-09-14 17:26:35 +00:00
62bbba80f3
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
2019-09-14 16:39:42 +00:00
d7457c9165
Merge branch 'develop' into refactor/subscription
2019-09-14 18:29:51 +03:00
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
2019-09-14 16:11:44 +03:00
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
2019-09-14 01:50:15 +03:00
1be09bde2d
Merge branch 'refactor/add_link_headers' into 'develop'
...
Refactor `add_link_headers/7` -> `add_link_headers/3`
See merge request pleroma/pleroma!1636
2019-09-13 17:06:38 +00:00
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
2019-09-13 19:42:53 +03:00
ac4a748fad
Disallow NULLs in deliveries
2019-09-13 19:28:35 +03:00
6fe2f554c3
Emoji: Generate emoji detecting functions at compile time.
...
Suggested by jvalim
2019-09-13 18:27:32 +02:00
69faec031d
markdown generation to the new file
2019-09-13 19:02:42 +03:00
0bd2b85edb
Separate Subscription Notifications from regular Notifications
2019-09-13 18:25:27 +03:00
8900cb68ae
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 15:25:15 +00:00
05f8a066a1
Apply suggestion to lib/pleroma/delivery.ex
2019-09-13 15:23:26 +00:00
2784962dba
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 15:23:03 +00:00
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
3ff5532220
Linting.
2019-09-13 16:41:30 +02:00
a7f31bf06c
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-13 16:31:27 +02:00
e5b3ad3d04
ActivityPub: Use is_unicode_emoji? function.
2019-09-13 16:06:34 +02:00
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
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
3896a51b8a
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 10:09:56 +00:00
5170170483
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 10:09:46 +00:00
fb96facc32
Remove unused functions and fix credo issues
2019-09-13 12:29:42 +03:00
ce23529d91
Use delivery info when federating deletes
2019-09-13 11:38:17 +03:00
25d8216804
Add email change endpoint
2019-09-13 13:09:35 +07:00
39dc9b470c
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
2019-09-13 12:44:59 +07:00
d8a178274b
fix Activity.get_by_id
2019-09-13 07:12:34 +03:00
2b40e57a72
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-13 06:55:05 +03:00
a697f0d791
Emoji: Add function to detect if a character is an emoji
2019-09-13 02:11:02 +02:00
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
b0e6058021
Parse http signature for request to objects/activities
2019-09-12 23:03:52 +03:00
936951826e
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-12 22:15:43 +03:00
dabc4a00f5
Put the cache with the right key when using a tracking function
2019-09-12 22:10:15 +03:00
769fb778d4
Track object/create activity fetches
2019-09-12 21:37:36 +03:00
8d4b661ecb
Transmogrifier: Strip internal emoji reaction fields.
2019-09-12 18:59:13 +02:00
05e9776517
PleromaAPIController: Add endpoint to fetch emoji reactions.
2019-09-12 18:48:25 +02:00
4f548cb2b7
added test for Ostatus
2019-09-12 10:25:43 +03:00
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
007e0c1ce1
added tests
2019-09-11 23:19:06 +03:00
56828abf6d
Use Jason for rendering responses
...
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59)
2019-09-11 23:06:31 +03:00
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
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
5a76d5d239
Add extended benchmark
2019-09-11 11:13:17 +03:00
38b29779c3
refactoring
2019-09-11 09:25:33 +03:00
be32d90a0c
little refactor
2019-09-11 09:25:33 +03:00
5ff12e7df1
some changes
2019-09-11 09:25:33 +03:00
57dc59d98d
little fix
2019-09-11 09:25:33 +03:00
35757b6d0e
don't add behaviour to suggestions
2019-09-11 09:25:33 +03:00
0624e06a9c
little fix
2019-09-11 09:25:33 +03:00
8f5ee7db06
typo fix
2019-09-11 09:25:33 +03:00
6721301086
some changes
2019-09-11 09:25:33 +03:00
0559c82bdb
fix
2019-09-11 09:25:33 +03:00
a1f2dfb10a
expanding regex sigils to use modifiers
2019-09-11 09:25:33 +03:00
511d93fa54
mix docs generates config.md
2019-09-11 09:25:33 +03:00
67e4300931
description formatters
2019-09-11 09:25:33 +03:00
fcf604fa43
added tests
2019-09-11 07:23:33 +03:00
43f02dfe38
Revert "Parallelize template rendering"
...
This reverts commit 1ad71592ad
2019-09-10 22:01:45 +03:00
a31af93e1d
added tests /activity_pub/transmogrifier.ex
2019-09-10 16:43:10 +03:00
b40b10b53d
Add an endpoint to get multiple statuses by IDs
2019-09-10 13:39:45 +07:00
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
2019-09-10 01:23:20 +03:00
11e12b5761
Add Pleroma.Plugs.Cache
2019-09-09 18:53:08 +00:00
edbaf78176
Merge branch 'fix/read-inbox' into 'develop'
...
Fix `ActivityPubController.read_inbox/2`
Closes #1248
See merge request pleroma/pleroma!1649
2019-09-09 18:21:29 +00:00
e0f84d0043
Fix `ActivityPubController.read_inbox/2`
2019-09-10 01:11:57 +07:00
b63faf9819
[ #1234 ] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
2019-09-08 15:00:03 +03:00
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-08 08:41:10 +03:00
e5c6bf3673
Mastodon API: URI encode hashtag name in generated URLs
...
Otherwise hashtags with word characters other than those allowed in URLs (e.g. Japanese characters) produce hashtag URLs that are invalid.
2019-09-07 19:50:45 +00:00
8c6cdff3cc
Merge branch 'develop' into issue/1218
2019-09-07 22:17:32 +03:00
39f99dc6cd
Merge branch 'develop' into support/tests
2019-09-07 22:13:43 +03:00
40a61532ca
activity: when restricting deactivated users, precalculate the user list
...
the PostgreSQL query planner is easily confused due to the complexity of
certain queries we make. while we plan to simplify these queries through
unification of activities and objects, we are not yet there. it has been
discovered that using a precalculated list of deactivated users encourages
the query planner to prefer simpler indices instead of the
activity_visibility index.
accordingly, drop the subquery and precalc the user list instead.
2019-09-06 23:14:29 +00:00
5effb2cbca
activitypub: help ecto build a better query for thread mute filtering
...
using an indexed value in thread_mute table helps ecto build a better query.
2019-09-06 23:11:26 +00:00
ab2f21e470
tests for mastodon_api_controller.ex
2019-09-06 21:50:00 +03:00
b3f6f6a409
generating remote users
2019-09-06 20:14:02 +03:00
252e5db45c
docs fixes
2019-09-06 16:37:18 +03:00
eb74c3d5c7
Merge branch 'develop' into issue/1218
2019-09-06 14:01:07 +03:00
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
2019-09-06 13:26:05 +03:00
40b3289c26
Refactor `add_link_headers/7` -> `add_link_headers/3`
2019-09-06 17:08:47 +07:00
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
2019-09-06 08:43:38 +00:00
3523bdcf26
Call TrailingFormatPlug for /api/pleroma/emoji
...
Apparently Pleroma-FE still calls it with trailing '.json'
2019-09-05 22:21:20 +03:00
736165c082
Reverse reports list
2019-09-05 16:54:34 +03:00
a1125bd564
generatoin and fetching
2019-09-05 16:02:20 +03:00
79dde58044
one more temp commit
2019-09-05 16:02:20 +03:00
db690bede9
temp commit
2019-09-05 16:02:20 +03:00
fe7cf44c40
Merge branch 'feature/mastoapi-accounts-external' into 'develop'
...
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622
2019-09-05 12:48:27 +00:00
26fe6f70c9
Move checking for restrict_local to User.get_cached_by_id_or_nickname
2019-09-05 15:39:10 +03:00
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
2019-09-05 12:03:39 +03:00
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-05 11:30:41 +03:00
3e30f6e198
Merge branch 'fix/safe-render-notifications' into 'develop'
...
Do not crash if one notification failed to render
See merge request pleroma/pleroma!1630
2019-09-05 05:47:06 +00:00
558969a0fd
Do not crash if one notification failed to render
2019-09-05 08:32:49 +03:00
ae506ca997
fix formatting
2019-09-04 21:40:53 +03:00
e2011a667c
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
2019-09-04 18:35:01 +00:00
8306078de1
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
2019-09-04 17:31:14 +00:00
99ea990a16
PleromaAPIController: Add emoji reactions.
2019-09-04 12:20:35 -05:00
af746fa4a8
Return total for reports
2019-09-04 20:08:13 +03:00
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
2019-09-04 19:40:07 +03:00
cb99cfcc65
don't try to truncate non-strings
2019-09-04 15:57:42 +01:00
2975da284b
truncate remote user bio/display name
2019-09-04 15:45:40 +01:00
a890451187
fetch_announcements -> take_announcements
2019-09-04 17:42:27 +03:00
8cbad5500c
add tests for activity_pub/utils.ex
2019-09-04 15:25:12 +03:00
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
2019-09-04 14:17:23 +03:00
7c3838090f
Apply suggestion to lib/pleroma/notification.ex
2019-09-04 10:14:15 +00:00
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
2019-09-04 12:38:27 +03:00
9bc12b88b3
ActivityPub: Save emoji reactions in object.
2019-09-03 16:50:04 -05:00
cc1d1ee406
Mastdon API: Add ability to get a remote account by nickname to
...
`/api/v1/accounts/:id`
2019-09-03 19:26:10 +03:00
eb17cc17a1
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# CHANGELOG.md
2019-09-03 17:12:15 +03:00
b15cfd80ef
Return "total" optionally
2019-09-03 13:58:27 +03:00
a4c5f71e93
Return total from pagination + tests
2019-09-02 22:48:52 +03:00
b49085c156
[ #1149 ] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
2019-09-02 14:57:40 +03:00
d0f07e55d2
use atom key for fields
2019-09-02 12:31:23 +01:00
05c935c396
mix format
2019-09-02 12:15:40 +01:00
35ef470d00
truncate fields for remote users instead
2019-09-02 12:15:21 +01:00
9c96b17e16
Add pagination to logs
2019-09-01 21:23:30 +03:00
dd017c65a4
[ #1149 ] Refactored Oban workers API (introduced `enqueue/3`).
2019-08-31 21:58:42 +03:00
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
2019-08-31 14:25:43 +03:00
70eed0594c
credo fixes
2019-08-31 13:08:43 +03:00
bd3ed3a622
Add back /api/qvitter/statuses/notifications/read.json
2019-08-31 11:43:06 +03:00
64410497d2
Remove TwitterAPI representers
2019-08-31 10:41:15 +03:00
985122cc03
Remove Activity, User and Notification views from TwitterAPI
2019-08-31 10:31:15 +03:00
90c2dae9a4
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
2019-08-31 10:20:34 +03:00
6ef0103ca0
added Emoji struct
2019-08-31 10:14:53 +03:00
4d6e22bb9b
Style
2019-08-31 01:09:48 +03:00
f182f0f6bd
Add ability to search moderation logs
2019-08-31 00:57:15 +03:00
d8098d142a
added Emoji.Formatter
2019-08-30 22:04:17 +03:00
5c90b70733
Apply suggestion to lib/pleroma/emoji/loader.ex
2019-08-30 07:30:54 +03:00
d7808b5db4
added code\path fields without html tags in ets
2019-08-30 07:30:54 +03:00
cef2e980b1
division emoji.ex on loader.ex and emoji.ex
2019-08-30 07:30:54 +03:00
7853b3f17d
Fix AntiFollowbotPolicy when trying to follow a relay
2019-08-30 00:38:03 +00:00
d9d7765383
Merge branch 'fix-osada-follow' into 'develop'
...
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
2019-08-28 07:10:35 +00:00
b770ed1d99
CommonAPI: Support emoji reactions.
2019-08-27 17:56:28 -05:00
f017260cdc
Merge remote-tracking branch 'origin/develop' into reactions
2019-08-27 16:38:51 -05:00
66519f2100
Merge branch 'list-controller' into 'develop'
...
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
2019-08-27 21:15:54 +00:00
5e4fde1d3d
Filter logs by date
2019-08-27 20:48:16 +03:00
ffcd742aa0
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-08-27 17:37:19 +00:00
c30cc039e4
Transmogrifier: Use Containment.get_actor to get actors.
2019-08-27 12:22:30 -05:00
00abe099cd
added tests for ActivityPub.like\unlike
2019-08-27 16:21:03 +03:00
cd78e63a25
[ #1149 ] Bugfix: Pleroma.Workers.Subscriber / "verify_websub" works with WebsubServerSubscription.
2019-08-27 14:34:37 +03:00
eb1739c596
Remove most of TwitterAPIController
2019-08-27 12:29:19 +03:00
a0b21c8928
Transmogrifier: Handle incoming emoji reactions.
2019-08-26 16:47:31 -05:00
6e1ec4c5da
ActivityPub: Basic EmojiReactions.
2019-08-26 16:29:51 -05:00
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
2019-08-26 14:34:52 -05:00
4194abbc8f
Move mastodon_api/*_controller.ex to mastodon_api/controllers/
2019-08-26 19:37:57 +07:00
30510ade0e
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
2019-08-26 19:37:54 +07:00
4d82bc8b0b
Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
2019-08-26 19:16:40 +07:00
3b1b631c2a
Add validation in Pleroma.List.create/2
2019-08-26 18:59:57 +07:00
8ca4f145a5
Extract if block into private function
2019-08-26 17:09:32 +09:00
6dc24422dc
Merge branch 'issue/1177' into 'develop'
...
[#1177 ] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
2019-08-25 19:43:27 +00:00
37dd3867bb
Log admin/moderator actions
2019-08-25 19:39:37 +00:00
503139b343
Merge branch 'fix-all-custom-fields-deleted' into 'develop'
...
Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596
2019-08-25 19:35:28 +00:00
b15e226593
Change to delete empty name field
2019-08-25 07:34:15 +09:00
705b5adfc4
Fix type of fields_attributes
...
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
2019-08-25 07:34:14 +09:00
45e21a9df4
Rename fields to fields_attributes
2019-08-25 07:34:11 +09:00
3549cd9754
Change to use attachment only when fields do not exist
2019-08-25 01:28:38 +09:00
90986667ce
Merge branch 'admin-create-users' into 'develop'
...
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
2019-08-24 16:04:19 +00:00
efb8818e9e
Activity Expiration: Switch to 'expires_in' system.
2019-08-24 17:22:48 +02:00
1692fa8945
ActivityExpirationWorker: Fix merge issues.
2019-08-24 17:22:26 +02:00
654d291b6d
update tests
2019-08-24 17:41:53 +03:00
6062017493
put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
2019-08-24 17:17:17 +03:00
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
2019-08-24 15:48:33 +02:00
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
2019-08-23 18:28:23 +03:00
c056736daa
[ #1149 ] Publisher worker fix (atomized `params` keys).
2019-08-23 16:11:39 +03:00
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
2019-08-23 09:23:10 +03:00
8dc6a6b210
fix /inbox for Relay
2019-08-22 22:48:07 +03:00
399ca9133b
fix test
2019-08-22 21:54:37 +03:00
f95b67c933
Merge branch 'develop' into issue/1177
2019-08-22 21:13:03 +03:00
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-22 21:01:28 +03:00
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
2019-08-22 20:59:58 +03:00
a79ebac592
Improve AP routes rate limit
2019-08-22 16:03:43 +07:00
64bfb41c55
fixed unfollow for relay actor
2019-08-22 06:57:55 +03:00
37229af15f
remove old user create and delete routes for admin
2019-08-22 00:15:00 +05:45
f740d786a3
Merge branch 'rate-limit-ap-routes' into 'develop'
...
[#1174 ] Rate limit AP routes
See merge request pleroma/pleroma!1586
2019-08-21 16:45:20 +00:00
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
2019-08-20 19:34:47 +00:00
8d899d6197
Add `:ap_routes` rate limit
2019-08-20 22:10:36 +07:00
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
2019-08-20 12:55:51 +00:00
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
2019-08-20 12:44:14 +00:00
5171aa5b4d
Refactor check_actor_is_active
2019-08-19 20:36:25 +03:00
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
2019-08-19 17:00:59 +00:00
75a5dd41ee
Add more tests for Database tasks and DigestEmailWorker
2019-08-19 16:10:00 +00:00
49ae3191df
Merge branch 'hotfix/user_unfollow' into 'develop'
...
[#1177 ] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
2019-08-19 14:36:10 +00:00
e652cef76b
removes duplicates from relay subscription list
2019-08-19 13:39:18 +03:00
475fcb3e6c
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
...
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
2019-08-18 21:59:22 +00:00
18c8c8d176
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
...
Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575
2019-08-18 21:57:55 +00:00
94e336d9d5
clear follow requests when blocking a user
2019-08-18 20:30:57 +01:00
ef82f868d9
Formatting
2019-08-16 10:00:18 -05:00
3315a2a1c3
fixed User.unfollow with synchronization external user
2019-08-16 15:58:42 +03:00
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
2019-08-16 12:55:33 +00:00
158231cd20
Add configurable colors and logo for the digest template
2019-08-16 18:32:25 +07:00
6a3b1a526e
max_body_size -> max_body_length, as it should be
2019-08-15 15:34:41 -05:00
fba3c16d20
Fix OAuth cleanup worker unconditionally starting
...
!1576 removed enabled/disabled check from the worker, in favor of just
not starting it in application.ex if disabled. However a line
unconditionally starting the worker was removed
2019-08-15 20:36:20 +03:00
1c8f58a30e
Merge branch 'features/formatting-sub_sup' into 'develop'
...
html.ex: Allow sub and sup elements by default
Closes #1191
See merge request pleroma/pleroma!1572
2019-08-15 17:34:16 +00:00
1ad71592ad
Parallelize template rendering
2019-08-15 18:05:50 +03:00
a4a3e3becd
Hide muted theads from home/public timelines unless `with_muted` is set
2019-08-15 17:37:30 +03:00
9fb71ce7f4
Merge branch 'cache-follow-state' into 'develop'
...
Cache follow state
Closes #1180
See merge request pleroma/pleroma!1573
2019-08-15 14:06:27 +00:00
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
2019-08-14 22:45:32 +00:00
2b94ae3b39
Do not check if actor is active when deleting a user
2019-08-15 01:35:29 +03:00
e8a8d50138
Collect stats immediately after init
2019-08-15 01:01:13 +03:00
bd5ad0af78
Cache follow state
2019-08-15 00:47:30 +03:00
a9e75fa6a4
Add a task to benchmark timeline rendering
2019-08-15 00:43:02 +03:00
a6a814420d
html.ex: Allow sub and sup elements by default
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1191
2019-08-14 22:49:13 +02:00
31d576de0c
Merge branch 'misc-otp-issues' into 'develop'
...
Misc OTP issues
See merge request pleroma/pleroma!1567
2019-08-14 19:22:15 +00:00
dc902ad3df
Merge branch 'fix/http-signatures-post' into 'develop'
...
activitypub: publisher: add (request-target) to http signature when POSTing
See merge request pleroma/pleroma!1569
2019-08-14 19:16:52 +00:00
1754f8ce6d
Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex
2019-08-14 19:05:44 +00:00
5bb418a90d
activitypub: publisher: add (request-target) to http signature when POSTing
2019-08-14 19:01:51 +00:00
626e094589
MRF: fix up unserializable option lists in describe implementations
2019-08-14 18:54:17 +00:00
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
a180c1360e
[ #1149 ] Oban mailer job. Adjusted tests.
2019-08-14 21:42:21 +03:00
c43152f6c1
fix formatting
2019-08-14 14:01:11 -04:00
d81f63845a
Implement Pleroma.Stats as GenServer
2019-08-14 11:59:33 -04:00
574856ef01
streamline Streamer pings
2019-08-14 11:58:32 -04:00
15ef521009
Isolate OAuth.Token.CleanWorker
2019-08-14 11:57:50 -04:00
51bdf0cab6
use default child_specs
2019-08-14 11:55:17 -04:00
d3af9e19ed
Conversations: Load relations in one query.
2019-08-14 17:01:11 +02:00
c9970feee2
Fix compatibility with Elixir 1.8
2019-08-14 21:03:25 +07:00
f73212b2a3
Conversation: Render new participation on update.
2019-08-14 15:56:15 +02:00
df81abb68c
Conversations: Use correct oauth paths for extended api.
2019-08-14 15:55:43 +02:00
4b7f1c6995
Improve digest email template
2019-08-14 20:46:05 +07:00
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-14 15:30:40 +02:00
672fcbc7b7
Limit custom fields for old remote users
2019-08-14 14:58:06 +07:00
e457fcc479
Add `:max_remote_account_fields` config option
2019-08-14 14:58:06 +07:00
f7bbf99caa
Use info.fields instead of source_data for remote users
2019-08-14 14:52:54 +07:00
2c35d4b0b0
Add configurable account field name length limit
2019-08-14 14:52:54 +07:00
db3c05f6b4
Add configurable account field value length limit
2019-08-14 14:52:54 +07:00
7d6f8a7fd7
Linkify custom fields values in ActivityPub.UserViewx
2019-08-14 14:52:54 +07:00
5178f960c3
Support user attachment update in Transmogrifier
2019-08-14 14:52:54 +07:00
88598c9baf
Add profile custom fields to ActivityPub.UserView
2019-08-14 14:52:54 +07:00
a22f540fc4
Add custom fields to TwitterAPI.UserView
2019-08-14 14:52:54 +07:00
e0ac5c7a66
Add custom profile fields
2019-08-14 14:52:54 +07:00
5c35d2f1d8
Merge branch 'preload-user-timelines' into 'develop'
...
Preload thread mutes/bookmarks in user_statuses
See merge request pleroma/pleroma!1563
2019-08-14 01:04:07 +00:00
fe42844bda
Merge branch 'get-context-optimizations' into 'develop'
...
Preload thread mutes/bookmarks in get_context
See merge request pleroma/pleroma!1562
2019-08-14 01:03:54 +00:00
8202f1634a
Preload thread mutes/bookmarks in user_statuses
2019-08-14 03:02:09 +03:00
f4e087ee48
Preload thread mutes/bookmarks in get_context
...
Also removes filtering for creates (was done on the database side
already) and filtering for the requested activity (moved to the database
side) from application side.
2019-08-14 02:36:54 +03:00
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00
c3a54cc34d
Merge branch 'feature/mrf-describe' into 'develop'
...
MRF describe API
See merge request pleroma/pleroma!1561
2019-08-13 22:46:19 +00:00
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
2019-08-13 22:40:13 +00:00
abfbcfdcb3
mrf_vocabulary: add describe API support
2019-08-13 22:39:26 +00:00
4244e17de0
fix credo
2019-08-13 22:36:24 +00:00
47c20ab796
Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'
...
Mastodon API: Preloading and normalization optimizations
See merge request pleroma/pleroma!1558
2019-08-13 22:32:49 +00:00
46d7bef7e7
Nicer formatting for safe_render errors
2019-08-14 01:15:18 +03:00
f305e97eeb
nodeinfo: use MRF.describe() instead of hardcoded MRF transparency stuff
2019-08-13 22:09:02 +00:00
c574b7a1fc
MRF: add describe() to all modules, add base MRF configuration to base describe()
2019-08-13 22:08:58 +00:00
694bc43123
MRF: add describe() for gathering and describing the MRF configuration
2019-08-13 21:26:24 +00:00
fea4d89e9f
tests for Web/ActivityPub/Relay
2019-08-13 21:12:59 +00:00
04da1166db
tests for /web/mastodon_api/mastodon_api.ex
2019-08-13 21:12:37 +00:00
3fdbeb7087
MRF: add vocabulary policy module
2019-08-13 20:55:38 +00:00
c1b6952d2a
Mastodon API: Preloading and normalization optimizations
...
- Try to normalize the activity instead of object wherever possible
- Put the `user` key on non-home timelines as well so bookmarks and
thread mutes are preloaded there as well
- Skip trying to get the user when rendering mentions if the id ==
as:Public or user's follower collection
- Preload the object when getting replied to activities and do not crash
if it's not present
This almost solves the problem of Pleroma hammering the db with a lot
of queries when rendering timelines, the things left are
1. When rendering mentions and the user is not in cache, save it for
later and request all uncached users in one go
2. Somehow get rid of needing to get the latest follow activity to
detect the value of `requested` in a relationship. (create a database
view for user relationship and cache it maybe?)
2019-08-13 20:34:34 +03:00
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
2019-08-13 20:20:26 +03:00
f46cd7e9c7
config: remove legacy activitypub accept_blocks setting
...
Anyone who is interested in dropping blocks can write their own MRF
policy at this point. This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy.
2019-08-13 02:15:21 +00:00
511ccea5aa
ConversationView: Align parameter names with other views.
2019-08-12 14:23:06 +02:00
60231ec7bd
Conversation: Add endpoint to get a conversation by id.
2019-08-12 13:58:04 +02:00
23c46f7e72
Conversations: Use 'recipients' for accounts in conversation view.
...
According to gargron, this is the intended usage.
2019-08-12 12:51:08 +02:00
92479c6f48
Do not fetch the reply object in `fix_type` unless the object has the
...
`name` key and use a depth limit when fetching it
2019-08-11 22:49:55 +03:00
9cfc289594
MRF: ensure that subdomain_match calls are case-insensitive
2019-08-10 21:19:26 +00:00
84808e1697
Merge branch 'develop' into 'fix/hide-follows-counters'
...
# Conflicts:
# CHANGELOG.md
2019-08-10 18:49:04 +00:00
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
2019-08-10 18:47:40 +00:00
11d08c2de0
tests for Pleroma.Uploaders
2019-08-10 18:46:26 +00:00
33a5fc4a70
[ #1149 ] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.
2019-08-10 20:38:31 +03:00
0802a08871
Mastodon API: Fix thread mute detection
...
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
2019-08-10 16:27:46 +03:00
bb9c539580
Uploader.S3 added support stream uploads
2019-08-10 11:27:59 +00:00
dfae61c25c
Fix deactivated user deletion
2019-08-09 23:05:28 +03:00
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-09 20:09:56 +03:00
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
2019-08-09 20:08:01 +03:00
409bcad54b
Mastodon API: Set follower/following counters to 0 when hiding
...
followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency.
2019-08-09 16:53:55 +03:00
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-08 16:04:20 +02:00
9c0da1009a
Return profile URL in MastodonAPI's `url` field
2019-08-07 21:40:53 +00:00
089d53a961
Simplify logic to mention.js `url` field
...
`User.profile_url` already fallbacks to ap_id
2019-08-07 20:55:37 +00:00
a10c840aba
Return profile URL when available instead of actor URI for MastodonAPI mention URL
...
Fixes #1165
2019-08-07 20:29:30 +00:00
aa718ab8f6
Merge branch 'fix/object-reembeds' into 'develop'
...
Do not rembed the object after updating it
Closes #1142
See merge request pleroma/pleroma!1538
2019-08-06 22:14:00 +00:00
4f1b9c54b9
Do not rembed the object after updating it
2019-08-07 01:02:29 +03:00
03ad31328c
OStatus Announce Representer: Do not depend on the object being embedded
...
in the Create activity
2019-08-07 00:23:58 +03:00
73d8d5c49f
Stop depending on the embedded object in restrict_favorited_by
2019-08-07 00:12:42 +03:00
139b196bc0
[ #1150 ] fixed parser TwitterCard
2019-08-06 20:19:28 +00:00
e4a01d253e
Conversation: Rename function to better express what it does.
2019-08-06 15:06:19 +02:00
a49c92f6ae
Participation: Setting recipients will always add the owner.
2019-08-06 14:51:17 +02:00
bdc9a7222c
tests for CommonApi/Utils
2019-08-05 15:37:05 +00:00
d6fe220e32
Linting.
2019-08-05 16:11:23 +02:00
b64b6fee2a
CommonAPI: Replies to conversations also get the correct context id.
2019-08-05 15:33:22 +02:00
3af6d14da7
Pleroma Conversations API: Add a way to set recipients.
2019-08-05 15:09:19 +02:00
96028cd585
Remove Reply-To from report emails
2019-08-04 22:24:50 +00:00
f7fc902c29
Merge branch 'feature/relay-list-task' into 'develop'
...
tasks: relay: add list task
Closes #1101
See merge request pleroma/pleroma!1528
2019-08-04 17:14:37 +00:00
e8ad116c2a
Do not add the "next" key to likes.json if there is no more items
2019-08-04 17:13:06 +00:00
cef3af5536
tasks: relay: add list task
2019-08-03 23:17:17 +00:00
a035ab8c1d
templates/layout/app.html.eex: Style anchors
...
[ci skip]
2019-08-03 23:18:22 +02:00
86fffe9c27
Merge branch 'patch-2' into 'develop'
...
Add preferredUsername to service actors so Mastodon can resolve them
See merge request pleroma/pleroma!1526
2019-08-03 18:55:09 +00:00
1fce56c7df
Refactor
2019-08-03 18:37:20 +00:00
16cfb89240
Only add `preferredUsername` to service actor json when the underlying user actually has a username
2019-08-03 18:28:08 +00:00
de0f3b73dd
Admin fixes
2019-08-03 18:16:09 +00:00
040347b248
Remove spaces from the domain search
2019-08-03 18:13:20 +00:00
8b2fa31fed
Handle MRF rejections of incoming AP activities
2019-08-03 18:12:38 +00:00
a187dbb326
Add preferredUsername to service actors so Mastodon can resolve them
2019-08-03 17:24:57 +00:00
8815f07058
tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1155
[ci skip]
2019-08-02 23:38:02 +02:00
eee98aaa73
Pleroma API: Add endpoint to get conversation statuses.
2019-08-02 19:53:08 +02:00
d93d777915
Fix/mediaproxy whitelist base url
2019-08-02 17:07:09 +00:00
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
56b1c3af13
CommonAPI: Extend api with conversation replies.
2019-08-02 15:05:27 +02:00
5ff8f07ca9
Merge branch 'feature/hide-follows-remote' into 'develop'
...
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
2019-08-02 11:23:07 +00:00
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
2019-08-02 11:55:41 +02:00
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
2019-08-01 17:28:00 +03:00
9ca4506355
Add configurable length limits for `User.bio` and `User.name`
2019-08-01 15:53:37 +07:00
6c06529cd4
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
...
Disallow following locked accounts over OStatus
See merge request pleroma/pleroma!1512
2019-07-31 19:13:56 +00:00
813c686dd7
Disallow following locked accounts over OStatus
2019-07-31 22:05:12 +03:00
6eb33e7303
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
2019-07-31 18:35:15 +00:00
f72e0b7cad
ostatus: explicitly disallow protocol downgrade from activitypub
...
This closes embargoed bug #1135 .
2019-07-31 18:17:31 +00:00
301ea0dc04
Add tests for counters being updated on follow
2019-07-31 21:09:13 +03:00
58443d0cd6
tests for TwitterApi/UtilController
2019-07-31 15:14:36 +00:00
7483679a7b
StatusView: Return direct conversation id.
2019-07-31 15:12:29 +02:00
f42719506c
Fix credo issues
2019-07-31 14:20:34 +03:00
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
2019-07-31 14:12:29 +03:00
51b3b6d816
Admin changes
2019-07-30 16:36:05 +00:00
3850812503
twitter api: utils: rework do_remote_follow() to use CommonAPI
...
Closes #1138
2019-07-29 20:00:57 +00:00
5835069215
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
...
This reverts merge request !1504
2019-07-29 19:42:26 +00:00
5795a890e9
markdown: clean up html generated by earmark
2019-07-29 19:09:58 +00:00
1dfde4151c
Merge branch 'refactor/use-constants' into 'develop'
...
refactoring: begin to use constants
See merge request pleroma/pleroma!1500
2019-07-29 16:30:47 +00:00
0bee2131ce
Add `mailerEnabled` to the NodeInfo metadata
2019-07-29 16:17:40 +00:00
c0e258cf21
Redirect not logged-in users to the MastoFE login page on private instances
2019-07-29 16:17:22 +00:00
159bbec570
added tests for OstatusController
2019-07-29 05:02:20 +00:00
b93498eb52
constants: add as_public constant and use it everywhere
2019-07-29 02:43:19 +00:00
492d854e7a
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
...
Closes #1104
2019-07-28 21:32:04 +00:00
242f5c585e
add account confirmation email resend in mastodon api
2019-07-28 20:30:10 +00:00
6a4b8b2681
fixed User.update_and_set_cache for stale user
2019-07-28 20:29:26 +00:00
488c06b6f5
Merge branch 'develop' into 'develop'
...
Fix HTTP sig tweak on KeyId
See merge request pleroma/pleroma!1496
2019-07-28 20:25:35 +00:00
02dc651828
Handle 303 redirects
2019-07-28 20:24:39 +00:00
961e778531
Fix HTTP sig tweak on KeyId
2019-07-28 14:17:56 +02:00
6b77a88365
[ #1097 ] added redirect: /pleroma/admin -> /pleroma/admin/
2019-07-26 20:27:38 +00:00
41e0304757
Merge branch 'develop' into feature/hide-follows-remote
2019-07-25 18:43:30 +03:00
19835be067
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
...
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
2019-07-24 19:29:01 +00:00
b20020da16
Show the url advertised in the Activity in the Status JSON response
2019-07-24 19:28:21 +00:00
84fca14c3c
Do not prepend /media/ when using base_url
...
This ensures admin has full control over the path where media resides.
2019-07-24 15:35:25 +00:00
ac27b94ffa
Change to not require `magic-public-key` on WebFinger
2019-07-25 00:21:32 +09:00
55341ac717
tests WebFinger
2019-07-24 15:13:10 +00:00
4504135894
Add `domain_blocking` to the relationship API (GET /api/v1/accounts/relationships)
2019-07-24 15:12:27 +00:00
2c83eb0b15
Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
...
This reverts commit 2981821db8
2019-07-24 17:09:59 +02:00
2981821db8
squash! Expose expires_at datetime in mastoAPI only for the activity actor
...
NOTE: rewrite the commit msg
2019-07-24 16:51:09 +02:00
d2da3d30f3
Merge branch 'develop' into feature/digest-email
2019-07-24 16:37:52 +03:00
3cb471ec06
Expose expires_at datetime in mastoAPI only for the activity actor
...
In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.
The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so.
2019-07-24 14:47:22 +02:00
36012ef6c1
Require that ephemeral posts live for at least one hour
...
If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them.
2019-07-24 14:46:08 +02:00
704960b3c1
Add support for activity expiration to common and Masto API
...
The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not.
2019-07-24 14:45:14 +02:00
378f5f0fbe
Add activity expiration worker
...
This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.
2019-07-24 13:14:52 +02:00
666514194a
Add activity expirations table
...
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
2019-07-24 13:14:52 +02:00
f5d574f4ed
check both item and parent domain blocks
2019-07-24 11:35:16 +01:00
48bd3be9cb
move domain block check to with block
2019-07-24 11:11:33 +01:00
4af4f6166b
honour domain blocks on streaming notifications
2019-07-24 11:09:06 +01:00
9c6357324e
Merge branch 'feature/admin-api-user-statuses' into 'develop'
...
Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413
2019-07-23 23:59:21 +00:00
d3bdb8e704
rich media: parser: splice the given URL into the result
2019-07-23 23:51:29 +00:00
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-24 02:42:28 +03:00
03471151d6
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
2019-07-24 01:51:36 +03:00
bd265acf91
Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'
...
Router: Remove deprecated AdminAPI endpoints
See merge request pleroma/pleroma!1466
2019-07-23 19:48:34 +00:00
90be91b0e0
Router: Remove deprecated AdminAPI endpoints
2019-07-23 21:35:25 +02:00
5e72554f3c
Admin config fix
2019-07-23 19:17:00 +00:00
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
2019-07-23 19:15:48 +00:00
8d3cf7e519
Merge branch 'bugfix/unauthed-liked-by' into 'develop'
...
Bugfix: don't error out on unauthorized request to liked/favourited_by
See merge request pleroma/pleroma!1474
2019-07-23 19:14:43 +00:00
03d89e182e
Merge branch 'fix/subscriber-notifications' into 'develop'
...
Do not notify subscribers for messages from users which are replies to others
See merge request pleroma/pleroma!1477
2019-07-23 19:13:55 +00:00
6a79bb12c3
Fix function
2019-07-23 13:53:05 -05:00
54a161cb7a
move unauth'd user blocks?/2 check
2019-07-23 19:44:47 +01:00
fd287387a0
Do not notify subscribers for messages from users which are replies to others
2019-07-23 13:14:26 -05:00
e7c64f106e
signature: properly deduce the actor from misskey key IDs
2019-07-23 16:47:22 +00:00
452980652d
Mix format
2019-07-23 15:13:05 +01:00
eacf61d823
fix unauthenticated req to favourited/rebloggd_by
2019-07-23 15:08:33 +01:00
e818381042
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1
2019-07-23 19:47:27 +09:00
b70e659304
Feature/1087 wildcard option for blocks
2019-07-22 14:33:58 +00:00
674ad5e1df
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
...
activitypub: publisher: align sharedinbox usage with AP specification rules
See merge request pleroma/pleroma!1464
2019-07-22 11:01:35 +00:00
f712ee879a
Bugfix: muted/blocked user notification streaming
2019-07-22 02:43:55 +00:00
05b5af8075
Add tests for users tasks and PleromaAuthenticator
2019-07-22 02:43:15 +00:00
a5d6287ba8
Hide blocked users from interactions
2019-07-22 02:42:29 +00:00
56019d53a8
activitypub: publisher: align sharedinbox usage with AP specification rules
...
While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification. Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.
2019-07-22 02:38:31 +00:00
a00aab3402
Merge branch 'fix/rich-media-ttl-fallback' into 'develop'
...
Fix rich media parser failing when no TTL can be found by image TTL setters
See merge request pleroma/pleroma!1460
2019-07-21 16:05:58 +00:00
3368174785
Fix rich media parser failing when no TTL can be found by image TTL
...
setters
2019-07-21 18:22:22 +03:00
bc6c5c513a
router: ensure the AP sharedinbox path is registered first
2019-07-21 03:52:06 +00:00
196cad46f3
Resolve merge conflicts
2019-07-20 22:04:47 +03:00
c3ecaea64d
Apply suggestion to lib/pleroma/object/fetcher.ex
2019-07-20 18:53:00 +00:00
d4ee76ab63
Apply suggestion to lib/pleroma/user.ex
2019-07-20 18:52:41 +00:00
8292331b35
Merge branch 'develop' into feature/digest-email
2019-07-20 16:41:58 +03:00
d0198fe215
[ #1112 ] Preserving `id` on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
2019-07-20 13:03:34 +03:00
ae4fc58589
Remove flavour from userinfo
2019-07-20 01:24:01 +03:00
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
93df0796f0
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
...
Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211
2019-07-19 21:59:18 +00:00
9169f331b6
Merge branch 'develop' into feature/matstodon-statuses-by-name
2019-07-19 16:55:10 -05:00
33729bbb28
Merge branch 'feature/richmedia-ttl' into 'develop'
...
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
2019-07-19 21:36:36 +00:00
9a8eb2c94d
mix: add pleroma.user unsubscribe_all_from_instance
2019-07-19 19:25:29 +00:00
716afc83ce
Merge branch 'refactor/http-signature-plug' into 'develop'
...
http signature plug: separation of concerns
See merge request pleroma/pleroma!1449
2019-07-19 16:57:24 +00:00
c2e2aadc42
#1110 fixed /api/pleroma/healthcheck
2019-07-19 16:20:23 +00:00
de9906ad56
change the structure of image ttl parsar
2019-07-19 11:43:42 +05:45
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-18 23:38:38 +03:00
c947cfec5a
mapped signature plug: use `user` assign like authentication plug
2019-07-18 20:31:25 +00:00
f435217e50
tests for Plugs.AuthenticationPlug
2019-07-18 20:29:51 +00:00
a8af0ac053
mapped signature plug: fix user lookup
2019-07-18 16:27:50 +00:00
5ea0cd69f7
mapped signature plug: don't invalidate in cases where a signature is actually not present (testsuite)
2019-07-18 16:01:21 +00:00
184fa61fb3
plugs: add MappedSignatureToIdentityPlug
2019-07-18 15:38:45 +00:00
18d8d12d53
signature: make key_id_to_actor_id() public
2019-07-18 15:35:42 +00:00
88d064d80e
http signature plug: remove redundant checks handled by HTTPSignatures library
...
the redundant checks assumed a POST request, which will not work for signed GETs.
this check was originally needed because the HTTPSignatures adapter assumed that
the requests were also POST requests. but now, the adapter has been corrected.
2019-07-18 15:11:21 +00:00
f9a0014681
Merge branch 'feature/signed-object-fetches' into 'develop'
...
signed object fetches
See merge request pleroma/pleroma!1446
2019-07-18 13:27:50 +00:00
b6b748d3e7
tests for Uploader with webhook
2019-07-18 12:30:18 +00:00
399acd4c42
fetcher: sign object fetches if configured
2019-07-17 22:58:46 +00:00
1e48af9acf
Merge branch 'feature/instance-fetch-actor' into 'develop'
...
instance fetch service actor
See merge request pleroma/pleroma!1440
2019-07-17 19:45:40 +00:00
60b54ee64a
Merge branch 'feature/http-signatures-keyid' into 'develop'
...
http signatures: derive actor from key IDs
See merge request pleroma/pleroma!1442
2019-07-17 19:44:14 +00:00
f84fb340b7
http signatures: derive actor ID from key ID.
...
Almost all AP servers return their key ID as the actor URI with #main-key
added. Hubzilla, which doesn't, uses a URL which refers to the actor
anyway, so worst case, Hubzilla users get refetched.
2019-07-17 19:18:19 +00:00
4bf2bb9cff
Fix password reset for non-test env
...
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
2019-07-17 18:09:31 +00:00
cf9cb953d5
activitypub: represent internal fetch actor
2019-07-17 17:34:57 +00:00
d930e5d5c3
activitypub: introduce internal fetch service actor
2019-07-17 17:14:08 +00:00
62e5ff624e
user: add is_internal_user? helper function
2019-07-17 17:12:42 +00:00
0a6f6e1b5b
webfinger: allow resolution of usernames with dots in them (internal actors)
2019-07-17 16:59:29 +00:00
a9d6a12bb3
activitypub: controller: rework the way the relay actor is presented so the code can be reused
2019-07-17 16:33:08 +00:00
4885473be2
user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()
2019-07-17 16:03:05 +00:00
ce73d5f6a5
Merge branch 'feature/mention-mrf' into 'develop'
...
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
2019-07-17 15:28:41 +00:00
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors
2019-07-17 15:16:55 +01:00
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
2019-07-16 21:44:50 +00:00
21e3f9ac69
added tests for Pleroma.Upload.Filter
2019-07-16 21:35:43 +00:00
18234cc44e
add the rich media ttl based on image exp time
2019-07-17 00:20:34 +05:45
889dc17abd
[ #1094 ] Rate-limited follow & unfollow actions.
2019-07-16 19:18:30 +03:00
e7c175c943
Use PleromaJobQueue for scheduling
2019-07-16 16:49:50 +03:00
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
520ee6c591
Add `pleroma.deactivated` to the Account entity (Mastodon API)
2019-07-16 11:14:46 +00:00
c4ca142e14
Add the `blocked_by` attribute to the relationship API (`GET /api/v1/accounts/relationships`)
2019-07-16 11:04:11 +00:00
70439494af
Fix typo
2019-07-16 14:56:07 +07:00
996fd58ac4
Merge branch 'bugfix/poll-id-as-string' into 'develop'
...
Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430
2019-07-16 06:06:22 +00:00
1ed24bcc76
Status View: Poll ids are strings.
...
All ids in mastodon are strings, in general.
2019-07-16 12:47:40 +09:00
ffb4eb9779
Merge branch 'develop' into feature/matstodon-statuses-by-name
2019-07-15 17:10:27 -05:00
9f987dd017
Merge branch 'match-file-name' into 'develop'
...
try to always match the filename for proxy url
See merge request pleroma/pleroma!1405
2019-07-15 22:04:58 +00:00
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
2019-07-15 19:47:23 +00:00
33fd4c0ed7
query fix
2019-07-15 20:53:52 +03:00
ee5250ae56
Merge branch 'sha512-crypt' into 'develop'
...
detect and use sha512-crypt for stored password hash.
See merge request pleroma/pleroma!1422
2019-07-15 16:13:17 +00:00
1d906ffa82
Merge branch 'develop' into match-file-name
...
# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
2019-07-15 21:30:56 +05:45
105f437ce9
formatting
2019-07-15 08:36:51 -07:00
03c4ea44ad
Merge branch 'admin-configure-atom-keys' into 'develop'
...
admin configure - atom keys with leading :
See merge request pleroma/pleroma!1424
2019-07-15 13:01:58 +00:00
c32384c1ea
tests for Pleroma.Signature
2019-07-15 13:01:22 +00:00
b8607c151c
migrating task refactor
2019-07-15 15:45:27 +03:00
c66044b923
atom keys with leading :
2019-07-15 11:00:55 +03:00
de13c9bb8f
List messages must be visible for mentioned users
2019-07-15 14:54:40 +07:00
d86a97abfb
Add an explanation comment to Publisher.publish/2
2019-07-15 14:20:31 +07:00
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-07-15 14:11:54 +07:00
a87c313309
Support `list` visibility in StatusView
2019-07-15 14:00:29 +07:00
fa17879c20
added tests for Web.MediaProxy
2019-07-14 21:01:32 +00:00
b052a9d4d0
Update DigestEmailWorker to compile and send emails via queue
2019-07-14 22:32:11 +03:00
dce8ebc9ea
Unfollow should also unsubscribe
2019-07-14 19:25:03 +00:00
168dc97c37
Make opts optional in Pleroma.Notification.for_user_query/2
2019-07-14 22:04:55 +03:00
c729883936
Merge branch 'develop' into feature/digest-email
2019-07-14 21:43:30 +03:00
739bbe0d3b
security: detect object containment violations at the IR level
...
It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers. OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.
2019-07-14 17:47:08 +00:00
f98f7ad1b9
detect and use sha512-crypt for stored password hash.
2019-07-14 09:48:42 -07:00
cef4337f95
Merge branch 'bugfix/llal-object-containment' into 'develop'
...
Object.Fetcher: Handle error on Containment.contain_origin/2
See merge request pleroma/pleroma!1414
2019-07-14 16:39:17 +00:00
2592934480
Object.Fetcher: Keep the with-do block as per kaniini proposition
2019-07-14 17:28:25 +02:00
e1c08a67d6
Object.Fetcher: Fallback to OStatus only if AP actually fails
2019-07-14 17:05:31 +02:00
e7c39b7ac8
Feature/1072 muting notifications
2019-07-14 13:29:31 +00:00
40d0a198e2
Object.Fetcher: Handle error on Containment.contain_origin/2
2019-07-14 14:58:47 +02:00
f4447d82b8
parsers configurable
2019-07-14 09:21:56 +03:00
0c2dcb4c69
Add follow information refetching after following/unfollowing
2019-07-14 01:58:39 +03:00
183da33e00
Add tests for fetch_follow_information_for_user and check object type
...
when fetching the page
2019-07-14 00:56:02 +03:00
418ae6638d
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-14 00:39:06 +03:00
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
2019-07-14 00:37:26 +03:00
d06d1b751d
Use atoms when updating user info
2019-07-14 00:21:35 +03:00
e5b850a991
Refactor fetching follow information to a separate function
2019-07-13 23:56:10 +03:00
80c46d6d8b
nodeinfo: implement MRF transparency exclusions
2019-07-13 18:53:14 +00:00
e8fa477793
Refactor Follows/Followers counter syncronization
...
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
2019-07-13 19:27:49 +03:00
f4c001062e
Merge branch '1041-status-actions-rate-limit' into 'develop'
...
Rate-limited status actions (per user and per user+status).
Closes #1041
See merge request pleroma/pleroma!1410
2019-07-13 14:17:17 +00:00
d72876c57d
[ #1041 ] Minor refactoring.
2019-07-13 15:21:50 +03:00
9497d14f09
Merge branch 'fix/hackney-global-options' into 'develop'
...
Merge the default options with custom ones in ReverseProxy and Pleroma.HTTP and workaround for remote server certificate chain issues
See merge request pleroma/pleroma!1409
2019-07-13 11:55:09 +00:00
369e9bb42f
[ #1041 ] Rate-limited status actions (per user and per user+status).
2019-07-13 14:49:39 +03:00
b001b8891a
Merge the default options with custom ones in ReverseProxy and
...
Pleroma.HTTP
2019-07-12 23:52:26 +03:00
095117a58c
Merge branch 'develop' into fix/ap-hide-follows
2019-07-12 21:43:06 +03:00
97b79efbcd
ActivityPub Controller: Actually pass for_user to following/followers
...
views and give 403 errors when trying to request hidden follower pages
when unauthenticated
2019-07-12 20:54:20 +03:00
f8e3ae6154
try to always match the filename for proxy url
2019-07-12 22:56:14 +05:45
92055941bd
Pleroma.Web.Metadata - tests
2019-07-12 16:42:54 +00:00
1f6ac7680d
ActivityPub User view: Following/Followers refactoring
...
- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it
2019-07-12 19:41:55 +03:00
360e4cdaa2
Move these to pleroma namespace in Mastodon API
2019-07-12 11:25:58 -05:00
6a6c4d134b
preserve the original path/filename (no encoding/decoding) for proxy
2019-07-12 21:05:01 +05:45
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
2019-07-11 13:55:31 +00:00
846ad9a463
admin api configure changes
2019-07-11 13:02:13 +00:00
e4e3fd7e55
Merge branch 'fix/1019-refactor' into 'develop'
...
Fix/1019 refactor
See merge request pleroma/pleroma!1397
2019-07-11 13:01:11 +00:00
9e06873d58
Add `list` to Visibility
2019-07-11 19:29:24 +07:00
958fb9aa80
Add "listMessage"
2019-07-11 16:36:08 +07:00
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
2019-07-11 13:26:59 +07:00
a237c6a2d4
support for idna domains
2019-07-10 15:23:25 +00:00
252e129b1e
MastoAPI: Add categories to custom emojis
...
Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.
2019-07-10 17:02:37 +02:00
beba7bbc85
removing synchronization worker
2019-07-10 17:42:18 +03:00
f8786fa6f2
adding following_address field to user
2019-07-10 17:42:18 +03:00
ff55e3c16f
Create mentions only for explicitly mentioned users
2019-07-10 13:29:50 +00:00
ed8ce21a22
Fix unused import warning
2019-07-10 18:10:09 +07:00
a42da8f311
Fix response
2019-07-10 18:10:09 +07:00
5104f65b69
Wrap error messages into gettext helpers
2019-07-10 18:10:09 +07:00
26a6871609
Add translation helpers
2019-07-10 18:10:09 +07:00
0d54a571ca
Add SetLocalePlug
2019-07-10 18:08:03 +07:00
008c55e4e9
add test for search_controller/ 100% coverage
2019-07-10 08:28:03 +00:00
12b1454245
[ #1062 ] added option to disable send email
2019-07-10 05:34:21 +00:00
2d2b50ccca
Send and handle "Delete" activity for deleted users
2019-07-10 05:16:08 +00:00
75be90a6d1
Merge branch 'release/listener' into 'develop'
...
add listener port and ip option for 'pleroma.instance gen' and enable its test
See merge request pleroma/pleroma!1393
2019-07-10 05:14:08 +00:00
93a0eeab16
Add license/copyright to all project files
2019-07-10 05:13:23 +00:00
bb8065a1fd
tests MRF filters
2019-07-10 05:12:21 +00:00
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
2019-07-10 01:46:49 +05:45
829e997223
[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
...
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
2019-07-09 21:46:16 +03:00
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
670a77ecbc
Merge branch 'feature/allow-user-query-via-id' into 'develop'
...
Admin API: Allow querying user by ID
See merge request pleroma/pleroma!1380
2019-07-09 17:53:41 +00:00
1417627d07
Merge branch 'remove-avatar-header' into 'develop'
...
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
2019-07-09 17:51:41 +00:00
9a9b60cfbc
Merge branch 'develop' into feature/allow-user-query-via-id
2019-07-09 12:49:04 -05:00
d6b0fce6e9
Fix/1019 correct count remote users
2019-07-09 17:36:35 +00:00
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
2019-07-09 16:54:32 +00:00
4e6e5d8042
reverse proxy tests
2019-07-09 16:54:13 +00:00
1179a13533
Merge branch 'features/sec-websocket-protocol-header' into 'develop'
...
Features: MastoAPI streaming Sec-WebSocket-Protocol header
See merge request pleroma/pleroma!1381
2019-07-09 16:52:22 +00:00
1ab4e35f27
Merge branch 'enable-ogp-by-default' into 'develop'
...
Do not crash if metadata fails to render and enable OGP and TwitterCard by default
Closes #1034
See merge request pleroma/pleroma!1388
2019-07-09 16:07:20 +00:00
167f810ff1
Merge branch 'proxy-error' into 'develop'
...
make sure the url used by proxy is same as original url
See merge request pleroma/pleroma!1383
2019-07-09 16:00:44 +00:00
95c085174d
Merge branch 'test-speedup' into 'develop'
...
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
2019-07-09 15:35:28 +00:00
31a59d6f23
Merge branch 'develop' into proxy-error
2019-07-09 10:18:30 -05:00
376a55c97f
Merge branch '161-incoming-replies-depth-limit' into 'develop'
...
[#161 ] Limited replies depth on incoming federation (memory leaks fix)
Closes #161
See merge request pleroma/pleroma!1361
2019-07-09 14:15:10 +00:00
23d4781e73
change for local user search
2019-07-09 08:52:49 +00:00
abe2e8881f
Testing: Don't federate in testing.
2019-07-09 15:30:51 +09:00
daff85a985
[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
2019-07-08 19:53:02 +03:00
44b2e1fdad
Formatting
2019-07-08 14:05:57 +03:00
9e58d3c624
FallbackRedirector: Do not crash on Metadata rendering errors
2019-07-08 12:59:49 +03:00
7f609ee8f4
OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent
2019-07-08 12:16:32 +03:00
72b88c82bc
Mastodon API: Fix embedded relationships not being rendered inside of statuses
2019-07-08 12:07:08 +03:00
f5ad430974
make sure the url used by proxy is same as origin url
...
encoding or decoding it breaks some of the signed url
2019-07-07 14:13:40 +05:45
e174614eb9
MastoAPI Streaming: Keep compatibility with access_token
2019-07-07 08:49:29 +02:00
a7885748c7
MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol
2019-07-06 20:29:17 +02:00
ad8d86e7c6
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
2019-07-06 10:17:06 +03:00
3589b30ddc
Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'
...
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
Closes #1058
See merge request pleroma/pleroma!1378
2019-07-05 18:55:27 +00:00
6c50fbcd14
Admin API: Allow querying user by ID
2019-07-05 19:33:53 +03:00
6dadf5d6f4
[ #1043 ] fix search accounts.
2019-07-05 04:22:08 +00:00
977c2d0448
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1058
2019-07-05 06:19:27 +02:00
15eb1235ed
Expose `skip_thread_containment` in nodeinfo
2019-07-03 18:35:57 +00:00
5184b0f41a
Use fallback values for search queries
...
This is to make sure the entire request doesn't return a 500 error if
user or status search times out.
2019-07-03 10:19:51 +00:00
4f42093220
Remove Uploaders.Swift
2019-07-03 14:11:04 +07:00
ab50c6b3ca
Add fallback value to the admin report view.
...
This is to avoid 500 error when the reported user no longer exists
in the database.
2019-07-02 01:27:00 +00:00
d2cb18b2a3
Merge branch 'develop' into feature/digest-email
2019-06-30 21:23:35 +03:00
a799418573
[ #161 ] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
...
# Conflicts:
# CHANGELOG.md
2019-06-30 16:05:00 +03:00
2b9d914089
[ #161 ] Refactoring, documentation.
2019-06-30 15:58:50 +03:00
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
2019-06-30 09:08:46 +00:00
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
2019-06-30 07:28:35 +00:00
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
2019-06-29 22:27:42 +03:00
5b7b1040b3
[ #161 ] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
2019-06-29 20:04:50 +03:00
d1549a6375
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
...
Merge admin and mastodon user views for reports
See merge request pleroma/pleroma!1346
2019-06-29 00:12:09 +00:00
034986e1fd
MRF: add mediaproxy warming policy
2019-06-28 23:19:20 +00:00
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
2286f62a36
Merge branch 'release-docs' into 'develop'
...
Docs on OTP releases
See merge request pleroma/pleroma!1315
2019-06-28 15:26:09 +00:00
452ca5250d
Merge admin and mastodon user views for reports
2019-06-28 15:15:32 +03:00
0369a5db16
Merge branch 'idempotency-plug' into 'develop'
...
Add IdempotencyPlug and use it in all of the api
Closes #1003
See merge request pleroma/pleroma!1339
2019-06-27 04:20:17 +00:00
c6705144a2
don't delete config settings on admin update
2019-06-27 04:19:44 +00:00
889a9c3a3f
Polish IdempotencyPlug
2019-06-27 01:53:58 +07:00
159630b21c
Fix credo warning
2019-06-26 19:19:07 +07:00
0b8aeac0f3
Remove previous idempotency implementation from `post_status`
2019-06-26 18:49:14 +07:00
74132e3715
Enable IdempotencyPlug for the all API
2019-06-26 18:42:49 +07:00
825077a5b0
Add Idempotency plug
2019-06-26 18:36:58 +07:00
d53fb55bb7
Return correct response when reply to a direct message is not direct itself
2019-06-26 10:59:27 +00:00
24bcc209f9
Merge branch 'refactoring/fix_render_view' into 'develop'
...
Fix Controller.render/4 deprecation
See merge request pleroma/pleroma!1337
2019-06-26 05:34:26 +00:00
9f8e645dce
Merge branch 'feature/configurable-pack-extensions' into 'develop'
...
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
2019-06-26 05:34:02 +00:00
41e4752950
Make default pack extensions configurable and default to png and gif
2019-06-26 06:48:59 +03:00
5c0f646cef
fix validate_page_url
2019-06-26 06:27:17 +03:00
a7a54068f9
Fix Controller.render/4 deprecation
2019-06-26 03:28:02 +03:00
4ad15ad2a9
add ignore hosts and TLDs for rich_media
2019-06-25 22:25:37 +03:00
0276cf5a02
fix validate_url for private ip
2019-06-25 17:44:24 +03:00
a0c4ebb4d7
[ #184 ] small refactoring reset password
2019-06-24 19:01:56 +00:00
2c63c67512
Rework user deletion
2019-06-24 18:59:12 +00:00
f2c03425b0
Broadcast conversation update when DM is deleted
2019-06-24 07:14:04 +00:00
27b9605de0
Merge branch 'rich_media_titles_two' into 'develop'
...
Rich media titles two
See merge request pleroma/pleroma!1325
2019-06-23 05:43:11 +00:00
8b7860f12f
Merge branch 'admin-config' into 'develop'
...
Admin config
See merge request pleroma/pleroma!1328
2019-06-23 05:42:37 +00:00
982cad0268
support for config groups
2019-06-23 08:16:16 +03:00
a0c65bbd6c
Merge branch 'develop' into 'remove-avatar-header'
...
# Conflicts:
# CHANGELOG.md
2019-06-23 03:25:50 +00:00
410add1c30
support for tuples with more than 2 values
2019-06-22 17:30:53 +03:00
0e415921cd
Rich Media Parser: Do not return just a title if nothing else is there.
2019-06-22 16:22:59 +02:00
58c4d5312b
Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
...
This reverts commit b6af80f769
2019-06-22 15:12:57 +02:00
3ac5ecbac1
Support RUM indexes in the config generator
2019-06-22 12:54:16 +03:00
51760c84b9
Merge branch 'develop' into release-docs
2019-06-22 12:44:20 +03:00
53c73cd1a3
Merge branch 'fix/ecto-tasks-release' into 'develop'
...
Ecto tasks: Resolve relative path using the application directory instead of cwd and load the application before doing anything
See merge request pleroma/pleroma!1322
2019-06-22 09:19:10 +00:00
6426301407
notifications: fix notification generation for non-create activities
...
in 300d94c62
2019-06-22 06:44:47 +00:00
f0fccb7578
fix for int and modules
2019-06-22 09:01:30 +03:00
19f16e829d
Load the application before executing the create task
2019-06-22 04:33:46 +03:00
ebee9f59d8
Ecto tasks: Resolve relative path using the application directory
...
instead of cwd and load the application before doing anything
In OTP releases cwd != app directory and the configuration is read
only if the application is loaded
2019-06-22 04:17:04 +03:00
ee4e7c6570
Remove the getting started steps from pleroma.instance gen task
...
They are not compatible with every platform, different for OTP releases
and may become outdated. We are better off just telling people to refer
to the installation guides for their particular platform
2019-06-22 02:07:05 +03:00
452d5d3231
Merge branch 'develop' into release-docs
2019-06-22 02:00:18 +03:00
55742d978d
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
...
implement anti link spam MRF
See merge request pleroma/pleroma!1307
2019-06-21 22:56:54 +00:00
e3534f5b3c
Merge branch 'oauth_secure_redirect' into 'develop'
...
OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302
2019-06-21 22:31:12 +00:00
720412bf24
Merge branch 'revert-6f5a0cc1' into 'develop'
...
Revert "Merge branch 'fix/ogp-title' into 'develop'"
See merge request pleroma/pleroma!1317
2019-06-21 22:28:46 +00:00
127a5a7d65
change the anti-link-spam MRF implementation to use old_user? instead of the previous name
2019-06-21 22:27:14 +00:00
e76115989a
Move config templates to priv so they can be found in releases
2019-06-21 19:54:04 +03:00
b6af80f769
Revert "Merge branch 'fix/ogp-title' into 'develop'"
...
This reverts merge request !1277
2019-06-21 11:36:32 +00:00
89fead9250
Default DB configuration to false and set the default database name to
...
`pleroma` instead of `pleroma_dev`
2019-06-21 06:42:04 +03:00
2437f51284
Merge branch 'fix/config-gen-releases' into 'develop'
...
Refactor mix tasks a bit and make config generator work with releases
See merge request pleroma/pleroma!1312
2019-06-20 21:25:34 +00:00
32320c1ee9
Fixes for dynamic configuration
2019-06-20 17:43:57 +00:00
69070e641d
Allow setting upload/static directories in the config generator
2019-06-20 03:59:16 +03:00
144e2e3e0b
Remove deprecated dedupe_media from the config template
2019-06-20 03:40:00 +03:00
fe3a830b80
Remove a useless binding from config template call
2019-06-20 02:34:19 +03:00
f8c64dd4c0
Release Tasks: Ensure the application is loaded before getting the
...
modules
Needed for non-rpc tasks to work
2019-06-20 02:21:48 +03:00
8c7a382027
Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functions
...
instead of aliasing
This seems to be the convention for functions that can be reused between
different mix tasks in all Elixir projects I've seen and it gets rid on
an error message when someone runs mix pleroma.common
Also in this commit by accident:
- Move benchmark task under a proper namespace
- Insert a space after the prompt
2019-06-20 02:08:02 +03:00
363618207c
Apply suggestion to lib/mix/tasks/pleroma/user.ex
2019-06-19 19:39:53 +00:00
71fb75b7ef
User sign out mix task.
2019-06-19 22:29:36 +03:00
21dacd4b15
unbreak polls
2019-06-19 16:33:49 +00:00
736d8ad6be
implement anti link spam MRF
2019-06-19 15:58:32 +00:00
e4fa6b99ac
aliases for mix tasks
...
ecto.migrate
ecto.rollback
2019-06-19 10:33:33 +00:00
df2dab69a7
Merge branch 'begone-the-dot-hack' into 'develop'
...
Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits
See merge request pleroma/pleroma!1298
2019-06-19 10:22:23 +00:00
5c6c4ce634
Merge branch 'fix/rich-media-hashtags-again' into 'develop'
...
Rich Media: Skip Microformats hashtags
See merge request pleroma/pleroma!1304
2019-06-19 08:48:41 +00:00
035368d363
Rich Media: Skip Microformats hashtags
...
When fixing this problem I incorrectly assumed a.hashtag is
the proper way for detecting hashtags, but it is just something Pleroma and
Mastodon add. Per microformats it should be detected by the presense of rel=tag.
This MR adds a check for rel=tag, but I still left a.hashtag just in case
2019-06-19 00:46:30 +03:00
966317e052
Merge branch 'deps/update-auto-linker' into 'develop'
...
Deps: Update auto_linker
See merge request pleroma/pleroma!1300
2019-06-18 20:47:36 +00:00
64bc7ac619
Minor edit (comment).
2019-06-18 17:15:26 +03:00
9f45f93949
Added more `redirect_uri` checks to prevent redirect to not explicitly listed URI.
2019-06-18 17:00:49 +03:00
f30a3241d2
Deps: Update auto_linker
2019-06-18 16:08:18 +03:00
c7acca2abb
Mastodon API: Sanitize display names
...
Closes #1000
2019-06-18 14:12:11 +03:00
c4e4f7d0e4
Add proper error handling for when the post exceeds character limits
2019-06-18 05:05:05 +03:00
dce27de733
Mastodon API: Remove the dot hack
2019-06-18 05:04:41 +03:00
49a49d3763
Merge branch 'removing-test-errors' into 'develop'
...
Removing test errors
See merge request pleroma/pleroma!1296
2019-06-17 14:16:23 +00:00
c34327b22e
Merge branch 'fix/sanitize-report-content' into 'develop'
...
Sanitize HTML in ReportView
Closes #990
See merge request pleroma/pleroma!1293
2019-06-16 18:05:00 +00:00
0f59265a50
salmon fix
...
removed some ownership sandbox error
2019-06-16 20:10:12 +08:00
a04bf131e0
[ #570 ] add user:notification stream
2019-06-16 10:33:25 +00:00
bf6aa6f1a8
Fix report content stopping to be nullable
2019-06-16 13:06:12 +03:00
7a4228be5a
fix for new instances
2019-06-16 10:01:15 +00:00
44de34d170
Credo fixes
2019-06-16 01:35:45 +03:00
641bcaa44e
Sanitize HTML in ReportView
...
Closes #990
2019-06-16 01:30:32 +03:00
135c196769
Merge branch 'bugfix/980-polls-double-vote' into 'develop'
...
MastodonAPI Controller: Band-Aid double vote problem.
See merge request pleroma/pleroma!1275
2019-06-15 15:13:48 +00:00
37ee6c6e2c
Merge branch 'update/phoenix-and-plug' into 'develop'
...
Update Phoenix
See merge request pleroma/pleroma!1290
2019-06-15 15:09:14 +00:00
52b1b0e45d
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
...
[#963 ] No redirect on OOB OAuth authorize request with existing authorization
See merge request pleroma/pleroma!1276
2019-06-15 13:45:50 +00:00
9b908697dd
OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
...
and this leftover artifact breaks compiling now.
2019-06-15 07:04:01 -05:00
a440cf856d
Mastodon API: Return the token needed for the chat.
2019-06-15 10:59:35 +02:00
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
2019-06-14 16:49:28 +00:00
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
7f48b90bfb
Merge branch 'fix/hashtag-rich-media' into 'develop'
...
Fix hashtags being picked up by rich media parser
Closes #989
See merge request pleroma/pleroma!1288
2019-06-14 11:52:04 +00:00
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
2019-06-14 11:39:57 +00:00
d0ebc0edf3
Fix hashtags being picked up by rich media parser
...
Closes #989
2019-06-14 14:34:42 +03:00
58a094b605
Add copyright info to containment.ex
2019-06-14 09:26:36 +00:00
eac298083f
MastodonAPI: Add a way to update the background image.
2019-06-14 11:19:22 +02:00
b22b10d3aa
Improve rate limiter documentation
...
Documents how to disable rate limiting
2019-06-14 15:02:10 +07:00
315f090f59
Prometheus: Remove flaky process collection NIF.
2019-06-13 20:30:04 +02:00
5965efb216
AccountView: Add user background.
2019-06-13 19:08:05 +02:00
6f5a0cc14e
Merge branch 'fix/ogp-title' into 'develop'
...
Rich Media Parser: Attempt to use <title> from HTML as a fallback
Closes #979
See merge request pleroma/pleroma!1277
2019-06-13 13:26:39 +00:00
30e54fd7e2
Handle HTTP 404 response
2019-06-13 17:13:35 +07:00
afae3ada22
Handle HTTP "410 Gone" response
2019-06-13 16:34:03 +07:00
a12f8e13c8
Improve <title> fallback; Add a test
2019-06-13 15:02:46 +07:00
7363a0ea8a
Revert "Only run Floki if title is missing from the map"
...
This reverts commit 97d2b1a45a
2019-06-12 18:32:28 -05:00
97d2b1a45a
Only run Floki if title is missing from the map
2019-06-12 18:27:35 -05:00
097fdf6a5d
Attempt to use <title> from HTML as a fallback
2019-06-12 17:56:51 -05:00
4b2c29016c
[ #963 ] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
2019-06-12 21:30:06 +03:00
966543379d
MastodonAPI Controller: Band-Aid double vote problem.
2019-06-12 16:36:23 +02:00
f46c628e6b
Merge branch 'update_auto_linker' into 'develop'
...
Update `auto_linker` dependency
See merge request pleroma/pleroma!1272
2019-06-12 09:52:29 +00:00
817c66bc3e
Remove search result order for non-RUM indexes
2019-06-12 16:22:56 +07:00
bf22ed5fbd
Update `auto_linker` dependency
2019-06-12 15:53:33 +07:00
6f29865d43
Add option to restrict all users to local content
2019-06-11 21:25:53 +07:00
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
2019-06-11 11:32:01 +00:00
ad04d12de6
Replace `MastodonAPIController.account_register/2` rate limiter
2019-06-11 16:06:03 +07:00
bc8f059367
Add rate limiting for search endpoints
2019-06-11 14:28:39 +07:00
2e5affce61
Add RateLimiter
2019-06-11 14:27:41 +07:00
f2d72b1fe4
Merge branch 'preload-changes' into 'develop'
...
Conversations: Fetch users in one query.
See merge request pleroma/pleroma!1258
2019-06-11 02:37:08 +00:00
3ecfe2a6d4
Merge branch 'develop' into feature/releases
2019-06-09 13:55:32 +03:00
2a659b35f1
Add migrate/rollback to release tasks
2019-06-09 13:33:44 +03:00
7223c1b643
Use Mix.shell().yes? if available
2019-06-08 20:10:48 +03:00
d7ec0898e5
Make mix tasks work in a release
2019-06-08 17:40:40 +03:00
1e0fa899b6
Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'
...
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
See merge request pleroma/pleroma!1259
2019-06-08 10:22:15 +00:00
d020f68e87
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
2019-06-07 20:40:38 +03:00
970f71e222
Conversations: Fetch users in one query.
2019-06-07 17:51:47 +02:00
cb3258c863
Emoji: Use full path to check if a file is a directory.
2019-06-07 17:31:21 +02:00
d5330ed125
Merge branch 'fix/replace-mix-env' into 'develop'
...
Replace Mix.env with Pleroma.Config.get(:env)
See merge request pleroma/pleroma!1254
2019-06-07 10:58:09 +00:00
bc597d888c
Mix Tasks: Switch to Application.ensure_all_started instead of
...
Mix.Task.run and ensure serve_endpoints is set to false
In release environments there is no Mix.Task.run and serve_endpoints
must be set to true for the endpoints to start, so we need to ensure it
is set to false before starting Pleroma for executing a mix task.
2019-06-07 12:37:20 +03:00
01fe5abad1
Resolve conflicts
2019-06-07 01:20:50 +03:00
92213fb87c
Replace Mix.env with Pleroma.Config.get(:env)
...
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
2019-06-06 23:59:51 +03:00
62cdf701f4
Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'
...
Switch to manual Supervisor child specifications instead of Supervisor.Spec
See merge request pleroma/pleroma!1252
2019-06-06 14:54:29 +00:00
cb2bcee842
User Search: Boost friends more strongly.
2019-06-06 16:18:27 +02:00
9ae8f012a5
Switch to manual Supervisor child specifications instead of Supervisor.Spec
...
Supervisor.Spec is deprecated and causes warnings on Elixir master, see
https://hexdocs.pm/elixir/Supervisor.Spec.html
2019-06-06 16:37:44 +03:00
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
2019-06-06 12:17:49 +00:00
3f6da9c45a
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
...
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
2019-06-05 15:52:40 +00:00
a511d2f900
Merge branch 'improve-search' into 'develop'
...
[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
2019-06-05 15:51:32 +00:00
e1370ba131
Utils: Use update_follow_state_for_all when appropriate.
2019-06-05 16:51:28 +02:00
ad19bfc7fe
Utils: Split update_follow_state and update_follow_state_for_all.
2019-06-05 16:43:35 +02:00
076c9ae40e
User: Remove superfluous `maybe_follow`.
2019-06-05 14:24:31 +02:00
3115b64cfe
Transmogrifier: Add tests for incoming follows to locked accounts.
2019-06-05 14:10:46 +02:00
50afe5ab9e
Merge branch 'fix-stuck-follows' into 'develop'
...
User: Don't error out when following a user that's already followed.
See merge request pleroma/pleroma!1249
2019-06-05 11:07:54 +00:00
ddd4a09b72
Fix merge conflict
2019-06-05 17:55:00 +07:00
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 17:53:15 +07:00
024dfdc39c
Typo + Linting.
2019-06-05 12:45:28 +02:00
8b9a0dd4a7
User: Don't error out when following a user that's already followed.
...
This leads to a few situations where it is impossible to follow a user.
2019-06-05 12:06:45 +02:00
3eefb274f4
OAuth consumer: tests fix, comments, Keycloak config notes.
2019-06-05 13:02:13 +03:00
1cb245c982
Fix formatting
2019-06-05 16:55:17 +07:00
5b04f07a1e
Limit search for unauthenticated users to local users only
2019-06-05 16:51:04 +07:00
94b9e9d844
Update benchmark mix task
2019-06-05 16:37:43 +07:00
93397fce3d
Contain search for unauthenticated users
2019-06-05 16:37:43 +07:00
e4babb1c9f
Merge branch 'explicit-addressing' into 'develop'
...
Explicit addressing
See merge request pleroma/pleroma!1239
2019-06-05 08:28:20 +00:00
6ba9055b51
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 12:54:30 +07:00
b1b1a270e8
Fix conflict
2019-06-05 02:45:21 +03:00
ab4915edcb
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
...
Participations: Filter out participations without activities.
Closes #956 and #953
See merge request pleroma/pleroma!1246
2019-06-04 15:34:55 +00:00
18c35d84fd
NodeInfo: Add explicit addressing to nodeinfo.
2019-06-04 17:14:25 +02:00
1e7bb69a95
update ActivityPub#fetch_activities_query
2019-06-04 15:21:18 +03:00
d3d1704e84
Merge branch 'develop' into issue/941
2019-06-04 15:06:58 +03:00
0acfcf6c52
update ActivityPub#fetch_activities_query
2019-06-04 15:04:36 +03:00
a3a7178b60
Participations: Filter out participations without activities.
2019-06-04 13:58:36 +02:00
0eb7464c10
Merge branch 'emoji-loader-fix' into 'develop'
...
Emoji: Don't die when files are present in the emoji folder.
Closes #957
See merge request pleroma/pleroma!1245
2019-06-04 11:26:42 +00:00
17383861ed
Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities
2019-06-04 13:38:32 +03:00
e74581a5c4
Emoji: Don't die when files are present in the emoji folder.
2019-06-04 12:14:43 +02:00
29b022bb59
Restrict `get_existing_votes` to only get Create activities
2019-06-04 12:42:10 +03:00
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-04 16:28:23 +07:00
4cab98b7bf
Merge remote-tracking branch 'origin/develop' into explicit-addressing
2019-06-04 11:23:46 +02:00
37a4ba0624
utils: access inReplyTo as an explicit string when fetching poll results`
2019-06-04 08:45:03 +00:00
4f2e359687
Merge branch 'develop' into issue/941
2019-06-04 09:49:08 +03:00
1c6cf0a348
nodeinfo: add pollLimits to metadata
2019-06-04 06:19:44 +00:00
9f0d0d0805
Merge branch 'feature/mrf-subchain' into 'develop'
...
MRF: subchain policy
See merge request pleroma/pleroma!1233
2019-06-04 05:49:54 +00:00
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
2019-06-04 05:43:43 +00:00
3e17610587
Add task to test emails
2019-06-04 02:48:21 +03:00
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
f13d6c7f78
update api to set skip_thread_containment
2019-06-03 21:02:57 +03:00
f2c4c99e03
Remove repeated scope lists
2019-06-03 19:18:21 +03:00
80d4d83aac
CommonAPI: Add explicit addressing.
2019-06-03 18:17:08 +02:00
2b664b048e
User: Add function to get AP ids from nicknames.
2019-06-03 18:16:11 +02:00
243d8ed94e
Use workaround for the heavy checkmark symbol in iOS
2019-06-03 18:28:36 +03:00
f4e2595592
Merge branch 'develop' into update-oauth-template
2019-06-03 09:12:17 -05:00
080e1aa70e
add option skip_thread_containment
2019-06-03 16:13:37 +03:00
dc91bcc0af
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 13:16:17 +03:00
314758c25b
Merge branch 'align-mastodon-conversations' into 'develop'
...
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
2019-06-03 09:48:37 +00:00
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 11:14:52 +03:00
5bd41fef8b
Change query order in fetch_activities_for_context_query to make poll vote exclusion work
2019-06-03 10:58:37 +03:00
1fd8e19d76
Remove a TODO comment as the tests for poll view were written
2019-06-02 23:46:17 +03:00
2fe3a20638
Make error message about author's inability to vote more sensible
2019-06-02 23:33:15 +03:00
e3c460353d
Refresh the object in CommonAPI.vote instead of MastoAPI controller
2019-06-02 23:24:48 +03:00
561a21986d
formatting
2019-06-02 10:29:15 +00:00
4087ccdab8
mrf: add subchain policy
2019-06-02 10:07:42 +00:00
edf772d41e
mrf: allow a policy chain to be specified when filtering
2019-06-02 09:44:42 +00:00
52e09807d4
reverse proxy: clean up some @hackney leftovers
2019-06-02 09:09:58 +00:00
5402d04e3c
Merge branch 'feature/notification-control-part-2' into 'develop'
...
notification controls, part 2
See merge request pleroma/pleroma!1204
2019-06-02 08:25:37 +00:00
6bc9e5c020
Mastodon API: Refresh the object before rendering it after voting
2019-06-01 21:41:49 +03:00
444406167b
Mastodon API: actually check for poll votes
2019-06-01 21:41:23 +03:00
65db5e9f52
Resolve merge conflicts
2019-06-01 16:29:58 +03:00
300d94c628
Add poll votes
...
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
2019-06-01 16:17:46 +03:00
ad5263c647
Merge remote-tracking branch 'upstream/develop' into admin-create-users
2019-06-01 11:42:37 +05:45
5534d4c676
make bulk user creation from admin works as a transaction
2019-06-01 11:17:53 +05:45
e706b42f51
Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
...
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
See merge request pleroma/pleroma!1230
2019-06-01 03:39:13 +00:00
2bbc2a801f
Remove all follower collections but actor's from "cc"
2019-06-01 03:26:45 +00:00
f2efe24cf8
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
2019-06-01 03:24:08 +00:00
5d3ece2861
Remove now useless flavours switching
2019-06-01 01:44:10 +02:00
aa9f52edd2
mastodon_api_controller.ex: Remove vanilla from supported_flavours
2019-06-01 01:44:10 +02:00
6872c5f88f
Mastodon API search default value for "resolve" is false
...
https://docs.joinmastodon.org/api/rest/accounts/
https://docs.joinmastodon.org/api/rest/search/
2019-05-31 18:46:57 +00:00
2993361075
Merge branch 'hotfix/leaking-lists' into 'develop'
...
Mastodon API: Fix lists leaking private posts
See merge request pleroma/pleroma!1222
2019-05-31 13:26:48 +00:00
7861974ab2
MastodonAPI: Add extension to set and get pleroma_settings_store.
2019-05-31 14:50:18 +02:00
aaad85c4d9
AccountView: settings -> settings_store
2019-05-31 14:49:46 +02:00
eb2963bc43
User: Add settings store to Info, AccountView
...
This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.
2019-05-31 14:27:15 +02:00
d9c0650ff9
Mastodon API: Fix lists leaking private posts
...
Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).
Reported by @kurisu@iscute.moe via a DM
2019-05-31 15:25:17 +03:00
a9eaa55885
Fix fix_explicit_addressing moving follower collection to cc and add tests for it
2019-05-31 14:17:05 +03:00
97fb50d9fa
Mastodon Conversation API: Don't return own account in 'accounts'.
2019-05-31 11:27:14 +02:00
1690be991e
Replace missing non-nullable Card attributes with empty strings
2019-05-30 21:03:31 +00:00
91ac8b075b
Merge branch 'use-pleroma-config' into 'develop'
...
Use Pleroma.Config everywhere
See merge request pleroma/pleroma!1214
2019-05-30 13:16:08 +00:00
99f70c7e20
Use Pleroma.Config everywhere
2019-05-30 15:33:58 +07:00
6aec0d1b58
Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"
...
This reverts merge request !1209
2019-05-29 22:10:16 +00:00
5cee2fe9fe
Replace Application.get_env/2 with Pleroma.Config.get/1
2019-05-29 21:31:27 +03:00
e7edfd9fec
Permit fetching statuses from API with nickname or id
2019-05-29 12:20:18 -05:00
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
672fddb721
Default search limit should be 40
...
https://docs.joinmastodon.org/api/rest/search/
2019-05-29 08:06:26 -05:00
0159a6dbe9
router: require oauth_read for searching
...
Search calls are generally expensive and allow unauthenticated users to
crawl the instance for user profiles or posts which contain specified
keywords. An adversary can build a distributed search engine which not
only will consume significant instance resources, but also can be used
for undesirable purposes such as datamining.
Accordingly, require authenticated access to use the search API endpoints.
This acts as a nice balance as it allows guest users to make use of most
functionality available in Pleroma FE while ensuring that Pleroma
instances are reasonably protected from resource exhaustion. It also
removes Pleroma as a potential vector in distributed search engines.
2019-05-29 10:58:45 +00:00
9f3bcf0efe
Respect proxy settings federation
2019-05-28 06:49:53 +00:00
1452a96ad6
ability to set and reset avatar, profile banner and backgroud in Mastodon API
2019-05-27 15:31:01 +05:45
5bb843ceec
Merge branch 'refactor/die-httpoison-die' into 'develop'
...
remove @httpoison, @ostatus and @websub compile-time constants
See merge request pleroma/pleroma!1203
2019-05-26 13:33:11 +00:00
79503ce90f
mrf: simple policy: fix matching imported activitypub and ostatus statuses
2019-05-26 02:01:24 +00:00
750ede5764
notification: remove local/remote match rules (too complicated)
2019-05-26 00:05:47 +00:00
e7e2e7a1a6
user info: allow formdata for notification settings like every other API
2019-05-25 05:54:02 +00:00
59a703fcbe
twitter api: user view: expose user notification settings under pleroma object
2019-05-25 05:31:13 +00:00
4030837d91
notification: add non_follows/non_followers notification control settings
2019-05-25 05:19:47 +00:00
56fd7dbdd7
remove @websub and @ostatus module-level constants
2019-05-25 04:43:11 +00:00
9bec891eb4
kill @httpoison
2019-05-25 04:24:21 +00:00
9415932af5
Keep nodeinfo available when not federating
2019-05-25 08:15:12 +08:00
bbea5691da
Mention all people in the beginning of DM
2019-05-24 20:34:23 +00:00
f916e4cdd9
Move the Cache Control header test to its own file
...
We can consolidate our cache control header tests here
2019-05-24 20:33:55 +00:00
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-24 21:05:57 +07:00
8b2d39c1ec
Change the order of preloading when fetching activities for context
2019-05-23 14:03:16 +03:00
0c53d91f3b
fix merge conflict
2019-05-23 09:45:12 +02:00
e6b175ed6c
Fix credo issues
2019-05-22 21:57:46 +03:00
baf72d6c58
mrf: simple policy: add the ability to strip avatars and banners from user profiles
2019-05-22 18:53:12 +00:00
60f882b09f
activitypub: run user objects through MRF filters
2019-05-22 18:53:12 +00:00
75b6c4b004
mrf: defang policy modules for filtering user profile objects
2019-05-22 18:53:12 +00:00
ac7702f800
Exclude Answers from fetching by default
2019-05-22 21:52:12 +03:00
19c90d47c4
Normalize poll votes to Answer objects
2019-05-22 21:17:57 +03:00
54e10a3e55
Disable timeouts for object pruning query
2019-05-22 20:10:52 +03:00
620908a2db
[ #699 ] add worker to clean expired oauth tokens
2019-05-22 15:44:50 +00:00
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
2019-05-22 11:04:30 +00:00
ff363f70b5
Merge branch 'refactor/keys' into 'develop'
...
move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186
2019-05-22 06:28:16 +00:00
1344c85e2f
salmon: fix credo
2019-05-22 05:58:51 +00:00
cdac5efd10
Merge branch 'bugfix/account_view_source.note' into 'develop'
...
MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189
2019-05-22 05:39:01 +00:00
0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
2019-05-22 07:22:19 +02:00
17bfd000d7
Ability to reset avatar, profile banner and backgroud
2019-05-22 06:47:18 +02:00
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
2019-05-22 04:06:54 +00:00
ab6e15622b
Merge branch 'fix/api-fallback' into 'develop'
...
Do not fallback to index.html for /api/* routes
Closes #920
See merge request pleroma/pleroma!1182
2019-05-22 04:05:41 +00:00
9134848170
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
2019-05-22 04:04:20 +00:00
045803346d
move key generation functions into Pleroma.Keys module
2019-05-22 03:58:15 +00:00
a023ca004c
prune objects task: use Repo.delete_all()
2019-05-22 03:12:48 +00:00
3ab9255eda
Respond with a 404 Not implemented JSON error message
...
when requested API is not implemented
2019-05-22 07:15:52 +08:00
16b260fb19
add mix task to prune the object database using a configured retention period
2019-05-21 21:38:56 +00:00
73df9d690d
object: fetcher: add support for reinjecting pruned objects
2019-05-21 21:38:56 +00:00
c2b0b82e6a
object: add Object.prune()
2019-05-21 21:38:56 +00:00
63b0b7190c
MastoAPI: Add GET /api/v1/polls/:id
2019-05-21 20:40:35 +03:00
ff61d34502
Accept question objects for conversations
2019-05-21 17:33:54 +03:00
5f67c26baf
Accept strings in expires_in because sasuga javascript
2019-05-21 17:30:51 +03:00
0407ffe75f
Change validation error status codes to be more appropriate
2019-05-21 17:12:38 +03:00
ee68244141
Do not stream out poll replies
2019-05-21 16:58:15 +03:00
d7c4d029c8
Restrict poll replies when fetching activiites for context
2019-05-21 14:35:20 +03:00
f28747858b
Actual vote count in poll view
2019-05-21 14:27:09 +03:00
a53d062730
Fix posting non-polls from mastofe
2019-05-21 14:19:03 +03:00
aafe30d94e
Handle poll votes
2019-05-21 14:12:10 +03:00
3f96b3e4b8
Enforce poll limits and add error handling for MastodonAPI's post endpoint
2019-05-21 10:54:20 +03:00
76a7429bef
Add poll limits to /api/v1/instance and initial state
2019-05-21 09:13:10 +03:00
be6b57193a
Merge branch 'trivial/increase-hackney-timeouts' into 'develop'
...
http: bump connection timeout to 10 seconds
See merge request pleroma/pleroma!1183
2019-05-21 05:15:29 +00:00
c972d0bb14
http: bump connection timeout to 10 seconds
2019-05-21 04:59:15 +00:00
94caca924d
Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'
...
Fix prometheus-ecto error when not configured
Closes #917
See merge request pleroma/pleroma!1180
2019-05-21 01:36:06 +00:00
d4847b17ca
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
...
Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178
2019-05-20 23:30:19 +00:00
f96e9b28bb
Fix prometheus-ecto error when not configured
2019-05-21 07:30:18 +08:00
eb02edcad9
Add virtual :thread_muted? field
...
that may be set when fetching activities
2019-05-21 00:35:46 +08:00
daeae8e2e7
Move default mascot configuration to `config/`
2019-05-20 16:12:55 +01:00
3d0d9e7a56
Use string map for default mascot
2019-05-20 13:10:04 +01:00
e81f0fc6d4
Add mascot get/set tests
2019-05-20 12:58:06 +01:00
54e9cb5c2d
Add API endpoints for a custom user mascot
2019-05-20 12:39:23 +01:00
2375e9a95b
Add report filtering to MRF.SimplePolicy
2019-05-20 06:02:50 +08:00
6430cb1bf7
Restrict poll replies from fetch queries by default
2019-05-19 17:44:18 +03:00
1d90f9b969
Remove tags/mentions/rich text from poll options because Mastodon and
...
add custom emoji
2019-05-19 17:06:44 +03:00
5ece901af3
Resolve merge conflicts and remove IO.inspects
2019-05-18 13:37:38 +03:00
fd920c8973
Mastodon API: Add support for posting polls
2019-05-18 13:29:28 +03:00
8e9a764dfc
Merge branch 'feature/mrf-always-nsfw' into 'develop'
...
suppress link previews from posts marked sensitive
Closes #865
See merge request pleroma/pleroma!1173
2019-05-18 07:13:18 +00:00
c4a55e167a
add Changelog entry
2019-05-17 23:00:14 +00:00
dc08159538
also suppress link previews from posts marked #nsfw
2019-05-17 22:13:24 +00:00
290f5b2cfe
config: make sending the user agent configurable, disable sending the user agent in tests
2019-05-17 20:28:58 +00:00
d3b8cd342f
http: request builder: send user-agent when making requests
2019-05-17 19:04:17 +00:00
0da1233e8e
rich media: suppress link previews if post is marked as sensitive
2019-05-17 18:49:43 +00:00
78588dbd80
mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw
2019-05-17 18:49:10 +00:00
3b71612d3d
Improve Pleroma.Web.ActivityPub.ActivityPub.maybe_update_cc/3
2019-05-18 01:17:14 +07:00
075eecec90
Linting.
2019-05-17 18:32:30 +02:00
f959bf7aa6
MongooseIM: Add basic integration endpoints.
2019-05-17 18:21:11 +02:00
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-17 19:57:14 +07:00
f2936e0a07
Add `ap_id` to List
2019-05-17 19:56:37 +07:00
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
2019-05-17 12:26:59 +02:00
e5b34f5e05
Merge branch 'ecto_sql_update' into 'develop'
...
Dependencies: Update Ecto SQL.
See merge request pleroma/pleroma!1160
2019-05-17 10:21:38 +00:00
1dcdcd8871
Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
...
MastoAPI account_view.ex: requested is false when following is true
Closes #903
See merge request pleroma/pleroma!1169
2019-05-17 10:07:51 +00:00
46684db84d
Update account_view.ex
2019-05-17 09:53:44 +00:00
249b31ffe5
Fix specs.
2019-05-17 11:49:13 +02:00
642a67dd44
Render polls in statuses
2019-05-17 11:44:47 +03:00
7ed682213f
Fix/902 random compile failing
2019-05-17 07:25:20 +00:00
5c028b8f92
user creation admin api will create multiple users
2019-05-17 12:21:58 +05:45
68c75a08e8
MastoAPI account_view.ex: requested is false when following is true
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
2019-05-17 07:44:09 +02:00
70235ce840
Fix typo: s/"tags"/"tag"/g
2019-05-17 09:02:34 +08:00
bf84d50c76
Merge branch 'feature/890-add-report-uri' into 'develop'
...
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
2019-05-16 20:11:12 +00:00
2c303afc8b
Remove duplicated entries in users' following lists
2019-05-16 20:04:08 +00:00
e2b3a27204
Add Reports to Admin API
2019-05-16 19:09:18 +00:00
e190b3022b
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
...
Fix domain-unblocked reblogs
Closes #892
See merge request pleroma/pleroma!1157
2019-05-16 18:57:14 +00:00
efa61c1610
Move to pleroma.database mix task
2019-05-16 13:14:48 -05:00
ebb0482116
Merge branch 'develop' into conversations-import
2019-05-16 13:11:17 -05:00
fde30aee43
Merge branch 'feature/sql-thread-sat' into 'develop'
...
SQL thread visibility solver
See merge request pleroma/pleroma!971
2019-05-16 13:44:22 +00:00
73ae58fdfa
Feature/896 toggling confirmation
2019-05-16 13:23:41 +00:00
fc7246d715
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-16 17:54:24 +07:00
9d14214eb9
Merge branch 'develop' into feature/890-add-report-uri
2019-05-16 12:54:06 +07:00
aa11fa4864
add report uri and report to
2019-05-16 12:49:40 +07:00
c31026423c
publisher: use the correct queue name for outgoing federation
2019-05-16 04:41:27 +00:00
793f1834d2
Use named binding to conditionally join object
2019-05-16 06:25:14 +08:00
2b6119dfbf
Restrict reblogs of activities from blocked domains
2019-05-16 05:53:51 +08:00
62e42b03ab
Handle incoming Question objects
2019-05-15 20:10:16 +03:00
a591ab6112
activity pub: remove Ecto SQL query dumps
2019-05-15 16:56:46 +00:00
f09c3afdf5
chase test failures
2019-05-15 16:23:01 +00:00
0aada88b55
bbs: chase timeline containment patch
2019-05-15 16:02:15 +00:00
31db31c587
activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread
2019-05-15 15:54:10 +00:00
de114ffbb0
activitypub: remove contain_timeline()
2019-05-15 15:53:06 +00:00
0387f52138
activitypub: add restrict_thread_visibility()
2019-05-15 15:53:06 +00:00
f168a1cbdc
Merge remote-tracking branch 'origin/develop' into conversations-import
2019-05-15 17:47:29 +02:00
62516be9c4
Merge branch 'fix/public-option-not-working' into 'develop'
...
Fix public option not working
Closes #873
See merge request pleroma/pleroma!1143
2019-05-15 15:42:21 +00:00
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
2019-05-15 15:37:31 +00:00
7a92e701b9
CommonAPI: Visibility refactor.
2019-05-15 16:35:33 +02:00
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
2019-05-15 16:30:08 +02:00
f1e67bdc31
Search: Add optional rum indexing / searching.
2019-05-15 15:28:01 +02:00
ee22fff5ac
remove deprecated PleromaFE configuration
2019-05-15 15:29:59 +05:45
a7a8f3bc2c
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-15 14:31:24 +07:00
70c81b95d0
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
2019-05-15 05:09:32 +08:00
7b8dc99ef1
Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
2019-05-15 05:09:29 +08:00
071f78733a
switch to pleroma/http_signatures library
2019-05-14 20:03:13 +00:00
1caa6331ea
Group def perform() together to fix the build
2019-05-14 12:33:03 -05:00
fa4bd898f1
Merge branch 'fix/gopher' into 'develop'
...
gopher: fix rendering of post content (closes #895 )
Closes #895
See merge request pleroma/pleroma!1150
2019-05-14 15:41:37 +00:00
51325fd60c
gopher: fix rendering of post content ( closes #895 )
2019-05-14 15:35:06 +00:00
692919c7d2
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
...
use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142
2019-05-14 15:27:34 +00:00
ac3a3abf6b
clean up follow/block imports a little
2019-05-14 15:07:38 +00:00
dfd031c26a
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
...
Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148
2019-05-14 14:58:45 +00:00
52297920e7
Refactoring oauth response.
2019-05-14 14:49:45 +00:00
e82e73478e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-14 19:00:07 +07:00
b92c004ea8
Reuse query from User.restrict_deactivated/1
2019-05-14 18:29:10 +07:00
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
a18b2c0b12
Fix Pleroma.Config.get!/1 raising an error when value is false
2019-05-14 06:40:59 +08:00
bbacdf2352
Bump Mastodon API level
2019-05-13 15:52:16 -05:00
498bfdf403
Switch to Jason over Poison
2019-05-13 15:37:38 -05:00
69a9e0563c
user: migrate follow/blocks import to job queue
2019-05-13 19:36:00 +00:00
57d11ac9db
activitypub: move post rich media fetching to job queue
2019-05-13 19:36:00 +00:00
32d4630c9c
user: move initial post fetching to job queue
2019-05-13 19:36:00 +00:00
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
2019-05-13 18:58:04 +00:00
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
7701a4c841
Make irreversible field default to false in filters
2019-05-14 00:13:15 +05:45
786f2c7a84
Update shortdoc description
2019-05-13 11:16:54 -05:00
23276e8d68
Use pseudo ap id of a list in BCC
2019-05-13 16:15:14 +07:00
44b182732e
nodeinfo: gather supported protocol names from federation modules
2019-05-12 19:15:29 +00:00
28f7f4c6de
webfinger: build the response based on enabled federation modules
2019-05-12 19:05:03 +00:00
80759f012e
xml builder: properly escape quotes
2019-05-12 19:04:37 +00:00
55fa4b812a
federator: websub removal
2019-05-12 05:04:24 +00:00
Egor Kislitsyn
Ivan Tashkinov
Alexander Strizhakov
Maksim Pechnikov
Alex Gleason
rinpatch
lain
Haelwenn
Haelwenn (lanodan) Monnier
feld
kPherox
Mark Felder
eugenijm
Phil Hagelberg
Ivan Tashkinov
Roman Chvanikov
Hakaba Hitoyo
Maxim Filippov
Thomas Citharel
Sadposter
Alex Schroeder
kaniini
href
Steven Fuchs
William Pitcock
AkiraFukushima
Jill H.
Ekaterina Vaartis
Sergey Suprunenko
Thibaut Girka
KokaKiwi
Rachel Fae Fox
D Anzorge
shadowfacts
Sachin Joshi
Thibaut Girka
Thomas Sileo
Mike Verdone
RX14
Ivan Tashkinov
Moonman
kaniini
Roman Chvanikov
Roman Chvanikov
jeff
Aaron Tinio
