lain
c10485db16
StatusController: Ignore nil scheduled_at parameters.
2020-04-22 14:26:19 +02:00
lain
5102468d0f
Polls: Persist and show voters' count
2020-04-22 14:06:39 +02:00
lain
923513b641
Federator: Return proper values for jobs
2020-04-22 13:28:52 +02:00
lain
f719a5b23a
WebPush: Return proper values for jobs.
2020-04-22 13:28:34 +02:00
lain
2e62a63749
ChatMessageValidator: Validation changes
...
Don't validate if the recipient is blocking the actor.
2020-04-22 12:48:52 +02:00
lain
6c8390fa4d
ChatControllerTest: Credo fixes.
2020-04-21 18:32:30 +02:00
lain
66c2eb670b
ChatController: Validate parameters.
2020-04-21 18:23:00 +02:00
lain
97ad0c4597
Chats: Add API specs.
2020-04-21 17:51:06 +02:00
Ivan Tashkinov
f685cbd309
Automatic checks of authentication / instance publicity. Definition of missing OAuth scopes in AdminAPIController. Refactoring.
2020-04-21 16:29:19 +03:00
lain
a185b5455f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-21 14:24:27 +02:00
lain
3c828016d9
Merge branch 'openapi/custom-emojis' into 'develop'
...
Add OpenAPI spec for CustomEmojiController
See merge request pleroma/pleroma!2375
2020-04-21 10:13:50 +00:00
lain
5165287ff4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-21 12:00:33 +02:00
Ivan Tashkinov
bb5d0eafa4
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# CHANGELOG.md
2020-04-21 08:20:50 +03:00
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration
2020-04-20 20:37:56 +04:00
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
2020-04-20 10:15:40 -05:00
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
2020-04-20 10:11:06 -05:00
Egor Kislitsyn
736fead494
Merge branch 'develop' into openapi/account
2020-04-20 18:40:02 +04:00
lain
28165dad3a
Merge branch 'cleanup-subscription-controller' into 'develop'
...
Cleanup SubscriptionController
See merge request pleroma/pleroma!2393
2020-04-20 13:01:17 +00:00
Ilja
8b4de61d64
Fix ObjectAgePolicyTest
...
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
2020-04-20 12:59:16 +00:00
lain
b5df4a98e4
ChatMessageView: Support emoji.
2020-04-20 14:38:53 +02:00
lain
7e53da250e
ChatMessage: Support emoji.
2020-04-20 14:08:54 +02:00
lain
139b9d1338
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-20 12:37:17 +02:00
lain
970b74383b
Credo fixes.
2020-04-20 12:29:19 +02:00
lain
5b6818b3e5
CommonAPI: Obey local limit for chat messages.
2020-04-20 12:08:47 +02:00
lain
ce23673ca1
ChatMessageValidator: Don't validate messages that are too long.
2020-04-20 11:45:11 +02:00
rinpatch
918a8094fc
Merge branch '1559-follow-request-notifications' into 'develop'
...
[#1559 ] Support for "follow_request" notifications
Closes #1559
See merge request pleroma/pleroma!2354
2020-04-19 21:45:20 +00:00
Ivan Tashkinov
66f55106bd
[ #1682 ] Fixed Basic Auth permissions issue by disabling OAuth scopes checks when password is provided. Refactored plugs skipping functionality.
2020-04-17 21:21:10 +03:00
Egor Kislitsyn
163341857a
Improve OpenAPI errors
2020-04-17 19:27:22 +04:00
lain
c845820911
Notifications: Create a chat notification.
2020-04-17 16:55:01 +02:00
lain
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-17 15:51:24 +02:00
lain
26d9c83316
SideEffects: Test for notification creation.
2020-04-17 15:50:15 +02:00
lain
372614cfd3
ChatView: Add a mastodon api representation of the recipient.
2020-04-17 15:37:54 +02:00
Ivan Tashkinov
6e6f95c6ae
Merge remote-tracking branch 'remotes/origin/develop' into 1559-follow-request-notifications
...
# Conflicts:
# CHANGELOG.md
2020-04-17 16:23:58 +03:00
lain
d45ae64858
ChatController: Use OAuth scopes.
2020-04-17 13:04:46 +02:00
Alexander Strizhakov
6cda360fea
don't restart postgrex
2020-04-17 12:45:13 +03:00
Haelwenn
a17bfb5fab
Merge branch 'feature/1584-client-captcha-options' into 'develop'
...
Creating trusted app from adminFE & mix task
Closes #1584
See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00
Haelwenn
d8142ee6fe
Merge branch 'fix/1694-transfer-task-fix' into 'develop'
...
Fix for logger configuration
Closes #1694
See merge request pleroma/pleroma!2396
2020-04-17 09:02:10 +00:00
Haelwenn
9c76d70a47
Merge branch 'feature/1677-need_reboot-flag-endpoint' into 'develop'
...
Added need_reboot endpoint to admin api
Closes #1677
See merge request pleroma/pleroma!2373
2020-04-17 08:55:46 +00:00
Alexander Strizhakov
304ea09f4c
fix for logger configuration
2020-04-17 08:42:48 +03:00
rinpatch
badd888ccb
Merge branch 'authenticated-api-oauth-check-enforcement' into 'develop'
...
Enforcement of OAuth scopes check for authenticated API endpoints
See merge request pleroma/pleroma!2349
2020-04-16 21:58:57 +00:00
rinpatch
28bcde5d98
Merge branch 'fix/1691-feed-render' into 'develop'
...
Fix for use of `published` field from different entities
Closes #1691
See merge request pleroma/pleroma!2395
2020-04-16 18:38:58 +00:00
rinpatch
942d7467ca
Merge branch 'develop' into features/remove-user-source_data
2020-04-16 21:28:52 +03:00
lain
f8c3ae7a62
ChatController: Handle pagination.
2020-04-16 18:43:31 +02:00
lain
e983f70884
ChatMessagesHandling: Strip HTML of incoming messages.
2020-04-16 17:50:24 +02:00
Alexander Strizhakov
4d330d9df1
fix for use of published from different entities
2020-04-16 18:05:36 +03:00
rinpatch
252528a4b9
Merge branch 'refactor/remove-upgrade-changeset' into 'develop'
...
Remove User.upgrade_changeset in favor of remote_user_creation
See merge request pleroma/pleroma!2368
2020-04-16 14:59:11 +00:00
lain
41fdcb7282
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-16 15:28:08 +02:00
lain
ca598e9c27
AccountView: Return user ap_id.
2020-04-16 15:27:35 +02:00
lain
e2ced04917
ChatMessages: Better validation.
2020-04-16 15:21:47 +02:00
Alexander Strizhakov
72ef6cc4f2
added need_reboot endpoint to admin api
2020-04-16 16:03:26 +03:00
lain
3d4eca5dd4
CommonAPI: Escape HTML for chat messages.
2020-04-16 12:56:29 +02:00
Egor Kislitsyn
cf4ebba774
Cleanup SubscriptionController
2020-04-15 23:14:47 +04:00
Maksim Pechnikov
4b3b1fec4e
added an endpoint for getting unread notification count
2020-04-15 21:19:43 +03:00
Ivan Tashkinov
bde1189c34
[ #2349 ] Made :skip_plug/2 prevent plug from being executed even if explicitly called. Refactoring. Tests.
2020-04-15 21:19:16 +03:00
lain
6ace22b56a
Chat: Add views, don't return them in timeline queries.
2020-04-15 18:23:16 +02:00
Ivan Tashkinov
bedf92e064
Merge remote-tracking branch 'remotes/origin/develop' into authenticated-api-oauth-check-enforcement
2020-04-15 19:20:34 +03:00
lain
44bfb491ea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-15 14:41:43 +02:00
Alexander Strizhakov
22bde21c4f
remote_ip plug adds remote_ip_found flag
2020-04-15 15:27:34 +03:00
Ivan Tashkinov
0cda80f266
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
2020-04-14 20:10:02 +03:00
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
Egor Kislitsyn
247e6fcb90
Merge branch 'develop' into openapi/account
2020-04-14 19:45:22 +04:00
feld
bf3afbc1a1
Merge branch 'logger-configuration' into 'develop'
...
Fix for logger configuration through admin-fe
See merge request pleroma/pleroma!2365
2020-04-14 15:11:25 +00:00
Ivan Tashkinov
650853fc89
Merge remote-tracking branch 'remotes/origin/develop' into 1364-no-pushes-from-blocked-domains-users
...
# Conflicts:
# lib/pleroma/notification.ex
2020-04-14 11:58:38 +03:00
Haelwenn
60cc7d6c9a
Merge branch 'issue/1276' into 'develop'
...
[#1276 ] An endpoint for getting unread notification count
Closes #1276
See merge request pleroma/pleroma!1877
2020-04-14 06:38:56 +00:00
Egor Kislitsyn
4dca712e90
Add OpenAPI spec for DomainBlockController
2020-04-13 22:44:52 +04:00
Maksim Pechnikov
a16b3dbcbf
Merge branch 'develop' into issue/1276
2020-04-13 21:19:27 +03:00
Egor Kislitsyn
c28aaf9d82
Add OpenAPI spec for CustomEmojiController
2020-04-13 21:21:04 +04:00
Egor Kislitsyn
7e0b42d99f
Add specs for AccountController.mutes, AccountController.blocks, AccountController.mutes, AccountController.endorsements
2020-04-13 18:17:09 +04:00
Egor Kislitsyn
ab185d3ea4
Add spec for AccountController.follows
2020-04-13 18:17:09 +04:00
Egor Kislitsyn
68a979b824
Add specs for AccountController.block and AccountController.unblock
2020-04-13 18:17:08 +04:00
Egor Kislitsyn
e4195d4a68
Add specs for AccountController.mute and AccountController.unmute
2020-04-13 18:17:08 +04:00
Egor Kislitsyn
aa958a6dda
Add spec for AccountController.unfollow
2020-04-13 18:17:08 +04:00
Egor Kislitsyn
854780c72b
Add spec for AccountController.follow
2020-04-13 18:17:08 +04:00
Egor Kislitsyn
1b680a98ae
Add spec for AccountController.lists
2020-04-13 18:17:07 +04:00
Egor Kislitsyn
e105cc12b6
Add spec for AccountController.following
2020-04-13 18:17:07 +04:00
Egor Kislitsyn
bd6e2b300f
Add spec for AccountController.followers
2020-04-13 18:17:07 +04:00
Egor Kislitsyn
03124c96cc
Add spec for AccountController.statuses
2020-04-13 18:17:07 +04:00
Egor Kislitsyn
278b3fa0ad
Add spec for AccountController.show
2020-04-13 18:16:07 +04:00
Egor Kislitsyn
d7d6a83233
Add spec for AccountController.relationships
2020-04-13 18:16:07 +04:00
Egor Kislitsyn
ab400b2ddb
Add specs for ActorType and VisibilityScope
2020-04-13 18:16:07 +04:00
Egor Kislitsyn
260cbddc94
Add spec for AccountController.update_credentials
2020-04-13 18:16:07 +04:00
Egor Kislitsyn
f80116125f
Add spec for AccountController.verify_credentials
2020-04-13 17:38:59 +04:00
Egor Kislitsyn
b08ded6c2f
Add spec for AccountController.create
2020-04-13 17:38:59 +04:00
Egor Kislitsyn
dc8fa04192
Merge branch 'develop' into global-status-expiration
2020-04-13 14:12:51 +04:00
Ivan Tashkinov
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
Ivan Tashkinov
a21baf89d8
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
2020-04-13 09:16:51 +03:00
Alexander Strizhakov
a050f3e015
fix for logger configuration through admin-fe
2020-04-13 08:56:28 +03:00
Maksim Pechnikov
c5c09fc61b
fix mediaType of object
2020-04-13 07:02:57 +03:00
Alex Gleason
9a3c74b244
Always accept deletions through SimplePolicy
2020-04-12 20:26:35 -05:00
Ivan Tashkinov
c556efb761
[ #1364 ] Enabled notifications on followed domain-blocked users' activities.
2020-04-12 21:53:03 +03:00
rinpatch
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
rinpatch
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
Ivan Tashkinov
88b16fdfb7
[ #1364 ] Disabled notifications on activities from blocked domains.
2020-04-11 16:01:09 +03:00
Egor Kislitsyn
dd612f86ae
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-04-10 20:00:05 +04:00
lain
64c78581fe
Chat: Only create them for valid users for now.
2020-04-10 14:47:56 +02:00
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration
2020-04-10 14:20:48 +04:00
Egor Kislitsyn
cf2a0574e7
Merge branch 'develop' into fix/support-conversations-pagination
2020-04-10 14:18:57 +04:00
Haelwenn
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
Haelwenn (lanodan) Monnier
e89078ac2a
User: remove source_data
2020-04-10 06:20:03 +02:00
Haelwenn (lanodan) Monnier
3420dec494
Remove User.fields/1
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
62656ab259
User: Move inbox & shared_inbox to own fields
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
369c03834c
formatter: Use user.uri instead of user.source_data.uri
2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier
19eedb3d04
User: Move public_key from source_data to own field
2020-04-10 06:16:18 +02:00
lain
2cc6841424
ChatController: Basic message posting.
2020-04-09 17:18:31 +02:00
lain
e8fd0dd689
ChatController: Basic support for returning messages.
2020-04-09 16:59:49 +02:00
lain
68abea313d
ChatController: Add creation and return of chats.
2020-04-09 15:13:55 +02:00
Egor Kislitsyn
d545b883eb
Add /api/v1/notifications/:id/dismiss endpoint
2020-04-09 17:08:43 +04:00
lain
d35e114acd
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-09 13:25:27 +02:00
lain
8e637ae1a7
CommonAPI: Basic ChatMessage support.
2020-04-09 13:20:16 +02:00
lain
4b04785071
SideEffects: Extend ChatMessage test.
2020-04-09 12:46:33 +02:00
lain
2e78686686
SideEffects: Handle ChatMessage creation.
2020-04-09 12:44:20 +02:00
lain
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
Alexander Strizhakov
9795ff5b01
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
2020-04-09 10:17:50 +00:00
Alexander Strizhakov
365c34a7a9
Apply suggestion to test/web/admin_api/admin_api_controller_test.exs
2020-04-09 10:17:44 +00:00
lain
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
rinpatch
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
Ivan Tashkinov
3965772b26
[ #1559 ] Minor change (analysis).
2020-04-08 21:33:37 +03:00
Ivan Tashkinov
f35c28bf07
[ #1559 ] Added / fixed tests for follow / follow_request notifications.
2020-04-08 21:26:22 +03:00
lain
3775683a04
ChatMessage: Basic incoming handling.
2020-04-08 15:55:43 +02:00
rinpatch
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
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
2020-04-07 14:09:43 +03:00
kPherox
06471940e0
Apply suggestion to test/web/mastodon_api/controllers/account_controller/update_credentials_test.exs
2020-04-07 08:44:53 +00:00
lain
19335be24c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-06 17:50:31 +02:00
lain
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
lain
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
lain
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
Alexander Strizhakov
a43e055916
using another fn for file deletion
2020-04-06 14:27:20 +03:00
Alexander Strizhakov
b59ac37b2c
tests for emoji mix task
2020-04-06 11:13:59 +03:00
Ivan Tashkinov
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
Ivan Tashkinov
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
Ivan Tashkinov
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
2020-04-02 19:23:30 +03:00
lain
fd97b0e634
Chats: Basic implementation.
2020-04-02 15:19:09 +02:00
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
Egor Kislitsyn
23219e6fb3
Add OpenAPI
2020-04-01 23:13:08 +04:00
Alexander Strizhakov
2d64500a9d
error improvement for email_invite endpoint
2020-04-01 20:26:33 +03:00
Ivan Tashkinov
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
feld
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
2020-04-01 17:05:09 +00:00
Ivan Tashkinov
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
rinpatch
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
Alexander Strizhakov
94ddbe4098
restrict remote users from indexing
2020-04-01 09:57:12 +03:00
Haelwenn (lanodan) Monnier
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
2020-03-31 23:55:29 +02:00
Haelwenn (lanodan) Monnier
b30fb1f3bb
User: Fix use of source_data in profile_url/1
2020-03-31 23:54:20 +02:00
Haelwenn (lanodan) Monnier
2553400a66
Initial failing test statement against funkwhale channels
2020-03-31 23:54:20 +02:00
kPherox
dbf9d719f9
split test for update profile fields
2020-04-01 02:52:30 +09:00
lain
aebec1bac9
Validator Test: Small refactor.
2020-03-31 17:47:34 +02:00
Alexander Strizhakov
df5f89c0d6
test for default features and changelog entry
2020-03-31 18:22:25 +03:00
lain
643f15e77b
Validators: ObjectID is an http uri.
2020-03-31 16:11:38 +02:00
Alexander Strizhakov
b607ae1a1c
removing grouped reports admin api endpoint
2020-03-30 13:51:45 +03:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
Haelwenn
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
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
Ivan Tashkinov
be9d18461a
FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).
2020-03-28 18:49:03 +03:00
Ivan Tashkinov
dfbc05d496
Misc refactoring / tweaks (ThreadMute.exists?/2).
2020-03-27 08:01:03 +03:00
lain
0adaab8e75
Bump copyright dates.
2020-03-26 15:37:42 +01:00
Ivan Tashkinov
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
rinpatch
de62e633d3
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-25 18:00:24 +00:00
Ivan Tashkinov
ff1baae7e9
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-25 20:41:17 +03:00
Ivan Tashkinov
460e41585c
Further preloading (more endpoints), refactoring, tests.
2020-03-25 20:33:34 +03:00
Egor Kislitsyn
9081a071ee
Add a test for accounts/update_credentials
2020-03-25 18:46:17 +04:00
Ivan Tashkinov
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-25 09:05:17 +03:00
Ivan Tashkinov
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
2020-03-25 09:04:00 +03:00
Haelwenn (lanodan) Monnier
03a18cf037
node_info_test: Bump default features list
2020-03-24 20:39:19 +01:00
Haelwenn (lanodan) Monnier
212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
2020-03-24 20:32:49 +01:00
Haelwenn (lanodan) Monnier
64165d1df9
node_info_test.exs: Add test on the default feature list
2020-03-24 20:21:27 +01:00
Ivan Tashkinov
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-24 22:15:37 +03:00
Ivan Tashkinov
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
feld
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
lain
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
Egor Kislitsyn
4a2538967c
Support pagination in conversations
2020-03-24 20:18:27 +04:00
Egor Kislitsyn
d1a9716a98
Fix activity deletion
2020-03-24 17:38:18 +04:00
Egor Kislitsyn
3189c44a0c
Remove some TwitterAPI endpoints
2020-03-24 15:21:40 +04:00
lain
eec1fcaf55
Home timeline tests: Add failing test for relationships
2020-03-23 15:58:55 +01:00
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
Haelwenn (lanodan) Monnier
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
Egor Kislitsyn
fc2eb1fbd6
Fix formatter warnings
2020-03-20 22:16:57 +04:00
Egor Kislitsyn
80e1571610
Merge branch 'develop' into global-status-expiration
2020-03-20 22:08:34 +04:00
Alexander Strizhakov
7f9b5284fa
updating clear_config
2020-03-20 20:58:47 +03:00
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun
2020-03-20 20:47:54 +03:00
lain
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
Ivan Tashkinov
1c05f539aa
Improved in-test clear_config/n applicability (setup / setup_all / in-test usage).
2020-03-20 18:33:00 +03:00
Ivan Tashkinov
0e27c274f4
Merge remote-tracking branch 'remotes/origin/develop' into clear-config-test-improvements
...
# Conflicts:
# test/web/mastodon_api/controllers/account_controller_test.exs
2020-03-20 18:08:23 +03:00
lain
6c1232b486
NotificationController: Fix test.
2020-03-20 15:00:28 +01:00
lain
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-20 14:52:58 +01:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
2020-03-20 16:36:20 +03:00
Alexander Strizhakov
98a60df41f
include_types parameter in /api/v1/notifications
2020-03-20 13:18:12 +03:00
Haelwenn (lanodan) Monnier
a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
2020-03-19 19:25:50 +01:00
Haelwenn (lanodan) Monnier
c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR
2020-03-19 19:10:03 +01:00
lain
3c2c32b460
Merge branch 'remake-remodel' into develop
2020-03-19 18:00:55 +01:00
Haelwenn (lanodan) Monnier
f9d622d25a
WIP
2020-03-19 15:39:11 +01:00
Ivan Tashkinov
ec3719f539
Improved in-test config management functions.
2020-03-18 20:30:31 +03:00
Alexander Strizhakov
f9ecb513fa
Merge branch 'develop' into gun
2020-03-18 14:08:21 +03:00
Haelwenn (lanodan) Monnier
d3cf7e19fb
activity_pub_controller_test.exs: test posting with AP C2S uploaded media
2020-03-17 14:00:19 +01:00
Ivan Tashkinov
7438833685
[ #1364 ] Improved notification-related tests.
2020-03-16 21:58:10 +03:00
eugenijm
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
eugenijm
d198e7fa2a
Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password
2020-03-16 20:32:07 +03:00
Alexander Strizhakov
f3791add99
removing with_move parameter
2020-03-16 20:07:45 +03:00
Ivan Tashkinov
0e07c5ef57
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-16 17:58:42 +03:00
Egor Kislitsyn
5ad54d1bd5
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-16 16:31:15 +04:00
Alexander Strizhakov
3805e09b9c
Merge branch 'develop' into gun
2020-03-16 14:35:27 +03:00
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration
2020-03-16 15:31:31 +04:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
Alexander Strizhakov
dc2ec84c0f
warnings fix
2020-03-16 14:19:36 +03:00
Alexander Strizhakov
89e4b3ebbd
fix for content-type header for tag feed
2020-03-16 12:59:18 +03:00
Alexander Strizhakov
91870c8995
adding rss for user feed
2020-03-16 12:45:31 +03:00
Alexander Strizhakov
26e2076659
fix for feed page pagination
2020-03-16 12:33:55 +03:00
rinpatch
34fd1c2c9d
Merge branch 'bugfix/earmark_renderer_test' into 'develop'
...
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
See merge request pleroma/pleroma!2300
2020-03-15 20:04:31 +00:00
Haelwenn (lanodan) Monnier
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
lain
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
Ivan Tashkinov
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
Haelwenn
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
Haelwenn (lanodan) Monnier
dca21cd1d6
test/earmark_renderer_test.exs: Rename from test/earmark_renderer_test.ex
...
Wasn't in the test suite otherwise
2020-03-15 17:07:08 +01:00
Haelwenn
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
rinpatch
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
Ivan Tashkinov
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
rinpatch
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
rinpatch
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
rinpatch
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
rinpatch
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
Mark Felder
c6eb1c1b92
Merge branch 'develop' into fix/cache-control-headers
2020-03-13 12:54:06 -05:00
Mark Felder
db36b48180
Remove test verifying we preserve cache-control headers; we don't
2020-03-13 12:23:14 -05:00
Mark Felder
470090471d
Fix test to use new cache-control settings
2020-03-13 12:20:33 -05:00
rinpatch
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
Egor Kislitsyn
fffc382f13
Fix hashtags WebSocket streaming
2020-03-13 19:30:42 +04:00
Haelwenn (lanodan) Monnier
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
feld
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
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
2020-03-12 18:31:10 +03:00
Alexander Strizhakov
1306b92997
clean up
2020-03-12 18:29:07 +03:00
Egor Kislitsyn
d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-12 16:02:24 +04:00
Ivan Tashkinov
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
feld
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
rinpatch
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
feld
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
rinpatch
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
Alexander Strizhakov
282a93554f
merging release default config on app start
2020-03-11 16:25:53 +03:00
Haelwenn (lanodan) Monnier
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
Ivan Tashkinov
5b696a8ac1
[ #1560 ] Enforced authentication for non-federating instances in StaticFEController.
2020-03-11 14:05:56 +03:00
Ivan Tashkinov
972889550d
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-11 09:15:55 +03:00
Mark Felder
5af798f246
Fix enforcement of character limits
2020-03-10 13:08:00 -05:00
Alexander Strizhakov
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
Alexander Strizhakov
426f5ee48a
tesla adapter can't be changed in adminFE
2020-03-10 15:31:44 +03:00
Ivan Tashkinov
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
2020-03-09 20:51:44 +03:00
Maksim Pechnikov
edb659dc57
Merge branch 'develop' into issue/1276
2020-03-08 14:10:59 +03:00
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun
2020-03-07 12:41:37 +03:00
Alexander Strizhakov
9f884a2639
tests changes
2020-03-07 11:01:37 +03:00
Alexander Strizhakov
14678a7708
using stub instead expect
2020-03-07 10:12:34 +03:00
Alexander Strizhakov
56ff02f2ef
removing GunMock to use Mox
2020-03-06 20:23:58 +03:00
Ivan Tashkinov
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-06 11:48:30 +03:00
Ivan Tashkinov
40765875d4
[ #1560 ] Misc. improvements in ActivityPubController federation state restrictions.
2020-03-05 21:19:21 +03:00
Alexander Strizhakov
931111fd55
removing integration tests
2020-03-05 18:57:45 +03:00
Alexander Strizhakov
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
eugenijm
ad22e94f33
Exclude private and direct statuses visible to the admin when using godmode
2020-03-05 15:15:27 +03:00
lain
f1750b4658
Admin API tests: Fix wrong test.
2020-03-05 12:42:02 +01:00
lain
4bce13fa2f
MastodonController: Return 404 errors correctly.
2020-03-04 18:09:06 +01:00
Alexander Strizhakov
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
lain
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
Alexander Strizhakov
22d52f5691
same copyright date format
2020-03-04 09:41:23 +03:00
Alexander Strizhakov
6b2fb9160c
otp version
2020-03-04 09:23:42 +03:00
Mark Felder
d9c5ae7c09
Update Copyrights for gun related files
2020-03-03 17:16:24 -06:00
Mark Felder
4427161ca3
Merge branch 'develop' into gun
2020-03-03 17:15:49 -06:00
Mark Felder
5592db4757
Older copyright updates
2020-03-03 16:46:45 -06:00
Mark Felder
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
Ivan Tashkinov
b6fc98d9cd
[ #1560 ] ActivityPubController federation state restrictions adjustments. Adjusted tests.
2020-03-03 22:22:02 +03:00
Alexander Strizhakov
884d9710b2
refactoring for gun api modules
2020-03-03 19:24:14 +03:00
Alexander Strizhakov
23f407bf09
don't test gun itself
2020-03-03 18:57:16 +03:00
Alexander Strizhakov
f98ee730f0
adapter renaming to adapter_helper
2020-03-03 18:53:44 +03:00
Alexander Strizhakov
3723d72365
proxy parse tests fix
2020-03-03 17:32:59 +03:00
Alexander Strizhakov
7c0ed9302c
unnecessary mock
2020-03-03 16:46:20 +03:00
Alexander Strizhakov
e605e79df9
simplification of formatting host method
...
case for format_proxy method
2020-03-03 16:42:03 +03:00
Alexander Strizhakov
ee8071f0d5
removing unused method
2020-03-03 15:12:09 +03:00
Alexander Strizhakov
28ed4b41d0
naming for checkin from pool timeout
2020-03-03 13:05:28 +03:00
Alexander Strizhakov
4c8569d403
otp_version refactor
2020-03-03 12:21:10 +03:00
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun
2020-03-03 10:08:07 +03:00
Egor Kislitsyn
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-03 00:32:34 +04:00
Ivan Tashkinov
bd8624d649
[ #1560 ] Added tests for non-federating instance bahaviour to OStatusControllerTest.
2020-03-02 22:02:21 +03:00
Ivan Tashkinov
b4367125e9
[ #1560 ] Added tests for non-federating instance bahaviour to ActivityPubControllerTest.
2020-03-02 21:43:18 +03:00
Ivan Tashkinov
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-02 18:41:12 +03:00
Egor Kislitsyn
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
2020-03-02 15:35:49 +04:00
Haelwenn
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
Alexander Strizhakov
137c600cae
stop connections manually
2020-03-02 10:01:07 +03:00
Alexander Strizhakov
cc98d010ed
relay list shows hosts without accepted follow
2020-03-02 09:27:20 +03:00
Haelwenn (lanodan) Monnier
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
Haelwenn (lanodan) Monnier
6c0d869d9d
Bump copyright years of files changed after 2019-01-01
...
Done via the following command:
git diff 1e6c102b
2020-03-02 05:54:56 +01:00
Alexander Strizhakov
d9e4b77f8b
Merge branch 'develop' into gun
2020-03-01 12:48:49 +03:00
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction
2020-03-01 12:01:39 +03:00
rinpatch
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
rinpatch
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
Ivan Tashkinov
c747260989
[ #2250 ] Tiny refactoring per merge request review.
2020-02-29 22:04:09 +03:00
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun
2020-02-29 11:34:50 +03:00
feld
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
Ivan Tashkinov
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
2020-02-27 18:46:05 +03:00
Egor Kislitsyn
cb60a9c42f
Do not fail when user has no email
2020-02-27 17:27:49 +04:00
eugenijm
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
eugenijm
e2a6a40367
Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only)
2020-02-26 20:21:38 +03:00
Egor Kislitsyn
f446744a6a
Allow account registration without an email
2020-02-26 20:13:53 +04:00
feld
97dae77240
Merge branch 'token-web-push-test' into 'develop'
...
Add a test to ensure OAuth tokens are tied to Push subscriptions
Closes #1551
See merge request pleroma/pleroma!2241
2020-02-25 16:06:06 +00:00
Egor Kislitsyn
c495e6d387
Add a test to ensure OAuth tokens are tied to Push subscriptions
2020-02-25 18:04:28 +04:00
Alexander Strizhakov
3eccdd15aa
compile fix
2020-02-25 15:19:52 +03:00
Maksim Pechnikov
10f452ad1f
Merge branch 'develop' into issue/1276
2020-02-25 07:22:56 +03:00
rinpatch
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
rinpatch
5e4fe0e8f7
instance.gen task: fix crash when using custom static directory
...
Closes #1082
2020-02-24 23:42:24 +03:00
eugenijm
7ad5c51f23
Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope
2020-02-24 21:46:37 +03:00
Alexander Strizhakov
8efae966b1
open conn in separate task
2020-02-24 19:56:27 +03:00
lain
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
Haelwenn (lanodan) Monnier
f9fe6a9e30
Captcha: return invalid when answer_data is nil
2020-02-24 02:49:53 +01:00
Haelwenn (lanodan) Monnier
ee57663d34
captcha_test.exs: Use the same testing logic in Kocaptcha and native
2020-02-24 01:27:16 +01:00
Ivan Tashkinov
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
2020-02-22 19:48:41 +03:00
Ivan Tashkinov
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
Alexander Strizhakov
ad8f26c0a4
more info in Connections.checkin timout errors
2020-02-21 12:53:40 +03:00
Alexander Strizhakov
13918cb545
Merge branch 'develop' into gun
2020-02-21 10:02:37 +03:00
Haelwenn
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
Egor Kislitsyn
819cd46717
Auto-expire Create activities only
2020-02-20 22:04:02 +04:00
lain
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
lain
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
Ivan Tashkinov
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
2020-02-20 15:00:48 +03:00
lain
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
lain
cf4ecffcea
Merge branch 'tests-clear-config-tweaks' into 'develop'
...
Tweaks to `clear_config` calls in tests
See merge request pleroma/pleroma!2209
2020-02-20 11:36:48 +00:00
lain
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
2020-02-19 17:16:45 +01:00
Alexander Strizhakov
c9db0507f8
removing retry option and changing some logger messages levels
2020-02-19 12:26:57 +03:00
Mark Felder
138a3c1fe4
Spelling was wrong in test as well
2020-02-18 09:30:18 -06:00
Mark Felder
cf94349287
Merge branch 'develop' into gun
2020-02-18 09:06:27 -06:00
lain
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
Ivan Tashkinov
226f4d5ef9
Merge remote-tracking branch 'remotes/origin/develop' into tests-clear-config-tweaks
...
# Conflicts:
# test/web/admin_api/admin_api_controller_test.exs
2020-02-18 17:52:31 +03:00
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-18 17:46:09 +03:00
lain
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
Egor Kislitsyn
ca7ac068f0
Add a test
2020-02-18 17:09:50 +04:00
Alexander Strizhakov
514c899275
adding gun adapter
2020-02-18 08:19:01 +03:00
Maksim Pechnikov
28701c08ad
Merge branch 'develop' into issue/1276
2020-02-17 08:56:03 +03:00
rinpatch
472132215e
Use floki's new APIs for parsing fragments
2020-02-16 01:55:26 +03:00
Ivan Tashkinov
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
Haelwenn (lanodan) Monnier
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
Egor Kislitsyn
e2d358f1fb
Fix typo
2020-02-14 15:19:23 +04:00
Ivan Tashkinov
4f8c3462a8
Tweaks to clear_config calls in tests in order to prevent side effects on config during test suite execution.
2020-02-13 21:55:47 +03:00
Egor Kislitsyn
241a3d744a
Add ActivityExpirationPolicy
2020-02-13 22:27:10 +04:00
Maksim Pechnikov
6f9839c73c
Merge branch 'develop' into issue/1276
2020-02-13 20:43:34 +03:00
feld
b312c36b8e
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
...
# Conflicts:
# config/description.exs
2020-02-13 14:37:55 +00:00
Maksim Pechnikov
da44ee5b0f
Merge branch 'develop' into issue/1276
2020-02-13 09:20:34 +03:00
Egor Kislitsyn
19516af74e
Fix status.expires_in validation
2020-02-12 20:20:44 +04:00
Mark Felder
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
Egor Kislitsyn
58b2017aa0
Restore TwitterAPI tests
2020-02-12 00:51:05 +04:00
Egor Kislitsyn
50d9fcbe29
Hotlink logo instead of attachment
2020-02-11 23:33:05 +04:00
feld
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
rinpatch
ea1631d7e6
Make Floki use fast_html
2020-02-11 16:17:21 +03:00
lain
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
2020-02-11 13:58:36 +01:00
Egor Kislitsyn
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
2020-02-11 13:54:55 +04:00
Maksim Pechnikov
58574ef156
Merge branch 'develop' into issue/1276
2020-02-11 08:35:26 +03:00
Maksim Pechnikov
6813c0302c
Merge branch 'develop' into issue/1383
2020-02-10 20:49:20 +03:00
Ivan Tashkinov
b95dd5e217
[ #1505 ] Improved replies-handling tests: updated Mastodon message fixture, used exact Pleroma federation message.
2020-02-10 11:46:16 +03:00
Maksim Pechnikov
cd040691bd
maked unread_count as virtual field
2020-02-10 09:01:45 +03:00
Maksim Pechnikov
b87533760b
Merge branch 'develop' into issue/1276
2020-02-10 07:59:52 +03:00
Ivan Tashkinov
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests.
2020-02-09 17:34:48 +03:00
Ivan Tashkinov
7c3991f59e
[ #1505 ] Fixed replies serialization (included objects' ids instead of activities' ids).
2020-02-09 10:17:21 +03:00
Ivan Tashkinov
4e6bbdc7b5
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-08 19:59:37 +03:00
Ivan Tashkinov
d458f4fdca
[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
2020-02-08 19:58:02 +03:00
Alexander Strizhakov
dad23e3766
need_reboot flag
2020-02-08 13:00:02 +03:00
Haelwenn
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
Lain Soykaf
d85bcc8627
Questions: Add timezone to closed property
2020-02-07 16:57:46 +01:00
Lain Soykaf
4538a1ee01
EmojiReactions: Remove old API endpoints
2020-02-07 15:01:45 +01:00
Lain Soykaf
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
2020-02-07 14:52:13 +01:00
Egor Kislitsyn
bc2e98b200
Add User.get_follow_state/2
2020-02-07 16:17:34 +04:00
Lain Soykaf
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
feld
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
Egor Kislitsyn
8b9742ecf5
Cancellation of a follow request for a remote user
2020-02-06 18:02:33 +04:00
Alexander Strizhakov
c85aa6e87f
removing confusing error
2020-02-06 12:50:36 +03:00
rinpatch
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
Alexander Strizhakov
5db6ac8ee4
removing migrate_from_db endpoint from admin api
2020-02-05 20:36:21 +03:00
rinpatch
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
Egor Kislitsyn
8c71f7e11a
Add support for cancellation of a follow request
2020-02-05 20:22:15 +04:00
Ivan Tashkinov
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-05 07:56:36 +03:00
Maksim Pechnikov
2c40c8b4a2
Merge branch 'develop' into issue/1383
2020-02-03 21:42:36 +03:00
rinpatch
50f5a92021
fix not being able to pin polls
2020-02-02 14:55:06 +03:00
rinpatch
983a87175e
mastodon API: do not sanitize html in non-html fields
2020-02-02 14:46:32 +03:00
Roman Chvanikov
8057157ee3
Make attachments cleanup optional
2020-01-31 01:20:37 +03:00
rinpatch
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
rinpatch
5b62acf6e9
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
2020-01-30 22:16:55 +03:00
lain
01fb4dbeae
Emoji Reactions: Add fixtures
2020-01-30 16:26:45 +01:00
lain
a0d9d42eaa
Emoji Reactions: Actually use the validation.
2020-01-30 16:07:37 +01:00
feld
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
rinpatch
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
Haelwenn
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
Alexander Strizhakov
e7fee0d6fa
emoji api error on not writable dir
2020-01-29 15:31:34 +03:00
lain
7a60cd91ff
Merge branch 'fix-streaming-reblog' of git.pleroma.social:pleroma/pleroma into fix-streaming-reblog
2020-01-29 11:52:24 +01:00
lain
e2e9299b8e
Streamer Tests: code readability improvements
2020-01-29 11:50:49 +01:00
lain
b3a877d6c9
Emoji Reactions: Correctly handle deleted users
2020-01-29 11:43:36 +01:00
lain
a802e07241
Emoji Reactions: Add reacted field to emoji reactions
2020-01-29 11:39:06 +01:00
Alexander Strizhakov
1f4fbe9d98
title parse improvement
2020-01-29 11:13:34 +03:00
Maksim Pechnikov
ba5e8a6444
Merge branch 'develop' into issue/1276
2020-01-28 21:11:13 +03:00
Maksim Pechnikov
21a2a05407
Merge branch 'develop' into issue/1383
2020-01-28 20:39:20 +03:00
lain
cedee2793d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
2020-01-28 17:52:42 +01:00
lain
e8f22451da
Merge branch 'linkify-test-expansion' into 'develop'
...
Formatter: Add a test for domain / username clashes
See merge request pleroma/pleroma!2151
2020-01-28 16:51:29 +00:00
lain
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
lain
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
Alexander Strizhakov
7bd4c14581
meta tag parser respect first title header
2020-01-28 19:29:27 +03:00
lain
d385789a45
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
2020-01-28 17:06:36 +01:00
Haelwenn (lanodan) Monnier
4eb935be78
Create pleroma.email mix task
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
2020-01-28 16:49:38 +01:00
lain
e816edbb2f
Update streamer_test.exs
2020-01-28 15:42:05 +00:00
lain
77f24525ca
Streamer: Correctly handle reblog mutes
2020-01-28 16:40:44 +01:00
Alexander Strizhakov
33bd8fbffe
filename and test fixes
2020-01-28 18:02:11 +03:00
feld
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
Egor Kislitsyn
2ddd1bb088
Fix compatibility with Elixir v1.10
2020-01-28 18:23:59 +04:00
Roman Chvanikov
d18a2e4e36
Add test for custom base_url when deleting an attachment
2020-01-28 17:22:24 +03:00
lain
51283bf996
Formatter: Add a test for domain / username clashes
2020-01-28 13:38:21 +01:00
Maksim Pechnikov
be926863a8
fix test
2020-01-27 21:20:33 +03:00
Maksim Pechnikov
bcffa662dc
Merge branch 'develop' into feature/tag_feed
2020-01-27 21:13:13 +03:00
Hakaba Hitoyo
dabd535e43
Remove user recommendation by third party engine
2020-01-27 13:21:50 +00:00
Maksim Pechnikov
e442ea5722
Merge branch 'develop' into issue/1276
2020-01-27 15:20:47 +03:00
Maksim Pechnikov
bfc70fdf29
Merge branch 'develop' into issue/1383
2020-01-27 08:48:19 +03:00
Mark Felder
d770cffce0
Merge branch 'develop' into issue/1280
2020-01-26 11:23:05 -06:00
Alexander Strizhakov
ac97d01fb6
right test
2020-01-25 19:21:21 +03:00
Alexander Strizhakov
e93cc561cd
restarting pleroma from outside application
2020-01-25 18:42:04 +03:00
Ivan Tashkinov
86e4d23acb
[ #1505 ] Background fetching of incoming activities' replies collections.
2020-01-25 10:47:30 +03:00
Maksim Pechnikov
99c0a11c58
added atom feed
2020-01-24 22:12:23 +03:00
Maksim Pechnikov
055edd3d72
Merge branch 'develop' into feature/tag_feed
2020-01-24 21:46:57 +03:00
rinpatch
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
rinpatch
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
lain
347f3ed2c6
Emoji reactions: Change api format once more
2020-01-24 10:52:24 +01:00
Alexander Strizhakov
6a0f0ac4a2
fix for non existing atom
2020-01-24 12:22:26 +03:00
Maksim Pechnikov
293281fcbd
Merge branch 'develop' into feature/tag_feed
2020-01-24 08:58:07 +03:00
feld
a182d400d7
Merge branch 'fix_for_migrate_to_db_test' into 'develop'
...
Fix for migrate to db test
See merge request pleroma/pleroma!2133
2020-01-24 00:25:38 +00:00
Alexander Strizhakov
6cd2e851d9
parsing Swoosh modules
2020-01-23 18:21:29 +03:00
Alexander Strizhakov
4344c5d5b9
truncate config table on migrate to db task
2020-01-23 17:23:02 +03:00
Alexander Strizhakov
2bad25cf14
fix for migrate to db test
2020-01-23 15:13:27 +03:00
lain
34fc0ca053
Emoji reactions: Add sanity checks for the cache
2020-01-23 12:34:34 +01:00
Maksim Pechnikov
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
2020-01-23 11:42:10 +03:00
Maksim Pechnikov
5fc2fa8908
Merge branch 'develop' into issue/1383
2020-01-23 11:11:18 +03:00
Maksim Pechnikov
ce7c887a27
removed try/rescue
2020-01-23 11:05:08 +03:00
Haelwenn
dddebee047
Merge branch 'emoji-notifications' into 'develop'
...
Emoji notifications
See merge request pleroma/pleroma!2130
2020-01-23 02:12:03 +00:00
Mark Felder
e151dea276
Merge branch 'develop' into feature/new-registrations-digest
2020-01-22 15:59:24 -06:00
Mark Felder
ae78059ff4
Merge branch 'develop' into features/remote-follow-userpage-redirect
2020-01-22 15:05:39 -06:00
lain
615b72238e
Notifications: Add emoji reaction notifications
2020-01-22 20:06:12 +01:00
Ivan Tashkinov
cf96c40057
[ #1505 ] Added Mastodon-compatible replies collection to Note federated representation.
2020-01-22 21:10:17 +03:00
Maksim Pechnikov
cf19bf3c7c
Merge branch 'develop' into issue/1383
2020-01-22 20:20:39 +03:00
Egor Kislitsyn
5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest
2020-01-22 21:18:27 +04:00
feld
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
Egor Kislitsyn
b6f5b326e7
Fix credo warnings
2020-01-22 20:59:58 +04:00
Egor Kislitsyn
df0b8f1d08
Add new users digest email
2020-01-22 20:31:42 +04:00
rinpatch
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
lain
dd3fc50ea4
Emoji reactions: Change cache and reply format
2020-01-22 13:57:42 +01:00
Alexander Strizhakov
d5f8a88a37
support for updating env after settings deletion
2020-01-22 15:14:11 +03:00
Alexander Strizhakov
32a643a159
Merge branch 'develop' into admin-be
2020-01-22 11:22:31 +03:00
Maksim Pechnikov
b8d5c09f48
Merge branch 'develop' into issue/1383
2020-01-22 09:30:30 +03:00
Maksim Pechnikov
5ea8596448
Merge branch 'develop' into feature/tag_feed
2020-01-21 20:56:49 +03:00
Roman Chvanikov
22e94bb2c7
Merge branch 'develop' into fix/attachments-cleanup
2020-01-21 19:45:13 +03:00
Haelwenn (lanodan) Monnier
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
Alexander Strizhakov
f01ab6cd29
some refactor and tests
2020-01-21 18:42:00 +03:00
rinpatch
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
Alexander Strizhakov
503d966e9f
Merge branch 'develop' into admin-be
2020-01-21 10:32:27 +03:00
Alexander Strizhakov
dcae5914d1
fix for db key
2020-01-21 10:14:48 +03:00
Maksim Pechnikov
41e2332007
Merge branch 'develop' into feature/tag_feed
2020-01-21 09:23:35 +03:00
Maksim Pechnikov
6e88a7e591
exclude blocked user posts from search results
2020-01-21 07:40:13 +03:00
lain
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
2020-01-20 18:10:55 +01:00
Ivan Tashkinov
ca3b4de2c9
[ #1521 ] AdminApiControllerTest: fixed create report test (OAuth).
2020-01-20 20:04:25 +03:00
rinpatch
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
lain
4c5b5f14dc
StatusView: Add emoji_reactions
2020-01-20 16:24:20 +01:00
lain
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
lain
2199d63ddc
StatusControllerTest: Fix typo
2020-01-20 15:31:14 +01:00
lain
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
lain
510776ba31
CommonAPI: Don't error out on double favs/repeats
2020-01-20 14:27:59 +01:00
lain
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
lain
5fddf988ea
Pleroma API: emoji_reactions_by does not need authorization
2020-01-20 13:05:35 +01:00
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5
2020-01-20 12:17:14 +01:00
rinpatch
dc0498ab2b
Check for unapplied migrations on startup
...
Closes #1328
2020-01-20 12:20:26 +03:00
Roman Chvanikov
0f1fc382d0
Add test case for attachment deletion when non-map data.url present in DB
2020-01-19 22:04:14 +03:00
Roman Chvanikov
d6a532bf0f
Delete attachments asynchronously
2020-01-19 19:45:20 +03:00
Alexander Strizhakov
efb8ef5abe
releases support
2020-01-18 17:14:50 +03:00
Alexander Strizhakov
e699861690
full update for some subkeys
2020-01-18 12:25:56 +03:00
Alexander Strizhakov
89e93fb33f
return db key on update requests
2020-01-17 18:15:41 +03:00
Alexander Strizhakov
7676ed8239
some clean up
2020-01-17 16:28:44 +03:00
Maksim Pechnikov
108a39c876
updated error messages for authentication process
2020-01-17 15:01:37 +03:00
Alexander Strizhakov
60ba2339a2
saving to DB only added by user settings
2020-01-17 11:45:44 +03:00
Alexander Strizhakov
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
2020-01-16 08:50:27 +03:00
Maksim Pechnikov
a5db044e57
Merge branch 'develop' into feature/tag_feed
2020-01-15 19:11:13 +03:00
Ivan Tashkinov
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
2020-01-15 18:12:08 +03:00
lain
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
2020-01-15 14:29:56 +00:00
Alexander Strizhakov
59ba5c80b9
little cleanup
2020-01-15 17:10:33 +03:00
Egor Kislitsyn
023b7f605b
Fix notification controller test
2020-01-15 16:51:09 +04:00
Egor Kislitsyn
3849053c6a
Merge branch 'develop' into notifications-from-account
2020-01-15 16:49:45 +04:00
Maksim Pechnikov
c9f45edeac
Merge branch 'develop' into feature/tag_feed
2020-01-14 21:29:14 +03:00
Alexander Strizhakov
a9c7cd341b
Merge branch 'develop' into admin-be
2020-01-14 19:56:33 +03:00
Alexander Strizhakov
0d331f3d23
compilation warnings fix
2020-01-14 15:49:52 +03:00
Alexander Strizhakov
70c7a26de8
Merge branch 'develop' into admin-be
2020-01-14 14:52:00 +03:00
Maksim Pechnikov
b7908844f2
Merge branch 'develop' into issue/1383
2020-01-13 12:41:07 +03:00
Roman Chvanikov
88f0eed0f2
Delete attachments when status is deleted
2020-01-12 18:48:58 +00:00
feld
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
feld
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
Mark Felder
e64059d218
Assign token that can write to follows
2020-01-12 12:14:09 -06:00
Mark Felder
2f5b8fbeb3
Merge branch 'develop' into issue/1354
2020-01-12 12:12:15 -06:00
feld
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
Hakaba Hitoyo
0c9c62509d
Remove MDII uploader
2020-01-11 17:19:54 +00:00
Alexander Strizhakov
1630ecaa20
Merge branch 'develop' into admin-be
2020-01-11 12:15:42 +03:00
Alexander Strizhakov
d933fd3d61
more renamings
2020-01-10 19:51:32 +03:00
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
2020-01-10 19:34:19 +03:00
Ivan Tashkinov
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
lain
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
Alexander Strizhakov
88a16bb9fc
deep merge in config update
2020-01-10 15:52:02 +03:00
Alexander
c841174de8
flag for delete fix
2020-01-10 15:52:02 +03:00
Alexander
0b02040327
little fixes and typos fix
2020-01-10 15:52:02 +03:00
Alexander
9c1f3bfeff
fixes for logger backends
2020-01-10 15:52:01 +03:00
Alexander
cda2c1fc63
fix for subgroup tuple
...
added settings for swoosh adapters local
2020-01-10 15:52:01 +03:00
Alexander
063ab6d911
logger backends fix
2020-01-10 15:52:01 +03:00
Alexander
583cee4607
parsing proxy url setting
2020-01-10 15:52:01 +03:00
Alexander
e412d2f152
test fixes after rebase
2020-01-10 15:52:00 +03:00
Alexander
fea734ca70
errors on endpoints
2020-01-10 15:52:00 +03:00
Alexander
5cacb988b9
partially settings update
2020-01-10 15:52:00 +03:00
Alexander
0656816c77
tests for setttings without an explicit key
2020-01-10 15:51:59 +03:00
Alex S
2753285b77
config editing through database
2020-01-10 15:51:59 +03:00
Ivan Tashkinov
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
Maksim Pechnikov
70410dfafd
fix create service actor
2020-01-08 16:40:49 +03:00
eugenijm
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
Maksim Pechnikov
fa7d8e77e6
fixed Metadata.Utils.scrub_html_and_truncate
2020-01-03 16:28:13 +03:00
Ivan Tashkinov
badd0a96ea
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
2020-01-02 13:03:33 +03:00
Maksim Pechnikov
933dc12043
added code of mr#2067
2019-12-25 15:12:43 +03:00
Maksim Pechnikov
385356aad0
fix oauth scopes for AdminApi#reports_update
2019-12-24 20:51:52 +03:00
Maksim Pechnikov
969769730e
update tests
2019-12-23 17:12:55 +03:00
Maksim Pechnikov
bdd71669da
update test
2019-12-22 21:21:31 +03:00
Maksim Pechnikov
5b84156013
moved remote follow in separate controller
2019-12-21 21:27:42 +03:00
Maksim Pechnikov
54c9db38c8
Merge branch 'develop' into issue/1383
2019-12-21 20:38:59 +03:00
rinpatch
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
Maxim Filippov
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
2019-12-21 11:41:19 +00:00
Mark Felder
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
2019-12-20 16:32:04 -06:00
feld
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
Maxim Filippov
4079d66f00
Expose issue via failing test
2019-12-19 19:47:36 +03:00
Ivan Tashkinov
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
2019-12-19 17:24:08 +03:00
Ivan Tashkinov
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
2019-12-19 17:23:27 +03:00
Egor Kislitsyn
34d85f8a54
Return 404 if account to filter notifications from is not found
2019-12-19 20:45:44 +07:00
Egor Kislitsyn
775212121c
Verify HTTP signatures only when request accepts "activity+json" type
2019-12-19 20:17:18 +07:00
Egor Kislitsyn
432b3067d4
Do not crash when remote user follower and following counters are hidden
2019-12-19 19:26:46 +07:00
Maxim Filippov
404a9ccb9a
Stats: return status counts by scope
2019-12-18 23:17:34 +03:00
Maksim Pechnikov
b53573a837
add tag feeds
2019-12-18 09:19:37 +03:00
Thomas Citharel
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
Egor Kislitsyn
6c39fa20b1
Add support for account_id param to filter notifications by the account
2019-12-17 17:00:46 +07:00
Maxim Filippov
45180d4c60
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
2019-12-17 12:36:56 +03:00
Egor Kislitsyn
8f79f433bc
Hide follower counter when hiding is activated
2019-12-17 13:34:07 +07:00
Maksim Pechnikov
a879c396bb
Merge branch 'develop' into feature/tag_feed
2019-12-17 09:24:08 +03:00
minibikini
e1fa8c11a9
Apply suggestion to test/plugs/http_signature_plug_test.exs
2019-12-16 18:39:59 +00:00
Egor Kislitsyn
a12b6454bb
Add an option to require fetches to be signed
2019-12-16 22:24:03 +07:00
rinpatch
eae65e3216
formatting
2019-12-16 01:37:33 +03:00
rinpatch
6ffbfdeeb2
tests: significantly reduce streamer timeout
...
there is no reason IPC between two processes on the same node should
take 4 seconds
2019-12-16 01:22:01 +03:00
rinpatch
54029fe212
tests: remove a useless sleep in rate limiter tests
...
It was used to check that authenticated and unauthenticated users have
different limits. Instead of sleeping a super low limit for
unauthenticated users was set, preventing them from doing 5 requests in
the first place.
2019-12-16 01:03:13 +03:00
rinpatch
137a3d220b
tests: remove a useless 1 second sleep
...
there is no need to wait for the task to finish, it will be deleted
when the transaction is aborted anyway.
2019-12-16 00:51:59 +03:00
rinpatch
814a99c80f
tests: remove a useless 3 second sleep
...
the ids favs use are accurate down to a microsecond, there is no need
for it
2019-12-16 00:50:39 +03:00
rinpatch
c8046e1080
tests: Replace 2 second sleep with offseting updated_at
2019-12-16 00:50:15 +03:00
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
2019-12-15 22:32:42 +03:00
Maksim Pechnikov
67cb46e15d
Merge branch 'develop' into issue/1383
2019-12-14 21:44:10 +03:00
Maxim Filippov
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
2019-12-14 03:06:43 +03:00
Egor Kislitsyn
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-13 01:51:52 +07:00
lain
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
Ivan Tashkinov
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
Egor Kislitsyn
e536796984
Add native captcha and enable it by default.
2019-12-12 17:39:39 +07:00
Maxim Filippov
3ecf131511
Merge branch 'develop' into feature/report-notes
2019-12-12 02:16:23 +03:00
Mark Felder
9ef912aecf
Merge branch 'develop' into issue/1411
2019-12-11 15:02:53 -06:00
rinpatch
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
Ivan Tashkinov
3920244be5
[ #1427 ] Fixed :admin option handling in OAuthScopesPlug, added tests.
2019-12-11 11:42:02 +03:00
Sadposter
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-10 16:54:25 +00:00
Sadposter
5abee19b63
make analysis happy
2019-12-10 16:50:58 +00:00
Sadposter
19d228cc58
modify SQL to include followed-but-domain-blocked activities
2019-12-10 16:40:12 +00:00
minibikini
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:38:25 +00:00
lain
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:34:54 +00:00
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
2019-12-10 08:55:14 +03:00
Maksim Pechnikov
9dfaa0b832
fix loads config variable with large value from db
2019-12-09 22:29:44 +03:00
rinpatch
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
rinpatch
f4b7f32d51
status search: prefer the status fetched by url over other results
2019-12-09 20:45:04 +03:00
Egor Kislitsyn
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-10 00:16:43 +07:00
Maksim Pechnikov
2b821036c4
Merge branch 'develop' into issue/1383
2019-12-09 19:41:43 +03:00
lain
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
Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
2019-12-08 21:25:26 +03:00
Maksim Pechnikov
6fbafb1cdc
Merge branch 'develop' into issue/1276
2019-12-08 20:14:28 +03:00
Maksim Pechnikov
5876a9cb79
Merge branch 'develop' into issue/1383
2019-12-08 19:52:46 +03:00
rinpatch
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
rinpatch
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
Maxim Filippov
cc36a8ea90
Fix test
2019-12-08 11:35:38 +03:00
Maxim Filippov
a7f77785c2
Implement report notes destruction
2019-12-08 11:27:23 +03:00
Ivan Tashkinov
1770602747
[ #1427 ] Extra check that admin OAuth scope is used by admin. Adjusted tests.
2019-12-07 17:49:53 +03:00
Ivan Tashkinov
40e1817f70
[ #1427 ] Fixes / improvements of admin scopes support. Added tests.
2019-12-06 20:33:47 +03:00
rinpatch
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
lain
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
2019-12-06 14:25:13 +01:00
Egor Kislitsyn
a75d4a41e0
Add a test for custom runtime modules
2019-12-06 17:05:09 +07:00
Maxim Filippov
08c89fd2b8
Fix incorrect report count
2019-12-06 17:17:24 +09:00
Maksim Pechnikov
22fc271e23
init tag feed
2019-12-06 09:33:40 +03:00
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
2019-12-06 00:26:31 +03:00
Ivan Tashkinov
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
rinpatch
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
2019-12-06 00:12:21 +03:00
rinpatch
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
2019-12-05 21:45:57 +03:00
lain
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
feld
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
Maksim Pechnikov
3fe7a1fd35
Merge branch 'develop' into issue/1342
2019-12-05 15:46:27 +03:00
lain
1993d7096d
Validators: Add a type for the datetime used in AP.
2019-12-05 12:33:06 +01:00
Maksim Pechnikov
49bb0a130f
Merge branch 'develop' into issue/1276
2019-12-05 12:22:19 +03:00
Maksim Pechnikov
e21afdb7c7
Merge branch 'develop' into issue/1411
2019-12-05 12:18:59 +03:00
Egor Kislitsyn
d4953474ac
Merge branch 'develop' into improve-move-notificaions-api
2019-12-05 14:55:48 +07:00
Maxim Filippov
4453a9cb73
Add failing test, which exposes a bug
2019-12-05 12:07:53 +09:00
Maksim Pechnikov
3c3bba0b7c
fix ScheduledActivity
2019-12-04 21:18:05 +03:00
Ivan Tashkinov
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
lain
e9993acdbb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-12-04 16:35:59 +01:00
Maksim Pechnikov
c0d572d0bf
added test
2019-12-04 17:28:57 +03:00
Maksim Pechnikov
680e071dba
Merge branch 'develop' into issue/1383
2019-12-04 16:31:45 +03:00
lain
24599c519f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/1455-chat-character-limit
2019-12-04 14:25:00 +01:00
Maksim Pechnikov
ed7f850ad2
fix test
2019-12-04 16:22:01 +03:00
lain
aa97fe8f17
ChatChannel: Ignore messages that are too long.
2019-12-04 12:48:34 +01:00
Maksim Pechnikov
29a98b86b7
Merge branch 'develop' into issue/1383
2019-12-04 09:34:44 +03:00
Maksim Pechnikov
652cc6ba4b
updated ScheduledActivity
2019-12-04 09:12:17 +03:00
Maxim Filippov
4b60d41db9
Add report notes
2019-12-04 00:26:37 +09:00
Egor Kislitsyn
624e720aa4
Add with_move query param to the notifications API
2019-12-03 22:13:38 +07:00
lain
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
Maksim Pechnikov
88f7cf51d4
Merge branch 'develop' into issue/1411
2019-12-01 16:18:16 +03:00
rinpatch
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
kPherox
1915b23e72
test missing first field
2019-11-30 15:43:12 +09:00
Egor Kislitsyn
a98cda7758
Fix Pleroma.HTML.extract_first_external_url/2
2019-11-29 15:49:35 +07:00
Ivan Tashkinov
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
Maksim Pechnikov
04a8ffbe84
added privacy option to push notifications
2019-11-28 22:13:11 +03:00
Maksim Pechnikov
a52da55eb9
added User.NotificationSetting struct
2019-11-28 22:08:30 +03:00
Maksim Pechnikov
b7c449118b
Merge branch 'develop' into issue/1383
2019-11-28 21:27:01 +03:00
lain
98990d2d61
Merge branch 'fed-testing-updates' into 'develop'
...
Add federated test infrastructure
See merge request pleroma/pleroma!2014
2019-11-28 14:34:07 +00:00
lain
8627fb0bb5
Merge branch 'cleanup-tests-output' into 'develop'
...
Cleanup tests output
See merge request pleroma/pleroma!2018
2019-11-28 12:19:15 +00:00
Sadposter
c7cc80a9ee
obligatory format commit
2019-11-28 10:40:50 +00:00
Sadposter
fa97eddf8a
make follows take precedence over domain blocks
2019-11-28 10:38:38 +00:00
Egor Kislitsyn
c4b468a95b
Cleanup tests output
2019-11-28 16:44:48 +07:00
Maksim Pechnikov
1403a1441d
added tests
2019-11-28 09:02:23 +03:00
Maxim Filippov
fcabcab443
Fetch account from report, not from status (it might be deleted)
2019-11-28 00:09:00 +09:00
Maxim Filippov
5135656f57
Handle reopened reports with deleted statuses
2019-11-27 22:54:12 +09:00
lain
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
lain
f36724efb1
User: Never return nil for user follower counts.
2019-11-27 14:13:36 +01:00
Maksim Pechnikov
a4f834a687
moved DigestEmail to Oban Periodic jobs
2019-11-27 15:59:13 +03:00
Egor Kislitsyn
f595cfe623
Remove User.user_info/2
2019-11-27 19:43:47 +07:00
Egor Kislitsyn
1fc28a4b44
Add a view for the move notification
2019-11-27 17:52:02 +07:00
Maksim Pechnikov
c5766a8100
moved ActivityExpiration to Oban Periodic jobs
2019-11-27 13:36:03 +03:00
Maksim Pechnikov
6f202a401b
moved ScheduledActivity to Oban Periodic jobs
2019-11-27 09:26:37 +03:00
stwf
bd1984f054
update tests and Oban
2019-11-26 15:24:34 -05:00
lain
717d246491
Tests: Don't run federated tests by default
2019-11-26 15:03:16 -05:00
Chris McCord
f01881e82a
Add federated test infrastructure
2019-11-26 15:01:35 -05:00
Maksim Pechnikov
ac3abb5414
moved Pleroma.Stats to Oban Periodic jobs
2019-11-26 10:54:30 +03:00
Ivan Tashkinov
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
Maxim Filippov
5869a43fe7
Fix tests
2019-11-26 01:06:54 +09:00
Maxim Filippov
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
2019-11-26 00:25:43 +09:00
lain
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
Maxim Filippov
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
rinpatch
4b10804f21
OStatus controller: don't serve json at /notice/, redirect instead
2019-11-25 17:55:17 +03:00
rinpatch
02f7383891
ActivityPub controller: do not render remote users
2019-11-25 17:19:33 +03:00
feld
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
Sadposter
d3656c2725
add ability to set a custom user-agent string
2019-11-25 09:53:11 +00:00
Maxim Filippov
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-25 01:46:18 +09:00
Maxim Filippov
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-25 01:43:11 +09:00
Maxim Filippov
2b341627da
Admin API: Render whole status in grouped reports
2019-11-25 00:04:29 +09:00
Ivan Tashkinov
1636cc5b7e
Removed users.info and remaining usages.
2019-11-23 14:06:19 +03:00
lain
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
Ivan Tashkinov
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
lain
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
Egor Kislitsyn
d38ab4bb89
Fix user.following_count
2019-11-21 16:31:13 +07:00
Ivan Tashkinov
4f88b1b435
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-20 15:47:11 +03:00
Ivan Tashkinov
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
2019-11-20 15:46:11 +03:00
Egor Kislitsyn
63711258ce
Fix sporadically failing test
2019-11-20 14:25:00 +07:00
Ivan Tashkinov
565f261338
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-19 23:22:47 +03:00
Ivan Tashkinov
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
Maksim Pechnikov
708fd234bd
fix order favorites activites
2019-11-19 20:19:41 +03:00
Maxim Filippov
b88dbc17c8
Fix tests
2019-11-19 22:50:24 +09:00
Maxim Filippov
46eb160135
AdminAPI: Confirm user account, resend confirmation email
2019-11-19 20:14:02 +09:00
Egor Kislitsyn
36686f5245
Support authentication via x-admin-token HTTP header
2019-11-19 15:58:20 +07:00
Maksim Pechnikov
7d727dbfec
added test
2019-11-18 22:32:43 +03:00
Ivan Tashkinov
3aaf3aa2c2
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-18 20:43:19 +03:00
kaniini
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
Maksim Pechnikov
b9041c2097
added recount unread notifications to markers
2019-11-15 22:46:58 +03:00
Ivan Tashkinov
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-15 21:40:14 +03:00
Ivan Tashkinov
c31ddce51e
[ #1335 ] Reorganized users.mutes as relation to UserMute entity.
2019-11-15 21:38:54 +03:00
kPherox
c9a06b14ab
Add test
2019-11-15 23:55:28 +09:00
rinpatch
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
Ariadne Conill
7c59bc9ef9
fix credo
2019-11-14 20:18:45 -06:00
Ariadne Conill
5705cf0e3e
MRF: add ObjectAgePolicy which deals with old posts being imported
2019-11-14 19:48:10 -06:00
Maxim Filippov
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-14 23:45:29 +09:00
Maxim Filippov
30af5da330
Admin API: list all statuses from a given instance
2019-11-14 23:44:07 +09:00
feld
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
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
rinpatch
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
2019-11-14 08:47:10 +00:00
Phil Hagelberg
3c60adbc1f
Support redirecting by activity UUID in static FE as well.
2019-11-13 08:22:11 -08:00
Phil Hagelberg
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
lain
60cc5a7750
Merge branch 'fix-rate-limiter-test' into 'develop'
...
Fix random fails of the rate limiter tests (hopefully)
See merge request pleroma/pleroma!1978
2019-11-13 14:27:37 +00:00
Egor Kislitsyn
72cf6a76f4
Fix random fails of the rate limiter tests
2019-11-13 18:07:53 +07:00
lain
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
Phil Hagelberg
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
Egor Kislitsyn
27cd1374e3
Add a notification for Move activities
2019-11-12 18:48:14 +07:00
Egor Kislitsyn
e6d7e27bd6
Add allow_following_move setting to User
2019-11-12 18:45:28 +07:00
lain
e835cd97f6
Containment: Add a catch-all clause to contain_origin.
2019-11-12 12:07:17 +01:00
eugenijm
f86a7d5d8b
Fix exclude_visibilities filter for followers-only Like notifications
2019-11-11 23:57:30 +03:00
feld
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
kaniini
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
2019-11-11 19:10:44 +00:00
href
b39b49cc14
report federating status in nodeinfo
2019-11-11 19:03:43 +01:00
lain
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
lain
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
Steven Fuchs
94627baa5c
New rate limiter
2019-11-11 12:13:06 +00:00
lain
f6056e9c9c
UserEnabledPlug: Don't authenticate unconfirmed users.
2019-11-11 12:43:46 +01:00
lain
8521553ad9
User: Don't let deactivated users authenticate.
2019-11-11 12:37:38 +01:00
Maxim Filippov
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-11 19:18:12 +09:00
Alexander
6a4201e0b4
fix for migrate task
2019-11-10 22:54:37 +03:00
Ivan Tashkinov
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
2019-11-10 16:30:21 +03:00
lain
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-11-10 11:32:50 +00:00
lain
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
Maksim Pechnikov
9d0b989521
add subject to atom feed
2019-11-10 11:10:20 +03:00
Phil Hagelberg
6ef8049664
Add changelog entry, cheatsheet docs, and alphabetize.
2019-11-09 18:09:29 -08:00
Phil Hagelberg
ef7c3bdc7a
Add some further test cases.
...
Including like ... private visibility, cos that's super important.
2019-11-09 18:08:45 -08:00
Phil Hagelberg
2bf592f5dc
Add tests for static_fe controller.
2019-11-09 18:08:45 -08:00
Ariadne Conill
5b60d82592
object containment: handle all cases where ID is invalid (missing, nil, non-string)
2019-11-08 14:51:28 -06:00
lain
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
2019-11-08 13:27:11 +01:00
Maxim Filippov
b14bf9044f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-08 18:30:49 +09:00
Maxim Filippov
7258db023e
Support old flag format
2019-11-08 18:21:29 +09:00
eugenijm
7888803ffe
Mastodon API: Add the recipients parameter to GET /api/v1/conversations
2019-11-07 08:26:24 +03:00
rinpatch
84175fe30e
Set better Cache-Control header for static content
...
Closes #1382
2019-11-06 16:41:19 +03:00
feld
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
Maxim Filippov
f171095960
Grouped reports with status data baked in
2019-11-06 21:25:46 +10:00
rinpatch
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
AkiraFukushima
e1fc6cb78f
Check client and token in GET /oauth/authorize
2019-11-05 23:52:47 +09:00
lain
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-11-05 15:21:00 +01:00
lain
faced6236b
NoteValidator: Add very basic validator for Note objects.
2019-11-05 15:02:31 +01:00
lain
3d1b445cbf
Object Validators: Extract common validations.
2019-11-05 15:02:09 +01:00
Maksim Pechnikov
e52955c961
update following_relationship.ex
2019-11-05 10:50:03 +03:00
Maksim Pechnikov
62bc0657e7
excluded invisible users from search results
2019-11-05 08:55:41 +03:00
Maxim Filippov
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
2019-11-05 11:36:47 +10:00
Maxim Filippov
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-05 02:12:48 +03:00
Maksim Pechnikov
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
2019-11-04 20:44:24 +03:00
Maksim Pechnikov
ff6c727739
Merge branch 'develop' into issue/1276
2019-11-04 20:24:53 +03:00
rinpatch
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
lain
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
eugenijm
ed29be24cb
Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.
2019-11-04 18:36:16 +03:00
lain
a304a2a845
Merge branch 'transmogrifier-test-errors' into 'develop'
...
capture test log where errors are expected
See merge request pleroma/pleroma!1915
2019-11-04 15:19:29 +00:00
Steven Fuchs
5271bbcf11
add missing tesla mocks
2019-11-04 15:18:32 +00:00
lain
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
rinpatch
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
kaniini
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
kaniini
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
Ariadne Conill
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
Maxim Filippov
743b622b7b
Force password reset for multiple users
2019-11-01 18:45:47 +03:00
Maksim Pechnikov
1b3a942a84
fix format
2019-10-31 17:38:12 +03:00
Maxim Filippov
6f9d3d30fa
AdminAPI: Omit relay user from users list
2019-10-31 02:26:02 +03:00
Mark Felder
fcea6a9d2c
Merge branch 'develop' into feature/fast_sanitize
2019-10-30 17:51:15 -05:00
Maksim Pechnikov
209319c8d2
update marker api
2019-10-30 23:49:05 +03:00
Egor Kislitsyn
61fc739ab8
Handle "Move" activity
2019-10-30 18:21:49 +07:00
kPherox
d1ae51b02a
Update test for get_recipients_from_activity
2019-10-30 20:14:16 +09:00
rinpatch
ae59b38203
Rip out the rest of htmlsanitizeex
2019-10-30 09:20:13 +03:00
Maksim Pechnikov
b27a92e8fa
Merge branch 'develop' into issue/1276
2019-10-29 22:23:19 +03:00
rinpatch
61400d7eb7
Fix XSS emoji test
2019-10-29 20:49:32 +03:00
kPherox
c2f2d7bcf6
Add test follow activity for locked account
2019-10-29 18:46:22 +09:00
rinpatch
08f6837065
Switch from HtmlSanitizeEx to FastSanitize
2019-10-29 01:18:08 +03:00
stwf
56e42602b0
capture where errors are expected
2019-10-28 12:51:58 -04:00
Egor Kislitsyn
4270861085
Merge branch 'develop' into feature/move-activity
2019-10-28 15:10:47 +07:00
lain
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
Maxim Filippov
8282b6ac3d
Make sure incoming flags are updated with status data
2019-10-27 16:17:37 +03:00
Maxim Filippov
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
2019-10-27 16:11:25 +03:00
Maxim Filippov
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
2019-10-27 16:05:32 +03:00
eugenijm
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
Egor Kislitsyn
b777083f3f
Add also_known_as field to Pleroma.User
2019-10-25 19:14:18 +07:00
stwf
5329b361ec
fix test
2019-10-24 12:48:17 -04:00
Maksim Pechnikov
922e3d082c
add test
2019-10-24 12:17:50 +03:00
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
2019-10-24 14:55:36 +07:00
Maksim Pechnikov
99cf1ef9be
Merge branch 'develop' into issue/1276
2019-10-24 09:23:59 +03:00
Maksim Pechnikov
d3fb9e02cc
add tests
2019-10-23 22:48:04 +03:00
Maxim Filippov
b08b1d5d91
Store status data inside Flag activity
2019-10-23 21:27:22 +02:00
Ivan Tashkinov
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
lain
25077812bf
SideEffectsTest: Fix test.
2019-10-23 12:25:20 +02:00
lain
1adafa0966
Credo fixes.
2019-10-23 12:18:05 +02:00
lain
97d5c79aa0
Add Pipeline module, test for federation.
2019-10-23 11:52:27 +02:00
Maksim Pechnikov
9a4afbd2a0
added update unread_count for notifications
2019-10-23 11:22:48 +03:00
Ariadne Conill
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
2019-10-22 20:50:46 -05:00
Ariadne Conill
277aea45b9
tests: transmogrifier: add explicit regression tests for JSON-LD string to single-element array deserialization
...
There appears to be confusion on whether or not Pleroma can handle this particular
sin of JSON-LD. It can, and we will add regression tests to prove that it can handle
this particular sin. Which, by the way, this is actually not a "feature" of JSON-LD,
but whatever.
2019-10-22 19:43:31 -05:00
Maksim Pechnikov
d4270397dc
Marker: added unread_count field
2019-10-22 14:51:46 +03:00
kaniini
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
Mark Felder
0c628fafc5
Spelling
2019-10-21 18:35:43 -05:00
Mark Felder
2cbb3f2364
Add tests for the subject of push notifications
2019-10-21 18:34:20 -05:00
rinpatch
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
rinpatch
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
Ivan Tashkinov
7c7f90bc4f
[ #1304 ] Merged develop, handled User.Info.invisible.
2019-10-21 11:58:22 +03:00
Maksim Pechnikov
243719a965
Merge branch 'develop' into feature/masto_api_markers
2019-10-21 11:32:28 +03:00
Ivan Tashkinov
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
Egor Kislitsyn
c6fba62666
Fix Relay
2019-10-21 14:47:07 +07:00
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
2019-10-21 14:19:15 +07:00
Ivan Tashkinov
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
Ivan Tashkinov
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
Ivan Tashkinov
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
2019-10-20 13:42:42 +03:00
Ariadne Conill
05c58eaece
change Maksim's test description
2019-10-19 23:23:13 +00:00
Ariadne Conill
ba92522c69
tests: add test to ensure invisible actors are rendered with the invisible hint set to true
2019-10-19 23:21:37 +00:00
Ariadne Conill
52d56ed705
tests: add test verifying the relay user is invisible
2019-10-19 23:21:37 +00:00
Ariadne Conill
c9280b9730
rework to use properties instead of compound typing, per SocialCG
2019-10-19 23:21:37 +00:00
Maksim Pechnikov
189a288925
fix test
2019-10-19 23:21:37 +00:00
Maksim Pechnikov
9694d51437
added test fo Pleroma.Web.MastodonAPI.StatusController
2019-10-19 23:21:37 +00:00
Ariadne Conill
80d3912a56
test: activitypub: use User.invisible?/1 for testing invisibility
2019-10-19 23:21:37 +00:00
Ariadne Conill
ef659331b0
implement invisible support for remote users
2019-10-19 23:21:37 +00:00
Ariadne Conill
95871cb462
user: implement User.invisible?/1
2019-10-19 23:21:37 +00:00
Ariadne Conill
cd90735a4b
tests: ostatus controller tests: fix sporadic compilation failure
2019-10-19 23:16:15 +00:00
lain
f1381d68e7
StatusControllerTest: Capture log.
2019-10-19 14:46:14 +02:00
eugenijm
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
Maxim Filippov
019147f115
Merge branch 'develop' into feature/relay-list
2019-10-18 18:35:58 +02:00
Ariadne Conill
c2ae6310dc
tests: mastodon api: fix broken test that used OStatus
2019-10-18 15:46:46 +00:00
Ariadne Conill
a8eb1f0975
tests: mastodon search: search for an account that is visible via activitypub, not ostatus
2019-10-18 14:50:10 +00:00
Ariadne Conill
dbfdb1f6e3
add some missing tesla fixtures
2019-10-18 14:50:10 +00:00
Ariadne Conill
85ddcaf418
tests: fix up signature tests
2019-10-18 14:50:10 +00:00
Ariadne Conill
700c654208
tests: fix relay tests
2019-10-18 14:50:10 +00:00
Ariadne Conill
af9aa8e358
tests: simplify object fetching and containment tests
2019-10-18 14:50:09 +00:00
Ariadne Conill
597cb8897b
tests: remove some more ostatus tests
2019-10-18 14:50:09 +00:00
Ariadne Conill
48059c03c9
fix up some tests
2019-10-18 14:50:09 +00:00
Ariadne Conill
d379b48769
kill almost all of the OStatus module
2019-10-18 14:50:09 +00:00
Ariadne Conill
835ad52378
remove Salmon module
2019-10-18 14:50:09 +00:00
Ariadne Conill
4f82e42e4e
websub: remove entirely
2019-10-18 14:50:09 +00:00
Ariadne Conill
c6de0cbb4a
config: disable Websub and Salmon publisher modules
2019-10-18 14:50:09 +00:00
rinpatch
b085cd2660
Add a test for safe_jsonb_set
2019-10-18 15:22:16 +03:00
lain
15bbc34c07
Tests: Capture log.
2019-10-18 12:44:53 +02:00
lain
4ec299ea9c
CommonAPI tests: Capture logs.
2019-10-18 12:11:25 +02:00
Maxim Filippov
2473702be2
Merge branch 'develop' into feature/relay-list
2019-10-18 10:24:29 +02:00
lain
203d61b950
Transmogrifier: Make proper use of the LikeValidator.
2019-10-17 19:35:31 +02:00
lain
66452f518f
ObjectValidator: Rewrite LikeValidator with Ecto.
2019-10-17 18:36:52 +02:00
eugenijm
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
Maksim Pechnikov
66b5d0ff55
add Markers /api/v1/markers
2019-10-17 15:26:59 +03:00
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
lain
6e4f52f8a2
Introduce new ingestion pipeline structure, implement internal Likes with it.
2019-10-16 16:16:39 +02:00
lain
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
rinpatch
b8be6a4dc9
Remove a failing search test due to it being unrealistic
...
While the case tested (`lain@ple`) gives wrong ordering due to
using only trigram to order, it almost never happens in reality. In reality
it would be either `lain` (in which case it's fine to list the user with `lain`
in display name first), or `@lain@pleroma.soykaf.com`/`lain@pleroma.soykaf.com` (which is
handled fine as well)
2019-10-16 15:09:39 +03:00
rinpatch
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
Maxim Filippov
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
2019-10-15 17:33:29 +02:00
Egor Kislitsyn
1d46944fbd
Do not add follower_address to following for non local users
2019-10-14 13:50:43 +07:00
eugenijm
a97b642289
Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints
2019-10-14 02:57:21 +03:00
Maxim Filippov
751513b6df
This line either causes a warning, or a failed test
2019-10-11 19:31:00 +03:00
Maxim Filippov
cc6875b582
Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
2019-10-11 19:12:29 +03:00
Maxim Filippov
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
2019-10-11 15:59:35 +03:00
Maxim Filippov
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
lain
cb8492962e
SearchController: Fix test.
...
Turns out you can't actually find the user with this.
2019-10-11 12:41:44 +02:00
lain
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
2019-10-11 11:48:58 +02:00
lain
9b963064eb
Transmogrifier: Actually store who deleted a note.
2019-10-11 11:25:45 +02:00
Maxim Filippov
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
2019-10-11 00:24:31 +03:00
Egor Kislitsyn
059005ff82
Replace user.following with Pleroma.FollowingRelationship
2019-10-11 02:35:32 +07:00
lain
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
2019-10-10 17:17:33 +02:00
lain
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-10 12:38:51 +00:00
Maxim Filippov
24eecc3cb4
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-10-10 03:33:55 +03:00
kaniini
9fd5176c35
Merge branch 'unicode-search' into 'develop'
...
Search: Add tests for unicode searches.
See merge request pleroma/pleroma!1824
2019-10-09 16:33:05 +00:00
Steven Fuchs
dc6d20b68d
provide mocks for webfinger endpoints
2019-10-09 16:32:28 +00:00
lain
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
Maxim Filippov
ad42837244
Ability to toggle activation status and permission group for a group of users
2019-10-09 17:03:54 +03:00
lain
c1bae01376
Search: Add tests for unicode searches.
2019-10-09 16:03:45 +02:00
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users
2019-10-09 13:11:57 +07:00
eugenijm
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
Maxim Filippov
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-10-07 15:41:41 +03:00
Maxim Filippov
7aceaa517b
Admin API: Reports, grouped by status
2019-10-07 15:39:07 +03:00
lain
6c278cfe09
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-07 12:31:51 +00:00
Sergey Suprunenko
4b3f77a99f
Extract RSS Feed functionality from OStatus
2019-10-07 12:20:41 +00:00
lain
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-07 12:30:59 +02:00
kaniini
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
lain
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
Haelwenn
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
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject
2019-10-07 03:49:57 +02:00
kaniini
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
feld
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
rinpatch
fefbd31c6e
Move local keys out of user.info
2019-10-06 16:56:36 +03:00
Ivan Tashkinov
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
lain
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-06 08:11:47 +00:00
Haelwenn
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
kaniini
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
kaniini
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
kaniini
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
eugenijm
8249924485
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
2019-10-05 20:12:00 +03:00
lain
1ed8fbc4d9
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-05 15:10:57 +02:00
lain
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
lain
4b8524f392
ActivityPub / Transmogrifier: Correctly store incoming Update id.
2019-10-05 14:49:45 +02:00
Thibaut Girka
b1ff66dc5f
Add test for handling Announces with inlined object from different origin
2019-10-05 13:56:40 +02:00
Thibaut Girka
977e711e22
Import object from self-Announce whenever possible
2019-10-05 13:56:40 +02:00
kaniini
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
2019-10-05 10:00:05 +00:00
lain
6a85f7d1ea
Transmogrifier: Extend misskey like compatibility.
2019-10-05 10:45:42 +02:00
lain
d9aaea44ff
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-05 10:42:29 +02:00
Maksim Pechnikov
83631752af
removed legacy api: "/objects/:uuid/likes"
2019-10-04 22:35:26 +03:00
kaniini
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
kaniini
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
Maxim Filippov
8dcc2f9f5e
Admin API: Allow changing the state of multiple reports at once
2019-10-04 19:00:58 +03:00
Ariadne Conill
8325858ed2
tests: streamer: add a test for blocked transitive activities
2019-10-04 15:17:32 +00:00
lain
2a7f44acfe
ActivityPub.Utils: Fix undo test.
2019-10-04 17:10:49 +02:00
lain
43a211bcb1
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
2019-10-04 17:01:04 +02:00
lain
568a995d64
ActivityPub: Change addressing of Undo.
2019-10-04 16:32:42 +02:00
lain
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
lain
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
rinpatch
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
lain
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
Haelwenn (lanodan) Monnier
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
eugenijm
06d9df79c5
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
2019-10-04 00:53:23 +03:00
lain
c9043c6c80
Transmogrifier: Handle incoming Undos for EmojiReactions.
2019-10-03 18:37:23 +02:00
Ivan Tashkinov
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
lain
4cb603e1df
PleromaAPI: Add unreacting.
2019-10-02 18:19:16 +02:00
Egor Kislitsyn
e0c68eeb02
Move :favourites and :bookmarks actions to StatusController
2019-10-02 21:31:19 +07:00
Egor Kislitsyn
7f2bc57725
Move follows, mutes and blocks actions to AccountController
2019-10-02 21:22:21 +07:00
Egor Kislitsyn
9b68aab8b3
Fix credo warning
2019-10-02 21:12:01 +07:00
lain
9cfe9a57c5
CommonAPI: Add unreactions.
2019-10-02 15:38:57 +02:00
Egor Kislitsyn
d3c404af12
Add MastoFEController
2019-10-02 20:36:08 +07:00
lain
dfe5c958eb
ActivityPub: Add undo for emoji reactions.
2019-10-02 15:08:20 +02:00
Egor Kislitsyn
1c6e1055c8
Add CustomEmojiController
2019-10-02 19:16:34 +07:00
lain
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-02 13:27:55 +02:00
kaniini
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
Thibaut Girka
86880b9821
Inline object when Announcing a self-owned private object
2019-10-02 12:15:06 +02:00
Egor Kislitsyn
0fc29deba0
Add tests for Pleroma.JobQueueMonitor
2019-10-02 15:24:21 +07:00
Egor Kislitsyn
c8b01f6667
Extract instance actions from MastodonAPIController to InstanceController
2019-10-02 14:13:52 +07:00
kaniini
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
kaniini
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
kaniini
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
feld
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
2019-10-01 22:16:29 +00:00
Thibaut Girka
427d0c2a00
Store private announcements in object.data["announcements"], filter them on display
2019-10-01 22:39:25 +02:00
Sergey Suprunenko
c541b83bef
Track failed proxy urls and don't request them again
2019-10-01 20:00:27 +00:00
Thibaut Girka
7d5a9f3f6d
Add tests for privately announcing statuses via API
2019-10-01 20:38:29 +02:00
Thibaut Girka
e0b654e202
Add tests
2019-10-01 18:38:57 +02:00
Maxim Filippov
0f9c2c8b87
Send an identifier alongside with error message in OAuthController
2019-10-01 18:10:04 +03:00
Egor Kislitsyn
af690d1033
Extract auth actions from MastodonAPIController to AuthController
2019-10-01 15:54:45 +07:00
Egor Kislitsyn
2dad6dd020
Extract apps actions from MastodonAPIController to AppController
2019-10-01 15:21:46 +07:00
Egor Kislitsyn
39695c4436
Extract suggestions actions from MastodonAPIController to SuggestionController
2019-10-01 15:07:49 +07:00
Egor Kislitsyn
585bc57edb
Extract media actions from MastodonAPIController to MediaController
2019-10-01 14:36:35 +07:00
Egor Kislitsyn
36a34c36fe
Extract poll actions from MastodonAPIController to PollController
2019-10-01 11:44:34 +07:00
kPherox
f364438032
Add rel="ugc"
2019-10-01 02:24:06 +09:00
kPherox
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
2019-10-01 01:40:33 +09:00
lain
dae744478e
Transmogrifier: Handle compact objects in undos.
2019-09-30 18:13:05 +02:00
lain
19bc0b8c79
.
2019-09-30 16:38:19 +02:00
lain
08256e9299
ActivityPub: Federate reactions.
2019-09-30 15:51:09 +02:00
lain
6068d2254e
PleromaAPIController: Fixes and refactoring.
2019-09-30 15:13:25 +02:00
Egor Kislitsyn
0c6009dd2e
Extract mascot actions from MastodonAPIController to MascotController
2019-09-30 19:32:43 +07:00
Egor Kislitsyn
c55facf78b
Fix warning in TransmogrifierTest
2019-09-30 19:10:56 +07:00
Egor Kislitsyn
987e0b8be8
Move update_credentials to MastodonAPI.AccountController
2019-09-30 19:10:56 +07:00
Egor Kislitsyn
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
2019-09-30 19:10:55 +07:00
Egor Kislitsyn
122cc050ab
Move account_lists test to MastodonAPI.AccountControllerTest
2019-09-30 19:10:55 +07:00
Egor Kislitsyn
38db4878a4
Disable async in DomainBlockControllerTest
2019-09-30 19:10:55 +07:00
Egor Kislitsyn
3c5ecb70b4
Add PleromaAPI.AccountController
2019-09-30 19:10:55 +07:00
Egor Kislitsyn
e7aef27c00
Fix merge
2019-09-30 19:10:54 +07:00
lain
a7f22c6e93
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-30 13:58:14 +02:00
lain
b923842e96
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-30 13:57:54 +02:00
Egor Kislitsyn
1207e88195
Fix ReportControllerTest
2019-09-30 18:30:10 +07:00
kaniini
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
kaniini
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
kaniini
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
Egor Kislitsyn
b7f27a4f58
Extract report actions from MastodonAPIController to ReportController
...
Update MastodonAPI.ReportView
2019-09-30 17:44:10 +07:00
Ariadne Conill
1d7cbdaf7b
change new scrobble endpoint
2019-09-30 10:39:48 +00:00
Ariadne Conill
211008ae2f
test: fix scrobble controller tests
2019-09-30 10:39:48 +00:00
Ariadne Conill
71eff09e56
common api: make sure the generated IR is actually federatable
2019-09-30 10:39:48 +00:00
Ariadne Conill
e7309d3b60
test: transmogrifier: add test proving that transmogrifier can handle outgoing listens
2019-09-30 10:39:48 +00:00
Ariadne Conill
7cad6ea67a
pleroma api: hook up scrobbler controller
2019-09-30 10:39:17 +00:00
Ariadne Conill
2c82d8603b
common api: implement scrobbling
2019-09-30 10:39:17 +00:00
Ariadne Conill
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
2019-09-30 10:39:17 +00:00
Ariadne Conill
1f9de2a8cd
activitypub: implement IR-level considerations for Listen activities
2019-09-30 10:39:17 +00:00
Ariadne Conill
b7877e9b1c
mastodon api: implement rendering of listen activities
2019-09-30 10:39:17 +00:00
Ariadne Conill
c3d09921e4
test: factory: implement support for generating mock audio and listen objects
2019-09-30 10:39:17 +00:00
Egor Kislitsyn
d4d88b3361
Extract conversation actions from MastodonAPIController to ConversationController
2019-09-30 16:52:07 +07:00
rinpatch
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
2019-09-29 18:43:27 +03:00
kaniini
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
Maksim Pechnikov
1053319cd6
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-28 10:36:04 +03:00
Haelwenn (lanodan) Monnier
9202904da9
status_controller.ex: Posting media status without content defined
2019-09-28 01:53:41 +02:00
rinpatch
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
minibikini
f9380289eb
Add remote_ip plug
2019-09-27 21:59:23 +00:00
kaniini
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
kaniini
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
kaniini
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
Egor Kislitsyn
408750b94e
Extract domain blocks actions from MastodonAPIController to DomainBlockController
2019-09-27 14:28:05 +07:00
Egor Kislitsyn
99c5a35890
Extract follow requests actions from MastodonAPIController to FollowRequestController
2019-09-27 14:25:17 +07:00
Egor Kislitsyn
0a5b106ddd
Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController
2019-09-27 13:36:28 +07:00
Egor Kislitsyn
621377f378
Extract filter actions from MastodonAPIController to FilterController
2019-09-27 13:06:25 +07:00
kaniini
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
Ariadne Conill
14294243a2
mastodon api: implement follow_requests_count
2019-09-27 04:22:40 +00:00
Egor Kislitsyn
5ea5c58a85
Move view logic from StatusController.context to StatusView and add a test
2019-09-27 10:52:47 +07:00
Egor Kislitsyn
76b7e5cd5b
Move StatusController tests from MastodonAPIControllerTest to StatusControllerTest
2019-09-27 10:52:47 +07:00
kaniini
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
Egor Kislitsyn
98d1347a4e
Extract status actions from MastodonAPIController into StatusController
2019-09-27 10:51:15 +07:00
kaniini
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
Maksim Pechnikov
b4fc96f640
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-26 20:56:59 +03:00
Maxim Filippov
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
2019-09-26 19:01:54 +03:00
Maksim Pechnikov
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-26 16:16:30 +03:00
Egor Kislitsyn
75290cbfbd
Add Pleroma.JobQueueMonitor
2019-09-26 18:49:57 +07:00
Roman Chvanikov
b4b147000c
Merge develop
2019-09-26 10:38:54 +03:00
Egor Kislitsyn
3572cf29b7
Extract timeline actions from MastodonAPIController into TimelineController
2019-09-26 10:53:42 +07:00
kaniini
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
kaniini
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
kaniini
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
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
kaniini
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
kaniini
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
kaniini
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
rinpatch
16487716af
Merge branch 'support/test' into 'develop'
...
clears `robot.txt` after tests
See merge request pleroma/pleroma!1715
2019-09-25 18:51:45 +00:00
Maksim
dd4263da5a
Apply suggestion to test/tasks/instance_test.exs
2019-09-25 17:47:22 +00:00
rinpatch
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
Ekaterina Vaartis
118d6dcdf4
Fix nodeinfo handling
2019-09-25 12:32:19 +02:00
Ekaterina Vaartis
ba9d35a904
Add an API endpoint for listing remote packs
2019-09-25 12:32:19 +02:00
Maksim Pechnikov
1b2e4a0ae0
clears robot.txt after tests
2019-09-25 13:27:31 +03:00
Egor Kislitsyn
b5dfe83433
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
Maksim Pechnikov
1a858134ed
Merge branch 'develop' into issue/1218
2019-09-25 12:24:12 +03:00
Maxim Filippov
60cbea5bb2
Allow activities pagination via limit/offset
2019-09-25 01:25:42 +03:00
Haelwenn (lanodan) Monnier
0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
2019-09-24 19:03:06 +02:00
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
2019-09-24 19:50:07 +07:00
Maxim Filippov
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-24 13:00:48 +03:00
Egor Kislitsyn
a66a7a328f
Extract notification actions from MastodonAPIController into NotificationController
2019-09-24 15:16:44 +07:00
Egor Kislitsyn
79b25be4e1
Do not return tuple when unneeded
2019-09-24 15:03:20 +07:00
Maksim Pechnikov
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-24 08:06:04 +03:00
kaniini
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
kaniini
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
kaniini
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
kaniini
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
Steven Fuchs
e1d2d69c87
Clean up views
2019-09-23 22:33:59 +00:00
Maksim Pechnikov
494bb6bac6
updated tests
2019-09-23 22:37:30 +03:00
Maksim Pechnikov
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-23 21:41:57 +03:00
Maksim Pechnikov
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-23 21:32:50 +03:00
rinpatch
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
rinpatch
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
2019-09-23 21:14:51 +03:00
Haelwenn (lanodan) Monnier
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
2019-09-23 20:00:12 +02:00
Haelwenn (lanodan) Monnier
2ad50583f0
Document and test /api/ap/whoami
2019-09-23 19:47:35 +02:00
Maxim Filippov
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-22 16:58:39 +03:00
Maxim Filippov
72a01f1350
Use router helper to generate reset password link
2019-09-22 16:36:59 +03:00
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
2019-09-22 16:08:07 +03:00
eugenijm
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
lain
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
D Anzorge
9aca2cc95d
Add test for correct AP outbox pagination
2019-09-19 16:49:27 +02:00
Ivan Tashkinov
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
Egor Kislitsyn
95c948110c
Add rel="ugc" to hashtags and mentions
2019-09-19 14:56:10 +07:00
Egor Kislitsyn
cf3041220a
Add support for rel="ugc"
2019-09-19 14:56:10 +07:00
eugenijm
fe5e0b7846
Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses)
2019-09-19 08:59:25 +03:00
Maksim Pechnikov
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-19 07:35:34 +03:00
Haelwenn
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
rinpatch
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
Haelwenn (lanodan) Monnier
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
Ekaterina Vaartis
b585134c90
Get the nodeinfo address from the well-known
2019-09-19 00:16:34 +03:00
Ekaterina Vaartis
a1325d5fd9
Change path from nodeinfo to metadata->features
2019-09-19 00:16:34 +03:00
Ekaterina Vaartis
36f2275dc9
A feature for shareable emoji packs, use it in download_from & tests
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
74fb6d8647
Move EmojiAPIController from EmojiAPI to PleromaAPI
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
6cd651a38b
Make the emoji controller api more RESTy
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7c784128fd
Change emoji api responses to JSON
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9eb2ee4df0
Allow importing old (emoji.txt / plain) packs from the filesystem
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
f5131540dc
Add a way to create emoji packs via an endpoint
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
8dbdd5c280
Allow uploading new emojis to packs from URLs
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9afe7258dd
Implememt emoji pack file updating + write tests
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9dc9689144
Add tests for pack metadata updating
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
adf31d596e
Add tests for downloading from fallback url
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
2a94eca096
Change YAML to JSON
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
2d4b8f3d20
Add an endpoint for deleting emoji packs
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7e4c8b56ea
Add tests for emoji pack sharing
2019-09-19 00:16:33 +03:00
feld
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
feld
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
feld
220afadc55
Merge branch 'restore-tests' into 'develop'
...
Restore tests for `change_password` and `delete_account`
See merge request pleroma/pleroma!1658
2019-09-18 21:05:18 +00:00
Haelwenn
56286447ee
Merge branch 'fix/test-upload-cleanup' into 'develop'
...
Cleanup uploads after the tests are finished
See merge request pleroma/pleroma!1695
2019-09-18 21:00:09 +00:00
rinpatch
a12aeb09c4
Cleanup uploads after the tests are finished
2019-09-18 23:34:13 +03:00
rinpatch
eb87a86b5b
Preserve internal fields when reinjecting
2019-09-18 19:53:51 +03:00
rinpatch
84a40f6f26
Capture log in object refetch tests
2019-09-18 18:31:24 +03:00
rinpatch
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
Alex S
4faf2b1555
post for creating invite tokens in admin api
2019-09-18 10:49:14 +03:00
Ivan Tashkinov
b17f217bf3
[ #1234 ] Addressed code analysis issue.
2019-09-17 23:31:05 +03:00
Ivan Tashkinov
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
Maksim Pechnikov
0447c42715
Merge branch 'develop' into issue/733
2019-09-17 22:20:39 +03:00
Ivan Tashkinov
76068873db
[ #1234 ] Defined admin OAuth scopes, refined other scopes. Added tests.
2019-09-17 22:19:39 +03:00
rinpatch
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
Maksim Pechnikov
7dd51652f9
Merge branch 'develop' into issue/733
2019-09-17 21:20:08 +03:00
rinpatch
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
Steven Fuchs
80c5c3495b
remove remaining errors from tests
2019-09-17 14:44:52 +00:00
Roman Chvanikov
e9f69a3eb7
Move pleroma_api controllers into controllers sub-folders
2019-09-17 16:52:23 +03:00
Roman Chvanikov
7d1773bc6b
Rename SubscriptionNotificationController list and get actions to index and show
2019-09-17 16:48:24 +03:00
Roman Chvanikov
015597c2ab
Apply suggestion to test/web/pleroma_api/subscription_notification_controller_test.exs
2019-09-17 13:43:15 +00:00
eugenijm
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
Roman Chvanikov
6042e21b25
Move subscription notifications to a separate controller
2019-09-16 21:59:49 +03:00
Roman Chvanikov
76c3e290fc
Merge develop
2019-09-16 20:30:42 +03:00
Maxim Filippov
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
2019-09-16 19:44:06 +03:00
Maxim Filippov
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
2019-09-16 14:40:17 +03:00
Egor Kislitsyn
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
2019-09-16 17:55:04 +07:00
rinpatch
e8120944d8
Fix signed fetch inclusion publisher test
...
Oban branch changed `actor` to `actor_id` and this test was not adjusted for that
2019-09-16 13:23:06 +03:00
kaniini
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
Steven Fuchs
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
kaniini
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
Egor Kislitsyn
ca88e37a8f
Fix a race condition in tests
2019-09-16 12:55:05 +07:00
Egor Kislitsyn
43f17c2e67
Restore tests for change_password and delete_account
2019-09-16 12:34:47 +07:00
Maksim Pechnikov
d75bc728e7
Merge branch 'develop' into issue/733
2019-09-16 07:34:22 +03:00
Ivan Tashkinov
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
Ivan Tashkinov
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
2019-09-15 18:22:08 +03:00
Maksim Pechnikov
8751809e1e
Merge branch 'develop' into support/tests
2019-09-15 14:22:15 +03:00
Ivan Tashkinov
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
rinpatch
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
Roman Chvanikov
d7457c9165
Merge branch 'develop' into refactor/subscription
2019-09-14 18:29:51 +03:00
Ivan Tashkinov
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
Egor Kislitsyn
b870ae08fd
Fix Activity.all_by_actor_and_id/2 test
2019-09-14 19:31:20 +07:00
rinpatch
a78a7ee455
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-14 10:50:08 +00:00
rinpatch
85b6144ffd
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-14 10:46:35 +00:00
rinpatch
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
2019-09-14 01:50:15 +03:00
lain
a9b78f55e3
Merge branch 'capture-test-errors' into 'develop'
...
Capture test error messages where appropriate
See merge request pleroma/pleroma!1665
2019-09-13 17:07:14 +00:00
rinpatch
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
2019-09-13 19:42:53 +03:00
stwf
25a64a4aa0
Capture test error messages where appropriate
2019-09-13 11:46:41 -04:00
Roman Chvanikov
0bd2b85edb
Separate Subscription Notifications from regular Notifications
2019-09-13 18:25:27 +03:00
lain
53a3ad6043
Merge branch 'cleanup-activity' into 'develop'
...
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
2019-09-13 14:48:00 +00:00
lain
a7f31bf06c
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-13 16:31:27 +02:00
lain
e5b3ad3d04
ActivityPub: Use is_unicode_emoji? function.
2019-09-13 16:06:34 +02:00
Haelwenn
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
2019-09-13 12:46:16 +00:00
rinpatch
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
2019-09-13 12:36:24 +00:00
Maksim Pechnikov
bc3e8c033b
fix formatting
2019-09-13 15:06:34 +03:00
Maksim Pechnikov
ec5aaf5bd7
fix tests
2019-09-13 14:59:58 +03:00
rinpatch
fb96facc32
Remove unused functions and fix credo issues
2019-09-13 12:29:42 +03:00
rinpatch
ce23529d91
Use delivery info when federating deletes
2019-09-13 11:38:17 +03:00
Egor Kislitsyn
25d8216804
Add email change endpoint
2019-09-13 13:09:35 +07:00
Egor Kislitsyn
5bfbad13ad
Add more tests for Pleroma.Activity
2019-09-13 12:49:52 +07:00
Egor Kislitsyn
39dc9b470c
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
2019-09-13 12:44:59 +07:00
Maksim Pechnikov
d8a178274b
fix Activity.get_by_id
2019-09-13 07:12:34 +03:00
Maksim
58b17196fa
Apply suggestion to test/web/mastodon_api/mastodon_api_controller_test.exs
2019-09-13 03:58:58 +00:00
Maksim Pechnikov
2b40e57a72
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-13 06:55:05 +03:00
lain
a697f0d791
Emoji: Add function to detect if a character is an emoji
2019-09-13 02:11:02 +02:00
Maksim Pechnikov
936951826e
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-12 22:15:43 +03:00
rinpatch
769fb778d4
Track object/create activity fetches
2019-09-12 21:37:36 +03:00
Mark Felder
102eb4455c
Fix associated test as well
2019-09-12 12:29:08 -05:00
lain
8d4b661ecb
Transmogrifier: Strip internal emoji reaction fields.
2019-09-12 18:59:13 +02:00
lain
05e9776517
PleromaAPIController: Add endpoint to fetch emoji reactions.
2019-09-12 18:48:25 +02:00
Maksim Pechnikov
4f548cb2b7
added test for Ostatus
2019-09-12 10:25:43 +03:00
Maksim Pechnikov
007e0c1ce1
added tests
2019-09-11 23:19:06 +03:00
Alex S
a1f2dfb10a
expanding regex sigils to use modifiers
2019-09-11 09:25:33 +03:00
Maksim Pechnikov
fcf604fa43
added tests
2019-09-11 07:23:33 +03:00
Egor Kislitsyn
3d12e05f43
Fix Activity.all_by_ids_with_object/1 test
2019-09-11 01:08:37 +07:00
Maksim Pechnikov
a31af93e1d
added tests /activity_pub/transmogrifier.ex
2019-09-10 16:43:10 +03:00
Egor Kislitsyn
b40b10b53d
Add an endpoint to get multiple statuses by IDs
2019-09-10 13:39:45 +07:00
Maxim Filippov
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
2019-09-10 01:23:20 +03:00
minibikini
11e12b5761
Add Pleroma.Plugs.Cache
2019-09-09 18:53:08 +00:00
Egor Kislitsyn
e0f84d0043
Fix ActivityPubController.read_inbox/2
2019-09-10 01:11:57 +07:00
Ivan Tashkinov
b63faf9819
[ #1234 ] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
2019-09-08 15:00:03 +03:00
Maksim Pechnikov
39f99dc6cd
Merge branch 'develop' into support/tests
2019-09-07 22:13:43 +03:00
Maksim Pechnikov
ab2f21e470
tests for mastodon_api_controller.ex
2019-09-06 21:50:00 +03:00
Maksim Pechnikov
eb74c3d5c7
Merge branch 'develop' into issue/1218
2019-09-06 14:01:07 +03:00
Ivan Tashkinov
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
rinpatch
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
2019-09-06 08:43:38 +00:00
Haelwenn
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
rinpatch
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
2019-09-05 12:03:39 +03:00
Ivan Tashkinov
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-05 11:30:41 +03:00
lain
99ea990a16
PleromaAPIController: Add emoji reactions.
2019-09-04 12:20:35 -05:00
Maxim Filippov
af746fa4a8
Return total for reports
2019-09-04 20:08:13 +03:00
Maxim Filippov
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
2019-09-04 19:40:07 +03:00
Sadposter
2975da284b
truncate remote user bio/display name
2019-09-04 15:45:40 +01:00
Maksim Pechnikov
8cbad5500c
add tests for activity_pub/utils.ex
2019-09-04 15:25:12 +03:00
rinpatch
3face45467
Mastodon API: Add pleroma.thread_muted to Status entity
...
Needed for pleroma-fe!941
2019-09-04 14:17:23 +03:00
rinpatch
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
lain
9bc12b88b3
ActivityPub: Save emoji reactions in object.
2019-09-03 16:50:04 -05:00
rinpatch
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
Ivan Tashkinov
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
Maxim Filippov
b15cfd80ef
Return "total" optionally
2019-09-03 13:58:27 +03:00
Maxim Filippov
a4c5f71e93
Return total from pagination + tests
2019-09-02 22:48:52 +03:00
Ivan Tashkinov
b49085c156
[ #1149 ] Refactoring: GenServer workers renamed to daemons, use Oban.Worker moved to helper.
2019-09-02 14:57:40 +03:00
Sadposter
e73685834c
add mandatory fields for user update
2019-09-02 12:35:55 +01:00
Sadposter
05c935c396
mix format
2019-09-02 12:15:40 +01:00
Sadposter
35ef470d00
truncate fields for remote users instead
2019-09-02 12:15:21 +01:00
Maxim Filippov
6c2fd1b78b
Fix tests
2019-09-01 21:38:15 +03:00
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
Ivan Tashkinov
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
rinpatch
9cabc02864
Remove a useless import
2019-08-31 10:57:35 +03:00
rinpatch
dbfcba85ec
Add a changelog entry for twitterapi removal and fix credo issues
2019-08-31 10:45:37 +03:00
rinpatch
64410497d2
Remove TwitterAPI representers
2019-08-31 10:41:15 +03:00
rinpatch
985122cc03
Remove Activity, User and Notification views from TwitterAPI
2019-08-31 10:31:15 +03:00
rinpatch
90c2dae9a4
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
2019-08-31 10:20:34 +03:00
Maksim Pechnikov
6ef0103ca0
added Emoji struct
2019-08-31 10:14:53 +03:00
Maxim Filippov
f182f0f6bd
Add ability to search moderation logs
2019-08-31 00:57:15 +03:00
Maksim Pechnikov
d8098d142a
added Emoji.Formatter
2019-08-30 22:04:17 +03:00
Maksim Pechnikov
d7808b5db4
added code\path fields without html tags in ets
2019-08-30 07:30:54 +03:00
Maksim Pechnikov
cef2e980b1
division emoji.ex on loader.ex and emoji.ex
2019-08-30 07:30:54 +03:00
Haelwenn
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
lain
b770ed1d99
CommonAPI: Support emoji reactions.
2019-08-27 17:56:28 -05:00
lain
f017260cdc
Merge remote-tracking branch 'origin/develop' into reactions
2019-08-27 16:38:51 -05:00
lain
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
Maxim Filippov
5e4fde1d3d
Filter logs by date
2019-08-27 20:48:16 +03:00
Maksim Pechnikov
00abe099cd
added tests for ActivityPub.like\unlike
2019-08-27 16:21:03 +03:00
rinpatch
eb1739c596
Remove most of TwitterAPIController
2019-08-27 12:29:19 +03:00
lain
a0b21c8928
Transmogrifier: Handle incoming emoji reactions.
2019-08-26 16:47:31 -05:00
lain
6e1ec4c5da
ActivityPub: Basic EmojiReactions.
2019-08-26 16:29:51 -05:00
lain
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
2019-08-26 14:34:52 -05:00
Maxim Filippov
c338224c93
Fix sporadic test
2019-08-26 17:24:22 +03:00
Egor Kislitsyn
019ced0558
Move test/web/mastodon_api/*_test.exs to test/web/mastodon_api/controllers and test/web/mastodon_api/views
2019-08-26 19:37:57 +07:00
Egor Kislitsyn
30510ade0e
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
2019-08-26 19:37:54 +07:00
Egor Kislitsyn
3b1b631c2a
Add validation in Pleroma.List.create/2
2019-08-26 18:59:57 +07:00
kPherox
eb75ea502d
Update test for custom fields when content-type urlencoded
2019-08-26 16:55:26 +09:00
kaniini
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
Maxim Filippov
37dd3867bb
Log admin/moderator actions
2019-08-25 19:39:37 +00:00
kaniini
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
kPherox
b8777b01ae
Update test for custom fields when name empty string
2019-08-26 03:30:31 +09:00
kPherox
d74efde94e
Update test for custom profile fields
2019-08-26 02:06:52 +09:00
lain
5e7098cf69
Merge branch 'bugfix/rel_me_missing_mocks' into 'develop'
...
Implement missing mocks for rel=me
See merge request pleroma/pleroma!1598
2019-08-25 16:12:13 +00:00
Haelwenn (lanodan) Monnier
20c3f613d8
HttpRequestMock: Remove useless error = error
2019-08-25 08:55:29 +02:00
Haelwenn (lanodan) Monnier
f3b1266273
user_test.exs: fix rel=me tests
2019-08-25 08:48:38 +02:00
Haelwenn (lanodan) Monnier
211e163770
Implement missing mocks for rel=me
2019-08-25 08:03:25 +02:00
Haelwenn (lanodan) Monnier
e22737ffb5
HttpRequestMock: Improve non-implemented error message
2019-08-25 07:33:46 +02:00
Haelwenn (lanodan) Monnier
18668447d2
HttpRequestMock: Log mock errors as warnings
2019-08-25 07:33:13 +02:00
kPherox
45e21a9df4
Rename fields to fields_attributes
2019-08-25 07:34:11 +09:00
lain
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
lain
efb8818e9e
Activity Expiration: Switch to 'expires_in' system.
2019-08-24 17:22:48 +02:00
Maksim Pechnikov
654d291b6d
update tests
2019-08-24 17:41:53 +03:00
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
2019-08-24 15:48:33 +02:00
Maksim Pechnikov
73bcbf4fa3
add tests
2019-08-24 11:03:13 +03:00
Ivan Tashkinov
71700ea6d4
[ #1149 ] Updated docs & tests.
2019-08-24 09:27:32 +03:00
Ivan Tashkinov
c29686309e
[ #1149 ] Upgraded oban from 0.6.0 to 0.7.1.
2019-08-23 09:23:10 +03:00
Maksim Pechnikov
399ca9133b
fix test
2019-08-22 21:54:37 +03:00
Maksim Pechnikov
f95b67c933
Merge branch 'develop' into issue/1177
2019-08-22 21:13:03 +03:00
Ivan Tashkinov
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-22 21:01:28 +03:00
Ivan Tashkinov
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
Maksim Pechnikov
64bfb41c55
fixed unfollow for relay actor
2019-08-22 06:57:55 +03:00
Maksim Pechnikov
85bd8a4e31
fixed clear config after test
2019-08-21 21:24:35 +03:00
Ariadne Conill
76bb3572dd
test: rich media: aws signed url: increase TTL delta check to 2 seconds from 1
2019-08-20 20:20:12 +00:00
lain
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
lain
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
lain
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
lain
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
2019-08-19 17:00:59 +00:00
Sergey Suprunenko
75a5dd41ee
Add more tests for Database tasks and DigestEmailWorker
2019-08-19 16:10:00 +00:00
Maksim
a320358703
added test helpers to clear config after tests
2019-08-19 15:34:29 +00:00
lain
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
Maksim Pechnikov
e652cef76b
removes duplicates from relay subscription list
2019-08-19 13:39:18 +03:00
Ariadne Conill
a2fdc32368
tests: activitypub: fix typo
2019-08-18 22:31:59 +00:00
kaniini
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
kaniini
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
Sadposter
58c1391c4d
use commonAPI in tests
2019-08-18 22:54:40 +01:00
Sadposter
94e336d9d5
clear follow requests when blocking a user
2019-08-18 20:30:57 +01:00
Maksim Pechnikov
3315a2a1c3
fixed User.unfollow with synchronization external user
2019-08-16 15:58:42 +03:00
lain
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
2019-08-16 12:55:33 +00:00
Mark Felder
6a3b1a526e
max_body_size -> max_body_length, as it should be
2019-08-15 15:34:41 -05:00
rinpatch
a4a3e3becd
Hide muted theads from home/public timelines unless with_muted is set
2019-08-15 17:37:30 +03:00
Maxim Filippov
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
2019-08-14 22:45:32 +00:00
Maxim Filippov
2b94ae3b39
Do not check if actor is active when deleting a user
2019-08-15 01:35:29 +03:00
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
Ivan Tashkinov
a180c1360e
[ #1149 ] Oban mailer job. Adjusted tests.
2019-08-14 21:42:21 +03:00
stwf
d81f63845a
Implement Pleroma.Stats as GenServer
2019-08-14 11:59:33 -04:00
stwf
51bdf0cab6
use default child_specs
2019-08-14 11:55:17 -04:00
lain
d3af9e19ed
Conversations: Load relations in one query.
2019-08-14 17:01:11 +02:00
Egor Kislitsyn
4b7f1c6995
Improve digest email template
2019-08-14 20:46:05 +07:00
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-14 15:30:40 +02:00
Egor Kislitsyn
e457fcc479
Add :max_remote_account_fields config option
2019-08-14 14:58:06 +07:00
Egor Kislitsyn
f7bbf99caa
Use info.fields instead of source_data for remote users
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
2c35d4b0b0
Add configurable account field name length limit
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
db3c05f6b4
Add configurable account field value length limit
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
7d6f8a7fd7
Linkify custom fields values in ActivityPub.UserViewx
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
5178f960c3
Support user attachment update in Transmogrifier
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
88598c9baf
Add profile custom fields to ActivityPub.UserView
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
d6094b405d
Fix tests
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
e0ac5c7a66
Add custom profile fields
2019-08-14 14:52:54 +07:00
rinpatch
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00
kaniini
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
rinpatch
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
Ariadne Conill
4244e17de0
fix credo
2019-08-13 22:36:24 +00:00
Ariadne Conill
10fef2fcee
tests: fix up nodeinfo tests
2019-08-13 22:32:40 +00:00
Ariadne Conill
dd0b71ea6d
tests: add tests for MRF.describe()
2019-08-13 22:19:15 +00:00
Ariadne Conill
7089400675
test: add mock MRF module for describe() testing
2019-08-13 21:29:15 +00:00
Maksim
fea4d89e9f
tests for Web/ActivityPub/Relay
2019-08-13 21:12:59 +00:00
Maksim
04da1166db
tests for /web/mastodon_api/mastodon_api.ex
2019-08-13 21:12:37 +00:00
Ariadne Conill
f7e3b7ff75
tests: add tests for mrf_vocabulary
2019-08-13 20:55:42 +00:00
Ivan Tashkinov
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
2019-08-13 20:20:26 +03:00
lain
511ccea5aa
ConversationView: Align parameter names with other views.
2019-08-12 14:23:06 +02:00
lain
60231ec7bd
Conversation: Add endpoint to get a conversation by id.
2019-08-12 13:58:04 +02:00
lain
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
Ariadne Conill
9cfc289594
MRF: ensure that subdomain_match calls are case-insensitive
2019-08-10 21:19:26 +00:00
kaniini
84808e1697
Merge branch 'develop' into 'fix/hide-follows-counters'
...
# Conflicts:
# CHANGELOG.md
2019-08-10 18:49:04 +00:00
Sergey Suprunenko
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
2019-08-10 18:47:40 +00:00
Maksim
11d08c2de0
tests for Pleroma.Uploaders
2019-08-10 18:46:26 +00:00
Ivan Tashkinov
33a5fc4a70
[ #1149 ] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.
2019-08-10 20:38:31 +03:00
rinpatch
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
Maksim
bb9c539580
Uploader.S3 added support stream uploads
2019-08-10 11:27:59 +00:00
Maxim Filippov
dfae61c25c
Fix deactivated user deletion
2019-08-09 23:05:28 +03:00
Ivan Tashkinov
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-09 20:09:56 +03:00
Ivan Tashkinov
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
2019-08-09 20:08:01 +03:00
rinpatch
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
lain
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
lain
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-08 16:04:20 +02:00
Haelwenn
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
rinpatch
5329e84d62
OStatus tests: stop relying on embedded objects
2019-08-07 00:58:48 +03:00
rinpatch
32018a4ee0
ActivityPub tests: remove assertions of embedded object being updated,
...
because the objects are no longer supposed to be embedded
2019-08-07 00:36:13 +03:00
Maksim
139b196bc0
[ #1150 ] fixed parser TwitterCard
2019-08-06 20:19:28 +00:00
lain
a49c92f6ae
Participation: Setting recipients will always add the owner.
2019-08-06 14:51:17 +02:00
Maksim
bdc9a7222c
tests for CommonApi/Utils
2019-08-05 15:37:05 +00:00
lain
d6fe220e32
Linting.
2019-08-05 16:11:23 +02:00
lain
b64b6fee2a
CommonAPI: Replies to conversations also get the correct context id.
2019-08-05 15:33:22 +02:00
lain
3af6d14da7
Pleroma Conversations API: Add a way to set recipients.
2019-08-05 15:09:19 +02:00
Eugenij
96028cd585
Remove Reply-To from report emails
2019-08-04 22:24:50 +00:00
Sergey Suprunenko
e8ad116c2a
Do not add the "next" key to likes.json if there is no more items
2019-08-04 17:13:06 +00:00
Alexander Strizhakov
de0f3b73dd
Admin fixes
2019-08-03 18:16:09 +00:00
Sergey Suprunenko
040347b248
Remove spaces from the domain search
2019-08-03 18:13:20 +00:00
Sergey Suprunenko
8b2fa31fed
Handle MRF rejections of incoming AP activities
2019-08-03 18:12:38 +00:00
lain
eee98aaa73
Pleroma API: Add endpoint to get conversation statuses.
2019-08-02 19:53:08 +02:00
feld
d93d777915
Fix/mediaproxy whitelist base url
2019-08-02 17:07:09 +00:00
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
lain
56b1c3af13
CommonAPI: Extend api with conversation replies.
2019-08-02 15:05:27 +02:00
lain
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
lain
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
Ivan Tashkinov
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
2019-08-01 17:28:00 +03:00
Egor Kislitsyn
f98235f2ad
Clean up tests output
2019-08-01 16:33:36 +07:00
Egor Kislitsyn
9ca4506355
Add configurable length limits for User.bio and User.name
2019-08-01 15:53:37 +07:00
kaniini
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
rinpatch
813c686dd7
Disallow following locked accounts over OStatus
2019-07-31 22:05:12 +03:00
Maksim
6eb33e7303
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
2019-07-31 18:35:15 +00:00
Ariadne Conill
f72e0b7cad
ostatus: explicitly disallow protocol downgrade from activitypub
...
This closes embargoed bug #1135 .
2019-07-31 18:17:31 +00:00
rinpatch
301ea0dc04
Add tests for counters being updated on follow
2019-07-31 21:09:13 +03:00
Maksim
58443d0cd6
tests for TwitterApi/UtilController
2019-07-31 15:14:36 +00:00
lain
7483679a7b
StatusView: Return direct conversation id.
2019-07-31 15:12:29 +02:00
rinpatch
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
2019-07-31 14:12:29 +03:00
Alexander Strizhakov
51b3b6d816
Admin changes
2019-07-30 16:36:05 +00:00
kaniini
5835069215
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
...
This reverts merge request !1504
2019-07-29 19:42:26 +00:00
Ariadne Conill
5795a890e9
markdown: clean up html generated by earmark
2019-07-29 19:09:58 +00:00
lain
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
Sergey Suprunenko
c0e258cf21
Redirect not logged-in users to the MastoFE login page on private instances
2019-07-29 16:17:22 +00:00
Maksim
159bbec570
added tests for OstatusController
2019-07-29 05:02:20 +00:00
Ariadne Conill
b93498eb52
constants: add as_public constant and use it everywhere
2019-07-29 02:43:19 +00:00
Ariadne Conill
492d854e7a
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
...
Closes #1104
2019-07-28 21:32:04 +00:00
Sachin Joshi
242f5c585e
add account confirmation email resend in mastodon api
2019-07-28 20:30:10 +00:00
Maksim
6a4b8b2681
fixed User.update_and_set_cache for stale user
2019-07-28 20:29:26 +00:00
Maksim
6b77a88365
[ #1097 ] added redirect: /pleroma/admin -> /pleroma/admin/
2019-07-26 20:27:38 +00:00
rinpatch
41e0304757
Merge branch 'develop' into feature/hide-follows-remote
2019-07-25 18:43:30 +03:00
Maksim
03c386614f
fixed test for elixir 1.7.4
2019-07-25 03:43:13 +00:00
kaniini
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
Sergey Suprunenko
b20020da16
Show the url advertised in the Activity in the Status JSON response
2019-07-24 19:28:21 +00:00
kPherox
8d9f43e1d1
Add WebFinger test for AP-only account
2019-07-25 01:27:34 +09:00
feld
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
Mike Verdone
0e2b5a3e6a
WIP
2019-07-24 17:25:11 +02:00
Maksim
55341ac717
tests WebFinger
2019-07-24 15:13:10 +00:00
Eugenij
4504135894
Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships)
2019-07-24 15:12:27 +00:00
Mike Verdone
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
Mike Verdone
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
Roman Chvanikov
d2da3d30f3
Merge branch 'develop' into feature/digest-email
2019-07-24 16:37:52 +03:00
Mike Verdone
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
Mike Verdone
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
Mike Verdone
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
Mike Verdone
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
Mike Verdone
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
Mike Verdone
8ba7a151ad
Cleanup: fix a comment
2019-07-24 13:14:52 +02:00
sadposter
f5d574f4ed
check both item and parent domain blocks
2019-07-24 11:35:16 +01:00
Sadposter
4af4f6166b
honour domain blocks on streaming notifications
2019-07-24 11:09:06 +01:00
kaniini
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
Ariadne Conill
d3bdb8e704
rich media: parser: splice the given URL into the result
2019-07-23 23:51:29 +00:00
Maxim Filippov
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-24 02:42:28 +03:00
Maxim Filippov
03471151d6
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
2019-07-24 01:51:36 +03:00
Alexander Strizhakov
5e72554f3c
Admin config fix
2019-07-23 19:17:00 +00:00
Maksim
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
2019-07-23 19:15:48 +00:00
kaniini
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
kaniini
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
Mark Felder
ec7b085b76
Fix test
2019-07-23 13:57:22 -05:00
Mark Felder
fd287387a0
Do not notify subscribers for messages from users which are replies to others
2019-07-23 13:14:26 -05:00
Ariadne Conill
e7c64f106e
signature: properly deduce the actor from misskey key IDs
2019-07-23 16:47:22 +00:00
Sadposter
c400565427
fix test names because i cannot type
2019-07-23 15:47:17 +01:00
Sadposter
299c0e965b
actually reblog on the reblog test
2019-07-23 15:38:19 +01:00
Sadposter
7026018c8c
Use correct URL for tests
2019-07-23 15:31:35 +01:00
Sadposter
452980652d
Mix format
2019-07-23 15:13:05 +01:00
Sadposter
fd1fa5a2ec
add tests for unauthed reqs to liked/reblogged_by
2019-07-23 15:08:41 +01:00
Maxim Filippov
14ab2fd0f4
remove pry
2019-07-23 12:30:37 +03:00
Sergey Suprunenko
9340896c9e
Exclude tests that use :crypt.crypt/2 on macOS
2019-07-22 19:54:22 +00:00
Alexander Strizhakov
b70e659304
Feature/1087 wildcard option for blocks
2019-07-22 14:33:58 +00:00
Haelwenn
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
Sadposter
f712ee879a
Bugfix: muted/blocked user notification streaming
2019-07-22 02:43:55 +00:00
Sergey Suprunenko
05b5af8075
Add tests for users tasks and PleromaAuthenticator
2019-07-22 02:43:15 +00:00
Sadposter
a5d6287ba8
Hide blocked users from interactions
2019-07-22 02:42:29 +00:00
Ariadne Conill
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
rinpatch
196cad46f3
Resolve merge conflicts
2019-07-20 22:04:47 +03:00
Roman Chvanikov
8292331b35
Merge branch 'develop' into feature/digest-email
2019-07-20 16:41:58 +03:00
Sergey Suprunenko
43a7cd27fe
[tests] Mock :crypt.crypt/2 function in AuthenticationPlugTest
2019-07-20 13:07:51 +00:00
Roman Chvanikov
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
kaniini
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
kaniini
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
Maksim
c2e2aadc42
#1110 fixed /api/pleroma/healthcheck
2019-07-19 16:20:23 +00:00
Sachin Joshi
de9906ad56
change the structure of image ttl parsar
2019-07-19 11:43:42 +05:45
Maxim Filippov
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-18 23:38:38 +03:00
Ariadne Conill
c947cfec5a
mapped signature plug: use user assign like authentication plug
2019-07-18 20:31:25 +00:00
Maksim
f435217e50
tests for Plugs.AuthenticationPlug
2019-07-18 20:29:51 +00:00
Ariadne Conill
621cacf667
tests: add tests for mapped signature plug
2019-07-18 16:28:36 +00:00
Ariadne Conill
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
kaniini
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
Maksim
b6b748d3e7
tests for Uploader with webhook
2019-07-18 12:30:18 +00:00
Ariadne Conill
1345e0c2bf
tests: add tests for signed object fetches
2019-07-17 23:06:16 +00:00
kaniini
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
kaniini
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
Ariadne Conill
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
Eugenij
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
Ariadne Conill
3d23a12d75
tests: add test for fetching the internal fetch actor
2019-07-17 17:48:08 +00:00
Ariadne Conill
62e5ff624e
user: add is_internal_user? helper function
2019-07-17 17:12:42 +00:00
kaniini
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
RX14
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors
2019-07-17 15:16:55 +01:00
Alexander Strizhakov
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
2019-07-16 21:44:50 +00:00
Maksim
21e3f9ac69
added tests for Pleroma.Upload.Filter
2019-07-16 21:35:43 +00:00
Sachin Joshi
18234cc44e
add the rich media ttl based on image exp time
2019-07-17 00:20:34 +05:45
Roman Chvanikov
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
Eugenij
520ee6c591
Add pleroma.deactivated to the Account entity (Mastodon API)
2019-07-16 11:14:46 +00:00
Eugenij
c4ca142e14
Add the blocked_by attribute to the relationship API (GET /api/v1/accounts/relationships)
2019-07-16 11:04:11 +00:00
rinpatch
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
lain
7a24def473
Mastodon Controller: Fix tests.
2019-07-16 14:01:18 +09:00
lain
1ed24bcc76
Status View: Poll ids are strings.
...
All ids in mastodon are strings, in general.
2019-07-16 12:47:40 +09:00
feld
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
Sergey Suprunenko
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
2019-07-15 19:47:23 +00:00
Sachin Joshi
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
kaniini
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
Maksim
c32384c1ea
tests for Pleroma.Signature
2019-07-15 13:01:22 +00:00
Alex S
b8607c151c
migrating task refactor
2019-07-15 15:45:27 +03:00
Alex S
c66044b923
atom keys with leading :
2019-07-15 11:00:55 +03:00
Egor Kislitsyn
de13c9bb8f
List messages must be visible for mentioned users
2019-07-15 14:54:40 +07:00
Egor Kislitsyn
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-07-15 14:11:54 +07:00
Egor Kislitsyn
a87c313309
Support list visibility in StatusView
2019-07-15 14:00:29 +07:00
Maksim
fa17879c20
added tests for Web.MediaProxy
2019-07-14 21:01:32 +00:00
Sergey Suprunenko
dce8ebc9ea
Unfollow should also unsubscribe
2019-07-14 19:25:03 +00:00
Ariadne Conill
841314c2d5
tests: fix object containment violations in the transmogrifier tests
...
Some objects were not completely rewritten in the tests, which caused object
containment violations. Fix them by rewriting the object IDs to be in an
appropriate namespace.
2019-07-14 19:24:22 +00:00
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
2019-07-14 21:43:30 +03:00
Ariadne Conill
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
kaniini
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
Haelwenn (lanodan) Monnier
a2c601acb5
FetcherTest: Containment refute called(OStatus.fetch_activity_from_url)
2019-07-14 17:05:32 +02:00
Alexander Strizhakov
e7c39b7ac8
Feature/1072 muting notifications
2019-07-14 13:29:31 +00:00
Haelwenn (lanodan) Monnier
f00562ed6b
HttpRequestMock: Add 404s on OStatus fetching for info.pleroma.site
2019-07-14 13:55:41 +02:00
Haelwenn (lanodan) Monnier
efa9a13d4e
HttpRequestMock: Add missing mocks for object containment tests
2019-07-14 13:55:41 +02:00
rinpatch
0c2dcb4c69
Add follow information refetching after following/unfollowing
2019-07-14 01:58:39 +03:00
rinpatch
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
Maxim Filippov
418ae6638d
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-14 00:39:06 +03:00
Maxim Filippov
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
2019-07-14 00:37:26 +03:00
Ariadne Conill
80c46d6d8b
nodeinfo: implement MRF transparency exclusions
2019-07-13 18:53:14 +00:00
rinpatch
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
Ivan Tashkinov
369e9bb42f
[ #1041 ] Rate-limited status actions (per user and per user+status).
2019-07-13 14:49:39 +03:00
rinpatch
095117a58c
Merge branch 'develop' into fix/ap-hide-follows
2019-07-12 21:43:06 +03:00
rinpatch
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
Sachin Joshi
f8e3ae6154
try to always match the filename for proxy url
2019-07-12 22:56:14 +05:45
Maksim
92055941bd
Pleroma.Web.Metadata - tests
2019-07-12 16:42:54 +00:00
rinpatch
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
Mark Felder
360e4cdaa2
Move these to pleroma namespace in Mastodon API
2019-07-12 11:25:58 -05:00
rinpatch
27ed260eed
AP user view: Add a test for hiding totalItems in following/followers
2019-07-12 18:36:14 +03:00
Sachin Joshi
6a6c4d134b
preserve the original path/filename (no encoding/decoding) for proxy
2019-07-12 21:05:01 +05:45
Roman Chvanikov
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
Eugenij
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
Alexander Strizhakov
846ad9a463
admin api configure changes
2019-07-11 13:02:13 +00:00
kaniini
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
Egor Kislitsyn
9e06873d58
Add list to Visibility
2019-07-11 19:29:24 +07:00
Egor Kislitsyn
958fb9aa80
Add "listMessage"
2019-07-11 16:36:08 +07:00
Egor Kislitsyn
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
2019-07-11 13:26:59 +07:00
Alexander Strizhakov
a237c6a2d4
support for idna domains
2019-07-10 15:23:25 +00:00
Haelwenn (lanodan) Monnier
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
Alex S
beba7bbc85
removing synchronization worker
2019-07-10 17:42:18 +03:00
Alex S
ade213cb35
robots txt test fix
2019-07-10 17:42:18 +03:00
Alex S
f8786fa6f2
adding following_address field to user
2019-07-10 17:42:18 +03:00
Sergey Suprunenko
ff55e3c16f
Create mentions only for explicitly mentioned users
2019-07-10 13:29:50 +00:00
Egor Kislitsyn
c2a589d9a3
Fix credo warning
2019-07-10 18:10:09 +07:00
Egor Kislitsyn
0d54a571ca
Add SetLocalePlug
2019-07-10 18:08:03 +07:00
Maksim
008c55e4e9
add test for search_controller/ 100% coverage
2019-07-10 08:28:03 +00:00
Maksim
12b1454245
[ #1062 ] added option to disable send email
2019-07-10 05:34:21 +00:00
Sergey Suprunenko
2d2b50ccca
Send and handle "Delete" activity for deleted users
2019-07-10 05:16:08 +00:00
kaniini
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
feld
93a0eeab16
Add license/copyright to all project files
2019-07-10 05:13:23 +00:00
Maksim
bb8065a1fd
tests MRF filters
2019-07-10 05:12:21 +00:00
Sachin Joshi
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
2019-07-10 01:46:49 +05:45
Ivan Tashkinov
8a41d34673
[ #878 ] Tests improvements per code review.
2019-07-09 22:37:59 +03:00
Ivan Tashkinov
6fc0c27be3
[ #878 ] Uncommented test statement.
2019-07-09 22:28:04 +03:00
Ivan Tashkinov
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
Roman Chvanikov
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
kaniini
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
Alexander Strizhakov
d6b0fce6e9
Fix/1019 correct count remote users
2019-07-09 17:36:35 +00:00
kaniini
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
Alexander Strizhakov
4e6e5d8042
reverse proxy tests
2019-07-09 16:54:13 +00:00
kaniini
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
feld
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
Mark Felder
e143747445
Add test for URLs with Unicode characters too
2019-07-09 10:55:36 -05:00
Haelwenn
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
Mark Felder
ce3ffad13a
Remove duplicated test. New one is more comprehensive.
2019-07-09 10:23:22 -05:00
Mark Felder
31a59d6f23
Merge branch 'develop' into proxy-error
2019-07-09 10:18:30 -05:00
Mark Felder
98f13eac9e
Capitalize
2019-07-09 10:11:42 -05:00
Mark Felder
4213a4e2aa
Test that all ASCII encoded characters are preserved
2019-07-09 09:43:33 -05:00
rinpatch
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
Alexander Strizhakov
23d4781e73
change for local user search
2019-07-09 08:52:49 +00:00
lain
abe2e8881f
Testing: Don't federate in testing.
2019-07-09 15:30:51 +09:00
Ivan Tashkinov
46cf81a544
[ #878 ] Formatting fix.
2019-07-08 20:05:02 +03:00
Ivan Tashkinov
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
rinpatch
72b88c82bc
Mastodon API: Fix embedded relationships not being rendered inside of statuses
2019-07-08 12:07:08 +03:00
Sachin Joshi
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
Haelwenn (lanodan) Monnier
b5ba41a725
mastodon_websocket_test.exs: Test for Sec-WebSocket-Protocol header
2019-07-07 08:58:24 +02:00
Ivan Tashkinov
ad8d86e7c6
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
2019-07-06 10:17:06 +03:00
Maksim
6dadf5d6f4
[ #1043 ] fix search accounts.
2019-07-05 04:22:08 +00:00
Egor Kislitsyn
11143c542a
Remove httpoison from dependencies
2019-07-03 14:42:24 +07:00
Eugenij
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
Roman Chvanikov
d2cb18b2a3
Merge branch 'develop' into feature/digest-email
2019-06-30 21:23:35 +03:00
Ivan Tashkinov
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
Ivan Tashkinov
2b9d914089
[ #161 ] Refactoring, documentation.
2019-06-30 15:58:50 +03:00
Eugenij
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
2019-06-30 09:08:46 +00:00
Maksim
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
2019-06-30 07:28:35 +00:00
rinpatch
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
2019-06-29 22:27:42 +03:00
Ivan Tashkinov
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
kaniini
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
William Pitcock
c22f0bfb80
test: add tests for mediaproxy warming policy
2019-06-28 23:41:42 +00:00
Roman Chvanikov
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
Maxim Filippov
90927e6a9a
Kowalski, analysis!
2019-06-28 15:27:18 +03:00
Maxim Filippov
452ca5250d
Merge admin and mastodon user views for reports
2019-06-28 15:15:32 +03:00
kaniini
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
Alexander Strizhakov
c6705144a2
don't delete config settings on admin update
2019-06-27 04:19:44 +00:00
Egor Kislitsyn
889a9c3a3f
Polish IdempotencyPlug
2019-06-27 01:53:58 +07:00
Egor Kislitsyn
825077a5b0
Add Idempotency plug
2019-06-26 18:36:58 +07:00
Sergey Suprunenko
d53fb55bb7
Return correct response when reply to a direct message is not direct itself
2019-06-26 10:59:27 +00:00
Maksim Pechnikov
4ad15ad2a9
add ignore hosts and TLDs for rich_media
2019-06-25 22:25:37 +03:00
Maksim Pechnikov
0cb8e710fb
add test
2019-06-25 18:06:08 +03:00
Maksim
a0c4ebb4d7
[ #184 ] small refactoring reset password
2019-06-24 19:01:56 +00:00
Sergey Suprunenko
2c63c67512
Rework user deletion
2019-06-24 18:59:12 +00:00
Eugenij
f2c03425b0
Broadcast conversation update when DM is deleted
2019-06-24 07:14:04 +00:00
kaniini
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
Alex S
b37ede5df3
log capturing
2019-06-23 08:16:28 +03:00
Alex S
982cad0268
support for config groups
2019-06-23 08:16:16 +03:00
Sachin Joshi
a0c65bbd6c
Merge branch 'develop' into 'remove-avatar-header'
...
# Conflicts:
# CHANGELOG.md
2019-06-23 03:25:50 +00:00
Alex S
410add1c30
support for tuples with more than 2 values
2019-06-22 17:30:53 +03:00
lain
0e415921cd
Rich Media Parser: Do not return just a title if nothing else is there.
2019-06-22 16:22:59 +02:00
lain
58c4d5312b
Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
...
This reverts commit b6af80f769
2019-06-22 15:12:57 +02:00
Alex S
f0fccb7578
fix for int and modules
2019-06-22 09:01:30 +03:00
kaniini
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
kaniini
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
kaniini
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
feld
b6af80f769
Revert "Merge branch 'fix/ogp-title' into 'develop'"
...
This reverts merge request !1277
2019-06-21 11:36:32 +00:00
Egor Kislitsyn
fc6e661672
Fix rate limiter tests
2019-06-21 16:47:16 +07:00
Alexander Strizhakov
32320c1ee9
Fixes for dynamic configuration
2019-06-20 17:43:57 +00:00
William Pitcock
21dacd4b15
unbreak polls
2019-06-19 16:33:49 +00:00
William Pitcock
736d8ad6be
implement anti link spam MRF
2019-06-19 15:58:32 +00:00
Alexander Strizhakov
e4fa6b99ac
aliases for mix tasks
...
ecto.migrate
ecto.rollback
2019-06-19 10:33:33 +00:00
lain
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
rinpatch
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
Ivan Tashkinov
9f45f93949
Added more redirect_uri checks to prevent redirect to not explicitly listed URI.
2019-06-18 17:00:49 +03:00
rinpatch
c7acca2abb
Mastodon API: Sanitize display names
...
Closes #1000
2019-06-18 14:12:11 +03:00
rinpatch
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
Haelwenn
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
Alex S
2e2edcb461
capturing errors
2019-06-16 20:10:12 +08:00
Alex S
0f59265a50
salmon fix
...
removed some ownership sandbox error
2019-06-16 20:10:12 +08:00
Maksim
a04bf131e0
[ #570 ] add user:notification stream
2019-06-16 10:33:25 +00:00
rinpatch
bf6aa6f1a8
Fix report content stopping to be nullable
2019-06-16 13:06:12 +03:00
rinpatch
44de34d170
Credo fixes
2019-06-16 01:35:45 +03:00
rinpatch
e943905bd7
Add tests for report view
2019-06-16 01:30:14 +03:00
kaniini
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
lain
a440cf856d
Mastodon API: Return the token needed for the chat.
2019-06-15 10:59:35 +02:00
rinpatch
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
Alexander Strizhakov
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
lain
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
Maksim
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
2019-06-14 11:39:57 +00:00
rinpatch
d0ebc0edf3
Fix hashtags being picked up by rich media parser
...
Closes #989
2019-06-14 14:34:42 +03:00
lain
eac298083f
MastodonAPI: Add a way to update the background image.
2019-06-14 11:19:22 +02:00
lain
5965efb216
AccountView: Add user background.
2019-06-13 19:08:05 +02:00
lain
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
Egor Kislitsyn
30e54fd7e2
Handle HTTP 404 response
2019-06-13 17:13:35 +07:00
Egor Kislitsyn
afae3ada22
Handle HTTP "410 Gone" response
2019-06-13 16:34:03 +07:00
Egor Kislitsyn
a12f8e13c8
Improve <title> fallback; Add a test
2019-06-13 15:02:46 +07:00
Ivan Tashkinov
4b2c29016c
[ #963 ] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
2019-06-12 21:30:06 +03:00
Egor Kislitsyn
6f29865d43
Add option to restrict all users to local content
2019-06-11 21:25:53 +07:00
lain
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
Egor Kislitsyn
ad04d12de6
Replace MastodonAPIController.account_register/2 rate limiter
2019-06-11 16:06:03 +07:00
Egor Kislitsyn
2e5affce61
Add RateLimiter
2019-06-11 14:27:41 +07:00
kaniini
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
Sergey Suprunenko
365268d522
Add more tests for using media_proxy and whitelists
2019-06-10 11:34:11 +00:00
rinpatch
dffc9f060a
replace missing mock with a 404
2019-06-07 20:48:25 +03:00
rinpatch
d020f68e87
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
2019-06-07 20:40:38 +03:00
lain
970f71e222
Conversations: Fetch users in one query.
2019-06-07 17:51:47 +02:00
Roman Chvanikov
01fe5abad1
Resolve conflicts
2019-06-07 01:20:50 +03:00
lain
cb2bcee842
User Search: Boost friends more strongly.
2019-06-06 16:18:27 +02:00
lain
7e9f7ea0c2
MastodonAPI: Add test for user search.
2019-06-06 16:16:22 +02:00
Egor
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
2019-06-06 12:17:49 +00:00
kaniini
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
kaniini
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
lain
ad19bfc7fe
Utils: Split update_follow_state and update_follow_state_for_all.
2019-06-05 16:43:35 +02:00
lain
827a51e777
CommonAPI: Add test for accept_follow_request.
2019-06-05 15:45:16 +02:00
lain
076c9ae40e
User: Remove superfluous maybe_follow.
2019-06-05 14:24:31 +02:00
lain
3115b64cfe
Transmogrifier: Add tests for incoming follows to locked accounts.
2019-06-05 14:10:46 +02:00
Egor Kislitsyn
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 17:53:15 +07:00
lain
024dfdc39c
Typo + Linting.
2019-06-05 12:45:28 +02:00
lain
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
Egor Kislitsyn
5b04f07a1e
Limit search for unauthenticated users to local users only
2019-06-05 16:51:04 +07:00
Egor Kislitsyn
17a6f81f7b
Fix tests with enabled RUM
2019-06-05 16:37:43 +07:00
Egor Kislitsyn
93397fce3d
Contain search for unauthenticated users
2019-06-05 16:37:43 +07:00
kaniini
e4babb1c9f
Merge branch 'explicit-addressing' into 'develop'
...
Explicit addressing
See merge request pleroma/pleroma!1239
2019-06-05 08:28:20 +00:00
Egor Kislitsyn
6ba9055b51
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 12:54:30 +07:00
Roman Chvanikov
b1b1a270e8
Fix conflict
2019-06-05 02:45:21 +03:00
Haelwenn
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
Maksim Pechnikov
d3d1704e84
Merge branch 'develop' into issue/941
2019-06-04 15:06:58 +03:00
lain
a3a7178b60
Participations: Filter out participations without activities.
2019-06-04 13:58:36 +02:00
rinpatch
bbff7554de
Add tests for get_existing_votes
2019-06-04 13:47:53 +03:00
Egor Kislitsyn
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-04 16:28:23 +07:00
lain
4cab98b7bf
Merge remote-tracking branch 'origin/develop' into explicit-addressing
2019-06-04 11:23:46 +02:00
Maksim Pechnikov
4f2e359687
Merge branch 'develop' into issue/941
2019-06-04 09:49:08 +03:00
kaniini
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
Sergey Suprunenko
84cc131b59
Add missing HTTP Request mocks
2019-06-04 05:46:19 +00:00
kaniini
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
Roman Chvanikov
f6036ce3b9
Fix tests
2019-06-04 03:38:53 +03:00
Roman Chvanikov
bd325132ca
Fix tests
2019-06-04 03:07:49 +03:00
Roman Chvanikov
3e17610587
Add task to test emails
2019-06-04 02:48:21 +03:00
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
Maksim Pechnikov
64ada7f960
fix tests
2019-06-03 22:51:14 +03:00
Maksim Pechnikov
f13d6c7f78
update api to set skip_thread_containment
2019-06-03 21:02:57 +03:00
lain
804b6a4d8f
CommonAPI.Utils: Add tests.
2019-06-03 19:08:38 +02:00
lain
80d4d83aac
CommonAPI: Add explicit addressing.
2019-06-03 18:17:08 +02:00
lain
2b664b048e
User: Add function to get AP ids from nicknames.
2019-06-03 18:16:11 +02:00
Maksim Pechnikov
080e1aa70e
add option skip_thread_containment
2019-06-03 16:13:37 +03:00
rinpatch
dc91bcc0af
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 13:16:17 +03:00
lambda
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
rinpatch
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 11:14:52 +03:00
rinpatch
2fe3a20638
Make error message about author's inability to vote more sensible
2019-06-02 23:33:15 +03:00
rinpatch
c47da0e65d
Add tests for poll view
2019-06-02 23:25:33 +03:00
William Pitcock
38a275b31f
test: add tests for subchain policy
2019-06-02 10:08:51 +00:00
kaniini
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
Sachin Joshi
e394fc2eef
fix the flaky test for users creation by admin
2019-06-02 09:49:59 +05:45
rinpatch
cfa588e357
Fix Credo issues
2019-06-01 21:42:29 +03:00
rinpatch
65db5e9f52
Resolve merge conflicts
2019-06-01 16:29:58 +03:00
rinpatch
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
Sachin Joshi
ad5263c647
Merge remote-tracking branch 'upstream/develop' into admin-create-users
2019-06-01 11:42:37 +05:45
Sachin Joshi
5534d4c676
make bulk user creation from admin works as a transaction
2019-06-01 11:17:53 +05:45
kaniini
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
Sergey Suprunenko
2bbc2a801f
Remove all follower collections but actor's from "cc"
2019-06-01 03:26:45 +00:00
kaniini
d46cc7896e
Merge branch 'bugfix/remove-vanilla-flavour' into 'develop'
...
Bugfix: remove vanilla flavour
See merge request pleroma/pleroma!1228
2019-06-01 03:26:05 +00:00
William Pitcock
f2efe24cf8
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
2019-06-01 03:24:08 +00:00
Sachin Joshi
d4304a3945
add the missing mock file
2019-06-01 08:37:10 +05:45
Haelwenn (lanodan) Monnier
5d3ece2861
Remove now useless flavours switching
2019-06-01 01:44:10 +02:00
lambda
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
lain
7861974ab2
MastodonAPI: Add extension to set and get pleroma_settings_store.
2019-05-31 14:50:18 +02:00
lain
aaad85c4d9
AccountView: settings -> settings_store
2019-05-31 14:49:46 +02:00
lain
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
rinpatch
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
rinpatch
a9eaa55885
Fix fix_explicit_addressing moving follower collection to cc and add tests for it
2019-05-31 14:17:05 +03:00
lain
97fb50d9fa
Mastodon Conversation API: Don't return own account in 'accounts'.
2019-05-31 11:27:14 +02:00
Sergey Suprunenko
1690be991e
Replace missing non-nullable Card attributes with empty strings
2019-05-30 21:03:31 +00:00
lambda
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
Egor Kislitsyn
99f70c7e20
Use Pleroma.Config everywhere
2019-05-30 15:33:58 +07:00
Roman Chvanikov
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
Maksim
db94294dfb
[ #936 ] fix tests
2019-05-29 14:04:58 +00:00
Sachin Joshi
1452a96ad6
ability to set and reset avatar, profile banner and backgroud in Mastodon API
2019-05-27 15:31:01 +05:45
lambda
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
William Pitcock
79503ce90f
mrf: simple policy: fix matching imported activitypub and ostatus statuses
2019-05-26 02:01:24 +00:00
William Pitcock
45e4642a58
tests: chase remote/local removal
2019-05-26 00:20:54 +00:00
William Pitcock
59a703fcbe
twitter api: user view: expose user notification settings under pleroma object
2019-05-25 05:31:13 +00:00
William Pitcock
0f7eeb0943
tests: add tests for non-follows/non-followers settings
2019-05-25 05:25:40 +00:00
William Pitcock
1542cccbbc
tests: chase notification setting changes
2019-05-25 05:22:13 +00:00
William Pitcock
56fd7dbdd7
remove @websub and @ostatus module-level constants
2019-05-25 04:43:11 +00:00
William Pitcock
80d55d428f
tests: websub: check only that signature validation succeeds or fails
2019-05-25 04:34:16 +00:00
Aaron Tinio
9415932af5
Keep nodeinfo available when not federating
2019-05-25 08:15:12 +08:00
Sergey Suprunenko
bbea5691da
Mention all people in the beginning of DM
2019-05-24 20:34:23 +00:00
feld
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
Egor Kislitsyn
a7affbdd6d
Fix tests
2019-05-24 21:41:11 +07:00
Egor Kislitsyn
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-24 21:05:57 +07:00
Sachin Joshi
0c53d91f3b
fix merge conflict
2019-05-23 09:45:12 +02:00
William Pitcock
8086c7aed6
tests: add tests for banner and avatar removal
2019-05-22 18:53:12 +00:00
rinpatch
19c90d47c4
Normalize poll votes to Answer objects
2019-05-22 21:17:57 +03:00
Maksim
620908a2db
[ #699 ] add worker to clean expired oauth tokens
2019-05-22 15:44:50 +00:00
lambda
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
2019-05-22 11:04:30 +00:00
lambda
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
rinpatch
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
Haelwenn (lanodan) Monnier
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
Sachin Joshi
17bfd000d7
Ability to reset avatar, profile banner and backgroud
2019-05-22 06:47:18 +02:00
kaniini
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
kaniini
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
Sergey Suprunenko
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
William Pitcock
045803346d
move key generation functions into Pleroma.Keys module
2019-05-22 03:58:15 +00:00
Aaron Tinio
f76268135c
Fix failing test
2019-05-22 07:16:11 +08:00
Aaron Tinio
3ab9255eda
Respond with a 404 Not implemented JSON error message
...
when requested API is not implemented
2019-05-22 07:15:52 +08:00
Aaron Tinio
a13d449b24
Add tests for fallback routes
2019-05-22 05:39:29 +08:00
William Pitcock
73df9d690d
object: fetcher: add support for reinjecting pruned objects
2019-05-21 21:38:56 +00:00
rinpatch
63b0b7190c
MastoAPI: Add GET /api/v1/polls/:id
2019-05-21 20:40:35 +03:00
rinpatch
0407ffe75f
Change validation error status codes to be more appropriate
2019-05-21 17:12:38 +03:00
rinpatch
aafe30d94e
Handle poll votes
2019-05-21 14:12:10 +03:00
rinpatch
3f96b3e4b8
Enforce poll limits and add error handling for MastodonAPI's post endpoint
2019-05-21 10:54:20 +03:00
rinpatch
76a7429bef
Add poll limits to /api/v1/instance and initial state
2019-05-21 09:13:10 +03:00
kaniini
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
Aaron Tinio
eb02edcad9
Add virtual :thread_muted? field
...
that may be set when fetching activities
2019-05-21 00:35:46 +08:00
Sadposter
dc916ba15f
Format mascot tests
2019-05-20 12:58:17 +01:00
Sadposter
e81f0fc6d4
Add mascot get/set tests
2019-05-20 12:58:06 +01:00
Aaron Tinio
2375e9a95b
Add report filtering to MRF.SimplePolicy
2019-05-20 06:02:50 +08:00
rinpatch
5ece901af3
Resolve merge conflicts and remove IO.inspects
2019-05-18 13:37:38 +03:00
rinpatch
fd920c8973
Mastodon API: Add support for posting polls
2019-05-18 13:29:28 +03:00
William Pitcock
dc08159538
also suppress link previews from posts marked #nsfw
2019-05-17 22:13:24 +00:00
William Pitcock
0da1233e8e
rich media: suppress link previews if post is marked as sensitive
2019-05-17 18:49:43 +00:00
lain
f959bf7aa6
MongooseIM: Add basic integration endpoints.
2019-05-17 18:21:11 +02:00
Egor Kislitsyn
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-17 19:57:14 +07:00
Egor Kislitsyn
f2936e0a07
Add ap_id to List
2019-05-17 19:56:37 +07:00
lain
249b31ffe5
Fix specs.
2019-05-17 11:49:13 +02:00
Alexander Strizhakov
7ed682213f
Fix/902 random compile failing
2019-05-17 07:25:20 +00:00
Sachin Joshi
5c028b8f92
user creation admin api will create multiple users
2019-05-17 12:21:58 +05:45
Aaron Tinio
443cd68a4c
Add tests for MRF.SimplePolicy
2019-05-17 09:02:34 +08:00
kaniini
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
Sergey Suprunenko
2c303afc8b
Remove duplicated entries in users' following lists
2019-05-16 20:04:08 +00:00
Sergey Suprunenko
e2b3a27204
Add Reports to Admin API
2019-05-16 19:09:18 +00:00
feld
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
Mark Felder
ebb0482116
Merge branch 'develop' into conversations-import
2019-05-16 13:11:17 -05:00
lambda
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
Alexander Strizhakov
73ae58fdfa
Feature/896 toggling confirmation
2019-05-16 13:23:41 +00:00
Egor Kislitsyn
fc7246d715
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-16 17:54:24 +07:00
Alex S
4711d8151c
try this
2019-05-16 17:35:07 +07:00
Alex S
aa11fa4864
add report uri and report to
2019-05-16 12:49:40 +07:00
Aaron Tinio
2b6119dfbf
Restrict reblogs of activities from blocked domains
2019-05-16 05:53:51 +08:00
Aaron Tinio
64495b96e9
Add test for blocked domains
2019-05-16 05:53:51 +08:00
rinpatch
62e42b03ab
Handle incoming Question objects
2019-05-15 20:10:16 +03:00
William Pitcock
f09c3afdf5
chase test failures
2019-05-15 16:23:01 +00:00
William Pitcock
c7644313e7
test: update obsolete test
2019-05-15 15:54:10 +00:00
lain
f168a1cbdc
Merge remote-tracking branch 'origin/develop' into conversations-import
2019-05-15 17:47:29 +02:00
kaniini
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
lambda
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
William Pitcock
4429c1b7da
tests: fixup
2019-05-15 15:29:42 +00:00
lain
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
2019-05-15 16:30:08 +02:00
Sachin Joshi
ee22fff5ac
remove deprecated PleromaFE configuration
2019-05-15 15:29:59 +05:45
Egor Kislitsyn
a7a8f3bc2c
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-15 14:31:24 +07:00
Aaron Tinio
70c81b95d0
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
2019-05-15 05:09:32 +08:00
Aaron Tinio
7b8dc99ef1
Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
2019-05-15 05:09:29 +08:00
William Pitcock
071f78733a
switch to pleroma/http_signatures library
2019-05-14 20:03:13 +00:00
kaniini
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
Maksim
52297920e7
Refactoring oauth response.
2019-05-14 14:49:45 +00:00
Egor Kislitsyn
d474995efa
Add Tests
2019-05-14 20:12:47 +07:00
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
Aaron Tinio
a18b2c0b12
Fix Pleroma.Config.get!/1 raising an error when value is false
2019-05-14 06:40:59 +08:00
lambda
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
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
Sachin Joshi
7701a4c841
Make irreversible field default to false in filters
2019-05-14 00:13:15 +05:45
rinpatch
15cda998f3
Add a test to ensure create_or_bump_for does not normalize objects before checking the activity type
2019-05-13 10:32:04 +03:00
William Pitcock
582bd9d170
tests: fix AP test failures
2019-05-12 14:40:57 +00:00
William Pitcock
d823eb921b
tests: fix salmon tests
2019-05-12 14:35:38 +00:00
William Pitcock
2b847d4add
tests: chase federator publish_single_foo removals
2019-05-12 05:04:24 +00:00
kaniini
131f883207
Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
...
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
See merge request pleroma/pleroma!1129
2019-05-11 16:52:26 +00:00
Sachin Joshi
f01f995816
make url uniform in admin api
2019-05-11 14:46:00 +05:45
Roman Chvanikov
f1f7a11222
Merge develop
2019-05-11 14:45:54 +07:00
Francis Dinh
2a54e8c1f5
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
...
This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
2019-05-09 19:58:34 -04:00
rinpatch
e4523c3010
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
2019-05-09 22:27:00 +03:00
lain
a33bec7d58
Conversations: Import order, import as read.
2019-05-09 16:39:28 +02:00
lain
a4598b5e8b
Visibility: Make it more resilient.
2019-05-08 18:08:50 +02:00
lain
fcf2f38d20
Conversations: Add a function to 'import' old DMs.
2019-05-08 17:37:00 +02:00
Alexander Strizhakov
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
2019-05-08 14:34:36 +00:00
Roman Chvanikov
b6b5b16ba4
Merge develop
2019-05-08 17:08:06 +07:00
rinpatch
4c5125dedc
Remove bookmarks assoc and add a fake bookmark assoc instead
2019-05-07 19:33:22 +00:00
rinpatch
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
2019-05-07 19:33:22 +00:00
rinpatch
f841eb7cdb
Preload bookmarks wherever the object is preloaded
2019-05-07 19:33:22 +00:00
lambda
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
2019-05-07 14:43:21 +00:00
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-07 16:51:11 +07:00
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06 17:51:03 +00:00
lambda
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
2019-05-06 17:17:03 +00:00
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
2019-05-06 16:45:22 +00:00
lain
eb0fb73ddb
BBS: Credo fixes.
2019-05-04 15:47:50 +02:00
lain
c58fd4c038
BBS: Fix tests.
2019-05-04 15:36:48 +02:00
lain
4c76f49e60
BBS: small fixes.
2019-05-04 15:06:18 +02:00
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
Haelwenn (lanodan) Monnier
b5ad1715b2
MastoAPI: profile update with emoji_map
2019-05-03 16:41:23 +02:00
Haelwenn (lanodan) Monnier
2f76a40d02
formatter.ex: Add get_emoji_map/1
2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier
d70af32127
Pleroma.User: remove emojify on parse_bio
2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier
85b5c60694
Pleroma.Formatter: width/height to class=emoji
2019-05-03 16:25:58 +02:00
lain
81d1aa424d
Streamer: Stream out Conversations/Participations.
2019-05-03 13:39:14 +02:00
lambda
497d34b825
Merge branch 'iss-849' into 'develop'
...
Parse access_token from body parameters and URL parameters
See merge request pleroma/pleroma!1103
2019-05-02 14:17:17 +00:00
AkiraFukushima
a53a6c9d64
Add oauth plug tests for url and body parameters
2019-05-02 22:25:21 +09:00
Roman Chvanikov
8af55728e4
Fix tests
2019-05-01 19:03:55 +02:00
lain
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
2019-05-01 18:40:41 +02:00
Maksim
c854bff8f5
Refactored Pleroma.Web.Auth.Authenticator
2019-05-01 13:28:04 +00:00
lambda
0bcdaf378e
Merge branch 'bugfix/web-notification-special-char' into 'develop'
...
fix the web push notification with special char for status created
See merge request pleroma/pleroma!1092
2019-05-01 10:45:32 +00:00
Alex S
f11e7037c2
test fixes
2019-05-01 16:09:53 +07:00
Sachin Joshi
cd6da3606b
Merge branch 'develop' into bugfix/web-notification-special-char
2019-05-01 00:21:30 +05:45
Roman Chvanikov
0f0cc2703b
Merge develop
2019-04-30 20:17:52 +07:00
lain
b0951a8849
WebPush: Use Object.normalize, rewrite tests so they test reality.
2019-04-29 18:15:30 +02:00
rinpatch
0fd176b990
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
...
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
2019-04-29 06:45:18 +00:00
kaniini
292c69481b
Merge branch 'regression/rights-only-for-admin' into 'develop'
...
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators
See merge request pleroma/pleroma!1102
2019-04-28 23:05:14 +00:00
rinpatch
61ca2f7a4e
Fix rights in TwitterAPI's user entity being present only for
...
Admins/Moderators
In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
2019-04-28 19:42:43 +03:00
rinpatch
ce3789e39a
Add default_scope to /api/v1/update_credentials
2019-04-27 23:55:54 +03:00
rinpatch
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
2019-04-27 23:06:46 +03:00
kaniini
002ea343f8
Merge branch 'feature/bbcode' into 'develop'
...
BBCode support (backend)
See merge request pleroma/pleroma!1097
2019-04-27 07:44:24 +00:00
William Pitcock
ef52aa0e66
tests: fix up for changed bbcode library output and verify html is properly escaped
2019-04-26 22:45:45 +00:00
William Pitcock
501af917b5
add support for bbcode
2019-04-26 22:35:02 +00:00
lambda
4de5fef1f8
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
...
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
2019-04-26 11:59:47 +00:00
kaniini
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
2019-04-26 02:41:35 +00:00
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
2019-04-25 18:11:47 -05:00
rinpatch
dfc8425659
Move settings to Source subentity
2019-04-25 10:31:14 +03:00
Alex S
85953c0836
fixes for tests
2019-04-25 13:46:40 +07:00
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00
Alex S
73d01857e3
bookmarks in separate table
2019-04-25 13:38:24 +07:00
William Pitcock
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
2019-04-25 00:48:45 +00:00
rinpatch
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
2019-04-24 20:01:42 +03:00
Sachin Joshi
963d5774af
fix the status notification with special char
2019-04-24 07:06:17 +05:45
kaniini
030a7876b4
Merge branch 'security/fix-html-class-scrubbing' into 'develop'
...
html: lock down allowed class attributes to only those related to microformats
See merge request pleroma/pleroma!1090
2019-04-23 23:07:56 +00:00
William Pitcock
f5535e5743
html: lock down allowed class attributes to only those related to microformats
2019-04-23 23:03:45 +00:00
Sergey Suprunenko
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
2019-04-23 02:47:43 +00:00
rinpatch
f60d072bbb
Add pleroma.in_reply_to_account_acct to MastoAPI status entity
2019-04-22 11:54:27 +03:00
Egor
b9cdf6d3b9
Use User.get_cached* everywhere
2019-04-22 07:20:43 +00:00
Alexander Strizhakov
88f0be9693
Feature/826 healthcheck endpoint
2019-04-22 07:19:53 +00:00
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-22 13:08:30 +07:00
kaniini
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
2019-04-22 02:07:19 +00:00
Roman Chvanikov
2662bea4e0
Add accounts and last_status to conversation read response
2019-04-21 20:26:13 +07:00
Ivan Tashkinov
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
2019-04-21 10:51:32 +03:00
eugenijm
375fd21055
Set correct values in the MastoAPI reblog status view
2019-04-21 05:40:22 +03:00
Roman Chvanikov
724311e151
Fix Credo warnings
2019-04-20 19:57:43 +07:00
Roman Chvanikov
60f213bb1a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-20 19:43:06 +07:00
Ekaterina Vaartis
aef3a3ca46
Fix tests that used finmoji
2019-04-20 11:34:00 +03:00
Ekaterina Vaartis
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
2019-04-20 11:17:17 +03:00
eugenijm
fa48532387
Handle reblogs on the first follow request in MastoAPI
2019-04-20 04:39:49 +03:00
kaniini
9da8b287f8
Merge branch 'feature/database-compaction' into 'develop'
...
database compaction
See merge request pleroma/pleroma!473
2019-04-19 16:55:33 +00:00
Roman Chvanikov
73407f4eea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-19 23:27:13 +07:00
Roman Chvanikov
bc7862106d
Fix tests
2019-04-19 23:26:41 +07:00
Roman Chvanikov
8add119444
Add User.list_inactive_users_query/1
2019-04-19 22:19:00 +07:00
Roman Chvanikov
aeafa0b2ef
Add Notification.for_user_since/2
2019-04-19 22:16:17 +07:00
Alexander Strizhakov
ada384207b
typo fix
...
docs for RelMe provider
2019-04-19 07:50:21 +00:00
lambda
218d96a26b
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
...
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
2019-04-19 07:49:26 +00:00
rinpatch
4ef237f26a
Fix my incorrect search test fix
2019-04-18 14:37:57 +03:00
rinpatch
83589ca6a5
Merge branch 'develop' into feature/database-compaction
2019-04-18 12:56:38 +03:00
rinpatch
6069d0fd36
Fix object search depending on embeded object
2019-04-18 09:28:20 +03:00
rinpatch
2abc09570f
Use the preloaded object in tag queries
2019-04-18 01:37:04 +03:00
William Pitcock
36f78c6dcd
activitypub: fix filtering of boosts from blocked users
2019-04-17 22:27:59 +00:00
William Pitcock
2140e164d7
activitypub: properly filter out transitive activities concerning blocked users
2019-04-17 20:05:09 +00:00
rinpatch
35ac672b8d
Remove containment tests from transmogrifier and fix thread visibility solver
2019-04-17 17:59:15 +03:00
rinpatch
d1eb578a57
Refactor tests that used ActivityPub.fetch_object_from_id
2019-04-17 17:03:35 +03:00
rinpatch
8e4d950f31
Remove updating reply count for embeded objects
2019-04-17 15:54:09 +03:00
rinpatch
ff8d76c670
Refactor all tests that acessed the embeded object
2019-04-17 15:46:59 +03:00
rinpatch
54b82f236b
Fix note count test
2019-04-17 15:03:17 +03:00
rinpatch
ad681877df
Make credo happy
2019-04-17 14:52:01 +03:00
rinpatch
e7c3c36766
Update functions in object fetcher for tesla and set up a proper mock for tests
2019-04-17 14:21:39 +03:00
rinpatch
b09ae02c04
Added some more normalization calls all in mastodon api controller
2019-04-17 13:04:58 +03:00
Roman Chvanikov
2f0203a4a1
Resolve conflicts
2019-04-17 16:59:05 +07:00
Roman Chvanikov
87013f8438
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-17 16:58:08 +07:00
rinpatch
dda4e0e2a8
Fix warnings in object tests
2019-04-17 12:27:29 +03:00
rinpatch
627e5a0a49
Merge branch 'develop' into feature/database-compaction
2019-04-17 12:22:32 +03:00
kaniini
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
2019-04-16 18:44:07 +00:00
Haelwenn
cde7711b12
Merge branch 'bugfix/relax-spam-protection' into 'develop'
...
activitypub: allow indirect messages from users being followed at a personal inbox
See merge request pleroma/pleroma!1069
2019-04-16 18:38:11 +00:00
Normandy
d4a749cfb2
Handle new-style mastodon follow lists
...
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
2019-04-16 18:35:38 +00:00
William Pitcock
750b369d04
activitypub: allow indirect messages from users being followed at a personal inbox
2019-04-16 18:31:12 +00:00
lain
76999c73a7
Conversation: Add accounts to output.
2019-04-15 22:28:42 +02:00
lain
0da985182f
Conversation: Return full status object, id is a string.
2019-04-15 21:58:58 +02:00
lain
c1ebb38d3a
Conversation: Also create participations for remote users.
...
Needed to get the participating user list.
2019-04-15 21:45:25 +02:00
lambda
56956de6fa
Merge branch 'fix/status-reblogged' into 'develop'
...
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
2019-04-15 10:26:23 +00:00
lambda
f358295cbe
Merge branch 'unfollow-oneself' into 'develop'
...
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
2019-04-15 10:24:37 +00:00
eugenijm
27d78dc526
Use User.get_cached_by*
2019-04-15 12:37:49 +03:00
rinpatch
fd2e31af86
oops
2019-04-15 11:59:01 +03:00
rinpatch
5d73dca064
Remove inReplyToStatusId
2019-04-15 11:50:36 +03:00
eugenijm
507e7821e3
Handle follow/unfollow directed to themselves
2019-04-15 10:21:18 +03:00
Roman Chvanikov
dc21181f65
Update updated_at field on notification read
2019-04-14 22:29:05 +07:00
eugenijm
679a8ef629
Assign reblogged in the Mastodon reblog status view
2019-04-14 11:35:15 +03:00
Roman Chvanikov
0cd4b6024d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-14 14:05:21 +07:00
Roman Chvanikov
371a4aed2c
Add User.Info.email_notifications
2019-04-13 17:40:42 +07:00
Alex S
c5d0fffeaf
naming fix
2019-04-13 14:55:42 +07:00
Alex S
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
2019-04-13 12:24:38 +07:00
lambda
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
2019-04-12 10:41:09 +00:00
Egor Kislitsyn
d0304b4f92
more tests
2019-04-12 16:51:28 +07:00
Egor Kislitsyn
dd097a406b
add tests
2019-04-12 16:38:32 +07:00
lambda
0a09692c7d
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
...
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
2019-04-12 09:34:12 +00:00
Alexander Strizhakov
711ade961e
adding destroy multiple for mastofe
2019-04-12 02:28:46 +00:00
Alexander Strizhakov
e03d24af96
in_reply_to_id - null
2019-04-12 02:21:32 +00:00
lain
6f880b1627
Conversation: Fix tests.
2019-04-11 13:31:20 +02:00
lain
36ec8d9694
ActivityPub: Fix specs.
2019-04-11 13:20:46 +02:00
Ivan Tashkinov
c3f12cf3c3
[ #923 ] OAuth consumer params handling refactoring.
...
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
2019-04-10 21:40:38 +03:00
lain
c352a0aba6
Conversations: Make tests run.
2019-04-10 17:48:31 +02:00
lain
cf353514fe
Participations: Add last activity.
2019-04-10 17:28:02 +02:00
lain
20d9b90760
Participation: Get for a user.
2019-04-10 17:05:33 +02:00
lain
280172f6f6
Conversations: Create or bump on inserting a dm.
2019-04-10 16:33:45 +02:00
lain
64c1c3a407
Participations: Add marking as read and unread.
2019-04-10 15:12:01 +02:00
lain
d1da6b155a
Conversation: Add Conversations and Participations.
2019-04-10 15:01:42 +02:00
Alex S
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
2019-04-10 18:06:54 +07:00
Alex S
fe13a1d78c
adding notify_email setting for trigger emails
2019-04-10 17:57:41 +07:00
lambda
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
2019-04-10 10:10:08 +00:00
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
2019-04-10 10:44:54 +01:00
lain
b5cecebbc1
Conversations: Fix specs.
2019-04-10 09:32:17 +02:00
lambda
c8440b5e0c
Merge branch 'fix/emoji-api-nonsense' into 'develop'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
2019-04-10 06:22:51 +00:00
Haelwenn (lanodan) Monnier
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
2019-04-10 06:33:20 +02:00
kaniini
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
2019-04-10 02:10:31 +00:00
rinpatch
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
2019-04-09 23:20:31 +03:00
rinpatch
144648de92
Merge branch 'mastoapi/plaintext-statuses' into 'develop'
...
Provide plaintext representations of content/cw in MastoAPI
Closes #787
See merge request pleroma/pleroma!1035
2019-04-09 17:25:31 +00:00
lambda
0a02ed7a2f
Merge branch 'bugfix/follower_count' into 'develop'
...
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
2019-04-09 07:30:38 +00:00
Sachin Joshi
07afb9b537
update the follower count when a follower is blocked
2019-04-09 09:15:45 +05:45
Alex S
fee50636d0
removing not needed invite update
2019-04-08 20:08:16 +07:00
lain
a9f805c871
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
2019-04-08 14:10:51 +02:00
Egor Kislitsyn
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
2019-04-08 18:48:10 +07:00
Sadposter
13ff312c48
Sever subscription in case of block
2019-04-08 12:46:12 +01:00
lambda
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
2019-04-08 11:42:20 +00:00
lambda
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
2019-04-08 11:41:50 +00:00
Alexander Strizhakov
36c0a10fdf
adding language tag
2019-04-08 11:03:10 +00:00
Alex S
f0ca0696c8
test for valid_invite?
2019-04-08 17:06:04 +07:00
lambda
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
2019-04-08 09:50:00 +00:00
Egor Kislitsyn
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
2019-04-08 16:46:59 +07:00
Ivan Tashkinov
44829d9181
AdminApiControllerTest unused variables fix.
2019-04-08 12:32:55 +03:00
Egor Kislitsyn
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
2019-04-08 16:29:20 +07:00
Ivan Tashkinov
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
2019-04-08 12:20:26 +03:00
lambda
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
2019-04-08 09:18:01 +00:00
lambda
b177e1e7f3
Merge branch 'scheduled-activities' into 'develop'
...
Scheduled activities
See merge request pleroma/pleroma!989
2019-04-08 09:08:18 +00:00
Alex S
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
2019-04-08 16:01:28 +07:00
Sadposter
76fdfd1c7f
Add check on activity visibility in sub notification
2019-04-07 15:11:29 +01:00
Alex S
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
2019-04-07 19:48:52 +07:00
feld
fb2040d061
Merge branch 'fix/deactivated-user-error' into 'develop'
...
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
2019-04-06 22:19:30 +00:00
eugenijm
2056efa714
Add scheduler for sending scheduled activities to the queue
2019-04-06 23:56:29 +03:00
eugenijm
fc92a0fd8d
Added limits and media attachments for scheduled activities.
2019-04-06 23:55:58 +03:00
eugenijm
b3870df51f
Handle scheduled_at on status creation.
2019-04-06 23:55:58 +03:00
eugenijm
7bf622ce73
Add scheduled activities
2019-04-06 23:55:58 +03:00
eugenijm
7aa53d52bd
Return 403 on oauth token exchange for a deactivated user
2019-04-06 23:27:55 +03:00
feld
876965a7e7
Merge branch 'fix/failed-legacy-test' into 'develop'
...
Mock :crypt.crypt/2 to pass LegacyAuthenticationPlugTest on Mac OS
See merge request pleroma/pleroma!1030
2019-04-06 16:03:35 +00:00
Alex S
ce8d457132
little channges
2019-04-06 22:38:35 +07:00
Alex S
76d8928cf1
fix for field name
2019-04-06 20:49:43 +07:00
Alex S
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-06 20:34:00 +07:00
Alex S
dcc54f8cfa
admin api endpoints for invites
2019-04-06 20:25:19 +07:00
Alex S
47b07cec49
token -> invite renaming
2019-04-06 20:24:22 +07:00
Alex S
be54e40890
twitter api registration
...
fix for twitter api tests
2019-04-06 17:18:59 +07:00
Alex S
0484f3a8b1
generating tokens with mix
2019-04-06 16:58:22 +07:00
Sergey Suprunenko
325a268017
Redirect to the referer url after mastofe authorization
2019-04-05 23:36:42 +00:00
Sergey Suprunenko
e9c075d05c
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS
2019-04-05 22:48:11 +02:00
Mark Felder
fac76bfa35
We actually want the user id not nickname in the test...
2019-04-05 12:11:19 -05:00
Mark Felder
c746087f57
Also remove Repo functions in the tests
2019-04-05 11:59:56 -05:00
Roger Braun
7895ee37fa
Add user following / unfollowing to the admin api.
2019-04-05 11:27:07 -05:00
Sadposter
a270e7a191
Mix format everything
2019-04-05 17:07:58 +01:00
Sadposter
f6e131eeb9
Don't use twitterAPI for subscription tests
2019-04-05 17:02:09 +01:00
Sadposter
9ca91cbb87
Change relationship direction of subscriptions
2019-04-05 17:02:07 +01:00
Sadposter
73afd13c21
Add subscription key to one test I forgot about
2019-04-05 15:37:36 +01:00
Sadposter
06cd547fc6
Format subscriptions related stuff
2019-04-05 15:30:34 +01:00
Sadposter
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
2019-04-05 15:30:31 +01:00
Sadposter
75c4ceb4a2
Add tests for subscriptions
2019-04-05 15:30:29 +01:00
Egor Kislitsyn
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
2019-04-05 19:38:44 +07:00
Ivan Tashkinov
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
2019-04-05 15:12:02 +03:00
Ivan Tashkinov
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
2019-04-05 09:19:17 +03:00
Ivan Tashkinov
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-04 23:43:08 +03:00
Ivan Tashkinov
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
2019-04-04 22:41:03 +03:00
Egor Kislitsyn
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
2019-04-04 16:10:43 +07:00
Haelwenn
0cb94cfa94
Merge branch 'fix-slow-relationships' into 'develop'
...
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
2019-04-02 18:43:48 +00:00
lambda
256b492a58
Merge branch 'bugfix/wrong-date-format' into 'develop'
...
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
2019-04-02 14:18:23 +00:00
lambda
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
2019-04-02 14:17:43 +00:00
lain
39bcf93007
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
2019-04-02 16:10:38 +02:00
lain
fd07745d1b
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
2019-04-02 16:08:55 +02:00
Alex S
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
2019-04-02 20:39:52 +07:00
lambda
180b87257c
Merge branch 'bugfix/share-mastodon' into 'develop'
...
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
2019-04-02 12:47:40 +00:00
lambda
ce9284b36f
Merge branch 'remove-user-activities' into 'develop'
...
[#757 ] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
2019-04-02 12:45:29 +00:00
lambda
b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
2019-04-02 12:43:28 +00:00
Alex S
9e0567ec52
Merge develop into feature/770-add-emoji-tags
2019-04-02 19:16:29 +07:00
rinpatch
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
2019-04-02 14:31:18 +03:00
Egor Kislitsyn
20c619f85f
replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname) in tests
2019-04-02 17:58:32 +07:00
lambda
091baf9316
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
...
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
2019-04-02 10:57:38 +00:00
lambda
26d509cc86
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
2019-04-02 10:52:29 +00:00
cascode
95c92c49c9
Fix account lookup for nicknames beginning with numbers
2019-04-02 10:51:33 +00:00
Egor Kislitsyn
9a59c26619
replace Repo.get_by(User, ap_id: ap_id) with User.get_by_ap_id(ap_id)
2019-04-02 17:47:52 +07:00
Ivan Tashkinov
15ce710460
Added "GET /oauth/authorize" tests.
2019-04-02 13:43:33 +03:00
Egor Kislitsyn
11c2d6bdc4
change Repo.get(Activity, id) => Activity.get_by_id(id) in tests
2019-04-02 17:08:03 +07:00
Egor Kislitsyn
1b3d921921
change Repo.get(User, id) => User.get_by_id(id)
2019-04-02 17:01:26 +07:00
Sergey Suprunenko
3db9235150
Ignore dates in wrong formats
2019-04-02 11:32:36 +02:00
Egor Kislitsyn
a14742f495
add user delete_activities mix task
2019-04-02 16:30:11 +07:00
Alex S
484162c187
test fix
2019-04-02 16:26:40 +07:00
Alex S
9b2188da7c
refactoring of emoji tags config to use groups
2019-04-02 15:44:56 +07:00
Ivan Tashkinov
aac48d0cc6
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
2019-04-02 09:19:10 +03:00
Sachin Joshi
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
2019-04-02 10:26:09 +05:45
Sergey Suprunenko
b6f9f7b8aa
Handle dates in the Unix timestamp format ( Fixes #763 )
2019-04-01 22:45:24 +02:00
Sachin Joshi
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
2019-04-01 22:26:58 +05:45
Alex S
17d3d05a71
code style
...
little fix
2019-04-01 17:54:30 +07:00
Alex S
3601f03147
Adding tag to emoji ets table
...
changes in apis
2019-04-01 17:17:57 +07:00
lain
e3bf6655ba
Add replying.
2019-03-31 21:24:29 +02:00
lain
10fdc080a0
BBS: Tests and formatting.
2019-03-31 20:35:10 +02:00
rinpatch
1bb4d5d65b
Implement fake status submit
2019-03-29 21:59:04 +03:00
Egor
9a39d1d846
Replace Pleroma.Jobs with pleroma_job_queue
2019-03-29 12:46:05 +00:00
Haelwenn (lanodan) Monnier
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
2019-03-28 17:23:21 +01:00
eugenijm
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
2019-03-28 18:55:16 +03:00
eugenijm
55d086b520
Notification controls
...
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
2019-03-28 07:52:07 +03:00
eugenijm
10c81fc902
Add user show endpoint for Pleroma admin API
2019-03-27 21:44:15 +03:00
lambda
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
2019-03-27 11:33:13 +00:00
rinpatch
776bb5137f
Fix muting reblogs tests
2019-03-27 13:43:43 +03:00
Maxim Filippov
3cf7539bca
Add more user filters + move search to its own module
2019-03-27 03:51:59 +05:00
eugenijm
a4ab60ac54
Add vapid_key to the POST /api/v1/apps response
2019-03-26 23:27:37 +03:00
eugenijm
691d1208b5
Add GET /api/v1/apps/verify_credentials
2019-03-26 21:53:28 +03:00
lambda
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
2019-03-26 16:12:50 +00:00
lambda
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
2019-03-26 16:01:52 +00:00
lain
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
2019-03-26 16:59:28 +01:00
Ivan Tashkinov
47b49ab1a1
Test for MastoAPI /api/v1/instance response structure (formatting fix).
2019-03-26 18:18:36 +03:00
lambda
9e3899bf36
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
...
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
2019-03-26 15:13:55 +00:00
Ivan Tashkinov
caf0e9cf33
Test for MastoAPI /api/v1/instance response structure.
2019-03-26 18:13:24 +03:00
lambda
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
2019-03-26 14:49:09 +00:00
rinpatch
aacdcac1be
Credo is upset about me not remembering the alphabet
2019-03-26 17:35:45 +03:00
rinpatch
087662d4fb
Fix formatting
2019-03-26 17:18:18 +03:00
rinpatch
406d19331f
Remove ActivityRepresenter
2019-03-26 17:16:21 +03:00
eugenijm
568e348588
Increment replies_count on replies (MastoAPI)
2019-03-26 15:27:04 +03:00
Ivan Tashkinov
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true.
2019-03-26 15:09:06 +03:00
William Pitcock
26b0c802c3
fix up missing announcements with preloads
2019-03-25 07:38:09 +00:00
rinpatch
a32bcab04b
Merge branch 'fix/eldap-warnings' into 'develop'
...
Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956
2019-03-24 11:17:40 +00:00
William Pitcock
4a3dd86a55
tests: fix up activity collision test
2019-03-23 03:17:51 +00:00
William Pitcock
aaec91b9a1
relay test: don't do preloading (since follow objects are activities, it's a mess)
2019-03-23 01:23:02 +00:00
William Pitcock
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
2019-03-23 01:09:12 +00:00
lambda
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
2019-03-22 11:03:56 +00:00
lain
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
2019-03-22 11:57:20 +01:00
rinpatch
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
2019-03-22 08:39:49 +03:00
kaniini
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
William Pitcock
a223e65f35
tests: fixup
2019-03-21 23:56:57 +00:00
William Pitcock
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
2019-03-21 23:25:41 +00:00
William Pitcock
fea3696799
common api: move context functions from twitterapi
2019-03-21 23:24:04 +00:00
lain
bf27190f7f
UtilController: Return state of safe dm mentions.
2019-03-21 16:20:58 +01:00
link0ff
f858df819b
Skip tests in LDAPAuthorizationTest if :eldap module is unavailable
2019-03-21 12:31:16 +02:00
kaniini
b68fb3dc17
Merge branch 'imageoptim' into 'develop'
...
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
2019-03-21 00:59:24 +00:00
lain
8468f3f6d4
Add safe dm mode option.
2019-03-20 21:09:36 +01:00
Maxim Filippov
ed8a2935f5
Use ILIKE to search users
2019-03-20 01:37:40 +03:00
William Pitcock
455bb526f6
test: add test for list sanitization
2019-03-19 17:53:40 +00:00
William Pitcock
fd0aa58ee0
tests: add test for as:Public issues
2019-03-19 17:49:29 +00:00
optikfluffel
00c5d7248f
fix UploadTest to use new image_tmp.jpg
2019-03-19 10:10:48 +01:00
optikfluffel
a907522690
used imageOptim to reduce size of image files
2019-03-19 10:10:48 +01:00
kaniini
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
2019-03-18 23:08:31 +00:00
eugenijm
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
2019-03-18 11:27:27 +03:00
Haelwenn (lanodan) Monnier
42d034505a
Add test for conversation API beforehand
2019-03-17 16:51:26 +01:00
Fong-Wan Chau
4ed2618f6c
Allow 'rel' attribute on <a> link with specific values (for hashtag recognition).
2019-03-17 11:03:19 -04:00
Maxim Filippov
76a13bc5a2
Fix test
2019-03-17 13:29:28 +03:00
Maxim Filippov
93291c3d7a
Order users by nickname
2019-03-17 13:23:31 +03:00
kaniini
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
2019-03-16 19:27:56 +00:00
lambda
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
2019-03-16 08:44:02 +00:00
kaniini
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
2019-03-16 04:31:31 +00:00
William Pitcock
40134598a8
test: fix defective ldap setup/teardown
2019-03-16 04:05:19 +00:00
William Pitcock
e0edc706cf
oauth: add me property to token responses
2019-03-16 01:12:50 +00:00
eugenijm
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
kaniini
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
link0ff
a070dd4a83
Add tests for LDAP authorization
2019-03-15 16:28:46 +02:00
Karen Konou
ebfc10c834
Fix streamer test
2019-03-15 14:20:08 +01:00
Karen Konou
da53c079db
Refactor to store user ap_id, add tests
2019-03-15 14:20:08 +01:00
Karen Konou
13c298d354
Fix tests to assume reblogs shown by default
2019-03-15 14:18:21 +01:00
Haelwenn
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
2019-03-15 09:48:50 +00:00
rinpatch
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
2019-03-15 11:58:12 +03:00
kaniini
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
2019-03-15 02:59:17 +00:00
eugenijm
100413bf2c
Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
2019-03-15 01:35:48 +03:00
rinpatch
cbdd11c381
Merge develop to bump elixir version in the CI so I don't get failing formatting
2019-03-14 22:33:20 +03:00
rinpatch
355f285a86
Fix uploaded media plug test
2019-03-14 22:26:54 +03:00
William Pitcock
414d4b8088
test: add a test for accepting inbound Flag activities
2019-03-14 19:04:33 +00:00
rinpatch
e2fe796c63
Add some tests
2019-03-14 22:02:48 +03:00
Maxim Filippov
257d8e78e5
Add tags
2019-03-14 01:52:24 +03:00
Maxim Filippov
4872914d32
Add test when local is false
2019-03-13 17:56:15 +03:00
Maxim Filippov
d5edff6ce6
Fix test
2019-03-13 16:14:31 +03:00
Maxim Filippov
490d9cf7b1
Add "local" to users admin API
2019-03-13 16:04:44 +03:00
Haelwenn (lanodan) Monnier
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
Haelwenn (lanodan) Monnier
6c8743d0c0
[Credo] Fix the warnings
2019-03-13 04:17:30 +01:00
Maxim Filippov
25eb6cf1cb
Add "roles" to users admin API
2019-03-12 22:15:28 +03:00
kaniini
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
2019-03-12 16:27:47 +00:00
eugenijm
984b5f8adf
MastoAPI followers/following endpoints
2019-03-12 16:01:24 +03:00
rinpatch
faf238c1b0
Fix upload tests
2019-03-12 15:33:15 +03:00
lain
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
2019-03-11 15:18:32 +01:00
lambda
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
2019-03-11 13:26:12 +00:00
lain
4811eefa6e
MastoAPI StatusView: Add locality indicator.
2019-03-11 13:48:27 +01:00
eugenijm
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
2019-03-11 09:02:03 +03:00
kaniini
735f40047a
Merge branch 'delete-status' into 'develop'
...
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
2019-03-08 22:47:41 +00:00
kaniini
130fc9eae6
Merge branch 'fetch-posts-on-first-federation' into 'develop'
...
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
2019-03-08 22:33:31 +00:00
eugenijm
2827dfea50
Allow an admin to delete a user status
2019-03-08 20:21:56 +03:00
Ekaterina Vaartis
b775fded10
Add tests for fetch_ordered_collection
2019-03-08 16:28:40 +03:00
William Pitcock
3c5926fe91
tests: add regression test
2019-03-07 12:20:04 +00:00
rinpatch
992145e64c
Merge branch 'bugfix/delete-activity-audience' into 'develop'
...
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
2019-03-07 11:31:08 +00:00
eugenijm
7342b5a45f
Preserve parameters in link headers (Mastodon API)
2019-03-07 09:12:16 +03:00
kaniini
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
2019-03-06 22:27:42 +00:00
kaniini
07f8c79a69
Merge branch 'bugfix/rel-me_list' into 'develop'
...
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
2019-03-06 13:20:51 +00:00
Maksim
bc7570c282
[ #647 ] tests for web push
2019-03-06 13:20:12 +00:00
Haelwenn
96901b6554
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
...
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
2019-03-06 01:45:17 +00:00
Karen Konou
28d5b40d0a
Add handling of objects not in database
2019-03-05 23:15:22 +01:00
rinpatch
40ff8f5964
Add tests for reserved char escaping in upload
2019-03-05 19:28:58 +03:00
rinpatch
bcd8ef65e0
Merge branch 'add-admin-to-node-info' into 'develop'
...
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
2019-03-05 07:05:44 +00:00
Haelwenn (lanodan) Monnier
788a354ce0
Web.RelMe: Fix having other values in rel attr
...
One example of this is Github which puts a rel="nofollow me" on the
profile link.
2019-03-05 02:13:22 +01:00
eugenijm
d1de0a30cc
Include admins in nodeinfo
2019-03-05 03:17:24 +03:00
Maxim Filippov
e34710b988
Format & update docs
2019-03-04 21:33:53 +03:00
William Pitcock
9f3cb38012
helpers: use AutoLinker to validate URIs as well as the other tests
2019-03-04 18:31:49 +00:00
William Pitcock
d7a278a733
tests: add tests for rich media helper functions
2019-03-04 18:31:49 +00:00
kaniini
d45dbdce5a
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
...
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
2019-03-04 18:29:13 +00:00
Maxim Filippov
f620199836
Merge search endpoint into /users
2019-03-04 21:26:32 +03:00
Maxim Filippov
cc7b35e097
Add status text to notifications (mentions and reposts)
2019-03-04 20:47:34 +03:00
kaniini
ca5d894e68
Merge branch 'fix/like-adressing' into 'develop'
...
Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896
2019-03-04 15:59:57 +00:00
rinpatch
33c614bce0
Stop adresssing like activities to actor's follower collection on non-public posts
2019-03-04 18:09:58 +03:00
Karen Konou
aab86698a5
Expand "to" of delete activities
2019-03-04 11:18:45 +01:00
eugenijm
86e4b48a5e
Fix DM visibility for blocking users
2019-03-04 06:24:27 +03:00
kaniini
ace4231628
Merge branch 'features/bio_rel_me' into 'develop'
...
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
2019-03-03 16:00:49 +00:00
kaniini
6c6a2dbfdd
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
...
Add pagination and search to users
See merge request pleroma/pleroma!873
2019-03-03 15:59:15 +00:00
kaniini
b531e366df
Merge branch 'get-follow-requests-sql' into 'develop'
...
Use sql query in User.get_follow_requests/1 for filtering logic
See merge request pleroma/pleroma!883
2019-03-03 15:51:32 +00:00
kaniini
c93479c6f5
Merge branch 'count-only-public-statuses' into 'develop'
...
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
2019-03-03 15:49:19 +00:00
eugenijm
d5418e9ff7
Remove follow_request_count as it's not needed for FE anymore.
...
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
2019-03-03 18:42:27 +03:00
lambda
9b63fda9c7
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
...
[#675 ] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
2019-03-03 11:13:59 +00:00
eugenijm
c46950d3b1
Increment user note count only on public activities
2019-03-03 14:08:43 +03:00
eugenijm
1a1f4520cd
Use sql query in User.get_follow_requests/1 for filtering logic
2019-03-02 22:18:56 +03:00
Maxim Filippov
bf30df99cb
We do not guarantee the order of elements when we search
2019-03-02 17:32:40 +03:00
Maxim Filippov
2ec8cf5665
Add pagination to search
2019-03-02 17:21:30 +03:00
rinpatch
f38c316e6e
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
...
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
2019-03-02 06:39:07 +00:00
Haelwenn (lanodan) Monnier
7b9868f343
Pleroma.UserTest: Add tests for rel=me
2019-03-02 06:59:09 +01:00
Haelwenn (lanodan) Monnier
8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
2019-03-02 06:58:42 +01:00
Haelwenn (lanodan) Monnier
25e588496a
Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe
2019-03-02 06:31:33 +01:00
Haelwenn (lanodan) Monnier
bb9e40968a
Web.OAuth.OAuthControllerTest: Add test against token formatting
2019-03-02 04:10:57 +01:00
Maxim Filippov
a25c1313ae
Format
2019-03-01 21:07:05 +03:00
Maxim Filippov
aaa9fed1ca
Fix user_test
2019-03-01 20:58:47 +03:00
Maxim Filippov
f384a9a256
Format
2019-03-01 20:23:19 +03:00
Maxim Filippov
f1a4c3163b
Show current user in users list as well
2019-03-01 20:23:03 +03:00
Maxim Filippov
5b08b470f6
Add "local" params to users search
2019-03-01 20:13:02 +03:00
rinpatch
9c6abec4d8
use commonapi.post instead of activitybulder
2019-03-01 15:48:04 +03:00
rinpatch
1341ee650e
[ #675 ] Do not show DMs in mentions timeline
2019-03-01 09:37:29 +03:00
Maxim Filippov
46f29b9da1
Add search users endpoint
2019-02-28 19:04:47 +03:00
Maxim Filippov
70e82a3465
Add test for the second page
2019-02-28 17:54:02 +03:00
kaniini
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
2019-02-28 10:22:19 +00:00
kaniini
089e2588a3
Merge branch 'speedup-follow-requests' into 'develop'
...
Speedup follow requests
Closes #677
See merge request pleroma/pleroma!871
2019-02-28 10:10:03 +00:00
kaniini
3c849d0438
Merge branch 'deactivated-in-user-view' into 'develop'
...
Add activation status to the regular user view
See merge request pleroma/pleroma!874
2019-02-28 10:08:31 +00:00
eugenijm
6b11011039
Added deactivated to the user view
2019-02-28 09:08:34 +03:00
Maxim Filippov
2883f75a3a
Add pagination to users admin API
2019-02-28 01:11:56 +03:00
lain
bbbdbec4fd
Remove parts of the old activity view.
...
Not used anymore.
2019-02-27 17:24:51 +01:00
lain
9ade1242c2
Add user muted status info to twitterapi.
2019-02-27 16:52:03 +01:00
lain
c1ae495878
Add user muted status info to MastodonAPI.
2019-02-27 16:46:47 +01:00
lain
c4235f96bd
Add with_muted param.
2019-02-27 16:37:42 +01:00
lain
8d8cb08f94
Add follow request test.
2019-02-27 14:51:07 +01:00
William Pitcock
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
2019-02-27 13:01:10 +00:00
Egor Kislitsyn
5d961d536c
fix formatter
2019-02-27 15:40:30 +07:00
Maxim Filippov
ed7fd6b47e
Add missing docs and tests
2019-02-27 03:08:03 +03:00
Egor
c3ac9424d2
AutoLinker
2019-02-26 23:32:26 +00:00
lain
9e0686efa6
Move visibility into own module.
2019-02-22 13:29:52 +01:00
lain
62296f5a25
Fix private post card handling.
2019-02-22 12:02:51 +01:00
KZ
7c722c08f5
Fix: Fixing an outbox related bug when local user activity is empty
2019-02-22 04:37:48 +00:00
William Pitcock
e95dbecf3e
tests: fix formatting
2019-02-20 20:49:10 +00:00
William Pitcock
aa45674be6
tests: add test for fetching AP objects with application/json.
2019-02-20 20:45:09 +00:00
William Pitcock
3ee77e95b2
tests: fix tests
2019-02-20 17:23:05 +00:00
Egor
bff9eb5ef7
Reports
2019-02-20 16:51:25 +00:00
lain
59c27f29c8
Add some nicer urls in status view.
2019-02-20 17:36:16 +01:00
Ivan Tashkinov
b574d97c2e
[ #468 ] Added support for push OAuth scope (Mastodon 2.4+).
2019-02-20 17:27:41 +03:00
Ivan Tashkinov
6fe7acd58e
[ #468 ] Merged upstream/develop.
2019-02-20 16:48:59 +03:00
lambda
11b3c10c54
Merge branch 'muting' into 'develop'
...
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
2019-02-20 13:19:37 +00:00
lain
4196d9af11
Add test for User.mutes and so on.
2019-02-20 14:14:52 +01:00
lain
9ae79bb71a
Add test for muting functionality.
2019-02-20 13:47:44 +01:00
Ivan Tashkinov
337367d764
[ #468 ] More OAuth scopes-specific tests.
2019-02-20 12:27:28 +03:00
Ivan Tashkinov
04ee877a20
[ #468 ] Added OAuth scopes-specific tests.
2019-02-19 22:28:21 +03:00
Ekaterina Vaartis
ad2cf4fd86
Add test for mastodon muting endpoints
2019-02-19 21:49:55 +03:00
eugenijm
25b9e7a8c3
Added admin API for changing user activation status
2019-02-19 19:37:02 +03:00
Ivan Tashkinov
c0ecbf6669
[ #468 ] Merged upstream/develop.
2019-02-19 19:10:55 +03:00
kaniini
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
2019-02-18 19:43:06 +00:00
kaniini
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
2019-02-18 04:02:41 +00:00
kaniini
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
2019-02-18 04:01:51 +00:00
kaniini
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
2019-02-18 04:01:26 +00:00
kaniini
3f38a05571
Merge branch 'csv-export' into 'develop'
...
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
2019-02-18 03:59:46 +00:00
Maxim Filippov
fd17a0cc9b
Fix test
2019-02-18 00:10:48 +03:00
lambda
79e503b3f5
Merge branch 'docker-speedup' into 'develop'
...
Docker speedup
See merge request pleroma/pleroma!837
2019-02-17 17:38:25 +00:00
lambda
ae84af4ad0
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
...
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
2019-02-17 16:57:57 +00:00
lain
71c8c60ded
More speedup, test fixes.
2019-02-17 17:47:24 +01:00
rinpatch
d0a94f98e0
more tests for HellthreadPolicy
2019-02-17 14:33:44 +03:00
Ivan Tashkinov
bc4f77b10b
[ #468 ] Merged upstream/develop, resolved conflicts.
2019-02-17 14:07:04 +03:00
Ivan Tashkinov
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
2019-02-17 13:49:14 +03:00
Haelwenn (lanodan) Monnier
72a4272d84
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
2019-02-16 19:52:46 +01:00
lain
f469a8610f
Check that the welcome message is sent from the correct user.
2019-02-16 17:24:31 +01:00
lain
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
2019-02-16 17:01:15 +01:00
lain
d812a347ca
Add optional welcome message.
2019-02-16 16:42:34 +01:00
rinpatch
921571c19b
Merge branch 'hellthread-filter-fix' into 'develop'
...
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
2019-02-15 13:18:35 +00:00
Karen Konou
dca6bee2f7
Rename test, add check for follower collection when delisting
2019-02-15 13:43:14 +01:00
rinpatch
b63a5e309d
Merge branch 'bugfix/actor-containment' into 'develop'
...
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
2019-02-15 12:27:03 +00:00
Karen Konou
d943c90249
Add tests, change default config values, fix a bug
2019-02-15 12:47:50 +01:00
eugenijm
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the follow,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
2019-02-15 12:20:20 +03:00
William Pitcock
32b1649434
test: user: add a test for whether user search returns a user or not
2019-02-14 20:05:08 +00:00
lambda
ea2698beb7
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
...
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
2019-02-14 19:54:16 +00:00
Egor Kislitsyn
907306174b
fix S3 links encoding in Mediaproxy
2019-02-14 15:55:21 +07:00
kaniini
19756d68f2
Merge branch 'fix/credo-issues-test' into 'develop'
...
Fix credo issues in ./test
See merge request pleroma/pleroma!808
2019-02-14 03:55:26 +00:00
