ed189568f3
moving mrf settings from instance to separate group
2020-06-16 18:32:18 +03:00
3c2cee33ad
moving custom ecto types in context folders
2020-06-16 17:50:33 +03:00
32c6576b60
naming
2020-06-16 15:54:22 +03:00
e1603ac8fe
fix attemps to merge map
2020-06-16 15:54:22 +03:00
9a4fde9766
Mogrify args as custom tuples
2020-06-16 15:53:28 +03:00
1eb6cedaad
ActivityPub: When restricting to media posts, only show 'Creates'.
2020-06-16 13:08:27 +02:00
b023110799
fixed a visibility of functions
2020-06-15 20:48:22 +03:00
faba1a6e33
fix tests
2020-06-15 12:25:03 -04:00
e1ee8bc1da
User: update_follower_count refactor.
2020-06-15 14:29:34 +02:00
579763126f
Merge branch 'develop' into issue/1855
2020-06-15 15:24:55 +03:00
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-15 16:03:40 +04:00
62b8c31b7a
added tests
2020-06-15 14:55:00 +03:00
b7df7436c8
Conversations: Return last dm for conversation, not last message.
2020-06-15 12:27:13 +02:00
2e8a236cef
fix invalidates media url's
2020-06-14 21:02:57 +03:00
b15cfc3d36
Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page
2020-06-14 18:27:11 +03:00
271ea5068f
Merge branch '1851-favorites-pagination' into 'develop'
...
StatusController: Correctly paginate favorites.
Closes #1851
See merge request pleroma/pleroma!2636
2020-06-13 17:20:43 +00:00
1d625c29a0
ControllerHelper: Always return id field.
2020-06-13 13:12:43 +02:00
4b865bba10
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-13 10:37:15 +00:00
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
2020-06-13 12:08:46 +03:00
520367d6fd
Fix atom leak in Rich Media Parser
2020-06-13 12:08:46 +03:00
26f710b9e3
Merge branch 'develop' into preload-data
2020-06-12 16:52:52 -05:00
4115701f71
Merge branch 'recipients-experiments' into 'develop'
...
ActivityPub: Don't show announces of your own objects in timeline.
See merge request pleroma/pleroma!2637
2020-06-12 16:57:13 +00:00
09d31d24de
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2
2020-06-12 18:39:51 +04:00
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers
2020-06-12 18:25:29 +04:00
e557265a03
Merge branch 'global-status-expiration' into 'develop'
...
Global status expiration
See merge request pleroma/pleroma!2208
2020-06-12 14:14:09 +00:00
34593d6aa5
Merge branch 'develop' into features/mix-task-reset-mfa
2020-06-12 08:43:50 -05:00
1419c67f4d
Merge branch 'feature/cli-reload-emoji' into 'develop'
...
Add command to reload emoji packs from cli for OTP users
Closes #1814
See merge request pleroma/pleroma!2639
2020-06-12 13:32:59 +00:00
f9dcf15ecb
added admin api for MediaProxy cache invalidation
2020-06-12 14:49:54 +03:00
2188097066
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-12 14:25:41 +03:00
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname>
2020-06-11 22:54:48 +02:00
2419776e19
Deprecate Pleroma.Web.RichMedia.Parsers.OGP
2020-06-11 23:11:46 +04:00
7f7a1a4676
Check for media proxy base_url, not Upload base_url
2020-06-11 11:05:22 -05:00
8a59fde0e5
Merge branch 'develop' into fix/csp-mediaproxy-base-url
2020-06-11 10:25:00 -05:00
1f35acce54
Merge OGP parser with TwitterCard
2020-06-11 17:57:31 +04:00
b28cec4271
[ #1794 ] Fixes URI query handling for hashtags extraction in search.
2020-06-11 16:05:14 +03:00
5e44e9d698
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 18:56:46 +00:00
7c47f791a8
Add command to reload emoji packs from cli for OTP users
...
Not useful for source releases as we don't have a way to automate connecting to the running instance.
2020-06-10 13:02:08 -05:00
99afc7f4e4
HTTP security plug: add media proxy base url host to csp
2020-06-10 20:09:16 +03:00
7aa6c82937
Merge branch 'remake-remodel-dms' into 'develop'
...
Chats / ChatMessages
See merge request pleroma/pleroma!2429
2020-06-10 12:05:45 +00:00
9e411372d0
ActivityPub: Don't show announces of your own objects in timeline.
2020-06-10 12:10:09 +02:00
86fec45f40
ControllerHelper: Fix wrong comparison.
2020-06-10 11:09:45 +02:00
b4c50be9df
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 08:12:29 +00:00
be7c322865
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 08:02:35 +00:00
c4f267b3be
Apply suggestion to lib/pleroma/web/controller_helper.ex
2020-06-10 08:02:26 +00:00
1b746cfbbb
Merge branch 'add-url-to-admin-account-view' into 'develop'
...
Add `url` field to AdminAPI.AccountView
See merge request pleroma/pleroma!2633
2020-06-09 12:59:14 +00:00
3dd1de61a7
Add `url` field to AdminAPI.AccountView
2020-06-09 16:02:42 +04:00
063e6b9841
StatusController: Correctly paginate favorites.
...
Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this.
2020-06-09 10:53:40 +02:00
064c4f86f3
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-09 09:36:07 +02:00
40d5058cc4
Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-09 09:21:44 +02:00
e1bc37d118
MigrationHelper: Move notification backfilling to own module.
2020-06-09 09:20:55 +02:00
fc04a138d4
Apply suggestion to lib/pleroma/notification.ex
2020-06-08 20:01:37 +00:00
fe1cb56fdc
transmogrifier: MIME.valid?/1 for mediaType
...
No issues with the rest of the network yet but this makes sure it will work
once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429
is merged.
2020-06-08 21:04:30 +02:00
604a83ae3e
merge develop
2020-06-08 19:21:07 +03:00
d44843e677
Restrict ActivityExpirationPolicy to Notes only
2020-06-08 17:56:34 +04:00
da22119c2f
Merge branch 'develop' into global-status-expiration
2020-06-08 17:21:47 +04:00
d192492658
Merge branch 'openapi/admin/relay' into 'develop'
...
Add OpenAPI spec for AdminAPI.RelayController
See merge request pleroma/pleroma!2579
2020-06-08 11:07:01 +00:00
c450b248cc
Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop'
...
Delete outgoing pending follow requests on user deletion
See merge request pleroma/pleroma!2631
2020-06-08 10:54:43 +00:00
3b5282bef2
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-08 11:19:18 +02:00
89b85f6529
ChatController: Remove nonsensical pagination.
2020-06-08 11:09:53 +02:00
7d66dd180a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-08 10:18:10 +02:00
fe2a5d0614
ChatController: Make last_read_id mandatory.
2020-06-07 20:22:08 +02:00
8d9e586887
Delete pending follow requests on user deletion
2020-06-07 17:31:37 +02:00
801e668a97
ChatController: Add `last_read_id` option to mark_as_read.
2020-06-07 15:38:33 +02:00
2cdaac4330
SideEffects: Move streaming of chats to after the transaction.
2020-06-07 14:52:56 +02:00
1a11f0e453
Chats: Change id to flake id.
2020-06-07 14:25:30 +02:00
0365053c8d
AttachmentValidator: Check if the mime type is valid.
2020-06-07 09:19:00 +02:00
40fc4e974e
Notfication: Add validation of notification types
2020-06-06 16:59:08 +02:00
f4cf4ae16e
ChatController: Use new oauth scope *:chats.
2020-06-06 16:48:02 +02:00
e1b07402ab
User: Add raw_bio, storing unformatted bio
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-06-06 16:23:16 +02:00
f77d4a302d
Credo fixes.
2020-06-06 15:51:08 +02:00
9189b489ee
Migrations: Move Notification migration code to helper
2020-06-06 15:33:02 +02:00
9fa3f0b156
Notification: Change type of `type` to an enum.
2020-06-06 13:08:45 +02:00
ca0e6e702b
ChatMessageReference -> Chat.MessageReference
2020-06-06 11:51:10 +02:00
137adef6e0
ChatMessageReference: Use FlakeId.Ecto.Type
...
No need for compat because this is brand new.
2020-06-06 10:42:24 +02:00
239d03499e
Chat: creation_cng -> changeset
...
Make our usage of this more uniform.
2020-06-06 10:38:45 +02:00
4e8c0eecd5
WebPush: Don't break on contentless chat messages.
2020-06-06 09:46:07 +02:00
167812a3f2
Fix pagination
2020-06-05 23:18:29 +04:00
b02df1803e
Merge remote-tracking branch 'origin/develop' into activity-pub-use-atoms-as-keys
2020-06-05 23:15:10 +04:00
f24d2f714f
Credo fixes
2020-06-05 17:18:48 +02:00
a8ca030d85
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-05 16:53:56 +02:00
d74985af23
Merge branch 'features/apc2s-pagination' into 'develop'
...
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
2020-06-05 14:52:09 +00:00
54bae06b4f
Create Pleroma.Maps.put_if_present(map, key, value, value_fun // &{:ok, &1})
...
Unifies all the similar functions to one and simplify some blocks with it.
2020-06-05 14:48:02 +00:00
115d08a754
Pipeline: Add a side effects step after the transaction finishes
...
This is to run things like streaming notifications out, which will
sometimes need data that is created by the transaction, but is
streamed out asynchronously.
2020-06-05 16:47:02 +02:00
65689ba9bd
If Credo fixes is so good, why is there no Credo fixes 2?
2020-06-05 13:10:48 +02:00
f3ea6ee2c8
Credo fixes.
2020-06-05 12:45:25 +02:00
0efa8aa0b9
Transmogrifier: For follows, create notifications last.
...
As the notification type changes depending on the follow state,
the notification should not be created and streamed out before the
state settles. For this reason, the notification creation has been
delayed until it's clear if the user has been followed or not.
This is a bit hacky but it will be properly rewritten using the
pipeline soon.
2020-06-05 12:26:07 +02:00
cc8a7dc205
SideEffects / ChatView: Add an unread cache.
...
This is to prevent wrong values in the stream.
2020-06-05 12:01:33 +02:00
aa2ac76510
Notification: Don't break on figuring out the type of old EmojiReactions
2020-06-04 20:40:46 +02:00
d44da91bbf
SubscriptionOperation: Let chat mentions through.
2020-06-04 20:28:33 +02:00
317e2b8d61
Use atoms as keys in `ActivityPub.fetch_*` functions options
2020-06-04 21:36:26 +04:00
56dfa0e0fb
Transmogrifier: Update notification after accepting.
2020-06-04 19:22:49 +02:00
00748e9650
ChatMessageReferences: Change seen -> unread
2020-06-04 17:14:42 +02:00
b57e4ad1ab
Merge branch 'develop' into 'openapi/admin/relay'
...
# Conflicts:
# lib/pleroma/web/admin_api/controllers/admin_api_controller.ex
2020-06-04 13:29:32 +00:00
b952f3f379
WebPush: Push out chat message notications.
2020-06-04 14:49:10 +02:00
70f054b083
Merge branch 'develop' into openapi/admin/relay
2020-06-04 13:30:14 +04:00
b4d5bdd6f1
Merge branch 'develop' into openapi/admin/config
2020-06-04 13:28:00 +04:00
5677b21e82
clean up
2020-06-03 17:24:35 -04:00
3b8180d7d1
add status_net/config
2020-06-03 16:34:03 -04:00
dbcc1b105e
encode data properly
2020-06-03 16:34:03 -04:00
29ae5bb771
preload data into index.html
2020-06-03 16:34:03 -04:00
e46aecda55
Notification: Fix notifications backfill for compacted activities
2020-06-03 20:51:59 +02:00
b3407344d3
ChatController: Add function to mark single message as read.
2020-06-03 19:21:23 +02:00
c020fd4352
ChatMessageReferenceView: Return read status as `unread`.
2020-06-03 18:58:58 +02:00
c16315d055
Add OpenAPI spec for AdminAPI.ReportController
2020-06-03 19:17:05 +04:00
9d572f2f66
Move report actions to AdminAPI.ReportController
2020-06-03 19:17:04 +04:00
fb4ae9c720
Streamer, SideEffects: Stream out ChatMessageReferences
...
Saves us a few calles to fetch things from the DB that we already
have.
2020-06-03 16:45:04 +02:00
18b050dfd1
Merge branch 'openapi/update-admin-api/status' into 'develop'
...
Update OpenAPI spec for AdminAPI.StatusController
See merge request pleroma/pleroma!2624
2020-06-03 14:04:12 +00:00
903955b189
FollowingRelationship: Remove meaningless change
2020-06-03 14:40:44 +02:00
7f5c5b11a5
Chats: Remove `unread` from the db, calculate from unseen messages.
2020-06-03 14:26:50 +02:00
73127cff75
Credo fixes.
2020-06-03 13:17:29 +02:00
2591745fc2
ChatMessageReferences: Move tests
2020-06-03 12:56:39 +02:00
8a43611e01
Use AdminAPI.StatusView in api/admin/users
2020-06-03 14:53:46 +04:00
f3ccd50a33
ChatMessageReferences: Adjust views
2020-06-03 12:49:53 +02:00
aa22fce8f4
ChatMessageReference: Introduce and switch in chat controller.
2020-06-03 12:30:12 +02:00
feld
6c1c2cddec
Merge branch 'fix/1794-hashtag-search-results' into 'develop'
...
[#1794 ] Improvements to hashtags extraction from search query
Closes #1794
See merge request pleroma/pleroma!2611
2020-06-02 16:30:03 +00:00
7922e63825
Update OpenAPI spec for AdminAPI.StatusController
2020-06-02 19:08:09 +04:00
68cb152a08
Merge branch 'develop' into openapi/admin/relay
2020-06-02 18:50:37 +04:00
879304dcd9
Merge branch 'replies-domain-block' into 'develop'
...
Replies domain block
Closes #1650
See merge request pleroma/pleroma!2622
2020-06-02 14:14:23 +00:00
5da38c15cd
Merge branch 'openapi/admin/oauth-apps' into 'develop'
...
Add OpenAPI spec for AdminAPI.OAuthAppContoller
See merge request pleroma/pleroma!2582
2020-06-02 14:13:24 +00:00
6977500ef7
Merge branch 'tagline' into 'develop'
...
Update default instance description
See merge request pleroma/pleroma!2600
2020-06-02 14:10:53 +00:00
022d975a39
Merge branch 'openapi/admin/invites' into 'develop'
...
Add OpenAPI spec for AdminAPI.InviteController
See merge request pleroma/pleroma!2585
2020-06-02 14:10:21 +00:00
2860c66e88
Merge branch 'feature/embeddable-posts' into 'develop'
...
Add embeddable posts
Closes #1288
See merge request pleroma/pleroma!2319
2020-06-02 14:04:34 +00:00
2c6ebe709a
Credo fixes
2020-06-02 15:14:52 +02:00
6cd2fa2a4c
Migrations: Add a migration to backfill notification types.
2020-06-02 15:13:19 +02:00
38dce485c4
Notification: Add function to backfill notification types
2020-06-02 14:50:10 +02:00
904295d53b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-02 14:28:01 +02:00
37542a9dfa
Activity: Remove notifications-related functions.
2020-06-02 14:22:16 +02:00
127ccc4e1c
NotificationController: Don't return chat_mentions by default.
2020-06-02 14:05:53 +02:00
cd2abcc0e3
Merge branch 'fix/invisible-repeats' into 'develop'
...
Do not include activities of invisible users unless explicitly requested
Closes #1833
See merge request pleroma/pleroma!2620
2020-06-02 11:32:03 +00:00
805ab86933
Notifications: Make notifications save their type.
2020-06-02 13:24:34 +02:00
165a4b2a69
Do not include activities of invisible users unless explicitly requested
...
Closes #1833
2020-06-02 13:34:12 +03:00
d111eae798
Merge branch 'feature/status-by-id-account-view' into 'develop'
...
another view for account in admin-fe status_show
Closes #1783
See merge request pleroma/pleroma!2543
2020-06-02 08:49:24 +00:00
8e1db6a835
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-02 10:43:13 +02:00
19f468c5bc
replies filtering for blocked domains
2020-06-02 09:00:10 +03:00
6fb900a496
Merge branch 'user-updates' into 'develop'
...
AccountController: Federate user account changes.
Closes pleroma-support#33 and #1801
See merge request pleroma/pleroma!2617
2020-06-01 20:48:11 +00:00
7e6ec778d9
exclude replies on blocked domains
2020-06-01 21:17:32 +03:00
6b84c62d4a
Merge remote-tracking branch 'origin/develop' into feature/embeddable-posts
2020-06-01 17:38:57 +04:00
af9090238e
CommonAPI: Newlines -> br for chat messages.
2020-06-01 15:14:22 +02:00
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-06-01 15:48:51 +04:00
8ff3425828
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-06-01 13:34:13 +02:00
d4d4b92f75
TimelineController: Only return `Create` in public timelines.
2020-06-01 13:17:56 +02:00
9460983032
AccountController: Federate user account changes.
...
Hotfixy commit, will be moved to the pipeline.
2020-06-01 13:03:22 +02:00
e96765df6b
Merge branch 'chore/bump-hackney' into 'develop'
...
mix.lock: update hackney to 1.16.0
Closes #1612
See merge request pleroma/pleroma!2614
2020-05-30 15:51:19 +00:00
0cb7b0ea84
hackney adapter helper: support tlsv1.3 and remove custom opts
...
- partitial_chain is no longer exported, but it seems to be the default anyway.
- The bug that caused sni to not be sent automatically seems to be fixed -
https://github.com/benoitc/hackney/issues/612
2020-05-30 15:36:55 +03:00
6ff079ca9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-05-30 12:31:12 +02:00
8bdf18d7c1
CommonAPI: Linkify chat messages.
2020-05-30 12:30:31 +02:00
2c9465cc51
SafeText: Let through basic html.
2020-05-30 12:17:18 +02:00
b004c427a0
Merge branch 'conversation-pagination' into 'develop'
...
Conversation pagination
See merge request pleroma/pleroma!2601
2020-05-30 10:02:37 +00:00
6d4b80822b
Conversation pagination
2020-05-30 10:02:37 +00:00
24f40b8a26
[ #1794 ] Fixed search query splitting regex to deal with Unicode. Adjusted a test.
2020-05-30 10:29:08 +03:00
Alexander Strizhakov
feld