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
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
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
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
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
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
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
c3b9fbd3a7
Revert "Set better Cache-Control header for static content"
...
On furher investigation it seems like all that did was cause unintuitive
behavior. The emoji request flood that was the reason for introducing it
isn't really that big of a deal either, since Plug.Static only needs to
read file modification time and size to determine the ETag.
Closes #1613
2020-03-11 17:58:25 +03:00
fce090c1de
using Pleroma.Config instead of ets
2020-03-11 17:22:50 +03:00
193d67cde5
compile fix
2020-03-11 16:43:58 +03:00
282a93554f
merging release default config on app start
2020-03-11 16:25:53 +03:00
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
2020-03-11 13:46:42 +01:00
5b696a8ac1
[ #1560 ] Enforced authentication for non-federating instances in StaticFEController.
2020-03-11 14:05:56 +03:00
972889550d
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-11 09:15:55 +03:00
5af798f246
Fix enforcement of character limits
2020-03-10 13:08:00 -05:00
f39e1b9eff
add verify tls_opts only when we open connection
...
for other requests tesla will add tls_opts
2020-03-10 15:54:11 +03:00
426f5ee48a
tesla adapter can't be changed in adminFE
2020-03-10 15:31:44 +03:00
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
2020-03-09 20:51:44 +03:00
d9f8941dac
Merge branch 'develop' into gun
2020-03-09 10:56:33 +03:00
edb659dc57
Merge branch 'develop' into issue/1276
2020-03-08 14:10:59 +03:00
6cf1958b02
moderation log: fix improperly migrated data
...
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.
Closes #1606
2020-03-07 17:00:58 +03:00
474ef512df
wait in mix task while pleroma is rebooted
2020-03-07 16:02:55 +03:00
b2eb1124d1
Merge branch 'develop' into gun
2020-03-07 12:41:37 +03:00
6d797b9928
Merge branch 'restart-fix-for-mix-tasks' into 'develop'
...
Wait in mix task while pleroma is rebooted
See merge request pleroma/pleroma!2225
2020-03-07 09:32:29 +00:00
5f42ecc4c7
start gun upload pool, if proxy_remote is enabled
2020-03-07 12:24:39 +03:00
78282dc983
little polishing
2020-03-06 21:24:19 +03:00
c93c3096d5
little refactor
2020-03-06 21:04:18 +03:00
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-06 11:48:30 +03:00
40765875d4
[ #1560 ] Misc. improvements in ActivityPubController federation state restrictions.
2020-03-05 21:19:21 +03:00
058c9b01ac
returning, not needed
2020-03-05 18:28:04 +03:00
f0753eed0f
removing try block in tesla request
...
added mocks for tests which fail with Tesla.Mock.Error
2020-03-05 17:31:06 +03:00
ad22e94f33
Exclude private and direct statuses visible to the admin when using godmode
2020-03-05 15:15:27 +03:00
47604907c9
Merge branch 'proper_error_messages' into 'develop'
...
MastodonController: Return 404 errors correctly.
See merge request pleroma/pleroma!2270
2020-03-05 11:49:51 +00:00
927079e2ff
Merge branch 'fix/stats-on-startup' into 'develop'
...
Generate instance stats on startup
Closes #1598
See merge request pleroma/pleroma!2271
2020-03-05 07:25:23 +00:00
eb324467d9
removing try block in getting gun info
2020-03-05 09:51:52 +03:00
cdb05633a6
Generate instance stats on startup
2020-03-04 13:33:26 -06:00
feld
9b740cfb23
Merge branch 'exclude-reblogs-from-admin-api-by-default' into 'develop'
...
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
Closes #1596
See merge request pleroma/pleroma!2267
2020-03-04 18:22:37 +00:00
4bce13fa2f
MastodonController: Return 404 errors correctly.
2020-03-04 18:09:06 +01:00
d6bebd4f9c
moving some logic to tesla adapter
...
- checking original inside gun adapter
- flushing streams on max_body error
2020-03-04 18:13:24 +03:00
6f7a8c43a2
Merge branch 'fix/no-email-no-fail' into 'develop'
...
Do not fail when user has no email
See merge request pleroma/pleroma!2249
2020-03-04 12:43:06 +00:00
22d52f5691
same copyright date format
2020-03-04 09:41:23 +03:00
6b2fb9160c
otp version
2020-03-04 09:23:42 +03:00
d9c5ae7c09
Update Copyrights for gun related files
2020-03-03 17:16:24 -06:00
4427161ca3
Merge branch 'develop' into gun
2020-03-03 17:15:49 -06:00
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
b6fc98d9cd
[ #1560 ] ActivityPubController federation state restrictions adjustments. Adjusted tests.
2020-03-03 22:22:02 +03:00
884d9710b2
refactoring for gun api modules
2020-03-03 19:24:14 +03:00
f98ee730f0
adapter renaming to adapter_helper
2020-03-03 18:53:44 +03:00
8854770fc4
retry and retry_timeout settings default change
2020-03-03 18:01:35 +03:00
1ad34bfdba
no try block in checkout connection
2020-03-03 17:44:04 +03:00
24bf5c4e89
remove try block from pool request
2020-03-03 17:27:56 +03:00
aaa879ce75
proxy parsing errors
2020-03-03 17:27:22 +03:00
6ebf389d6e
poolboy timeout fix
2020-03-03 16:51:49 +03:00
8fc00b7cbf
return error if connection failed to open
2020-03-03 16:42:24 +03:00
7d68924e4f
naming
2020-03-03 16:42:24 +03:00
e605e79df9
simplification of formatting host method
...
case for format_proxy method
2020-03-03 16:42:03 +03:00
ee8071f0d5
removing unused method
2020-03-03 15:12:09 +03:00
05429730e4
unnecessary with
2020-03-03 15:11:48 +03:00
d0e4d3ca3b
removing unnecessary with
...
comment in tesla client impovement
2020-03-03 14:56:49 +03:00
24d1ac125c
hiding raise error logic to otp_version module
2020-03-03 13:24:19 +03:00
28ed4b41d0
naming for checkin from pool timeout
2020-03-03 13:05:28 +03:00
151dc4e387
Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex
2020-03-03 09:53:37 +00:00
7eb6592992
Apply suggestion to lib/pleroma/pool/connections.ex
2020-03-03 09:53:31 +00:00
a21a66972f
Apply suggestion to lib/pleroma/http/http.ex
2020-03-03 09:52:01 +00:00
614e3934f9
Apply suggestion to lib/pleroma/http/http.ex
2020-03-03 09:50:42 +00:00
d30ff35d94
Apply suggestion to lib/pleroma/http/request_builder.ex
2020-03-03 09:46:53 +00:00
a3ad028973
Apply suggestion to lib/pleroma/http/adapter.ex
2020-03-03 09:34:36 +00:00
2c8d80dc0a
Apply suggestion to lib/pleroma/pool/connections.ex
2020-03-03 09:29:57 +00:00
097ad10d02
Apply suggestion to lib/pleroma/pool/connections.ex
2020-03-03 09:29:51 +00:00
4c8569d403
otp_version refactor
2020-03-03 12:21:10 +03:00
509c81e4b1
Merge branch 'develop' into gun
2020-03-03 10:08:07 +03:00
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-02 18:41:12 +03:00
7af431c150
Exclude reblogs from `GET /api/pleroma/admin/statuses` by default
2020-03-02 16:47:31 +03:00
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
2020-03-02 15:35:49 +04:00
764a50f8a6
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
...
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
2020-03-02 07:58:01 +00:00
cc98d010ed
relay list shows hosts without accepted follow
2020-03-02 09:27:20 +03:00
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
d9e4b77f8b
Merge branch 'develop' into gun
2020-03-01 12:48:49 +03:00
400fbc7629
wait in mix task while pleroma is rebooted
2020-03-01 12:36:09 +03:00
34f1d09f3a
spec fix
2020-03-01 12:01:39 +03:00
ba87ed7335
fix for compiling
2020-03-01 12:01:39 +03:00
32d1e04817
ActivityPub actions & side-effects in transaction
2020-03-01 12:01:39 +03:00
523f73dccd
Fix static FE plug to handle missing Accept header.
2020-02-29 18:53:49 -08:00
b5465bf385
timeline controller: add a TODO for replacing copypaste with a macro
2020-03-01 02:03:46 +03:00
ffcebe7e22
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
2020-03-01 01:13:08 +03:00
4d416343fa
rate limiter: Fix a race condition
...
When multiple requests are processed by rate limiter plug at the same
time and the bucket is not yet initialized, both would try to initialize
the bucket resulting in an internal server error.
2020-03-01 01:13:07 +03:00
df2173343a
pagination: limit the number of elements returned at one time to 40
2020-03-01 01:11:54 +03:00
19e559fe51
Merge branch 'rate-limiter-runtime-settings' into 'develop'
...
RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250
2020-02-29 21:52:33 +00:00
c747260989
[ #2250 ] Tiny refactoring per merge request review.
2020-02-29 22:04:09 +03:00
814b275af7
Merge branch 'develop' into gun
2020-02-29 11:34:50 +03:00
3ef2ff3e47
auth_controller.ex: Add admin scope to MastoFE
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
2020-02-29 01:25:14 +01:00
3759b146c4
Apply suggestion to lib/pleroma/plugs/rate_limiter/rate_limiter.ex
2020-02-28 13:33:42 +00:00
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
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
2020-02-27 18:46:05 +03:00
cb60a9c42f
Do not fail when user has no email
2020-02-27 17:27:49 +04:00
4ab07cf0d5
Admin API: Exclude boosts from `GET /api/pleroma/admin/users/:nickname/statuses` and `GET /api/pleroma/admin/instance/:instance/statuses`
2020-02-26 22:35:57 +03:00
e2a6a40367
Admin API: `GET /api/pleroma/admin/statuses` - list all statuses (accepts `godmode` and `local_only`)
2020-02-26 20:21:38 +03:00
f446744a6a
Allow account registration without an email
2020-02-26 20:13:53 +04:00
fda6f35a46
Merge branch 'feat/instance-gen-improvements' into 'develop'
...
small instance.gen task improvements
See merge request pleroma/pleroma!2245
2020-02-26 08:26:16 +00:00
3bbfebd1c2
instance.gen task: make example instance name less confusing
...
See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217
2020-02-26 00:32:34 +03:00
359faa8645
instance.gen task: remind to transfer the config to the database after
...
migrations
2020-02-25 22:13:08 +03:00
cfa28dee32
instance.gen task: make instance name default to the domain
2020-02-25 21:59:37 +03:00
22018adae6
Fix Dialyzer warnings
2020-02-25 18:34:56 +04:00
10f452ad1f
Merge branch 'develop' into issue/1276
2020-02-25 07:22:56 +03:00
035c2c1415
Merge branch 'fix/instance-gen-custom-static' into 'develop'
...
instance.gen task: fix crash when using custom static directory
Closes #1082
See merge request pleroma/pleroma!2237
2020-02-24 20:52:10 +00:00
5e4fe0e8f7
instance.gen task: fix crash when using custom static directory
...
Closes #1082
2020-02-24 23:42:24 +03:00
7ad5c51f23
Admin API: `GET /api/pleroma/admin/stats` to get status count by visibility scope
2020-02-24 21:46:37 +03:00
8efae966b1
open conn in separate task
2020-02-24 19:56:27 +03:00
81f29e7c6a
Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
...
Bugfix: return invalid when answer_data is nil
Closes #1585
See merge request pleroma/pleroma!2236
2020-02-24 14:54:22 +00:00
f9fe6a9e30
Captcha: return invalid when answer_data is nil
2020-02-24 02:49:53 +01:00
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
2020-02-22 19:48:41 +03:00
8f0ca19b9c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# CHANGELOG.md
# config/config.exs
2020-02-22 09:31:43 +03:00
d44f9e3b6c
fix for timeout clause
2020-02-21 16:56:55 +03:00
f604f9e470
hackney pool timeout
2020-02-21 14:33:55 +03:00
6806df80dd
don't log info ssl messages
2020-02-21 14:28:16 +03:00
ad8f26c0a4
more info in Connections.checkin timout errors
2020-02-21 12:53:40 +03:00
a03c420b84
by default don't use gun retries
...
remove conn depends on retry setting from config
2020-02-21 12:32:42 +03:00
13918cb545
Merge branch 'develop' into gun
2020-02-21 10:02:37 +03:00
c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
2020-02-20 23:50:40 +00:00
3eddd9caa6
Merge branch 'require-signature' into 'develop'
...
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
2020-02-20 12:13:21 +00:00
c69b04c490
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
...
remote_follow_controller.ex: Redirect to the user page on success
Closes #1245
See merge request pleroma/pleroma!2123
2020-02-20 12:04:29 +00:00
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
2020-02-20 15:00:48 +03:00
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
2020-02-20 11:58:37 +00:00
3432294657
[ #1505 ] Fixed @spec for Queries.by_object_in_reply_to_id/3
2020-02-20 14:48:46 +03:00
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
2020-02-19 17:16:45 +01:00
c9db0507f8
removing retry option and changing some logger messages levels
2020-02-19 12:26:57 +03:00
7d73e7a09a
Spelling
2020-02-18 09:18:09 -06:00
cf94349287
Merge branch 'develop' into gun
2020-02-18 09:06:27 -06:00
cf8307e71c
Merge branch 'fix/status-view/expires_at' into 'develop'
...
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
2020-02-18 14:56:59 +00:00
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-18 17:46:09 +03:00
3fa2ac68df
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
...
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
2020-02-18 14:36:10 +00:00
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
2020-02-18 14:32:03 +00:00
2ef70b55f5
Fix `status.expires_at` type
2020-02-18 14:52:11 +04:00
514c899275
adding gun adapter
2020-02-18 08:19:01 +03:00
28701c08ad
Merge branch 'develop' into issue/1276
2020-02-17 08:56:03 +03:00
472132215e
Use floki's new APIs for parsing fragments
2020-02-16 01:55:26 +03:00
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
2020-02-15 20:41:38 +03:00
1257331291
MastodonAPI.StatusView: Do not use site_name
...
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg " />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/ ">
2020-02-15 00:36:09 +01:00
478619782b
Standardize @behaviour usage in MRFs
2020-02-14 11:02:24 -06:00
9906c6fb6f
Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop'
...
NodeInfo: Fix federating status not being reported when MRF transparency is disabled
Closes #1568
See merge request pleroma/pleroma!2206
2020-02-13 18:08:43 +00:00
6f9839c73c
Merge branch 'develop' into issue/1276
2020-02-13 20:43:34 +03:00
23049a077e
NodeInfo: Fix federating status not being reported when MRF
...
transparency is disabled
Closes #1568
2020-02-13 19:53:39 +03:00
feld
b312c36b8e
Merge branch 'develop' into 'fix/rename-no_attachment_links-setting'
...
# Conflicts:
# config/description.exs
2020-02-13 14:37:55 +00:00
da44ee5b0f
Merge branch 'develop' into issue/1276
2020-02-13 09:20:34 +03:00
19516af74e
Fix `status.expires_in` validation
2020-02-12 20:20:44 +04:00
ff9fd4ca89
Fix the confusingly named and inverted logic of "no_attachment_links"
...
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
2020-02-11 15:39:19 -06:00
50d9fcbe29
Hotlink logo instead of attachment
2020-02-11 23:33:05 +04:00
feld
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
ea1631d7e6
Make Floki use fast_html
2020-02-11 16:17:21 +03:00
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
2020-02-11 13:58:36 +01:00
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
2020-02-11 13:54:55 +04:00
58574ef156
Merge branch 'develop' into issue/1276
2020-02-11 08:35:26 +03:00
94e5ca1105
Merge branch 'issue/1383' into 'develop'
...
[#1383 ] Switch periodic jobs from quantum to oban
See merge request pleroma/pleroma!2015
2020-02-11 00:04:06 +00:00
6813c0302c
Merge branch 'develop' into issue/1383
2020-02-10 20:49:20 +03:00
c55301e760
Fix a compilation error under certain circumstances
...
I've noticed that sometimes when switching from develop to stable and back,
develop fails to compile and rm -r ing the _build and deps dirs doesn't
help at all.
This is due to Admin API controller needing to generate JSON description
of the config at compile time. Evaluating `config/description.exs`
calls `Generator.list_modules_in_dir/2`, which in turn predicts the
module names of files in the directory and tries to convert the
predicted name to *existing* atoms. Sometimes the compiler will
call that function before compiling the modules in the said directory,
so the conversion will of course fail.
This fixes it by removing the requirement of the atoms being existent.
The function is not subjected to any untrusted user input so this should
be safe. An ideal fix would be to block the compilation of docs before
all modules are compiled and then get a list of compiled elixir modules
under the namespace we want instead of directory hacks, but I have not
been able to figure out how to do that.
2020-02-10 18:41:02 +03:00
3830cb538b
removed a comments
2020-02-10 09:14:15 +03:00
cd040691bd
maked `unread_count` as virtual field
2020-02-10 09:01:45 +03:00
b87533760b
Merge branch 'develop' into issue/1276
2020-02-10 07:59:52 +03:00
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into `first` element, added comments to transmogrifier tests.
2020-02-09 17:34:48 +03:00
6ea3c06d8d
[ #1505 ] Minor refactoring.
2020-02-09 14:09:01 +03:00
7c3991f59e
[ #1505 ] Fixed `replies` serialization (included objects' ids instead of activities' ids).
2020-02-09 10:17:21 +03:00
8fda6303ba
Fix email mix task on OTP releases
...
Closes pleroma#1548
2020-02-09 03:27:29 +03:00
4e6bbdc7b5
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-08 19:59:37 +03:00
d458f4fdca
[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
2020-02-08 19:58:02 +03:00
964b4d82a0
Merge branch 'fix/upload-limit-otp' into 'develop'
...
Actually fix upload limit on OTP releases
Closes #1109
See merge request pleroma/pleroma!2185
2020-02-08 14:02:36 +00:00
dad23e3766
need_reboot flag
2020-02-08 13:00:02 +03:00
15ea75cd2a
Actually fix upload limit on OTP releases
...
Closes #1109
2020-02-07 20:14:06 +03:00
1262357ddb
Merge branch 'cancel-follow-request' into 'develop'
...
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
2020-02-07 16:10:43 +00:00
d85bcc8627
Questions: Add timezone to `closed` property
2020-02-07 16:57:46 +01:00
4538a1ee01
EmojiReactions: Remove old API endpoints
2020-02-07 15:01:45 +01:00
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
2020-02-07 14:52:13 +01:00
bc2e98b200
Add User.get_follow_state/2
2020-02-07 16:17:34 +04:00
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
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
8b9742ecf5
Cancellation of a follow request for a remote user
2020-02-06 18:02:33 +04:00
c85aa6e87f
removing confusing error
2020-02-06 12:50:36 +03:00
15cb1f6804
Merge branch 'fix/unpinnable-polls' into 'develop'
...
fix not being able to pin polls
See merge request pleroma/pleroma!2172
2020-02-05 21:04:16 +00:00
72d767998c
Merge branch 'removing-admin-api-endpoint' into 'develop'
...
Removing migrate_from_db endpoint from admin api
See merge request pleroma/pleroma!2177
2020-02-05 21:03:56 +00:00
feld
b21e59da5f
Merge branch 'remove-linker-scheme-option' into 'develop'
...
Remove AutoLinker `scheme` option from the config
See merge request pleroma/pleroma!2176
2020-02-05 20:32:45 +00:00
5db6ac8ee4
removing migrate_from_db endpoint from admin api
2020-02-05 20:36:21 +03:00
3909b5b7b3
Remove AutoLinker `scheme` option from the config
2020-02-05 21:13:56 +04:00
49e80a1537
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
...
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
2020-02-05 16:59:21 +00:00
8c71f7e11a
Add support for cancellation of a follow request
2020-02-05 20:22:15 +04:00
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-05 07:56:36 +03:00
2c40c8b4a2
Merge branch 'develop' into issue/1383
2020-02-03 21:42:36 +03:00
50f5a92021
fix not being able to pin polls
2020-02-02 14:55:06 +03:00
983a87175e
mastodon API: do not sanitize html in non-html fields
2020-02-02 14:46:32 +03:00
8057157ee3
Make attachments cleanup optional
2020-01-31 01:20:37 +03:00
c27d1d65bf
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
...
Disable rate limiter for socket/localhost
Closes #1380
See merge request pleroma/pleroma!2064
2020-01-30 19:24:04 +00:00
5b62acf6e9
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
2020-01-30 22:16:55 +03:00
774cba84f5
Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop'
...
Re-enable rate limiter and enable remote ip
See merge request pleroma/pleroma!2164
2020-01-30 18:47:44 +00:00
a0d9d42eaa
Emoji Reactions: Actually use the validation.
2020-01-30 16:07:37 +01:00
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
feld
df200ea7a4
Merge branch 'http-security-warning' into 'develop'
...
Warn if HTTPSecurityPlug is disabled
Closes #1528
See merge request pleroma/pleroma!2155
2020-01-30 14:11:29 +00:00
feld
b3e9c87724
Update emoji_api_controller.ex
2020-01-30 14:09:41 +00:00
feld
36becd5573
Update http_security_plug.ex
2020-01-30 14:07:41 +00:00
263abe3ba5
Merge branch 'emoji-reactions-reacted' into 'develop'
...
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
2020-01-30 13:16:04 +00:00
889965141a
RemoteIp: only trust X-Forwarded-For
...
Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.
2020-01-30 00:06:58 +03:00
946de2299c
Merge branch 'fix-streaming-reblog' into 'develop'
...
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
2020-01-29 20:21:32 +00:00
e07e7888d7
Fix credo warning
2020-01-29 18:53:43 +04:00
2bd4d6289b
Make the warning more scarier
2020-01-29 18:43:23 +04:00
e7fee0d6fa
emoji api error on not writable dir
2020-01-29 15:31:34 +03:00
b3a877d6c9
Emoji Reactions: Correctly handle deleted users
2020-01-29 11:43:36 +01:00
a802e07241
Emoji Reactions: Add `reacted` field to emoji reactions
2020-01-29 11:39:06 +01:00
1f4fbe9d98
title parse improvement
2020-01-29 11:13:34 +03:00
ba5e8a6444
Merge branch 'develop' into issue/1276
2020-01-28 21:11:13 +03:00
21a2a05407
Merge branch 'develop' into issue/1383
2020-01-28 20:39:20 +03:00
cedee2793d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
2020-01-28 17:52:42 +01:00
12b6fcdb8c
Merge branch 'features/task-test-email' into 'develop'
...
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
2020-01-28 16:42:57 +00:00
2c121b2623
Merge branch 'fix/1524-link_preview' into 'develop'
...
Meta tags parser respects first title tag
Closes #1524
See merge request pleroma/pleroma!2157
2020-01-28 16:38:14 +00:00
7bd4c14581
meta tag parser respect first title header
2020-01-28 19:29:27 +03:00
d385789a45
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
2020-01-28 17:06:36 +01:00
271935953a
Merge branch 'whole-db-removal' into 'develop'
...
Remove `whole_db` parameter everywhere, it's not used anymore
See merge request pleroma/pleroma!2152
2020-01-28 15:51:45 +00:00
4eb935be78
Create pleroma.email mix task
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
2020-01-28 16:49:38 +01:00
77f24525ca
Streamer: Correctly handle reblog mutes
2020-01-28 16:40:44 +01:00
6302b40791
Warn if HTTPSecurityPlug is disabled
2020-01-28 19:14:09 +04:00
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
d18a2e4e36
Add test for custom base_url when deleting an attachment
2020-01-28 17:22:24 +03:00
804a702f97
Fix base_url string trimming
2020-01-28 17:07:46 +03:00
dea968463d
Add logging
2020-01-28 16:52:20 +03:00
46915207b6
Remove `whole_db` parameter everywhere, it's not used anymore
2020-01-28 14:40:40 +01:00
e3fae3380e
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
2020-01-28 13:38:49 +00:00
7f78bd7e37
Fix __MODULE__ usage
2020-01-28 16:38:44 +03:00
95afcae194
Merge branch 'support/update_ecto' into 'develop'
...
updated ecto and fixed warning
See merge request pleroma/pleroma!2150
2020-01-28 12:49:22 +00:00
4f004ab92e
Merge branch 'fix/attachments-cleanup' into 'develop'
...
Fix/attachments cleanup
See merge request pleroma/pleroma!2148
2020-01-28 12:40:00 +00:00
02c3dd2e3d
update ecto
2020-01-28 10:43:47 +03:00
eb4870e1cd
Remove unused var
2020-01-28 03:54:54 +03:00
52e08ec9fd
explicitly describe perform op in AttachmentsClenupWorker
2020-01-28 03:52:50 +03:00
bcffa662dc
Merge branch 'develop' into feature/tag_feed
2020-01-27 21:13:13 +03:00
dabd535e43
Remove user recommendation by third party engine
2020-01-27 13:21:50 +00:00
e442ea5722
Merge branch 'develop' into issue/1276
2020-01-27 15:20:47 +03:00
bfc70fdf29
Merge branch 'develop' into issue/1383
2020-01-27 08:48:19 +03:00
86c4b76bf0
Fix typo
2020-01-27 04:01:50 +03:00
feld
36838b516f
Merge branch 'fix/runtime-config' into 'develop'
...
Fixes for runtime config
See merge request pleroma/pleroma!2143
2020-01-26 17:35:21 +00:00
d770cffce0
Merge branch 'develop' into issue/1280
2020-01-26 11:23:05 -06:00
e93cc561cd
restarting pleroma from outside application
2020-01-25 18:42:04 +03:00
86e4d23acb
[ #1505 ] Background fetching of incoming activities' `replies` collections.
2020-01-25 10:47:30 +03:00
de4102b247
can be changed in runtime
2020-01-25 10:39:10 +03:00
6252e82f85
respect settings from database in mix tasks
2020-01-25 10:33:27 +03:00
99c0a11c58
added atom feed
2020-01-24 22:12:23 +03:00
055edd3d72
Merge branch 'develop' into feature/tag_feed
2020-01-24 21:46:57 +03:00
8533b63d1f
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
...
Fix for non existing atom
Closes #1532
See merge request pleroma/pleroma!2139
2020-01-24 11:33:02 +00:00
0fceeb44b3
Merge branch 'emoji-reaction-sanity-check' into 'develop'
...
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
2020-01-24 11:32:25 +00:00
347f3ed2c6
Emoji reactions: Change api format once more
2020-01-24 10:52:24 +01:00
6a0f0ac4a2
fix for non existing atom
2020-01-24 12:22:26 +03:00
293281fcbd
Merge branch 'develop' into feature/tag_feed
2020-01-24 08:58:07 +03:00
6cd2e851d9
parsing Swoosh modules
2020-01-23 18:21:29 +03:00
e8e57e398f
restart config id after truncate
2020-01-23 17:48:45 +03:00
4344c5d5b9
truncate config table on migrate to db task
2020-01-23 17:23:02 +03:00
8589632d09
fixed delete ScheduledActivity
2020-01-23 17:18:23 +03:00
34fc0ca053
Emoji reactions: Add sanity checks for the cache
2020-01-23 12:34:34 +01:00
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
2020-01-23 11:42:10 +03:00
5fc2fa8908
Merge branch 'develop' into issue/1383
2020-01-23 11:11:18 +03:00
ce7c887a27
removed try/rescue
2020-01-23 11:05:08 +03:00
6f77b77428
Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex
2020-01-23 05:49:00 +00:00
dddebee047
Merge branch 'emoji-notifications' into 'develop'
...
Emoji notifications
See merge request pleroma/pleroma!2130
2020-01-23 02:12:03 +00:00
e151dea276
Merge branch 'develop' into feature/new-registrations-digest
2020-01-22 15:59:24 -06:00
ae78059ff4
Merge branch 'develop' into features/remote-follow-userpage-redirect
2020-01-22 15:05:39 -06:00
615b72238e
Notifications: Add emoji reaction notifications
2020-01-22 20:06:12 +01:00
cf96c40057
[ #1505 ] Added Mastodon-compatible `replies` collection to Note federated representation.
2020-01-22 21:10:17 +03:00
6e6f1ead31
Merge branch 'no-error-404' into 'develop'
...
Log at debug level for object deletion, not error.
See merge request pleroma/pleroma!2066
2020-01-22 17:55:49 +00:00
cf19bf3c7c
Merge branch 'develop' into issue/1383
2020-01-22 20:20:39 +03:00
7c0ac54437
Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
2020-01-22 17:18:55 +00:00
5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest
2020-01-22 21:18:27 +04:00
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
b6f5b326e7
Fix credo warnings
2020-01-22 20:59:58 +04:00
aa0f0d4edd
Disable NewUsersDigestEmail by default
2020-01-22 20:53:06 +04:00
df0b8f1d08
Add new users digest email
2020-01-22 20:31:42 +04:00
34aa0c542b
Merge branch 'emoji-reaction-extensions-2' into 'develop'
...
Emoji Reactions: In the API, sort them by first emoji insertion date
See merge request pleroma/pleroma!2126
2020-01-22 14:11:01 +00:00
dd3fc50ea4
Emoji reactions: Change cache and reply format
2020-01-22 13:57:42 +01:00
d5f8a88a37
support for updating env after settings deletion
2020-01-22 15:14:11 +03:00
32a643a159
Merge branch 'develop' into admin-be
2020-01-22 11:22:31 +03:00
b8d5c09f48
Merge branch 'develop' into issue/1383
2020-01-22 09:30:30 +03:00
5ea8596448
Merge branch 'develop' into feature/tag_feed
2020-01-21 20:56:49 +03:00
22e94bb2c7
Merge branch 'develop' into fix/attachments-cleanup
2020-01-21 19:45:13 +03:00
7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
2020-01-21 16:46:16 +01:00
f01ab6cd29
some refactor and tests
2020-01-21 18:42:00 +03:00
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
2020-01-21 13:13:17 +00:00
503d966e9f
Merge branch 'develop' into admin-be
2020-01-21 10:32:27 +03:00
dcae5914d1
fix for db key
2020-01-21 10:14:48 +03:00
41e2332007
Merge branch 'develop' into feature/tag_feed
2020-01-21 09:23:35 +03:00
6e88a7e591
exclude blocked user posts from search results
2020-01-21 07:40:13 +03:00
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
2020-01-20 18:10:55 +01:00
00d08c9231
Merge branch 'favoritng-responses' into 'develop'
...
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
2020-01-20 16:31:43 +00:00
8023fa48db
merge fix
2020-01-20 18:25:00 +03:00
4c5b5f14dc
StatusView: Add `emoji_reactions`
2020-01-20 16:24:20 +01:00
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
2020-01-20 14:42:43 +00:00
42ea480e95
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
...
Pleroma API: `emoji_reactions_by` does not need authorization
See merge request pleroma/pleroma!2117
2020-01-20 13:49:06 +00:00
510776ba31
CommonAPI: Don't error out on double favs/repeats
2020-01-20 14:27:59 +01:00
c814f22030
Merge branch 'fix-admin-api-scope' into 'develop'
...
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
2020-01-20 12:07:12 +00:00
5fddf988ea
Pleroma API: `emoji_reactions_by` does not need authorization
2020-01-20 13:05:35 +01:00
e8759cb5ba
Merge branch 'hashtag-benchmarks' into 'develop'
...
Hashtag benchmarks
See merge request pleroma/pleroma!2116
2020-01-20 11:26:07 +00:00
5c533e10e7
Bump credo to 1.1.5
2020-01-20 12:17:14 +01:00
9367b70f37
Merge branch 'features/cleanup-incoming-actor' into 'develop'
...
transmogrifier.ex: simplify handle_incoming of actors
See merge request pleroma/pleroma!2114
2020-01-20 10:25:17 +00:00
dc0498ab2b
Check for unapplied migrations on startup
...
Closes #1328
2020-01-20 12:20:26 +03:00
cde828ff7d
Fix credo warning
2020-01-19 22:09:47 +03:00
d6a532bf0f
Delete attachments asynchronously
2020-01-19 19:45:20 +03:00
6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
2020-01-19 07:06:15 +01:00
efb8ef5abe
releases support
2020-01-18 17:14:50 +03:00
e699861690
full update for some subkeys
2020-01-18 12:25:56 +03:00
81133702d4
Delete attachments after object and cache cleanup
2020-01-17 20:20:37 +03:00
89e93fb33f
return db key on update requests
2020-01-17 18:15:41 +03:00
7676ed8239
some clean up
2020-01-17 16:28:44 +03:00
ce027fd0ef
revert non needable
2020-01-17 15:13:24 +03:00
9e10b90b5b
configure only console backend
2020-01-17 15:06:42 +03:00
108a39c876
updated error messages for authentication process
2020-01-17 15:01:37 +03:00
b310feeccb
compile fix
2020-01-17 15:00:20 +03:00
58e8963824
fix for config loader
2020-01-17 11:54:22 +03:00
60ba2339a2
saving to DB only added by user settings
2020-01-17 11:45:44 +03:00
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
2020-01-16 08:50:27 +03:00
a5db044e57
Merge branch 'develop' into feature/tag_feed
2020-01-15 19:11:13 +03:00
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
2020-01-15 18:12:08 +03:00
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
2020-01-15 14:29:56 +00:00
59ba5c80b9
little cleanup
2020-01-15 17:10:33 +03:00
66de2b159b
don't migrate Pleroma.Web.EndPoint settings
...
don't set Logger level to all tasks
2020-01-15 17:08:45 +03:00
3849053c6a
Merge branch 'develop' into notifications-from-account
2020-01-15 16:49:45 +04:00
167e9c45ec
Benchmarks: Move to correct folder
2020-01-15 12:37:50 +01:00
76c1948880
[ #1478 ] Adjusted AdminAPIController admin subscope requirements.
2020-01-15 12:11:23 +03:00
c9f45edeac
Merge branch 'develop' into feature/tag_feed
2020-01-14 21:29:14 +03:00
0709757e47
Check if object->data is array when looking up attachment objects to delete
2020-01-14 19:53:28 +03:00
2ee6754095
Mix Tasks: Add pleroma.benchmarks.tags
2020-01-14 17:24:26 +01:00
70c7a26de8
Merge branch 'develop' into admin-be
2020-01-14 14:52:00 +03:00
b7908844f2
Merge branch 'develop' into issue/1383
2020-01-13 12:41:07 +03:00
88f0eed0f2
Delete attachments when status is deleted
2020-01-12 18:48:58 +00:00
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
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
0c9c62509d
Remove MDII uploader
2020-01-11 17:19:54 +00:00
1630ecaa20
Merge branch 'develop' into admin-be
2020-01-11 12:15:42 +03:00
3453b27015
don't migrate prometheus settings
2020-01-10 21:24:06 +03:00
d933fd3d61
more renamings
2020-01-10 19:51:32 +03:00
eadb674c41
don't migrate configurable_from_database setting
2020-01-10 19:44:30 +03:00
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
2020-01-10 19:34:19 +03:00
958d0452e4
fix for pleroma assets group update
2020-01-10 18:18:09 +03:00
39ce894a07
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
...
# Conflicts:
# lib/pleroma/user.ex
2020-01-10 16:18:32 +03:00
05ca420c09
Merge branch 'issue/1490' into 'develop'
...
[#1490 ] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
2020-01-10 13:14:20 +00:00
88a16bb9fc
deep merge in config update
2020-01-10 15:52:02 +03:00
c841174de8
flag for delete fix
2020-01-10 15:52:02 +03:00
0b02040327
little fixes and typos fix
2020-01-10 15:52:02 +03:00
9c1f3bfeff
fixes for logger backends
2020-01-10 15:52:01 +03:00
cda2c1fc63
fix for subgroup tuple
...
added settings for swoosh adapters local
2020-01-10 15:52:01 +03:00
063ab6d911
logger backends fix
2020-01-10 15:52:01 +03:00
583cee4607
parsing proxy url setting
2020-01-10 15:52:01 +03:00
a71393dd29
fix for endpoints after env update
2020-01-10 15:52:00 +03:00
fea734ca70
errors on endpoints
2020-01-10 15:52:00 +03:00
5cacb988b9
partially settings update
2020-01-10 15:52:00 +03:00
0656816c77
tests for setttings without an explicit key
2020-01-10 15:51:59 +03:00
2753285b77
config editing through database
2020-01-10 15:51:59 +03:00
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
2020-01-10 10:52:21 +03:00
70410dfafd
fix create service actor
2020-01-08 16:40:49 +03:00
0b6d1292d2
Fix mark-as-read (`POST /api/v1/conversations/:id/read`) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
2020-01-05 17:38:51 +03:00
fa7d8e77e6
fixed Metadata.Utils.scrub_html_and_truncate
2020-01-03 16:28:13 +03:00
badd0a96ea
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
2020-01-02 13:03:33 +03:00
933dc12043
added code of mr#2067
2019-12-25 15:12:43 +03:00
385356aad0
fix oauth scopes for AdminApi#reports_update
2019-12-24 20:51:52 +03:00
bdd71669da
update test
2019-12-22 21:21:31 +03:00
4c505bc615
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
2019-12-22 17:58:54 +00:00
c9a44ec4a6
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
2019-12-22 17:58:45 +00:00
5b84156013
moved remote follow in separate controller
2019-12-21 21:27:42 +03:00
54c9db38c8
Merge branch 'develop' into issue/1383
2019-12-21 20:38:59 +03:00
c51e93978e
Merge branch 'feature/custom-runtime-modules' into 'develop'
...
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
2019-12-21 11:56:24 +00:00
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
2019-12-21 11:41:19 +00:00
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
2019-12-20 16:32:04 -06:00
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
7bd0bca2ab
fixed remote follow
2019-12-20 16:33:44 +03:00
5fc84552d3
Fix all count
2019-12-19 19:52:55 +03:00
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
2019-12-19 17:24:08 +03:00
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
2019-12-19 17:23:27 +03:00
34d85f8a54
Return 404 if account to filter notifications from is not found
2019-12-19 20:45:44 +07:00
775212121c
Verify HTTP signatures only when request accepts "activity+json" type
2019-12-19 20:17:18 +07:00
432b3067d4
Do not crash when remote user follower and following counters are hidden
2019-12-19 19:26:46 +07:00
404a9ccb9a
Stats: return status counts by scope
2019-12-18 23:17:34 +03:00
b53573a837
add tag feeds
2019-12-18 09:19:37 +03:00
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17 16:16:21 +01:00
6c39fa20b1
Add support for `account_id` param to filter notifications by the account
2019-12-17 17:00:46 +07:00
45180d4c60
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
2019-12-17 12:36:56 +03:00
8f79f433bc
Hide follower counter when hiding is activated
2019-12-17 13:34:07 +07:00
a879c396bb
Merge branch 'develop' into feature/tag_feed
2019-12-17 09:24:08 +03:00
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-16 22:34:21 +07:00
a12b6454bb
Add an option to require fetches to be signed
2019-12-16 22:24:03 +07:00
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
2019-12-15 22:32:42 +03:00
67cb46e15d
Merge branch 'develop' into issue/1383
2019-12-14 21:44:10 +03:00
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
2019-12-14 03:06:43 +03:00
02c3031e99
Don't log when users or objects are deleted.
2019-12-13 12:05:53 -08:00
bcd16676a7
Publisher: check out a connection for inserting publish_one jobs
...
Related to #1474 , federation of one post on my istance creates in
best-case 360 jobs, so if they for some reason take a while to insert,
it will exhaust the connection pool. This fixes it by checking out one
dedicated connection for inserting them.
2019-12-13 14:27:10 +03:00
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-13 01:51:52 +07:00
2f31cef71f
Merge branch 'feature/native-captcha' into 'develop'
...
Add native captcha and enable it by default.
Closes #1017 and #1405
See merge request pleroma/pleroma!2060
2019-12-12 18:43:21 +00:00
81b05340e9
[ #1427 ] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
...
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
2019-12-12 16:00:06 +03:00
e536796984
Add native captcha and enable it by default.
2019-12-12 17:39:39 +07:00
8cb852523a
Merge branch 'feature/merge-acc-views-for-statuses' into 'develop'
...
AdminAPI: Merge account views for list instance statuses
See merge request pleroma/pleroma!2054
2019-12-12 09:28:27 +00:00
3ecf131511
Merge branch 'develop' into feature/report-notes
2019-12-12 02:16:23 +03:00
9ef912aecf
Merge branch 'develop' into issue/1411
2019-12-11 15:02:53 -06:00
82fae3e23f
AdminAPI: Merge account views for list instance statuses
2019-12-11 18:57:36 +03:00
ee6805850c
Set log level to debug for not important messages
2019-12-11 17:47:19 +07:00
72f3b22134
Merge branch 'domain-block-precedence' into 'develop'
...
make follows take precedence over domain blocks
See merge request pleroma/pleroma!2019
2019-12-11 09:57:00 +00:00
1ad96d667a
remove single-step pipe
2019-12-11 09:08:20 +00:00
1f498ba2bb
Merge branch '1427-oauth-admin-scopes' into 'develop'
...
[#1427 ] Fixed `:admin` option handling in OAuthScopesPlug, added tests
Closes #1427
See merge request pleroma/pleroma!2053
2019-12-11 08:50:43 +00:00
3920244be5
[ #1427 ] Fixed `:admin` option handling in OAuthScopesPlug, added tests.
2019-12-11 11:42:02 +03:00
lain
feld
