369c03834c
formatter: Use user.uri instead of user.source_data.uri
2020-04-10 06:20:02 +02:00
b6bed1a284
Types.URI: New
2020-04-10 06:20:02 +02:00
19eedb3d04
User: Move public_key from source_data to own field
2020-04-10 06:16:18 +02:00
5628984df4
User: remove source_data use for follower_address and following_address
2020-04-10 06:16:18 +02:00
d545b883eb
Add `/api/v1/notifications/:id/dismiss` endpoint
2020-04-09 17:08:43 +04:00
ac672a9d6b
[ #1559 ] Addressed code review requests.
2020-04-09 15:13:37 +03:00
b87b798ca1
Merge branch 'fix/1658-invite-send' into 'develop'
...
Error improvement for email_invite endpoint
See merge request pleroma/pleroma!2344
2020-04-09 10:42:43 +00:00
f20a19de85
typo fix
2020-04-09 13:28:54 +03:00
1cf0d5ab0d
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
2020-04-09 10:17:36 +00:00
4c60fdcbb1
Apply suggestion to lib/pleroma/web/admin_api/admin_api_controller.ex
2020-04-09 10:17:31 +00:00
d2e21fbc96
Merge branch 'open-api' into 'develop'
...
Add OpenAPI
Closes pleroma-meta#19
See merge request pleroma/pleroma!2345
2020-04-09 09:48:56 +00:00
564f3f01ca
Merge branch 'formatter-html-safe' into 'develop'
...
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
See merge request pleroma/pleroma!2357
2020-04-09 09:47:07 +00:00
c401b00c78
ObjectValidators.Types.ObjectID: Fix when URI.parse returns %URL{host: ""}
2020-04-09 04:36:39 +02:00
d067eaa7b3
formatter.ex: Use Phoenix.HTML for mention/hashtag generation
...
Unlike concatenating strings, this makes sure everything is escaped.
Tests had to be changed because Phoenix.HTML runs attributes through
Enum.sort before generation for whatever reason.
2020-04-08 22:58:31 +03:00
5739c498c0
fix for gun connections pool
2020-04-08 18:46:01 +03:00
1a4875adfa
[ #1559 ] Support for "follow_request" notifications (configurable).
...
(Not currently supported by PleromaFE, thus disabled by default).
2020-04-07 21:52:32 +03:00
dd4d10b275
Merge branch 'fix-auto-link-for-profile-fields' into 'develop'
...
Use Pleroma.Formatter.linkify/2 instead
See merge request pleroma/pleroma!2352
2020-04-07 11:41:10 +00:00
2b7d7bbd2d
Merge branch 'develop' into issue/1276
2020-04-07 14:09:43 +03:00
03eebabe8e
Add Pleroma.Web.ApiSpec.Helpers
2020-04-06 17:11:00 +04:00
1d4ab06505
Merge branch 'featureflag/emoji_reactions' into 'develop'
...
Add emoji reactions to features in nodeinfo
See merge request pleroma/pleroma!2313
2020-04-06 12:51:35 +00:00
96ee0aadbf
Merge branch 'improving-test-coverage' into 'develop'
...
Tests for emoji mix task
See merge request pleroma/pleroma!2350
2020-04-06 12:49:17 +00:00
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
2020-04-06 11:59:01 +00:00
772bc258cd
ObjectID Validator: Refactor.
2020-04-06 13:53:24 +02:00
e67cde0ed6
Transmogrifier: Refactoring / Renaming.
2020-04-06 13:46:34 +02:00
b59ac37b2c
tests for emoji mix task
2020-04-06 11:13:59 +03:00
fc81e5a49c
Enforcement of OAuth scopes check for authenticated API endpoints, :skip_plug plug to mark a plug explicitly skipped (disabled).
2020-04-06 10:20:44 +03:00
3fa51f7272
Merge remote-tracking branch 'remotes/origin/2323-accounts-relationships-hotfix' into output-of-relationships-in-statuses
...
# Conflicts:
# lib/pleroma/web/mastodon_api/views/account_view.ex
# lib/pleroma/web/mastodon_api/views/status_view.ex
2020-04-02 19:38:39 +03:00
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
2020-04-02 19:23:30 +03:00
0aa24a150b
Add oAuth
2020-04-02 17:33:23 +04:00
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
23219e6fb3
Add OpenAPI
2020-04-01 23:13:08 +04:00
2d64500a9d
error improvement for email_invite endpoint
2020-04-01 20:26:33 +03:00
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
2020-04-01 20:08:14 +03:00
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
2020-04-01 17:05:09 +00:00
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01 19:49:09 +03:00
037b49c415
Validators: Correct ObjectID filename
2020-04-01 16:10:17 +02:00
bfec45bf74
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
...
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
2020-04-01 12:55:52 +00:00
94ddbe4098
restrict remote users from indexing
2020-04-01 09:57:12 +03:00
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
2020-03-31 23:55:29 +02:00
b30fb1f3bb
User: Fix use of source_data in profile_url/1
2020-03-31 23:54:20 +02:00
7408f003a6
Use `Pleroma.Formatter.linkify` instead of `AutoLinker.link`
2020-04-01 02:52:30 +09:00
c982093cc2
Transmogrifier: Fix BAD code by RINPATCH
2020-03-31 19:33:41 +02:00
1b323ce1c6
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:28:18 +00:00
ecac57732a
Transmogrifier: Only add context if it really is onne.
2020-03-31 19:16:45 +02:00
51fc504705
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-31 19:06:08 +02:00
288f2b5a7c
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:00:55 +00:00
0be1fa0a86
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:00:48 +00:00
057438a657
CommonAPI: DRY up a bit.
2020-03-31 17:56:05 +02:00
643f15e77b
Validators: ObjectID is an http uri.
2020-03-31 16:11:38 +02:00
d191b0942f
Remove no longer used function
2020-03-31 22:50:18 +09:00
f6835333be
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 12:55:25 +00:00
ea9c57b26e
[ #2332 ] Misc. improvements per code change requests.
2020-03-31 09:21:42 +03:00
9c94b6a327
[ #2332 ] Misc. fixes per code change requests.
2020-03-30 19:08:37 +03:00
8bd5ad8664
Merge branch 'benchmark-improvements' into 'develop'
...
Benchmark improvements
See merge request pleroma/pleroma!2308
2020-03-30 14:48:00 +00:00
b607ae1a1c
removing grouped reports admin api endpoint
2020-03-30 13:51:45 +03:00
1fcdcb12a7
updating gun with bug fix
...
https://github.com/ninenines/gun/issues/222
2020-03-30 12:47:12 +03:00
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
1f29ecdcd7
sync with develop
2020-03-30 11:42:25 +03:00
eb9744cade
activities generation tasks
2020-03-30 11:42:25 +03:00
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-03-29 19:18:22 +00:00
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
be9d18461a
FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.).
2020-03-28 18:49:03 +03:00
dfbc05d496
Misc refactoring / tweaks (`ThreadMute.exists?/2`).
2020-03-27 08:01:03 +03:00
6b793d3f83
Ensured no auxiliary computations (actors list preparation etc.) related to relationships preloading if no user is present (for statuses / accounts / relationships rendering).
2020-03-26 21:54:01 +03:00
29ab1d9f8d
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-26 17:24:10 +01:00
69fc1dd69f
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
2020-03-26 14:45:28 +00:00
0c60c0a76a
Validators: Use correct type for IDs.
2020-03-26 15:44:14 +01:00
0adaab8e75
Bump copyright dates.
2020-03-26 15:37:42 +01:00
eaacc64839
Refactors.
2020-03-26 15:33:10 +01:00
ee979dd6d7
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-26 15:24:06 +01:00
d7aa0b645b
Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex
2020-03-26 14:23:19 +00:00
4cf1007a7d
ActivityPub: Small refactor.
2020-03-26 15:16:54 +01:00
112101ca52
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
...
# Conflicts:
# lib/pleroma/thread_mute.ex
2020-03-26 09:43:58 +03:00
af820f8cf1
Merge branch 'benchmark_timeline' into 'develop'
...
Benchmarks: Add timeline benchmark
See merge request pleroma/pleroma!2325
2020-03-25 18:06:00 +00:00
460e41585c
Further preloading (more endpoints), refactoring, tests.
2020-03-25 20:33:34 +03:00
be5e2c4dbb
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
2020-03-25 17:01:45 +03:00
3fa3d45dbe
[ #1364 ] Minor improvements / comments.
...
Further fixes of incorrect usage of "relations" as a short form of "relationships".
2020-03-25 13:05:00 +03:00
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-25 09:05:17 +03:00
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
2020-03-25 09:04:00 +03:00
212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
2020-03-24 20:32:49 +01:00
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-24 22:15:37 +03:00
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
2020-03-24 22:14:26 +03:00
8eebc75c15
Merge branch 'fix/activity-deletion' into 'develop'
...
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
2020-03-24 19:10:32 +00:00
f316882464
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
2020-03-24 18:37:53 +00:00
aaf00f1ff5
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
2020-03-24 18:24:09 +00:00
74560e888e
Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex
2020-03-24 18:20:58 +00:00
1d75d0ed7a
Merge branch 'admin-api-change-password' into 'develop'
...
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
2020-03-24 17:34:13 +00:00
4a2538967c
Support pagination in conversations
2020-03-24 20:18:27 +04:00
d1a9716a98
Fix activity deletion
2020-03-24 17:38:18 +04:00
fbf02a3722
Merge branch 'bugfix/profile-bio-newline' into 'develop'
...
AccountView: fix for other forms of <br> in bio
Closes #1643
See merge request pleroma/pleroma!2322
2020-03-23 19:32:01 +00:00
3bd2829e5c
Benchmarks: Add timeline benchmark
2020-03-23 18:56:01 +01:00
86f2fbc81e
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-23 14:34:58 +03:00
5a34dca8ed
Add emoji support in statuses in staticfe
2020-03-23 14:03:31 +04:00
3c78e5f327
Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
2020-03-23 12:01:11 +03:00
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
c2e415143b
WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
2020-03-22 21:51:44 +03:00
15be6ba9c2
AccountView: fix for other forms of <br> in bio
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-03-22 16:41:01 +01:00
981e015f1b
Mastodon API Account view: Remove an outdated hack
...
The hack with caching the follow relationship was introduced
when we still were storing it inside the follow activity, resulting in
slow queries. Now we store follow state in `FollowRelationship` table,
so this is no longer necessary.
2020-03-22 17:10:37 +03:00
9bae9b1b1b
Merge branch 'develop' into gun
2020-03-20 20:47:54 +03:00
d74405fc1a
Merge branch 'fix-feed-pagination' into 'develop'
...
Fix for feed page pagination
Closes #1605
See merge request pleroma/pleroma!2281
2020-03-20 16:57:51 +00:00
Haelwenn (lanodan) Monnier
Egor Kislitsyn
Ivan Tashkinov
lain
Alexander Strizhakov
rinpatch
Maksim Pechnikov
feld
kPherox
Haelwenn