aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
2020-04-02 19:23:30 +03:00
0aa24a150b
Add oAuth
2020-04-02 17:33:23 +04:00
fd97b0e634
Chats: Basic implementation.
2020-04-02 15:19:09 +02:00
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
23219e6fb3
Add OpenAPI
2020-04-01 23:13:08 +04:00
2d64500a9d
error improvement for email_invite endpoint
2020-04-01 20:26:33 +03:00
98b96e45ab
Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
...
# Conflicts:
# CHANGELOG.md
2020-04-01 20:08:14 +03:00
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
2020-04-01 17:05:09 +00:00
2f2bd7fe72
Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
...
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01 19:49:09 +03:00
037b49c415
Validators: Correct ObjectID filename
2020-04-01 16:10:17 +02:00
bfec45bf74
Merge branch 'fix/1601-add-new-meta-tag' into 'develop'
...
Restrict remote users from indexing
Closes #1601
See merge request pleroma/pleroma!2341
2020-04-01 12:55:52 +00:00
94ddbe4098
restrict remote users from indexing
2020-04-01 09:57:12 +03:00
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
2020-03-31 23:55:29 +02:00
b30fb1f3bb
User: Fix use of source_data in profile_url/1
2020-03-31 23:54:20 +02:00
7408f003a6
Use `Pleroma.Formatter.linkify` instead of `AutoLinker.link`
2020-04-01 02:52:30 +09:00
c982093cc2
Transmogrifier: Fix BAD code by RINPATCH
2020-03-31 19:33:41 +02:00
1b323ce1c6
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:28:18 +00:00
ecac57732a
Transmogrifier: Only add context if it really is onne.
2020-03-31 19:16:45 +02:00
51fc504705
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-31 19:06:08 +02:00
288f2b5a7c
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:00:55 +00:00
0be1fa0a86
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 17:00:48 +00:00
057438a657
CommonAPI: DRY up a bit.
2020-03-31 17:56:05 +02:00
643f15e77b
Validators: ObjectID is an http uri.
2020-03-31 16:11:38 +02:00
d191b0942f
Remove no longer used function
2020-03-31 22:50:18 +09:00
f6835333be
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 12:55:25 +00:00
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
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
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-20 14:52:58 +01:00
fe15f0ba15
restrict_unauthenticated setting
2020-03-20 16:36:20 +03:00
98a60df41f
include_types parameter in /api/v1/notifications
2020-03-20 13:18:12 +03:00
a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
2020-03-19 19:25:50 +01:00
c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR
2020-03-19 19:10:03 +01:00
9b9d67bbec
Fix linting.
2020-03-19 18:16:12 +01:00
3c2c32b460
Merge branch 'remake-remodel' into develop
2020-03-19 18:00:55 +01:00
7d275970ab
Add emoji reactions to features in nodeinfo
2020-03-19 10:08:11 -05:00
f9d622d25a
WIP
2020-03-19 15:39:11 +01:00
f9ecb513fa
Merge branch 'develop' into gun
2020-03-18 14:08:21 +03:00
7438833685
[ #1364 ] Improved notification-related tests.
2020-03-16 21:58:10 +03:00
13cce9c0de
Admin API: `PATCH /api/pleroma/admin/users/:nickname/credentials`, `GET /api/pleroma/admin/users/:nickname/credentials`.
2020-03-16 20:42:37 +03:00
d198e7fa2a
Admin API: `PATCH /api/pleroma/admin/users/:nickname/change_password`
2020-03-16 20:32:07 +03:00
f3791add99
removing with_move parameter
2020-03-16 20:07:45 +03:00
0e07c5ef57
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-16 17:58:42 +03:00
bf474ca3c1
fix
2020-03-16 16:23:49 +03:00
35471205f8
temp fix for `:gun.info` MatchError
2020-03-16 15:47:25 +03:00
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
89e4b3ebbd
fix for content-type header for tag feed
2020-03-16 12:59:18 +03:00
91870c8995
adding rss for user feed
2020-03-16 12:45:31 +03:00
26e2076659
fix for feed page pagination
2020-03-16 12:33:55 +03:00
8176ca9e40
static_fe: Sanitize HTML in users
2020-03-15 20:44:04 +01:00
0ac6e29654
static_fe: Sanitize HTML in posts
...
Note: Seems to have different sanitization with TwitterCard generator giving
the following:
<meta content=\"“alert('xss')”\" property=\"twitter:description\">
2020-03-15 20:44:04 +01:00
fa4ec17c84
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
...
[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
2020-03-15 19:15:20 +00:00
7c8003c3fc
[ #1364 ] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
2020-03-15 21:00:12 +03:00
d84670b9e1
Merge branch 'f' into 'develop'
...
rip out fetch_initial_posts
Closes #1422 and #1595
See merge request pleroma/pleroma!2297
2020-03-15 16:14:54 +00:00
67a27825b1
Merge branch 'fix/rate-limiter-remoteip-behavior' into 'develop'
...
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
Closes #1620
See merge request pleroma/pleroma!2296
2020-03-15 14:22:10 +00:00
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
2020-03-15 15:59:17 +03:00
8f7bc07ebc
pleroma_api_controller.ex: Improve conversations error reporting
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-15 12:35:23 +01:00
ecb7809e92
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex
2020-03-14 15:37:02 +03:00
d88c8a9614
Merge branch 'fix/cache-control-headers' into 'develop'
...
Fix Cache Control headers on media
See merge request pleroma/pleroma!2295
2020-03-14 11:19:42 +00:00
6a28c198af
uploaded media plug: do not inject compile-time params on every request
2020-03-13 22:12:33 +03:00
38f796a5c6
Merge branch 'feature/mastofe-admin-scope' into 'develop'
...
auth_controller.ex: Add admin scope to MastoFE
See merge request pleroma/pleroma!2256
2020-03-13 18:58:52 +00:00
994ac4357c
Merge branch 'fix/hashtags-streaming' into 'develop'
...
Fix hashtags WebSocket streaming
Closes #1593
See merge request pleroma/pleroma!2294
2020-03-13 18:50:17 +00:00
658f30c0b3
Merge branch 'static-accept-missing' into 'develop'
...
Fix static FE plug to handle missing Accept header.
See merge request pleroma/pleroma!2260
2020-03-13 18:46:54 +00:00
fc4496d4fa
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
...
The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.
Also closes #1620
2020-03-13 21:41:17 +03:00
3e0f05f08e
Merge branch 'bugfix/br-vs-newline' into 'develop'
...
Formatting: Do not use \n and prefer <br> instead
Closes #1374 and #1375
See merge request pleroma/pleroma!2204
2020-03-13 18:22:55 +00:00
c6eb1c1b92
Merge branch 'develop' into fix/cache-control-headers
2020-03-13 12:54:06 -05:00
7321429a2e
Lint
2020-03-13 12:42:06 -05:00
3b1b183b42
Synchronize cache-control header for local media with the mediaproxy
2020-03-13 12:27:50 -05:00
413177c8f0
Set correct Cache-Control header for local media
2020-03-13 12:02:58 -05:00
c62195127d
Update comment to reflect what the code is actually doing
2020-03-13 11:46:40 -05:00
ad31d0726a
Do not trust remote Cache-Control headers for mediaproxy
2020-03-13 11:30:27 -05:00
096c5c52e0
Merge branch 'revert/cache-control' into 'develop'
...
Revert "Set better Cache-Control header for static content"
Closes #1613
See merge request pleroma/pleroma!2290
2020-03-13 16:25:10 +00:00
fffc382f13
Fix hashtags WebSocket streaming
2020-03-13 19:30:42 +04:00
d1379c4de8
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-13 16:07:17 +01:00
98ed0d1c4b
more clean up
2020-03-13 09:37:57 +03:00
802b991814
Merge branch 'exclude-posts-visible-to-admin' into 'develop'
...
Exclude private and direct statuses visible to the admin when using godmode
Closes #1599
See merge request pleroma/pleroma!2272
2020-03-12 20:29:51 +00:00
39ed608b13
Merge branch 'develop' into gun
2020-03-12 18:31:10 +03:00
1306b92997
clean up
2020-03-12 18:29:07 +03:00
bd40880fa0
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
2020-03-12 12:07:07 +03:00
2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
2020-03-11 16:53:05 +00:00
7cdabdc0df
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
...
Merging default release config on app start
Closes #1610
See merge request pleroma/pleroma!2288
2020-03-11 15:16:18 +00:00
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
2020-03-11 15:10:09 +00:00
c3b9fbd3a7
Revert "Set better Cache-Control header for static content"
...
On furher investigation it seems like all that did was cause unintuitive
behavior. The emoji request flood that was the reason for introducing it
isn't really that big of a deal either, since Plug.Static only needs to
read file modification time and size to determine the ETag.
Closes #1613
2020-03-11 17:58:25 +03:00
fce090c1de
using Pleroma.Config instead of ets
2020-03-11 17:22:50 +03:00
193d67cde5
compile fix
2020-03-11 16:43:58 +03:00
282a93554f
merging release default config on app start
2020-03-11 16:25:53 +03:00
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
2020-03-11 13:46:42 +01:00
5b696a8ac1
[ #1560 ] Enforced authentication for non-federating instances in StaticFEController.
2020-03-11 14:05:56 +03:00
972889550d
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-11 09:15:55 +03:00
5af798f246
Fix enforcement of character limits
2020-03-10 13:08:00 -05:00
f39e1b9eff
add verify tls_opts only when we open connection
...
for other requests tesla will add tls_opts
2020-03-10 15:54:11 +03:00
426f5ee48a
tesla adapter can't be changed in adminFE
2020-03-10 15:31:44 +03:00
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
2020-03-09 20:51:44 +03:00
d9f8941dac
Merge branch 'develop' into gun
2020-03-09 10:56:33 +03:00
edb659dc57
Merge branch 'develop' into issue/1276
2020-03-08 14:10:59 +03:00
6cf1958b02
moderation log: fix improperly migrated data
...
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.
Closes #1606
2020-03-07 17:00:58 +03:00
474ef512df
wait in mix task while pleroma is rebooted
2020-03-07 16:02:55 +03:00
b2eb1124d1
Merge branch 'develop' into gun
2020-03-07 12:41:37 +03:00
6d797b9928
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
...
Wait in mix task while pleroma is rebooted
See merge request pleroma/pleroma!2225
2020-03-07 09:32:29 +00:00
5f42ecc4c7
start gun upload pool, if proxy_remote is enabled
2020-03-07 12:24:39 +03:00
78282dc983
little polishing
2020-03-06 21:24:19 +03:00
c93c3096d5
little refactor
2020-03-06 21:04:18 +03:00
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-06 11:48:30 +03:00
40765875d4
[ #1560 ] Misc. improvements in ActivityPubController federation state restrictions.
2020-03-05 21:19:21 +03:00
058c9b01ac
returning, not needed
2020-03-05 18:28:04 +03:00
Ivan Tashkinov