lain
643f15e77b
Validators: ObjectID is an http uri.
2020-03-31 16:11:38 +02:00
kPherox
d191b0942f
Remove no longer used function
2020-03-31 22:50:18 +09:00
lain
f6835333be
Apply suggestion to lib/pleroma/web/activity_pub/transmogrifier.ex
2020-03-31 12:55:25 +00:00
rinpatch
e99e2a86af
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-31 13:42:02 +03:00
lain
c4d3ccc7b9
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-31 13:41:47 +03:00
feld
10b7b2b4a4
Merge branch 'fix/activity-deletion' into 'develop'
...
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
2020-03-31 13:40:28 +03:00
rinpatch
0e92aa0025
Merge branch '1364-notifications-sending-control' into 'develop'
...
[#1364 ] Ability to opt-out of notifications (in all clients)
Closes #1364
See merge request pleroma/pleroma!2301
2020-03-31 13:39:58 +03:00
Ivan Tashkinov
ea9c57b26e
[ #2332 ] Misc. improvements per code change requests.
2020-03-31 09:21:42 +03:00
Ivan Tashkinov
9c94b6a327
[ #2332 ] Misc. fixes per code change requests.
2020-03-30 19:08:37 +03:00
lain
8bd5ad8664
Merge branch 'benchmark-improvements' into 'develop'
...
Benchmark improvements
See merge request pleroma/pleroma!2308
2020-03-30 14:48:00 +00:00
Alexander Strizhakov
b607ae1a1c
removing grouped reports admin api endpoint
2020-03-30 13:51:45 +03:00
Alexander Strizhakov
1fcdcb12a7
updating gun with bug fix
...
https://github.com/ninenines/gun/issues/222
2020-03-30 12:47:12 +03:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
Alexander Strizhakov
1f29ecdcd7
sync with develop
2020-03-30 11:42:25 +03:00
Alexander Strizhakov
eb9744cade
activities generation tasks
2020-03-30 11:42:25 +03:00
Haelwenn
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-03-29 19:18:22 +00:00
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
Ivan Tashkinov
be9d18461a
FollowingRelationship storage & performance optimizations (state turned ecto_enum-driven integer, reorganized indices etc.).
2020-03-28 18:49:03 +03:00
Ivan Tashkinov
dfbc05d496
Misc refactoring / tweaks (ThreadMute.exists?/2).
2020-03-27 08:01:03 +03:00
Ivan Tashkinov
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
lain
29ab1d9f8d
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-26 17:24:10 +01:00
lain
69fc1dd69f
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
2020-03-26 14:45:28 +00:00
lain
0c60c0a76a
Validators: Use correct type for IDs.
2020-03-26 15:44:14 +01:00
lain
0adaab8e75
Bump copyright dates.
2020-03-26 15:37:42 +01:00
lain
eaacc64839
Refactors.
2020-03-26 15:33:10 +01:00
lain
ee979dd6d7
Merge branch 'remake-remodel-2' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-26 15:24:06 +01:00
lain
d7aa0b645b
Apply suggestion to lib/pleroma/web/activity_pub/object_validator.ex
2020-03-26 14:23:19 +00:00
lain
4cf1007a7d
ActivityPub: Small refactor.
2020-03-26 15:16:54 +01:00
Egor Kislitsyn
94a6590e3c
Partially restore /api/statusnet/config.json
2020-03-26 17:59:45 +04:00
Egor Kislitsyn
1c3f3a12ed
Add characterLimit and vapidPublicKey to nodeinfo
2020-03-26 16:20:20 +04:00
Ivan Tashkinov
112101ca52
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
...
# Conflicts:
# lib/pleroma/thread_mute.ex
2020-03-26 09:43:58 +03:00
rinpatch
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
Ivan Tashkinov
460e41585c
Further preloading (more endpoints), refactoring, tests.
2020-03-25 20:33:34 +03:00
Ivan Tashkinov
be5e2c4dbb
Applied relationships preloading to GET /api/v1/accounts/relationships. Refactoring (User.binary_id/1).
2020-03-25 17:01:45 +03:00
Ivan Tashkinov
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
Ivan Tashkinov
012d428e1f
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-25 09:05:17 +03:00
Ivan Tashkinov
e743c22329
Fixed incorrect usage of "relations" as a short form of "relationships".
2020-03-25 09:04:00 +03:00
Haelwenn (lanodan) Monnier
212c31c637
Merge remote-tracking branch 'pleroma/develop' into featureflag/emoji_reactions
2020-03-24 20:32:49 +01:00
Ivan Tashkinov
8f1d622b8d
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-24 22:15:37 +03:00
Ivan Tashkinov
13cbb9f6ad
Implemented preloading of relationships with parent activities' actors for statuses/timeline rendering. Applied preloading for notifications rendering. Fixed announces rendering issue (preloading-related).
2020-03-24 22:14:26 +03:00
feld
8eebc75c15
Merge branch 'fix/activity-deletion' into 'develop'
...
Fix activity deletion
Closes #1640
See merge request pleroma/pleroma!2328
2020-03-24 19:10:32 +00:00
rinpatch
f316882464
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub.ex
2020-03-24 18:37:53 +00:00
lain
aaf00f1ff5
Apply suggestion to lib/pleroma/web/activity_pub/pipeline.ex
2020-03-24 18:24:09 +00:00
lain
74560e888e
Apply suggestion to lib/pleroma/web/activity_pub/object_validators/create_validator.ex
2020-03-24 18:20:58 +00:00
lain
1d75d0ed7a
Merge branch 'admin-api-change-password' into 'develop'
...
Admin API: `PATCH /api/pleroma/admin/users/:nickname/update_credentials`
See merge request pleroma/pleroma!2149
2020-03-24 17:34:13 +00:00
Egor Kislitsyn
4a2538967c
Support pagination in conversations
2020-03-24 20:18:27 +04:00
Egor Kislitsyn
d1a9716a98
Fix activity deletion
2020-03-24 17:38:18 +04:00
Egor Kislitsyn
3189c44a0c
Remove some TwitterAPI endpoints
2020-03-24 15:21:40 +04:00
rinpatch
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
lain
3bd2829e5c
Benchmarks: Add timeline benchmark
2020-03-23 18:56:01 +01:00
Ivan Tashkinov
86f2fbc81e
Merge remote-tracking branch 'remotes/origin/develop' into relations-preloading-for-statuses-rendering
2020-03-23 14:34:58 +03:00
Egor Kislitsyn
5a34dca8ed
Add emoji support in statuses in staticfe
2020-03-23 14:03:31 +04:00
Ivan Tashkinov
3c78e5f327
Preloading of follow relations for timeline/statuses rendering (performance improvement). Refactoring.
2020-03-23 12:01:11 +03:00
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task
2020-03-23 10:44:47 +03:00
Ivan Tashkinov
c2e415143b
WIP: preloading of user relations for timeline/statuses rendering (performance improvement).
2020-03-22 21:51:44 +03:00
Haelwenn (lanodan) Monnier
15be6ba9c2
AccountView: fix for other forms of <br> in bio
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-03-22 16:41:01 +01:00
rinpatch
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
Egor Kislitsyn
80e1571610
Merge branch 'develop' into global-status-expiration
2020-03-20 22:08:34 +04:00
Alexander Strizhakov
9bae9b1b1b
Merge branch 'develop' into gun
2020-03-20 20:47:54 +03:00
Egor Kislitsyn
cb8236cda6
Add embeddable posts
2020-03-20 21:46:26 +04:00
lain
d74405fc1a
Merge branch 'fix-feed-pagination' into 'develop'
...
Fix for feed page pagination
Closes #1605
See merge request pleroma/pleroma!2281
2020-03-20 16:57:51 +00:00
lain
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-20 14:52:58 +01:00
Alexander Strizhakov
fe15f0ba15
restrict_unauthenticated setting
2020-03-20 16:36:20 +03:00
Alexander Strizhakov
98a60df41f
include_types parameter in /api/v1/notifications
2020-03-20 13:18:12 +03:00
Haelwenn (lanodan) Monnier
a8aa917530
Merge remote-tracking branch 'pleroma/develop' into bugfix/apc2s_upload_activity
2020-03-19 19:25:50 +01:00
Haelwenn (lanodan) Monnier
c1fd4f6653
transmogrifier.ex: rework fix_attachment for better IR
2020-03-19 19:10:03 +01:00
lain
9b9d67bbec
Fix linting.
2020-03-19 18:16:12 +01:00
lain
3c2c32b460
Merge branch 'remake-remodel' into develop
2020-03-19 18:00:55 +01:00
Mark Felder
7d275970ab
Add emoji reactions to features in nodeinfo
2020-03-19 10:08:11 -05:00
Haelwenn (lanodan) Monnier
f9d622d25a
WIP
2020-03-19 15:39:11 +01:00
Alexander Strizhakov
f9ecb513fa
Merge branch 'develop' into gun
2020-03-18 14:08:21 +03:00
Ivan Tashkinov
7438833685
[ #1364 ] Improved notification-related tests.
2020-03-16 21:58:10 +03:00
eugenijm
13cce9c0de
Admin API: PATCH /api/pleroma/admin/users/:nickname/credentials, GET /api/pleroma/admin/users/:nickname/credentials.
2020-03-16 20:42:37 +03:00
eugenijm
d198e7fa2a
Admin API: PATCH /api/pleroma/admin/users/:nickname/change_password
2020-03-16 20:32:07 +03:00
Alexander Strizhakov
f3791add99
removing with_move parameter
2020-03-16 20:07:45 +03:00
Ivan Tashkinov
0e07c5ef57
Merge remote-tracking branch 'remotes/origin/develop' into 1364-notifications-sending-control
2020-03-16 17:58:42 +03:00
Alexander Strizhakov
bf474ca3c1
fix
2020-03-16 16:23:49 +03:00
Alexander Strizhakov
35471205f8
temp fix for :gun.info MatchError
2020-03-16 15:47:25 +03:00
Egor Kislitsyn
421e35b578
Merge branch 'develop' into global-status-expiration
2020-03-16 15:31:31 +04:00
Alexander Strizhakov
f0651730bd
Merge branch 'develop' into gun
2020-03-16 14:25:55 +03:00
Alexander Strizhakov
89e4b3ebbd
fix for content-type header for tag feed
2020-03-16 12:59:18 +03:00
Alexander Strizhakov
91870c8995
adding rss for user feed
2020-03-16 12:45:31 +03:00
Alexander Strizhakov
26e2076659
fix for feed page pagination
2020-03-16 12:33:55 +03:00
rinpatch
c46d035f7b
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-16 00:15:21 +03:00
rinpatch
9d09755291
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-16 00:15:11 +03:00
rinpatch
fcf51a77ba
Merge branch 'features/staticfe-sanitization' into 'develop'
...
static_fe: Sanitize HTML
Closes #1614
See merge request pleroma/pleroma!2299
2020-03-16 00:14:04 +03:00
Haelwenn (lanodan) Monnier
8176ca9e40
static_fe: Sanitize HTML in users
2020-03-15 20:44:04 +01:00
Haelwenn (lanodan) Monnier
0ac6e29654
static_fe: Sanitize HTML in posts
...
Note: Seems to have different sanitization with TwitterCard generator giving
the following:
<meta content=\"“alert('xss')”\" property=\"twitter:description\">
2020-03-15 20:44:04 +01:00
lain
fa4ec17c84
Merge branch '1560-non-federating-instances-routes-restrictions' into 'develop'
...
[#1560 ] Restricted AP- & OStatus-related routes for non-federating instances
Closes #1560
See merge request pleroma/pleroma!2235
2020-03-15 19:15:20 +00:00
Ivan Tashkinov
7c8003c3fc
[ #1364 ] Improved control over generation / sending of notifications. Fixed blocking / muting users notifications issue. Added tests.
2020-03-15 21:00:12 +03:00
Haelwenn
d84670b9e1
Merge branch 'f' into 'develop'
...
rip out fetch_initial_posts
Closes #1422 and #1595
See merge request pleroma/pleroma!2297
2020-03-15 16:14:54 +00:00
Haelwenn
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
Haelwenn (lanodan) Monnier
306d633b40
pleroma_api_controller.ex: Improve conversations error reporting
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1594
2020-03-15 17:01:33 +03:00
rinpatch
0b823755a2
Merge branch 'fix/cache-control-headers' into 'develop'
...
Fix Cache Control headers on media
See merge request pleroma/pleroma!2295
2020-03-15 17:01:04 +03:00
Haelwenn (lanodan) Monnier
3f54215219
auth_controller.ex: Add admin scope to MastoFE
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1265
2020-03-15 17:00:41 +03:00
Egor Kislitsyn
ffd636f109
Fix hashtags WebSocket streaming
2020-03-15 17:00:18 +03:00
Phil Hagelberg
bd80ff9a6c
Fix static FE plug to handle missing Accept header.
2020-03-15 17:00:06 +03:00
Haelwenn (lanodan) Monnier
5f9fbd7d33
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-15 16:59:52 +03:00
rinpatch
80bc8c2cc9
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-15 16:59:39 +03:00
feld
e7837bc14e
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
2020-03-15 16:58:51 +03:00
Mark Felder
f8dc597c51
Fix enforcement of character limits
2020-03-15 16:58:13 +03:00
rinpatch
423cfaf141
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-15 16:57:59 +03:00
Alexander Strizhakov
7cf7083076
relay list shows hosts without accepted follow
2020-03-15 16:55:20 +03:00
rinpatch
e87a32bcd7
rip out fetch_initial_posts
...
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.
idea acked by lain and feld on irc
Closes #1595 #1422
2020-03-15 15:59:17 +03:00
Haelwenn (lanodan) Monnier
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
Ivan Tashkinov
ecb7809e92
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# lib/pleroma/plugs/static_fe_plug.ex
2020-03-14 15:37:02 +03:00
rinpatch
d88c8a9614
Merge branch 'fix/cache-control-headers' into 'develop'
...
Fix Cache Control headers on media
See merge request pleroma/pleroma!2295
2020-03-14 11:19:42 +00:00
rinpatch
6a28c198af
uploaded media plug: do not inject compile-time params on every request
2020-03-13 22:12:33 +03:00
rinpatch
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
rinpatch
994ac4357c
Merge branch 'fix/hashtags-streaming' into 'develop'
...
Fix hashtags WebSocket streaming
Closes #1593
See merge request pleroma/pleroma!2294
2020-03-13 18:50:17 +00:00
rinpatch
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
rinpatch
fc4496d4fa
rate limiter: disable based on if remote ip was found, not on if the plug was enabled
...
The current rate limiter disable logic won't trigger when the remote ip
is not forwarded, only when the remoteip plug is not enabled, which is
not the case on most instances since it's enabled by default. This
changes the behavior to warn and disable when the remote ip was not forwarded,
even if the RemoteIP plug is enabled.
Also closes #1620
2020-03-13 21:41:17 +03:00
rinpatch
3e0f05f08e
Merge branch 'bugfix/br-vs-newline' into 'develop'
...
Formatting: Do not use \n and prefer <br> instead
Closes #1374 and #1375
See merge request pleroma/pleroma!2204
2020-03-13 18:22:55 +00:00
Mark Felder
c6eb1c1b92
Merge branch 'develop' into fix/cache-control-headers
2020-03-13 12:54:06 -05:00
Mark Felder
7321429a2e
Lint
2020-03-13 12:42:06 -05:00
Mark Felder
3b1b183b42
Synchronize cache-control header for local media with the mediaproxy
2020-03-13 12:27:50 -05:00
Mark Felder
413177c8f0
Set correct Cache-Control header for local media
2020-03-13 12:02:58 -05:00
Mark Felder
c62195127d
Update comment to reflect what the code is actually doing
2020-03-13 11:46:40 -05:00
Mark Felder
ad31d0726a
Do not trust remote Cache-Control headers for mediaproxy
2020-03-13 11:30:27 -05:00
rinpatch
096c5c52e0
Merge branch 'revert/cache-control' into 'develop'
...
Revert "Set better Cache-Control header for static content"
Closes #1613
See merge request pleroma/pleroma!2290
2020-03-13 16:25:10 +00:00
Egor Kislitsyn
fffc382f13
Fix hashtags WebSocket streaming
2020-03-13 19:30:42 +04:00
Haelwenn (lanodan) Monnier
d1379c4de8
Formatting: Do not use \n and prefer <br> instead
...
It moves bbcode to bbcode_pleroma as the former is owned by kaniini
and transfering ownership wasn't done in a timely manner.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1374
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1375
2020-03-13 16:07:17 +01:00
Alexander Strizhakov
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
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun
2020-03-12 18:31:10 +03:00
Alexander Strizhakov
1306b92997
clean up
2020-03-12 18:29:07 +03:00
Egor Kislitsyn
d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-12 16:02:24 +04:00
Ivan Tashkinov
bd40880fa0
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
...
# Conflicts:
# test/web/activity_pub/activity_pub_controller_test.exs
2020-03-12 12:07:07 +03:00
feld
2019f3b3ff
Merge branch 'fix/signup-without-email' into 'develop'
...
Allow account registration without an email
See merge request pleroma/pleroma!2246
2020-03-11 16:53:05 +00:00
rinpatch
7cdabdc0df
Merge branch 'fix/1610-release-compilation-config-fix' into 'develop'
...
Merging default release config on app start
Closes #1610
See merge request pleroma/pleroma!2288
2020-03-11 15:16:18 +00:00
feld
f92c447bbc
Merge branch 'relay-list-change' into 'develop'
...
Relay list shows hosts without accepted follow
See merge request pleroma/pleroma!2240
2020-03-11 15:10:09 +00:00
rinpatch
c3b9fbd3a7
Revert "Set better Cache-Control header for static content"
...
On furher investigation it seems like all that did was cause unintuitive
behavior. The emoji request flood that was the reason for introducing it
isn't really that big of a deal either, since Plug.Static only needs to
read file modification time and size to determine the ETag.
Closes #1613
2020-03-11 17:58:25 +03:00
Alexander Strizhakov
fce090c1de
using Pleroma.Config instead of ets
2020-03-11 17:22:50 +03:00
Alexander Strizhakov
193d67cde5
compile fix
2020-03-11 16:43:58 +03:00
Alexander Strizhakov
282a93554f
merging release default config on app start
2020-03-11 16:25:53 +03:00
Haelwenn (lanodan) Monnier
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
2020-03-11 13:46:42 +01:00
Ivan Tashkinov
5b696a8ac1
[ #1560 ] Enforced authentication for non-federating instances in StaticFEController.
2020-03-11 14:05:56 +03:00
Ivan Tashkinov
972889550d
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-11 09:15:55 +03:00
Mark Felder
5af798f246
Fix enforcement of character limits
2020-03-10 13:08:00 -05:00
Alexander Strizhakov
f39e1b9eff
add verify tls_opts only when we open connection
...
for other requests tesla will add tls_opts
2020-03-10 15:54:11 +03:00
Alexander Strizhakov
426f5ee48a
tesla adapter can't be changed in adminFE
2020-03-10 15:31:44 +03:00
Ivan Tashkinov
5fc92deef3
[ #1560 ] Ensured authentication or enabled federation for federation-related routes. New tests + tests refactoring.
2020-03-09 20:51:44 +03:00
Alexander Strizhakov
d9f8941dac
Merge branch 'develop' into gun
2020-03-09 10:56:33 +03:00
Maksim Pechnikov
edb659dc57
Merge branch 'develop' into issue/1276
2020-03-08 14:10:59 +03:00
rinpatch
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
Alexander Strizhakov
474ef512df
wait in mix task while pleroma is rebooted
2020-03-07 16:02:55 +03:00
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun
2020-03-07 12:41:37 +03:00
rinpatch
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
Alexander Strizhakov
5f42ecc4c7
start gun upload pool, if proxy_remote is enabled
2020-03-07 12:24:39 +03:00
Alexander Strizhakov
78282dc983
little polishing
2020-03-06 21:24:19 +03:00
Alexander Strizhakov
c93c3096d5
little refactor
2020-03-06 21:04:18 +03:00
Ivan Tashkinov
027714b519
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-06 11:48:30 +03:00
Ivan Tashkinov
40765875d4
[ #1560 ] Misc. improvements in ActivityPubController federation state restrictions.
2020-03-05 21:19:21 +03:00
Alexander Strizhakov
058c9b01ac
returning, not needed
2020-03-05 18:28:04 +03:00
Alexander Strizhakov
f0753eed0f
removing try block in tesla request
...
added mocks for tests which fail with Tesla.Mock.Error
2020-03-05 17:31:06 +03:00
eugenijm
ad22e94f33
Exclude private and direct statuses visible to the admin when using godmode
2020-03-05 15:15:27 +03:00
lain
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
Haelwenn
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
Alexander Strizhakov
eb324467d9
removing try block in getting gun info
2020-03-05 09:51:52 +03:00
Mark Felder
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
lain
4bce13fa2f
MastodonController: Return 404 errors correctly.
2020-03-04 18:09:06 +01:00
Alexander Strizhakov
d6bebd4f9c
moving some logic to tesla adapter
...
- checking original inside gun adapter
- flushing streams on max_body error
2020-03-04 18:13:24 +03:00
lain
6f7a8c43a2
Merge branch 'fix/no-email-no-fail' into 'develop'
...
Do not fail when user has no email
See merge request pleroma/pleroma!2249
2020-03-04 12:43:06 +00:00
Alexander Strizhakov
22d52f5691
same copyright date format
2020-03-04 09:41:23 +03:00
Alexander Strizhakov
6b2fb9160c
otp version
2020-03-04 09:23:42 +03:00
Mark Felder
d9c5ae7c09
Update Copyrights for gun related files
2020-03-03 17:16:24 -06:00
Mark Felder
4427161ca3
Merge branch 'develop' into gun
2020-03-03 17:15:49 -06:00
Mark Felder
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
Ivan Tashkinov
b6fc98d9cd
[ #1560 ] ActivityPubController federation state restrictions adjustments. Adjusted tests.
2020-03-03 22:22:02 +03:00
Alexander Strizhakov
884d9710b2
refactoring for gun api modules
2020-03-03 19:24:14 +03:00
Alexander Strizhakov
f98ee730f0
adapter renaming to adapter_helper
2020-03-03 18:53:44 +03:00
Alexander Strizhakov
8854770fc4
retry and retry_timeout settings default change
2020-03-03 18:01:35 +03:00
Alexander Strizhakov
1ad34bfdba
no try block in checkout connection
2020-03-03 17:44:04 +03:00
Alexander Strizhakov
24bf5c4e89
remove try block from pool request
2020-03-03 17:27:56 +03:00
Alexander Strizhakov
aaa879ce75
proxy parsing errors
2020-03-03 17:27:22 +03:00
Alexander Strizhakov
6ebf389d6e
poolboy timeout fix
2020-03-03 16:51:49 +03:00
Alexander Strizhakov
8fc00b7cbf
return error if connection failed to open
2020-03-03 16:42:24 +03:00
Alexander Strizhakov
7d68924e4f
naming
2020-03-03 16:42:24 +03:00
Alexander Strizhakov
e605e79df9
simplification of formatting host method
...
case for format_proxy method
2020-03-03 16:42:03 +03:00
Alexander Strizhakov
ee8071f0d5
removing unused method
2020-03-03 15:12:09 +03:00
Alexander Strizhakov
05429730e4
unnecessary with
2020-03-03 15:11:48 +03:00
Alexander Strizhakov
d0e4d3ca3b
removing unnecessary with
...
comment in tesla client impovement
2020-03-03 14:56:49 +03:00
Alexander Strizhakov
24d1ac125c
hiding raise error logic to otp_version module
2020-03-03 13:24:19 +03:00
Alexander Strizhakov
28ed4b41d0
naming for checkin from pool timeout
2020-03-03 13:05:28 +03:00
Alexander Strizhakov
151dc4e387
Apply suggestion to lib/pleroma/reverse_proxy/client/tesla.ex
2020-03-03 09:53:37 +00:00
Alexander Strizhakov
7eb6592992
Apply suggestion to lib/pleroma/pool/connections.ex
2020-03-03 09:53:31 +00:00
Alexander Strizhakov
a21a66972f
Apply suggestion to lib/pleroma/http/http.ex
2020-03-03 09:52:01 +00:00
Alexander Strizhakov
614e3934f9
Apply suggestion to lib/pleroma/http/http.ex
2020-03-03 09:50:42 +00:00
Alexander Strizhakov
d30ff35d94
Apply suggestion to lib/pleroma/http/request_builder.ex
2020-03-03 09:46:53 +00:00
Alexander Strizhakov
a3ad028973
Apply suggestion to lib/pleroma/http/adapter.ex
2020-03-03 09:34:36 +00:00
Alexander Strizhakov
2c8d80dc0a
Apply suggestion to lib/pleroma/pool/connections.ex
2020-03-03 09:29:57 +00:00
Alexander Strizhakov
097ad10d02
Apply suggestion to lib/pleroma/pool/connections.ex
2020-03-03 09:29:51 +00:00
Alexander Strizhakov
4c8569d403
otp_version refactor
2020-03-03 12:21:10 +03:00
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun
2020-03-03 10:08:07 +03:00
Egor Kislitsyn
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-03 00:32:34 +04:00
Ivan Tashkinov
99a6c660a9
Merge remote-tracking branch 'remotes/origin/develop' into 1560-non-federating-instances-routes-restrictions
2020-03-02 18:41:12 +03:00
eugenijm
7af431c150
Exclude reblogs from GET /api/pleroma/admin/statuses by default
2020-03-02 16:47:31 +03:00
Egor Kislitsyn
4a45b96a91
Merge branch 'develop' into fix/signup-without-email
2020-03-02 15:35:49 +04:00
Haelwenn
764a50f8a6
Merge branch 'feature/1482-activity_pub_transactions' into 'develop'
...
ActivityPub actions & side-effects in transaction
Closes #1482
See merge request pleroma/pleroma!2089
2020-03-02 07:58:01 +00:00
Alexander Strizhakov
cc98d010ed
relay list shows hosts without accepted follow
2020-03-02 09:27:20 +03:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
Alexander Strizhakov
d9e4b77f8b
Merge branch 'develop' into gun
2020-03-01 12:48:49 +03:00
Alexander Strizhakov
400fbc7629
wait in mix task while pleroma is rebooted
2020-03-01 12:36:09 +03:00
Alexander Strizhakov
34f1d09f3a
spec fix
2020-03-01 12:01:39 +03:00
Alexander Strizhakov
ba87ed7335
fix for compiling
2020-03-01 12:01:39 +03:00
Alexander Strizhakov
32d1e04817
ActivityPub actions & side-effects in transaction
2020-03-01 12:01:39 +03:00
Phil Hagelberg
523f73dccd
Fix static FE plug to handle missing Accept header.
2020-02-29 18:53:49 -08:00
rinpatch
b5465bf385
timeline controller: add a TODO for replacing copypaste with a macro
2020-03-01 02:03:46 +03:00
rinpatch
ffcebe7e22
timeline controller: rate limit timelines to 3 requests per 500ms per timeline per ip/user
2020-03-01 01:13:08 +03:00
rinpatch
4d416343fa
rate limiter: Fix a race condition
...
When multiple requests are processed by rate limiter plug at the same
time and the bucket is not yet initialized, both would try to initialize
the bucket resulting in an internal server error.
2020-03-01 01:13:07 +03:00
rinpatch
df2173343a
pagination: limit the number of elements returned at one time to 40
2020-03-01 01:11:54 +03:00
rinpatch
19e559fe51
Merge branch 'rate-limiter-runtime-settings' into 'develop'
...
RateLimiter improvements: runtime configurability, no default limits in tests
See merge request pleroma/pleroma!2250
2020-02-29 21:52:33 +00:00
Ivan Tashkinov
c747260989
[ #2250 ] Tiny refactoring per merge request review.
2020-02-29 22:04:09 +03:00
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun
2020-02-29 11:34:50 +03:00
Haelwenn (lanodan) Monnier
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
Ivan Tashkinov
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
Ivan Tashkinov
6f2efb1c45
Runtime configurability of RateLimiter. Refactoring. Disabled default rate limits in tests.
2020-02-27 18:46:05 +03:00
Egor Kislitsyn
cb60a9c42f
Do not fail when user has no email
2020-02-27 17:27:49 +04:00
eugenijm
4ab07cf0d5
Admin API: Exclude boosts from GET /api/pleroma/admin/users/:nickname/statuses and GET /api/pleroma/admin/instance/:instance/statuses
2020-02-26 22:35:57 +03:00
eugenijm
e2a6a40367
Admin API: GET /api/pleroma/admin/statuses - list all statuses (accepts godmode and local_only)
2020-02-26 20:21:38 +03:00
Egor Kislitsyn
f446744a6a
Allow account registration without an email
2020-02-26 20:13:53 +04:00
lain
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
rinpatch
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
rinpatch
359faa8645
instance.gen task: remind to transfer the config to the database after
...
migrations
2020-02-25 22:13:08 +03:00
rinpatch
cfa28dee32
instance.gen task: make instance name default to the domain
2020-02-25 21:59:37 +03:00
Egor Kislitsyn
22018adae6
Fix Dialyzer warnings
2020-02-25 18:34:56 +04:00
Maksim Pechnikov
10f452ad1f
Merge branch 'develop' into issue/1276
2020-02-25 07:22:56 +03:00
rinpatch
035c2c1415
Merge branch 'fix/instance-gen-custom-static' into 'develop'
...
instance.gen task: fix crash when using custom static directory
Closes #1082
See merge request pleroma/pleroma!2237
2020-02-24 20:52:10 +00:00
rinpatch
5e4fe0e8f7
instance.gen task: fix crash when using custom static directory
...
Closes #1082
2020-02-24 23:42:24 +03:00
eugenijm
7ad5c51f23
Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope
2020-02-24 21:46:37 +03:00
Alexander Strizhakov
8efae966b1
open conn in separate task
2020-02-24 19:56:27 +03:00
lain
81f29e7c6a
Merge branch 'bugfix/captcha-nil-answer_data' into 'develop'
...
Bugfix: return invalid when answer_data is nil
Closes #1585
See merge request pleroma/pleroma!2236
2020-02-24 14:54:22 +00:00
Haelwenn (lanodan) Monnier
f9fe6a9e30
Captcha: return invalid when answer_data is nil
2020-02-24 02:49:53 +01:00
Ivan Tashkinov
0cf1d4fcd0
[ #1560 ] Restricted AP- & OStatus-related routes for non-federating instances.
2020-02-22 19:48:41 +03:00
Ivan Tashkinov
8f0ca19b9c
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# CHANGELOG.md
# config/config.exs
2020-02-22 09:31:43 +03:00
Alexander Strizhakov
d44f9e3b6c
fix for timeout clause
2020-02-21 16:56:55 +03:00
Alexander Strizhakov
f604f9e470
hackney pool timeout
2020-02-21 14:33:55 +03:00
Alexander Strizhakov
6806df80dd
don't log info ssl messages
2020-02-21 14:28:16 +03:00
Egor Kislitsyn
011ede4536
Update documentation
2020-02-21 14:42:43 +04:00
Alexander Strizhakov
ad8f26c0a4
more info in Connections.checkin timout errors
2020-02-21 12:53:40 +03:00
Alexander Strizhakov
a03c420b84
by default don't use gun retries
...
remove conn depends on retry setting from config
2020-02-21 12:32:42 +03:00
Alexander Strizhakov
13918cb545
Merge branch 'develop' into gun
2020-02-21 10:02:37 +03:00
Haelwenn
c5570e0493
Merge branch 'single_emoji_reaction' into 'develop'
...
Single emoji reaction
Closes #1578
See merge request pleroma/pleroma!2226
2020-02-20 23:50:40 +00:00
Egor Kislitsyn
819cd46717
Auto-expire Create activities only
2020-02-20 22:04:02 +04:00
lain
3eddd9caa6
Merge branch 'require-signature' into 'develop'
...
Add an option to require fetches to be signed
Closes #1444
See merge request pleroma/pleroma!2071
2020-02-20 12:13:21 +00:00
lain
c69b04c490
Merge branch 'features/remote-follow-userpage-redirect' into 'develop'
...
remote_follow_controller.ex: Redirect to the user page on success
Closes #1245
See merge request pleroma/pleroma!2123
2020-02-20 12:04:29 +00:00
Ivan Tashkinov
0c65a8c3d0
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
...
# Conflicts:
# config/config.exs
2020-02-20 15:00:48 +03:00
lain
e0b2de6385
Merge branch 'feature/new-registrations-digest' into 'develop'
...
New users digest email
Closes #1514
See merge request pleroma/pleroma!2128
2020-02-20 11:58:37 +00:00
Ivan Tashkinov
3432294657
[ #1505 ] Fixed @spec for Queries.by_object_in_reply_to_id/3
2020-02-20 14:48:46 +03:00
lain
314928333a
Pleroma API: Add endpoint to get reaction information on a single emoji
2020-02-19 17:16:45 +01:00
Alexander Strizhakov
c9db0507f8
removing retry option and changing some logger messages levels
2020-02-19 12:26:57 +03:00
Mark Felder
7d73e7a09a
Spelling
2020-02-18 09:18:09 -06:00
Mark Felder
cf94349287
Merge branch 'develop' into gun
2020-02-18 09:06:27 -06:00
lain
cf8307e71c
Merge branch 'fix/status-view/expires_at' into 'develop'
...
Fix `status.expires_at` type
Closes #1573
See merge request pleroma/pleroma!2222
2020-02-18 14:56:59 +00:00
Ivan Tashkinov
61d9f43e46
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-18 17:46:09 +03:00
lain
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
lain
c07efd5b42
Merge branch 'need-reboot-flag' into 'develop'
...
need_reboot flag for adminFE
See merge request pleroma/pleroma!2188
2020-02-18 14:32:03 +00:00
Egor Kislitsyn
2ef70b55f5
Fix status.expires_at type
2020-02-18 14:52:11 +04:00
Alexander Strizhakov
514c899275
adding gun adapter
2020-02-18 08:19:01 +03:00
Maksim Pechnikov
28701c08ad
Merge branch 'develop' into issue/1276
2020-02-17 08:56:03 +03:00
rinpatch
472132215e
Use floki's new APIs for parsing fragments
2020-02-16 01:55:26 +03:00
Ivan Tashkinov
269d592181
[ #1505 ] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction).
2020-02-15 20:41:38 +03:00
Haelwenn (lanodan) Monnier
1257331291
MastodonAPI.StatusView: Do not use site_name
...
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg " />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/ ">
2020-02-15 00:36:09 +01:00
Mark Felder
478619782b
Standardize @behaviour usage in MRFs
2020-02-14 11:02:24 -06:00
Egor Kislitsyn
57878f8708
Improve readability
2020-02-14 15:50:31 +04:00
Egor Kislitsyn
4d459b0e99
Move ActivityExpiration creation from CommonApi.post/2 to ActivityPub.insert/4
2020-02-13 22:27:10 +04:00
Egor Kislitsyn
241a3d744a
Add ActivityExpirationPolicy
2020-02-13 22:27:10 +04:00
rinpatch
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
Maksim Pechnikov
6f9839c73c
Merge branch 'develop' into issue/1276
2020-02-13 20:43:34 +03:00
rinpatch
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
Maksim Pechnikov
da44ee5b0f
Merge branch 'develop' into issue/1276
2020-02-13 09:20:34 +03:00
Egor Kislitsyn
19516af74e
Fix status.expires_in validation
2020-02-12 20:20:44 +04:00
Mark Felder
ff9fd4ca89
Fix the confusingly named and inverted logic of "no_attachment_links"
...
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
2020-02-11 15:39:19 -06:00
Egor Kislitsyn
50d9fcbe29
Hotlink logo instead of attachment
2020-02-11 23:33:05 +04:00
feld
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
rinpatch
ea1631d7e6
Make Floki use fast_html
2020-02-11 16:17:21 +03:00
lain
24c526a0b1
Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge
2020-02-11 13:58:36 +01:00
Egor Kislitsyn
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest
2020-02-11 13:54:55 +04:00
Maksim Pechnikov
58574ef156
Merge branch 'develop' into issue/1276
2020-02-11 08:35:26 +03:00
rinpatch
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
Maksim Pechnikov
6813c0302c
Merge branch 'develop' into issue/1383
2020-02-10 20:49:20 +03:00
rinpatch
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
Maksim Pechnikov
3830cb538b
removed a comments
2020-02-10 09:14:15 +03:00
Maksim Pechnikov
cd040691bd
maked unread_count as virtual field
2020-02-10 09:01:45 +03:00
Maksim Pechnikov
b87533760b
Merge branch 'develop' into issue/1276
2020-02-10 07:59:52 +03:00
Ivan Tashkinov
24e49d14f2
[ #1505 ] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests.
2020-02-09 17:34:48 +03:00
Ivan Tashkinov
6ea3c06d8d
[ #1505 ] Minor refactoring.
2020-02-09 14:09:01 +03:00
Ivan Tashkinov
7c3991f59e
[ #1505 ] Fixed replies serialization (included objects' ids instead of activities' ids).
2020-02-09 10:17:21 +03:00
rinpatch
8fda6303ba
Fix email mix task on OTP releases
...
Closes pleroma#1548
2020-02-09 03:27:29 +03:00
Ivan Tashkinov
4e6bbdc7b5
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-08 19:59:37 +03:00
Ivan Tashkinov
d458f4fdca
[ #1505 ] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation.
2020-02-08 19:58:02 +03:00
lain
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
Alexander Strizhakov
dad23e3766
need_reboot flag
2020-02-08 13:00:02 +03:00
rinpatch
15ea75cd2a
Actually fix upload limit on OTP releases
...
Closes #1109
2020-02-07 20:14:06 +03:00
Haelwenn
1262357ddb
Merge branch 'cancel-follow-request' into 'develop'
...
Add support for cancellation of a follow request
Closes #1522
See merge request pleroma/pleroma!2175
2020-02-07 16:10:43 +00:00
Lain Soykaf
d85bcc8627
Questions: Add timezone to closed property
2020-02-07 16:57:46 +01:00
Lain Soykaf
4538a1ee01
EmojiReactions: Remove old API endpoints
2020-02-07 15:01:45 +01:00
Lain Soykaf
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
2020-02-07 14:52:13 +01:00
Egor Kislitsyn
bc2e98b200
Add User.get_follow_state/2
2020-02-07 16:17:34 +04:00
Lain Soykaf
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
feld
df0b00b32d
Merge branch 'mastoapi-non-html-strings' into 'develop'
...
mastodon API: do not sanitize html in non-html fields
See merge request pleroma/pleroma!2167
2020-02-06 16:08:23 +00:00
Egor Kislitsyn
8b9742ecf5
Cancellation of a follow request for a remote user
2020-02-06 18:02:33 +04:00
Alexander Strizhakov
c85aa6e87f
removing confusing error
2020-02-06 12:50:36 +03:00
rinpatch
15cb1f6804
Merge branch 'fix/unpinnable-polls' into 'develop'
...
fix not being able to pin polls
See merge request pleroma/pleroma!2172
2020-02-05 21:04:16 +00:00
rinpatch
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
Alexander Strizhakov
5db6ac8ee4
removing migrate_from_db endpoint from admin api
2020-02-05 20:36:21 +03:00
Egor Kislitsyn
3909b5b7b3
Remove AutoLinker scheme option from the config
2020-02-05 21:13:56 +04:00
rinpatch
49e80a1537
Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop'
...
Restarting pleroma from outside application
See merge request pleroma/pleroma!2144
2020-02-05 16:59:21 +00:00
Egor Kislitsyn
8c71f7e11a
Add support for cancellation of a follow request
2020-02-05 20:22:15 +04:00
Ivan Tashkinov
e84fee5b86
Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation
2020-02-05 07:56:36 +03:00
Maksim Pechnikov
2c40c8b4a2
Merge branch 'develop' into issue/1383
2020-02-03 21:42:36 +03:00
rinpatch
50f5a92021
fix not being able to pin polls
2020-02-02 14:55:06 +03:00
rinpatch
983a87175e
mastodon API: do not sanitize html in non-html fields
2020-02-02 14:46:32 +03:00
Roman Chvanikov
8057157ee3
Make attachments cleanup optional
2020-01-31 01:20:37 +03:00
rinpatch
c27d1d65bf
Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop'
...
Disable rate limiter for socket/localhost
Closes #1380
See merge request pleroma/pleroma!2064
2020-01-30 19:24:04 +00:00
rinpatch
5b62acf6e9
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
2020-01-30 22:16:55 +03:00
lain
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
lain
a0d9d42eaa
Emoji Reactions: Actually use the validation.
2020-01-30 16:07:37 +01:00
feld
e2f2602fdc
Merge branch 'emoji-api-errors' into 'develop'
...
Emoji api error if emoji dir is not writable
Closes admin-fe#62
See merge request pleroma/pleroma!2161
2020-01-30 14:13:40 +00:00
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
rinpatch
263abe3ba5
Merge branch 'emoji-reactions-reacted' into 'develop'
...
Emoji reactions: Add `reacted` field
See merge request pleroma/pleroma!2160
2020-01-30 13:16:04 +00:00
rinpatch
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
Haelwenn
946de2299c
Merge branch 'fix-streaming-reblog' into 'develop'
...
Streamer: Correctly handle reblog mutes
Closes #1129 and #1438
See merge request pleroma/pleroma!2156
2020-01-29 20:21:32 +00:00
Egor Kislitsyn
e07e7888d7
Fix credo warning
2020-01-29 18:53:43 +04:00
Egor Kislitsyn
2bd4d6289b
Make the warning more scarier
2020-01-29 18:43:23 +04:00
Alexander Strizhakov
e7fee0d6fa
emoji api error on not writable dir
2020-01-29 15:31:34 +03:00
lain
b3a877d6c9
Emoji Reactions: Correctly handle deleted users
2020-01-29 11:43:36 +01:00
lain
a802e07241
Emoji Reactions: Add reacted field to emoji reactions
2020-01-29 11:39:06 +01:00
Alexander Strizhakov
1f4fbe9d98
title parse improvement
2020-01-29 11:13:34 +03:00
Maksim Pechnikov
ba5e8a6444
Merge branch 'develop' into issue/1276
2020-01-28 21:11:13 +03:00
Maksim Pechnikov
21a2a05407
Merge branch 'develop' into issue/1383
2020-01-28 20:39:20 +03:00
lain
cedee2793d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect
2020-01-28 17:52:42 +01:00
lain
12b6fcdb8c
Merge branch 'features/task-test-email' into 'develop'
...
Create pleroma.email mix task
Closes #1061
See merge request pleroma/pleroma!2118
2020-01-28 16:42:57 +00:00
lain
2c121b2623
Merge branch 'fix/1524-link_preview' into 'develop'
...
Meta tags parser respects first title tag
Closes #1524
See merge request pleroma/pleroma!2157
2020-01-28 16:38:14 +00:00
Alexander Strizhakov
7bd4c14581
meta tag parser respect first title header
2020-01-28 19:29:27 +03:00
lain
d385789a45
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed
2020-01-28 17:06:36 +01:00
Haelwenn
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
Haelwenn (lanodan) Monnier
4eb935be78
Create pleroma.email mix task
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
2020-01-28 16:49:38 +01:00
lain
77f24525ca
Streamer: Correctly handle reblog mutes
2020-01-28 16:40:44 +01:00
Egor Kislitsyn
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
Roman Chvanikov
d18a2e4e36
Add test for custom base_url when deleting an attachment
2020-01-28 17:22:24 +03:00
Roman Chvanikov
804a702f97
Fix base_url string trimming
2020-01-28 17:07:46 +03:00
Roman Chvanikov
dea968463d
Add logging
2020-01-28 16:52:20 +03:00
lain
46915207b6
Remove whole_db parameter everywhere, it's not used anymore
2020-01-28 14:40:40 +01:00
lain
e3fae3380e
Apply suggestion to lib/pleroma/web/feed/tag_controller.ex
2020-01-28 13:38:49 +00:00
Roman Chvanikov
7f78bd7e37
Fix __MODULE__ usage
2020-01-28 16:38:44 +03:00
lain
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
lain
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
Maksim Pechnikov
02c3dd2e3d
update ecto
2020-01-28 10:43:47 +03:00
Roman Chvanikov
eb4870e1cd
Remove unused var
2020-01-28 03:54:54 +03:00
Roman Chvanikov
52e08ec9fd
explicitly describe perform op in AttachmentsClenupWorker
2020-01-28 03:52:50 +03:00
Maksim Pechnikov
bcffa662dc
Merge branch 'develop' into feature/tag_feed
2020-01-27 21:13:13 +03:00
Hakaba Hitoyo
dabd535e43
Remove user recommendation by third party engine
2020-01-27 13:21:50 +00:00
Maksim Pechnikov
e442ea5722
Merge branch 'develop' into issue/1276
2020-01-27 15:20:47 +03:00
Maksim Pechnikov
bfc70fdf29
Merge branch 'develop' into issue/1383
2020-01-27 08:48:19 +03:00
Roman Chvanikov
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
Mark Felder
d770cffce0
Merge branch 'develop' into issue/1280
2020-01-26 11:23:05 -06:00
Alexander Strizhakov
e93cc561cd
restarting pleroma from outside application
2020-01-25 18:42:04 +03:00
Ivan Tashkinov
86e4d23acb
[ #1505 ] Background fetching of incoming activities' replies collections.
2020-01-25 10:47:30 +03:00
Alexander Strizhakov
de4102b247
can be changed in runtime
2020-01-25 10:39:10 +03:00
Alexander Strizhakov
6252e82f85
respect settings from database in mix tasks
2020-01-25 10:33:27 +03:00
Maksim Pechnikov
99c0a11c58
added atom feed
2020-01-24 22:12:23 +03:00
Maksim Pechnikov
055edd3d72
Merge branch 'develop' into feature/tag_feed
2020-01-24 21:46:57 +03:00
rinpatch
8533b63d1f
Merge branch 'fix/1532-fix-for-migration-fe-setting' into 'develop'
...
Fix for non existing atom
Closes #1532
See merge request pleroma/pleroma!2139
2020-01-24 11:33:02 +00:00
rinpatch
0fceeb44b3
Merge branch 'emoji-reaction-sanity-check' into 'develop'
...
Emoji reactions: Add sanity checks for the cache
See merge request pleroma/pleroma!2132
2020-01-24 11:32:25 +00:00
lain
347f3ed2c6
Emoji reactions: Change api format once more
2020-01-24 10:52:24 +01:00
Alexander Strizhakov
6a0f0ac4a2
fix for non existing atom
2020-01-24 12:22:26 +03:00
Maksim Pechnikov
293281fcbd
Merge branch 'develop' into feature/tag_feed
2020-01-24 08:58:07 +03:00
Alexander Strizhakov
6cd2e851d9
parsing Swoosh modules
2020-01-23 18:21:29 +03:00
Alexander Strizhakov
e8e57e398f
restart config id after truncate
2020-01-23 17:48:45 +03:00
Alexander Strizhakov
4344c5d5b9
truncate config table on migrate to db task
2020-01-23 17:23:02 +03:00
Maksim Pechnikov
8589632d09
fixed delete ScheduledActivity
2020-01-23 17:18:23 +03:00
lain
34fc0ca053
Emoji reactions: Add sanity checks for the cache
2020-01-23 12:34:34 +01:00
Maksim Pechnikov
2cfe1b9385
Merge branch 'develop' into feature/tag_feed
2020-01-23 11:42:10 +03:00
Maksim Pechnikov
5fc2fa8908
Merge branch 'develop' into issue/1383
2020-01-23 11:11:18 +03:00
Maksim Pechnikov
ce7c887a27
removed try/rescue
2020-01-23 11:05:08 +03:00
Maksim
6f77b77428
Apply suggestion to lib/pleroma/workers/cron/clear_oauth_token_worker.ex
2020-01-23 05:49:00 +00:00
Haelwenn
dddebee047
Merge branch 'emoji-notifications' into 'develop'
...
Emoji notifications
See merge request pleroma/pleroma!2130
2020-01-23 02:12:03 +00:00
Mark Felder
e151dea276
Merge branch 'develop' into feature/new-registrations-digest
2020-01-22 15:59:24 -06:00
Mark Felder
ae78059ff4
Merge branch 'develop' into features/remote-follow-userpage-redirect
2020-01-22 15:05:39 -06:00
lain
615b72238e
Notifications: Add emoji reaction notifications
2020-01-22 20:06:12 +01:00
Ivan Tashkinov
cf96c40057
[ #1505 ] Added Mastodon-compatible replies collection to Note federated representation.
2020-01-22 21:10:17 +03:00
rinpatch
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
Maksim Pechnikov
cf19bf3c7c
Merge branch 'develop' into issue/1383
2020-01-22 20:20:39 +03:00
minibikini
7c0ac54437
Apply suggestion to lib/pleroma/web/templates/layout/email_styled.html.eex
2020-01-22 17:18:55 +00:00
Egor Kislitsyn
5c842e3b68
Merge branch 'develop' into feature/new-registrations-digest
2020-01-22 21:18:27 +04:00
feld
be27777156
Merge branch 'admin-be' into 'develop'
...
Config api for admin-fe
Closes #1406
See merge request pleroma/pleroma!1976
2020-01-22 17:13:17 +00:00
Egor Kislitsyn
b6f5b326e7
Fix credo warnings
2020-01-22 20:59:58 +04:00
Egor Kislitsyn
aa0f0d4edd
Disable NewUsersDigestEmail by default
2020-01-22 20:53:06 +04:00
Egor Kislitsyn
df0b8f1d08
Add new users digest email
2020-01-22 20:31:42 +04:00
rinpatch
34aa0c542b
Merge branch 'emoji-reaction-extensions-2' into 'develop'
...
Emoji Reactions: In the API, sort them by first emoji insertion date
See merge request pleroma/pleroma!2126
2020-01-22 14:11:01 +00:00
lain
dd3fc50ea4
Emoji reactions: Change cache and reply format
2020-01-22 13:57:42 +01:00
Alexander Strizhakov
d5f8a88a37
support for updating env after settings deletion
2020-01-22 15:14:11 +03:00
Alexander Strizhakov
32a643a159
Merge branch 'develop' into admin-be
2020-01-22 11:22:31 +03:00
Maksim Pechnikov
b8d5c09f48
Merge branch 'develop' into issue/1383
2020-01-22 09:30:30 +03:00
Maksim Pechnikov
5ea8596448
Merge branch 'develop' into feature/tag_feed
2020-01-21 20:56:49 +03:00
Roman Chvanikov
22e94bb2c7
Merge branch 'develop' into fix/attachments-cleanup
2020-01-21 19:45:13 +03:00
Haelwenn (lanodan) Monnier
7bfb8ed14d
remote_follow_controller.ex: Redirect to the user page on success
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1245
2020-01-21 16:46:16 +01:00
Alexander Strizhakov
f01ab6cd29
some refactor and tests
2020-01-21 18:42:00 +03:00
rinpatch
04c9ca5d68
Merge branch 'emoji-reaction-extensions' into 'develop'
...
StatusView: Add `emoji_reactions`
See merge request pleroma/pleroma!2120
2020-01-21 13:13:17 +00:00
Alexander Strizhakov
503d966e9f
Merge branch 'develop' into admin-be
2020-01-21 10:32:27 +03:00
Alexander Strizhakov
dcae5914d1
fix for db key
2020-01-21 10:14:48 +03:00
Maksim Pechnikov
41e2332007
Merge branch 'develop' into feature/tag_feed
2020-01-21 09:23:35 +03:00
Maksim Pechnikov
6e88a7e591
exclude blocked user posts from search results
2020-01-21 07:40:13 +03:00
lain
7d8b709d29
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into emoji-reaction-extensions
2020-01-20 18:10:55 +01:00
rinpatch
00d08c9231
Merge branch 'favoritng-responses' into 'develop'
...
Mastodon API: Align favoriting / repeating behavior with Mastodon
See merge request pleroma/pleroma!2119
2020-01-20 16:31:43 +00:00
Alexander Strizhakov
8023fa48db
merge fix
2020-01-20 18:25:00 +03:00
lain
4c5b5f14dc
StatusView: Add emoji_reactions
2020-01-20 16:24:20 +01:00
lain
6a716e3fe5
Merge branch 'credo/version-bump-1.1.5' into 'develop'
...
Bump credo to 1.1.5
See merge request pleroma/pleroma!2115
2020-01-20 14:42:43 +00:00
lain
42ea480e95
Merge branch 'fix-emoji-reactions-oauth-scope' into 'develop'
...
Pleroma API: `emoji_reactions_by` does not need authorization
See merge request pleroma/pleroma!2117
2020-01-20 13:49:06 +00:00
lain
510776ba31
CommonAPI: Don't error out on double favs/repeats
2020-01-20 14:27:59 +01:00
lain
c814f22030
Merge branch 'fix-admin-api-scope' into 'develop'
...
fix oauth scopes for AdminApi#reports_update
See merge request pleroma/pleroma!2087
2020-01-20 12:07:12 +00:00
lain
5fddf988ea
Pleroma API: emoji_reactions_by does not need authorization
2020-01-20 13:05:35 +01:00
Haelwenn
e8759cb5ba
Merge branch 'hashtag-benchmarks' into 'develop'
...
Hashtag benchmarks
See merge request pleroma/pleroma!2116
2020-01-20 11:26:07 +00:00
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5
2020-01-20 12:17:14 +01:00
rinpatch
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
rinpatch
dc0498ab2b
Check for unapplied migrations on startup
...
Closes #1328
2020-01-20 12:20:26 +03:00
Roman Chvanikov
cde828ff7d
Fix credo warning
2020-01-19 22:09:47 +03:00
Roman Chvanikov
d6a532bf0f
Delete attachments asynchronously
2020-01-19 19:45:20 +03:00
Haelwenn (lanodan) Monnier
6cf3b19a38
transmogrifier.ex: simplify handle_incoming of actors
2020-01-19 07:06:15 +01:00
Alexander Strizhakov
efb8ef5abe
releases support
2020-01-18 17:14:50 +03:00
Alexander Strizhakov
e699861690
full update for some subkeys
2020-01-18 12:25:56 +03:00
Roman Chvanikov
81133702d4
Delete attachments after object and cache cleanup
2020-01-17 20:20:37 +03:00
Alexander Strizhakov
89e93fb33f
return db key on update requests
2020-01-17 18:15:41 +03:00
Alexander Strizhakov
7676ed8239
some clean up
2020-01-17 16:28:44 +03:00
Alexander Strizhakov
ce027fd0ef
revert non needable
2020-01-17 15:13:24 +03:00
Alexander Strizhakov
9e10b90b5b
configure only console backend
2020-01-17 15:06:42 +03:00
Maksim Pechnikov
108a39c876
updated error messages for authentication process
2020-01-17 15:01:37 +03:00
Alexander Strizhakov
b310feeccb
compile fix
2020-01-17 15:00:20 +03:00
Alexander Strizhakov
58e8963824
fix for config loader
2020-01-17 11:54:22 +03:00
Alexander Strizhakov
60ba2339a2
saving to DB only added by user settings
2020-01-17 11:45:44 +03:00
Alexander Strizhakov
29155137fd
renaming
...
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
2020-01-16 08:50:27 +03:00
Maksim Pechnikov
a5db044e57
Merge branch 'develop' into feature/tag_feed
2020-01-15 19:11:13 +03:00
Ivan Tashkinov
5304c8cd21
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
2020-01-15 18:12:08 +03:00
lain
aa9fe3a712
Merge branch 'develop' into 'feature/tag_feed'
...
# Conflicts:
# CHANGELOG.md
2020-01-15 14:29:56 +00:00
Alexander Strizhakov
59ba5c80b9
little cleanup
2020-01-15 17:10:33 +03:00
Alexander Strizhakov
66de2b159b
don't migrate Pleroma.Web.EndPoint settings
...
don't set Logger level to all tasks
2020-01-15 17:08:45 +03:00
Egor Kislitsyn
3849053c6a
Merge branch 'develop' into notifications-from-account
2020-01-15 16:49:45 +04:00
lain
167e9c45ec
Benchmarks: Move to correct folder
2020-01-15 12:37:50 +01:00
Ivan Tashkinov
76c1948880
[ #1478 ] Adjusted AdminAPIController admin subscope requirements.
2020-01-15 12:11:23 +03:00
Maksim Pechnikov
c9f45edeac
Merge branch 'develop' into feature/tag_feed
2020-01-14 21:29:14 +03:00
Roman Chvanikov
0709757e47
Check if object->data is array when looking up attachment objects to delete
2020-01-14 19:53:28 +03:00
lain
2ee6754095
Mix Tasks: Add pleroma.benchmarks.tags
2020-01-14 17:24:26 +01:00
Alexander Strizhakov
70c7a26de8
Merge branch 'develop' into admin-be
2020-01-14 14:52:00 +03:00
Maksim Pechnikov
b7908844f2
Merge branch 'develop' into issue/1383
2020-01-13 12:41:07 +03:00
Roman Chvanikov
88f0eed0f2
Delete attachments when status is deleted
2020-01-12 18:48:58 +00:00
feld
8b4d81609d
Merge branch 'updated-at-on-conversation-read' into 'develop'
...
MastodonAPI: Fix mark-as-read bringing the conversation to the top (`POST /api/v1/conversations/:id/read`)
See merge request pleroma/pleroma!2080
2020-01-12 18:37:52 +00:00
feld
bb5862ea2f
Merge branch 'issue/1354' into 'develop'
...
[#1354 ] fix remote follow
See merge request pleroma/pleroma!2079
2020-01-12 18:20:31 +00:00
Mark Felder
2f5b8fbeb3
Merge branch 'develop' into issue/1354
2020-01-12 12:12:15 -06:00
feld
ea4a462858
Merge branch 'issue/1487' into 'develop'
...
[#1487 ] fixed clear HTML entities after scrub html and truncate
See merge request pleroma/pleroma!2090
2020-01-12 17:25:25 +00:00
Hakaba Hitoyo
0c9c62509d
Remove MDII uploader
2020-01-11 17:19:54 +00:00
Alexander Strizhakov
1630ecaa20
Merge branch 'develop' into admin-be
2020-01-11 12:15:42 +03:00
Alexander Strizhakov
3453b27015
don't migrate prometheus settings
2020-01-10 21:24:06 +03:00
Alexander Strizhakov
d933fd3d61
more renamings
2020-01-10 19:51:32 +03:00
Alexander Strizhakov
eadb674c41
don't migrate configurable_from_database setting
2020-01-10 19:44:30 +03:00
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming
...
and moving it from instance settings
2020-01-10 19:34:19 +03:00
Alexander Strizhakov
958d0452e4
fix for pleroma assets group update
2020-01-10 18:18:09 +03:00
Ivan Tashkinov
39ce894a07
Merge remote-tracking branch 'remotes/origin/develop' into 1478-oauth-admin-scopes-tweaks
...
# Conflicts:
# lib/pleroma/user.ex
2020-01-10 16:18:32 +03:00
lain
05ca420c09
Merge branch 'issue/1490' into 'develop'
...
[#1490 ] fixed create service user (relay, internal.fetch)
See merge request pleroma/pleroma!2092
2020-01-10 13:14:20 +00:00
Alexander Strizhakov
88a16bb9fc
deep merge in config update
2020-01-10 15:52:02 +03:00
Alexander
c841174de8
flag for delete fix
2020-01-10 15:52:02 +03:00
Alexander
0b02040327
little fixes and typos fix
2020-01-10 15:52:02 +03:00
Alexander
9c1f3bfeff
fixes for logger backends
2020-01-10 15:52:01 +03:00
Alexander
cda2c1fc63
fix for subgroup tuple
...
added settings for swoosh adapters local
2020-01-10 15:52:01 +03:00
Alexander
063ab6d911
logger backends fix
2020-01-10 15:52:01 +03:00
Alexander
583cee4607
parsing proxy url setting
2020-01-10 15:52:01 +03:00
Alexander
a71393dd29
fix for endpoints after env update
2020-01-10 15:52:00 +03:00
Alexander
fea734ca70
errors on endpoints
2020-01-10 15:52:00 +03:00
Alexander
5cacb988b9
partially settings update
2020-01-10 15:52:00 +03:00
Alexander
0656816c77
tests for setttings without an explicit key
2020-01-10 15:51:59 +03:00
Alex S
2753285b77
config editing through database
2020-01-10 15:51:59 +03:00
Ivan Tashkinov
6c94b7498b
[ #1478 ] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests.
2020-01-10 10:52:21 +03:00
Maksim Pechnikov
70410dfafd
fix create service actor
2020-01-08 16:40:49 +03:00
eugenijm
0b6d1292d2
Fix mark-as-read (POST /api/v1/conversations/:id/read) refreshing updated_at and bringing conversation to the top in the user's direct conversation list
2020-01-05 17:38:51 +03:00
Maksim Pechnikov
fa7d8e77e6
fixed Metadata.Utils.scrub_html_and_truncate
2020-01-03 16:28:13 +03:00
Ivan Tashkinov
badd0a96ea
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
2020-01-02 13:03:33 +03:00
Maksim Pechnikov
933dc12043
added code of mr#2067
2019-12-25 15:12:43 +03:00
Maksim Pechnikov
385356aad0
fix oauth scopes for AdminApi#reports_update
2019-12-24 20:51:52 +03:00
Maksim Pechnikov
bdd71669da
update test
2019-12-22 21:21:31 +03:00
Maksim
4c505bc615
Apply suggestion to lib/pleroma/web/twitter_api/views/remote_follow_view.ex
2019-12-22 17:58:54 +00:00
Maksim
c9a44ec4a6
Apply suggestion to lib/pleroma/web/twitter_api/controllers/remote_follow_controller.ex
2019-12-22 17:58:45 +00:00
Maksim Pechnikov
5b84156013
moved remote follow in separate controller
2019-12-21 21:27:42 +03:00
Maksim Pechnikov
54c9db38c8
Merge branch 'develop' into issue/1383
2019-12-21 20:38:59 +03:00
rinpatch
c51e93978e
Merge branch 'feature/custom-runtime-modules' into 'develop'
...
Add support for custom modules at runtime
Closes #1448
See merge request pleroma/pleroma!2039
2019-12-21 11:56:24 +00:00
Maxim Filippov
e71a13ad57
Revert "Merge branch 'feature/status-counts-by-scope' into 'develop'"
...
This reverts merge request !2076
2019-12-21 11:41:19 +00:00
Mark Felder
06ae56a3ae
Posts without media attachments should get the Summary TwitterCard
2019-12-20 16:32:04 -06:00
feld
a54aa5af43
Merge branch 'feature/status-counts-by-scope' into 'develop'
...
Stats: return status counts by scope
See merge request pleroma/pleroma!2076
2019-12-20 16:30:26 +00:00
Maksim Pechnikov
7bd0bca2ab
fixed remote follow
2019-12-20 16:33:44 +03:00
Maxim Filippov
5fc84552d3
Fix all count
2019-12-19 19:52:55 +03:00
Ivan Tashkinov
ead2d18826
Merge remote-tracking branch 'remotes/origin/develop' into oauth-scopes-tweaks-and-tests
2019-12-19 17:24:08 +03:00
Ivan Tashkinov
455e072d27
[ #2068 ] Introduced proper OAuth tokens usage to controller tests.
2019-12-19 17:23:27 +03:00
Egor Kislitsyn
34d85f8a54
Return 404 if account to filter notifications from is not found
2019-12-19 20:45:44 +07:00
Egor Kislitsyn
775212121c
Verify HTTP signatures only when request accepts "activity+json" type
2019-12-19 20:17:18 +07:00
Egor Kislitsyn
432b3067d4
Do not crash when remote user follower and following counters are hidden
2019-12-19 19:26:46 +07:00
Maxim Filippov
404a9ccb9a
Stats: return status counts by scope
2019-12-18 23:17:34 +03:00
Maksim Pechnikov
b53573a837
add tag feeds
2019-12-18 09:19:37 +03:00
Thomas Citharel
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17 16:16:21 +01:00
Egor Kislitsyn
6c39fa20b1
Add support for account_id param to filter notifications by the account
2019-12-17 17:00:46 +07:00
Maxim Filippov
45180d4c60
Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost
2019-12-17 12:36:56 +03:00
Egor Kislitsyn
8f79f433bc
Hide follower counter when hiding is activated
2019-12-17 13:34:07 +07:00
Maksim Pechnikov
a879c396bb
Merge branch 'develop' into feature/tag_feed
2019-12-17 09:24:08 +03:00
Egor Kislitsyn
b9a87b1baa
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-16 22:34:21 +07:00
Egor Kislitsyn
a12b6454bb
Add an option to require fetches to be signed
2019-12-16 22:24:03 +07:00
Ivan Tashkinov
7973cbdb9f
OAuthScopesPlug: disallowed nil token (unless with :fallback option). WIP: controller tests modification: OAuth scopes usage.
2019-12-15 22:32:42 +03:00
Maksim Pechnikov
67cb46e15d
Merge branch 'develop' into issue/1383
2019-12-14 21:44:10 +03:00
Maxim Filippov
eb11c60289
Disable rate limiter for socket/localhost (unless RemoteIp is enabled)
2019-12-14 03:06:43 +03:00
Phil Hagelberg
02c3031e99
Don't log when users or objects are deleted.
2019-12-13 12:05:53 -08:00
rinpatch
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
Egor Kislitsyn
7528322f83
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-13 01:51:52 +07:00
lain
2f31cef71f
Merge branch 'feature/native-captcha' into 'develop'
...
Add native captcha and enable it by default.
Closes #1017 and #1405
See merge request pleroma/pleroma!2060
2019-12-12 18:43:21 +00:00
Ivan Tashkinov
81b05340e9
[ #1427 ] Graceful clearance of OAuth admin scopes for non-admin users (no error raised).
...
PleromaFE and other clients may safely request admin scope(s): if user isn't an admin, request is successful but only non-admin scopes from request are granted.
2019-12-12 16:00:06 +03:00
Egor Kislitsyn
e536796984
Add native captcha and enable it by default.
2019-12-12 17:39:39 +07:00
lain
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
Maxim Filippov
3ecf131511
Merge branch 'develop' into feature/report-notes
2019-12-12 02:16:23 +03:00
Mark Felder
9ef912aecf
Merge branch 'develop' into issue/1411
2019-12-11 15:02:53 -06:00
Maxim Filippov
82fae3e23f
AdminAPI: Merge account views for list instance statuses
2019-12-11 18:57:36 +03:00
Egor Kislitsyn
ee6805850c
Set log level to debug for not important messages
2019-12-11 17:47:19 +07:00
rinpatch
72f3b22134
Merge branch 'domain-block-precedence' into 'develop'
...
make follows take precedence over domain blocks
See merge request pleroma/pleroma!2019
2019-12-11 09:57:00 +00:00
Sadposter
1ad96d667a
remove single-step pipe
2019-12-11 09:08:20 +00:00
lain
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
Ivan Tashkinov
3920244be5
[ #1427 ] Fixed :admin option handling in OAuthScopesPlug, added tests.
2019-12-11 11:42:02 +03:00
Sadposter
457821adb0
Apply suggestion to lib/pleroma/user.ex
2019-12-10 18:49:41 +00:00
feld
67a478d709
Merge branch 'fix/unsubscribe-route' into 'develop'
...
Do not apply http signature pipeline to the unsubscribe route
See merge request pleroma/pleroma!2052
2019-12-10 17:25:56 +00:00
Sadposter
8cfaab8f04
Merge branch 'develop' into 'domain-block-precedence'
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-10 16:54:25 +00:00
Sadposter
25f774f7c1
format activity_pub.ex
2019-12-10 16:41:43 +00:00
Sadposter
19d228cc58
modify SQL to include followed-but-domain-blocked activities
2019-12-10 16:40:12 +00:00
Egor Kislitsyn
75b419d7c8
Do not apply http signature pipeline to the unsubscribe route
2019-12-10 22:36:03 +07:00
minibikini
43d9c06a2a
Merge branch 'develop' into 'feature/custom-runtime-modules'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:38:25 +00:00
lain
1ae976ac51
Merge branch 'develop' into '1427-oauth-admin-scopes'
...
# Conflicts:
# CHANGELOG.md
2019-12-10 13:34:54 +00:00
Hakaba Hitoyo
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
Egor Kislitsyn
a37bd5c255
Change log level
2019-12-10 15:08:57 +07:00
Ivan Tashkinov
835ac2157c
Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes
...
# Conflicts:
# CHANGELOG.md
2019-12-10 08:55:14 +03:00
Maksim Pechnikov
9dfaa0b832
fix loads config variable with large value from db
2019-12-09 22:29:44 +03:00
rinpatch
37c34ccec3
Merge branch 'fix/prefer-url-over-search' into 'develop'
...
status search: prefer the status fetched by url over other results
See merge request pleroma/pleroma!2050
2019-12-09 17:55:48 +00:00
rinpatch
f4b7f32d51
status search: prefer the status fetched by url over other results
2019-12-09 20:45:04 +03:00
Egor Kislitsyn
b7a57d8e38
Use Pleroma.Utils.compile_dir/1 in Pleroma.HTML.compile_scrubbers/0
2019-12-10 00:38:01 +07:00
Egor Kislitsyn
c098dec473
Merge branch 'develop' into feature/custom-runtime-modules
2019-12-10 00:16:43 +07:00
Maksim Pechnikov
2b821036c4
Merge branch 'develop' into issue/1383
2019-12-09 19:41:43 +03:00
lain
0d2c13a119
Merge branch 'fix/otp-parsers' into 'develop'
...
OTP: Fix runtime upload limit config being ignored
Closes #1109
See merge request pleroma/pleroma!2045
2019-12-09 15:10:05 +00:00
lain
b3c80b8404
Merge branch 'exclude-visibilities-for-like-notifications' into 'develop'
...
Fix exclude_visibilities filter for followers-only Like notifications
See merge request pleroma/pleroma!1957
2019-12-09 14:55:42 +00:00
lain
f3c2363f4a
Merge branch 'fix/user-list-task' into 'develop'
...
Fix `mix pleroma.user list` task
See merge request pleroma/pleroma!2029
2019-12-09 14:44:56 +00:00
lain
e4ea0e20b3
Merge branch 'issue/1342' into 'develop'
...
[#1342 ] Added privacy option to push notifications
See merge request pleroma/pleroma!1920
2019-12-09 14:30:35 +00:00
lain
a5e28bf214
Merge branch 'develop' into 'fix/oauth-compile-time'
...
# Conflicts:
# CHANGELOG.md
2019-12-09 13:52:01 +00:00
Egor Kislitsyn
78299ab182
Set Plug.Logger to log at :debug level
2019-12-09 19:12:24 +07:00
Egor Kislitsyn
ed92784e7c
Set Logger level to :info in prod
2019-12-09 19:11:54 +07:00
Egor Kislitsyn
84f891ea3e
Add Pleroma.Utils.compile_dir/1
2019-12-09 18:23:07 +07:00
lain
d4bafabfd1
Beginnings of the create validator
2019-12-09 10:39:14 +01:00
Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
2019-12-08 21:25:26 +03:00
rinpatch
3c45ed4f47
OTP: Fix runtime upload limit config being ignored
...
Closes #1109
2019-12-08 21:08:25 +03:00
rinpatch
d6c89068f3
HTML: Compile Scrubbers on boot
...
This makes it possible to configure their behavior on OTP releases.
2019-12-08 20:35:41 +03:00
Maksim Pechnikov
6fbafb1cdc
Merge branch 'develop' into issue/1276
2019-12-08 20:14:28 +03:00
rinpatch
bd3aa8500c
OAuth token cleanup: Get rid of compile-time configuration
2019-12-08 20:03:33 +03:00
Maksim Pechnikov
5876a9cb79
Merge branch 'develop' into issue/1383
2019-12-08 19:52:46 +03:00
rinpatch
af5fef1f22
Merge branch 'fix/clause-never-matches' into 'develop'
...
Fix never matching clause
See merge request pleroma/pleroma!2042
2019-12-08 13:50:57 +00:00
rinpatch
a21340caa1
Fix never matching clause
...
`length/1` is only used with lists.
2019-12-08 16:46:18 +03:00
rinpatch
8404f8c8fb
Merge branch 'improve-move-notificaions-api' into 'develop'
...
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
2019-12-08 13:07:05 +00:00
rinpatch
29a3f70cba
Merge branch 'bugfix/1463-blocking-in-user-tls' into 'develop'
...
ActivityPub: For user timelines, respects blocks.
Closes #1463
See merge request pleroma/pleroma!2041
2019-12-08 11:23:31 +00:00
Maxim Filippov
a7f77785c2
Implement report notes destruction
2019-12-08 11:27:23 +03:00
Ivan Tashkinov
1770602747
[ #1427 ] Extra check that admin OAuth scope is used by admin. Adjusted tests.
2019-12-07 17:49:53 +03:00
Ivan Tashkinov
40e1817f70
[ #1427 ] Fixes / improvements of admin scopes support. Added tests.
2019-12-06 20:33:47 +03:00
rinpatch
6cb31edd76
Merge branch 'feature/1455-chat-character-limit' into 'develop'
...
Feature/1455 chat character limit
Closes #1455
See merge request pleroma/pleroma!2034
2019-12-06 15:36:30 +00:00
Ivan Tashkinov
93a80ee915
[ #1427 ] Bugfix for enforce_oauth_admin_scope_usage. Admin API documentation entry.
2019-12-06 16:56:23 +03:00
lain
e8cee4d9a0
ActivityPub: For user timelines, respects blocks.
...
Unless the timeline belongs to a blocked user.
2019-12-06 14:25:13 +01:00
Egor Kislitsyn
a75d4a41e0
Add a test for custom runtime modules
2019-12-06 17:05:09 +07:00
Maxim Filippov
08c89fd2b8
Fix incorrect report count
2019-12-06 17:17:24 +09:00
Egor Kislitsyn
e4292cbfad
Use Kernel.inspect/2 to print loaded custom modules
2019-12-06 15:16:39 +07:00
Egor Kislitsyn
157bceeda9
Move runtime configuration from :instance to :modules
2019-12-06 15:04:46 +07:00
Maksim Pechnikov
22fc271e23
init tag feed
2019-12-06 09:33:40 +03:00
Ivan Tashkinov
13926537b6
Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes
2019-12-06 00:26:31 +03:00
Ivan Tashkinov
af42c00cff
[ #1427 ] Reworked admin scopes support.
...
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
2019-12-06 00:25:44 +03:00
rinpatch
cdff5b8267
Merge branch 'develop' into fix/mrf-delete
2019-12-06 00:12:21 +03:00
rinpatch
9f99640cfc
ActivityPub: Fix deletes being exempt from MRF
...
Closes #1461
2019-12-05 21:45:57 +03:00
lain
67d8df04a4
Merge branch '1335-user-api-id-fields-relations' into 'develop'
...
[#1335 ] User: refactoring of AP ID fields into relations
Closes #1335
See merge request pleroma/pleroma!1963
2019-12-05 17:16:23 +00:00
feld
d0bd4348b3
Merge branch 'feature/admin-api-render-whole-status' into 'develop'
...
Miscellaneous grouped reports fixes
Closes admin-fe#48 and admin-fe#51
See merge request pleroma/pleroma!2007
2019-12-05 13:34:34 +00:00
Egor Kislitsyn
1216b546c6
Fix credo warning
2019-12-05 20:29:17 +07:00
Egor Kislitsyn
48ae3c4347
Add support for custom modules
2019-12-05 20:18:25 +07:00
Maksim Pechnikov
3fe7a1fd35
Merge branch 'develop' into issue/1342
2019-12-05 15:46:27 +03:00
lain
1993d7096d
Validators: Add a type for the datetime used in AP.
2019-12-05 12:33:06 +01:00
Maksim Pechnikov
49bb0a130f
Merge branch 'develop' into issue/1276
2019-12-05 12:22:19 +03:00
Maksim Pechnikov
e21afdb7c7
Merge branch 'develop' into issue/1411
2019-12-05 12:18:59 +03:00
Maksim Pechnikov
3c3bba0b7c
fix ScheduledActivity
2019-12-04 21:18:05 +03:00
Ivan Tashkinov
d3bce89edd
[ #1335 ] Merge issue fix.
2019-12-04 19:41:14 +03:00
Ivan Tashkinov
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
lain
e9993acdbb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-12-04 16:35:59 +01:00
lain
aa97fe8f17
ChatChannel: Ignore messages that are too long.
2019-12-04 12:48:34 +01:00
Maksim Pechnikov
3a0a400fe1
add @type to ScheduledActivity
2019-12-04 09:53:01 +03:00
Maksim Pechnikov
29a98b86b7
Merge branch 'develop' into issue/1383
2019-12-04 09:34:44 +03:00
Maksim Pechnikov
652cc6ba4b
updated ScheduledActivity
2019-12-04 09:12:17 +03:00
Egor Kislitsyn
05fb8d0084
Fix Pleroma.FollowingRelationship.move_following/2
2019-12-03 22:31:12 +07:00
Maxim Filippov
4b60d41db9
Add report notes
2019-12-04 00:26:37 +09:00
Egor Kislitsyn
624e720aa4
Add with_move query param to the notifications API
2019-12-03 22:13:38 +07:00
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
Egor Kislitsyn
356a936ecb
Fix mix pleroma.user list task
2019-12-02 18:11:45 +07:00
Egor Kislitsyn
cf52106e05
Update Floki dependency
2019-12-02 13:38:35 +07:00
Maksim Pechnikov
88f7cf51d4
Merge branch 'develop' into issue/1411
2019-12-01 16:18:16 +03:00
rinpatch
0d24ab04c5
Merge branch 'remove-info-from-users' into 'develop'
...
Removed users.info field
See merge request pleroma/pleroma!2006
2019-11-30 10:42:51 +00:00
kPherox
0326683932
hide follower/following for friendica
2019-11-30 15:43:05 +09:00
Ivan Tashkinov
51111e286b
[ #1427 ] Initial support for OAuth admin scopes.
2019-11-29 18:57:19 +03:00
Egor Kislitsyn
a98cda7758
Fix Pleroma.HTML.extract_first_external_url/2
2019-11-29 15:49:35 +07:00
Ivan Tashkinov
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
2019-11-29 10:17:59 +03:00
Maksim Pechnikov
a36607c27e
add mix task to set\unset privacy option of notification
2019-11-28 22:13:28 +03:00
Maksim Pechnikov
04a8ffbe84
added privacy option to push notifications
2019-11-28 22:13:11 +03:00
Maksim Pechnikov
a52da55eb9
added User.NotificationSetting struct
2019-11-28 22:08:30 +03:00
Maksim Pechnikov
b7c449118b
Merge branch 'develop' into issue/1383
2019-11-28 21:27:01 +03:00
Sadposter
c7cc80a9ee
obligatory format commit
2019-11-28 10:40:50 +00:00
Sadposter
fa97eddf8a
make follows take precedence over domain blocks
2019-11-28 10:38:38 +00:00
Maxim Filippov
fcabcab443
Fetch account from report, not from status (it might be deleted)
2019-11-28 00:09:00 +09:00
Maxim Filippov
5135656f57
Handle reopened reports with deleted statuses
2019-11-27 22:54:12 +09:00
lain
50b152766f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
2019-11-27 14:48:28 +01:00
lain
f36724efb1
User: Never return nil for user follower counts.
2019-11-27 14:13:36 +01:00
Maksim Pechnikov
a4f834a687
moved DigestEmail to Oban Periodic jobs
2019-11-27 15:59:13 +03:00
Egor Kislitsyn
f595cfe623
Remove User.user_info/2
2019-11-27 19:43:47 +07:00
Egor Kislitsyn
1fc28a4b44
Add a view for the move notification
2019-11-27 17:52:02 +07:00
Maksim Pechnikov
c5766a8100
moved ActivityExpiration to Oban Periodic jobs
2019-11-27 13:36:03 +03:00
Maksim Pechnikov
6f202a401b
moved ScheduledActivity to Oban Periodic jobs
2019-11-27 09:26:37 +03:00
Egor Kislitsyn
4af69f047d
Remove account field from web push payload
2019-11-27 02:32:55 +07:00
Egor Kislitsyn
80ededc04f
Add direct_conversation_id to web push payload
2019-11-26 19:53:43 +07:00
Maksim Pechnikov
ac3abb5414
moved Pleroma.Stats to Oban Periodic jobs
2019-11-26 10:54:30 +03:00
Ivan Tashkinov
c8d3c3bfec
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
2019-11-26 10:42:36 +03:00
Maxim Filippov
b62be2564c
Merge branch 'develop' into feature/admin-api-render-whole-status
2019-11-26 00:25:43 +09:00
lain
dc9090810d
Merge branch 'fix/ap-disable-remote-render' into 'develop'
...
Disable rendering AP representation for remote users and objects
See merge request pleroma/pleroma!2010
2019-11-25 15:23:45 +00:00
Maxim Filippov
b3b4e5ca80
AdminAPI: Grouped reports old/new fix
...
If some status received reports both in the "new" format and "old" format it was considered reports on two different statuses (in the context of grouped reports)
2019-11-26 00:20:46 +09:00
Maxim Filippov
1364d303f8
AdminAPI: Fix grouped reports for closed/resolved reports
2019-11-26 00:13:11 +09:00
rinpatch
4b10804f21
OStatus controller: don't serve json at /notice/, redirect instead
2019-11-25 17:55:17 +03:00
rinpatch
02f7383891
ActivityPub controller: do not render remote users
2019-11-25 17:19:33 +03:00
feld
5f981178d0
Merge branch 'feature/admin-api-list-statuses-for-a-given-instance' into 'develop'
...
Admin API: list all statuses from a given instance
See merge request pleroma/pleroma!1981
2019-11-25 13:29:53 +00:00
feld
9374b52756
Merge branch 'fix/update-reports-old-format' into 'develop'
...
Admin API: Fix error when trying to update reports in the "old" format
See merge request pleroma/pleroma!1986
2019-11-25 13:29:22 +00:00
Maksim Pechnikov
0e9be6bafa
moved OAuth.Token.CleanWorker to Oban Periodic jobs
2019-11-25 14:32:20 +03:00
Sadposter
d3656c2725
add ability to set a custom user-agent string
2019-11-25 09:53:11 +00:00
Maxim Filippov
82f4e4760e
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-25 01:46:18 +09:00
Maxim Filippov
fd24467b92
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-25 01:43:11 +09:00
Maxim Filippov
40059c9b1e
Typo
2019-11-25 00:05:52 +09:00
Maxim Filippov
2b341627da
Admin API: Render whole status in grouped reports
2019-11-25 00:04:29 +09:00
rinpatch
9f29930440
fetcher: move local object checking into a reusable function
2019-11-23 22:55:41 +03:00
Ivan Tashkinov
1636cc5b7e
Removed users.info and remaining usages.
2019-11-23 14:06:19 +03:00
lain
bd62946020
Merge branch 'feature/confirm-user-acc-resend-confirmation' into 'develop'
...
AdminAPI: Confirm user account, resend confirmation email
See merge request pleroma/pleroma!1994
2019-11-22 15:39:19 +00:00
Maxim Filippov
b64c7b35d4
Swap map with each
2019-11-22 09:11:36 +09:00
rinpatch
c2ad9fd5f9
Merge branch 'list-users' into 'develop'
...
Add CLI list users command
See merge request pleroma/pleroma!1990
2019-11-21 20:33:11 +00:00
Alex Schroeder
fbc379d689
Add CLI list users command
2019-11-21 21:07:06 +01:00
lain
19b727bf8f
Merge branch 'fix/mix-task-logging' into 'develop'
...
Allow mix tasks to always run with debug logging
See merge request pleroma/pleroma!1997
2019-11-21 15:04:19 +00:00
Ivan Tashkinov
cad9b325e5
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user/search.ex
# test/user_test.exs
2019-11-21 16:47:52 +03:00
lain
8feb5dcb42
Merge branch 'issue/1348' into 'develop'
...
[#1348 ] excluded invisible actors from gets /api/v1/accounts/:id
See merge request pleroma/pleroma!1937
2019-11-21 13:13:14 +00:00
lain
320690f7a5
Object: Use inspect to log missing preload.
2019-11-21 14:03:01 +01:00
Egor Kislitsyn
d38ab4bb89
Fix user.following_count
2019-11-21 16:31:13 +07:00
Mark Felder
edaae845af
Some tasks try to set log level in test environment, but we were stripping logs belog :warn.
...
Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose.
2019-11-20 11:55:30 -06:00
Ivan Tashkinov
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
2019-11-20 15:46:11 +03:00
Ivan Tashkinov
555edd01ab
[ #1335 ] User AP ID relations fetching performance optimizations.
2019-11-20 12:19:07 +03:00
Mark Felder
ff9133b978
Allow mix tasks to always run with debug logging
2019-11-19 16:01:17 -06:00
Ivan Tashkinov
565f261338
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-19 23:22:47 +03:00
Ivan Tashkinov
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19 23:22:10 +03:00
Maksim Pechnikov
708fd234bd
fix order favorites activites
2019-11-19 20:19:41 +03:00
Maxim Filippov
46eb160135
AdminAPI: Confirm user account, resend confirmation email
2019-11-19 20:14:02 +09:00
Egor Kislitsyn
36686f5245
Support authentication via x-admin-token HTTP header
2019-11-19 15:58:20 +07:00
Maksim Pechnikov
5cee51fac5
fix order by for fetch_favorites
2019-11-18 21:34:54 +03:00
Ivan Tashkinov
3aaf3aa2c2
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-18 20:43:19 +03:00
Ivan Tashkinov
aad6576130
[ #1335 ] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum.
2019-11-18 20:38:56 +03:00
Maksim Pechnikov
0937895182
updated fetch_favorites
2019-11-18 16:56:47 +03:00
Maksim Pechnikov
9da4c88b49
fix test
2019-11-18 10:00:48 +03:00
Maksim Pechnikov
4beb3ce5c5
/api/v1/favourites: added sorting for activites by adds to favorites
2019-11-18 09:44:08 +03:00
Maxim Filippov
c506cc48ef
Admin API: Error when trying to update reports in the "old" format
2019-11-16 18:44:48 +09:00
kaniini
81cba405af
Merge branch 'nodeinfo-fields-limit' into 'develop'
...
Add fieldsLimit to metadata of nodeinfo
See merge request pleroma/pleroma!1983
2019-11-15 20:29:38 +00:00
Maksim Pechnikov
b9041c2097
added recount unread notifications to markers
2019-11-15 22:46:58 +03:00
Ivan Tashkinov
01d9c093c3
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
2019-11-15 21:40:14 +03:00
Ivan Tashkinov
c31ddce51e
[ #1335 ] Reorganized users.mutes as relation to UserMute entity.
2019-11-15 21:38:54 +03:00
rinpatch
22554ac5ca
Merge branch 'bugfix/1395-email-activation' into 'develop'
...
Bugfix/1395 email activation
Closes #1395
See merge request pleroma/pleroma!1965
2019-11-15 14:11:48 +00:00
lain
f17e0f8e4f
OAuthPlug, Router: Handle deactivated users in the UserEnabledPlug
2019-11-15 14:13:21 +01:00
kPherox
72d2557e11
Add fieldsLimit to metadata of nodeinfo
2019-11-15 18:52:31 +09:00
Ariadne Conill
eecd64cc07
object age policy: remove debug logging
2019-11-14 19:56:14 -06:00
Ariadne Conill
5705cf0e3e
MRF: add ObjectAgePolicy which deals with old posts being imported
2019-11-14 19:48:10 -06:00
Maxim Filippov
114930b5fd
Merge branch 'develop' into feature/admin-api-list-statuses-for-a-given-instance
2019-11-14 23:45:29 +09:00
Maxim Filippov
30af5da330
Admin API: list all statuses from a given instance
2019-11-14 23:44:07 +09:00
rinpatch
09b4f7269e
Merge branch 'fix/conversations-rendering' into 'develop'
...
Fix rendering conversations when there's a malformed status
Closes #1401
See merge request pleroma/pleroma!1973
2019-11-14 14:40:37 +00:00
rinpatch
94f1cfced8
format the code
2019-11-14 17:26:59 +03:00
feld
1afeaf82fa
Merge branch 'feature/reports-groups-and-multiple-state-update' into 'develop'
...
Admin API: Grouped reports, update multiple reports in one query
Closes admin-fe#43
See merge request pleroma/pleroma!1815
2019-11-14 13:35:41 +00:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
rinpatch
6085c71bd1
Merge branch 'reactions' into 'develop'
...
Emoji Reactions
See merge request pleroma/pleroma!1662
2019-11-14 08:47:10 +00:00
Phil Hagelberg
3c60adbc1f
Support redirecting by activity UUID in static FE as well.
2019-11-13 08:22:11 -08:00
Phil Hagelberg
0867cb083e
Support redirecting by object ID in static FE.
...
This matches the behavior of pleroma-fe better.
Fixes #1412 .
2019-11-13 08:02:02 -08:00
lain
facc37aaa6
Merge branch 'static-remote-redirect' into 'develop'
...
For remote notices, redirect to the original instead of 404 in static-fe
See merge request pleroma/pleroma!1974
2019-11-13 10:16:00 +00:00
Phil Hagelberg
62f3a93049
For remote notices, redirect to the original instead of 404.
...
We shouldn't treat these like local statuses, but I don't think a 404
is the right choice either here, because within pleroma-fe, these are
valid URLs. So with remote notices you have the awkward situation
where clicking a link will behave differently depending on whether you
open it in a new tab or not; the new tab will 404 if it hits static-fe.
This new redirecting behavior should improve that situation.
2019-11-12 09:40:29 -08:00
Maksim Pechnikov
b5b62f42b2
update Marker.multi_set_unread_count
2019-11-12 15:59:34 +03:00
Egor Kislitsyn
768c1a5de1
Fix tests
2019-11-12 19:13:19 +07:00
Egor Kislitsyn
27cd1374e3
Add a notification for Move activities
2019-11-12 18:48:14 +07:00
Egor Kislitsyn
e6d7e27bd6
Add allow_following_move setting to User
2019-11-12 18:45:28 +07:00
lain
e835cd97f6
Containment: Add a catch-all clause to contain_origin.
2019-11-12 12:07:17 +01:00
Mark Felder
7d101bc9c5
Fix rendering conversations when there's a malformed status
2019-11-11 18:29:55 -06:00
eugenijm
f86a7d5d8b
Fix exclude_visibilities filter for followers-only Like notifications
2019-11-11 23:57:30 +03:00
feld
e27d78e768
Merge branch 'nodeinfo-federation-enabled' into 'develop'
...
report federating status in nodeinfo
See merge request pleroma/pleroma!1971
2019-11-11 19:14:06 +00:00
kaniini
2cc043591c
Merge branch 'feature/static-fe' into 'develop'
...
Static frontend
See merge request pleroma/pleroma!1917
2019-11-11 19:10:44 +00:00
href
b39b49cc14
report federating status in nodeinfo
2019-11-11 19:03:43 +01:00
Maksim Pechnikov
ddbfc995ac
clean sql query
2019-11-11 17:06:41 +03:00
lain
1ca7b877a1
Merge branch 'iss-1376' into 'develop'
...
Check client and token in GET /oauth/authorize
See merge request pleroma/pleroma!1940
2019-11-11 12:27:33 +00:00
lain
417f9a782f
Merge branch 'fix/1399' into 'develop'
...
fix for migrate config to db task
Closes #1399
See merge request pleroma/pleroma!1964
2019-11-11 12:13:45 +00:00
Steven Fuchs
94627baa5c
New rate limiter
2019-11-11 12:13:06 +00:00
lain
f6056e9c9c
UserEnabledPlug: Don't authenticate unconfirmed users.
2019-11-11 12:43:46 +01:00
lain
8521553ad9
User: Don't let deactivated users authenticate.
2019-11-11 12:37:38 +01:00
Ivan Tashkinov
5cf2c7422b
[ #1335 ] Applied code review suggestions.
2019-11-11 14:16:57 +03:00
Maxim Filippov
46787b9fe1
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-11 19:18:12 +09:00
Maxim Filippov
31343e4321
Code style fixes
2019-11-11 19:06:09 +09:00
Alexander
6a4201e0b4
fix for migrate task
2019-11-10 22:54:37 +03:00
Ivan Tashkinov
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
2019-11-10 16:30:21 +03:00
lain
a88e834dba
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-11-10 11:32:50 +00:00
lain
3a1aaadc18
Merge branch 'issue/1339' into 'develop'
...
[#1339 ] add subject to atom feed
See merge request pleroma/pleroma!1961
2019-11-10 11:20:20 +00:00
Maksim Pechnikov
9d0b989521
add subject to atom feed
2019-11-10 11:10:20 +03:00
Phil Hagelberg
3cc49cdb78
Formatter moved to new module.
2019-11-09 18:30:23 -08:00
Phil Hagelberg
ef7c3bdc7a
Add some further test cases.
...
Including like ... private visibility, cos that's super important.
2019-11-09 18:08:45 -08:00
Phil Hagelberg
4729027f91
Prevent non-local notices from rendering.
2019-11-09 18:08:45 -08:00
Phil Hagelberg
886a07ba57
Move static_fe config to its own section instead of in :instance.
2019-11-09 18:08:45 -08:00
Phil Hagelberg
b0080fa730
Render errors in HTML, not with JS.
2019-11-09 18:08:08 -08:00
Phil Hagelberg
e27c61218d
Expand subject content automatically when config is set.
2019-11-09 18:08:08 -08:00
Phil Hagelberg
bfd5d79826
Include metadata in static FE conversations and profiles.
2019-11-09 18:08:08 -08:00
Phil Hagelberg
828259fb65
Catch 404s.
2019-11-09 18:08:08 -08:00
Phil Hagelberg
df2f59be91
Pagination for user profiles.
2019-11-09 18:08:08 -08:00
Phil Hagelberg
8969c5522d
Make many of the improvements suggested in review.
2019-11-09 18:08:08 -08:00
Phil Hagelberg
e8bee35578
Static FE plug should only respond to text/html requests.
2019-11-09 18:08:08 -08:00
Phil Hagelberg
dc3b87d153
Move static FE routing into its own plug.
...
Previously it was piggybacking on FallbackRedirectController for users
and OStatusController for notices; now it's all in one place.
2019-11-09 18:08:08 -08:00
Phil Hagelberg
c6c706161e
Make sure notice link is remote if the post is remote.
2019-11-09 18:08:08 -08:00
Phil Hagelberg
274cc18e8a
Visually separate header.
2019-11-09 18:08:08 -08:00
Phil Hagelberg
2ac1ece652
Fix a bug where reblogs were displayed under the wrong user.
2019-11-09 18:08:08 -08:00
Phil Hagelberg
5d7c44266b
Change date formatting.
2019-11-09 18:08:08 -08:00
Phil Hagelberg
1dc785b74b
Move static-fe CSS to a separate file.
2019-11-09 18:07:50 -08:00
Phil Hagelberg
e4b9784c39
Show counts for replies, likes, and announces for selected notice.
...
Using text instead of an icon, for now.
2019-11-09 18:07:50 -08:00
Phil Hagelberg
93e9c0cedf
Format dates using CommonAPI utils.
2019-11-09 18:07:50 -08:00
Phil Hagelberg
918e1353f6
Add header to profile/notice pages linking to pleroma-fe.
2019-11-09 18:07:50 -08:00
Phil Hagelberg
33a26b61c3
Remove activity/user representer; move logic to controller.
2019-11-09 18:07:50 -08:00
Phil Hagelberg
41fde63def
Get rid of @data in views and use separate fields.
2019-11-09 18:07:50 -08:00
Phil Hagelberg
e944a2213d
Use gettext for sensitive media warning.
2019-11-09 18:07:50 -08:00
Phil Hagelberg
2d1897e8a7
Apply all suggested changes from reviewers.
2019-11-09 18:07:50 -08:00
Phil Hagelberg
cc1b07132f
Notices should show entire thread from context.
2019-11-09 18:07:08 -08:00
Phil Hagelberg
748d800acb
Show images, video, and audio attachments to notices.
2019-11-09 18:07:08 -08:00
Phil Hagelberg
1d8950798c
Fix activity_representer to work with User.get_or_fetch returning tuple.
2019-11-09 18:06:51 -08:00
Phil Hagelberg
0cf04e1088
Fix OStatus controller to know about StaticFEController.
...
But only when it's configured to be on.
2019-11-09 18:06:51 -08:00
Phil Hagelberg
e79d8985ab
Don't show 404 in static-fe controller unless it's actually not found.
2019-11-09 18:06:51 -08:00
Phil Hagelberg
c1fc139986
Add permalinks to the static-fe notice rendering.
2019-11-09 18:06:51 -08:00
Phil Hagelberg
d1320160f4
Looks like source_data is on user directly now.
2019-11-09 18:06:51 -08:00
William Pitcock
ca5ef201ef
static fe: add remote follow button
2019-11-09 18:06:51 -08:00
William Pitcock
b33fbd58e3
static fe: add support for message subjects
2019-11-09 18:06:51 -08:00
William Pitcock
e2904b5777
static fe: reformat activity representer
2019-11-09 18:06:51 -08:00
William Pitcock
2b5bd5236d
static fe: add user profile rendering
2019-11-09 18:06:51 -08:00
William Pitcock
8f08da750a
static fe: use a generic activity representer to render activities
2019-11-09 18:06:51 -08:00
William Pitcock
ff8d0902f3
static fe: formatting
2019-11-09 18:06:51 -08:00
William Pitcock
a4d3a8ec03
static fe: proof of concept
2019-11-09 18:06:51 -08:00
Ariadne Conill
5b60d82592
object containment: handle all cases where ID is invalid (missing, nil, non-string)
2019-11-08 14:51:28 -06:00
Ariadne Conill
532fd38b12
nodeinfo: add multifetch feature (ref pleroma-fe!977).
2019-11-08 12:48:28 -06:00
lain
b22ee9d966
Merge remote-tracking branch 'origin/develop' into reactions
2019-11-08 13:27:11 +01:00
Maxim Filippov
b14bf9044f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-08 18:30:49 +09:00
Maxim Filippov
7258db023e
Support old flag format
2019-11-08 18:21:29 +09:00
eugenijm
7888803ffe
Mastodon API: Add the recipients parameter to GET /api/v1/conversations
2019-11-07 08:26:24 +03:00
rinpatch
32afa07995
Fetcher: fix local check returning unwrapped object
...
This resulted in error messages about failed refetches being logged.
2019-11-07 01:40:55 +03:00
rinpatch
802d249827
Merge branch 'fix/trailing-format-plug-oauth' into 'develop'
...
Fix TrailingFormatPlug not being active for /api/oauth_tokens
Closes #1385
See merge request pleroma/pleroma!1944
2019-11-06 14:47:34 +00:00
rinpatch
365657320c
Fix TrailingFormatPlug not being active for /api/oauth_tokens
2019-11-06 17:22:23 +03:00
rinpatch
84175fe30e
Set better Cache-Control header for static content
...
Closes #1382
2019-11-06 16:41:19 +03:00
feld
8b19464176
Merge branch 'feature/multiple-users-force-password-reset' into 'develop'
...
Force password reset for multiple users
Closes admin-fe#46
See merge request pleroma/pleroma!1928
2019-11-06 12:24:41 +00:00
Maxim Filippov
f171095960
Grouped reports with status data baked in
2019-11-06 21:25:46 +10:00
rinpatch
54746c6c26
Object Fetcher: set cache after reinjecting
...
Probably fixes the issue hj had, where polls would have different
counters between endpoints.
2019-11-06 14:00:03 +03:00
AkiraFukushima
e1fc6cb78f
Check client and token in GET /oauth/authorize
2019-11-05 23:52:47 +09:00
lain
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-11-05 15:21:00 +01:00
lain
faced6236b
NoteValidator: Add very basic validator for Note objects.
2019-11-05 15:02:31 +01:00
lain
3d1b445cbf
Object Validators: Extract common validations.
2019-11-05 15:02:09 +01:00
Maksim Pechnikov
e52955c961
update following_relationship.ex
2019-11-05 10:50:03 +03:00
Maksim Pechnikov
62bc0657e7
excluded invisible users from search results
2019-11-05 08:55:41 +03:00
Maxim Filippov
2cbfa256fd
Merge branch 'develop' into feature/multiple-users-force-password-reset
2019-11-05 11:36:47 +10:00
Maxim Filippov
43ea16870f
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-11-05 02:12:48 +03:00
Maksim Pechnikov
4b7c11e3f9
excluded invisible actors from gets /api/v1/accounts/:id
2019-11-04 20:44:24 +03:00
Maksim Pechnikov
ff6c727739
Merge branch 'develop' into issue/1276
2019-11-04 20:24:53 +03:00
rinpatch
fee1276963
Merge branch 'failing-search-fixes' into 'develop'
...
User Search: Remove superfluous setweight and random test.
See merge request pleroma/pleroma!1935
2019-11-04 16:28:55 +00:00
lain
4e53520917
User Search: Remove superfluous setweight and random test.
...
The test tested for a behavior that isn't actually enforced anymore.
2019-11-04 16:57:41 +01:00
eugenijm
ed29be24cb
Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.
2019-11-04 18:36:16 +03:00
Steven Fuchs
5271bbcf11
add missing tesla mocks
2019-11-04 15:18:32 +00:00
kaniini
06cc77e6fb
Merge branch 'faster-user-deactivation' into 'develop'
...
User: Don't pull remote users follower count immediately after deactivating.
Closes #1369
See merge request pleroma/pleroma!1933
2019-11-04 14:24:21 +00:00
lain
556da92902
Merge branch 'feature/store-statuses-data-inside-flag' into 'develop'
...
Store status data inside flag activity
See merge request pleroma/pleroma!1849
2019-11-04 14:11:44 +00:00
lain
0c31258616
User: Don't pull remote users follower count immediately after deactivating.
...
The other instance doesn't necessarily know that anything changed yet, and it
will be fixed up at the next user pull anyway.
Closes #1369
2019-11-04 14:36:54 +01:00
Maksim Pechnikov
57995fa8cf
fix migrate
...
update migrate
2019-11-03 20:44:59 +03:00
rinpatch
8dd7c099a7
Merge branch 'bugfix/streamer-follows' into 'develop'
...
streamer: use direct object for filter checks when there is no valid child object in an activity
Closes #1291
See merge request pleroma/pleroma!1931
2019-11-03 17:09:57 +00:00
kaniini
74135e1318
Merge branch 'feature/omit-relay-user' into 'develop'
...
AdminAPI: Omit relay user from users list
Closes #1349
See merge request pleroma/pleroma!1924
2019-11-03 16:19:27 +00:00
kaniini
61bcd4595f
Merge branch 'feature/fast_sanitize' into 'develop'
...
Switching to FastSanitize
See merge request pleroma/pleroma!1916
2019-11-03 16:18:19 +00:00
Ariadne Conill
4bf942583f
streamer: use direct object for filter checks when there is no valid child object in an activity
...
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.
Closes #1291
2019-11-03 09:05:12 -06:00
Maxim Filippov
1b83a0694a
Fix moderation log crash
2019-11-01 19:13:29 +03:00
Maxim Filippov
743b622b7b
Force password reset for multiple users
2019-11-01 18:45:47 +03:00
Maxim Filippov
d75934b0d0
Undo dialyzer fix
2019-11-01 15:14:43 +03:00
Maksim Pechnikov
1b3a942a84
fix format
2019-10-31 17:38:12 +03:00
Maxim Filippov
ced9f92327
Fix count
2019-10-31 15:34:49 +03:00
Maxim Filippov
6f9d3d30fa
AdminAPI: Omit relay user from users list
2019-10-31 02:26:02 +03:00
Maxim Filippov
59a149c69a
Fix "the call ... will never return" warning
2019-10-31 02:25:15 +03:00
Mark Felder
fcea6a9d2c
Merge branch 'develop' into feature/fast_sanitize
2019-10-30 17:51:15 -05:00
Maksim Pechnikov
209319c8d2
update marker api
2019-10-30 23:49:05 +03:00
Maksim Pechnikov
1b82eb6d41
move sql (update_markers) from migrate to mix task
2019-10-30 23:22:38 +03:00
Egor Kislitsyn
61fc739ab8
Handle "Move" activity
2019-10-30 18:21:49 +07:00
kPherox
363e76d4da
Fix duplicate recipients
2019-10-30 15:40:25 +09:00
rinpatch
ae59b38203
Rip out the rest of htmlsanitizeex
2019-10-30 09:20:13 +03:00
Maksim Pechnikov
b27a92e8fa
Merge branch 'develop' into issue/1276
2019-10-29 22:23:19 +03:00
rinpatch
77cfb08b8c
Remove commented-out code
2019-10-29 20:58:54 +03:00
kPherox
0c361eeb25
Add pending to handle incoming for Follow activity
2019-10-29 17:12:49 +09:00
rinpatch
08f6837065
Switch from HtmlSanitizeEx to FastSanitize
2019-10-29 01:18:08 +03:00
Egor Kislitsyn
4270861085
Merge branch 'develop' into feature/move-activity
2019-10-28 15:10:47 +07:00
lain
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
2019-10-28 07:27:45 +00:00
Maxim Filippov
d56bc62275
Fix report parsing
2019-10-27 16:33:58 +03:00
Maxim Filippov
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
2019-10-27 16:11:25 +03:00
Maxim Filippov
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
2019-10-27 16:05:32 +03:00
eugenijm
0580654485
Mark the conversations with the blocked user as read and update the blocking user's unread_conversation_count.
...
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
2019-10-26 02:29:18 +03:00
rinpatch
653054d301
Merge branch 'remove-unsed-info-fields-fn' into 'develop'
...
Remove unused Pleroma.User.info_fields/0
See merge request pleroma/pleroma!1882
2019-10-25 14:51:02 +00:00
Egor Kislitsyn
b777083f3f
Add also_known_as field to Pleroma.User
2019-10-25 19:14:18 +07:00
Egor Kislitsyn
dbee53c2df
Remove unused Pleroma.User.info_fields/0
2019-10-25 16:48:01 +07:00
stwf
2ab072f949
object fetcher error handling
2019-10-24 12:08:34 -04:00
Maksim Pechnikov
922e3d082c
add test
2019-10-24 12:17:50 +03:00
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
2019-10-24 14:55:36 +07:00
Maksim Pechnikov
99cf1ef9be
Merge branch 'develop' into issue/1276
2019-10-24 09:23:59 +03:00
Maksim Pechnikov
d3fb9e02cc
add tests
2019-10-23 22:48:04 +03:00
Maxim Filippov
b08b1d5d91
Store status data inside Flag activity
2019-10-23 21:27:22 +02:00
Maksim Pechnikov
aa64b3108b
fix migrate
2019-10-23 22:02:59 +03:00
Ivan Tashkinov
c0246309a5
[ #1304 ] Extra bullet-proofing.
2019-10-23 19:30:02 +03:00
Ivan Tashkinov
065e9fac12
[ #1304 ] Adjusted User.Info references from Notification.
2019-10-23 17:31:02 +03:00
Ivan Tashkinov
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
2019-10-23 17:22:42 +03:00
Ivan Tashkinov
11cd994425
[ #1304 ] Fixed null::jsonb handling in User.Info migration.
2019-10-23 17:15:48 +03:00
lain
1adafa0966
Credo fixes.
2019-10-23 12:18:05 +02:00
lain
97d5c79aa0
Add Pipeline module, test for federation.
2019-10-23 11:52:27 +02:00
Maksim Pechnikov
9a4afbd2a0
added update unread_count for notifications
2019-10-23 11:22:48 +03:00
Ariadne Conill
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
2019-10-22 20:50:46 -05:00
Maksim Pechnikov
d4270397dc
Marker: added unread_count field
2019-10-22 14:51:46 +03:00
kaniini
6281e4795a
Merge branch 'feature/push-subject-for-dm' into 'develop'
...
Direct messages should provide a distinct push notification subject
See merge request pleroma/pleroma!1864
2019-10-21 23:50:01 +00:00
rinpatch
6712b6e4de
Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
...
Do not include notifications from blocked users when with_muted is set
See merge request pleroma/pleroma!1869
2019-10-21 16:44:17 +00:00
rinpatch
2dbee29cf5
Do not include notifications from blocked users when with_muted is set
...
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
2019-10-21 19:27:38 +03:00
Ivan Tashkinov
7c7f90bc4f
[ #1304 ] Merged develop, handled User.Info.invisible.
2019-10-21 11:58:22 +03:00
Maksim Pechnikov
243719a965
Merge branch 'develop' into feature/masto_api_markers
2019-10-21 11:32:28 +03:00
Ivan Tashkinov
a11a7176d5
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21 11:05:09 +03:00
Egor Kislitsyn
c6fba62666
Fix Relay
2019-10-21 14:47:07 +07:00
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
2019-10-21 14:19:15 +07:00
Ivan Tashkinov
ee04fbc35a
[ #1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
2019-10-20 22:29:56 +03:00
Ivan Tashkinov
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
2019-10-20 20:43:18 +03:00
Ivan Tashkinov
b4cbf0568b
[ #1304 ] Analysis issue fix.
2019-10-20 13:58:27 +03:00
Ivan Tashkinov
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
2019-10-20 13:42:42 +03:00
Ariadne Conill
c9280b9730
rework to use properties instead of compound typing, per SocialCG
2019-10-19 23:21:37 +00:00
Ariadne Conill
ef659331b0
implement invisible support for remote users
2019-10-19 23:21:37 +00:00
Ariadne Conill
95871cb462
user: implement User.invisible?/1
2019-10-19 23:21:37 +00:00
Ariadne Conill
1469a084d4
relay: set invisible to true
2019-10-19 23:21:37 +00:00
Ariadne Conill
e7333db72a
user info: add invisible field
2019-10-19 23:21:37 +00:00
Haelwenn
f01dbc450c
Merge branch 'feature/mastofe-pwa' into 'develop'
...
MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834
2019-10-19 20:11:58 +00:00
eugenijm
52ed2f8f2d
Pleroma API: POST /api/v1/pleroma/conversations/read to mark all user's conversations as read
2019-10-19 15:24:06 +03:00
KokaKiwi
638457ba94
MastoFE: Add PWA manifest.
2019-10-19 12:15:14 +02:00
rinpatch
fd6d05dc45
Merge branch 'mix-emoji-task-pack-json' into 'develop'
...
For pleroma.emoji downloaded packs, generate pack.json instead
See merge request pleroma/pleroma!1748
2019-10-19 08:51:03 +00:00
Mark Felder
dcb23a85b6
Merge branch 'develop' into feature/push-subject-for-dm
2019-10-18 17:56:15 -05:00
Mark Felder
152caef51d
Direct messages should provide a distinct push notification subject
2019-10-18 17:51:34 -05:00
Maxim Filippov
019147f115
Merge branch 'develop' into feature/relay-list
2019-10-18 18:35:58 +02:00
Ariadne Conill
44e64af5e7
object: containment: simplify the pattern match for OStatus testsuite hack
2019-10-18 15:39:15 +00:00
Ariadne Conill
e99fdfc32d
object: containment: only allow OStatus references in test suite environment
2019-10-18 15:37:14 +00:00
Ariadne Conill
3c785b85a6
object: fetcher: fix up formatting
2019-10-18 14:50:10 +00:00
Ariadne Conill
bae96de273
activitypub: tag containment checks for better error tracing
2019-10-18 14:50:10 +00:00
Ariadne Conill
7295a05cee
object: containment: also allow OStatus object IDs through when comparing origins
2019-10-18 14:50:10 +00:00
Ariadne Conill
a177f22e02
object: fetcher: improve error reporting
2019-10-18 14:50:10 +00:00
Ariadne Conill
bf2107743f
object: containment: don't try to contain ostatus objects
2019-10-18 14:50:10 +00:00
Ariadne Conill
6f110fc04c
object fetcher: fix up error handling
2019-10-18 14:50:09 +00:00
Ariadne Conill
48059c03c9
fix up some tests
2019-10-18 14:50:09 +00:00
Ariadne Conill
d379b48769
kill almost all of the OStatus module
2019-10-18 14:50:09 +00:00
Ariadne Conill
6a1f4c5145
federator: remove OStatus incoming document support
2019-10-18 14:50:09 +00:00
Ariadne Conill
835ad52378
remove Salmon module
2019-10-18 14:50:09 +00:00
Ariadne Conill
beb9861f9d
router: disconnect Salmon
2019-10-18 14:50:09 +00:00
Ariadne Conill
a7b92bba68
webfinger: stop pulling Salmon data out of WebFinger
2019-10-18 14:50:09 +00:00
Ariadne Conill
c00ae10af8
feed: don't advertise salmon endpoint
2019-10-18 14:50:09 +00:00
Ariadne Conill
adb639db56
publisher: move remote_users() from Salmon module
2019-10-18 14:50:09 +00:00
Ariadne Conill
4f82e42e4e
websub: remove entirely
2019-10-18 14:50:09 +00:00
Ariadne Conill
b16a460916
federator: remove websub stuff
2019-10-18 14:50:09 +00:00
Ariadne Conill
25b7ff56c3
application: don't start Federator.init/1 anymore
2019-10-18 14:50:09 +00:00
rinpatch
39e996528c
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
2019-10-18 15:22:07 +03:00
Haelwenn (lanodan) Monnier
3c6fd0bb99
upload.ex: Remove deprecated configuration
2019-10-18 12:34:09 +02:00
Maxim Filippov
2473702be2
Merge branch 'develop' into feature/relay-list
2019-10-18 10:24:29 +02:00
kaniini
7511f3d192
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
...
Fix streaming websocket handshake with `Sec-WebSocket-Protocol`
See merge request pleroma/pleroma!1847
2019-10-18 04:42:02 +00:00
kaniini
733b73b71c
Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
2019-10-18 04:36:37 +00:00
lain
203d61b950
Transmogrifier: Make proper use of the LikeValidator.
2019-10-17 19:35:31 +02:00
lain
66452f518f
ObjectValidator: Rewrite LikeValidator with Ecto.
2019-10-17 18:36:52 +02:00
eugenijm
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
2019-10-17 16:49:39 +03:00
Maksim Pechnikov
66b5d0ff55
add Markers /api/v1/markers
2019-10-17 15:26:59 +03:00
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
lain
081e8206ab
Transmogrifier: Use new ingestion pipeline for Likes.
2019-10-16 17:03:21 +02:00
lain
6e4f52f8a2
Introduce new ingestion pipeline structure, implement internal Likes with it.
2019-10-16 16:16:39 +02:00
lain
1bfdf57fc7
Merge branch 'user-search-experiments' into 'develop'
...
User search: Remove trigram and refactor the module
See merge request pleroma/pleroma!1850
2019-10-16 12:29:08 +00:00
feld
21f0757b0d
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
...
Ability to toggle activation status, permission group & delete multiple users
Closes admin-fe#39
See merge request pleroma/pleroma!1825
2019-10-16 12:14:47 +00:00
lain
6977cddff9
Merge branch 'benchmark-finishing' into 'develop'
...
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
2019-10-16 11:54:49 +00:00
rinpatch
0a5175ecbb
Order fts results by trigram
2019-10-16 13:49:33 +03:00
rinpatch
c10ce113d4
User search: Remove trigram and refactor the module
...
- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees
2019-10-16 12:52:47 +03:00
Maxim Filippov
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
2019-10-15 17:33:29 +02:00
Maxim Filippov
90d516d42b
Store status data inside flag activity
2019-10-15 16:52:41 +02:00
Alexander
e7bb762ec2
don't stream in benchmark env
2019-10-15 15:16:17 +03:00
kPherox
5bd0717de2
Add Sec-WebSocket-Protocol to response header
2019-10-15 21:09:44 +09:00
Ekaterina Vaartis
fbe5a00475
For pleroma.emoji downloaded packs, generate pack.json instead
2019-10-15 09:53:28 +03:00
Egor Kislitsyn
1d46944fbd
Do not add follower_address to following for non local users
2019-10-14 13:50:43 +07:00
eugenijm
a97b642289
Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints
2019-10-14 02:57:21 +03:00
lain
e3b4a3e96b
Merge branch 'incoming-id-fixes' into 'develop'
...
Assorted transmogrifier fixes
See merge request pleroma/pleroma!1831
2019-10-13 15:37:49 +00:00
rinpatch
9bdbf0811b
Make MediaProxy failure tracking less brutal
...
The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds.
2019-10-11 22:52:38 +03:00
Maxim Filippov
cc6875b582
Add GET /api/pleroma/admin/relay endpoint - lists all followed relays
2019-10-11 19:12:29 +03:00
Maxim Filippov
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
2019-10-11 15:59:35 +03:00
Maxim Filippov
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
2019-10-11 15:58:45 +03:00
lain
422aa6befe
Ostatus DeleteHandler: Fix for new option format.
2019-10-11 12:53:09 +02:00
lain
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
2019-10-11 11:48:58 +02:00
lain
9b963064eb
Transmogrifier: Actually store who deleted a note.
2019-10-11 11:25:45 +02:00
Maxim Filippov
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
2019-10-11 00:24:31 +03:00
Egor Kislitsyn
059005ff82
Replace user.following with Pleroma.FollowingRelationship
2019-10-11 02:35:32 +07:00
lain
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
2019-10-10 17:17:33 +02:00
lain
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
2019-10-10 14:40:59 +02:00
lain
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-10 12:38:51 +00:00
Maxim Filippov
24eecc3cb4
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-10-10 03:33:55 +03:00
lain
1357ec1a10
Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop'
...
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`
See merge request pleroma/pleroma!1822
2019-10-09 15:10:08 +00:00
Maxim Filippov
ad42837244
Ability to toggle activation status and permission group for a group of users
2019-10-09 17:03:54 +03:00
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users
2019-10-09 13:11:57 +07:00
eugenijm
580a67f5ca
Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id)
2019-10-09 07:27:09 +03:00
Maxim Filippov
aa7fd616c7
Line is too long!
2019-10-07 16:03:23 +03:00
Maxim Filippov
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
2019-10-07 15:41:41 +03:00
Maxim Filippov
7aceaa517b
Admin API: Reports, grouped by status
2019-10-07 15:39:07 +03:00
lain
6c278cfe09
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-07 12:31:51 +00:00
Ariadne Conill
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
2019-10-07 12:29:33 +00:00
Sergey Suprunenko
4b3f77a99f
Extract RSS Feed functionality from OStatus
2019-10-07 12:20:41 +00:00
lain
d580eedfe9
Linting.
2019-10-07 12:40:33 +02:00
lain
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-07 12:30:59 +02:00
kaniini
93bdc55306
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
...
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
2019-10-07 10:19:24 +00:00
Ivan Tashkinov
28fb98d69e
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-10-07 11:06:30 +03:00
lain
91e90aa807
Merge branch 'misskey-compat' into 'reactions'
...
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783
2019-10-07 07:25:27 +00:00
Haelwenn
b4f3c16885
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
...
[#1234 ] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
2019-10-07 02:14:45 +00:00
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject
2019-10-07 03:49:57 +02:00
kaniini
2411d09215
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
...
Move local keys out of `user.info`
See merge request pleroma/pleroma!1799
2019-10-06 14:32:56 +00:00
feld
1d8e956c32
Use the user.id instead of nickname in report URLs
...
Ensures links to profiles of remote users work.
2019-10-06 14:13:04 +00:00
Ivan Tashkinov
b93856874d
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
2019-10-06 17:12:17 +03:00
rinpatch
fefbd31c6e
Move local keys out of user.info
2019-10-06 16:56:36 +03:00
Ivan Tashkinov
06b3bb54c5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
2019-10-06 11:43:49 +03:00
lain
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
2019-10-06 08:11:47 +00:00
Ivan Tashkinov
f459aabdfa
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-10-06 09:30:49 +03:00
Haelwenn
9e34919dcd
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
...
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
2019-10-06 04:41:06 +00:00
kaniini
7a318d74e6
Merge branch 'split-masto-api/leftovers' into 'develop'
...
[#1278 ] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
2019-10-05 19:28:53 +00:00
kaniini
45b7f03f89
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
2019-10-05 19:28:29 +00:00
kaniini
17ff4b43cb
Merge branch 'unread-conversation-count' into 'develop'
...
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
2019-10-05 19:28:07 +00:00
eugenijm
8249924485
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
2019-10-05 20:12:00 +03:00
lain
1ed8fbc4d9
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-05 15:10:57 +02:00
lain
276a520163
CommonAPI: Create profile updates as public.
...
This saves us lots of sending out because we can use sharedInbox.
2019-10-05 14:53:50 +02:00
lain
4b8524f392
ActivityPub / Transmogrifier: Correctly store incoming Update id.
2019-10-05 14:49:45 +02:00
Thibaut Girka
791d93ff0e
Make credo happy
2019-10-05 13:56:40 +02:00
Thibaut Girka
977e711e22
Import object from self-Announce whenever possible
2019-10-05 13:56:40 +02:00
kaniini
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
2019-10-05 10:00:05 +00:00
lain
6a85f7d1ea
Transmogrifier: Extend misskey like compatibility.
2019-10-05 10:45:42 +02:00
lain
d9aaea44ff
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-05 10:42:29 +02:00
Maksim Pechnikov
83631752af
removed legacy api: "/objects/:uuid/likes"
2019-10-04 22:35:26 +03:00
kaniini
e0c0ea9f13
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
...
widen streaming API block effects
See merge request pleroma/pleroma!1784
2019-10-04 17:39:06 +00:00
kaniini
5c04e81724
Merge branch 'user-info-unread-direct-conversation' into 'develop'
...
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
2019-10-04 17:33:18 +00:00
Maxim Filippov
8dcc2f9f5e
Admin API: Allow changing the state of multiple reports at once
2019-10-04 19:00:58 +03:00
Ariadne Conill
d1d058bf85
streamer: worker: actually use should_send? consistently
2019-10-04 15:42:25 +00:00
Ariadne Conill
5a0c018d2a
streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
2019-10-04 15:41:55 +00:00
Ariadne Conill
2417b633ed
streamer: add missing copyright headers
2019-10-04 15:21:45 +00:00
lain
43a211bcb1
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
2019-10-04 17:01:04 +02:00
lain
568a995d64
ActivityPub: Change addressing of Undo.
2019-10-04 16:32:42 +02:00
lain
27110793a7
Merge branch 'featrue/job-monitor' into 'develop'
...
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
2019-10-04 12:52:11 +00:00
lain
27e914955e
Merge branch 'fix/nickname-fail' into 'develop'
...
Fix get_cached_by_nickname_or_id not allowing to get local users by nickname
Closes #1293
See merge request pleroma/pleroma!1777
2019-10-04 11:54:05 +00:00
rinpatch
8217292085
Fix get_cached_by_nickname_or_id not allowing to get local users by
...
nickname
Closes #1293
2019-10-04 14:44:09 +03:00
lain
01da6344b9
Merge branch 'bugfix/notification-nil-actor' into 'develop'
...
notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779
2019-10-04 11:28:20 +00:00
Egor Kislitsyn
d3ac4e8083
Fix OAuthController
2019-10-04 13:30:46 +07:00
Haelwenn (lanodan) Monnier
5dc14c89ce
notification_view.ex: Make sure account isn’t empty
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
2019-10-04 07:11:53 +02:00
eugenijm
06d9df79c5
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
2019-10-04 00:53:23 +03:00
lain
c9043c6c80
Transmogrifier: Handle incoming Undos for EmojiReactions.
2019-10-03 18:37:23 +02:00
rinpatch
1cae564b5d
Move config task docs to a separate file and mark it as WIP
2019-10-03 14:12:57 +03:00
rinpatch
e00403af23
Mix tasks: derive moduledoc from doc files
2019-10-03 14:00:23 +03:00
rinpatch
6baa037903
Move database maintenance tasks docs to a separate file
2019-10-03 11:17:29 +03:00
rinpatch
b4ca864c6b
Move user tasks docs to a separate file
2019-10-03 10:15:24 +03:00
rinpatch
d39ccc2e7f
Move uploads task docs to a separate file
2019-10-03 09:35:21 +03:00
rinpatch
808d0a0170
Move relay docs to a separate file
2019-10-03 09:10:31 +03:00
rinpatch
6435ba83cd
Move instance CLI task docs to a text file
2019-10-03 09:06:06 +03:00
rinpatch
869ea2ab90
Move digest email docs to a separate file and improve styling
2019-10-03 01:10:36 +03:00
rinpatch
bd9c7807fb
Move emoji task docs to a separate file
2019-10-03 01:03:47 +03:00
Ivan Tashkinov
64095961fe
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
2019-10-02 20:42:40 +03:00
lain
4cb603e1df
PleromaAPI: Add unreacting.
2019-10-02 18:19:16 +02:00
lain
391c736292
PleromaAPI: Fix emoji_reactions_by
2019-10-02 18:13:10 +02:00
Egor Kislitsyn
e0c68eeb02
Move :favourites and :bookmarks actions to StatusController
2019-10-02 21:31:19 +07:00
Egor Kislitsyn
7f2bc57725
Move follows, mutes and blocks actions to AccountController
2019-10-02 21:22:21 +07:00
lain
9cfe9a57c5
CommonAPI: Add unreactions.
2019-10-02 15:38:57 +02:00
Egor Kislitsyn
d3c404af12
Add MastoFEController
2019-10-02 20:36:08 +07:00
lain
dfe5c958eb
ActivityPub: Add undo for emoji reactions.
2019-10-02 15:08:20 +02:00
Egor Kislitsyn
1c6e1055c8
Add CustomEmojiController
2019-10-02 19:16:34 +07:00
lain
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
2019-10-02 13:27:55 +02:00
kaniini
433f2c0f68
Merge branch 'split-masto-api/instance' into 'develop'
...
Extract instance actions from `MastodonAPIController` to `InstanceController`
See merge request pleroma/pleroma!1760
2019-10-02 10:46:14 +00:00
kaniini
debd0a3066
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Inline object when Announcing a self-owned private object
See merge request pleroma/pleroma!1769
2019-10-02 10:45:55 +00:00
Thibaut Girka
86880b9821
Inline object when Announcing a self-owned private object
2019-10-02 12:15:06 +02:00
Thibaut Girka
3d61efa7c9
Rename misleading get_announce_visibility to public_announce?
2019-10-02 10:48:34 +02:00
Egor Kislitsyn
26693292f4
Remove :enqueued counter
2019-10-02 14:50:25 +07:00
Egor Kislitsyn
c8b01f6667
Extract instance actions from MastodonAPIController to InstanceController
2019-10-02 14:13:52 +07:00
kaniini
89ab673d00
Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
...
Send an identifier alongside with error message in OAuthController
See merge request pleroma/pleroma!1765
2019-10-02 07:04:33 +00:00
kaniini
8557176808
Merge branch 'split-masto-api/auth' into 'develop'
...
Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759
2019-10-02 07:02:56 +00:00
kaniini
9b38bf4af4
Merge branch 'features/private-reblogs' into 'develop'
...
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
2019-10-02 07:02:24 +00:00
feld
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
2019-10-01 22:16:29 +00:00
Thibaut Girka
427d0c2a00
Store private announcements in object.data["announcements"], filter them on display
2019-10-01 22:39:25 +02:00
Sergey Suprunenko
c541b83bef
Track failed proxy urls and don't request them again
2019-10-01 20:00:27 +00:00
Thibaut Girka
43e3db0951
Fix returned visibility of announces in MastodonAPI
2019-10-01 20:38:29 +02:00
Thibaut Girka
4c1f158f5d
Allow users to announce privately, including own private notes
2019-10-01 20:00:59 +02:00
Maxim Filippov
b2273c695e
Discard identifier, if empty
2019-10-01 19:43:22 +03:00
Thibaut Girka
fe538973dd
Ensure self-announces do not widen the audience of the original post
2019-10-01 18:38:57 +02:00
KokaKiwi
1f0be71ea4
Make activity announceable by its author.
2019-10-01 17:47:43 +02:00
Maxim Filippov
0f9c2c8b87
Send an identifier alongside with error message in OAuthController
2019-10-01 18:10:04 +03:00
Egor Kislitsyn
af690d1033
Extract auth actions from MastodonAPIController to AuthController
2019-10-01 15:54:45 +07:00
Egor Kislitsyn
2dad6dd020
Extract apps actions from MastodonAPIController to AppController
2019-10-01 15:21:46 +07:00
Egor Kislitsyn
39695c4436
Extract suggestions actions from MastodonAPIController to SuggestionController
2019-10-01 15:07:49 +07:00
Egor Kislitsyn
585bc57edb
Extract media actions from MastodonAPIController to MediaController
2019-10-01 14:36:35 +07:00
Egor Kislitsyn
36a34c36fe
Extract poll actions from MastodonAPIController to PollController
2019-10-01 11:44:34 +07:00
kPherox
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
2019-10-01 01:40:33 +09:00
lain
dae744478e
Transmogrifier: Handle compact objects in undos.
2019-09-30 18:13:05 +02:00
Ivan Tashkinov
6ffa2b5f66
[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
2019-09-30 17:41:20 +03:00
lain
19bc0b8c79
.
2019-09-30 16:38:19 +02:00
lain
08256e9299
ActivityPub: Federate reactions.
2019-09-30 15:51:09 +02:00
lain
6068d2254e
PleromaAPIController: Fixes and refactoring.
2019-09-30 15:13:25 +02:00
lain
04a2910f33
Pleroma.Constants: Fix typo.
2019-09-30 15:13:05 +02:00
Egor Kislitsyn
0c6009dd2e
Extract mascot actions from MastodonAPIController to MascotController
2019-09-30 19:32:43 +07:00
Egor Kislitsyn
987e0b8be8
Move update_credentials to MastodonAPI.AccountController
2019-09-30 19:10:56 +07:00
Egor Kislitsyn
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
2019-09-30 19:10:55 +07:00
Egor Kislitsyn
3c5ecb70b4
Add PleromaAPI.AccountController
2019-09-30 19:10:55 +07:00
Egor Kislitsyn
e7aef27c00
Fix merge
2019-09-30 19:10:54 +07:00
lain
a7f22c6e93
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-30 13:58:14 +02:00
lain
b923842e96
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-30 13:57:54 +02:00
kaniini
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
2019-09-30 11:21:49 +00:00
kaniini
0e356cc800
Merge branch 'split-masto-api/reports' into 'develop'
...
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
2019-09-30 11:17:30 +00:00
kaniini
74d8fadf37
Merge branch 'split-masto-api/conversations' into 'develop'
...
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
2019-09-30 10:49:40 +00:00
Egor Kislitsyn
b7f27a4f58
Extract report actions from MastodonAPIController to ReportController
...
Update MastodonAPI.ReportView
2019-09-30 17:44:10 +07:00
Ariadne Conill
1d7cbdaf7b
change new scrobble endpoint
2019-09-30 10:39:48 +00:00
Ariadne Conill
e653edd182
split scrobble functions into their own controller
2019-09-30 10:39:48 +00:00
Ariadne Conill
a6e1469767
router: change scrobble timeline route from now-playing to scrobbles
2019-09-30 10:39:48 +00:00
Ariadne Conill
8b34b221cb
common api: add some missing IR bits for listen activities' children
2019-09-30 10:39:48 +00:00
Ariadne Conill
84712c35f9
activitypub: object view: include child object for Listen activities
2019-09-30 10:39:48 +00:00
Ariadne Conill
71eff09e56
common api: make sure the generated IR is actually federatable
2019-09-30 10:39:48 +00:00
Ariadne Conill
7cad6ea67a
pleroma api: hook up scrobbler controller
2019-09-30 10:39:17 +00:00
Ariadne Conill
2c82d8603b
common api: implement scrobbling
2019-09-30 10:39:17 +00:00
Ariadne Conill
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
2019-09-30 10:39:17 +00:00
Ariadne Conill
1f9de2a8cd
activitypub: implement IR-level considerations for Listen activities
2019-09-30 10:39:17 +00:00
Ariadne Conill
b7877e9b1c
mastodon api: implement rendering of listen activities
2019-09-30 10:39:17 +00:00
Egor Kislitsyn
d4d88b3361
Extract conversation actions from MastodonAPIController to ConversationController
2019-09-30 16:52:07 +07:00
rinpatch
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
2019-09-29 18:43:27 +03:00
kaniini
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
2019-09-29 11:44:31 +00:00
Maksim Pechnikov
1053319cd6
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-28 10:36:04 +03:00
Haelwenn (lanodan) Monnier
9202904da9
status_controller.ex: Posting media status without content defined
2019-09-28 01:53:41 +02:00
rinpatch
374f83d29b
Fix not being able to post empty statuses with attachments
...
Attachment field was filled in after the empty status check
2019-09-28 01:58:06 +03:00
minibikini
f9380289eb
Add remote_ip plug
2019-09-27 21:59:23 +00:00
kaniini
92d08d4113
Merge branch 'split-masto-api/follow-requests' into 'develop'
...
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730
2019-09-27 07:54:54 +00:00
kaniini
68bf99baf2
Merge branch 'split-masto-api/domain-blocks' into 'develop'
...
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
2019-09-27 07:54:08 +00:00
kaniini
27a3221d57
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
...
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
2019-09-27 07:53:22 +00:00
Egor Kislitsyn
408750b94e
Extract domain blocks actions from MastodonAPIController to DomainBlockController
2019-09-27 14:28:05 +07:00
Egor Kislitsyn
99c5a35890
Extract follow requests actions from MastodonAPIController to FollowRequestController
2019-09-27 14:25:17 +07:00
Egor Kislitsyn
8d31530119
Cleanup ScheduledActivityView
2019-09-27 13:36:28 +07:00
Egor Kislitsyn
0a5b106ddd
Extract scheduled statuses actions from MastodonAPIController to ScheduledActivityController
2019-09-27 13:36:28 +07:00
Egor Kislitsyn
621377f378
Extract filter actions from MastodonAPIController to FilterController
2019-09-27 13:06:25 +07:00
Egor Kislitsyn
6c7c35dbe1
Fix SubscriptionNotificationView
2019-09-27 11:55:47 +07:00
kaniini
91e2bcf218
Merge branch 'refactor/status-controller' into 'develop'
...
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
2019-09-27 04:37:48 +00:00
Ariadne Conill
14294243a2
mastodon api: implement follow_requests_count
2019-09-27 04:22:40 +00:00
Egor Kislitsyn
5ea5c58a85
Move view logic from StatusController.context to StatusView and add a test
2019-09-27 10:52:47 +07:00
kaniini
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
2019-09-27 03:51:24 +00:00
Egor Kislitsyn
98d1347a4e
Extract status actions from MastodonAPIController into StatusController
2019-09-27 10:51:15 +07:00
kaniini
219771288c
Merge branch 'refactor/common_api' into 'develop'
...
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
2019-09-27 03:46:02 +00:00
kaniini
dc0fdb5e84
Merge branch 'refactor/timeline-controller' into 'develop'
...
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
2019-09-27 03:42:30 +00:00
Maksim Pechnikov
73ae38ca04
add deprecated tag
2019-09-26 21:08:04 +03:00
Maksim Pechnikov
b4fc96f640
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-26 20:56:59 +03:00
Maxim Filippov
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
2019-09-26 19:01:54 +03:00
Maksim Pechnikov
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-26 16:16:30 +03:00
Egor Kislitsyn
75290cbfbd
Add Pleroma.JobQueueMonitor
2019-09-26 18:49:57 +07:00
Roman Chvanikov
b4b147000c
Merge develop
2019-09-26 10:38:54 +03:00
Egor Kislitsyn
3572cf29b7
Extract timeline actions from MastodonAPIController into TimelineController
2019-09-26 10:53:42 +07:00
Egor Kislitsyn
c57ad0a402
Cleanup CommonAPI
2019-09-26 10:33:13 +07:00
Egor Kislitsyn
de3e90e536
Add ActivityDraft.with_valid/2
2019-09-26 10:29:34 +07:00
Egor Kislitsyn
eed774d058
Add CommonAPI.ActivityDraft
2019-09-26 10:29:34 +07:00
kaniini
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
2019-09-26 03:13:22 +00:00
kaniini
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
2019-09-26 03:12:03 +00:00
kaniini
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
2019-09-26 03:00:38 +00:00
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
kaniini
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
2019-09-26 02:51:54 +00:00
kaniini
beabc49e35
Merge branch 'feature/activities-pagination-by-offset' into 'develop'
...
Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714
2019-09-26 02:49:45 +00:00
kaniini
1b9cd4c866
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
...
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern
See merge request pleroma/pleroma!1716
2019-09-26 00:03:47 +00:00
rinpatch
f92d7d52c2
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
2019-09-25 13:38:45 +00:00
rinpatch
f2880d7d29
Credo considered harmful
2019-09-25 16:36:46 +03:00
rinpatch
c7d8ccd0c4
Remove useless with clause
2019-09-25 16:26:47 +03:00
rinpatch
1ddd403339
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-25 13:20:48 +00:00
rinpatch
d87be2ec96
Don't embed the first page in inboxes/outboxes and refactor the views to
...
follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
2019-09-25 15:59:04 +03:00
Ekaterina Vaartis
1fd9c60f87
Fix emoji tags for shareable packs to be "pack:{name}"
2019-09-25 12:34:03 +02:00
Ekaterina Vaartis
118d6dcdf4
Fix nodeinfo handling
2019-09-25 12:32:19 +02:00
Ekaterina Vaartis
ba9d35a904
Add an API endpoint for listing remote packs
2019-09-25 12:32:19 +02:00
vaartis
a6e85215e1
Credo fix (remove parens on function definition)
2019-09-25 12:32:19 +02:00
vaartis
f21dbbc021
Move emoji_dir_path & cache_seconds_per_file
2019-09-25 12:32:19 +02:00
Ekaterina Vaartis
cdbe7cd37a
When listing emoji packs, be sure to create the directory
2019-09-25 12:32:19 +02:00
Egor Kislitsyn
b5dfe83433
Replace Pleroma.FlakeId with flake_id hex package
2019-09-25 17:14:31 +07:00
Maksim Pechnikov
1a858134ed
Merge branch 'develop' into issue/1218
2019-09-25 12:24:12 +03:00
Maxim Filippov
60cbea5bb2
Allow activities pagination via limit/offset
2019-09-25 01:25:42 +03:00
Haelwenn (lanodan) Monnier
0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
2019-09-24 19:03:06 +02:00
Egor Kislitsyn
035f22f784
Fix Credo warnings
2019-09-24 19:50:09 +07:00
Egor Kislitsyn
1bea67cb5e
Cleanup Pleroma.User
2019-09-24 19:50:09 +07:00
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
2019-09-24 19:50:07 +07:00
Maxim Filippov
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-24 13:00:48 +03:00
Egor Kislitsyn
a66a7a328f
Extract notification actions from MastodonAPIController into NotificationController
2019-09-24 15:16:44 +07:00
Egor Kislitsyn
79b25be4e1
Do not return tuple when unneeded
2019-09-24 15:03:20 +07:00
Maksim Pechnikov
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-24 08:06:04 +03:00
kaniini
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
2019-09-23 22:42:34 +00:00
kaniini
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
2019-09-23 22:41:31 +00:00
kaniini
760df67a7b
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
...
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes #1223
See merge request pleroma/pleroma!1703
2019-09-23 22:35:09 +00:00
kaniini
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
2019-09-23 22:34:52 +00:00
Steven Fuchs
e1d2d69c87
Clean up views
2019-09-23 22:33:59 +00:00
Ekaterina Vaartis
e63f167f01
Also pretty print pack.json
2019-09-24 00:37:27 +03:00
Rachel Fae Fox
63af6951fa
add tunable for stream uploads, as needed for jortage to work.
2019-09-23 20:38:53 +00:00
Maksim Pechnikov
494bb6bac6
updated tests
2019-09-23 22:37:30 +03:00
Maksim Pechnikov
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
2019-09-23 21:41:57 +03:00
Maksim Pechnikov
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-23 21:32:50 +03:00
rinpatch
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
2019-09-23 18:20:08 +00:00
rinpatch
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
2019-09-23 21:14:51 +03:00
Haelwenn (lanodan) Monnier
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
2019-09-23 20:00:12 +02:00
Haelwenn (lanodan) Monnier
2ad50583f0
Document and test /api/ap/whoami
2019-09-23 19:47:35 +02:00
Maxim Filippov
d72d4757a8
Format
2019-09-22 23:13:48 +03:00
Maxim Filippov
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-22 16:58:39 +03:00
Maxim Filippov
72a01f1350
Use router helper to generate reset password link
2019-09-22 16:36:59 +03:00
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
2019-09-22 16:08:07 +03:00
eugenijm
7cf1252455
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (GET /api/v1/timelines/public)
2019-09-20 18:27:00 +03:00
lain
b80c41a14f
Merge branch 'outbox_pagination' into 'develop'
...
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
2019-09-19 16:53:59 +00:00
D Anzorge
0e6085da10
Fix pagination in AP outbox.json
2019-09-19 16:09:07 +02:00
Alex S
1d285e6fad
moving to separate dir
2019-09-19 14:02:27 +03:00
Alex S
924d7e6aa6
generating remote activities
2019-09-19 12:59:36 +03:00
Ivan Tashkinov
6f67aed3ac
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
2019-09-19 10:59:09 +03:00
Egor Kislitsyn
95c948110c
Add rel="ugc" to hashtags and mentions
2019-09-19 14:56:10 +07:00
Egor Kislitsyn
cf3041220a
Add support for rel="ugc"
2019-09-19 14:56:10 +07:00
eugenijm
fe5e0b7846
Mastodon API: Return pleroma.direct_conversation_id when creating direct messages (POST /api/v1/statuses)
2019-09-19 08:59:25 +03:00
Maksim Pechnikov
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-19 07:35:34 +03:00
Haelwenn
f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
2019-09-18 22:28:10 +00:00
rinpatch
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
2019-09-18 21:57:49 +00:00
Haelwenn (lanodan) Monnier
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
2019-09-18 23:21:11 +02:00
Ekaterina Vaartis
b585134c90
Get the nodeinfo address from the well-known
2019-09-19 00:16:34 +03:00
Ekaterina Vaartis
a1325d5fd9
Change path from nodeinfo to metadata->features
2019-09-19 00:16:34 +03:00
Ekaterina Vaartis
d51e5e447e
Move emoji reloading to admin api
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7680aec17d
Move emoji api to pleroma api dir
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
36f2275dc9
A feature for shareable emoji packs, use it in download_from & tests
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
74fb6d8647
Move EmojiAPIController from EmojiAPI to PleromaAPI
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
6cd651a38b
Make the emoji controller api more RESTy
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
3971bf9c5f
Change :sha to :checksum
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7c784128fd
Change emoji api responses to JSON
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
f24731788e
Move emoji pack list from /list to /
2019-09-19 00:16:33 +03:00
vaartis
cb125ffaf7
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
8f509e6d1e
Use with w/ pack_info_res
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
8790365fef
Remove unused variable
2019-09-19 00:16:33 +03:00
vaartis
b8a214b0ab
Split list_packs
2019-09-19 00:16:33 +03:00
vaartis
f251225cae
Apply suggestions to emoji_api_controller.ex
2019-09-19 00:16:33 +03:00
vaartis
c049c32270
Fixed a typo in create_archive_and_cache
2019-09-19 00:16:33 +03:00
vaartis
163082de6f
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
f6d4acc871
Fix credo warnings
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
87057101b0
Add documentation for the emoji api endpoints
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9eb2ee4df0
Allow importing old (emoji.txt / plain) packs from the filesystem
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
13cd93a0d3
Use && insted of "and" for checking shared-files for packs
...
share-files can be nil and "and" does not like that
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
f5131540dc
Add a way to create emoji packs via an endpoint
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
8dbdd5c280
Allow uploading new emojis to packs from URLs
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
16edfef12e
Handle empty shortcode/filename/new_shortcode/new_filename
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
9afe7258dd
Implememt emoji pack file updating + write tests
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
261d92f9c2
Update the pack fallback-src sha generation condition
...
The old one would not regenerate sha when fallback src changed
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
bcc0bfd0c5
Add an endpoint for emoji pack metadata updating
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
b78973d27f
fallback can't have pack.json, reflect that in code
...
having pacj.json and sha256 in a fallback pack would cause a circular dependency of itself
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
2a94eca096
Change YAML to JSON
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
b0ecd412f5
Clean out old emojis on reload
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
2d4b8f3d20
Add an endpoint for deleting emoji packs
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
3a8669b487
Fix responses for emoji pack controlller
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7a0c755d0a
Send ok for emoji reloading as text, not as json
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
ee620ecbf1
Add caching for emoji pack sharing
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
7fb7dd9e0e
Only find SHA256 for packs that are shared
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
54b8e683bc
Swap TOML for YAML to get YAML generation for packs from fallbacks
...
If fallback url doesn't have a pack.yml file, one from the source will
be used
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
b791a08656
Implement API actions on packs
...
That incldues listing them and downloading them from other instances
or from the remote url
2019-09-19 00:16:33 +03:00
Ekaterina Vaartis
6a42641b8d
Add pack.toml loading
2019-09-19 00:16:33 +03:00
feld
ab2ca3038f
Merge branch 'hide-follower-following-count' into 'develop'
...
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
2019-09-18 21:13:15 +00:00
feld
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
2019-09-18 21:11:37 +00:00
Haelwenn
e32d099a3a
Merge branch 'feature/poll-refresh' into 'develop'
...
Poll refetching
See merge request pleroma/pleroma!1694
2019-09-18 20:58:53 +00:00
rinpatch
5028b7b578
Fix credo issues
2019-09-18 22:09:03 +03:00
rinpatch
c096dd86e5
Do not refetch local objects
2019-09-18 20:01:26 +03:00
rinpatch
eb87a86b5b
Preserve internal fields when reinjecting
2019-09-18 19:53:51 +03:00
rinpatch
d32894ae51
Move object internal fields to a constant
2019-09-18 19:24:20 +03:00
rinpatch
e3f902b3a1
Set updated_at even if the object stayed the same
2019-09-18 19:07:25 +03:00
rinpatch
a9c700ff15
Fix wrong argument order when calling NaiveDateTime.diff
2019-09-18 18:52:33 +03:00
rinpatch
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
2019-09-18 18:13:21 +03:00
Maxim Filippov
384b7dd40d
Fix response
2019-09-18 18:06:49 +03:00
Maxim Filippov
f89728ad95
Merge branch 'develop' into feature/return-link-for-password-reset
2019-09-18 16:44:11 +03:00
Ivan Tashkinov
e4f3d7f69d
Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex
2019-09-18 10:31:10 +00:00
Ivan Tashkinov
551f2fa59e
[ #1234 ] Added changelog entry, removed admin OAuth scopes.
2019-09-18 12:31:33 +03:00
Ivan Tashkinov
c98e761d28
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
2019-09-18 12:06:38 +03:00
Alex S
a18f1e7cd7
namings
2019-09-18 10:49:14 +03:00
Alex S
2263c8b6b9
little fixes
2019-09-18 10:49:14 +03:00
Alex S
4faf2b1555
post for creating invite tokens in admin api
2019-09-18 10:49:14 +03:00
Haelwenn (lanodan) Monnier
e501c822c9
markdown.ex: put two-spaces before the description-newline
2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier
4785596a2c
markdown.ex: end suggestions list with a newline
...
Otherwise we end up with suggestion on the same level as the childs
Markdown is a fuck…
2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier
d2097fd0f5
markdown.ex: \n\n on >1 suggestions, 2-spaces on one
2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier
d6182a3c8f
markdown.ex: Make suggestion(s) plural only if on >1
2019-09-17 23:05:27 +02:00
Haelwenn (lanodan) Monnier
c0c5628200
description.exs: remove empty strings on descriptions
2019-09-17 23:05:26 +02:00
Haelwenn (lanodan) Monnier
106afaed58
markdown.ex: do not fail if there is no children
2019-09-17 23:05:26 +02:00
Haelwenn (lanodan) Monnier
e0d8c8897e
docs/markdown.ex: do no print empty suggestions
2019-09-17 23:05:26 +02:00
Ivan Tashkinov
b4d775161c
[ #1234 ] Undone reordering-related changes in router.ex.
2019-09-17 23:24:55 +03:00
Maxim Filippov
f9dd121ad3
Admin API: Return link alongside with token on password reset
2019-09-17 23:09:08 +03:00
Ivan Tashkinov
01c1078015
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-17 22:53:26 +03:00
Haelwenn (lanodan) Monnier
7f211a48e0
docs/markdown.ex: child header as "- key (type): description"
2019-09-17 21:47:32 +02:00
Maksim Pechnikov
0447c42715
Merge branch 'develop' into issue/733
2019-09-17 22:20:39 +03:00
Ivan Tashkinov
76068873db
[ #1234 ] Defined admin OAuth scopes, refined other scopes. Added tests.
2019-09-17 22:19:39 +03:00
rinpatch
ef2e2c5e12
Merge branch 'feature/return-total-for-reports' into 'develop'
...
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
2019-09-17 19:09:56 +00:00
Maksim Pechnikov
7dd51652f9
Merge branch 'develop' into issue/733
2019-09-17 21:20:08 +03:00
Steven Fuchs
6193157f19
Fix notification warnings
2019-09-17 18:12:27 +00:00
Haelwenn
2301de3d75
Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
...
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
See merge request pleroma/pleroma!1677
2019-09-17 17:16:39 +00:00
rinpatch
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
2019-09-17 14:47:26 +00:00
Steven Fuchs
80c5c3495b
remove remaining errors from tests
2019-09-17 14:44:52 +00:00
Roman Chvanikov
9fa2586abd
Refactor SubscriptionNotificationView
2019-09-17 17:44:10 +03:00
Roman Chvanikov
e9f69a3eb7
Move pleroma_api controllers into controllers sub-folders
2019-09-17 16:52:23 +03:00
Roman Chvanikov
7d1773bc6b
Rename SubscriptionNotificationController list and get actions to index and show
2019-09-17 16:48:24 +03:00
Roman Chvanikov
a76168e743
Cleanup PleromaAPIController
2019-09-17 16:44:54 +03:00
Roman Chvanikov
a81f80233d
Apply suggestion to lib/pleroma/web/router.ex
2019-09-17 13:43:10 +00:00
Roman Chvanikov
f9be517c7f
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17 13:42:40 +00:00
Roman Chvanikov
c0f776faec
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17 13:42:36 +00:00
Roman Chvanikov
2688b876ab
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
2019-09-17 13:42:28 +00:00
Ivan Tashkinov
e7afb67c5c
[ #1260 ] Rate-limiting for create authentication and related requests.
2019-09-17 16:16:11 +03:00
eugenijm
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)
2019-09-17 14:45:47 +03:00
rinpatch
a21584556f
Update oban to 0.8.1
...
This version uses a different locking mechanism, which gets rid of
`WARNING: you don't own a lock of type ShareLock` log spam
2019-09-17 13:04:43 +03:00
Roman Chvanikov
6042e21b25
Move subscription notifications to a separate controller
2019-09-16 21:59:49 +03:00
Roman Chvanikov
56b60798c2
Code style fixes
2019-09-16 20:50:14 +03:00
Roman Chvanikov
76c3e290fc
Merge develop
2019-09-16 20:30:42 +03:00
Maxim Filippov
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
2019-09-16 19:44:06 +03:00
Egor Kislitsyn
085d014f08
Fix Transmogrifier.upgrade_user_from_ap_id/1
2019-09-16 19:26:00 +07:00
Maxim Filippov
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
2019-09-16 14:40:17 +03:00
Egor Kislitsyn
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
2019-09-16 17:55:04 +07:00
kaniini
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
2019-09-16 09:09:21 +00:00
Steven Fuchs
aab264db82
Streamer refactoring
2019-09-16 07:44:03 +00:00
kaniini
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
2019-09-16 07:39:58 +00:00
kaniini
d1a84ceec8
Merge branch 'feature/optimize_rich_media_parser' into 'develop'
...
added prepare html for RichMedia.Parser
See merge request pleroma/pleroma!1672
2019-09-16 07:37:54 +00:00
Maksim Pechnikov
d75bc728e7
Merge branch 'develop' into issue/733
2019-09-16 07:34:22 +03:00
Ivan Tashkinov
efbc2edba1
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
# lib/pleroma/web/router.ex
2019-09-15 18:52:27 +03:00
Ivan Tashkinov
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
2019-09-15 18:22:08 +03:00
Maksim Pechnikov
b4cf74c106
added prepare html for RichMedia.Parser
2019-09-15 14:53:58 +03:00
Maksim Pechnikov
8751809e1e
Merge branch 'develop' into support/tests
2019-09-15 14:22:15 +03:00
Ivan Tashkinov
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
2019-09-15 10:12:24 +03:00
rinpatch
9c64a25713
Merge branch 'config-changes' into 'develop'
...
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
2019-09-14 17:26:35 +00:00
rinpatch
62bbba80f3
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
2019-09-14 16:39:42 +00:00
Roman Chvanikov
d7457c9165
Merge branch 'develop' into refactor/subscription
2019-09-14 18:29:51 +03:00
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
2019-09-14 16:11:44 +03:00
rinpatch
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
2019-09-14 01:50:15 +03:00
lain
1be09bde2d
Merge branch 'refactor/add_link_headers' into 'develop'
...
Refactor `add_link_headers/7` -> `add_link_headers/3`
See merge request pleroma/pleroma!1636
2019-09-13 17:06:38 +00:00
rinpatch
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
2019-09-13 19:42:53 +03:00
rinpatch
ac4a748fad
Disallow NULLs in deliveries
2019-09-13 19:28:35 +03:00
lain
6fe2f554c3
Emoji: Generate emoji detecting functions at compile time.
...
Suggested by jvalim
2019-09-13 18:27:32 +02:00
Alex S
69faec031d
markdown generation to the new file
2019-09-13 19:02:42 +03:00
Roman Chvanikov
0bd2b85edb
Separate Subscription Notifications from regular Notifications
2019-09-13 18:25:27 +03:00
rinpatch
8900cb68ae
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 15:25:15 +00:00
rinpatch
05f8a066a1
Apply suggestion to lib/pleroma/delivery.ex
2019-09-13 15:23:26 +00:00
rinpatch
2784962dba
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 15:23:03 +00:00
lain
53a3ad6043
Merge branch 'cleanup-activity' into 'develop'
...
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
2019-09-13 14:48:00 +00:00
lain
3ff5532220
Linting.
2019-09-13 16:41:30 +02:00
lain
a7f31bf06c
Merge remote-tracking branch 'origin/develop' into reactions
2019-09-13 16:31:27 +02:00
lain
e5b3ad3d04
ActivityPub: Use is_unicode_emoji? function.
2019-09-13 16:06:34 +02:00
Haelwenn
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
2019-09-13 12:46:16 +00:00
rinpatch
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
2019-09-13 12:36:24 +00:00
rinpatch
3896a51b8a
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 10:09:56 +00:00
rinpatch
5170170483
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-09-13 10:09:46 +00:00
rinpatch
fb96facc32
Remove unused functions and fix credo issues
2019-09-13 12:29:42 +03:00
rinpatch
ce23529d91
Use delivery info when federating deletes
2019-09-13 11:38:17 +03:00
Egor Kislitsyn
25d8216804
Add email change endpoint
2019-09-13 13:09:35 +07:00
Egor Kislitsyn
39dc9b470c
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
2019-09-13 12:44:59 +07:00
Maksim Pechnikov
d8a178274b
fix Activity.get_by_id
2019-09-13 07:12:34 +03:00
Maksim Pechnikov
2b40e57a72
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-13 06:55:05 +03:00
lain
a697f0d791
Emoji: Add function to detect if a character is an emoji
2019-09-13 02:11:02 +02:00
Haelwenn
51609217c2
Merge branch 'fix/error-log-double-quotes' into 'develop'
...
Fix double quotes in error logs
See merge request pleroma/pleroma!1656
2019-09-12 20:21:56 +00:00
rinpatch
b0e6058021
Parse http signature for request to objects/activities
2019-09-12 23:03:52 +03:00
Maksim Pechnikov
936951826e
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-12 22:15:43 +03:00
rinpatch
dabc4a00f5
Put the cache with the right key when using a tracking function
2019-09-12 22:10:15 +03:00
rinpatch
769fb778d4
Track object/create activity fetches
2019-09-12 21:37:36 +03:00
lain
8d4b661ecb
Transmogrifier: Strip internal emoji reaction fields.
2019-09-12 18:59:13 +02:00
lain
05e9776517
PleromaAPIController: Add endpoint to fetch emoji reactions.
2019-09-12 18:48:25 +02:00
Maksim Pechnikov
4f548cb2b7
added test for Ostatus
2019-09-12 10:25:43 +03:00
Mark Felder
74e4c72c4a
Fix double quotes in error logs
...
Example:
pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca "", error: nil
2019-09-11 16:16:09 -05:00
Maksim Pechnikov
007e0c1ce1
added tests
2019-09-11 23:19:06 +03:00
rinpatch
56828abf6d
Use Jason for rendering responses
...
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59)
2019-09-11 23:06:31 +03:00
Haelwenn
46ae62d159
Merge branch 'patch-5' into 'develop'
...
Mastodon API: URI encode hashtag name in generated URLs
See merge request pleroma/pleroma!1642
2019-09-11 17:47:19 +00:00
lain
fb7332aec7
Merge branch 'fix/oom-parallel-rendering' into 'develop'
...
Revert "Parallelize template rendering"
See merge request pleroma/pleroma!1654
2019-09-11 11:21:03 +00:00
rinpatch
5a76d5d239
Add extended benchmark
2019-09-11 11:13:17 +03:00
Alex S
38b29779c3
refactoring
2019-09-11 09:25:33 +03:00
Alex S
be32d90a0c
little refactor
2019-09-11 09:25:33 +03:00
Alex S
5ff12e7df1
some changes
2019-09-11 09:25:33 +03:00
Alex S
57dc59d98d
little fix
2019-09-11 09:25:33 +03:00
Alex S
35757b6d0e
don't add behaviour to suggestions
2019-09-11 09:25:33 +03:00
Alex S
0624e06a9c
little fix
2019-09-11 09:25:33 +03:00
Alex S
8f5ee7db06
typo fix
2019-09-11 09:25:33 +03:00
Alex S
6721301086
some changes
2019-09-11 09:25:33 +03:00
Alex S
0559c82bdb
fix
2019-09-11 09:25:33 +03:00
Alex S
a1f2dfb10a
expanding regex sigils to use modifiers
2019-09-11 09:25:33 +03:00
Alex S
511d93fa54
mix docs generates config.md
2019-09-11 09:25:33 +03:00
Alex S
67e4300931
description formatters
2019-09-11 09:25:33 +03:00
Maksim Pechnikov
fcf604fa43
added tests
2019-09-11 07:23:33 +03:00
rinpatch
43f02dfe38
Revert "Parallelize template rendering"
...
This reverts commit 1ad71592ad
2019-09-10 22:01:45 +03:00
Maksim Pechnikov
a31af93e1d
added tests /activity_pub/transmogrifier.ex
2019-09-10 16:43:10 +03:00
Egor Kislitsyn
b40b10b53d
Add an endpoint to get multiple statuses by IDs
2019-09-10 13:39:45 +07:00
Maxim Filippov
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
2019-09-10 01:23:20 +03:00
minibikini
11e12b5761
Add Pleroma.Plugs.Cache
2019-09-09 18:53:08 +00:00
feld
edbaf78176
Merge branch 'fix/read-inbox' into 'develop'
...
Fix `ActivityPubController.read_inbox/2`
Closes #1248
See merge request pleroma/pleroma!1649
2019-09-09 18:21:29 +00:00
Egor Kislitsyn
e0f84d0043
Fix ActivityPubController.read_inbox/2
2019-09-10 01:11:57 +07:00
Ivan Tashkinov
b63faf9819
[ #1234 ] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
2019-09-08 15:00:03 +03:00
Ivan Tashkinov
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-08 08:41:10 +03:00
shadowfacts
e5c6bf3673
Mastodon API: URI encode hashtag name in generated URLs
...
Otherwise hashtags with word characters other than those allowed in URLs (e.g. Japanese characters) produce hashtag URLs that are invalid.
2019-09-07 19:50:45 +00:00
Maksim Pechnikov
8c6cdff3cc
Merge branch 'develop' into issue/1218
2019-09-07 22:17:32 +03:00
Maksim Pechnikov
39f99dc6cd
Merge branch 'develop' into support/tests
2019-09-07 22:13:43 +03:00
Ariadne Conill
40a61532ca
activity: when restricting deactivated users, precalculate the user list
...
the PostgreSQL query planner is easily confused due to the complexity of
certain queries we make. while we plan to simplify these queries through
unification of activities and objects, we are not yet there. it has been
discovered that using a precalculated list of deactivated users encourages
the query planner to prefer simpler indices instead of the
activity_visibility index.
accordingly, drop the subquery and precalc the user list instead.
2019-09-06 23:14:29 +00:00
Ariadne Conill
5effb2cbca
activitypub: help ecto build a better query for thread mute filtering
...
using an indexed value in thread_mute table helps ecto build a better query.
2019-09-06 23:11:26 +00:00
Maksim Pechnikov
ab2f21e470
tests for mastodon_api_controller.ex
2019-09-06 21:50:00 +03:00
Alex S
b3f6f6a409
generating remote users
2019-09-06 20:14:02 +03:00
Alex S
252e5db45c
docs fixes
2019-09-06 16:37:18 +03:00
Maksim Pechnikov
eb74c3d5c7
Merge branch 'develop' into issue/1218
2019-09-06 14:01:07 +03:00
Ivan Tashkinov
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
2019-09-06 13:26:05 +03:00
Egor Kislitsyn
40b3289c26
Refactor add_link_headers/7 -> add_link_headers/3
2019-09-06 17:08:47 +07:00
rinpatch
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
2019-09-06 08:43:38 +00:00
rinpatch
3523bdcf26
Call TrailingFormatPlug for /api/pleroma/emoji
...
Apparently Pleroma-FE still calls it with trailing '.json'
2019-09-05 22:21:20 +03:00
Maxim Filippov
736165c082
Reverse reports list
2019-09-05 16:54:34 +03:00
Alex S
a1125bd564
generatoin and fetching
2019-09-05 16:02:20 +03:00
Alex S
79dde58044
one more temp commit
2019-09-05 16:02:20 +03:00
Alex S
db690bede9
temp commit
2019-09-05 16:02:20 +03:00
Haelwenn
fe7cf44c40
Merge branch 'feature/mastoapi-accounts-external' into 'develop'
...
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622
2019-09-05 12:48:27 +00:00
rinpatch
26fe6f70c9
Move checking for restrict_local to User.get_cached_by_id_or_nickname
2019-09-05 15:39:10 +03:00
rinpatch
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
2019-09-05 12:03:39 +03:00
Ivan Tashkinov
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-09-05 11:30:41 +03:00
rinpatch
3e30f6e198
Merge branch 'fix/safe-render-notifications' into 'develop'
...
Do not crash if one notification failed to render
See merge request pleroma/pleroma!1630
2019-09-05 05:47:06 +00:00
rinpatch
558969a0fd
Do not crash if one notification failed to render
2019-09-05 08:32:49 +03:00
Maksim Pechnikov
ae506ca997
fix formatting
2019-09-04 21:40:53 +03:00
Maksim
e2011a667c
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
2019-09-04 18:35:01 +00:00
Maksim
8306078de1
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
2019-09-04 17:31:14 +00:00
lain
99ea990a16
PleromaAPIController: Add emoji reactions.
2019-09-04 12:20:35 -05:00
Maxim Filippov
af746fa4a8
Return total for reports
2019-09-04 20:08:13 +03:00
Maxim Filippov
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
2019-09-04 19:40:07 +03:00
Sadposter
cb99cfcc65
don't try to truncate non-strings
2019-09-04 15:57:42 +01:00
Sadposter
2975da284b
truncate remote user bio/display name
2019-09-04 15:45:40 +01:00
Maksim Pechnikov
a890451187
fetch_announcements -> take_announcements
2019-09-04 17:42:27 +03:00
Maksim Pechnikov
8cbad5500c
add tests for activity_pub/utils.ex
2019-09-04 15:25:12 +03:00
rinpatch
3face45467
Mastodon API: Add pleroma.thread_muted to Status entity
...
Needed for pleroma-fe!941
2019-09-04 14:17:23 +03:00
rinpatch
7c3838090f
Apply suggestion to lib/pleroma/notification.ex
2019-09-04 10:14:15 +00:00
rinpatch
c2b6c1b089
Extend /api/pleroma/notifications/read to mark multiple notifications
...
as read and make it respond with Mastoapi entities
2019-09-04 12:38:27 +03:00
lain
9bc12b88b3
ActivityPub: Save emoji reactions in object.
2019-09-03 16:50:04 -05:00
rinpatch
cc1d1ee406
Mastdon API: Add ability to get a remote account by nickname to
...
`/api/v1/accounts/:id`
2019-09-03 19:26:10 +03:00
Ivan Tashkinov
eb17cc17a1
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# CHANGELOG.md
2019-09-03 17:12:15 +03:00
Maxim Filippov
b15cfd80ef
Return "total" optionally
2019-09-03 13:58:27 +03:00
Maxim Filippov
a4c5f71e93
Return total from pagination + tests
2019-09-02 22:48:52 +03:00
Ivan Tashkinov
b49085c156
[ #1149 ] Refactoring: GenServer workers renamed to daemons, use Oban.Worker moved to helper.
2019-09-02 14:57:40 +03:00
Sadposter
d0f07e55d2
use atom key for fields
2019-09-02 12:31:23 +01:00
Sadposter
05c935c396
mix format
2019-09-02 12:15:40 +01:00
Sadposter
35ef470d00
truncate fields for remote users instead
2019-09-02 12:15:21 +01:00
Maxim Filippov
9c96b17e16
Add pagination to logs
2019-09-01 21:23:30 +03:00
Ivan Tashkinov
dd017c65a4
[ #1149 ] Refactored Oban workers API (introduced enqueue/3).
2019-08-31 21:58:42 +03:00
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
2019-08-31 14:25:43 +03:00
rinpatch
70eed0594c
credo fixes
2019-08-31 13:08:43 +03:00
rinpatch
bd3ed3a622
Add back /api/qvitter/statuses/notifications/read.json
2019-08-31 11:43:06 +03:00
rinpatch
64410497d2
Remove TwitterAPI representers
2019-08-31 10:41:15 +03:00
rinpatch
985122cc03
Remove Activity, User and Notification views from TwitterAPI
2019-08-31 10:31:15 +03:00
rinpatch
90c2dae9a4
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
2019-08-31 10:20:34 +03:00
Maksim Pechnikov
6ef0103ca0
added Emoji struct
2019-08-31 10:14:53 +03:00
Maxim Filippov
4d6e22bb9b
Style
2019-08-31 01:09:48 +03:00
Maxim Filippov
f182f0f6bd
Add ability to search moderation logs
2019-08-31 00:57:15 +03:00
Maksim Pechnikov
d8098d142a
added Emoji.Formatter
2019-08-30 22:04:17 +03:00
Maksim
5c90b70733
Apply suggestion to lib/pleroma/emoji/loader.ex
2019-08-30 07:30:54 +03:00
Maksim Pechnikov
d7808b5db4
added code\path fields without html tags in ets
2019-08-30 07:30:54 +03:00
Maksim Pechnikov
cef2e980b1
division emoji.ex on loader.ex and emoji.ex
2019-08-30 07:30:54 +03:00
feld
7853b3f17d
Fix AntiFollowbotPolicy when trying to follow a relay
2019-08-30 00:38:03 +00:00
Haelwenn
d9d7765383
Merge branch 'fix-osada-follow' into 'develop'
...
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
2019-08-28 07:10:35 +00:00
lain
b770ed1d99
CommonAPI: Support emoji reactions.
2019-08-27 17:56:28 -05:00
lain
f017260cdc
Merge remote-tracking branch 'origin/develop' into reactions
2019-08-27 16:38:51 -05:00
lain
66519f2100
Merge branch 'list-controller' into 'develop'
...
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
2019-08-27 21:15:54 +00:00
Maxim Filippov
5e4fde1d3d
Filter logs by date
2019-08-27 20:48:16 +03:00
Maksim
ffcd742aa0
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
2019-08-27 17:37:19 +00:00
lain
c30cc039e4
Transmogrifier: Use Containment.get_actor to get actors.
2019-08-27 12:22:30 -05:00
Maksim Pechnikov
00abe099cd
added tests for ActivityPub.like\unlike
2019-08-27 16:21:03 +03:00
Ivan Tashkinov
cd78e63a25
[ #1149 ] Bugfix: Pleroma.Workers.Subscriber / "verify_websub" works with WebsubServerSubscription.
2019-08-27 14:34:37 +03:00
rinpatch
eb1739c596
Remove most of TwitterAPIController
2019-08-27 12:29:19 +03:00
lain
a0b21c8928
Transmogrifier: Handle incoming emoji reactions.
2019-08-26 16:47:31 -05:00
lain
6e1ec4c5da
ActivityPub: Basic EmojiReactions.
2019-08-26 16:29:51 -05:00
lain
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
2019-08-26 14:34:52 -05:00
Egor Kislitsyn
4194abbc8f
Move mastodon_api/*_controller.ex to mastodon_api/controllers/
2019-08-26 19:37:57 +07:00
Egor Kislitsyn
30510ade0e
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
2019-08-26 19:37:54 +07:00
Egor Kislitsyn
4d82bc8b0b
Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
2019-08-26 19:16:40 +07:00
Egor Kislitsyn
3b1b631c2a
Add validation in Pleroma.List.create/2
2019-08-26 18:59:57 +07:00
kPherox
8ca4f145a5
Extract if block into private function
2019-08-26 17:09:32 +09:00
kaniini
6dc24422dc
Merge branch 'issue/1177' into 'develop'
...
[#1177 ] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
2019-08-25 19:43:27 +00:00
Maxim Filippov
37dd3867bb
Log admin/moderator actions
2019-08-25 19:39:37 +00:00
kaniini
503139b343
Merge branch 'fix-all-custom-fields-deleted' into 'develop'
...
Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596
2019-08-25 19:35:28 +00:00
kPherox
b15e226593
Change to delete empty name field
2019-08-25 07:34:15 +09:00
kPherox
705b5adfc4
Fix type of fields_attributes
...
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
2019-08-25 07:34:14 +09:00
kPherox
45e21a9df4
Rename fields to fields_attributes
2019-08-25 07:34:11 +09:00
kPherox
3549cd9754
Change to use attachment only when fields do not exist
2019-08-25 01:28:38 +09:00
lain
90986667ce
Merge branch 'admin-create-users' into 'develop'
...
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
2019-08-24 16:04:19 +00:00
lain
efb8818e9e
Activity Expiration: Switch to 'expires_in' system.
2019-08-24 17:22:48 +02:00
lain
1692fa8945
ActivityExpirationWorker: Fix merge issues.
2019-08-24 17:22:26 +02:00
Maksim Pechnikov
654d291b6d
update tests
2019-08-24 17:41:53 +03:00
Maksim Pechnikov
6062017493
put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
2019-08-24 17:17:17 +03:00
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
2019-08-24 15:48:33 +02:00
Ivan Tashkinov
581123f8bb
[ #1149 ] Introduced quantum job scheduler. Documentation & config changes.
2019-08-23 18:28:23 +03:00
Ivan Tashkinov
c056736daa
[ #1149 ] Publisher worker fix (atomized params keys).
2019-08-23 16:11:39 +03:00
Ivan Tashkinov
c29686309e
[ #1149 ] Upgraded oban from 0.6.0 to 0.7.1.
2019-08-23 09:23:10 +03:00
Maksim Pechnikov
8dc6a6b210
fix /inbox for Relay
2019-08-22 22:48:07 +03:00
Maksim Pechnikov
399ca9133b
fix test
2019-08-22 21:54:37 +03:00
Maksim Pechnikov
f95b67c933
Merge branch 'develop' into issue/1177
2019-08-22 21:13:03 +03:00
Ivan Tashkinov
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-22 21:01:28 +03:00
Ivan Tashkinov
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
2019-08-22 20:59:58 +03:00
Egor Kislitsyn
a79ebac592
Improve AP routes rate limit
2019-08-22 16:03:43 +07:00
Maksim Pechnikov
64bfb41c55
fixed unfollow for relay actor
2019-08-22 06:57:55 +03:00
Sachin Joshi
37229af15f
remove old user create and delete routes for admin
2019-08-22 00:15:00 +05:45
lain
f740d786a3
Merge branch 'rate-limit-ap-routes' into 'develop'
...
[#1174 ] Rate limit AP routes
See merge request pleroma/pleroma!1586
2019-08-21 16:45:20 +00:00
lain
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
2019-08-20 19:34:47 +00:00
Egor Kislitsyn
8d899d6197
Add :ap_routes rate limit
2019-08-20 22:10:36 +07:00
lain
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
2019-08-20 12:55:51 +00:00
lain
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
2019-08-20 12:44:14 +00:00
Maxim Filippov
5171aa5b4d
Refactor check_actor_is_active
2019-08-19 20:36:25 +03:00
lain
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
2019-08-19 17:00:59 +00:00
Sergey Suprunenko
75a5dd41ee
Add more tests for Database tasks and DigestEmailWorker
2019-08-19 16:10:00 +00:00
lain
49ae3191df
Merge branch 'hotfix/user_unfollow' into 'develop'
...
[#1177 ] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
2019-08-19 14:36:10 +00:00
Maksim Pechnikov
e652cef76b
removes duplicates from relay subscription list
2019-08-19 13:39:18 +03:00
kaniini
475fcb3e6c
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
...
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
2019-08-18 21:59:22 +00:00
kaniini
18c8c8d176
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
...
Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575
2019-08-18 21:57:55 +00:00
Sadposter
94e336d9d5
clear follow requests when blocking a user
2019-08-18 20:30:57 +01:00
Mark Felder
ef82f868d9
Formatting
2019-08-16 10:00:18 -05:00
Maksim Pechnikov
3315a2a1c3
fixed User.unfollow with synchronization external user
2019-08-16 15:58:42 +03:00
lain
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
2019-08-16 12:55:33 +00:00
Egor Kislitsyn
158231cd20
Add configurable colors and logo for the digest template
2019-08-16 18:32:25 +07:00
Mark Felder
6a3b1a526e
max_body_size -> max_body_length, as it should be
2019-08-15 15:34:41 -05:00
rinpatch
fba3c16d20
Fix OAuth cleanup worker unconditionally starting
...
!1576 removed enabled/disabled check from the worker, in favor of just
not starting it in application.ex if disabled. However a line
unconditionally starting the worker was removed
2019-08-15 20:36:20 +03:00
kaniini
1c8f58a30e
Merge branch 'features/formatting-sub_sup' into 'develop'
...
html.ex: Allow sub and sup elements by default
Closes #1191
See merge request pleroma/pleroma!1572
2019-08-15 17:34:16 +00:00
rinpatch
1ad71592ad
Parallelize template rendering
2019-08-15 18:05:50 +03:00
rinpatch
a4a3e3becd
Hide muted theads from home/public timelines unless with_muted is set
2019-08-15 17:37:30 +03:00
lain
9fb71ce7f4
Merge branch 'cache-follow-state' into 'develop'
...
Cache follow state
Closes #1180
See merge request pleroma/pleroma!1573
2019-08-15 14:06:27 +00:00
Maxim Filippov
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
2019-08-14 22:45:32 +00:00
Maxim Filippov
2b94ae3b39
Do not check if actor is active when deleting a user
2019-08-15 01:35:29 +03:00
rinpatch
e8a8d50138
Collect stats immediately after init
2019-08-15 01:01:13 +03:00
rinpatch
bd5ad0af78
Cache follow state
2019-08-15 00:47:30 +03:00
rinpatch
a9e75fa6a4
Add a task to benchmark timeline rendering
2019-08-15 00:43:02 +03:00
Haelwenn (lanodan) Monnier
a6a814420d
html.ex: Allow sub and sup elements by default
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1191
2019-08-14 22:49:13 +02:00
rinpatch
31d576de0c
Merge branch 'misc-otp-issues' into 'develop'
...
Misc OTP issues
See merge request pleroma/pleroma!1567
2019-08-14 19:22:15 +00:00
rinpatch
dc902ad3df
Merge branch 'fix/http-signatures-post' into 'develop'
...
activitypub: publisher: add (request-target) to http signature when POSTing
See merge request pleroma/pleroma!1569
2019-08-14 19:16:52 +00:00
kaniini
1754f8ce6d
Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex
2019-08-14 19:05:44 +00:00
Ariadne Conill
5bb418a90d
activitypub: publisher: add (request-target) to http signature when POSTing
2019-08-14 19:01:51 +00:00
Ariadne Conill
626e094589
MRF: fix up unserializable option lists in describe implementations
2019-08-14 18:54:17 +00:00
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
Ivan Tashkinov
a180c1360e
[ #1149 ] Oban mailer job. Adjusted tests.
2019-08-14 21:42:21 +03:00
stwf
c43152f6c1
fix formatting
2019-08-14 14:01:11 -04:00
stwf
d81f63845a
Implement Pleroma.Stats as GenServer
2019-08-14 11:59:33 -04:00
stwf
574856ef01
streamline Streamer pings
2019-08-14 11:58:32 -04:00
stwf
15ef521009
Isolate OAuth.Token.CleanWorker
2019-08-14 11:57:50 -04:00
stwf
51bdf0cab6
use default child_specs
2019-08-14 11:55:17 -04:00
lain
d3af9e19ed
Conversations: Load relations in one query.
2019-08-14 17:01:11 +02:00
Egor Kislitsyn
c9970feee2
Fix compatibility with Elixir 1.8
2019-08-14 21:03:25 +07:00
lain
f73212b2a3
Conversation: Render new participation on update.
2019-08-14 15:56:15 +02:00
lain
df81abb68c
Conversations: Use correct oauth paths for extended api.
2019-08-14 15:55:43 +02:00
Egor Kislitsyn
4b7f1c6995
Improve digest email template
2019-08-14 20:46:05 +07:00
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-14 15:30:40 +02:00
Egor Kislitsyn
672fcbc7b7
Limit custom fields for old remote users
2019-08-14 14:58:06 +07:00
Egor Kislitsyn
e457fcc479
Add :max_remote_account_fields config option
2019-08-14 14:58:06 +07:00
Egor Kislitsyn
f7bbf99caa
Use info.fields instead of source_data for remote users
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
2c35d4b0b0
Add configurable account field name length limit
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
db3c05f6b4
Add configurable account field value length limit
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
7d6f8a7fd7
Linkify custom fields values in ActivityPub.UserViewx
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
5178f960c3
Support user attachment update in Transmogrifier
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
88598c9baf
Add profile custom fields to ActivityPub.UserView
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
a22f540fc4
Add custom fields to TwitterAPI.UserView
2019-08-14 14:52:54 +07:00
Egor Kislitsyn
e0ac5c7a66
Add custom profile fields
2019-08-14 14:52:54 +07:00
kaniini
5c35d2f1d8
Merge branch 'preload-user-timelines' into 'develop'
...
Preload thread mutes/bookmarks in user_statuses
See merge request pleroma/pleroma!1563
2019-08-14 01:04:07 +00:00
kaniini
fe42844bda
Merge branch 'get-context-optimizations' into 'develop'
...
Preload thread mutes/bookmarks in get_context
See merge request pleroma/pleroma!1562
2019-08-14 01:03:54 +00:00
rinpatch
8202f1634a
Preload thread mutes/bookmarks in user_statuses
2019-08-14 03:02:09 +03:00
rinpatch
f4e087ee48
Preload thread mutes/bookmarks in get_context
...
Also removes filtering for creates (was done on the database side
already) and filtering for the requested activity (moved to the database
side) from application side.
2019-08-14 02:36:54 +03:00
rinpatch
9ef31767f2
Merge branch 'feature/mrf-vocabulary' into 'develop'
...
MRF Vocabulary
See merge request pleroma/pleroma!1559
2019-08-13 22:51:15 +00:00
kaniini
c3a54cc34d
Merge branch 'feature/mrf-describe' into 'develop'
...
MRF describe API
See merge request pleroma/pleroma!1561
2019-08-13 22:46:19 +00:00
rinpatch
83a3de8cc4
Merge branch 'length-limit-bio' into 'develop'
...
Add configurable length limits for `User.bio` and `User.name`
See merge request pleroma/pleroma!1515
2019-08-13 22:40:13 +00:00
Ariadne Conill
abfbcfdcb3
mrf_vocabulary: add describe API support
2019-08-13 22:39:26 +00:00
Ariadne Conill
4244e17de0
fix credo
2019-08-13 22:36:24 +00:00
Haelwenn
47c20ab796
Merge branch 'fix/mastoapi-more-object-preloads' into 'develop'
...
Mastodon API: Preloading and normalization optimizations
See merge request pleroma/pleroma!1558
2019-08-13 22:32:49 +00:00
rinpatch
46d7bef7e7
Nicer formatting for safe_render errors
2019-08-14 01:15:18 +03:00
Ariadne Conill
f305e97eeb
nodeinfo: use MRF.describe() instead of hardcoded MRF transparency stuff
2019-08-13 22:09:02 +00:00
Ariadne Conill
c574b7a1fc
MRF: add describe() to all modules, add base MRF configuration to base describe()
2019-08-13 22:08:58 +00:00
Ariadne Conill
694bc43123
MRF: add describe() for gathering and describing the MRF configuration
2019-08-13 21:26:24 +00:00
Maksim
fea4d89e9f
tests for Web/ActivityPub/Relay
2019-08-13 21:12:59 +00:00
Maksim
04da1166db
tests for /web/mastodon_api/mastodon_api.ex
2019-08-13 21:12:37 +00:00
Ariadne Conill
3fdbeb7087
MRF: add vocabulary policy module
2019-08-13 20:55:38 +00:00
rinpatch
c1b6952d2a
Mastodon API: Preloading and normalization optimizations
...
- Try to normalize the activity instead of object wherever possible
- Put the `user` key on non-home timelines as well so bookmarks and
thread mutes are preloaded there as well
- Skip trying to get the user when rendering mentions if the id ==
as:Public or user's follower collection
- Preload the object when getting replied to activities and do not crash
if it's not present
This almost solves the problem of Pleroma hammering the db with a lot
of queries when rendering timelines, the things left are
1. When rendering mentions and the user is not in cache, save it for
later and request all uncached users in one go
2. Somehow get rid of needing to get the latest follow activity to
detect the value of `requested` in a relationship. (create a database
view for user relationship and cache it maybe?)
2019-08-13 20:34:34 +03:00
Ivan Tashkinov
0e1c481a94
[ #1149 ] Added more oban workers. Refactoring.
2019-08-13 20:20:26 +03:00
Ariadne Conill
f46cd7e9c7
config: remove legacy activitypub accept_blocks setting
...
Anyone who is interested in dropping blocks can write their own MRF
policy at this point. This setting predated the MRF framework.
Disabling the side effect (unsubscription) is still a config option
per policy.
2019-08-13 02:15:21 +00:00
lain
511ccea5aa
ConversationView: Align parameter names with other views.
2019-08-12 14:23:06 +02:00
lain
60231ec7bd
Conversation: Add endpoint to get a conversation by id.
2019-08-12 13:58:04 +02:00
lain
23c46f7e72
Conversations: Use 'recipients' for accounts in conversation view.
...
According to gargron, this is the intended usage.
2019-08-12 12:51:08 +02:00
rinpatch
92479c6f48
Do not fetch the reply object in fix_type unless the object has the
...
`name` key and use a depth limit when fetching it
2019-08-11 22:49:55 +03:00
Ariadne Conill
9cfc289594
MRF: ensure that subdomain_match calls are case-insensitive
2019-08-10 21:19:26 +00:00
kaniini
84808e1697
Merge branch 'develop' into 'fix/hide-follows-counters'
...
# Conflicts:
# CHANGELOG.md
2019-08-10 18:49:04 +00:00
Sergey Suprunenko
af4cf35e20
Strip internal fields including likes from incoming and outgoing activities
2019-08-10 18:47:40 +00:00
Maksim
11d08c2de0
tests for Pleroma.Uploaders
2019-08-10 18:46:26 +00:00
Ivan Tashkinov
33a5fc4a70
[ #1149 ] Fixed failing tests. Ensured Instance.set_unreachable/2 supports ISO 8601 datetime.
2019-08-10 20:38:31 +03:00
rinpatch
0802a08871
Mastodon API: Fix thread mute detection
...
It was calling CommonAPI.thread_muted? with post author's account
instead of viewer's one.
2019-08-10 16:27:46 +03:00
Maksim
bb9c539580
Uploader.S3 added support stream uploads
2019-08-10 11:27:59 +00:00
Maxim Filippov
dfae61c25c
Fix deactivated user deletion
2019-08-09 23:05:28 +03:00
Ivan Tashkinov
267262491e
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-09 20:09:56 +03:00
Ivan Tashkinov
b7fad8d395
[ #1149 ] Oban jobs implementation for :federator_incoming and :federator_outgoing queues.
2019-08-09 20:08:01 +03:00
rinpatch
409bcad54b
Mastodon API: Set follower/following counters to 0 when hiding
...
followers/following is enabled
We are already doing that in AP representation, so I think we should do
it here as well for consistency.
2019-08-09 16:53:55 +03:00
lain
29807ef6a5
Merge branch 'feature/digest-email' into 'develop'
...
Feature/digest email
See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
lain
a2b98f6d58
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
2019-08-08 16:04:20 +02:00
Thibaut Girka
9c0da1009a
Return profile URL in MastodonAPI's url field
2019-08-07 21:40:53 +00:00
Thibaut Girka
089d53a961
Simplify logic to mention.js url field
...
`User.profile_url` already fallbacks to ap_id
2019-08-07 20:55:37 +00:00
Thibaut Girka
a10c840aba
Return profile URL when available instead of actor URI for MastodonAPI mention URL
...
Fixes #1165
2019-08-07 20:29:30 +00:00
Haelwenn
aa718ab8f6
Merge branch 'fix/object-reembeds' into 'develop'
...
Do not rembed the object after updating it
Closes #1142
See merge request pleroma/pleroma!1538
2019-08-06 22:14:00 +00:00
rinpatch
4f1b9c54b9
Do not rembed the object after updating it
2019-08-07 01:02:29 +03:00
rinpatch
03ad31328c
OStatus Announce Representer: Do not depend on the object being embedded
...
in the Create activity
2019-08-07 00:23:58 +03:00
rinpatch
73d8d5c49f
Stop depending on the embedded object in restrict_favorited_by
2019-08-07 00:12:42 +03:00
Maksim
139b196bc0
[ #1150 ] fixed parser TwitterCard
2019-08-06 20:19:28 +00:00
lain
e4a01d253e
Conversation: Rename function to better express what it does.
2019-08-06 15:06:19 +02:00
lain
a49c92f6ae
Participation: Setting recipients will always add the owner.
2019-08-06 14:51:17 +02:00
Maksim
bdc9a7222c
tests for CommonApi/Utils
2019-08-05 15:37:05 +00:00
lain
d6fe220e32
Linting.
2019-08-05 16:11:23 +02:00
lain
b64b6fee2a
CommonAPI: Replies to conversations also get the correct context id.
2019-08-05 15:33:22 +02:00
lain
3af6d14da7
Pleroma Conversations API: Add a way to set recipients.
2019-08-05 15:09:19 +02:00
Eugenij
96028cd585
Remove Reply-To from report emails
2019-08-04 22:24:50 +00:00
kaniini
f7fc902c29
Merge branch 'feature/relay-list-task' into 'develop'
...
tasks: relay: add list task
Closes #1101
See merge request pleroma/pleroma!1528
2019-08-04 17:14:37 +00:00
Sergey Suprunenko
e8ad116c2a
Do not add the "next" key to likes.json if there is no more items
2019-08-04 17:13:06 +00:00
Ariadne Conill
cef3af5536
tasks: relay: add list task
2019-08-03 23:17:17 +00:00
Haelwenn (lanodan) Monnier
a035ab8c1d
templates/layout/app.html.eex: Style anchors
...
[ci skip]
2019-08-03 23:18:22 +02:00
kaniini
86fffe9c27
Merge branch 'patch-2' into 'develop'
...
Add preferredUsername to service actors so Mastodon can resolve them
See merge request pleroma/pleroma!1526
2019-08-03 18:55:09 +00:00
Thibaut Girka
1fce56c7df
Refactor
2019-08-03 18:37:20 +00:00
Thibaut Girka
16cfb89240
Only add preferredUsername to service actor json when the underlying user actually has a username
2019-08-03 18:28:08 +00:00
Alexander Strizhakov
de0f3b73dd
Admin fixes
2019-08-03 18:16:09 +00:00
Sergey Suprunenko
040347b248
Remove spaces from the domain search
2019-08-03 18:13:20 +00:00
Sergey Suprunenko
8b2fa31fed
Handle MRF rejections of incoming AP activities
2019-08-03 18:12:38 +00:00
Thibaut Girka
a187dbb326
Add preferredUsername to service actors so Mastodon can resolve them
2019-08-03 17:24:57 +00:00
Haelwenn (lanodan) Monnier
8815f07058
tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1155
[ci skip]
2019-08-02 23:38:02 +02:00
lain
eee98aaa73
Pleroma API: Add endpoint to get conversation statuses.
2019-08-02 19:53:08 +02:00
feld
d93d777915
Fix/mediaproxy whitelist base url
2019-08-02 17:07:09 +00:00
Roman Chvanikov
9d4f34fbcb
Merge branch 'develop' into feature/digest-email
2019-08-02 18:16:04 +03:00
lain
56b1c3af13
CommonAPI: Extend api with conversation replies.
2019-08-02 15:05:27 +02:00
lain
5ff8f07ca9
Merge branch 'feature/hide-follows-remote' into 'develop'
...
Refactor Follows/Followers counter syncronization and set hide_followers/hide_follows for remote users
See merge request pleroma/pleroma!1411
2019-08-02 11:23:07 +00:00
lain
f88560accd
Conversations: Add recipient list to conversation participation.
...
This enables to address the same group of people every time.
2019-08-02 11:55:41 +02:00
Ivan Tashkinov
23d279e03e
[ #1149 ] Replaced RetryQueue with oban-based retries.
2019-08-01 17:28:00 +03:00
Egor Kislitsyn
9ca4506355
Add configurable length limits for User.bio and User.name
2019-08-01 15:53:37 +07:00
kaniini
6c06529cd4
Merge branch 'fix/disallow-ostatus-follows-locked' into 'develop'
...
Disallow following locked accounts over OStatus
See merge request pleroma/pleroma!1512
2019-07-31 19:13:56 +00:00
rinpatch
813c686dd7
Disallow following locked accounts over OStatus
2019-07-31 22:05:12 +03:00
Maksim
6eb33e7303
test for Pleroma.Web.CommonAPI.Utils.get_by_id_or_ap_id
2019-07-31 18:35:15 +00:00
Ariadne Conill
f72e0b7cad
ostatus: explicitly disallow protocol downgrade from activitypub
...
This closes embargoed bug #1135 .
2019-07-31 18:17:31 +00:00
rinpatch
301ea0dc04
Add tests for counters being updated on follow
2019-07-31 21:09:13 +03:00
Maksim
58443d0cd6
tests for TwitterApi/UtilController
2019-07-31 15:14:36 +00:00
lain
7483679a7b
StatusView: Return direct conversation id.
2019-07-31 15:12:29 +02:00
rinpatch
f42719506c
Fix credo issues
2019-07-31 14:20:34 +03:00
rinpatch
c88a5d3251
Merge branch 'develop' into feature/hide-follows-remote
2019-07-31 14:12:29 +03:00
Alexander Strizhakov
51b3b6d816
Admin changes
2019-07-30 16:36:05 +00:00
Ariadne Conill
3850812503
twitter api: utils: rework do_remote_follow() to use CommonAPI
...
Closes #1138
2019-07-29 20:00:57 +00:00
kaniini
5835069215
Revert "Merge branch 'bugfix/clean-up-markdown-rendering' into 'develop'"
...
This reverts merge request !1504
2019-07-29 19:42:26 +00:00
Ariadne Conill
5795a890e9
markdown: clean up html generated by earmark
2019-07-29 19:09:58 +00:00
lain
1dfde4151c
Merge branch 'refactor/use-constants' into 'develop'
...
refactoring: begin to use constants
See merge request pleroma/pleroma!1500
2019-07-29 16:30:47 +00:00
Eugenij
0bee2131ce
Add mailerEnabled to the NodeInfo metadata
2019-07-29 16:17:40 +00:00
Sergey Suprunenko
c0e258cf21
Redirect not logged-in users to the MastoFE login page on private instances
2019-07-29 16:17:22 +00:00
Maksim
159bbec570
added tests for OstatusController
2019-07-29 05:02:20 +00:00
Ariadne Conill
b93498eb52
constants: add as_public constant and use it everywhere
2019-07-29 02:43:19 +00:00
Ariadne Conill
492d854e7a
transmogrifier: use User.delete() instead of handrolled user deletion code for remote users
...
Closes #1104
2019-07-28 21:32:04 +00:00
Sachin Joshi
242f5c585e
add account confirmation email resend in mastodon api
2019-07-28 20:30:10 +00:00
Maksim
6a4b8b2681
fixed User.update_and_set_cache for stale user
2019-07-28 20:29:26 +00:00
kaniini
488c06b6f5
Merge branch 'develop' into 'develop'
...
Fix HTTP sig tweak on KeyId
See merge request pleroma/pleroma!1496
2019-07-28 20:25:35 +00:00
Sergey Suprunenko
02dc651828
Handle 303 redirects
2019-07-28 20:24:39 +00:00
Thomas Sileo
961e778531
Fix HTTP sig tweak on KeyId
2019-07-28 14:17:56 +02:00
Maksim
6b77a88365
[ #1097 ] added redirect: /pleroma/admin -> /pleroma/admin/
2019-07-26 20:27:38 +00:00
rinpatch
41e0304757
Merge branch 'develop' into feature/hide-follows-remote
2019-07-25 18:43:30 +03:00
kaniini
19835be067
Merge branch 'fix-remote-follow-from-ostatus-subscribe' into 'develop'
...
Fix remote follow from /ostatus_subscribe
Closes #1103
See merge request pleroma/pleroma!1472
2019-07-24 19:29:01 +00:00
Sergey Suprunenko
b20020da16
Show the url advertised in the Activity in the Status JSON response
2019-07-24 19:28:21 +00:00
feld
84fca14c3c
Do not prepend /media/ when using base_url
...
This ensures admin has full control over the path where media resides.
2019-07-24 15:35:25 +00:00
kPherox
ac27b94ffa
Change to not require magic-public-key on WebFinger
2019-07-25 00:21:32 +09:00
Maksim
55341ac717
tests WebFinger
2019-07-24 15:13:10 +00:00
Eugenij
4504135894
Add domain_blocking to the relationship API (GET /api/v1/accounts/relationships)
2019-07-24 15:12:27 +00:00
Mike Verdone
2c83eb0b15
Revert "squash! Expose expires_at datetime in mastoAPI only for the activity actor"
...
This reverts commit 2981821db8
2019-07-24 17:09:59 +02:00
Mike Verdone
2981821db8
squash! Expose expires_at datetime in mastoAPI only for the activity actor
...
NOTE: rewrite the commit msg
2019-07-24 16:51:09 +02:00
Roman Chvanikov
d2da3d30f3
Merge branch 'develop' into feature/digest-email
2019-07-24 16:37:52 +03:00
Mike Verdone
3cb471ec06
Expose expires_at datetime in mastoAPI only for the activity actor
...
In the "pleroma" section of the MastoAPI for status activities you can
see an expires_at item that states when the activity will expire, or
nothing if the activity will not expire.
The expires_at date is only visible to the person who posted the
activity. This is the conservative approach in case some attacker
decides to write a logger for expiring posts. However, in the future of
OCAP, signed requests, and all that stuff, this attack might not be that
likely. Some other pleroma dev should remove the restriction in the code
at that time, if they're satisfied with the security implications of
doing so.
2019-07-24 14:47:22 +02:00
Mike Verdone
36012ef6c1
Require that ephemeral posts live for at least one hour
...
If we didn't put some kind of lifetime requirement on these, I guess you
could annoy people by sending large numbers of ephemeral posts that
provoke notifications but then disappear before anyone can read them.
2019-07-24 14:46:08 +02:00
Mike Verdone
704960b3c1
Add support for activity expiration to common and Masto API
...
The "expires_at" parameter accepts an ISO8601-formatted date which
defines when the activity will expire.
At this point the API will not give you any feedback about if your post
will expire or not.
2019-07-24 14:45:14 +02:00
Mike Verdone
378f5f0fbe
Add activity expiration worker
...
This is a worker that runs every minute and deletes expired activities.
It's based heavily on the scheduled activities worker.
2019-07-24 13:14:52 +02:00
Mike Verdone
666514194a
Add activity expirations table
...
Add a table to store activity expirations. An activity can have zero or
one expirations. The expiration has a scheduled_at field which stores
the time at which the activity should expire and be deleted.
2019-07-24 13:14:52 +02:00
sadposter
f5d574f4ed
check both item and parent domain blocks
2019-07-24 11:35:16 +01:00
Sadposter
48bd3be9cb
move domain block check to with block
2019-07-24 11:11:33 +01:00
Sadposter
4af4f6166b
honour domain blocks on streaming notifications
2019-07-24 11:09:06 +01:00
kaniini
9c6357324e
Merge branch 'feature/admin-api-user-statuses' into 'develop'
...
Admin API: Endpoint for fetching latest user's statuses
See merge request pleroma/pleroma!1413
2019-07-23 23:59:21 +00:00
Ariadne Conill
d3bdb8e704
rich media: parser: splice the given URL into the result
2019-07-23 23:51:29 +00:00
Maxim Filippov
f46805bb40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-24 02:42:28 +03:00
Maxim Filippov
03471151d6
AdminAPI: Add "godmode" while fetching user statuses (i.e. admin can see private statuses)
2019-07-24 01:51:36 +03:00
kaniini
bd265acf91
Merge branch 'chore/adminapi-deprecated-endpoints' into 'develop'
...
Router: Remove deprecated AdminAPI endpoints
See merge request pleroma/pleroma!1466
2019-07-23 19:48:34 +00:00
Haelwenn (lanodan) Monnier
90be91b0e0
Router: Remove deprecated AdminAPI endpoints
2019-07-23 21:35:25 +02:00
Alexander Strizhakov
5e72554f3c
Admin config fix
2019-07-23 19:17:00 +00:00
Maksim
c49a09ed88
tests for Pleroma.Web.ActivityPub.Publisher
2019-07-23 19:15:48 +00:00
kaniini
8d3cf7e519
Merge branch 'bugfix/unauthed-liked-by' into 'develop'
...
Bugfix: don't error out on unauthorized request to liked/favourited_by
See merge request pleroma/pleroma!1474
2019-07-23 19:14:43 +00:00
kaniini
03d89e182e
Merge branch 'fix/subscriber-notifications' into 'develop'
...
Do not notify subscribers for messages from users which are replies to others
See merge request pleroma/pleroma!1477
2019-07-23 19:13:55 +00:00
Mark Felder
6a79bb12c3
Fix function
2019-07-23 13:53:05 -05:00
Sadposter
54a161cb7a
move unauth'd user blocks?/2 check
2019-07-23 19:44:47 +01:00
Mark Felder
fd287387a0
Do not notify subscribers for messages from users which are replies to others
2019-07-23 13:14:26 -05:00
Ariadne Conill
e7c64f106e
signature: properly deduce the actor from misskey key IDs
2019-07-23 16:47:22 +00:00
Sadposter
452980652d
Mix format
2019-07-23 15:13:05 +01:00
Sadposter
eacf61d823
fix unauthenticated req to favourited/rebloggd_by
2019-07-23 15:08:33 +01:00
kPherox
e818381042
Use User.get_or_fetch/1 instead of OStatus.find_or_make_user/1
2019-07-23 19:47:27 +09:00
Alexander Strizhakov
b70e659304
Feature/1087 wildcard option for blocks
2019-07-22 14:33:58 +00:00
Haelwenn
674ad5e1df
Merge branch 'hardening/stop-misusing-sharedinbox' into 'develop'
...
activitypub: publisher: align sharedinbox usage with AP specification rules
See merge request pleroma/pleroma!1464
2019-07-22 11:01:35 +00:00
Sadposter
f712ee879a
Bugfix: muted/blocked user notification streaming
2019-07-22 02:43:55 +00:00
Sergey Suprunenko
05b5af8075
Add tests for users tasks and PleromaAuthenticator
2019-07-22 02:43:15 +00:00
Sadposter
a5d6287ba8
Hide blocked users from interactions
2019-07-22 02:42:29 +00:00
Ariadne Conill
56019d53a8
activitypub: publisher: align sharedinbox usage with AP specification rules
...
While debugging the follow breakage, I observed that our sharedInbox usage
did not match the rules in the specification. Accordingly, I have better
aligned our usage of sharedInbox with the rules outlined in the ActivityPub
specification.
2019-07-22 02:38:31 +00:00
kaniini
a00aab3402
Merge branch 'fix/rich-media-ttl-fallback' into 'develop'
...
Fix rich media parser failing when no TTL can be found by image TTL setters
See merge request pleroma/pleroma!1460
2019-07-21 16:05:58 +00:00
rinpatch
3368174785
Fix rich media parser failing when no TTL can be found by image TTL
...
setters
2019-07-21 18:22:22 +03:00
Ariadne Conill
bc6c5c513a
router: ensure the AP sharedinbox path is registered first
2019-07-21 03:52:06 +00:00
rinpatch
196cad46f3
Resolve merge conflicts
2019-07-20 22:04:47 +03:00
rinpatch
c3ecaea64d
Apply suggestion to lib/pleroma/object/fetcher.ex
2019-07-20 18:53:00 +00:00
rinpatch
d4ee76ab63
Apply suggestion to lib/pleroma/user.ex
2019-07-20 18:52:41 +00:00
Roman Chvanikov
8292331b35
Merge branch 'develop' into feature/digest-email
2019-07-20 16:41:58 +03:00
Ivan Tashkinov
d0198fe215
[ #1112 ] Preserving id on user insert conflict on order not to violate conversation_partipations_user_id_fkey constraint.
2019-07-20 13:03:34 +03:00
Roman Chvanikov
ae4fc58589
Remove flavour from userinfo
2019-07-20 01:24:01 +03:00
Roman Chvanikov
36049f08ef
Merge develop
2019-07-20 01:03:25 +03:00
feld
93df0796f0
Merge branch 'feature/matstodon-statuses-by-name' into 'develop'
...
Feature/matstodon statuses by name
See merge request pleroma/pleroma!1211
2019-07-19 21:59:18 +00:00
Mark Felder
9169f331b6
Merge branch 'develop' into feature/matstodon-statuses-by-name
2019-07-19 16:55:10 -05:00
kaniini
33729bbb28
Merge branch 'feature/richmedia-ttl' into 'develop'
...
add the rich media ttl based on image exp time
See merge request pleroma/pleroma!1438
2019-07-19 21:36:36 +00:00
Ariadne Conill
9a8eb2c94d
mix: add pleroma.user unsubscribe_all_from_instance
2019-07-19 19:25:29 +00:00
kaniini
716afc83ce
Merge branch 'refactor/http-signature-plug' into 'develop'
...
http signature plug: separation of concerns
See merge request pleroma/pleroma!1449
2019-07-19 16:57:24 +00:00
Maksim
c2e2aadc42
#1110 fixed /api/pleroma/healthcheck
2019-07-19 16:20:23 +00:00
Sachin Joshi
de9906ad56
change the structure of image ttl parsar
2019-07-19 11:43:42 +05:45
Maxim Filippov
9570a5be40
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-18 23:38:38 +03:00
Ariadne Conill
c947cfec5a
mapped signature plug: use user assign like authentication plug
2019-07-18 20:31:25 +00:00
Maksim
f435217e50
tests for Plugs.AuthenticationPlug
2019-07-18 20:29:51 +00:00
Ariadne Conill
a8af0ac053
mapped signature plug: fix user lookup
2019-07-18 16:27:50 +00:00
Ariadne Conill
5ea0cd69f7
mapped signature plug: don't invalidate in cases where a signature is actually not present (testsuite)
2019-07-18 16:01:21 +00:00
Ariadne Conill
184fa61fb3
plugs: add MappedSignatureToIdentityPlug
2019-07-18 15:38:45 +00:00
Ariadne Conill
18d8d12d53
signature: make key_id_to_actor_id() public
2019-07-18 15:35:42 +00:00
Ariadne Conill
88d064d80e
http signature plug: remove redundant checks handled by HTTPSignatures library
...
the redundant checks assumed a POST request, which will not work for signed GETs.
this check was originally needed because the HTTPSignatures adapter assumed that
the requests were also POST requests. but now, the adapter has been corrected.
2019-07-18 15:11:21 +00:00
kaniini
f9a0014681
Merge branch 'feature/signed-object-fetches' into 'develop'
...
signed object fetches
See merge request pleroma/pleroma!1446
2019-07-18 13:27:50 +00:00
Maksim
b6b748d3e7
tests for Uploader with webhook
2019-07-18 12:30:18 +00:00
Ariadne Conill
399acd4c42
fetcher: sign object fetches if configured
2019-07-17 22:58:46 +00:00
kaniini
1e48af9acf
Merge branch 'feature/instance-fetch-actor' into 'develop'
...
instance fetch service actor
See merge request pleroma/pleroma!1440
2019-07-17 19:45:40 +00:00
kaniini
60b54ee64a
Merge branch 'feature/http-signatures-keyid' into 'develop'
...
http signatures: derive actor from key IDs
See merge request pleroma/pleroma!1442
2019-07-17 19:44:14 +00:00
Ariadne Conill
f84fb340b7
http signatures: derive actor ID from key ID.
...
Almost all AP servers return their key ID as the actor URI with #main-key
added. Hubzilla, which doesn't, uses a URL which refers to the actor
anyway, so worst case, Hubzilla users get refetched.
2019-07-17 19:18:19 +00:00
Eugenij
4bf2bb9cff
Fix password reset for non-test env
...
Fixes `Plug.Conn.NotSentError` that causes a 5xx error in response
instead of 404 and 400.
Fixes pattern matching error caused by different response format
in test and non-test env: `Pleroma.Emails.Mailer.deliver_async` returns
:ok when PleromaJobQueue is enabled and `{:ok, _}` when it's disabled.
In tests, it's disabled.
2019-07-17 18:09:31 +00:00
Ariadne Conill
cf9cb953d5
activitypub: represent internal fetch actor
2019-07-17 17:34:57 +00:00
Ariadne Conill
d930e5d5c3
activitypub: introduce internal fetch service actor
2019-07-17 17:14:08 +00:00
Ariadne Conill
62e5ff624e
user: add is_internal_user? helper function
2019-07-17 17:12:42 +00:00
Ariadne Conill
0a6f6e1b5b
webfinger: allow resolution of usernames with dots in them (internal actors)
2019-07-17 16:59:29 +00:00
Ariadne Conill
a9d6a12bb3
activitypub: controller: rework the way the relay actor is presented so the code can be reused
2019-07-17 16:33:08 +00:00
Ariadne Conill
4885473be2
user: refactor get_or_create_instance_user() into get_or_create_service_actor_by_id()
2019-07-17 16:03:05 +00:00
kaniini
ce73d5f6a5
Merge branch 'feature/mention-mrf' into 'develop'
...
Add MRF MentionPolicy for dropping posts which mention specific actors
See merge request pleroma/pleroma!1439
2019-07-17 15:28:41 +00:00
RX14
96a2890a9e
Add MRF MentionPolicy for dropping posts which mention specific actors
2019-07-17 15:16:55 +01:00
Alexander Strizhakov
10f82c88b8
mastoapi password reset
...
added rate limit to password reset
configure rate limit in runtime
2019-07-16 21:44:50 +00:00
Maksim
21e3f9ac69
added tests for Pleroma.Upload.Filter
2019-07-16 21:35:43 +00:00
Sachin Joshi
18234cc44e
add the rich media ttl based on image exp time
2019-07-17 00:20:34 +05:45
Ivan Tashkinov
889dc17abd
[ #1094 ] Rate-limited follow & unfollow actions.
2019-07-16 19:18:30 +03:00
Roman Chvanikov
e7c175c943
Use PleromaJobQueue for scheduling
2019-07-16 16:49:50 +03:00
Roman Chvanikov
9bca70b10a
Merge develop
2019-07-16 16:19:19 +03:00
Eugenij
520ee6c591
Add pleroma.deactivated to the Account entity (Mastodon API)
2019-07-16 11:14:46 +00:00
Eugenij
c4ca142e14
Add the blocked_by attribute to the relationship API (GET /api/v1/accounts/relationships)
2019-07-16 11:04:11 +00:00
Egor Kislitsyn
70439494af
Fix typo
2019-07-16 14:56:07 +07:00
rinpatch
996fd58ac4
Merge branch 'bugfix/poll-id-as-string' into 'develop'
...
Status View: Poll ids are strings.
See merge request pleroma/pleroma!1430
2019-07-16 06:06:22 +00:00
lain
1ed24bcc76
Status View: Poll ids are strings.
...
All ids in mastodon are strings, in general.
2019-07-16 12:47:40 +09:00
Mark Felder
ffb4eb9779
Merge branch 'develop' into feature/matstodon-statuses-by-name
2019-07-15 17:10:27 -05:00
feld
9f987dd017
Merge branch 'match-file-name' into 'develop'
...
try to always match the filename for proxy url
See merge request pleroma/pleroma!1405
2019-07-15 22:04:58 +00:00
Sergey Suprunenko
b74300bc7a
Add more tests for MastodonAPIController and CommonAPI
2019-07-15 19:47:23 +00:00
Alex S
33fd4c0ed7
query fix
2019-07-15 20:53:52 +03:00
kaniini
ee5250ae56
Merge branch 'sha512-crypt' into 'develop'
...
detect and use sha512-crypt for stored password hash.
See merge request pleroma/pleroma!1422
2019-07-15 16:13:17 +00:00
Sachin Joshi
1d906ffa82
Merge branch 'develop' into match-file-name
...
# Conflicts:
# lib/pleroma/web/media_proxy/media_proxy_controller.ex
2019-07-15 21:30:56 +05:45
Moonman
105f437ce9
formatting
2019-07-15 08:36:51 -07:00
kaniini
03c4ea44ad
Merge branch 'admin-configure-atom-keys' into 'develop'
...
admin configure - atom keys with leading :
See merge request pleroma/pleroma!1424
2019-07-15 13:01:58 +00:00
Maksim
c32384c1ea
tests for Pleroma.Signature
2019-07-15 13:01:22 +00:00
Alex S
b8607c151c
migrating task refactor
2019-07-15 15:45:27 +03:00
Alex S
c66044b923
atom keys with leading :
2019-07-15 11:00:55 +03:00
Egor Kislitsyn
de13c9bb8f
List messages must be visible for mentioned users
2019-07-15 14:54:40 +07:00
Egor Kislitsyn
d86a97abfb
Add an explanation comment to Publisher.publish/2
2019-07-15 14:20:31 +07:00
Egor Kislitsyn
64a946643e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-07-15 14:11:54 +07:00
Egor Kislitsyn
a87c313309
Support list visibility in StatusView
2019-07-15 14:00:29 +07:00
Maksim
fa17879c20
added tests for Web.MediaProxy
2019-07-14 21:01:32 +00:00
Roman Chvanikov
b052a9d4d0
Update DigestEmailWorker to compile and send emails via queue
2019-07-14 22:32:11 +03:00
Sergey Suprunenko
dce8ebc9ea
Unfollow should also unsubscribe
2019-07-14 19:25:03 +00:00
Roman Chvanikov
168dc97c37
Make opts optional in Pleroma.Notification.for_user_query/2
2019-07-14 22:04:55 +03:00
Roman Chvanikov
c729883936
Merge branch 'develop' into feature/digest-email
2019-07-14 21:43:30 +03:00
Ariadne Conill
739bbe0d3b
security: detect object containment violations at the IR level
...
It is more efficient to check for object containment violations at the IR
level instead of in the protocol handlers. OStatus containment is especially
a tricky situation, as the containment rules don't match those of IR and
ActivityPub.
Accordingly, we just always do a final containment check at the IR level
before the object is added to the IR object graph.
2019-07-14 17:47:08 +00:00
Moonman
f98f7ad1b9
detect and use sha512-crypt for stored password hash.
2019-07-14 09:48:42 -07:00
kaniini
cef4337f95
Merge branch 'bugfix/llal-object-containment' into 'develop'
...
Object.Fetcher: Handle error on Containment.contain_origin/2
See merge request pleroma/pleroma!1414
2019-07-14 16:39:17 +00:00
Haelwenn (lanodan) Monnier
2592934480
Object.Fetcher: Keep the with-do block as per kaniini proposition
2019-07-14 17:28:25 +02:00
Haelwenn (lanodan) Monnier
e1c08a67d6
Object.Fetcher: Fallback to OStatus only if AP actually fails
2019-07-14 17:05:31 +02:00
Alexander Strizhakov
e7c39b7ac8
Feature/1072 muting notifications
2019-07-14 13:29:31 +00:00
Haelwenn (lanodan) Monnier
40d0a198e2
Object.Fetcher: Handle error on Containment.contain_origin/2
2019-07-14 14:58:47 +02:00
Alex S
f4447d82b8
parsers configurable
2019-07-14 09:21:56 +03:00
rinpatch
0c2dcb4c69
Add follow information refetching after following/unfollowing
2019-07-14 01:58:39 +03:00
rinpatch
183da33e00
Add tests for fetch_follow_information_for_user and check object type
...
when fetching the page
2019-07-14 00:56:02 +03:00
Maxim Filippov
418ae6638d
Merge branch 'develop' into feature/admin-api-user-statuses
2019-07-14 00:39:06 +03:00
Maxim Filippov
a9459ff98f
Admin API: Endpoint for fetching latest user's statuses
2019-07-14 00:37:26 +03:00
rinpatch
d06d1b751d
Use atoms when updating user info
2019-07-14 00:21:35 +03:00
rinpatch
e5b850a991
Refactor fetching follow information to a separate function
2019-07-13 23:56:10 +03:00
Ariadne Conill
80c46d6d8b
nodeinfo: implement MRF transparency exclusions
2019-07-13 18:53:14 +00:00
rinpatch
e8fa477793
Refactor Follows/Followers counter syncronization
...
- Actually sync counters in the database instead of info cache (which got
overriden after user update was finished anyway)
- Add following count field to user info
- Set hide_followers/hide_follows for remote users based on http status
codes for the first collection page
2019-07-13 19:27:49 +03:00
kaniini
f4c001062e
Merge branch '1041-status-actions-rate-limit' into 'develop'
...
Rate-limited status actions (per user and per user+status).
Closes #1041
See merge request pleroma/pleroma!1410
2019-07-13 14:17:17 +00:00
Ivan Tashkinov
d72876c57d
[ #1041 ] Minor refactoring.
2019-07-13 15:21:50 +03:00
Haelwenn
9497d14f09
Merge branch 'fix/hackney-global-options' into 'develop'
...
Merge the default options with custom ones in ReverseProxy and Pleroma.HTTP and workaround for remote server certificate chain issues
See merge request pleroma/pleroma!1409
2019-07-13 11:55:09 +00:00
Ivan Tashkinov
369e9bb42f
[ #1041 ] Rate-limited status actions (per user and per user+status).
2019-07-13 14:49:39 +03:00
rinpatch
b001b8891a
Merge the default options with custom ones in ReverseProxy and
...
Pleroma.HTTP
2019-07-12 23:52:26 +03:00
rinpatch
095117a58c
Merge branch 'develop' into fix/ap-hide-follows
2019-07-12 21:43:06 +03:00
rinpatch
97b79efbcd
ActivityPub Controller: Actually pass for_user to following/followers
...
views and give 403 errors when trying to request hidden follower pages
when unauthenticated
2019-07-12 20:54:20 +03:00
Sachin Joshi
f8e3ae6154
try to always match the filename for proxy url
2019-07-12 22:56:14 +05:45
Maksim
92055941bd
Pleroma.Web.Metadata - tests
2019-07-12 16:42:54 +00:00
rinpatch
1f6ac7680d
ActivityPub User view: Following/Followers refactoring
...
- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it
2019-07-12 19:41:55 +03:00
Mark Felder
360e4cdaa2
Move these to pleroma namespace in Mastodon API
2019-07-12 11:25:58 -05:00
Sachin Joshi
6a6c4d134b
preserve the original path/filename (no encoding/decoding) for proxy
2019-07-12 21:05:01 +05:45
Roman Chvanikov
eae991b06a
merge develop
2019-07-12 18:08:27 +03:00
Eugenij
4198c3ac39
Extend Pleroma.Pagination to support offset-based pagination, use async/await to execute status and account search in parallel
2019-07-11 13:55:31 +00:00
Alexander Strizhakov
846ad9a463
admin api configure changes
2019-07-11 13:02:13 +00:00
kaniini
e4e3fd7e55
Merge branch 'fix/1019-refactor' into 'develop'
...
Fix/1019 refactor
See merge request pleroma/pleroma!1397
2019-07-11 13:01:11 +00:00
Egor Kislitsyn
9e06873d58
Add list to Visibility
2019-07-11 19:29:24 +07:00
Egor Kislitsyn
958fb9aa80
Add "listMessage"
2019-07-11 16:36:08 +07:00
Egor Kislitsyn
182f7bbb11
Merge branch 'develop' into feature/addressable-lists
2019-07-11 13:26:59 +07:00
Alexander Strizhakov
a237c6a2d4
support for idna domains
2019-07-10 15:23:25 +00:00
Haelwenn (lanodan) Monnier
252e129b1e
MastoAPI: Add categories to custom emojis
...
Note: This isn’t in a release yet, can be seen in mastofe on the
rebase/glitch-soc branch.
2019-07-10 17:02:37 +02:00
Alex S
beba7bbc85
removing synchronization worker
2019-07-10 17:42:18 +03:00
Alex S
f8786fa6f2
adding following_address field to user
2019-07-10 17:42:18 +03:00
Sergey Suprunenko
ff55e3c16f
Create mentions only for explicitly mentioned users
2019-07-10 13:29:50 +00:00
Egor Kislitsyn
ed8ce21a22
Fix unused import warning
2019-07-10 18:10:09 +07:00
Egor Kislitsyn
a42da8f311
Fix response
2019-07-10 18:10:09 +07:00
Egor Kislitsyn
5104f65b69
Wrap error messages into gettext helpers
2019-07-10 18:10:09 +07:00
Egor Kislitsyn
26a6871609
Add translation helpers
2019-07-10 18:10:09 +07:00
Egor Kislitsyn
0d54a571ca
Add SetLocalePlug
2019-07-10 18:08:03 +07:00
Maksim
008c55e4e9
add test for search_controller/ 100% coverage
2019-07-10 08:28:03 +00:00
Maksim
12b1454245
[ #1062 ] added option to disable send email
2019-07-10 05:34:21 +00:00
Sergey Suprunenko
2d2b50ccca
Send and handle "Delete" activity for deleted users
2019-07-10 05:16:08 +00:00
kaniini
75be90a6d1
Merge branch 'release/listener' into 'develop'
...
add listener port and ip option for 'pleroma.instance gen' and enable its test
See merge request pleroma/pleroma!1393
2019-07-10 05:14:08 +00:00
feld
93a0eeab16
Add license/copyright to all project files
2019-07-10 05:13:23 +00:00
Maksim
bb8065a1fd
tests MRF filters
2019-07-10 05:12:21 +00:00
Sachin Joshi
6d0ae264fc
add listener port and ip option for 'pleroma.instance gen' and enable its test
2019-07-10 01:46:49 +05:45
Ivan Tashkinov
829e997223
[ #878 ] Merge remote-tracking branch 'remotes/upstream/develop' into 878-activity-object-decoupling-in-tests
...
# Conflicts:
# lib/pleroma/object.ex
# test/web/activity_pub/transmogrifier_test.exs
# test/web/ostatus/ostatus_test.exs
2019-07-09 21:46:16 +03:00
Roman Chvanikov
371d39e160
Merge develop
2019-07-09 21:21:09 +03:00
kaniini
670a77ecbc
Merge branch 'feature/allow-user-query-via-id' into 'develop'
...
Admin API: Allow querying user by ID
See merge request pleroma/pleroma!1380
2019-07-09 17:53:41 +00:00
kaniini
1417627d07
Merge branch 'remove-avatar-header' into 'develop'
...
Ability to reset avatar, profile banner and backgroud
See merge request pleroma/pleroma!1187
2019-07-09 17:51:41 +00:00
Mark Felder
9a9b60cfbc
Merge branch 'develop' into feature/allow-user-query-via-id
2019-07-09 12:49:04 -05:00
Alexander Strizhakov
d6b0fce6e9
Fix/1019 correct count remote users
2019-07-09 17:36:35 +00:00
kaniini
4948117fcf
Merge branch 'remove-swift' into 'develop'
...
Remove Uploaders.Swift and `httpoison` dependency
Closes #1051
See merge request pleroma/pleroma!1374
2019-07-09 16:54:32 +00:00
Alexander Strizhakov
4e6e5d8042
reverse proxy tests
2019-07-09 16:54:13 +00:00
kaniini
1179a13533
Merge branch 'features/sec-websocket-protocol-header' into 'develop'
...
Features: MastoAPI streaming Sec-WebSocket-Protocol header
See merge request pleroma/pleroma!1381
2019-07-09 16:52:22 +00:00
Haelwenn
1ab4e35f27
Merge branch 'enable-ogp-by-default' into 'develop'
...
Do not crash if metadata fails to render and enable OGP and TwitterCard by default
Closes #1034
See merge request pleroma/pleroma!1388
2019-07-09 16:07:20 +00:00
feld
167f810ff1
Merge branch 'proxy-error' into 'develop'
...
make sure the url used by proxy is same as original url
See merge request pleroma/pleroma!1383
2019-07-09 16:00:44 +00:00
Haelwenn
95c085174d
Merge branch 'test-speedup' into 'develop'
...
Testing: Don't federate in testing.
See merge request pleroma/pleroma!1391
2019-07-09 15:35:28 +00:00
Mark Felder
31a59d6f23
Merge branch 'develop' into proxy-error
2019-07-09 10:18:30 -05:00
rinpatch
376a55c97f
Merge branch '161-incoming-replies-depth-limit' into 'develop'
...
[#161 ] Limited replies depth on incoming federation (memory leaks fix)
Closes #161
See merge request pleroma/pleroma!1361
2019-07-09 14:15:10 +00:00
Alexander Strizhakov
23d4781e73
change for local user search
2019-07-09 08:52:49 +00:00
lain
abe2e8881f
Testing: Don't federate in testing.
2019-07-09 15:30:51 +09:00
Ivan Tashkinov
daff85a985
[ #878 ] Refactored assumptions on embedded object presence in tests. Adjusted note factory to not embed object into activity.
2019-07-08 19:53:02 +03:00
rinpatch
44b2e1fdad
Formatting
2019-07-08 14:05:57 +03:00
rinpatch
9e58d3c624
FallbackRedirector: Do not crash on Metadata rendering errors
2019-07-08 12:59:49 +03:00
rinpatch
7f609ee8f4
OGP/TwitterCard: Add fallbacks in case the attachment key is nonexistent
2019-07-08 12:16:32 +03:00
rinpatch
72b88c82bc
Mastodon API: Fix embedded relationships not being rendered inside of statuses
2019-07-08 12:07:08 +03:00
Sachin Joshi
f5ad430974
make sure the url used by proxy is same as origin url
...
encoding or decoding it breaks some of the signed url
2019-07-07 14:13:40 +05:45
Haelwenn (lanodan) Monnier
e174614eb9
MastoAPI Streaming: Keep compatibility with access_token
2019-07-07 08:49:29 +02:00
KokaKiwi
a7885748c7
MastoAPI streaming: Replace access_token with Sec-WebSocket-Protocol
2019-07-06 20:29:17 +02:00
Ivan Tashkinov
ad8d86e7c6
Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
2019-07-06 10:17:06 +03:00
rinpatch
3589b30ddc
Merge branch 'fix/1058-uploads-dir-consistency' into 'develop'
...
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
Closes #1058
See merge request pleroma/pleroma!1378
2019-07-05 18:55:27 +00:00
Maxim Filippov
6c50fbcd14
Admin API: Allow querying user by ID
2019-07-05 19:33:53 +03:00
Maksim
6dadf5d6f4
[ #1043 ] fix search accounts.
2019-07-05 04:22:08 +00:00
Haelwenn (lanodan) Monnier
977c2d0448
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1058
2019-07-05 06:19:27 +02:00
Eugenij
15eb1235ed
Expose skip_thread_containment in nodeinfo
2019-07-03 18:35:57 +00:00
Eugenij
5184b0f41a
Use fallback values for search queries
...
This is to make sure the entire request doesn't return a 500 error if
user or status search times out.
2019-07-03 10:19:51 +00:00
Egor Kislitsyn
4f42093220
Remove Uploaders.Swift
2019-07-03 14:11:04 +07:00
Eugenij
ab50c6b3ca
Add fallback value to the admin report view.
...
This is to avoid 500 error when the reported user no longer exists
in the database.
2019-07-02 01:27:00 +00:00
Roman Chvanikov
d2cb18b2a3
Merge branch 'develop' into feature/digest-email
2019-06-30 21:23:35 +03:00
Ivan Tashkinov
a799418573
[ #161 ] Merge remote-tracking branch 'remotes/upstream/develop' into 161-incoming-replies-depth-limit
...
# Conflicts:
# CHANGELOG.md
2019-06-30 16:05:00 +03:00
Ivan Tashkinov
2b9d914089
[ #161 ] Refactoring, documentation.
2019-06-30 15:58:50 +03:00
Eugenij
1f76740e10
Add hashtag filter to user statuses (GET /api/v1/accounts/:id/statuses)
2019-06-30 09:08:46 +00:00
Maksim
acd20f166b
[ #1026 ] Filter.AnonymizeFilename added ability to retain file extension with custom text
2019-06-30 07:28:35 +00:00
rinpatch
4c60a562a7
Fix not being able to pin unlisted posts
...
Closes #1038
2019-06-29 22:27:42 +03:00
Ivan Tashkinov
5b7b1040b3
[ #161 ] Limited replies depth on incoming federation in order to prevent memory leaks on recursive replies fetching.
2019-06-29 20:04:50 +03:00
kaniini
d1549a6375
Merge branch 'feature/merge-mastodon-admin-views-for-reports' into 'develop'
...
Merge admin and mastodon user views for reports
See merge request pleroma/pleroma!1346
2019-06-29 00:12:09 +00:00
William Pitcock
034986e1fd
MRF: add mediaproxy warming policy
2019-06-28 23:19:20 +00:00
Roman Chvanikov
657277ffc0
Resolve conflicts
2019-06-29 00:52:50 +03:00
lain
2286f62a36
Merge branch 'release-docs' into 'develop'
...
Docs on OTP releases
See merge request pleroma/pleroma!1315
2019-06-28 15:26:09 +00:00
Maxim Filippov
452ca5250d
Merge admin and mastodon user views for reports
2019-06-28 15:15:32 +03:00
kaniini
0369a5db16
Merge branch 'idempotency-plug' into 'develop'
...
Add IdempotencyPlug and use it in all of the api
Closes #1003
See merge request pleroma/pleroma!1339
2019-06-27 04:20:17 +00:00
Alexander Strizhakov
c6705144a2
don't delete config settings on admin update
2019-06-27 04:19:44 +00:00
Egor Kislitsyn
889a9c3a3f
Polish IdempotencyPlug
2019-06-27 01:53:58 +07:00
Egor Kislitsyn
159630b21c
Fix credo warning
2019-06-26 19:19:07 +07:00
Egor Kislitsyn
0b8aeac0f3
Remove previous idempotency implementation from post_status
2019-06-26 18:49:14 +07:00
Egor Kislitsyn
74132e3715
Enable IdempotencyPlug for the all API
2019-06-26 18:42:49 +07:00
Egor Kislitsyn
825077a5b0
Add Idempotency plug
2019-06-26 18:36:58 +07:00
Sergey Suprunenko
d53fb55bb7
Return correct response when reply to a direct message is not direct itself
2019-06-26 10:59:27 +00:00
kaniini
24bcc209f9
Merge branch 'refactoring/fix_render_view' into 'develop'
...
Fix Controller.render/4 deprecation
See merge request pleroma/pleroma!1337
2019-06-26 05:34:26 +00:00
kaniini
9f8e645dce
Merge branch 'feature/configurable-pack-extensions' into 'develop'
...
Make default pack extensions configurable and default to png and gif
See merge request pleroma/pleroma!1338
2019-06-26 05:34:02 +00:00
rinpatch
41e4752950
Make default pack extensions configurable and default to png and gif
2019-06-26 06:48:59 +03:00
Maksim Pechnikov
5c0f646cef
fix validate_page_url
2019-06-26 06:27:17 +03:00
Roman Chvanikov
a7a54068f9
Fix Controller.render/4 deprecation
2019-06-26 03:28:02 +03:00
Maksim Pechnikov
4ad15ad2a9
add ignore hosts and TLDs for rich_media
2019-06-25 22:25:37 +03:00
Maksim Pechnikov
0276cf5a02
fix validate_url for private ip
2019-06-25 17:44:24 +03:00
Maksim
a0c4ebb4d7
[ #184 ] small refactoring reset password
2019-06-24 19:01:56 +00:00
Sergey Suprunenko
2c63c67512
Rework user deletion
2019-06-24 18:59:12 +00:00
Eugenij
f2c03425b0
Broadcast conversation update when DM is deleted
2019-06-24 07:14:04 +00:00
kaniini
27b9605de0
Merge branch 'rich_media_titles_two' into 'develop'
...
Rich media titles two
See merge request pleroma/pleroma!1325
2019-06-23 05:43:11 +00:00
kaniini
8b7860f12f
Merge branch 'admin-config' into 'develop'
...
Admin config
See merge request pleroma/pleroma!1328
2019-06-23 05:42:37 +00:00
Alex S
982cad0268
support for config groups
2019-06-23 08:16:16 +03:00
Sachin Joshi
a0c65bbd6c
Merge branch 'develop' into 'remove-avatar-header'
...
# Conflicts:
# CHANGELOG.md
2019-06-23 03:25:50 +00:00
Alex S
410add1c30
support for tuples with more than 2 values
2019-06-22 17:30:53 +03:00
lain
0e415921cd
Rich Media Parser: Do not return just a title if nothing else is there.
2019-06-22 16:22:59 +02:00
lain
58c4d5312b
Revert "Revert "Merge branch 'fix/ogp-title' into 'develop'""
...
This reverts commit b6af80f769
2019-06-22 15:12:57 +02:00
rinpatch
3ac5ecbac1
Support RUM indexes in the config generator
2019-06-22 12:54:16 +03:00
rinpatch
51760c84b9
Merge branch 'develop' into release-docs
2019-06-22 12:44:20 +03:00
rinpatch
53c73cd1a3
Merge branch 'fix/ecto-tasks-release' into 'develop'
...
Ecto tasks: Resolve relative path using the application directory instead of cwd and load the application before doing anything
See merge request pleroma/pleroma!1322
2019-06-22 09:19:10 +00:00
William Pitcock
6426301407
notifications: fix notification generation for non-create activities
...
in 300d94c62
2019-06-22 06:44:47 +00:00
Alex S
f0fccb7578
fix for int and modules
2019-06-22 09:01:30 +03:00
rinpatch
19f16e829d
Load the application before executing the create task
2019-06-22 04:33:46 +03:00
rinpatch
ebee9f59d8
Ecto tasks: Resolve relative path using the application directory
...
instead of cwd and load the application before doing anything
In OTP releases cwd != app directory and the configuration is read
only if the application is loaded
2019-06-22 04:17:04 +03:00
rinpatch
ee4e7c6570
Remove the getting started steps from pleroma.instance gen task
...
They are not compatible with every platform, different for OTP releases
and may become outdated. We are better off just telling people to refer
to the installation guides for their particular platform
2019-06-22 02:07:05 +03:00
rinpatch
452d5d3231
Merge branch 'develop' into release-docs
2019-06-22 02:00:18 +03:00
kaniini
55742d978d
Merge branch 'feature/mrf-anti-link-spam' into 'develop'
...
implement anti link spam MRF
See merge request pleroma/pleroma!1307
2019-06-21 22:56:54 +00:00
kaniini
e3534f5b3c
Merge branch 'oauth_secure_redirect' into 'develop'
...
OAuth security improvements (`redirect_uri` listing enforcement)
See merge request pleroma/pleroma!1302
2019-06-21 22:31:12 +00:00
kaniini
720412bf24
Merge branch 'revert-6f5a0cc1' into 'develop'
...
Revert "Merge branch 'fix/ogp-title' into 'develop'"
See merge request pleroma/pleroma!1317
2019-06-21 22:28:46 +00:00
William Pitcock
127a5a7d65
change the anti-link-spam MRF implementation to use old_user? instead of the previous name
2019-06-21 22:27:14 +00:00
rinpatch
e76115989a
Move config templates to priv so they can be found in releases
2019-06-21 19:54:04 +03:00
feld
b6af80f769
Revert "Merge branch 'fix/ogp-title' into 'develop'"
...
This reverts merge request !1277
2019-06-21 11:36:32 +00:00
rinpatch
89fead9250
Default DB configuration to false and set the default database name to
...
`pleroma` instead of `pleroma_dev`
2019-06-21 06:42:04 +03:00
rinpatch
2437f51284
Merge branch 'fix/config-gen-releases' into 'develop'
...
Refactor mix tasks a bit and make config generator work with releases
See merge request pleroma/pleroma!1312
2019-06-20 21:25:34 +00:00
Alexander Strizhakov
32320c1ee9
Fixes for dynamic configuration
2019-06-20 17:43:57 +00:00
rinpatch
69070e641d
Allow setting upload/static directories in the config generator
2019-06-20 03:59:16 +03:00
rinpatch
144e2e3e0b
Remove deprecated dedupe_media from the config template
2019-06-20 03:40:00 +03:00
rinpatch
fe3a830b80
Remove a useless binding from config template call
2019-06-20 02:34:19 +03:00
rinpatch
f8c64dd4c0
Release Tasks: Ensure the application is loaded before getting the
...
modules
Needed for non-rpc tasks to work
2019-06-20 02:21:48 +03:00
rinpatch
8c7a382027
Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functions
...
instead of aliasing
This seems to be the convention for functions that can be reused between
different mix tasks in all Elixir projects I've seen and it gets rid on
an error message when someone runs mix pleroma.common
Also in this commit by accident:
- Move benchmark task under a proper namespace
- Insert a space after the prompt
2019-06-20 02:08:02 +03:00
Ivan Tashkinov
363618207c
Apply suggestion to lib/mix/tasks/pleroma/user.ex
2019-06-19 19:39:53 +00:00
Ivan Tashkinov
71fb75b7ef
User sign out mix task.
2019-06-19 22:29:36 +03:00
William Pitcock
21dacd4b15
unbreak polls
2019-06-19 16:33:49 +00:00
William Pitcock
736d8ad6be
implement anti link spam MRF
2019-06-19 15:58:32 +00:00
Alexander Strizhakov
e4fa6b99ac
aliases for mix tasks
...
ecto.migrate
ecto.rollback
2019-06-19 10:33:33 +00:00
rinpatch
df2dab69a7
Merge branch 'begone-the-dot-hack' into 'develop'
...
Remove the dot hack when posting from Mastodon API and add proper errors when the post exceeds character limits
See merge request pleroma/pleroma!1298
2019-06-19 10:22:23 +00:00
lain
5c6c4ce634
Merge branch 'fix/rich-media-hashtags-again' into 'develop'
...
Rich Media: Skip Microformats hashtags
See merge request pleroma/pleroma!1304
2019-06-19 08:48:41 +00:00
rinpatch
035368d363
Rich Media: Skip Microformats hashtags
...
When fixing this problem I incorrectly assumed a.hashtag is
the proper way for detecting hashtags, but it is just something Pleroma and
Mastodon add. Per microformats it should be detected by the presense of rel=tag.
This MR adds a check for rel=tag, but I still left a.hashtag just in case
2019-06-19 00:46:30 +03:00
lain
966317e052
Merge branch 'deps/update-auto-linker' into 'develop'
...
Deps: Update auto_linker
See merge request pleroma/pleroma!1300
2019-06-18 20:47:36 +00:00
Ivan Tashkinov
64bc7ac619
Minor edit (comment).
2019-06-18 17:15:26 +03:00
Ivan Tashkinov
9f45f93949
Added more redirect_uri checks to prevent redirect to not explicitly listed URI.
2019-06-18 17:00:49 +03:00
rinpatch
f30a3241d2
Deps: Update auto_linker
2019-06-18 16:08:18 +03:00
rinpatch
c7acca2abb
Mastodon API: Sanitize display names
...
Closes #1000
2019-06-18 14:12:11 +03:00
rinpatch
c4e4f7d0e4
Add proper error handling for when the post exceeds character limits
2019-06-18 05:05:05 +03:00
rinpatch
dce27de733
Mastodon API: Remove the dot hack
2019-06-18 05:04:41 +03:00
rinpatch
49a49d3763
Merge branch 'removing-test-errors' into 'develop'
...
Removing test errors
See merge request pleroma/pleroma!1296
2019-06-17 14:16:23 +00:00
Haelwenn
c34327b22e
Merge branch 'fix/sanitize-report-content' into 'develop'
...
Sanitize HTML in ReportView
Closes #990
See merge request pleroma/pleroma!1293
2019-06-16 18:05:00 +00:00
Alex S
0f59265a50
salmon fix
...
removed some ownership sandbox error
2019-06-16 20:10:12 +08:00
Maksim
a04bf131e0
[ #570 ] add user:notification stream
2019-06-16 10:33:25 +00:00
rinpatch
bf6aa6f1a8
Fix report content stopping to be nullable
2019-06-16 13:06:12 +03:00
Alexander Strizhakov
7a4228be5a
fix for new instances
2019-06-16 10:01:15 +00:00
rinpatch
44de34d170
Credo fixes
2019-06-16 01:35:45 +03:00
rinpatch
641bcaa44e
Sanitize HTML in ReportView
...
Closes #990
2019-06-16 01:30:32 +03:00
lain
135c196769
Merge branch 'bugfix/980-polls-double-vote' into 'develop'
...
MastodonAPI Controller: Band-Aid double vote problem.
See merge request pleroma/pleroma!1275
2019-06-15 15:13:48 +00:00
lain
37ee6c6e2c
Merge branch 'update/phoenix-and-plug' into 'develop'
...
Update Phoenix
See merge request pleroma/pleroma!1290
2019-06-15 15:09:14 +00:00
kaniini
52b1b0e45d
Merge branch '963_oob_oauth_redirect_fix' into 'develop'
...
[#963 ] No redirect on OOB OAuth authorize request with existing authorization
See merge request pleroma/pleroma!1276
2019-06-15 13:45:50 +00:00
Mark Felder
9b908697dd
OEmbed.OEmbedController does not exist in the Pleroma codebase. It was removed in commit 92c5640f
...
and this leftover artifact breaks compiling now.
2019-06-15 07:04:01 -05:00
lain
a440cf856d
Mastodon API: Return the token needed for the chat.
2019-06-15 10:59:35 +02:00
rinpatch
62ffc00a5d
Merge branch 'feature/add-background-image-to-mastoapi' into 'develop'
...
AccountView: Add user background.
See merge request pleroma/pleroma!1280
2019-06-14 16:49:28 +00:00
Alexander Strizhakov
c2ca1f22a2
it is changed in compile time
...
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
lain
7f48b90bfb
Merge branch 'fix/hashtag-rich-media' into 'develop'
...
Fix hashtags being picked up by rich media parser
Closes #989
See merge request pleroma/pleroma!1288
2019-06-14 11:52:04 +00:00
Maksim
ee4ed87fb4
[ #948 ] /api/v1/account_search added optional parameters (limit, offset, following)
2019-06-14 11:39:57 +00:00
rinpatch
d0ebc0edf3
Fix hashtags being picked up by rich media parser
...
Closes #989
2019-06-14 14:34:42 +03:00
Egor
58a094b605
Add copyright info to containment.ex
2019-06-14 09:26:36 +00:00
lain
eac298083f
MastodonAPI: Add a way to update the background image.
2019-06-14 11:19:22 +02:00
Egor Kislitsyn
b22b10d3aa
Improve rate limiter documentation
...
Documents how to disable rate limiting
2019-06-14 15:02:10 +07:00
lain
315f090f59
Prometheus: Remove flaky process collection NIF.
2019-06-13 20:30:04 +02:00
lain
5965efb216
AccountView: Add user background.
2019-06-13 19:08:05 +02:00
lain
6f5a0cc14e
Merge branch 'fix/ogp-title' into 'develop'
...
Rich Media Parser: Attempt to use <title> from HTML as a fallback
Closes #979
See merge request pleroma/pleroma!1277
2019-06-13 13:26:39 +00:00
Egor Kislitsyn
30e54fd7e2
Handle HTTP 404 response
2019-06-13 17:13:35 +07:00
Egor Kislitsyn
afae3ada22
Handle HTTP "410 Gone" response
2019-06-13 16:34:03 +07:00
Egor Kislitsyn
a12f8e13c8
Improve <title> fallback; Add a test
2019-06-13 15:02:46 +07:00
Mark Felder
7363a0ea8a
Revert "Only run Floki if title is missing from the map"
...
This reverts commit 97d2b1a45a
2019-06-12 18:32:28 -05:00
Mark Felder
97d2b1a45a
Only run Floki if title is missing from the map
2019-06-12 18:27:35 -05:00
Mark Felder
097fdf6a5d
Attempt to use <title> from HTML as a fallback
2019-06-12 17:56:51 -05:00
Ivan Tashkinov
4b2c29016c
[ #963 ] No redirect on OOB OAuth authorize request with existing authorization. OAuth-related refactoring.
2019-06-12 21:30:06 +03:00
lain
966543379d
MastodonAPI Controller: Band-Aid double vote problem.
2019-06-12 16:36:23 +02:00
lain
f46c628e6b
Merge branch 'update_auto_linker' into 'develop'
...
Update `auto_linker` dependency
See merge request pleroma/pleroma!1272
2019-06-12 09:52:29 +00:00
Egor Kislitsyn
817c66bc3e
Remove search result order for non-RUM indexes
2019-06-12 16:22:56 +07:00
Egor Kislitsyn
bf22ed5fbd
Update auto_linker dependency
2019-06-12 15:53:33 +07:00
Egor Kislitsyn
6f29865d43
Add option to restrict all users to local content
2019-06-11 21:25:53 +07:00
lain
63ab3c30eb
Merge branch 'feature/rate-limiter' into 'develop'
...
Feature/Rate Limiter
Closes #943
See merge request pleroma/pleroma!1266
2019-06-11 11:32:01 +00:00
Egor Kislitsyn
ad04d12de6
Replace MastodonAPIController.account_register/2 rate limiter
2019-06-11 16:06:03 +07:00
Egor Kislitsyn
bc8f059367
Add rate limiting for search endpoints
2019-06-11 14:28:39 +07:00
Egor Kislitsyn
2e5affce61
Add RateLimiter
2019-06-11 14:27:41 +07:00
kaniini
f2d72b1fe4
Merge branch 'preload-changes' into 'develop'
...
Conversations: Fetch users in one query.
See merge request pleroma/pleroma!1258
2019-06-11 02:37:08 +00:00
rinpatch
3ecfe2a6d4
Merge branch 'develop' into feature/releases
2019-06-09 13:55:32 +03:00
rinpatch
2a659b35f1
Add migrate/rollback to release tasks
2019-06-09 13:33:44 +03:00
rinpatch
7223c1b643
Use Mix.shell().yes? if available
2019-06-08 20:10:48 +03:00
rinpatch
d7ec0898e5
Make mix tasks work in a release
2019-06-08 17:40:40 +03:00
lain
1e0fa899b6
Merge branch 'fix/transmogrifier-inReplyTo' into 'develop'
...
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
See merge request pleroma/pleroma!1259
2019-06-08 10:22:15 +00:00
rinpatch
d020f68e87
Transmogrifier: Do not crash if inReplyTo does not exist and can't be fetched
2019-06-07 20:40:38 +03:00
lain
970f71e222
Conversations: Fetch users in one query.
2019-06-07 17:51:47 +02:00
lain
cb3258c863
Emoji: Use full path to check if a file is a directory.
2019-06-07 17:31:21 +02:00
kaniini
d5330ed125
Merge branch 'fix/replace-mix-env' into 'develop'
...
Replace Mix.env with Pleroma.Config.get(:env)
See merge request pleroma/pleroma!1254
2019-06-07 10:58:09 +00:00
rinpatch
bc597d888c
Mix Tasks: Switch to Application.ensure_all_started instead of
...
Mix.Task.run and ensure serve_endpoints is set to false
In release environments there is no Mix.Task.run and serve_endpoints
must be set to true for the endpoints to start, so we need to ensure it
is set to false before starting Pleroma for executing a mix task.
2019-06-07 12:37:20 +03:00
Roman Chvanikov
01fe5abad1
Resolve conflicts
2019-06-07 01:20:50 +03:00
rinpatch
92213fb87c
Replace Mix.env with Pleroma.Config.get(:env)
...
Mix.env/0 is not availible in release environments such as distillery or
elixir's built-in releases.
2019-06-06 23:59:51 +03:00
kaniini
62cdf701f4
Merge branch 'fix/elixir-master-deprecation-warnings' into 'develop'
...
Switch to manual Supervisor child specifications instead of Supervisor.Spec
See merge request pleroma/pleroma!1252
2019-06-06 14:54:29 +00:00
lain
cb2bcee842
User Search: Boost friends more strongly.
2019-06-06 16:18:27 +02:00
rinpatch
9ae8f012a5
Switch to manual Supervisor child specifications instead of Supervisor.Spec
...
Supervisor.Spec is deprecated and causes warnings on Elixir master, see
https://hexdocs.pm/elixir/Supervisor.Spec.html
2019-06-06 16:37:44 +03:00
Egor
f82382de22
[ #943 ] Make the unauthenticated users limitation optional
2019-06-06 12:17:49 +00:00
kaniini
3f6da9c45a
Merge branch 'bugfix/377-stuck-follow-request' into 'develop'
...
Bugfix/377 stuck follow request
Closes #377
See merge request pleroma/pleroma!1250
2019-06-05 15:52:40 +00:00
kaniini
a511d2f900
Merge branch 'improve-search' into 'develop'
...
[#943 ] Contain search for unauthenticated users
See merge request pleroma/pleroma!1220
2019-06-05 15:51:32 +00:00
lain
e1370ba131
Utils: Use update_follow_state_for_all when appropriate.
2019-06-05 16:51:28 +02:00
lain
ad19bfc7fe
Utils: Split update_follow_state and update_follow_state_for_all.
2019-06-05 16:43:35 +02:00
lain
076c9ae40e
User: Remove superfluous maybe_follow.
2019-06-05 14:24:31 +02:00
lain
3115b64cfe
Transmogrifier: Add tests for incoming follows to locked accounts.
2019-06-05 14:10:46 +02:00
rinpatch
50afe5ab9e
Merge branch 'fix-stuck-follows' into 'develop'
...
User: Don't error out when following a user that's already followed.
See merge request pleroma/pleroma!1249
2019-06-05 11:07:54 +00:00
Egor Kislitsyn
ddd4a09b72
Fix merge conflict
2019-06-05 17:55:00 +07:00
Egor Kislitsyn
cfa5572d28
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 17:53:15 +07:00
lain
024dfdc39c
Typo + Linting.
2019-06-05 12:45:28 +02:00
lain
8b9a0dd4a7
User: Don't error out when following a user that's already followed.
...
This leads to a few situations where it is impossible to follow a user.
2019-06-05 12:06:45 +02:00
Ivan Tashkinov
3eefb274f4
OAuth consumer: tests fix, comments, Keycloak config notes.
2019-06-05 13:02:13 +03:00
Egor Kislitsyn
1cb245c982
Fix formatting
2019-06-05 16:55:17 +07:00
Egor Kislitsyn
5b04f07a1e
Limit search for unauthenticated users to local users only
2019-06-05 16:51:04 +07:00
Egor Kislitsyn
94b9e9d844
Update benchmark mix task
2019-06-05 16:37:43 +07:00
Egor Kislitsyn
93397fce3d
Contain search for unauthenticated users
2019-06-05 16:37:43 +07:00
kaniini
e4babb1c9f
Merge branch 'explicit-addressing' into 'develop'
...
Explicit addressing
See merge request pleroma/pleroma!1239
2019-06-05 08:28:20 +00:00
Egor Kislitsyn
6ba9055b51
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-05 12:54:30 +07:00
Roman Chvanikov
b1b1a270e8
Fix conflict
2019-06-05 02:45:21 +03:00
Haelwenn
ab4915edcb
Merge branch 'bugfix/956-activity-id-nil-conversations' into 'develop'
...
Participations: Filter out participations without activities.
Closes #956 and #953
See merge request pleroma/pleroma!1246
2019-06-04 15:34:55 +00:00
lain
18c35d84fd
NodeInfo: Add explicit addressing to nodeinfo.
2019-06-04 17:14:25 +02:00
Maksim Pechnikov
1e7bb69a95
update ActivityPub#fetch_activities_query
2019-06-04 15:21:18 +03:00
Maksim Pechnikov
d3d1704e84
Merge branch 'develop' into issue/941
2019-06-04 15:06:58 +03:00
Maksim Pechnikov
0acfcf6c52
update ActivityPub#fetch_activities_query
2019-06-04 15:04:36 +03:00
lain
a3a7178b60
Participations: Filter out participations without activities.
2019-06-04 13:58:36 +02:00
Haelwenn
0eb7464c10
Merge branch 'emoji-loader-fix' into 'develop'
...
Emoji: Don't die when files are present in the emoji folder.
Closes #957
See merge request pleroma/pleroma!1245
2019-06-04 11:26:42 +00:00
rinpatch
17383861ed
Fix CommonAPI.vote returning tuples inside of the activity array instead of just activities
2019-06-04 13:38:32 +03:00
lain
e74581a5c4
Emoji: Don't die when files are present in the emoji folder.
2019-06-04 12:14:43 +02:00
rinpatch
29b022bb59
Restrict get_existing_votes to only get Create activities
2019-06-04 12:42:10 +03:00
Egor Kislitsyn
9ce928d823
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-06-04 16:28:23 +07:00
lain
4cab98b7bf
Merge remote-tracking branch 'origin/develop' into explicit-addressing
2019-06-04 11:23:46 +02:00
William Pitcock
37a4ba0624
utils: access inReplyTo as an explicit string when fetching poll results`
2019-06-04 08:45:03 +00:00
Maksim Pechnikov
4f2e359687
Merge branch 'develop' into issue/941
2019-06-04 09:49:08 +03:00
William Pitcock
1c6cf0a348
nodeinfo: add pollLimits to metadata
2019-06-04 06:19:44 +00:00
kaniini
9f0d0d0805
Merge branch 'feature/mrf-subchain' into 'develop'
...
MRF: subchain policy
See merge request pleroma/pleroma!1233
2019-06-04 05:49:54 +00:00
kaniini
9d2563a3de
Merge branch 'generic-fe-settings' into 'develop'
...
Generic settings store for frontend user settings
See merge request pleroma/pleroma!1221
2019-06-04 05:43:43 +00:00
Roman Chvanikov
3e17610587
Add task to test emails
2019-06-04 02:48:21 +03:00
Mark Felder
6ef145b4fc
Merge branch 'develop' into feature/digest-email
2019-06-03 15:29:53 -05:00
Maksim Pechnikov
f13d6c7f78
update api to set skip_thread_containment
2019-06-03 21:02:57 +03:00
eugenijm
f2c4c99e03
Remove repeated scope lists
2019-06-03 19:18:21 +03:00
lain
80d4d83aac
CommonAPI: Add explicit addressing.
2019-06-03 18:17:08 +02:00
lain
2b664b048e
User: Add function to get AP ids from nicknames.
2019-06-03 18:16:11 +02:00
eugenijm
243d8ed94e
Use workaround for the heavy checkmark symbol in iOS
2019-06-03 18:28:36 +03:00
Mark Felder
f4e2595592
Merge branch 'develop' into update-oauth-template
2019-06-03 09:12:17 -05:00
Maksim Pechnikov
080e1aa70e
add option skip_thread_containment
2019-06-03 16:13:37 +03:00
rinpatch
dc91bcc0af
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 13:16:17 +03:00
lambda
314758c25b
Merge branch 'align-mastodon-conversations' into 'develop'
...
Mastodon Conversations API: Align to Mastodon behavior
See merge request pleroma/pleroma!1215
2019-06-03 09:48:37 +00:00
rinpatch
026b245dbc
Merge branch 'develop' into feature/polls-2-electric-boogalo
2019-06-03 11:14:52 +03:00
rinpatch
5bd41fef8b
Change query order in fetch_activities_for_context_query to make poll vote exclusion work
2019-06-03 10:58:37 +03:00
rinpatch
1fd8e19d76
Remove a TODO comment as the tests for poll view were written
2019-06-02 23:46:17 +03:00
rinpatch
2fe3a20638
Make error message about author's inability to vote more sensible
2019-06-02 23:33:15 +03:00
rinpatch
e3c460353d
Refresh the object in CommonAPI.vote instead of MastoAPI controller
2019-06-02 23:24:48 +03:00
William Pitcock
561a21986d
formatting
2019-06-02 10:29:15 +00:00
William Pitcock
4087ccdab8
mrf: add subchain policy
2019-06-02 10:07:42 +00:00
William Pitcock
edf772d41e
mrf: allow a policy chain to be specified when filtering
2019-06-02 09:44:42 +00:00
William Pitcock
52e09807d4
reverse proxy: clean up some @hackney leftovers
2019-06-02 09:09:58 +00:00
kaniini
5402d04e3c
Merge branch 'feature/notification-control-part-2' into 'develop'
...
notification controls, part 2
See merge request pleroma/pleroma!1204
2019-06-02 08:25:37 +00:00
rinpatch
6bc9e5c020
Mastodon API: Refresh the object before rendering it after voting
2019-06-01 21:41:49 +03:00
rinpatch
444406167b
Mastodon API: actually check for poll votes
2019-06-01 21:41:23 +03:00
rinpatch
65db5e9f52
Resolve merge conflicts
2019-06-01 16:29:58 +03:00
rinpatch
300d94c628
Add poll votes
...
Also in this commit by accident:
- Fix query ordering causing exclude_poll_votes to not work
- Do not create notifications for Answer objects
2019-06-01 16:17:46 +03:00
Sachin Joshi
ad5263c647
Merge remote-tracking branch 'upstream/develop' into admin-create-users
2019-06-01 11:42:37 +05:45
Sachin Joshi
5534d4c676
make bulk user creation from admin works as a transaction
2019-06-01 11:17:53 +05:45
kaniini
e706b42f51
Merge branch 'bugfix/visibility-indicator-litepub-dm' into 'develop'
...
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
See merge request pleroma/pleroma!1230
2019-06-01 03:39:13 +00:00
Sergey Suprunenko
2bbc2a801f
Remove all follower collections but actor's from "cc"
2019-06-01 03:26:45 +00:00
William Pitcock
f2efe24cf8
visibility: if litepub:directMessage is asserted, always report the object as "direct" visibility
2019-06-01 03:24:08 +00:00
Haelwenn (lanodan) Monnier
5d3ece2861
Remove now useless flavours switching
2019-06-01 01:44:10 +02:00
Haelwenn (lanodan) Monnier
aa9f52edd2
mastodon_api_controller.ex: Remove vanilla from supported_flavours
2019-06-01 01:44:10 +02:00
feld
6872c5f88f
Mastodon API search default value for "resolve" is false
...
https://docs.joinmastodon.org/api/rest/accounts/
https://docs.joinmastodon.org/api/rest/search/
2019-05-31 18:46:57 +00:00
lambda
2993361075
Merge branch 'hotfix/leaking-lists' into 'develop'
...
Mastodon API: Fix lists leaking private posts
See merge request pleroma/pleroma!1222
2019-05-31 13:26:48 +00:00
lain
7861974ab2
MastodonAPI: Add extension to set and get pleroma_settings_store.
2019-05-31 14:50:18 +02:00
lain
aaad85c4d9
AccountView: settings -> settings_store
2019-05-31 14:49:46 +02:00
lain
eb2963bc43
User: Add settings store to Info, AccountView
...
This is to provide a generic frontend settings storage mechanism for all kinds
of frontends.
2019-05-31 14:27:15 +02:00
rinpatch
d9c0650ff9
Mastodon API: Fix lists leaking private posts
...
Our previous list visibility resolver grabbed posts if either follower
collection of the user in a list who is followed is in `to` or if
follower collection of the user in a list was in `cc`. This not only
missed unlisted posts but also lead to leaking private posts when
`fix_explicit_addressing` mistakingly started putting follower collections
to `cc` (also fixed in this MR).
Reported by @kurisu@iscute.moe via a DM
2019-05-31 15:25:17 +03:00
rinpatch
a9eaa55885
Fix fix_explicit_addressing moving follower collection to cc and add tests for it
2019-05-31 14:17:05 +03:00
lain
97fb50d9fa
Mastodon Conversation API: Don't return own account in 'accounts'.
2019-05-31 11:27:14 +02:00
Sergey Suprunenko
1690be991e
Replace missing non-nullable Card attributes with empty strings
2019-05-30 21:03:31 +00:00
lambda
91ac8b075b
Merge branch 'use-pleroma-config' into 'develop'
...
Use Pleroma.Config everywhere
See merge request pleroma/pleroma!1214
2019-05-30 13:16:08 +00:00
Egor Kislitsyn
99f70c7e20
Use Pleroma.Config everywhere
2019-05-30 15:33:58 +07:00
kaniini
6aec0d1b58
Revert "Merge branch 'feature/search-authenticated-only' into 'develop'"
...
This reverts merge request !1209
2019-05-29 22:10:16 +00:00
Roman Chvanikov
5cee2fe9fe
Replace Application.get_env/2 with Pleroma.Config.get/1
2019-05-29 21:31:27 +03:00
Mark Felder
e7edfd9fec
Permit fetching statuses from API with nickname or id
2019-05-29 12:20:18 -05:00
Roman Chvanikov
ce47017c89
Merge develop
2019-05-29 18:18:22 +03:00
Mark Felder
672fddb721
Default search limit should be 40
...
https://docs.joinmastodon.org/api/rest/search/
2019-05-29 08:06:26 -05:00
William Pitcock
0159a6dbe9
router: require oauth_read for searching
...
Search calls are generally expensive and allow unauthenticated users to
crawl the instance for user profiles or posts which contain specified
keywords. An adversary can build a distributed search engine which not
only will consume significant instance resources, but also can be used
for undesirable purposes such as datamining.
Accordingly, require authenticated access to use the search API endpoints.
This acts as a nice balance as it allows guest users to make use of most
functionality available in Pleroma FE while ensuring that Pleroma
instances are reasonably protected from resource exhaustion. It also
removes Pleroma as a potential vector in distributed search engines.
2019-05-29 10:58:45 +00:00
jeff
9f3bcf0efe
Respect proxy settings federation
2019-05-28 06:49:53 +00:00
Sachin Joshi
1452a96ad6
ability to set and reset avatar, profile banner and backgroud in Mastodon API
2019-05-27 15:31:01 +05:45
lambda
5bb843ceec
Merge branch 'refactor/die-httpoison-die' into 'develop'
...
remove @httpoison, @ostatus and @websub compile-time constants
See merge request pleroma/pleroma!1203
2019-05-26 13:33:11 +00:00
William Pitcock
79503ce90f
mrf: simple policy: fix matching imported activitypub and ostatus statuses
2019-05-26 02:01:24 +00:00
William Pitcock
750ede5764
notification: remove local/remote match rules (too complicated)
2019-05-26 00:05:47 +00:00
William Pitcock
e7e2e7a1a6
user info: allow formdata for notification settings like every other API
2019-05-25 05:54:02 +00:00
William Pitcock
59a703fcbe
twitter api: user view: expose user notification settings under pleroma object
2019-05-25 05:31:13 +00:00
William Pitcock
4030837d91
notification: add non_follows/non_followers notification control settings
2019-05-25 05:19:47 +00:00
William Pitcock
56fd7dbdd7
remove @websub and @ostatus module-level constants
2019-05-25 04:43:11 +00:00
William Pitcock
9bec891eb4
kill @httpoison
2019-05-25 04:24:21 +00:00
Aaron Tinio
9415932af5
Keep nodeinfo available when not federating
2019-05-25 08:15:12 +08:00
Sergey Suprunenko
bbea5691da
Mention all people in the beginning of DM
2019-05-24 20:34:23 +00:00
feld
f916e4cdd9
Move the Cache Control header test to its own file
...
We can consolidate our cache control header tests here
2019-05-24 20:33:55 +00:00
Egor Kislitsyn
f333041a0a
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-24 21:05:57 +07:00
rinpatch
8b2d39c1ec
Change the order of preloading when fetching activities for context
2019-05-23 14:03:16 +03:00
Sachin Joshi
0c53d91f3b
fix merge conflict
2019-05-23 09:45:12 +02:00
rinpatch
e6b175ed6c
Fix credo issues
2019-05-22 21:57:46 +03:00
William Pitcock
baf72d6c58
mrf: simple policy: add the ability to strip avatars and banners from user profiles
2019-05-22 18:53:12 +00:00
William Pitcock
60f882b09f
activitypub: run user objects through MRF filters
2019-05-22 18:53:12 +00:00
William Pitcock
75b6c4b004
mrf: defang policy modules for filtering user profile objects
2019-05-22 18:53:12 +00:00
rinpatch
ac7702f800
Exclude Answers from fetching by default
2019-05-22 21:52:12 +03:00
rinpatch
19c90d47c4
Normalize poll votes to Answer objects
2019-05-22 21:17:57 +03:00
rinpatch
54e10a3e55
Disable timeouts for object pruning query
2019-05-22 20:10:52 +03:00
Maksim
620908a2db
[ #699 ] add worker to clean expired oauth tokens
2019-05-22 15:44:50 +00:00
lambda
714d8d4ef9
Merge branch 'feature/object-pruning' into 'develop'
...
Object pruning
See merge request pleroma/pleroma!1181
2019-05-22 11:04:30 +00:00
lambda
ff363f70b5
Merge branch 'refactor/keys' into 'develop'
...
move key generation functions into Pleroma.Keys module
See merge request pleroma/pleroma!1186
2019-05-22 06:28:16 +00:00
William Pitcock
1344c85e2f
salmon: fix credo
2019-05-22 05:58:51 +00:00
rinpatch
cdac5efd10
Merge branch 'bugfix/account_view_source.note' into 'develop'
...
MastoAPI AccountView: fill source.note with plaintext version of note
Closes #926
See merge request pleroma/pleroma!1189
2019-05-22 05:39:01 +00:00
Haelwenn (lanodan) Monnier
0e2c215a00
MastoAPI AccountView: fill source.note with plaintext version of note
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/926
2019-05-22 07:22:19 +02:00
Sachin Joshi
17bfd000d7
Ability to reset avatar, profile banner and backgroud
2019-05-22 06:47:18 +02:00
kaniini
79c2cef2fb
Merge branch 'mongooseim-support' into 'develop'
...
MongooseIM: Add basic integration endpoints.
See merge request pleroma/pleroma!1172
2019-05-22 04:06:54 +00:00
kaniini
ab6e15622b
Merge branch 'fix/api-fallback' into 'develop'
...
Do not fallback to index.html for /api/* routes
Closes #920
See merge request pleroma/pleroma!1182
2019-05-22 04:05:41 +00:00
Sergey Suprunenko
9134848170
Do not truncate DM when it contains newlines and safe_dm_mentions is set to true
2019-05-22 04:04:20 +00:00
William Pitcock
045803346d
move key generation functions into Pleroma.Keys module
2019-05-22 03:58:15 +00:00
William Pitcock
a023ca004c
prune objects task: use Repo.delete_all()
2019-05-22 03:12:48 +00:00
Aaron Tinio
3ab9255eda
Respond with a 404 Not implemented JSON error message
...
when requested API is not implemented
2019-05-22 07:15:52 +08:00
William Pitcock
16b260fb19
add mix task to prune the object database using a configured retention period
2019-05-21 21:38:56 +00:00
William Pitcock
73df9d690d
object: fetcher: add support for reinjecting pruned objects
2019-05-21 21:38:56 +00:00
William Pitcock
c2b0b82e6a
object: add Object.prune()
2019-05-21 21:38:56 +00:00
rinpatch
63b0b7190c
MastoAPI: Add GET /api/v1/polls/:id
2019-05-21 20:40:35 +03:00
rinpatch
ff61d34502
Accept question objects for conversations
2019-05-21 17:33:54 +03:00
rinpatch
5f67c26baf
Accept strings in expires_in because sasuga javascript
2019-05-21 17:30:51 +03:00
rinpatch
0407ffe75f
Change validation error status codes to be more appropriate
2019-05-21 17:12:38 +03:00
rinpatch
ee68244141
Do not stream out poll replies
2019-05-21 16:58:15 +03:00
rinpatch
d7c4d029c8
Restrict poll replies when fetching activiites for context
2019-05-21 14:35:20 +03:00
rinpatch
f28747858b
Actual vote count in poll view
2019-05-21 14:27:09 +03:00
rinpatch
a53d062730
Fix posting non-polls from mastofe
2019-05-21 14:19:03 +03:00
rinpatch
aafe30d94e
Handle poll votes
2019-05-21 14:12:10 +03:00
rinpatch
3f96b3e4b8
Enforce poll limits and add error handling for MastodonAPI's post endpoint
2019-05-21 10:54:20 +03:00
rinpatch
76a7429bef
Add poll limits to /api/v1/instance and initial state
2019-05-21 09:13:10 +03:00
kaniini
be6b57193a
Merge branch 'trivial/increase-hackney-timeouts' into 'develop'
...
http: bump connection timeout to 10 seconds
See merge request pleroma/pleroma!1183
2019-05-21 05:15:29 +00:00
William Pitcock
c972d0bb14
http: bump connection timeout to 10 seconds
2019-05-21 04:59:15 +00:00
kaniini
94caca924d
Merge branch 'fix/prometheus-ecto-error-when-not-configured' into 'develop'
...
Fix prometheus-ecto error when not configured
Closes #917
See merge request pleroma/pleroma!1180
2019-05-21 01:36:06 +00:00
kaniini
d4847b17ca
Merge branch 'refactor/add-virtual-thread-muted-field' into 'develop'
...
Add virtual :thread_muted? field
Closes #901
See merge request pleroma/pleroma!1178
2019-05-20 23:30:19 +00:00
Aaron Tinio
f96e9b28bb
Fix prometheus-ecto error when not configured
2019-05-21 07:30:18 +08:00
Aaron Tinio
eb02edcad9
Add virtual :thread_muted? field
...
that may be set when fetching activities
2019-05-21 00:35:46 +08:00
Sadposter
daeae8e2e7
Move default mascot configuration to config/
2019-05-20 16:12:55 +01:00
Sadposter
3d0d9e7a56
Use string map for default mascot
2019-05-20 13:10:04 +01:00
Sadposter
e81f0fc6d4
Add mascot get/set tests
2019-05-20 12:58:06 +01:00
Sadposter
54e9cb5c2d
Add API endpoints for a custom user mascot
2019-05-20 12:39:23 +01:00
Aaron Tinio
2375e9a95b
Add report filtering to MRF.SimplePolicy
2019-05-20 06:02:50 +08:00
rinpatch
6430cb1bf7
Restrict poll replies from fetch queries by default
2019-05-19 17:44:18 +03:00
rinpatch
1d90f9b969
Remove tags/mentions/rich text from poll options because Mastodon and
...
add custom emoji
2019-05-19 17:06:44 +03:00
rinpatch
5ece901af3
Resolve merge conflicts and remove IO.inspects
2019-05-18 13:37:38 +03:00
rinpatch
fd920c8973
Mastodon API: Add support for posting polls
2019-05-18 13:29:28 +03:00
rinpatch
8e9a764dfc
Merge branch 'feature/mrf-always-nsfw' into 'develop'
...
suppress link previews from posts marked sensitive
Closes #865
See merge request pleroma/pleroma!1173
2019-05-18 07:13:18 +00:00
William Pitcock
c4a55e167a
add Changelog entry
2019-05-17 23:00:14 +00:00
William Pitcock
dc08159538
also suppress link previews from posts marked #nsfw
2019-05-17 22:13:24 +00:00
William Pitcock
290f5b2cfe
config: make sending the user agent configurable, disable sending the user agent in tests
2019-05-17 20:28:58 +00:00
William Pitcock
d3b8cd342f
http: request builder: send user-agent when making requests
2019-05-17 19:04:17 +00:00
William Pitcock
0da1233e8e
rich media: suppress link previews if post is marked as sensitive
2019-05-17 18:49:43 +00:00
William Pitcock
78588dbd80
mrf: simple policy: mark all posts instead of posts with media as sensitive if they match media_nsfw
2019-05-17 18:49:10 +00:00
Egor Kislitsyn
3b71612d3d
Improve Pleroma.Web.ActivityPub.ActivityPub.maybe_update_cc/3
2019-05-18 01:17:14 +07:00
lain
075eecec90
Linting.
2019-05-17 18:32:30 +02:00
lain
f959bf7aa6
MongooseIM: Add basic integration endpoints.
2019-05-17 18:21:11 +02:00
Egor Kislitsyn
557f0e33a7
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-17 19:57:14 +07:00
Egor Kislitsyn
f2936e0a07
Add ap_id to List
2019-05-17 19:56:37 +07:00
lain
412a3d8a0f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into rum-index
2019-05-17 12:26:59 +02:00
lambda
e5b34f5e05
Merge branch 'ecto_sql_update' into 'develop'
...
Dependencies: Update Ecto SQL.
See merge request pleroma/pleroma!1160
2019-05-17 10:21:38 +00:00
lambda
1dcdcd8871
Merge branch 'bugfix/903-mastoapi-relationship-requested' into 'develop'
...
MastoAPI account_view.ex: requested is false when following is true
Closes #903
See merge request pleroma/pleroma!1169
2019-05-17 10:07:51 +00:00
lambda
46684db84d
Update account_view.ex
2019-05-17 09:53:44 +00:00
lain
249b31ffe5
Fix specs.
2019-05-17 11:49:13 +02:00
rinpatch
642a67dd44
Render polls in statuses
2019-05-17 11:44:47 +03:00
Alexander Strizhakov
7ed682213f
Fix/902 random compile failing
2019-05-17 07:25:20 +00:00
Sachin Joshi
5c028b8f92
user creation admin api will create multiple users
2019-05-17 12:21:58 +05:45
Haelwenn (lanodan) Monnier
68c75a08e8
MastoAPI account_view.ex: requested is false when following is true
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/903
2019-05-17 07:44:09 +02:00
Aaron Tinio
70235ce840
Fix typo: s/"tags"/"tag"/g
2019-05-17 09:02:34 +08:00
kaniini
bf84d50c76
Merge branch 'feature/890-add-report-uri' into 'develop'
...
Feature/890 add report uri
Closes #890
See merge request pleroma/pleroma!1164
2019-05-16 20:11:12 +00:00
Sergey Suprunenko
2c303afc8b
Remove duplicated entries in users' following lists
2019-05-16 20:04:08 +00:00
Sergey Suprunenko
e2b3a27204
Add Reports to Admin API
2019-05-16 19:09:18 +00:00
feld
e190b3022b
Merge branch 'fix/domain-unblocked-reblogs' into 'develop'
...
Fix domain-unblocked reblogs
Closes #892
See merge request pleroma/pleroma!1157
2019-05-16 18:57:14 +00:00
Mark Felder
efa61c1610
Move to pleroma.database mix task
2019-05-16 13:14:48 -05:00
Mark Felder
ebb0482116
Merge branch 'develop' into conversations-import
2019-05-16 13:11:17 -05:00
lambda
fde30aee43
Merge branch 'feature/sql-thread-sat' into 'develop'
...
SQL thread visibility solver
See merge request pleroma/pleroma!971
2019-05-16 13:44:22 +00:00
Alexander Strizhakov
73ae58fdfa
Feature/896 toggling confirmation
2019-05-16 13:23:41 +00:00
Egor Kislitsyn
fc7246d715
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-16 17:54:24 +07:00
Alex S
9d14214eb9
Merge branch 'develop' into feature/890-add-report-uri
2019-05-16 12:54:06 +07:00
Alex S
aa11fa4864
add report uri and report to
2019-05-16 12:49:40 +07:00
William Pitcock
c31026423c
publisher: use the correct queue name for outgoing federation
2019-05-16 04:41:27 +00:00
Aaron Tinio
793f1834d2
Use named binding to conditionally join object
2019-05-16 06:25:14 +08:00
Aaron Tinio
2b6119dfbf
Restrict reblogs of activities from blocked domains
2019-05-16 05:53:51 +08:00
rinpatch
62e42b03ab
Handle incoming Question objects
2019-05-15 20:10:16 +03:00
William Pitcock
a591ab6112
activity pub: remove Ecto SQL query dumps
2019-05-15 16:56:46 +00:00
William Pitcock
f09c3afdf5
chase test failures
2019-05-15 16:23:01 +00:00
William Pitcock
0aada88b55
bbs: chase timeline containment patch
2019-05-15 16:02:15 +00:00
William Pitcock
31db31c587
activitypub: visibility: use SQL thread_visibility() function instead of manually walking the thread
2019-05-15 15:54:10 +00:00
William Pitcock
de114ffbb0
activitypub: remove contain_timeline()
2019-05-15 15:53:06 +00:00
William Pitcock
0387f52138
activitypub: add restrict_thread_visibility()
2019-05-15 15:53:06 +00:00
lain
f168a1cbdc
Merge remote-tracking branch 'origin/develop' into conversations-import
2019-05-15 17:47:29 +02:00
kaniini
62516be9c4
Merge branch 'fix/public-option-not-working' into 'develop'
...
Fix public option not working
Closes #873
See merge request pleroma/pleroma!1143
2019-05-15 15:42:21 +00:00
lambda
4440e23547
Merge branch 'chore/extricate-http-signatures' into 'develop'
...
switch to pleroma/http_signatures library
See merge request pleroma/pleroma!1155
2019-05-15 15:37:31 +00:00
lain
7a92e701b9
CommonAPI: Visibility refactor.
2019-05-15 16:35:33 +02:00
lain
cbb3451023
CommonAPI: Refactor visibility, forbid public to private replies.
2019-05-15 16:30:08 +02:00
lain
f1e67bdc31
Search: Add optional rum indexing / searching.
2019-05-15 15:28:01 +02:00
Sachin Joshi
ee22fff5ac
remove deprecated PleromaFE configuration
2019-05-15 15:29:59 +05:45
Egor Kislitsyn
a7a8f3bc2c
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-15 14:31:24 +07:00
Aaron Tinio
70c81b95d0
Pipe requests to public endpoints through EnsurePublicOrAuthenticatedPlug
2019-05-15 05:09:32 +08:00
Aaron Tinio
7b8dc99ef1
Implement Pleroma.Plugs.EnsurePublicOrAuthenticated
2019-05-15 05:09:29 +08:00
William Pitcock
071f78733a
switch to pleroma/http_signatures library
2019-05-14 20:03:13 +00:00
Mark Felder
1caa6331ea
Group def perform() together to fix the build
2019-05-14 12:33:03 -05:00
lambda
fa4bd898f1
Merge branch 'fix/gopher' into 'develop'
...
gopher: fix rendering of post content (closes #895 )
Closes #895
See merge request pleroma/pleroma!1150
2019-05-14 15:41:37 +00:00
William Pitcock
51325fd60c
gopher: fix rendering of post content ( closes #895 )
2019-05-14 15:35:06 +00:00
lambda
692919c7d2
Merge branch 'refactor/use-job-queue-everywhere' into 'develop'
...
use job queue everywhere
Closes #862
See merge request pleroma/pleroma!1142
2019-05-14 15:27:34 +00:00
William Pitcock
ac3a3abf6b
clean up follow/block imports a little
2019-05-14 15:07:38 +00:00
kaniini
dfd031c26a
Merge branch 'fix/pleroma-config-get-when-value-is-false' into 'develop'
...
Fix Pleroma.Config.get!/1 raising an error when value is false
See merge request pleroma/pleroma!1148
2019-05-14 14:58:45 +00:00
Maksim
52297920e7
Refactoring oauth response.
2019-05-14 14:49:45 +00:00
Egor Kislitsyn
e82e73478e
Merge remote-tracking branch 'pleroma/develop' into feature/addressable-lists
2019-05-14 19:00:07 +07:00
Egor Kislitsyn
b92c004ea8
Reuse query from User.restrict_deactivated/1
2019-05-14 18:29:10 +07:00
Egor Kislitsyn
5e2b491276
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-14 18:15:56 +07:00
Aaron Tinio
a18b2c0b12
Fix Pleroma.Config.get!/1 raising an error when value is false
2019-05-14 06:40:59 +08:00
Mark Felder
bbacdf2352
Bump Mastodon API level
2019-05-13 15:52:16 -05:00
Mark Felder
498bfdf403
Switch to Jason over Poison
2019-05-13 15:37:38 -05:00
William Pitcock
69a9e0563c
user: migrate follow/blocks import to job queue
2019-05-13 19:36:00 +00:00
William Pitcock
57d11ac9db
activitypub: move post rich media fetching to job queue
2019-05-13 19:36:00 +00:00
William Pitcock
32d4630c9c
user: move initial post fetching to job queue
2019-05-13 19:36:00 +00:00
lambda
b14a314ce7
Merge branch 'feature/federator-behaviours' into 'develop'
...
federator modularization (outgoing)
See merge request pleroma/pleroma!1140
2019-05-13 18:58:04 +00:00
Alexander Strizhakov
a2be420f94
differences_in_mastoapi_responses.md: fullname & bio are optionnal
...
[ci skip]
2019-05-13 18:35:45 +00:00
Sachin Joshi
7701a4c841
Make irreversible field default to false in filters
2019-05-14 00:13:15 +05:45
Mark Felder
786f2c7a84
Update shortdoc description
2019-05-13 11:16:54 -05:00
Egor Kislitsyn
23276e8d68
Use pseudo ap id of a list in BCC
2019-05-13 16:15:14 +07:00
William Pitcock
44b182732e
nodeinfo: gather supported protocol names from federation modules
2019-05-12 19:15:29 +00:00
William Pitcock
28f7f4c6de
webfinger: build the response based on enabled federation modules
2019-05-12 19:05:03 +00:00
William Pitcock
80759f012e
xml builder: properly escape quotes
2019-05-12 19:04:37 +00:00
William Pitcock
55fa4b812a
federator: websub removal
2019-05-12 05:04:24 +00:00
William Pitcock
c23276a59a
activitypub: publisher: fixups
2019-05-12 05:04:24 +00:00
William Pitcock
fedaca15a3
websub: adapt to work as a federator publishing module
2019-05-12 05:04:24 +00:00
William Pitcock
179293e51c
salmon: refactor to work as a federator publishing module
2019-05-12 05:04:21 +00:00
William Pitcock
2aee62a456
federator: publisher: only attempt publishing if we know the activity is representable
2019-05-12 05:04:16 +00:00
William Pitcock
69158f1065
ostatus: only as:Public activities are representable
2019-05-12 05:04:16 +00:00
William Pitcock
85377c0b67
federator: move activitypub relaying to the AP publisher module
2019-05-12 05:04:16 +00:00
William Pitcock
676752bb83
federator: hook up Publisher.publish()
2019-05-12 05:04:16 +00:00
William Pitcock
f7a6a37c4e
federator: remove no longer used :publish_single_ap
2019-05-12 05:04:16 +00:00
William Pitcock
10695a28d2
federator: publisher: add publish() wrapper
2019-05-12 05:04:16 +00:00
William Pitcock
0afc8d7856
federator: publisher: integrate job queue, simplify publish_one logic
2019-05-12 05:04:16 +00:00
William Pitcock
ef1f9e8d4e
activitypub: split out outgoing federation into a federation module
2019-05-12 05:04:11 +00:00
William Pitcock
e7d292f80e
federator: add publisher module defining a contract for publishing behaviours
2019-05-12 03:08:50 +00:00
rinpatch
b9f84a382a
Normalize the object only after ensuring the activity type is Create
2019-05-12 03:01:42 +03:00
kaniini
131f883207
Merge branch 'fix/ostatus-activity-representer-depends-on-emebeded-objects' into 'develop'
...
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
See merge request pleroma/pleroma!1129
2019-05-11 16:52:26 +00:00
lain
01c45ddc9e
Search: Use RUM index.
2019-05-11 11:26:46 +02:00
Sachin Joshi
f01f995816
make url uniform in admin api
2019-05-11 14:46:00 +05:45
Roman Chvanikov
f1f7a11222
Merge develop
2019-05-11 14:45:54 +07:00
feld
c953ae8c3d
Initial bundle of basic AdminFE
...
Due to CSP headers we only allow connecting to self. If you want to
host AdminFE on a separate domain without CSP headers you will be able
to connect to any public Pleroma host.
2019-05-11 01:34:17 +00:00
rinpatch
1d78e42fd4
Remove get_in_reply_to calls in some functions because the result is unused and it does not have any side-effects
2019-05-10 13:49:34 +03:00
Francis Dinh
2a54e8c1f5
Use "repeated" instead of "retweeted" for repeated statuses in Twitter API
...
This makes it consistent with the language used in Pleroma FE (at least
in English).
Resolves https://git.pleroma.social/pleroma/pleroma-fe/issues/533
2019-05-09 19:58:34 -04:00
rinpatch
e4523c3010
Fix get_in_reply_to in OStatus' activity representer depending on embedded objects
2019-05-09 22:27:00 +03:00
lain
a33bec7d58
Conversations: Import order, import as read.
2019-05-09 16:39:28 +02:00
lain
e6d7f8d223
Credo fixes.
2019-05-08 18:19:20 +02:00
lain
6d19bb4eae
Conversations: Add mix task to 'import' old DMs.
2019-05-08 18:09:07 +02:00
lain
a4598b5e8b
Visibility: Make it more resilient.
2019-05-08 18:08:50 +02:00
lain
920bd47055
ActivityPub: Remove leftover printf debugging.
2019-05-08 17:40:24 +02:00
lain
fcf2f38d20
Conversations: Add a function to 'import' old DMs.
2019-05-08 17:37:00 +02:00
Alexander Strizhakov
bfeb33e951
Merge develop
...
Merge conflict in lib/pleroma/activity.ex
2019-05-08 14:34:36 +00:00
Alex S
a76e2622ca
emoji dowload follow redirects
2019-05-08 19:05:25 +07:00
Maksim
799e1f48b5
Refactoring functions for dealing with oauth scopes.
2019-05-08 10:52:13 +00:00
Roman Chvanikov
b6b5b16ba4
Merge develop
2019-05-08 17:08:06 +07:00
kaniini
14deed7f7d
Merge branch 'refactor/preload-bookmarks-with-activities' into 'develop'
...
Optimize bookmarks by preloading them with activities
Closes #861
See merge request pleroma/pleroma!1121
2019-05-07 19:37:41 +00:00
William Pitcock
d64c3b604e
twitterapi: use order constraint to force descending order
2019-05-07 19:33:25 +00:00
William Pitcock
6020ff3fb6
activitypub: add optional order constraint to timeline query builder
2019-05-07 19:33:22 +00:00
rinpatch
4c5125dedc
Remove bookmarks assoc and add a fake bookmark assoc instead
2019-05-07 19:33:22 +00:00
rinpatch
be067ec2ab
Use with_preloaded_bookmark in create_by_object_ap_id_with_object
2019-05-07 19:33:22 +00:00
rinpatch
3a7c14645e
- Actually use preloaded bookmarks in views
...
- Preload bookmarks in bookmark timeline
- Rework bookmark preload tests
2019-05-07 19:33:22 +00:00
rinpatch
f841eb7cdb
Preload bookmarks wherever the object is preloaded
2019-05-07 19:33:22 +00:00
rinpatch
06947c9147
Remove bookmarks assoc
2019-05-07 19:33:22 +00:00
kaniini
a1a0df19c4
Merge branch 'docs/MRF-modules' into 'develop'
...
Documentation: MRF Modules
See merge request pleroma/pleroma!1122
2019-05-07 16:15:27 +00:00
William Pitcock
e71ddf23ba
containment: remove pointless moduledoc line
2019-05-07 16:11:22 +00:00
lambda
238dd72fad
Merge branch 'conversations_three' into 'develop'
...
Conversations once more.
See merge request pleroma/pleroma!1119
2019-05-07 14:43:21 +00:00
Egor Kislitsyn
1557b99beb
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-05-07 16:51:11 +07:00
Maksim
1040caf096
fix format
...
Modified-by: Maksim Pechnikov <parallel588@gmail.com>
2019-05-06 17:51:03 +00:00
lambda
aacac9da0b
Merge branch 'feature/bbs' into 'develop'
...
BBS / SSH
See merge request pleroma/pleroma!997
2019-05-06 17:17:03 +00:00
Alexander Strizhakov
ce6ca0fefe
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion
2019-05-06 16:45:22 +00:00
Haelwenn (lanodan) Monnier
69a5074893
Remove H1 in @moduledoc
2019-05-06 04:53:12 +02:00
Haelwenn (lanodan) Monnier
e41a2f98d5
mrf/tag_policy.ex: Add some documentation
...
mrf_tag:disable-remote-subscription exact way of working is quite
unclear to me. Is it the requester that is denied if they have a tag,
or is it the requestee if they have one?
2019-05-06 04:53:11 +02:00
Haelwenn (lanodan) Monnier
af62ace954
Add short documentation on every MRF Policy
2019-05-06 04:49:50 +02:00
lain
eb0fb73ddb
BBS: Credo fixes.
2019-05-04 15:47:50 +02:00
lain
c9d1cb2dce
BBS: Use cached user fetcher.
2019-05-04 15:08:07 +02:00
lain
4c76f49e60
BBS: small fixes.
2019-05-04 15:06:18 +02:00
lain
6ad8ddfd29
Merge remote-tracking branch 'origin/develop' into feature/bbs
2019-05-04 15:00:45 +02:00
rinpatch
d089ff2460
Merge branch 'fix/embeded-relationship-in-follows' into 'develop'
...
Fix embeded relationships in Mastodon API
See merge request pleroma/pleroma!1118
2019-05-03 20:36:13 +00:00
rinpatch
9907e974ca
Merge branch 'fix-search-speed' into 'develop'
...
Search: Add fts index on objects table.
See merge request pleroma/pleroma!1120
2019-05-03 18:35:02 +00:00
lain
0e37fddd5a
Search: Add fts index on objects table.
2019-05-03 19:21:09 +02:00
Haelwenn (lanodan) Monnier
b5ad1715b2
MastoAPI: profile update with emoji_map
2019-05-03 16:41:23 +02:00
Haelwenn (lanodan) Monnier
46bbf9e1cf
TwitterAPI: profile update with emoji_map
2019-05-03 16:30:24 +02:00
Haelwenn (lanodan) Monnier
85434669bb
Web.TwitterAPI.UserView: Also view local user emojis
2019-05-03 16:27:51 +02:00
Haelwenn (lanodan) Monnier
2f76a40d02
formatter.ex: Add get_emoji_map/1
2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier
d70af32127
Pleroma.User: remove emojify on parse_bio
2019-05-03 16:27:50 +02:00
Haelwenn (lanodan) Monnier
85b5c60694
Pleroma.Formatter: width/height to class=emoji
2019-05-03 16:25:58 +02:00
lain
c42ded13a2
Credo fixes.
2019-05-03 13:53:17 +02:00
feld
acb04306b6
Standardize construction of websocket URL
...
This follows up on the change made in d747bd98
2019-05-03 11:45:04 +00:00
lain
a0c755cc4a
MastodonApi: Bump api level.
2019-05-03 13:40:43 +02:00
lain
81d1aa424d
Streamer: Stream out Conversations/Participations.
2019-05-03 13:39:14 +02:00
rinpatch
38b79461df
Fix embeded relationships in Mastodon API
...
Currently some endpoints render accounts without for user resulting in
embedded relationship being empty. It causes bugs in followers/following
tab in pleroma-fe but I fixed it for other endpoints as well just in
case
2019-05-03 00:49:17 +03:00
lambda
497d34b825
Merge branch 'iss-849' into 'develop'
...
Parse access_token from body parameters and URL parameters
See merge request pleroma/pleroma!1103
2019-05-02 14:17:17 +00:00
AkiraFukushima
533d8cd581
Parse access_token from body parameters and URL parameters
2019-05-02 21:04:00 +09:00
Mark Felder
3c4cab9be1
Merge branch 'develop' into update-oauth-template
2019-05-01 12:32:17 -05:00
Mark Felder
9a98f48ec3
Remove incorrect statement about valid characters
2019-05-01 12:29:48 -05:00
Roman Chvanikov
8af55728e4
Fix tests
2019-05-01 19:03:55 +02:00
lain
45f790becc
Merge remote-tracking branch 'origin/develop' into conversations_three
2019-05-01 18:40:41 +02:00
Maksim
c854bff8f5
Refactored Pleroma.Web.Auth.Authenticator
2019-05-01 13:28:04 +00:00
rinpatch
51e26f14f7
Remove redundant ensure_scrubbed_html
...
It is never used as handling for fake and non-fake activities was merged
into one function above it
2019-05-01 13:52:44 +03:00
lambda
0bcdaf378e
Merge branch 'bugfix/web-notification-special-char' into 'develop'
...
fix the web push notification with special char for status created
See merge request pleroma/pleroma!1092
2019-05-01 10:45:32 +00:00
Egor Kislitsyn
a3dc02d282
Add addressable lists
2019-05-01 16:11:17 +07:00
Alex S
f11e7037c2
test fixes
2019-05-01 16:09:53 +07:00
Alex S
bdfa3a6fa8
Merging with develop
...
Conflicts:
lib/pleroma/web/activity_pub/transmogrifier.ex
lib/pleroma/user.ex
2019-05-01 12:29:33 +07:00
Sachin Joshi
85fa2fbce4
add scrubber for html special char
2019-05-01 01:37:17 +05:45
Sachin Joshi
cd6da3606b
Merge branch 'develop' into bugfix/web-notification-special-char
2019-05-01 00:21:30 +05:45
rinpatch
ce4825c1dc
Do not normalize objects in stream_out unless the activity type is
...
Create
Saves quite a bit of time with delete activities because they would
always query the db
2019-04-30 20:21:28 +03:00
Roman Chvanikov
0f0cc2703b
Merge develop
2019-04-30 20:17:52 +07:00
lain
b0951a8849
WebPush: Use Object.normalize, rewrite tests so they test reality.
2019-04-29 18:15:30 +02:00
rinpatch
0fd176b990
Merge branch 'fix/add-default-scope-mastoapi' into 'develop'
...
Add default_scope to /api/v1/update_credentials
See merge request pleroma/pleroma!1100
2019-04-29 06:45:18 +00:00
kaniini
292c69481b
Merge branch 'regression/rights-only-for-admin' into 'develop'
...
Fix `rights` in TwitterAPI's user entity being present only for Admins/Moderators
See merge request pleroma/pleroma!1102
2019-04-28 23:05:14 +00:00
rinpatch
61ca2f7a4e
Fix rights in TwitterAPI's user entity being present only for
...
Admins/Moderators
In !1093 I reused `maybe_with_role` for `rights` object, however I
missed that `maybe_with_role` is called only for admins/moderators.
2019-04-28 19:42:43 +03:00
rinpatch
ce3789e39a
Add default_scope to /api/v1/update_credentials
2019-04-27 23:55:54 +03:00
rinpatch
c3e9fcf098
Fix bookmarks depending on embeded object and move checking if the
...
status is bookmarked to SQL
2019-04-27 23:06:46 +03:00
kaniini
002ea343f8
Merge branch 'feature/bbcode' into 'develop'
...
BBCode support (backend)
See merge request pleroma/pleroma!1097
2019-04-27 07:44:24 +00:00
William Pitcock
501af917b5
add support for bbcode
2019-04-26 22:35:02 +00:00
lambda
4de5fef1f8
Merge branch 'feature/807-bookmark-endpoint-extension' into 'develop'
...
Feature/807 bookmark endpoint extension
Closes #807
See merge request pleroma/pleroma!1059
2019-04-26 11:59:47 +00:00
kaniini
48f68fd133
Merge branch 'feature/mastoapi-new-config' into 'develop'
...
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
This patch:
- Fixes `rights` in TwitterAPI ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
See merge request pleroma/pleroma!1093
2019-04-26 02:41:35 +00:00
Mark Felder
24c3e2db2c
Add mediaproxy whitelist capability
2019-04-25 18:11:47 -05:00
rinpatch
dfc8425659
Move settings to Source subentity
2019-04-25 10:31:14 +03:00
Alex S
a825056d4d
test fixes
2019-04-25 14:09:57 +07:00
Alex S
85953c0836
fixes for tests
2019-04-25 13:46:40 +07:00
Alex S
229ce6abbc
migration without using old field name
...
removing old field from db, after bookmarks migration
2019-04-25 13:42:10 +07:00
Alex S
3c2ae80008
unused
2019-04-25 13:42:10 +07:00
Egor Kislitsyn
c157e27a00
Merge branch 'develop' into feature/disable-account
2019-04-25 13:41:10 +07:00
Alex S
1258128f4f
favourites add bookmark display
2019-04-25 13:38:24 +07:00
Alex S
324c9c8ab5
migrate user.bookmarks to separate table
2019-04-25 13:38:24 +07:00
Alex S
73d01857e3
bookmarks in separate table
2019-04-25 13:38:24 +07:00
William Pitcock
0fd0ffcd76
activitypub: transmogrifier: send reject follow if following does not succeed
2019-04-25 00:48:45 +00:00
rinpatch
4baea6e6d9
Fix leaking private configuration parameters in Mastodon and Twitter APIs, and add new configuration parameters to Mastodon API
...
This patch:
- Fixes `rights` in twitterapi ignoring `show_role`
- Fixes exposing default scope of the user to anyone in Mastodon API
- Extends Mastodon API to be able to show and set `no_rich_text`, `default_scope`, `hide_follows`, `hide_followers`, `hide_favorites` (requested by the FE in #674 )
Sorry in advance for 500 line one commit diff, I should have split it up to separate MRs
2019-04-24 20:01:42 +03:00
Sachin Joshi
963d5774af
fix the status notification with special char
2019-04-24 07:06:17 +05:45
kaniini
030a7876b4
Merge branch 'security/fix-html-class-scrubbing' into 'develop'
...
html: lock down allowed class attributes to only those related to microformats
See merge request pleroma/pleroma!1090
2019-04-23 23:07:56 +00:00
William Pitcock
f5535e5743
html: lock down allowed class attributes to only those related to microformats
2019-04-23 23:03:45 +00:00
Sergey Suprunenko
9dd36e5bcb
Extend Mastodon API with public endpoint for getting Favorites timeline of any user ( #789 )
2019-04-23 02:47:43 +00:00
kaniini
10c40e13d2
Merge branch 'mastoapi/add-in-reply-to-screen-name' into 'develop'
...
Add `in_reply_to_account_acct` to MastoAPI status entity
See merge request pleroma/pleroma!1086
2019-04-23 02:43:53 +00:00
kaniini
aa9d378985
Merge branch 'fix/normalize-activities' into 'develop'
...
Normalize acitvities instead of objects inside them
See merge request pleroma/pleroma!1085
2019-04-23 02:43:26 +00:00
Alex S
d35246c449
added healthcheck setting to instance config
2019-04-22 17:00:06 +07:00
rinpatch
f60d072bbb
Add pleroma.in_reply_to_account_acct to MastoAPI status entity
2019-04-22 11:54:27 +03:00
rinpatch
d21d921def
Replace Object.normalize(activity.data[object] with Object.normalize(acitivty) to benefit from preloading
2019-04-22 11:27:29 +03:00
rinpatch
952a4ae68e
Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix
...
task docs
2019-04-22 11:02:31 +03:00
Egor
b9cdf6d3b9
Use User.get_cached* everywhere
2019-04-22 07:20:43 +00:00
Alexander Strizhakov
88f0be9693
Feature/826 healthcheck endpoint
2019-04-22 07:19:53 +00:00
Egor Kislitsyn
e8c2f9a73a
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-22 13:08:30 +07:00
kaniini
7fcbda702e
Merge branch 'rework-emoji-management' into 'develop'
...
Remove finmoji and add a way to download emojis in packs
Closes #817 and #821
See merge request pleroma/pleroma!1073
2019-04-22 02:07:19 +00:00
Ekaterina Vaartis
3cefdc62e0
Fix emoji.txt / custom_emoji.txt / shortcode_globs handling
2019-04-21 23:07:14 +03:00
Ekaterina Vaartis
ba19ba8a88
Formatting
2019-04-21 22:33:54 +03:00
Ekaterina Vaartis
153f5375a6
Replace MD5 with SHA256 for emoji pack verification
2019-04-21 22:28:41 +03:00
Ekaterina Vaartis
d5c0fd35e1
Wrap the docstrings to 70 characters
2019-04-21 22:16:46 +03:00
Roman Chvanikov
4908e0eeee
Fix Credo warning
2019-04-21 23:24:33 +07:00
Roman Chvanikov
eeb093631c
Fix Credo warning
2019-04-21 23:19:36 +07:00
Roman Chvanikov
e56afefef9
Refactor conversation function in MastodonAPIController to use a View
2019-04-21 23:14:27 +07:00
Roman Chvanikov
2662bea4e0
Add accounts and last_status to conversation read response
2019-04-21 20:26:13 +07:00
Roman Chvanikov
f1d90ee942
Remove debug code
2019-04-21 16:40:05 +07:00
Roman Chvanikov
2359ee38b3
Set digest emails to false by default
2019-04-21 16:36:25 +07:00
Ivan Tashkinov
9256d2d4b4
[ #923 ] Refactored OAuthController#authorize definitions, added test.
2019-04-21 10:51:32 +03:00
eugenijm
375fd21055
Set correct values in the MastoAPI reblog status view
2019-04-21 05:40:22 +03:00
Roman Chvanikov
24073f829f
Refactor query to return only 1 message instead of 20
2019-04-21 00:40:41 +07:00
Roman Chvanikov
724311e151
Fix Credo warnings
2019-04-20 19:57:43 +07:00
Roman Chvanikov
60f213bb1a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-20 19:43:06 +07:00
Roman Chvanikov
64a2c6a041
Digest emails
2019-04-20 19:42:19 +07:00
Ekaterina Vaartis
8f93d4c423
Remove most finmoji mentions where appropriate
2019-04-20 15:42:14 +03:00
Ekaterina Vaartis
53a3e61016
Fix priv/static/instance/static to be just instance/static
...
It was a misunderstanding
2019-04-20 15:08:51 +03:00
Ekaterina Vaartis
31cff7dbca
Document the pleroma.emoji task
2019-04-20 15:06:07 +03:00
Ekaterina Vaartis
1e311d6662
Add a newline at the end of pack in ls-packs
2019-04-20 11:34:03 +03:00
Ekaterina Vaartis
52ed287e87
Fix incorrect multiple emoji tag handling introduced in initial impl
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
9bd5e2dec9
Make emoji default_manifest a config option
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
98d4b3de53
Treat the manifest path as a file if it doesn't start with http
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
aaaa428512
mix format
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
a141f0807b
Assume packs without emoji.txt only have emoji pictures, unhardcode
...
unhardcode: remove hardcoded /instance/static and actually use the config option
as it is used in other places.
packs without emoji.txt: these are now assumed to have .png files that
are all emojis, their names are used as shortcodes
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
eff725c3af
Add a task to generate emoji packs
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
1e44b5478d
Remove useless comment
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
c5b7286b5f
Move helper functions of emoji manager task down in the file
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
06db3ee1a8
Add MD5 verification for emoji pack source
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
af5494f942
Separate emoji pack file lists in a different file
...
The file should be in the same directory as the manifest file
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
21b39c54a3
Allow using a custom manfest and getting multiple packs at once
...
A custom manifest can be provided as a command-line options --manifest/-m
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis
c26724cc55
Remove finmoji and add a way to download emojis in packs
...
These packs are stored in a git repo on pleroma gitlab
2019-04-20 11:17:17 +03:00
eugenijm
fa48532387
Handle reblogs on the first follow request in MastoAPI
2019-04-20 04:39:49 +03:00
kaniini
9da8b287f8
Merge branch 'feature/database-compaction' into 'develop'
...
database compaction
See merge request pleroma/pleroma!473
2019-04-19 16:55:33 +00:00
Roman Chvanikov
73407f4eea
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-19 23:27:13 +07:00
Roman Chvanikov
bc7862106d
Fix tests
2019-04-19 23:26:41 +07:00
Roman Chvanikov
8add119444
Add User.list_inactive_users_query/1
2019-04-19 22:19:00 +07:00
Roman Chvanikov
aeafa0b2ef
Add Notification.for_user_since/2
2019-04-19 22:16:17 +07:00
Alexander Strizhakov
ada384207b
typo fix
...
docs for RelMe provider
2019-04-19 07:50:21 +00:00
lambda
218d96a26b
Merge branch '923_oauth_consumer_refactoring_ci' into 'develop'
...
OAuth consumer params handling refactoring
See merge request pleroma/pleroma!1047
2019-04-19 07:49:26 +00:00
rinpatch
f9865cf943
Stream out deletes, mistakingly removed when resolving merge conflicts
2019-04-19 00:47:02 +03:00
rinpatch
73b8c5387b
Add some logging
2019-04-19 00:17:37 +03:00
rinpatch
945325013a
remove query timeouts
2019-04-18 23:58:59 +03:00
rinpatch
099f89367e
Replace embedded object migration with a mix task
2019-04-18 23:34:01 +03:00
rinpatch
9238dccac1
Add a guard to fetching reply activity
2019-04-18 21:40:40 +03:00
Haelwenn
eba3db0966
Merge branch 'bugfix/filter-boosted-blocks' into 'develop'
...
activitypub: fix filtering of boosts from blocked users
See merge request pleroma/pleroma!1074
2019-04-18 18:29:57 +00:00
Mark Felder
1aa4994f6d
Do not require authentication for user search in MastoAPI
2019-04-18 12:44:25 -05:00
rinpatch
a11ca87f40
Add a migration to remove embeded objects
2019-04-18 13:10:38 +03:00
rinpatch
83589ca6a5
Merge branch 'develop' into feature/database-compaction
2019-04-18 12:56:38 +03:00
rinpatch
ac04311b3f
Fix search in TwitterAPI
2019-04-18 10:24:06 +03:00
rinpatch
6069d0fd36
Fix object search depending on embeded object
2019-04-18 09:28:20 +03:00
rinpatch
e31a22043b
Fix media timeline depending on embeded object and add some guards
2019-04-18 08:31:08 +03:00
rinpatch
2abc09570f
Use the preloaded object in tag queries
2019-04-18 01:37:04 +03:00
William Pitcock
36f78c6dcd
activitypub: fix filtering of boosts from blocked users
2019-04-17 22:27:59 +00:00
William Pitcock
2140e164d7
activitypub: properly filter out transitive activities concerning blocked users
2019-04-17 20:05:09 +00:00
rinpatch
35ac672b8d
Remove containment tests from transmogrifier and fix thread visibility solver
2019-04-17 17:59:15 +03:00
rinpatch
4c289e924e
Fix delete-by_ap_id to expect not only embeded objects
2019-04-17 16:35:01 +03:00
rinpatch
8e4d950f31
Remove updating reply count for embeded objects
2019-04-17 15:54:09 +03:00
rinpatch
c3a2052806
If it's an object struct it is already normalized
2019-04-17 15:11:22 +03:00
rinpatch
a53b917e7f
oof
2019-04-17 14:55:26 +03:00
rinpatch
ad681877df
Make credo happy
2019-04-17 14:52:01 +03:00
rinpatch
e641651e2b
Fix unbookmarking
2019-04-17 14:27:02 +03:00
rinpatch
e7c3c36766
Update functions in object fetcher for tesla and set up a proper mock for tests
2019-04-17 14:21:39 +03:00
rinpatch
b09ae02c04
Added some more normalization calls all in mastodon api controller
2019-04-17 13:04:58 +03:00
Roman Chvanikov
2f0203a4a1
Resolve conflicts
2019-04-17 16:59:05 +07:00
Roman Chvanikov
87013f8438
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-17 16:58:08 +07:00
rinpatch
462028688b
Fix pinned posts relying on embded objects
2019-04-17 12:34:19 +03:00
rinpatch
627e5a0a49
Merge branch 'develop' into feature/database-compaction
2019-04-17 12:22:32 +03:00
Ivan Tashkinov
128aae05f3
[ #923 ] Minor semantic adjustment.
2019-04-17 11:33:21 +03:00
kaniini
73df3046e0
Merge branch 'feature/788-separate-email-addresses' into 'develop'
...
Feature/788 separate email addresses
Closes #788
See merge request pleroma/pleroma!1040
2019-04-16 18:44:07 +00:00
kaniini
02a53d00c9
Merge branch 'fix/remote-follow-auth' into 'develop'
...
Fix: remote follows should not ask user to log-in again for authorization
See merge request pleroma/pleroma!1060
2019-04-16 18:40:56 +00:00
Haelwenn
cde7711b12
Merge branch 'bugfix/relax-spam-protection' into 'develop'
...
activitypub: allow indirect messages from users being followed at a personal inbox
See merge request pleroma/pleroma!1069
2019-04-16 18:38:11 +00:00
Normandy
d4a749cfb2
Handle new-style mastodon follow lists
...
Fixes https://git.pleroma.social/pleroma/pleroma/issues/814
2019-04-16 18:35:38 +00:00
William Pitcock
750b369d04
activitypub: allow indirect messages from users being followed at a personal inbox
2019-04-16 18:31:12 +00:00
Hakurei Reimu
6e26ac10a3
make Pleroma.Endpoint use extra_cookie_attrs in config
2019-04-16 22:20:56 +08:00
lain
76999c73a7
Conversation: Add accounts to output.
2019-04-15 22:28:42 +02:00
lain
0da985182f
Conversation: Return full status object, id is a string.
2019-04-15 21:58:58 +02:00
lain
c1ebb38d3a
Conversation: Also create participations for remote users.
...
Needed to get the participating user list.
2019-04-15 21:45:25 +02:00
lambda
56956de6fa
Merge branch 'fix/status-reblogged' into 'develop'
...
Assign reblogged in the Mastodon reblog status view
Closes #812
See merge request pleroma/pleroma!1057
2019-04-15 10:26:23 +00:00
lambda
f358295cbe
Merge branch 'unfollow-oneself' into 'develop'
...
Consistent response for self follow/unfollow
Closes #819
See merge request pleroma/pleroma!1061
2019-04-15 10:24:37 +00:00
eugenijm
27d78dc526
Use User.get_cached_by*
2019-04-15 12:37:49 +03:00
rinpatch
5d73dca064
Remove inReplyToStatusId
2019-04-15 11:50:36 +03:00
eugenijm
507e7821e3
Handle follow/unfollow directed to themselves
2019-04-15 10:21:18 +03:00
Roman Chvanikov
dc21181f65
Update updated_at field on notification read
2019-04-14 22:29:05 +07:00
Sadposter
e513504e88
Revert "Assert on the success of enqueue before returning"
...
This reverts commit 16d8c8b33b
2019-04-14 16:12:54 +01:00
Sadposter
16d8c8b33b
Assert on the success of enqueue before returning
2019-04-14 16:05:26 +01:00
Sadposter
5e45557751
Always return {atom, _} from try_send_confirmation
2019-04-14 16:01:48 +01:00
Sadposter
ec42b639a3
fix pattern match on user registration
...
deliver_async will return a single atom
2019-04-14 15:46:54 +01:00
eugenijm
679a8ef629
Assign reblogged in the Mastodon reblog status view
2019-04-14 11:35:15 +03:00
Roman Chvanikov
0cd4b6024d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email
2019-04-14 14:05:21 +07:00
Roman Chvanikov
371a4aed2c
Add User.Info.email_notifications
2019-04-13 17:40:42 +07:00
Alex S
c349573791
Merge develop to 788-separate-email-addresses
...
Merge conflicts:
test/web/twitter_api/twitter_api_test.exs
test/web/twitter_api/twitter_api_controller_test.exs
test/web/admin_api/admin_api_controller_test.exs
2019-04-13 12:24:38 +07:00
Alex S
a64eb2b389
fallback to the old behaviour
...
admin and user mailers
2019-04-13 12:20:36 +07:00
Egor
f9af90c5aa
Revert "simplify mentions escape"
...
This reverts commit f3e06a1030636f24f7129dd93bb9780e67fb7de1.
2019-04-12 19:25:53 +00:00
lambda
184ae60b21
Merge branch 'bugfix/pleroma-email-naming' into 'develop'
...
Make the filename and module name of Pleroma.Emails.* orthogonal
See merge request pleroma/pleroma!1029
2019-04-12 10:41:09 +00:00
Egor Kislitsyn
dd097a406b
add tests
2019-04-12 16:38:32 +07:00
lambda
0a09692c7d
Merge branch 'features/mastoapi/2.6.0-min_id-pagination' into 'develop'
...
Features: mastoapi-2.6.0 `min_id` pagination
Closes #351
See merge request pleroma/pleroma!976
2019-04-12 09:34:12 +00:00
lambda
57d5ff57d6
Merge branch 'fix/732-password-align' into 'develop'
...
password reset page labels align
See merge request pleroma/pleroma!986
2019-04-12 09:13:30 +00:00
Alexander Strizhakov
711ade961e
adding destroy multiple for mastofe
2019-04-12 02:28:46 +00:00
Alexander Strizhakov
e03d24af96
in_reply_to_id - null
2019-04-12 02:21:32 +00:00
kaniini
31c06dba5a
Merge branch 'fix/hackney_max_body_param' into 'develop'
...
Add `with_body: true` to requests relying on `max_body: val`
Closes #778
See merge request pleroma/pleroma!1049
2019-04-11 17:54:31 +00:00
Roman Chvanikov
4615e56219
Add with_body: true to requests relying on max_body: val
2019-04-12 00:16:33 +07:00
Mark Felder
d6d5f46bae
Update OAuth web template
2019-04-11 16:02:38 +00:00
Egor Kislitsyn
46bd5c1d87
fix format
2019-04-11 17:28:12 +07:00
Egor Kislitsyn
db4badc6aa
move user disable into deactivation
2019-04-11 17:22:42 +07:00
Egor Kislitsyn
0f2f7d2cec
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-04-11 15:51:52 +07:00
Ivan Tashkinov
c3f12cf3c3
[ #923 ] OAuth consumer params handling refactoring.
...
Registration and authorization-related params are wrapped in "authorization" in order to reduce edge cases number and simplify handling logic.
2019-04-10 21:40:38 +03:00
lain
d115d2a27e
Conversations: Tidying up.
2019-04-10 18:17:22 +02:00
lain
c352a0aba6
Conversations: Make tests run.
2019-04-10 17:48:31 +02:00
lain
cf353514fe
Participations: Add last activity.
2019-04-10 17:28:02 +02:00
lain
20d9b90760
Participation: Get for a user.
2019-04-10 17:05:33 +02:00
lain
280172f6f6
Conversations: Create or bump on inserting a dm.
2019-04-10 16:33:45 +02:00
lain
64c1c3a407
Participations: Add marking as read and unread.
2019-04-10 15:12:01 +02:00
lain
d1da6b155a
Conversation: Add Conversations and Participations.
2019-04-10 15:01:42 +02:00
Alex S
fe511a6c65
Merge branch 'develop' into feature/788-separate-email-addresses
2019-04-10 18:06:54 +07:00
Alex S
fe13a1d78c
adding notify_email setting for trigger emails
2019-04-10 17:57:41 +07:00
lambda
e5d553aa45
Merge branch 'feature/767-multiple-use-invite-token' into 'develop'
...
Feature/767 multiple use invite token
See merge request pleroma/pleroma!1032
2019-04-10 10:10:08 +00:00
Sadposter
be8350baa2
Merge branch 'develop' into feature/user-status-subscriptions
2019-04-10 10:44:54 +01:00
lambda
c8440b5e0c
Merge branch 'fix/emoji-api-nonsense' into 'develop'
...
Change response format of /api/pleroma/emoji so it makes sense
See merge request pleroma/pleroma!1038
2019-04-10 06:22:51 +00:00
Haelwenn (lanodan) Monnier
9c1b36856b
s/Pleroma.UserEmail/Pleroma.Emails.UserEmail/
2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier
cae0231731
s/Pleroma.AdminEmail/Pleroma.Emails.AdminEmail/
2019-04-10 06:33:20 +02:00
Haelwenn (lanodan) Monnier
1791ee8ec4
s/Pleroma.Mailer/Pleroma.Emails.Mailer/
2019-04-10 06:33:19 +02:00
kaniini
0ab563d334
Merge branch 'hotfix/fix_undefined_summary' into 'develop'
...
transmogrifier.ex: Add fix_summary/1
See merge request pleroma/pleroma!1039
2019-04-10 02:10:47 +00:00
kaniini
97395e013e
Merge branch 'notification-pleroma-settings' into 'develop'
...
Notification controls
Closes #738
See merge request pleroma/pleroma!988
2019-04-10 02:10:31 +00:00
Haelwenn (lanodan) Monnier
cf9ba8fe1b
transmogrifier.ex: Add fix_summary/1
...
MRF.KeywordPolicy assumes that summary is present in a activity,
and this would probably simplify code elsewhere too anyway.
2019-04-10 02:32:04 +02:00
rinpatch
b57b43027c
Change response format of /api/pleroma/emoji to the one that actually makes sense
2019-04-09 23:20:31 +03:00
rinpatch
144648de92
Merge branch 'mastoapi/plaintext-statuses' into 'develop'
...
Provide plaintext representations of content/cw in MastoAPI
Closes #787
See merge request pleroma/pleroma!1035
2019-04-09 17:25:31 +00:00
lambda
0a02ed7a2f
Merge branch 'bugfix/follower_count' into 'develop'
...
update the follower count when a follower is blocked
See merge request pleroma/pleroma!1033
2019-04-09 07:30:38 +00:00
Sachin Joshi
07afb9b537
update the follower count when a follower is blocked
2019-04-09 09:15:45 +05:45
Sadposter
589629cf3e
Used cached user resources in subscriptions
2019-04-08 15:56:14 +01:00
Alex S
fee50636d0
removing not needed invite update
2019-04-08 20:08:16 +07:00
Alex S
d0696fdfd6
fix for elixir 1.7.4
2019-04-08 19:16:59 +07:00
lain
a9f805c871
Merge remote-tracking branch 'origin/develop' into features/mastoapi/2.6.0-conversations
2019-04-08 14:10:51 +02:00
Sadposter
87a01f9ee0
Use Pleroma.Config instead of Application.get_env
2019-04-08 13:04:30 +01:00
Egor Kislitsyn
9abf832b03
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
2019-04-08 18:48:10 +07:00
Sadposter
13ff312c48
Sever subscription in case of block
2019-04-08 12:46:12 +01:00
lambda
e19590c93f
Merge branch 'improve_upgrade_user_from_ap_id' into 'develop'
...
Improve Transmogrifier.upgrade_user_from_ap_id/2
See merge request pleroma/pleroma!1019
2019-04-08 11:42:20 +00:00
lambda
fd45cab9ec
Merge branch 'twitter_oauth' into 'develop'
...
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
2019-04-08 11:41:50 +00:00
Alexander Strizhakov
36c0a10fdf
adding language tag
2019-04-08 11:03:10 +00:00
lambda
23067908de
Merge branch 'feature/770-add-emoji-tags' into 'develop'
...
Feature/770 add emoji tags
See merge request pleroma/pleroma!998
2019-04-08 09:50:00 +00:00
Egor Kislitsyn
c3d5c3513a
Merge remote-tracking branch 'pleroma/develop' into use-jobs-in-webpush
2019-04-08 16:46:59 +07:00
Egor Kislitsyn
a1a854646e
Merge branch 'develop' into use-jobs-in-webpush
2019-04-08 16:29:20 +07:00
Ivan Tashkinov
bffddf5e31
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# docs/config.md
# test/support/factory.ex
2019-04-08 12:20:26 +03:00
lambda
b4da2bc1d0
Merge branch 'develop' into 'improve_upgrade_user_from_ap_id'
...
# Conflicts:
# config/config.exs
# docs/config.md
2019-04-08 09:18:01 +00:00
lambda
b177e1e7f3
Merge branch 'scheduled-activities' into 'develop'
...
Scheduled activities
See merge request pleroma/pleroma!989
2019-04-08 09:08:18 +00:00
Alex S
012bb5dcc9
renaming expire_at -> expires_at
...
keyword style change
2019-04-08 16:01:28 +07:00
Sadposter
76fdfd1c7f
Add check on activity visibility in sub notification
2019-04-07 15:11:29 +01:00
Alex S
56c75aec12
credo fix
2019-04-07 20:59:53 +07:00
Alex S
b810aac117
added docs to docs/api/admin_api.md
...
code style and little renamings
2019-04-07 19:48:52 +07:00
Ivan Tashkinov
e3328bc138
[ #923 ] Removed <br> elements from auth forms, adjusted docs, minor auth settings refactoring.
2019-04-07 11:08:37 +03:00
feld
fb2040d061
Merge branch 'fix/deactivated-user-error' into 'develop'
...
Return 403 for deactivated user on token request
Closes #785
See merge request pleroma/pleroma!1031
2019-04-06 22:19:30 +00:00
eugenijm
2056efa714
Add scheduler for sending scheduled activities to the queue
2019-04-06 23:56:29 +03:00
eugenijm
fc92a0fd8d
Added limits and media attachments for scheduled activities.
2019-04-06 23:55:58 +03:00
eugenijm
b3870df51f
Handle scheduled_at on status creation.
2019-04-06 23:55:58 +03:00
eugenijm
7bf622ce73
Add scheduled activities
2019-04-06 23:55:58 +03:00
eugenijm
7aa53d52bd
Return 403 on oauth token exchange for a deactivated user
2019-04-06 23:27:55 +03:00
Alex S
ce8d457132
little channges
2019-04-06 22:38:35 +07:00
Sadposter
c05fe4da0a
Document subscription endpoints, fix typos
...
Also adds a quick error case on the subscription endpoints
to avoid 500s
2019-04-06 16:20:06 +01:00
feld
9aeac7dcca
Merge branch 'feature/prometheus' into 'develop'
...
Upstream: Metrics and debugging
See merge request pleroma/pleroma!1020
2019-04-06 14:51:46 +00:00
Alex S
a53d591ac5
code style
2019-04-06 20:47:05 +07:00
Alex S
7410aee886
Merge develop to 770-add-emoji-tags
...
Merge conflict in test/web/mastodon_api/mastodon_api_controller_test.exs
2019-04-06 20:34:00 +07:00
Alex S
dcc54f8cfa
admin api endpoints for invites
2019-04-06 20:25:19 +07:00
Alex S
47b07cec49
token -> invite renaming
2019-04-06 20:24:22 +07:00
Alex S
be54e40890
twitter api registration
...
fix for twitter api tests
2019-04-06 17:18:59 +07:00
Alex S
0484f3a8b1
generating tokens with mix
2019-04-06 16:58:22 +07:00
Sergey Suprunenko
325a268017
Redirect to the referer url after mastofe authorization
2019-04-05 23:36:42 +00:00
Mark Felder
b5a2d384f7
Redundant Repo.get_by usage was recently removed from the codebase
2019-04-05 11:41:41 -05:00
Roger Braun
7895ee37fa
Add user following / unfollowing to the admin api.
2019-04-05 11:27:07 -05:00
Sadposter
9ca91cbb87
Change relationship direction of subscriptions
2019-04-05 17:02:07 +01:00
Sadposter
d35f6551c1
Move subscriptions endpoint to be under /pleroma
2019-04-05 17:02:02 +01:00
Sadposter
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
2019-04-05 15:30:31 +01:00
Sadposter
316fe20d86
Make subscriptions the same direction as blocks
...
That being, user - subscribes to -> users, rather than
user - has subscribers -> users
2019-04-05 15:30:26 +01:00
Sadposter
23c4f49494
Fix subscription endpoint return formats
2019-04-05 15:30:24 +01:00
Sadposter
007762e767
Add notification checks
2019-04-05 15:30:23 +01:00
Sadposter
79910ce5cc
Add API endpoints and user column for subscription
2019-04-05 15:30:18 +01:00
Egor Kislitsyn
1c2e4f88d1
fix credo
2019-04-05 19:46:28 +07:00
Egor Kislitsyn
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
2019-04-05 19:38:44 +07:00
rinpatch
f0f30019e1
Refactor html caching functions to have a key instead of a module, use more correct terminology and fix summaries in mastoapi
2019-04-05 15:19:44 +03:00
Ivan Tashkinov
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
2019-04-05 15:12:02 +03:00
Ivan Tashkinov
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
2019-04-05 09:19:17 +03:00
Ivan Tashkinov
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-04 23:43:08 +03:00
Ivan Tashkinov
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
2019-04-04 22:41:03 +03:00
Mark Felder
69038887b2
Code readability tweak
2019-04-04 12:36:57 -05:00
Egor Kislitsyn
0b5c818cb7
[ #1 ] fix telemetry
2019-04-04 11:35:09 -05:00
href
bc3618a38d
Set up telemetry and prometheus
2019-04-04 11:30:43 -05:00
Egor Kislitsyn
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
2019-04-04 16:10:43 +07:00
Haelwenn (lanodan) Monnier
af0065a71f
mastodon_api_controller.ex: Add pleroma-tan to initial_state
2019-04-04 09:07:25 +02:00
lambda
3f8be270c6
Merge branch 'feature/robotstxt' into 'develop'
...
Generate permissive or restrictive robots.txt in the config generator
See merge request pleroma/pleroma!1012
2019-04-03 17:31:34 +00:00
Sachin Joshi
cd41584ac4
Generate permissive or restrictive robots.txt in the config generator
2019-04-03 22:12:58 +05:45
rinpatch
79cb34a4b0
Fix preview not being usable in form data
2019-04-02 23:07:16 +03:00
Haelwenn
0cb94cfa94
Merge branch 'fix-slow-relationships' into 'develop'
...
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
2019-04-02 18:43:48 +00:00
lambda
256b492a58
Merge branch 'bugfix/wrong-date-format' into 'develop'
...
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
2019-04-02 14:18:23 +00:00
lambda
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
2019-04-02 14:17:43 +00:00
lain
39bcf93007
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
2019-04-02 16:10:38 +02:00
lain
fd07745d1b
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
2019-04-02 16:08:55 +02:00
Alex S
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
2019-04-02 20:39:52 +07:00
Alex S
d140738edf
second level of headertext change in doc
2019-04-02 20:36:36 +07:00
lambda
180b87257c
Merge branch 'bugfix/share-mastodon' into 'develop'
...
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
2019-04-02 12:47:40 +00:00
lambda
ce9284b36f
Merge branch 'remove-user-activities' into 'develop'
...
[#757 ] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
2019-04-02 12:45:29 +00:00
lambda
b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
2019-04-02 12:43:28 +00:00
Alex S
9e0567ec52
Merge develop into feature/770-add-emoji-tags
2019-04-02 19:16:29 +07:00
rinpatch
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
2019-04-02 14:31:18 +03:00
Ivan Tashkinov
37925cbe78
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# lib/pleroma/web/oauth/oauth_controller.ex
# lib/pleroma/web/router.ex
2019-04-02 14:05:34 +03:00
lambda
091baf9316
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
...
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
2019-04-02 10:57:38 +00:00
lambda
26d509cc86
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
2019-04-02 10:52:29 +00:00
cascode
95c92c49c9
Fix account lookup for nicknames beginning with numbers
2019-04-02 10:51:33 +00:00
Ivan Tashkinov
590c935d95
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-02 13:50:12 +03:00
Egor Kislitsyn
88d3cb44c3
replace Repo.get_by(User, nickname: nickname) with User.get_by_nickname(nickname)
2019-04-02 17:47:02 +07:00
Egor Kislitsyn
1b3d921921
change Repo.get(User, id) => User.get_by_id(id)
2019-04-02 17:01:26 +07:00
Egor Kislitsyn
4212527928
change Repo.get(Activity, id) => Activity.get_by_id(id)
2019-04-02 16:50:31 +07:00
Sergey Suprunenko
3db9235150
Ignore dates in wrong formats
2019-04-02 11:32:36 +02:00
Egor Kislitsyn
a14742f495
add user delete_activities mix task
2019-04-02 16:30:11 +07:00
Alex S
08d64b977f
little changes and typos
2019-04-02 16:13:34 +07:00
Alex S
9b2188da7c
refactoring of emoji tags config to use groups
2019-04-02 15:44:56 +07:00
Egor Kislitsyn
a1869f5272
Merge remote-tracking branch 'pleroma/develop' into remove-user-activities
2019-04-02 15:41:30 +07:00
Sachin Joshi
f20e8d28de
add support for all status type (ostatus) and replase case with if
2019-04-02 12:18:00 +05:45
Ivan Tashkinov
aac48d0cc6
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
2019-04-02 09:19:10 +03:00
Sachin Joshi
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
2019-04-02 10:26:09 +05:45
Haelwenn (lanodan) Monnier
f56eef8d8c
router: Add fake identity proof endpoint
2019-04-02 01:53:38 +02:00
Sergey Suprunenko
b6f9f7b8aa
Handle dates in the Unix timestamp format ( Fixes #763 )
2019-04-01 22:45:24 +02:00
Sachin Joshi
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
2019-04-01 22:26:58 +05:45
Ivan Tashkinov
6910fb371b
Fixed local MastoFE authentication / force_login option.
2019-04-01 17:25:25 +03:00
Ivan Tashkinov
cbe09d94d1
Added force_login authentication option (previously applied by default).
2019-04-01 14:46:50 +03:00
Alex S
17d3d05a71
code style
...
little fix
2019-04-01 17:54:30 +07:00
Alex S
3601f03147
Adding tag to emoji ets table
...
changes in apis
2019-04-01 17:17:57 +07:00
rinpatch
fe5145eeaa
Move putting fake attribute to lib/pleroma/web/activity_pub/utils.ex
2019-04-01 12:25:53 +03:00
rinpatch
975482f091
insert object defaults for fake activities and make credo happy
2019-04-01 12:16:51 +03:00
rinpatch
d866b59eea
oof
2019-04-01 11:58:08 +03:00
rinpatch
45ba10bf47
Fix the issue with HTML scrubber
2019-04-01 11:55:59 +03:00
Ivan Tashkinov
804173fc92
[ #923 ] Minor code readability fix.
2019-04-01 09:45:44 +03:00
Ivan Tashkinov
eadafc88b8
[ #923 ] Deps config adjustment (no override for httpoison), code analysis issues fixes.
2019-04-01 09:28:56 +03:00
Ivan Tashkinov
baffdcc480
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-01 08:49:32 +03:00
lain
629ad1766c
BBS: Some fixes.
2019-03-31 21:53:17 +02:00
lain
e3bf6655ba
Add replying.
2019-03-31 21:24:29 +02:00
lain
10fdc080a0
BBS: Tests and formatting.
2019-03-31 20:35:10 +02:00
lain
17ab9fa45b
BBS: Some more functionality.
2019-03-31 18:01:16 +02:00
lain
c810fb81a4
Basic SSH daemon.
2019-03-31 14:55:09 +02:00
rinpatch
cd387f8693
Add a fake option to lazy_put_actvity_defaults
2019-03-30 13:57:54 +03:00
rinpatch
1bb4d5d65b
Implement fake status submit
2019-03-29 21:59:04 +03:00
Egor
9a39d1d846
Replace Pleroma.Jobs with pleroma_job_queue
2019-03-29 12:46:05 +00:00
Haelwenn (lanodan) Monnier
c8abef373b
mastodon_api_controller.ex: fallback to first for min_id
2019-03-28 17:23:21 +01:00
Haelwenn (lanodan) Monnier
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
2019-03-28 17:23:21 +01:00
Haelwenn (lanodan) Monnier
e83ad12c57
pagination.ex: Drop atom keys in params
...
Atom keys could also have been transformed to string, or the other
way around but this one is more efficient and what we actually
expect with the current param_types in Pagination
2019-03-28 17:18:59 +01:00
Haelwenn (lanodan) Monnier
6f15224053
activity_pub.ex: Move limit/max_id restrictions to Pagination helpers
2019-03-28 17:18:59 +01:00
eugenijm
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
2019-03-28 18:55:16 +03:00
eugenijm
55d086b520
Notification controls
...
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
2019-03-28 07:52:07 +03:00
eugenijm
10c81fc902
Add user show endpoint for Pleroma admin API
2019-03-27 21:44:15 +03:00
Alex S
3ca6c4f443
password reset page labels align
2019-03-27 22:37:20 +06:30
Ivan Tashkinov
20e0f36605
Merge remote-tracking branch 'remotes/origin/develop' into twitter_oauth
2019-03-27 15:41:40 +03:00
Ivan Tashkinov
2a95014b9d
[ #923 ] OAuth consumer improvements, fixes, refactoring.
2019-03-27 15:39:35 +03:00
lambda
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
2019-03-27 11:33:13 +00:00
rinpatch
ce6d64bbd8
Fix missing announces in MastoAPI home timeline
...
Closes #762
2019-03-27 12:28:53 +03:00
Maxim Filippov
3cf7539bca
Add more user filters + move search to its own module
2019-03-27 03:51:59 +05:00
eugenijm
a4ab60ac54
Add vapid_key to the POST /api/v1/apps response
2019-03-26 23:27:37 +03:00
eugenijm
691d1208b5
Add GET /api/v1/apps/verify_credentials
2019-03-26 21:53:28 +03:00
lambda
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
2019-03-26 16:12:50 +00:00
lambda
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
2019-03-26 16:01:52 +00:00
lain
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
2019-03-26 16:59:28 +01:00
lambda
9e3899bf36
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
...
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
2019-03-26 15:13:55 +00:00
lambda
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
2019-03-26 14:49:09 +00:00
rinpatch
406d19331f
Remove ActivityRepresenter
2019-03-26 17:16:21 +03:00
Ivan Tashkinov
eef1042b16
Mastodon 2.7.2 instance attributes (registrations, languages).
2019-03-26 16:27:17 +03:00
eugenijm
568e348588
Increment replies_count on replies (MastoAPI)
2019-03-26 15:27:04 +03:00
Ivan Tashkinov
b0759f821b
Comments split.
2019-03-26 15:24:29 +03:00
Ivan Tashkinov
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to true.
2019-03-26 15:09:06 +03:00
Mark Felder
c410296120
Try sending an empty map
2019-03-25 19:00:35 -05:00
Mark Felder
6f090f981b
Attempt to fix incorrect federation of default instance avatars
2019-03-25 18:47:04 -05:00
rinpatch
b028b0f97d
Merge branch 'bugfix/missing-announces' into 'develop'
...
fix up missing announcements with preloads
See merge request pleroma/pleroma!972
2019-03-25 09:24:08 +00:00
William Pitcock
26b0c802c3
fix up missing announcements with preloads
2019-03-25 07:38:09 +00:00
kaniini
bc14c98de1
Merge branch 'features/s3-uploader-digital-ocean' into 'develop'
...
add overriding truncated_namespace condition for truncating paths for digital ocean
See merge request pleroma/pleroma!969
2019-03-25 02:25:59 +00:00
kaniini
63ffa4842c
Merge branch 'fix/mastoapi-liked' into 'develop'
...
Serve non-public activities in /api/v1/favourites
Closes #648
See merge request pleroma/pleroma!970
2019-03-25 02:24:27 +00:00
rinpatch
a7f58b3c13
Serve non-public activities in /api/v1/favourites
...
Fixes #648
2019-03-25 02:15:45 +03:00
Austin Lanari
6c96d68f77
add overriding truncated_namespace condition for truncating paths for digital ocean
2019-03-24 11:32:09 -07:00
rinpatch
750de7d842
Merge branch 'features/mrf-keyword-nil-summary' into 'develop'
...
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
See merge request pleroma/pleroma!968
2019-03-24 15:02:13 +00:00
Haelwenn (lanodan) Monnier
eab9425cc4
mrf/keyword_policy.ex: Fix when summary == nil, do not whitelist content == nil
2019-03-24 15:47:50 +01:00
William Pitcock
4aa699271c
activity: use left join instead of inner join when fetching activities that may or may not have a child object
2019-03-23 03:17:50 +00:00
William Pitcock
332dc1371b
user: use preloads when deleting accounts
2019-03-23 03:06:00 +00:00
William Pitcock
debf7f016d
ostatus: use preload objects with Object.normalize() when opportunistic
2019-03-23 03:05:57 +00:00
William Pitcock
3c2350cbee
object: downgrade normalize warning to debug severity
2019-03-23 03:05:15 +00:00
William Pitcock
8c70156157
activitypub: object view: use preloaded object when possible
2019-03-23 03:05:14 +00:00
William Pitcock
f9d5c13b21
activity: add get_by_ap_id_with_object()
2019-03-23 03:05:13 +00:00
William Pitcock
ce47eb8b29
activitypub: when fetching objects, use the preloaded object from the synthesized activity
2019-03-23 03:05:10 +00:00
William Pitcock
aabcecb269
notification: formatting
2019-03-23 02:30:53 +00:00
William Pitcock
07cdd9ed02
streamer: use the preloaded object if possible
2019-03-23 02:29:01 +00:00
William Pitcock
c62220c500
rich media: helpers: only crawl Create activities
2019-03-23 02:28:59 +00:00
William Pitcock
9a06d9f6e8
notification: preload child objects
2019-03-23 02:28:57 +00:00
William Pitcock
4cedf45423
relay: use preloaded object since we always have it
2019-03-23 02:28:56 +00:00
William Pitcock
e430a71d37
ostatus: fetch preloaded object in note handler for testsuite
2019-03-23 01:17:26 +00:00
William Pitcock
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
2019-03-23 01:09:12 +00:00
William Pitcock
ba7299fc87
activitypub: add missing with_preloaded_object()
2019-03-23 00:53:35 +00:00
William Pitcock
e4307cadc8
activitypub: splice in the child object if we have one
2019-03-23 00:40:08 +00:00
William Pitcock
a6973a668e
formatting
2019-03-23 00:28:16 +00:00
William Pitcock
59518cbcd8
activity: fix credo nitpick
2019-03-23 00:26:12 +00:00
William Pitcock
b3bf523c09
rich media: use optimized Object.normalize()
2019-03-23 00:22:57 +00:00
William Pitcock
e75e43b949
common api: use the optimized Object.normalize whenever possible
2019-03-23 00:22:14 +00:00
William Pitcock
9aea7cc224
activitypub: preload child objects when fetching timelines
2019-03-23 00:10:17 +00:00
William Pitcock
092cedede5
activity: add with_preloaded_object() convenience
2019-03-23 00:09:56 +00:00
William Pitcock
62bccddde0
object: add support for preloading objects when walking an activity graph in normal form
2019-03-22 23:51:12 +00:00
rinpatch
1b33986bfa
Fix text being nullable in TwitterAPI
2019-03-23 00:10:50 +03:00
lambda
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
2019-03-22 11:03:56 +00:00
lain
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
2019-03-22 11:57:20 +01:00
rinpatch
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
2019-03-22 08:39:49 +03:00
William Pitcock
27e03a2177
reports: fix up email generation for remote reports
2019-03-22 01:17:14 +00:00
kaniini
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
William Pitcock
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
2019-03-21 23:25:41 +00:00
William Pitcock
fea3696799
common api: move context functions from twitterapi
2019-03-21 23:24:04 +00:00
kaniini
bf8b29e080
Merge branch 'feature/move-search-to-db' into 'develop'
...
Move gluing search results from application to database and get mutuals a higher score multiplier
See merge request pleroma/pleroma!960
2019-03-21 21:41:04 +00:00
rinpatch
88096c65a5
Move gluing search results from application to database and get mutuals
...
a higher score multiplier
2019-03-21 23:16:32 +03:00
Quentin Rameau
80bc9ed2ba
Add a gopher url port config option
...
This lets the user advertise a different port in the gopher urls,
for example listening locally on port 7070 but telling clients to
connect to the regular port 70.
2019-03-21 19:59:43 +03:00
rinpatch
b92a16aa00
Merge branch 'ecto-3-migration' into 'develop'
...
Ecto 3.0.7 (ecto_sql 3.0.5) migration
See merge request pleroma/pleroma!957
2019-03-21 16:24:57 +00:00
lain
bf27190f7f
UtilController: Return state of safe dm mentions.
2019-03-21 16:20:58 +01:00
lain
8468f3f6d4
Add safe dm mode option.
2019-03-20 21:09:36 +01:00
Ivan Tashkinov
af68a42ef7
[ #923 ] Support for multiple OAuth consumer strategies.
2019-03-20 20:25:48 +03:00
rinpatch
19a19bdd81
Fix migration timestamp type
2019-03-20 16:04:59 +03:00
rinpatch
9a7b817c9a
Ecto 3.0.5 migration
...
kms
2019-03-20 15:59:54 +03:00
Ivan Tashkinov
e17a9a1f66
[ #923 ] Nickname & email selection for external registrations, option to connect to existing account.
2019-03-20 10:35:31 +03:00
Maxim Filippov
7ac9fff437
Format
2019-03-20 01:40:50 +03:00
Maxim Filippov
ed8a2935f5
Use ILIKE to search users
2019-03-20 01:37:40 +03:00
William Pitcock
1685e4258f
transmogrifier: upgrade: when upgrading OStatus users to AP, ensure we always use the fake collection
2019-03-19 18:39:33 +00:00
William Pitcock
67ff8d9311
user: properly cope with actors which do not declare a followers collection
2019-03-19 18:23:06 +00:00
William Pitcock
cd055983c3
transmogrifier: when determining followers collection URI, we may need to fetch the actor
2019-03-19 18:04:57 +00:00
William Pitcock
d487b753c3
activitypub: transmogrifier: do not allow missing lists to be interpreted as nil
2019-03-19 17:30:25 +00:00
William Pitcock
798da28812
activitypub: transmogrifier: ensure as:Public activities are delivered to followers
2019-03-19 17:27:42 +00:00
kaniini
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
2019-03-18 23:08:31 +00:00
kaniini
aba4c27120
Merge branch 'masto-api-notifications' into 'develop'
...
Add support for exclude_types, limit and min_id in Mastodon notifications
See merge request pleroma/pleroma!949
2019-03-18 19:17:36 +00:00
Ivan Tashkinov
40e9a04c31
[ #923 ] Registration validations & unique index on [:user_id, :provider].
2019-03-18 20:31:24 +03:00
Ekaterina Vaartis
a1aacc08a4
Check if the user has indeed not been federated with
...
Just updating the user triggered post fetching too, now it
shouldn't. It only happened in the AP user fetching since that's
what's used to update users
2019-03-18 20:16:31 +03:00
Ivan Tashkinov
8d21859717
[ #923 ] External User registration refactoring, password randomization.
2019-03-18 18:09:53 +03:00
Zachary Dunn
97b35e00b0
Fix with expression always matching
2019-03-18 14:59:52 +00:00
Zachary Dunn
e572786dad
Run
2019-03-18 14:53:30 +00:00
Zachary Dunn
af4338da0c
Use better error message
2019-03-18 14:52:24 +00:00
Ivan Tashkinov
26b6354095
[ #923 ] Support for multiple (external) registrations per user via Registration.
2019-03-18 17:23:38 +03:00
Zachary Dunn
5ba14c664b
Fix missing end brace
2019-03-18 14:05:10 +00:00
Zachary Dunn
a2e03d4f3c
Initial attempt at updating return type
2019-03-18 13:56:59 +00:00
eugenijm
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
2019-03-18 11:27:27 +03:00
Ivan Tashkinov
2a96283efb
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# config/config.exs
# lib/pleroma/web/auth/pleroma_authenticator.ex
2019-03-18 10:26:41 +03:00
Haelwenn (lanodan) Monnier
f6fab01ba7
Web.Router: Add routes for Conversation mastoAPI
2019-03-17 17:06:28 +01:00
Fong-Wan Chau
4ed2618f6c
Allow 'rel' attribute on <a> link with specific values (for hashtag recognition).
2019-03-17 11:03:19 -04:00
Maxim Filippov
93291c3d7a
Order users by nickname
2019-03-17 13:23:31 +03:00
kaniini
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
2019-03-16 19:27:56 +00:00
lambda
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
2019-03-16 08:44:02 +00:00
kaniini
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
2019-03-16 04:31:31 +00:00
William Pitcock
e0edc706cf
oauth: add me property to token responses
2019-03-16 01:12:50 +00:00
eugenijm
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
kaniini
4b3c86c1a6
Merge branch 'fix/mediaproxy-capture-content-disposition-filename' into 'develop'
...
MediaProxy: parse filename from content-disposition for non-whitelisted types
See merge request pleroma/pleroma!936
2019-03-15 20:06:08 +00:00
kaniini
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
Ivan Tashkinov
2739057442
Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
2019-03-15 17:11:00 +03:00
Ivan Tashkinov
aacbf0f570
[ #923 ] OAuth: prototype of sign in / sign up with Twitter.
2019-03-15 17:08:03 +03:00
Karen Konou
d8244c2a1b
remove unused function
2019-03-15 15:03:03 +01:00
Karen Konou
dfeb3aec44
fix credo warning
2019-03-15 14:36:07 +01:00
Karen Konou
094e1ef048
formatting
2019-03-15 14:28:14 +01:00
Karen Konou
da53c079db
Refactor to store user ap_id, add tests
2019-03-15 14:20:08 +01:00
Karen Konou
be465c762b
formatting
2019-03-15 14:18:53 +01:00
Karen Konou
15b21d1983
refactor filtering mechanism
2019-03-15 14:18:53 +01:00
Karen Konou
aa71139e4a
Fix elixir 1.8 vs 1.7 format conflict
2019-03-15 14:18:53 +01:00
Karen Konou
fe4c1d26fc
Add ActivityPub.contain_activity checks to streamer
2019-03-15 14:18:53 +01:00
Karen Konou
c8f31e0bc2
Implement mastodon's reblog hiding feature
2019-03-15 14:18:21 +01:00
Haelwenn
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
2019-03-15 09:48:50 +00:00
rinpatch
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
2019-03-15 11:58:12 +03:00
rinpatch
d02f1120f9
Content-Disposition regex improvements
2019-03-15 08:29:51 +03:00
kaniini
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
2019-03-15 02:59:17 +00:00
kaniini
c708656b5e
Merge branch 'robotstxt' into 'develop'
...
Add robots.txt
Closes #723
See merge request pleroma/pleroma!929
2019-03-15 02:50:27 +00:00
William Pearson
3dadaa4432
robots.txt
...
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
2019-03-15 02:28:18 +00:00
rinpatch
958227d556
MediaProxy: parse filename from content-disposition for non-whitelisted types
2019-03-15 01:36:29 +03:00
eugenijm
100413bf2c
Add is_seen to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
2019-03-15 01:35:48 +03:00
William Pitcock
423fd07928
activitypub: inject to/cc fields on non-forwarded reports since Flag activities are now Forwardable
2019-03-14 19:52:08 +00:00
William Pitcock
5c7b774f09
reports: unify sending e-mail for both remote and local reports
2019-03-14 19:44:08 +00:00
William Pitcock
64b0120d67
activitypub: add support for forwarding reports
2019-03-14 19:36:17 +00:00
rinpatch
cbdd11c381
Merge develop to bump elixir version in the CI so I don't get failing formatting
2019-03-14 22:33:20 +03:00
William Pitcock
3b48d5f0c2
common api: add support for forwarding reports
2019-03-14 19:29:33 +00:00
William Pitcock
379442ad17
activitypub: utils: also match Activity objects
2019-03-14 19:29:04 +00:00
William Pitcock
0f3ecb2bfb
activitypub: transmogrifier: accept remote Flag activities
2019-03-14 19:06:02 +00:00
William Pitcock
f86f7dbb8f
activitypub: utils: rework make_flag_data to accept either activity payloads or IRIs
2019-03-14 19:05:42 +00:00
rinpatch
e2fe796c63
Add some tests
2019-03-14 22:02:48 +03:00
rinpatch
34fc0dca2e
Merge branch 'hotfix/delete-activities' into 'develop'
...
Fix delete activities not federating
See merge request pleroma/pleroma!933
2019-03-14 17:49:00 +00:00
rinpatch
e630e5e135
Fix delete activities not federating
2019-03-14 20:43:14 +03:00
link0ff
54e7087ab4
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
2019-03-14 17:43:30 +02:00
kaniini
59333f2d56
Merge branch 'admin-api-account-view-namespace' into 'develop'
...
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
See merge request pleroma/pleroma!930
2019-03-14 02:01:10 +00:00
kaniini
86871c8a04
Merge branch 'feature/add-local-to-users-admin-api' into 'develop'
...
Add "local" & "tags" to users admin API
See merge request pleroma/pleroma!932
2019-03-14 02:00:47 +00:00
Maxim Filippov
f3964f4024
Ensure empty array is returned for tags
2019-03-14 03:17:09 +03:00
Maxim Filippov
257d8e78e5
Add tags
2019-03-14 01:52:24 +03:00
kaniini
4e72762322
Merge branch 'mastofe-content-types' into 'develop'
...
Set content types settings on mastofe endpoint.
See merge request pleroma/pleroma!894
2019-03-13 22:04:23 +00:00
eugenijm
e416c344dd
Unify unfollow, accept and reject follow requests using CommonAPI
2019-03-13 20:28:36 +03:00
Maxim Filippov
490d9cf7b1
Add "local" to users admin API
2019-03-13 16:04:44 +03:00
Haelwenn (lanodan) Monnier
cc0f2f8ba3
MastodonAPI.Admin.AccountView → AdminAPI.AccountView
2019-03-13 12:17:57 +01:00
Haelwenn (lanodan) Monnier
d43b1c0b5d
Pleroma.Web.TwitterAPI.Controller: Remove duplicated alias/es
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
4b73ca638e
[Credo][CI] Add readability as it’s fixed
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
8cd3eada7d
[Credo] write large numbers with underscore separation
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
c3d41b2b6e
[Credo] make all variables use snake_case
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
Haelwenn (lanodan) Monnier
4c440f12c3
[Credo] Fix the consistency
2019-03-13 04:17:30 +01:00
Haelwenn (lanodan) Monnier
6c8743d0c0
[Credo] Fix the warnings
2019-03-13 04:17:30 +01:00
Maxim Filippov
25eb6cf1cb
Add "roles" to users admin API
2019-03-12 22:15:28 +03:00
kaniini
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
2019-03-12 16:27:47 +00:00
link0ff
9338f061a3
Support LDAP method start_tls
2019-03-12 18:20:02 +02:00
Egor Kislitsyn
16e598ec11
fix wording
2019-03-12 22:12:05 +07:00
Egor Kislitsyn
d013b58e84
add mix pleroma.user delete_activities NICKNAME task
2019-03-12 22:04:08 +07:00
eugenijm
984b5f8adf
MastoAPI followers/following endpoints
2019-03-12 16:01:24 +03:00
rinpatch
92a69bddce
escape quotation marks in Content-Disposition header
2019-03-12 09:21:13 +03:00
rinpatch
5a73cae2be
WIP: Stop mangling filenames
2019-03-12 09:10:19 +03:00
kaniini
4aa285e6ce
Merge branch 'add-screenname-extension-to-masto-api' into 'develop'
...
MastoAPI Accounts: Add fetching by nickname.
See merge request pleroma/pleroma!922
2019-03-11 21:43:46 +00:00
lain
07277879e5
Linting.
2019-03-11 19:32:21 +01:00
lain
600f428db4
WebPush: Add activity id to the push messages.
...
Makes it easier to relate the push to a given status.
2019-03-11 19:23:21 +01:00
Ivan Tashkinov
63ab61ed3f
Sign in via Twitter (WIP).
2019-03-11 20:37:26 +03:00
lain
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
2019-03-11 15:18:32 +01:00
lambda
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
2019-03-11 13:26:12 +00:00
lambda
d9ae2d00a1
Merge branch 'feat/style-oauth-login-page' into 'develop'
...
Style again the OAuth login page to fit pleroma more
See merge request pleroma/pleroma!921
2019-03-11 13:19:24 +00:00
Shpuld Shpuldson
50edead11c
Remove chromium input hilight that clashes with our own
2019-03-11 15:10:42 +02:00
Shpuld Shpuldson
8ddbedcd9a
Style again the login page to fit pleroma more
2019-03-11 14:57:04 +02:00
lain
4811eefa6e
MastoAPI StatusView: Add locality indicator.
2019-03-11 13:48:27 +01:00
eugenijm
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
2019-03-11 09:02:03 +03:00
William Pitcock
1f78d23eed
http: connection: unify adapter configuration and defaults
2019-03-08 22:59:10 +00:00
William Pitcock
ba48bd901c
http: connection: relax the timeouts a little
2019-03-08 22:56:16 +00:00
William Pitcock
19afd9f81f
http: rework connection timeouts to match hackney docs, enforce 1 second max TCP connection timeout
2019-03-08 22:56:16 +00:00
William Pitcock
773f532b14
http: actually pass the options list to the Connection factory
2019-03-08 22:56:16 +00:00
William Pitcock
50ba4ba2c9
http: connection: merge hackney option lists instead of concatenating them
...
this ensures the right pools are used
2019-03-08 22:56:16 +00:00
William Pitcock
2a83c0ba93
http: safely catch erlang exits and elixir errors from hackney (ref #672 )
2019-03-08 22:56:16 +00:00
kaniini
46200d8fac
Merge branch 'fix-tlsv1.3' into 'develop'
...
Fix supported TLS versions as TLS 1.3 support seems buggy.
Closes #708
See merge request pleroma/pleroma!892
2019-03-08 22:53:12 +00:00
kaniini
735f40047a
Merge branch 'delete-status' into 'develop'
...
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
2019-03-08 22:47:41 +00:00
kaniini
130fc9eae6
Merge branch 'fetch-posts-on-first-federation' into 'develop'
...
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
2019-03-08 22:33:31 +00:00
eugenijm
2827dfea50
Allow an admin to delete a user status
2019-03-08 20:21:56 +03:00
Ekaterina Vaartis
5021b7836f
Fetch user's outbox posts on first federation with that user
2019-03-08 16:27:56 +03:00
William Pitcock
e53a9fd15e
MRF: anti followbot: gracefully handle accounts without a display name
2019-03-07 12:13:48 +00:00
rinpatch
992145e64c
Merge branch 'bugfix/delete-activity-audience' into 'develop'
...
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
2019-03-07 11:31:08 +00:00
Karen Konou
c2faae70df
Adjust delete activity audience to match the deleted object
2019-03-07 12:26:03 +01:00
Karen Konou
6a69ece437
Revert existing object check
2019-03-07 11:53:15 +01:00
eugenijm
7342b5a45f
Preserve parameters in link headers (Mastodon API)
2019-03-07 09:12:16 +03:00
kaniini
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
2019-03-06 22:27:42 +00:00
kaniini
39b766cc43
Merge branch 'bugfix/connect-src-https' into 'develop'
...
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
See merge request pleroma/pleroma!900
2019-03-06 13:22:02 +00:00
kaniini
07f8c79a69
Merge branch 'bugfix/rel-me_list' into 'develop'
...
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
2019-03-06 13:20:51 +00:00
Maksim
bc7570c282
[ #647 ] tests for web push
2019-03-06 13:20:12 +00:00
Haelwenn
96901b6554
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
...
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
2019-03-06 01:45:17 +00:00
Karen Konou
28d5b40d0a
Add handling of objects not in database
2019-03-05 23:15:22 +01:00
rinpatch
4263edc9c9
Properly escape reserved URI charachters in upload urls
2019-03-05 18:09:23 +03:00
rinpatch
bcd8ef65e0
Merge branch 'add-admin-to-node-info' into 'develop'
...
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
2019-03-05 07:05:44 +00:00
Haelwenn (lanodan) Monnier
788a354ce0
Web.RelMe: Fix having other values in rel attr
...
One example of this is Github which puts a rel="nofollow me" on the
profile link.
2019-03-05 02:13:22 +01:00
Haelwenn (lanodan) Monnier
fc37e5815f
Plugs.HTTPSecurityPlug: Add static_url to CSP's connect-src
...
Closes: https://git.pleroma.social/pleroma/pleroma/merge_requests/469
2019-03-05 01:44:24 +01:00
eugenijm
d1de0a30cc
Include admins in nodeinfo
2019-03-05 03:17:24 +03:00
Maxim Filippov
2d30fc279f
Typo
2019-03-05 02:11:15 +03:00
William Pitcock
b7aa1ea9e6
rich media: helpers: rework validate_page_url()
2019-03-04 18:39:13 +00:00
William Pitcock
9f3cb38012
helpers: use AutoLinker to validate URIs as well as the other tests
2019-03-04 18:31:49 +00:00
William Pitcock
d38d537bee
rich media: don't crawl bogus URIs
2019-03-04 18:31:49 +00:00
kaniini
d45dbdce5a
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
...
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
2019-03-04 18:29:13 +00:00
Maxim Filippov
f620199836
Merge search endpoint into /users
2019-03-04 21:26:32 +03:00
Maxim Filippov
0245ce842f
Remove unused code
2019-03-04 20:49:20 +03:00
Maxim Filippov
cc7b35e097
Add status text to notifications (mentions and reposts)
2019-03-04 20:47:34 +03:00
kaniini
ca5d894e68
Merge branch 'fix/like-adressing' into 'develop'
...
Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896
2019-03-04 15:59:57 +00:00
rinpatch
33c614bce0
Stop adresssing like activities to actor's follower collection on non-public posts
2019-03-04 18:09:58 +03:00
Egor Kislitsyn
22ac2288be
Merge remote-tracking branch 'pleroma/develop' into feature/disable-account
2019-03-04 20:48:43 +07:00
kaniini
10248d86a2
Merge branch 'unify-follow' into 'develop'
...
Unify follow code with CommonAPI
Closes #690
See merge request pleroma/pleroma!889
2019-03-04 13:25:32 +00:00
Egor Kislitsyn
eb84de0143
allow users to disable their own account
2019-03-04 19:55:11 +07:00
KokaKiwi
bf43f055dd
Set content types settings on mastofe endpoint.
2019-03-04 12:00:02 +01:00
KokaKiwi
b57913b13a
Fix supported TLS versions as TLS 1.3 support seems buggy.
2019-03-04 11:30:26 +01:00
Karen Konou
1445dc25d4
fix format
2019-03-04 11:18:45 +01:00
Karen Konou
aab86698a5
Expand "to" of delete activities
2019-03-04 11:18:45 +01:00
eugenijm
86e4b48a5e
Fix DM visibility for blocking users
2019-03-04 06:24:27 +03:00
eugenijm
594694607c
Unify Mastodon and Twitter follow implementations using CommonAPI
2019-03-04 01:00:37 +03:00
kaniini
dd5865535e
Merge branch 'muting' into 'develop'
...
Don't stream muted accounts
See merge request pleroma/pleroma!888
2019-03-03 21:10:10 +00:00
William Pearson
818a7894da
Don't stream muted accounts
2019-03-03 20:54:53 +00:00
link0ff
88a672fe88
Move LDAP code to LDAPAuthenticator. Use Authenticator for token_exchange with grant_type as well
2019-03-03 21:20:36 +02:00
link0ff
19e2b85247
Merge remote-tracking branch 'upstream/develop' into feature/openldap-support
2019-03-03 18:29:37 +02:00
kaniini
ace4231628
Merge branch 'features/bio_rel_me' into 'develop'
...
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
2019-03-03 16:00:49 +00:00
kaniini
6c6a2dbfdd
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
...
Add pagination and search to users
See merge request pleroma/pleroma!873
2019-03-03 15:59:15 +00:00
kaniini
b531e366df
Merge branch 'get-follow-requests-sql' into 'develop'
...
Use sql query in User.get_follow_requests/1 for filtering logic
See merge request pleroma/pleroma!883
2019-03-03 15:51:32 +00:00
kaniini
413cf00cc3
Merge branch 'atomic-note-count-updates' into 'develop'
...
Atomic update for note count and follower count
See merge request pleroma/pleroma!885
2019-03-03 15:50:41 +00:00
kaniini
c93479c6f5
Merge branch 'count-only-public-statuses' into 'develop'
...
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
2019-03-03 15:49:19 +00:00
eugenijm
d5418e9ff7
Remove follow_request_count as it's not needed for FE anymore.
...
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
2019-03-03 18:42:27 +03:00
eugenijm
af0039a3a0
Use atomic update for note count and follower count
2019-03-03 17:41:34 +03:00
lambda
9b63fda9c7
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
...
[#675 ] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
2019-03-03 11:13:59 +00:00
eugenijm
c46950d3b1
Increment user note count only on public activities
2019-03-03 14:08:43 +03:00
eugenijm
1a1f4520cd
Use sql query in User.get_follow_requests/1 for filtering logic
2019-03-02 22:18:56 +03:00
Maxim Filippov
2ec8cf5665
Add pagination to search
2019-03-02 17:21:30 +03:00
rinpatch
f38c316e6e
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
...
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
2019-03-02 06:39:07 +00:00
Haelwenn (lanodan) Monnier
f2452d5700
Pleroma.User: mix format
2019-03-02 07:04:49 +01:00
Haelwenn (lanodan) Monnier
8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
2019-03-02 06:58:42 +01:00
Haelwenn (lanodan) Monnier
39a5bea9b7
Pleroma.User: Fix syntax and user.ap_id call
2019-03-02 06:57:28 +01:00
Haelwenn (lanodan) Monnier
3d22642352
Pleroma.User: Pass an array to profile_urls
2019-03-02 06:33:15 +01:00
Haelwenn (lanodan) Monnier
9b83236fb0
Pleroma.Web.RelMe: fixups
2019-03-02 06:32:03 +01:00
Haelwenn (lanodan) Monnier
56d4e39012
Pleroma.User: Add rel=me to URLs where it linkbacks to the profile
2019-03-02 05:36:48 +01:00
Haelwenn (lanodan) Monnier
b6a001a34c
Web.OAuth.OAuthController: Fix scopes Enum.join for OAuth response
2019-03-02 04:04:16 +01:00
Maxim Filippov
f635b675b2
Refactor a little bit
2019-03-01 21:17:23 +03:00
Maxim Filippov
f1a4c3163b
Show current user in users list as well
2019-03-01 20:23:03 +03:00
Maxim Filippov
5b08b470f6
Add "local" params to users search
2019-03-01 20:13:02 +03:00
William Pitcock
689b0730f8
activitypub: fix date header format
...
HTTP date header specification says that days must always be two-digit.
Accordingly, change the format string used to ensure days are always
represented as two-digit (e.g. 01).
2019-03-01 12:22:45 +00:00
lambda
2f00814475
Merge branch 'bugfix/236-ambiguous-route-for-numerical-handles' into 'develop'
...
Bugfix #236 Prefer user look-up by nickname
See merge request pleroma/pleroma!860
2019-03-01 09:48:24 +00:00
rinpatch
1341ee650e
[ #675 ] Do not show DMs in mentions timeline
2019-03-01 09:37:29 +03:00
William Pitcock
28b4093233
mastodon websocket: return errors using ok, not stop
2019-02-28 16:23:55 +00:00
William Pitcock
388a3f4ca2
mastodon websocket: bring back infinity timeout
2019-02-28 16:23:24 +00:00
Maxim Filippov
46f29b9da1
Add search users endpoint
2019-02-28 19:04:47 +03:00
William Pitcock
f1d37a5e23
mastodon websocket: use pattern match to get query data, robustly handle errors
2019-02-28 16:02:48 +00:00
William Pitcock
bc53dff5b6
mastodon api: websocket: update code for cowboy 2.x
2019-02-28 15:44:12 +00:00
Maxim Filippov
72b7a0797e
Use Mastodon API views in Admin API
2019-02-28 17:43:09 +03:00
href
a47cc5a2cf
Merge branch 'customizable_auth' into 'develop'
...
Authenticator tweaks
See merge request pleroma/pleroma!875
2019-02-28 11:18:01 +00:00
Ivan Tashkinov
3281a3f074
Renamed *DatabaseAuthenticator to *Authenticator.
2019-02-28 14:12:41 +03:00
Ivan Tashkinov
4e77f68414
Added auth_template/0 to DatabaseAuthenticator.
2019-02-28 13:58:58 +03:00
kaniini
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
2019-02-28 10:22:19 +00:00
href
90a24fbf95
Merge branch 'customizable_auth' into 'develop'
...
Auth customization support
See merge request pleroma/pleroma!852
2019-02-28 10:12:26 +00:00
kaniini
089e2588a3
Merge branch 'speedup-follow-requests' into 'develop'
...
Speedup follow requests
Closes #677
See merge request pleroma/pleroma!871
2019-02-28 10:10:03 +00:00
kaniini
3c849d0438
Merge branch 'deactivated-in-user-view' into 'develop'
...
Add activation status to the regular user view
See merge request pleroma/pleroma!874
2019-02-28 10:08:31 +00:00
Ivan Tashkinov
b6f915313f
Made auth customization be runtime-configurable.
2019-02-28 13:00:54 +03:00
eugenijm
6b11011039
Added deactivated to the user view
2019-02-28 09:08:34 +03:00
Maxim Filippov
2883f75a3a
Add pagination to users admin API
2019-02-28 01:11:56 +03:00
lain
bbbdbec4fd
Remove parts of the old activity view.
...
Not used anymore.
2019-02-27 17:24:51 +01:00
lain
9ade1242c2
Add user muted status info to twitterapi.
2019-02-27 16:52:03 +01:00
lain
c1ae495878
Add user muted status info to MastodonAPI.
2019-02-27 16:46:47 +01:00
lain
c4235f96bd
Add with_muted param.
2019-02-27 16:37:42 +01:00
lain
b24cc44e8d
Follower requests: Utilize object index.
...
Closes #677
2019-02-27 15:01:54 +01:00
William Pitcock
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
2019-02-27 13:01:10 +00:00
Egor Kislitsyn
5d961d536c
fix formatter
2019-02-27 15:40:30 +07:00
Egor
c3ac9424d2
AutoLinker
2019-02-26 23:32:26 +00:00
Maxim Filippov
90d0d055fc
Add more admin actions
2019-02-27 00:13:38 +03:00
Ivan Tashkinov
e98d34e5fb
Added missing copyright headers.
2019-02-26 16:26:54 +03:00
Ivan Tashkinov
fd46edb473
Merge remote-tracking branch 'remotes/origin/develop' into customizable_auth
2019-02-26 15:29:43 +03:00
Ivan Tashkinov
e82b70eb53
Database authenticator behaviour / Pleroma implementation refactoring.
2019-02-26 15:27:01 +03:00
William Pitcock
fc9d895ebc
twitter card: remove IO.inspect() spam
2019-02-24 18:56:44 +00:00
11backslashes
efa506b874
delegate user retrieval to the User module
2019-02-24 13:23:47 -05:00
link0ff
e278d47023
OpenLDAP support
2019-02-22 15:03:43 +02:00
lain
9e0686efa6
Move visibility into own module.
2019-02-22 13:29:52 +01:00
lain
62296f5a25
Fix private post card handling.
2019-02-22 12:02:51 +01:00
Ivan Tashkinov
afddce45b3
Minor setting name adjustment (:app_template -> :app_layout).
2019-02-22 11:10:17 +03:00
kaniini
5a4e2905fe
Merge branch 'fix/twittercards' into 'develop'
...
Fix Twitter Cards
See merge request pleroma/pleroma!815
2019-02-22 04:38:14 +00:00
KZ
7c722c08f5
Fix: Fixing an outbox related bug when local user activity is empty
2019-02-22 04:37:48 +00:00
Ivan Tashkinov
1097ce6d9f
Auth customization support.
...
OAuthController#create_authorization user retrieval / creation, errors handling, template & layout selection.
2019-02-21 18:55:19 +03:00
lambda
2813f28b6f
Merge branch 'bugfix/httpsig-sign-date' into 'develop'
...
activitypub: sign date header
Closes #649 and #364
See merge request pleroma/pleroma!847
2019-02-21 08:20:06 +00:00
William Pitcock
f8a72f2997
activitypub: sign http date header
2019-02-21 00:23:17 +00:00
William Pitcock
1803d9a022
fix fetching AP objects with application/json
2019-02-20 20:45:40 +00:00
William Pitcock
22e2ed235d
logging: only return ISE reasons in API responses when in dev or test mode
2019-02-20 17:36:47 +00:00
William Pitcock
8b08096436
logging: improve visibility into ISE errors
2019-02-20 17:14:18 +00:00
Egor
bff9eb5ef7
Reports
2019-02-20 16:51:25 +00:00
lain
59c27f29c8
Add some nicer urls in status view.
2019-02-20 17:36:16 +01:00
Ivan Tashkinov
b574d97c2e
[ #468 ] Added support for push OAuth scope (Mastodon 2.4+).
2019-02-20 17:27:41 +03:00
Ivan Tashkinov
6fe7acd58e
[ #468 ] Merged upstream/develop.
2019-02-20 16:48:59 +03:00
lambda
11b3c10c54
Merge branch 'muting' into 'develop'
...
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
2019-02-20 13:19:37 +00:00
Ivan Tashkinov
3ad91ec3c1
[ #468 ] Adjusted scope restriction for MastodonAPIController#index.
2019-02-20 14:05:02 +03:00
Ekaterina Vaartis
5a46d37af9
Update the mute implementation to the current codebase
...
Make it part of the info thing (and do a migration to ensure it's there)
2019-02-19 23:09:16 +03:00
Ekaterina Vaartis
465b547c90
Remove unused "muted" parameter, use piping for mute/block fns
2019-02-19 21:49:55 +03:00
Ekaterina Vaartis
092b1b1453
Do not unfollow muted users
2019-02-19 21:49:55 +03:00
Ekaterina Vaartis
da64ea4a55
Implement mastodon mutes endpoint
...
Aparently i forgot to add it, it gets a list of muted users
2019-02-19 21:49:55 +03:00
Ekaterina Vaartis
f41f017bbc
Implement muting, add it to the mastodon API
2019-02-19 21:49:55 +03:00
href
f4bfc628ca
Player: allow styles on CSP, loop videos
2019-02-19 18:56:57 +01:00
href
aa9af1d639
CSP: Allow iframes on embed player
2019-02-19 18:19:13 +01:00
Mark Felder
2d21ea1a0e
Merge branch 'develop' into fix/twittercards
2019-02-19 16:58:28 +00:00
href
10a11f083c
Embed player suitable for Twitter Cards
2019-02-19 17:47:48 +01:00
eugenijm
25b9e7a8c3
Added admin API for changing user activation status
2019-02-19 19:37:02 +03:00
Ivan Tashkinov
c0ecbf6669
[ #468 ] Merged upstream/develop.
2019-02-19 19:10:55 +03:00
lambda
1dd718e83c
Merge branch 'set-cache-on-user-tag-update' into 'develop'
...
Update user cache when user tags are updated
See merge request pleroma/pleroma!840
2019-02-19 14:20:58 +00:00
lambda
f25a3f4f78
Merge branch 'fix/check-follower-collection-in-is_private' into 'develop'
...
properly check for follower address in is_private?
See merge request pleroma/pleroma!841
2019-02-19 14:08:19 +00:00
lambda
f53dc5ee08
Merge branch 'fix/ap_id-unique_constraint' into 'develop'
...
mark ap_id unique_constraint
See merge request pleroma/pleroma!842
2019-02-19 14:07:16 +00:00
rinpatch
109b01a631
mark ap_id unique_constraint
2019-02-19 13:52:15 +03:00
rinpatch
96dcacade1
properly check for follower address in is_private?
2019-02-19 13:23:13 +03:00
eugenijm
fc35481445
Update user cache when user tags are updated
2019-02-19 10:43:38 +03:00
kaniini
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
2019-02-18 19:43:06 +00:00
kaniini
a39a094cda
Merge branch 'patch-image-description' into 'develop'
...
Patch to support image descriptions for pleroma-fe
See merge request pleroma/pleroma!626
2019-02-18 04:11:46 +00:00
kaniini
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
2019-02-18 04:02:41 +00:00
kaniini
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
2019-02-18 04:01:51 +00:00
kaniini
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
2019-02-18 04:01:26 +00:00
kaniini
3f38a05571
Merge branch 'csv-export' into 'develop'
...
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
2019-02-18 03:59:46 +00:00
Maxim Filippov
94708d6370
Render only "id", "valid_until" and "app_name" in TokenView
2019-02-17 23:57:35 +03:00
lambda
f26582aae9
Merge branch 'mastoapi-stop-capping-attachments' into 'develop'
...
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla Mastodon
See merge request pleroma/pleroma!834
2019-02-17 17:37:48 +00:00
lambda
ae84af4ad0
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
...
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
2019-02-17 16:57:57 +00:00
Ivan Tashkinov
d3fe2c8ec6
[ #468 ] Formatting fix.
2019-02-17 14:07:35 +03:00
Ivan Tashkinov
bc4f77b10b
[ #468 ] Merged upstream/develop, resolved conflicts.
2019-02-17 14:07:04 +03:00
Ivan Tashkinov
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
2019-02-17 13:49:14 +03:00
rinpatch
8f98d970c1
Fix recipient count in hellthread policy
2019-02-17 13:46:40 +03:00
Haelwenn (lanodan) Monnier
4df455f69b
[MastoAPI] Add switching of frontend flavours
2019-02-16 19:50:13 +01:00
rinpatch
96c725328b
Remove a limit on attachments in Mastodon API and document the changes in responses from vanilla mastodon
2019-02-16 20:38:25 +03:00
lain
269d3e1ca6
WelcomeMessage: Get rid of Ecto reference.
2019-02-16 17:24:48 +01:00
lain
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
2019-02-16 17:01:15 +01:00
lain
d812a347ca
Add optional welcome message.
2019-02-16 16:42:34 +01:00
Ivan Tashkinov
2a4a4f3342
[ #468 ] Defined OAuth restrictions for all applicable routes.
...
Improved missing "scopes" param handling.
Allowed "any of" / "all of" mode specification in OAuthScopesPlug.
Fixed auth UI / behavior when user selects no permissions at /oauth/authorize.
2019-02-15 19:54:37 +03:00
lambda
1ce1b7b58d
Merge branch 'bugfix/oauth-token-padding' into 'develop'
...
oauth: never use base64 padding when returning tokens to applications
See merge request pleroma/pleroma!825
2019-02-15 14:58:13 +00:00
rinpatch
921571c19b
Merge branch 'hellthread-filter-fix' into 'develop'
...
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
2019-02-15 13:18:35 +00:00
Karen Konou
c2e0a0c8d4
Readd threshold is not 0 check, optmization?
2019-02-15 14:05:20 +01:00
Karen Konou
dca6bee2f7
Rename test, add check for follower collection when delisting
2019-02-15 13:43:14 +01:00
rinpatch
b63a5e309d
Merge branch 'bugfix/actor-containment' into 'develop'
...
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
2019-02-15 12:27:03 +00:00
Karen Konou
d943c90249
Add tests, change default config values, fix a bug
2019-02-15 12:47:50 +01:00
eugenijm
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the follow,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
2019-02-15 12:20:20 +03:00
William Pitcock
da44cdd381
user: search: use get_or_fetch() instead of get_or_fetch_by_nickname()
...
get_or_fetch() handles the nickname verses URI differences transparently.
2019-02-14 20:00:04 +00:00
lambda
ea2698beb7
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
...
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
2019-02-14 19:54:16 +00:00
William Pitcock
56862f4ce1
activitypub: clean up logging statements a little
2019-02-14 19:42:33 +00:00
Wim Vanderbauwhede
04b1c13554
Merge remote-tracking branch 'upstream/develop' into patch-image-description
2019-02-14 16:41:40 +00:00
Ivan Tashkinov
027adbc9e5
[ #468 ] Refactored OAuth scopes parsing / defaults handling.
2019-02-14 17:03:19 +03:00
Egor Kislitsyn
3f32d7b937
Fix queue name
2019-02-14 17:02:47 +07:00
Egor Kislitsyn
907306174b
fix S3 links encoding in Mediaproxy
2019-02-14 15:55:21 +07:00
William Pitcock
72ba5b4ab7
activitypub: user view: formatting
2019-02-14 03:13:07 +00:00
William Pitcock
5307c211b8
activitypub: user view: report totalItems=0 for follows/followers when hidden
2019-02-14 03:10:00 +00:00
William Pitcock
6542b86292
activitypub: user view: remove totalItems from user outbox
...
(this is based on a counter in User.Info, but the counter is not reliable.)
2019-02-14 03:02:45 +00:00
William Pitcock
ee2fa1a314
activitypub: user view: remove totalInbox from user inbox view
...
It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.
2019-02-14 03:01:39 +00:00
kaniini
bc9e5e6b65
Merge branch 'feature/activitypub-oauth-endpoints' into 'develop'
...
ActivityPub C2S oauth endpoints
See merge request pleroma/pleroma!821
2019-02-14 02:50:06 +00:00
William Pitcock
64620d8980
activitypub: user view: do not expose oAuth endpoints for instance users
2019-02-14 02:41:21 +00:00
William Pitcock
e9ef4b8da6
oauth: never use base64 padding when returning tokens to applications
...
The normal Base64 alphabet uses the equals sign (=) as a padding character. Since
Base64 strings are self-synchronizing, padding characters are unnecessary, so don't
generate them in the first place.
2019-02-14 01:10:04 +00:00
William Pitcock
e05bf2940f
activitypub: transmogrifier: correctly handle nil inReplyTo value
2019-02-14 00:35:54 +00:00
William Pitcock
94cbbb0e3a
activitypub: transmogrifier: do not attempt to expand pre-existing AS2 tag objects
2019-02-14 00:35:53 +00:00
Mark Felder
f62c1d6266
Improve login error for OAuth flow
2019-02-13 22:33:22 +00:00
Ivan Tashkinov
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for scopes fields, updated usages.
2019-02-14 00:29:29 +03:00
William Pitcock
9bd6ed975e
activitypub: user view: use route helpers instead of hardcoded URIs
2019-02-13 19:34:43 +00:00
William Pitcock
29e946ace4
activitypub: user view: add oauthRegistrationEndpoint to user profiles
2019-02-13 19:34:43 +00:00
William Pitcock
db8abd958d
activitypub: user view: fix up endpoints rendering
2019-02-13 19:34:43 +00:00
William Pitcock
90facd3598
user view: add AP C2S oauth endpoints to local user profiles
2019-02-13 19:34:43 +00:00
Karen Konou
bef9b9cb66
refactored code
2019-02-13 16:23:09 +01:00
Karen Konou
adcdd21f16
Merge branch 'develop' into hellthread-filter-fix
2019-02-13 16:22:14 +01:00
lain
88a4de24f9
User.follow_all: Respect blocks in both directions.
2019-02-13 13:52:27 +01:00
Maxim Filippov
760fec4cb8
Update token.ex
2019-02-13 12:59:56 +03:00
Maxim Filippov
62a45bdc11
Add revoke token
2019-02-13 12:59:56 +03:00
Maxim Filippov
61a4bc5095
Add OAuth tokens endpoint
2019-02-13 12:59:56 +03:00
hakabahitoyo
b7bc666200
bugfix mdii uploader
2019-02-13 15:46:42 +09:00
Karen Konou
1d727cd069
added checks for public url and follower collections
2019-02-13 00:01:34 +01:00
Haelwenn (lanodan) Monnier
da4c662af3
Plugs.HTTPSecurityPlug: Add webpacker to connect-src
2019-02-12 22:12:12 +01:00
Haelwenn (lanodan) Monnier
00e8f0b07d
Plugs.HTTPSecurityPlug: Add unsafe-eval to script-src when in dev mode
...
This is needed to run dev mode mastofe at the same time
2019-02-12 22:12:11 +01:00
Mark Felder
c984e8272a
Formatting
2019-02-12 00:37:22 +00:00
Mark Felder
4956ab5ea3
Fix compile
2019-02-12 00:25:12 +00:00
Mark Felder
ac7ef0999d
WIP: Fix Twitter Cards
...
Twitter cards were not passing any useful metadata. A few things were
being handled on Twitter's end by trying to match OpenGraph tags with
their own, but it wasn't working at all for media. This is an attempt to
fix that.
Common functions have been pulled out of opengraph and put into
utils. Twitter's functionality was entirely replaced with a direct copy
of Opengraph's and then modified as needed.
Profiles are now represented as Summary Cards
Posts with images are now represented as Summart with Large Image Cards
Posts with video and audio attachments are represented as Player Cards.
This now passes the Twitter Card Validator.
Validator and Docs are below
https://cards-dev.twitter.com/validator
https://developer.twitter.com/en/docs/tweets/optimize-with-cards/overview/abouts-cards
2019-02-11 23:59:04 +00:00
shibayashi
ea1058929c
Use url[:scheme] instead of protocol to determine if https is enabled
2019-02-12 00:08:52 +01:00
rinpatch
379d04692c
Filter summary in keywordpolicy
2019-02-11 21:35:40 +03:00
rinpatch
39383a6b79
Merge branch 'feature/thread-muting' into 'develop'
...
Feature/thread muting
See merge request pleroma/pleroma!796
2019-02-11 15:02:14 +00:00
lambda
044616292b
Merge branch 'feature/rich-media-limits' into 'develop'
...
rich media: tighten fetching timeouts and size limits
See merge request pleroma/pleroma!809
2019-02-11 12:33:58 +00:00
Karen Konou
ac72b578da
Merge branch 'develop' into feature/thread-muting
2019-02-11 12:10:49 +01:00
Karen Konou
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
2019-02-11 12:04:02 +01:00
lambda
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
2019-02-11 08:07:39 +00:00
Egor Kislitsyn
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
2019-02-11 13:54:21 +07:00
William Pitcock
45e57dd187
rich media: tighten fetching timeouts and size limits
2019-02-10 21:54:08 +00:00
kaniini
6c8d15da11
Merge branch 'fix/credo-issues' into 'develop'
...
Fix credo issues
See merge request pleroma/pleroma!786
2019-02-10 20:54:21 +00:00
Karen Konou
cc21fc5f53
refactor, status view updating, error handling
2019-02-10 10:42:30 +01:00
rinpatch
e0de0fcf22
Merge branch 'object-creation' into 'develop'
...
Do object insertion through Cachex
See merge request pleroma/pleroma!802
2019-02-10 07:39:27 +00:00
kaniini
d5fe05c37e
Merge branch 'follow-enhancements' into 'develop'
...
Respect blocks in mass follow.
See merge request pleroma/pleroma!797
2019-02-09 21:03:42 +00:00
lain
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
2019-02-09 22:01:08 +01:00
Karen Konou
6a150de3bd
Add unique index and unique constraint check, uniqueness test fails
2019-02-09 20:52:11 +01:00
Karen Konou
638456ce8f
elixir too new for CI's mix format lol
2019-02-09 18:08:46 +01:00
Karen Konou
a0d732ec55
it works!!
2019-02-09 17:47:57 +01:00
Haelwenn (lanodan) Monnier
6ca633ddd3
Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure)
2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier
d924dc73ba
de-group import/s
2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier
6a6a5b3251
de-group alias/es
2019-02-09 16:31:17 +01:00
Ivan Tashkinov
a337bd114c
[ #468 ] MastodonAPI scope restrictions. Removed obsolete "POST /web/login" route.
2019-02-09 17:32:33 +03:00
Ivan Tashkinov
4ad843fb9d
[ #468 ] Prototype of OAuth2 scopes support. TwitterAPI scope restrictions.
2019-02-09 17:09:08 +03:00
Haelwenn (lanodan) Monnier
381fe44172
HTML.Scrubber.Default: Consistency
2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier
2272934a5e
Stash
2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier
d2e4eb7c74
Web.ActivityPub.ActivityPub: assign the Enum.filter to recipients & simplify it
2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier
bd9b5fffbc
Mix.Tasks.Pleroma.Uploads: Fix typo in documentation
2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier
473095faf2
Web.Federator: Fix unused variable
2019-02-09 14:59:20 +01:00
Haelwenn (lanodan) Monnier
60ea29dfe6
Credo fixes: alias grouping/ordering
2019-02-09 14:59:20 +01:00
Haelwenn (lanodan) Monnier
106f4e7a0f
Credo fixes: parameter consistency
2019-02-09 14:59:20 +01:00
Haelwenn (lanodan) Monnier
8bcfac93a8
Make credo happy
2019-02-09 14:59:20 +01:00
lain
563f04e81b
Do autofollow first.
2019-02-09 13:39:57 +01:00
lain
bbd0049fae
Respect blocks in mass follow.
2019-02-09 13:24:23 +01:00
lambda
1eecbc1cd1
Merge branch 'feature/keyword-policy' into 'develop'
...
Add keyword policy
See merge request pleroma/pleroma!794
2019-02-09 11:38:37 +00:00
Karen Konou
7e47a810a2
help i am not good with git
2019-02-08 13:22:29 +01:00
Karen Konou
5c5b228f21
Added thread unmuting (still a bit buggy maybe)
2019-02-08 13:20:40 +01:00
Karen Konou
a44e532fb1
Added thread unmuting (still a bit buggy maybe)
2019-02-08 13:17:11 +01:00
rinpatch
7356659273
wow
2019-02-08 15:12:13 +03:00
Karen Konou
98ec578f4d
Merge branch 'develop' into feature/thread-muting
2019-02-08 12:44:02 +01:00
rinpatch
f88dec8b33
What idiot did that? (me)
2019-02-08 13:16:50 +03:00
rinpatch
6c21f5aa16
Merge branch 'develop' into feature/keyword-policy
2019-02-08 13:12:33 +03:00
rinpatch
8a0b755c19
rename ftl_removal to federated_timeline_removal to keep consistent naming with SimplePolicy
2019-02-08 13:12:09 +03:00
rinpatch
2174f6eb4f
Add default config for keyword policy
2019-02-08 12:48:39 +03:00
rinpatch
46aa8c18a2
Add keyword policy
2019-02-08 12:38:24 +03:00
Karen Konou
c43f414a79
Somehow fixed the repo insert [skip-ci]
2019-02-07 23:44:49 +01:00
Karen Konou
7e3ec93ed0
made a silly oopsie
2019-02-07 22:59:53 +01:00
Karen Konou
77448de492
ugghhhh
2019-02-07 22:25:07 +01:00
Ivan Tashkinov
2c68cf7e9e
OAuth2 security fixes: redirect URI validation, "Mastodon-Local" security breach fix.
...
(`POST /api/v1/apps` could create "Mastodon-Local" app wth any redirect_uris,
and if that happened before /web/login is accessed for the first time
then Pleroma used this externally created record with arbitrary
redirect_uris and client_secret known by creator).
2019-02-07 22:14:06 +03:00
Karen Konou
f4ff4ffba2
Migration and some boilerplate stuff
2019-02-07 17:36:14 +01:00
Mark Felder
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
2019-02-06 22:34:44 +00:00
Haelwenn
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
2019-02-06 18:39:13 +00:00
kaniini
18e783bcb2
Merge branch 'add-admin-and-moderator-fields' into 'develop'
...
Add admin and moderator badges to user view and make their visibility configurable
See merge request pleroma/pleroma!767
2019-02-06 18:19:47 +00:00
William Pitcock
65a4b9fbea
mastodon api: rich media: don't clobber %URI struct with a string
2019-02-06 18:02:15 +00:00
rinpatch
f7aedbcc55
Merge branch 'fix/activitypub-user-view-badmap' into 'develop'
...
Fix if clause in activity_pub user_view
See merge request pleroma/pleroma!783
2019-02-06 17:47:58 +00:00
href
f753043ce0
Fix if clause in activity_pub user_view
2019-02-06 18:42:19 +01:00
Egor Kislitsyn
6f05f448f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
2019-02-06 11:33:00 +07:00
eugenijm
035eaeb9b8
Allow to configure visibility for admin and moderator badges
2019-02-06 06:18:05 +03:00
eugenijm
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
2019-02-06 02:10:06 +03:00
William Pitcock
d83dbd9070
rich media: parser: reject any data which cannot be explicitly encoded into JSON
2019-02-05 20:50:57 +00:00
kaniini
d120aa63f0
Merge branch 'fix-dm-index' into 'develop'
...
Massage index until it actually does the stuff we want.
See merge request pleroma/pleroma!772
2019-02-05 20:27:31 +00:00
kaniini
681ba1e52f
Merge branch 'feature/ap-c2s-whoami' into 'develop'
...
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
See merge request pleroma/pleroma!773
2019-02-05 20:26:31 +00:00
kaniini
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
2019-02-05 18:56:59 +00:00
kaniini
ecdb0b7f57
Merge branch 'bugfix/rich-media-image-nil' into 'develop'
...
mastodon api: fix rendering of cards without image URLs (closes #597 )
Closes #597
See merge request pleroma/pleroma!777
2019-02-05 18:53:43 +00:00
William Pitcock
1d94b67e40
mastodon api: fix rendering of cards without image URLs ( closes #597 )
2019-02-05 18:30:27 +00:00
lambda
f8b831ecfd
Merge branch 'bugfix/transmogrifier-bare-tags' into 'develop'
...
activitypub: transmogrifier: fix bare tags
See merge request pleroma/pleroma!774
2019-02-05 11:30:18 +00:00
William Pitcock
a2bb5d890d
html: don't attempt to parse nil content
2019-02-05 05:06:17 +00:00
William Pitcock
e71ab5a10f
activitypub: transmogrifier: fix bare tags
2019-02-05 00:43:28 +00:00
William Pitcock
db1165f70f
activitypub: c2s: add /api/ap/whoami endpoint for andstatus
2019-02-04 22:58:29 +00:00
lain
f3c8b02d65
Massage index until it actually does the stuff we want.
...
Also makes the index a lot smoler.
2019-02-04 23:47:29 +01:00
Haelwenn
03991e7bc5
Merge branch 'feature/mrf-tag' into 'develop'
...
MRF TagPolicy engine
See merge request pleroma/pleroma!768
2019-02-04 19:20:11 +00:00
William Pitcock
7d110be119
activitypub: mrf: tag policy: fix force-unlisted and sandbox actions
2019-02-04 19:03:54 +00:00
William Pitcock
64a3993425
activitypub: mrf: tag policy: add support for subscription control
2019-02-04 17:48:48 +00:00
Egor Kislitsyn
14d967f515
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
2019-02-05 00:38:05 +07:00
rinpatch
3ae11835a9
Merge branch 'hotfix/hellthread-deprecation-warning' into 'develop'
...
fix hellthread threshold deprecation warning
See merge request pleroma/pleroma!770
2019-02-04 17:32:12 +00:00
Karen Konou
4031c94a59
fix hellthread threshold deprecation warning
2019-02-04 18:26:56 +01:00
William Pitcock
ff2c28fd6d
activitypub: mrf: tag policy: refactor the filtering hook a bit
2019-02-04 17:06:37 +00:00
William Pitcock
9a69f08e86
activitypub: mrf: tag policy: add support for processing follow requests
2019-02-04 17:04:05 +00:00
William Pitcock
084bb8ccd5
activitypub: mrf: tag policy: implement force-unlisted and sandbox
2019-02-04 17:04:05 +00:00
William Pitcock
88e32a32ce
mrf: add initial MRF.TagPolicy engine
2019-02-04 17:04:05 +00:00
William Pitcock
93e136d70b
mix: add user tag/untag task
2019-02-04 17:04:05 +00:00
kaniini
25a659d2dc
Merge branch 'mime-riff' into 'develop'
...
Mime: detect RIFF formats (wave, webp, avi)
See merge request pleroma/pleroma!769
2019-02-04 16:52:41 +00:00
href
127f99ae18
Mime: detect RIFF formats (wave, webp, avi)
2019-02-04 17:44:41 +01:00
rinpatch
00835bf678
Merge branch 'fix/rich-media-relative-path' into 'develop'
...
Fix rich media relative path
Closes #588
See merge request pleroma/pleroma!759
2019-02-04 16:01:34 +00:00
Egor Kislitsyn
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
2019-02-04 20:50:28 +07:00
rinpatch
89762ad230
Merge branch 'feature/hellthread-filter-improvements' into 'develop'
...
Improve hellthread filter
Closes #584
See merge request pleroma/pleroma!766
2019-02-04 12:36:50 +00:00
Karen Konou
58262a8b8a
removed a debug thingy
2019-02-04 11:22:25 +00:00
Karen Konou
4430641349
squished a bug
2019-02-04 12:09:00 +01:00
Karen Konou
3cf046babb
actually commited the changes
2019-02-04 10:23:43 +01:00
Karen Konou
63a4f4b7be
fixed Map,put arguments, updated nomenclature
2019-02-04 10:23:07 +01:00
Karen Konou
583c4e0f17
more tweaks, fixed silly mistakes...
2019-02-03 23:56:20 +01:00
Karen Konou
e10cda7541
implemented tweaks
2019-02-03 22:46:06 +01:00
kaniini
c57f37bd36
Merge branch 'mogrify-orient' into 'develop'
...
Update Mogrify docs and warning for deprecated syntax
See merge request pleroma/pleroma!763
2019-02-03 21:06:15 +00:00
Karen Konou
531507a635
fixed things
2019-02-03 20:45:32 +01:00
Karen Konou
10130fa7d6
made toggleable, added docs
2019-02-03 20:27:28 +01:00
Karen Konou
0ef0ae35ab
added optional delist feature
2019-02-03 20:12:23 +01:00
Maxim Filippov
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
2019-02-03 21:55:04 +03:00
lambda
69a38644bc
Merge branch '589-fix-cache' into 'develop'
...
Resolve "Update object cache on favs/boosts"
Closes #589
See merge request pleroma/pleroma!764
2019-02-03 18:19:40 +00:00
lain
505a084058
Still do caching in tests.
2019-02-03 18:28:14 +01:00
Mark Felder
0c08bd4181
Update Mogrify docs and warning for deprecated syntax to encourage
...
users to enable both strip and auto-orient
2019-02-03 16:39:42 +00:00
Ivan Tashkinov
3913b0196e
[ #582 ] Made single-pub task call Instance.set_reachable/1 if set_reachable is not specified.
...
Added tests.
2019-02-03 13:28:13 +03:00
Ivan Tashkinov
b40b4bc4e5
[ #582 ] Optimized federation retirement by reducing the number of SQL calls
...
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
2019-02-03 12:41:27 +03:00
Maxim Filippov
2c59eb3cfc
Add responsive features to layout
2019-02-02 13:40:34 +03:00
rinpatch
68d461b3a9
Check if rich media uri is relative
2019-02-02 12:24:24 +03:00
rinpatch
833404f0f5
Use with instead of if in the card
2019-02-02 12:04:18 +03:00
rinpatch
e4d18f328b
merge only if page_url is an absolute path
2019-02-02 11:53:46 +03:00
rinpatch
cbadf9d333
Fix rich media relative path
2019-02-02 11:38:37 +03:00
kaniini
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
2019-02-01 20:22:58 +00:00
href
28bfb09b01
Merge branch 'hotfix/object-normalize-cache' into 'develop'
...
object: use cached accesses when possible in Object.normalize()
See merge request pleroma/pleroma!757
2019-02-01 19:45:55 +00:00
href
ffbf306c9a
Merge branch 'streaming-api-url-fix' into 'develop'
...
Fix WebSocket streaming API URL.
See merge request pleroma/pleroma!756
2019-02-01 19:39:50 +00:00
William Pitcock
af10ef8d4e
object: use cached accesses when possible in Object.normalize()
2019-02-01 19:38:57 +00:00
eugenijm
a184811a60
Use url() instead of static_url in Endpoint.websocket_url()
2019-02-01 22:35:19 +03:00
href
7e384a2425
Merge branch 'develop' into 'develop'
...
Use nodeinfo 2.1
See merge request pleroma/pleroma!753
2019-02-01 19:18:46 +00:00
Luna
9cac8729af
update nodeinfo version when requesting 2.1
2019-02-01 16:03:23 -03:00
eugenijm
d747bd9870
Use String.replace_leading instead of String.replace for getting websocket streaming api url.
...
Extract the login responsible for obtaining websocket URL into the corresponding
Endpoint function.
2019-02-01 21:58:43 +03:00
Luna
1cdcee89da
mix format pass
2019-02-01 14:40:43 -03:00
Luna
23b1c64a19
downcase software name in nodeinfo
2019-02-01 14:35:08 -03:00
Luna
b17ce875cf
keep compatibility with nodeinfo 2.0
...
splits actual nodeinfo generation into raw_nodeinfo, the 2.0 handler
gives the same result, while the 2.1 handler inserts the
software.repository field. requested by @href
2019-02-01 14:23:40 -03:00
Haelwenn (lanodan) Monnier
74c6119f28
MastodonAPI.MastodonAPIController: Return a 404 when we fail to get a list
2019-02-01 18:21:16 +01:00
Luna
cd6db6abe4
use Mix.Project.Config for some Application functions
2019-02-01 14:11:23 -03:00
kaniini
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
2019-02-01 17:05:29 +00:00
lambda
fc7644798d
Merge branch 'serve-sw-pleroma.js' into 'develop'
...
Serve sw-pleroma.js properly
See merge request pleroma/pleroma!754
2019-02-01 14:24:07 +00:00
href
fa5ec765d9
Serve sw-pleroma.js properly
2019-02-01 11:34:41 +01:00
lain
01d483f9c7
Merge remote-tracking branch 'origin/develop' into fix-rich-media-toggle
2019-02-01 10:21:17 +01:00
href
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
2019-02-01 09:14:35 +00:00
Luna
b0c4c082c4
mix format pass
2019-02-01 04:02:40 -03:00
Luna
c05928dbda
use nodeinfo 2.1, add repository field
...
that is the only change from nodeinfo 2.0 to 2.1
also this makes the nodeinfo tests use 2.1.json instead of 2.0.json
2019-02-01 03:55:10 -03:00
lain
b19b4f8537
Remove default value for rich media.
...
Setting it to true will actually override a 'false' set before.
2019-01-31 20:02:08 +01:00
href
308b35ebe2
User.follow_all: ensure its stays unique
2019-01-31 18:17:44 +01:00
lambda
44913c1019
Merge branch 'bugfix/rich-media-non-unicode' into 'develop'
...
rich media non-unicode bugfix
See merge request pleroma/pleroma!749
2019-01-31 16:54:48 +00:00
William Pitcock
46dba03098
rich media: parser: only try to validate strings, not numbers (OEmbed)
2019-01-31 16:19:31 +00:00
William Pitcock
dafb6f0b5e
rich media: parser: reject OGP fields we cannot safely process
2019-01-31 16:03:56 +00:00
rinpatch
7057891db6
Make rich media support toggleable
2019-01-31 18:18:20 +03:00
lambda
a43a1c6d4e
Revert "Merge branch 'spc-fix-3' into 'develop'"
...
This reverts merge request !682
2019-01-31 12:16:23 +00:00
kaniini
4d3655c479
Merge branch 'spc-fix-3' into 'develop'
...
Spc fix 3
See merge request pleroma/pleroma!682
2019-01-31 11:29:29 +00:00
Haelwenn
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
2019-01-31 10:16:11 +00:00
Egor Kislitsyn
58e250d9d2
fix merge
2019-01-31 15:23:50 +07:00
Egor Kislitsyn
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
2019-01-31 15:07:49 +07:00
lambda
6b54a3ec0b
Merge branch 'multiple-hackney-pools' into 'develop'
...
Fix 4aff4efapleroma/pleroma!743
2019-01-30 20:18:05 +00:00
href
5ea0397e2d
Fix 4aff4efa typos
2019-01-30 21:08:41 +01:00
kaniini
bd5086731e
Merge branch 'multiple-hackney-pools' into 'develop'
...
Use multiple hackney pools
See merge request pleroma/pleroma!739
2019-01-30 19:01:57 +00:00
lain
47ec690c54
Use race-condition free mass follow.
2019-01-30 19:33:25 +01:00
lain
935e65e261
Use race-condition free following method.
2019-01-30 19:21:04 +01:00
Egor Kislitsyn
ab31adf15b
tiny improve
2019-01-30 22:56:59 +07:00
href
4aff4efa8d
Use multiple hackney pools
...
* federation (ap, salmon)
* media (rich media, media proxy)
* upload (uploader proxy)
Each "part" will stop fighting others ones -- a huge federation outbound
could before make the media proxy fail to checkout a connection in time.
splitted media and uploaded media for the good reason than an upload
pool will have all connections to the same host (the uploader upstream).
it also has a longer default retention period for connections.
2019-01-30 15:06:46 +01:00
kaniini
7a2c4f984b
Merge branch 'bugfix/fix-rejects' into 'develop'
...
follow request fixups
Closes #537
See merge request pleroma/pleroma!734
2019-01-29 14:47:36 +00:00
kaniini
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
2019-01-29 13:54:10 +00:00
William Pitcock
57549f6043
activitypub: utils: update the state of *any* pending follow relationship that matches the actor and target
2019-01-29 12:21:02 +00:00
William Pitcock
cbb2b709de
activitypub: transmogrifier: fix follow request rejections
2019-01-29 11:57:46 +00:00
Ivan Tashkinov
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of referer header. Updated tests.
2019-01-29 13:12:28 +03:00
Haelwenn
ebb3496386
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
...
Rich Media support, part 2.
See merge request pleroma/pleroma!719
2019-01-29 05:11:08 +00:00
William Pitcock
61d6715714
rich media: oembed: return data in the same format as the other parsers
2019-01-28 21:13:25 +00:00
William Pitcock
ddb5545202
rich media: kill some testsuite noise
2019-01-28 20:55:33 +00:00
William Pitcock
0f11254a06
rich media: parser: add some basic sanity checks on the returned data with pattern matching
2019-01-28 20:43:21 +00:00
William Pitcock
83b7062634
rich media: parser: cache negatives
2019-01-28 20:19:07 +00:00
William Pitcock
8fb16e9f0f
rich media: parser: add copyright header
2019-01-28 20:00:01 +00:00
Maxim Filippov
50d6183893
Split hide_network into hide_followers & hide_followings
2019-01-28 21:40:08 +03:00
Egor Kislitsyn
1724a6b34b
add spec back
2019-01-29 00:35:57 +07:00
Egor Kislitsyn
56533495b5
fix defaults
2019-01-29 00:33:08 +07:00
Egor Kislitsyn
b2e9700785
cleanup
2019-01-28 23:12:02 +07:00
Egor Kislitsyn
55affbca7f
add a job queue
2019-01-28 22:17:17 +07:00
lain
f53d464db0
Put deprecation warnings undre Pleroma.Config.
2019-01-28 14:39:54 +01:00
Ivan Tashkinov
d3f9e6f6fe
[ #534 ] Merged upstream/develop.
2019-01-28 15:39:14 +03:00
Ivan Tashkinov
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
2019-01-28 15:25:06 +03:00
lain
8e8a1e1ba8
Return new-style config if old-style config is set to false.
...
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
2019-01-28 13:07:12 +01:00
lain
f1d58c5c49
Don't run warnings in a task.
2019-01-28 13:05:17 +01:00
Haelwenn
de0fb88a9c
Merge branch 'safe-render-activities' into 'develop'
...
remove unnecessary filter (re !723 )
See merge request pleroma/pleroma!729
2019-01-28 11:48:03 +00:00
href
df2f7b39dd
re f83bae7c: remove unnecessary filter
2019-01-28 12:24:14 +01:00
lain
f231313b70
Add deprecation warning mechanism.
2019-01-28 12:09:41 +01:00
lain
1825118fd4
Correctly handle invalid credentials on auth login.
...
Closes #407
2019-01-28 11:41:47 +01:00
Ivan Tashkinov
9560abea10
[ #534 ] Refactoring / tweaks per MR review.
2019-01-28 11:03:52 +03:00
William Pitcock
ddc7ae2c1a
mastodon api: card: force OGP images through mediaproxy
2019-01-28 06:42:27 +00:00
William Pitcock
ebeabdcc72
rich media: helpers: clean up unused aliases
2019-01-28 06:10:25 +00:00
William Pitcock
91ef64a1ec
activitypub: prime OGP crawler cache when new messages are inserted into the database
2019-01-28 06:07:18 +00:00
William Pitcock
8e42251e06
rich media: add helpers module, use instead of MastodonAPI module
2019-01-28 06:04:54 +00:00
William Pitcock
24a103a1fe
mastodon api: formatting
2019-01-28 05:53:17 +00:00
William Pitcock
6096846f5f
API: kill /api/rich_media/parse endpoint
2019-01-28 05:53:17 +00:00
William Pitcock
07a9a891ad
twitter api: fix up activity representer
2019-01-28 05:53:17 +00:00
William Pitcock
de42646634
rich media: add try/rescue to ensure we catch parsing and fetching failures
2019-01-28 05:53:17 +00:00
William Pitcock
5d895093fd
twitter api: embed card in twitterapi posts
2019-01-28 05:53:17 +00:00
William Pitcock
5a37ddc2dc
mastodon api: embed card in status object
2019-01-28 05:53:17 +00:00
William Pitcock
132d815f1f
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
2019-01-28 05:53:17 +00:00
Haelwenn (lanodan) Monnier
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
2019-01-28 04:47:32 +01:00
Haelwenn (lanodan) Monnier
872241d7c5
/web/index template: Modify for glitch-soc
2019-01-28 04:43:36 +01:00
href
71bb90073b
/notice/:id - send the FE index even if 404
...
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
2019-01-27 22:51:50 +01:00
lambda
16ab1437d6
Merge branch 'safe-render-activities' into 'develop'
...
Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723
2019-01-27 20:10:09 +00:00
lain
2e277dd4ad
Fix objects.
2019-01-27 21:03:15 +01:00
kaniini
ea12371a01
Merge branch 'discard-invalid-likes' into 'develop'
...
Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724
2019-01-27 19:10:15 +00:00
href
77f2137383
Transmogrifier: fix incoming objects with invalid likes
2019-01-27 19:33:21 +01:00
href
f83bae7c22
Views: wrap activity rendering in a rescue
...
this avoids complete timeline breakage when an activity fucks up
rendering.
2019-01-27 19:16:20 +01:00
kaniini
9af798ad40
Merge branch 'flake-random-worker-id' into 'develop'
...
Flake: random worker id
See merge request pleroma/pleroma!721
2019-01-27 15:16:06 +00:00
href
e0e0cc5ab0
Flake: random worker id
2019-01-27 16:04:36 +01:00
kaniini
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
2019-01-27 12:45:50 +00:00
Haelwenn (lanodan) Monnier
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
2019-01-27 10:33:22 +01:00
William Pitcock
8f2f471e94
rich media: gracefully handle fetching nil URIs
2019-01-26 16:36:17 +00:00
kaniini
155a884300
Merge branch 'flake-from-int' into 'develop'
...
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
2019-01-26 16:17:50 +00:00
href
d6015338c8
Flake: support integers in from_string/1
...
Some previously issued stateless tokens have integer ids in them.
2019-01-26 16:58:23 +01:00
kaniini
3e66723f7e
Merge branch 'join-in-preloads' into 'develop'
...
Join on preloads to avoid N+1 queries
See merge request pleroma/pleroma!714
2019-01-26 15:57:02 +00:00
Haelwenn (lanodan) Monnier
de956b9e04
Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it
2019-01-26 16:46:20 +01:00
William Pitcock
1f7843b9b8
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
2019-01-26 15:24:16 +00:00
William Pitcock
86037e9c39
mastodon api: use HTML.extract_first_external_url()
2019-01-26 15:13:27 +00:00
href
8018ae7ae5
Join on preloads to avoid N+1 queries
2019-01-26 15:55:53 +01:00
William Pitcock
be9abb2cc5
html: add utility function to extract first URL from an object and cache the result
2019-01-26 14:55:12 +00:00
William Pitcock
78047d57bf
mastodon api: provider_name setting is required too on the card
2019-01-26 14:47:32 +00:00
Haelwenn (lanodan) Monnier
39863236eb
Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function for MastoAPI 2.6.x
...
Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status.
2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier
3f64379b13
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
2019-01-26 14:18:23 +00:00
Haelwenn (lanodan) Monnier
5a84def6a6
Fix the logic in multi-hashtag TLs
2019-01-26 04:46:02 +01:00
Haelwenn (lanodan) Monnier
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier
1a9bb4daa0
[Web.ActivityPub.ActivityPub]: Fix restrict_tag()
...
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
2019-01-26 04:46:01 +01:00
Haelwenn (lanodan) Monnier
f9cae0d04f
[WIP,MastoAPI] Multi-tag timelines
2019-01-26 04:45:36 +01:00
Haelwenn (lanodan) Monnier
15aa45ae8a
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
2019-01-26 03:50:49 +01:00
Ivan Tashkinov
060d280e64
[ #534 ] Made Salmon.send_to_user calls be handled through Federator.enqueue.
2019-01-25 20:38:13 +03:00
lain
aa8ddfdbe2
SPC fixes: Fix activities.
2019-01-25 18:14:48 +01:00
Ivan Tashkinov
465adedb7c
[ #534 ] Websub fix: made SQL use UTC time zone when comparing with valid_until (instead of postgresql-server default time zone).
2019-01-25 18:29:43 +03:00
Ivan Tashkinov
656ed7c84a
[ #534 ] Configurable outgoing federation reachability timeout.
2019-01-25 15:10:21 +03:00
rinpatch
3a5b3c5a3a
Merge remote-tracking branch 'pl/develop' into oembed_provider
2019-01-25 10:40:51 +03:00
kaniini
4c99b6d35a
Merge branch 'fix/tusky-dm' into 'develop'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
2019-01-25 05:19:32 +00:00
kaniini
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
2019-01-25 05:00:47 +00:00
kaniini
4df71cd88b
Merge branch 'classic-flakeids' into 'develop'
...
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
2019-01-25 04:59:06 +00:00
Maxim Filippov
9274cabe01
Use correct logic to determine "attentions" list
2019-01-24 23:30:43 +03:00
Ivan Tashkinov
3e9399ec0b
[ #534 ] Optimized bulk publish ops to filter on reachability early. Instance refactoring.
2019-01-24 19:15:23 +03:00
href
a3ba72d978
Fix clippy with one/five lines
2019-01-24 16:53:14 +01:00
Ivan Tashkinov
8654a591f0
[ #534 ] Updating external instances reachability on incoming federation.
2019-01-24 17:37:23 +03:00
href
be43aa2875
FlakeId: ignore null mac for workerid, use first mac
2019-01-24 13:08:27 +01:00
William Pitcock
54ec6d09b0
mrf: add anti-followbot policy
2019-01-24 09:35:19 +00:00
Ivan Tashkinov
20b54366ee
[ #534 ] Federation publish requests status control (enforced 2xx response code check).
2019-01-24 11:54:52 +03:00
Maxim Filippov
4333fea1dc
Send "hide_network" in user_view
2019-01-23 19:47:51 +03:00
Ivan Tashkinov
f161a92cb1
[ #534 ] Initial implementation of unreachable federation targets retirement.
2019-01-23 18:37:25 +03:00
kaniini
4a278cd80a
Merge branch 's3-namespace' into 'develop'
...
S3 uploader: support for namespaced bucket
Closes #532
See merge request pleroma/pleroma!699
2019-01-23 13:25:04 +00:00
lain
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
2019-01-23 13:05:58 +01:00
lain
e221c681dc
New frontend configuration mechanism.
2019-01-23 12:40:57 +01:00
href
a92c43bc4b
Clippy!
2019-01-23 11:26:38 +01:00
href
973c9eed18
Treat User.Info pinned ids as strings
2019-01-23 11:26:37 +01:00
href
e36a434b99
FlakeId.from_string/1: remove old, un-needed conversion
2019-01-23 11:26:36 +01:00
href
422e60ad76
2019
2019-01-23 11:26:35 +01:00
href
cdc5e6ff5c
ActivityPub: restrict_since/restrict_max: ignore empty param
2019-01-23 11:26:35 +01:00
href
9d63b27dcd
Test FlakeID old id compat & Ecto type
2019-01-23 11:26:34 +01:00
href
28d77e373c
Flake Ids for Users and Activities
2019-01-23 11:26:27 +01:00
Haelwenn
707cd9389c
Merge branch 'fix/activity_get_by_id' into 'develop'
...
Add get_by_id to activity.ex
See merge request pleroma/pleroma!695
2019-01-22 14:28:17 +00:00
Ivan Tashkinov
34d59e4008
[ #502 ] Fixed User.active_local_user_query to return users with nil or missing info.deactivated. Adjusted test.
2019-01-22 17:12:53 +03:00
rinpatch
e460820fcf
Add get_by_id to activity.ex
2019-01-22 10:55:10 +03:00
href
f9a3269099
Uploader callback controller
2019-01-21 22:44:14 +01:00
href
99763999c1
reverse_proxy - always override plug's cache-control
2019-01-21 15:17:24 +01:00
href
97412d9f94
S3 Namespace
2019-01-21 14:42:16 +01:00
lambda
8cd853ce0c
Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
...
[#530 ] Prevents user `info` from being overwritten because of race conditions
Closes #530
See merge request pleroma/pleroma!691
2019-01-21 13:03:32 +00:00
lambda
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
2019-01-21 12:35:10 +00:00
Ivan Tashkinov
a4d3fec8a7
[ #502 ] Code comments update.
2019-01-21 14:52:41 +03:00
Ivan Tashkinov
aa480f4a8b
[ #530 ] Prevents user info from being overwritten because of race conditions
...
and non-partial update of embed (in WebFinger.ensure_keys_present and other places).
2019-01-21 14:16:51 +03:00
Haelwenn (lanodan) Monnier
7390192c03
Activity: mix format (2 empty lines)
2019-01-21 08:00:41 +01:00
Haelwenn (lanodan) Monnier
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
2019-01-21 08:00:41 +01:00
Haelwenn (lanodan) Monnier
2fdbd4d137
Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list
2019-01-21 08:00:40 +01:00
Haelwenn (lanodan) Monnier
f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
2019-01-21 08:00:38 +01:00
Haelwenn (lanodan) Monnier
4ad5a0abb9
Activity: all_by_object_ap_id_q/1 → create_by_object_ap_id/1
2019-01-21 07:51:01 +01:00
Haelwenn (lanodan) Monnier
75e4c8f0b2
Activity: all_non_create_by_object_ap_id_q → by_object_ap_id
2019-01-21 07:50:57 +01:00
Haelwenn (lanodan) Monnier
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
2019-01-21 07:49:59 +01:00
Haelwenn (lanodan) Monnier
f94cc6d824
Mix.Tasks.Pleroma.Instance: Generate signing_salt
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/533
2019-01-21 01:16:41 +01:00
lain
cf1f35a93a
Send delete event over Mastodon streaming api
...
Closes #116
2019-01-20 13:00:46 +01:00
lambda
f3045a179e
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
...
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
2019-01-20 10:24:05 +00:00
lain
5834b08fe7
Set custom similarity limit.
2019-01-20 10:57:49 +01:00
William Pitcock
aa37313416
activitypub: short-circuit is_public?() with directMessage flag check
2019-01-20 02:33:21 +00:00
William Pitcock
7c9749f793
transmogrifier: slightly clean up fix_explicit_addressing pipeline
2019-01-20 02:27:48 +00:00
William Pitcock
420651157b
transmogrifier: don't apply heuristics against messages which have directMessage set true
2019-01-20 02:27:48 +00:00
William Pitcock
ddae43eb43
activitypub: add is_private?/is_direct? helpers
2019-01-20 02:27:48 +00:00
William Pitcock
9adc80afff
common api: set directMessage flag on our own posts
2019-01-20 02:27:48 +00:00
William Pitcock
75dfa1f0b0
mastodon api: get_visibility(): DMs never have a cc list.
2019-01-20 02:27:48 +00:00
William Pitcock
681f40ee5c
activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs
2019-01-20 02:27:48 +00:00
William Pitcock
8d06be35e0
activitypub: utils: add determine_explicit_mentions() and tests
2019-01-20 02:27:48 +00:00
kaniini
42612b1c8d
Merge branch 'bugfix/improve-boost-targeting' into 'develop'
...
improve handling of non-public Announces
See merge request pleroma/pleroma!681
2019-01-19 23:44:08 +00:00
lain
b108aeee08
Make use of the indices.
...
Indices in postgresql rely on operators, so they won't be used if you use only functions.
2019-01-20 00:31:17 +01:00
rinpatch
44693fbf6e
Formating
2019-01-20 01:28:46 +03:00
rinpatch
afd83db0d7
Provide local og:url for remote activities
2019-01-19 10:58:27 +03:00
kaniini
651ce1c97b
Merge branch '491_full_mentions_in_user_bio' into 'develop'
...
[#491 ] Made user bio preserve full nicknames (nick@host)
Closes #491
See merge request pleroma/pleroma!676
2019-01-19 07:36:58 +00:00
Maxim Filippov
651a1d64b5
Add current user to mentioned
2019-01-19 04:25:15 +03:00
Maxim Filippov
e116e55cab
Add actor to recipients
2019-01-18 22:40:52 +03:00
lain
bd6c12592e
Add migration to fix spc users.
2019-01-18 19:35:47 +01:00
lain
5d4d51e6dc
Add fixes for SPC users.
2019-01-18 19:25:37 +01:00
rinpatch
74346a7035
Fix merge conflict
2019-01-18 18:31:25 +03:00
Ivan Tashkinov
79e44042bc
[ #477 ] User trigram index adjustment.
2019-01-18 10:57:42 +03:00
Ivan Tashkinov
ed8f55ab8e
[ #477 ] User: FTS and trigram search results mixing (to handle misspelled requests).
2019-01-18 10:35:45 +03:00
rinpatch
997f4a5e09
Remove custom emojis and trailing whitespaces from previews
2019-01-18 10:28:19 +03:00
rinpatch
1b1af4798a
Use object instead of activity for metadata
2019-01-18 09:32:52 +03:00
Ivan Tashkinov
65bb9b2fba
[ #491 ] Made full nicknames be preserved in user links text only in Bio.
2019-01-18 09:30:16 +03:00
William Pitcock
75a9b2a851
activitypub: add a match clause for objects, not just activities
2019-01-17 23:32:16 +00:00
William Pitcock
dbc4e92509
activitypub: transmogrifier: do not clobber the addressing on relayed announcements
2019-01-17 23:21:31 +00:00
William Pitcock
33b473cc02
activitypub: allow is_public?() to work on any type of map representing an AS2 object
2019-01-17 23:21:31 +00:00
William Pitcock
8e9f1d5587
activitypub: relay: chase selective public announce changes
2019-01-17 23:21:31 +00:00
William Pitcock
2479e88815
activitypub: announce: add new public parameter
2019-01-17 23:21:31 +00:00
kaniini
98d9dcd509
Merge branch '502_instance_stats_active_users_count_fix' into 'develop'
...
[#502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users
Closes #502
See merge request pleroma/pleroma!678
2019-01-17 19:27:15 +00:00
kaniini
ae8a5942cf
Merge branch 'bad-copy-paste' into 'develop'
...
Fix bad link in likes collection
See merge request pleroma/pleroma!679
2019-01-17 19:22:21 +00:00
sxsdv1
948fba6f76
Fix bad link in likes collection
...
Don't copy and paste, mkay
2019-01-17 18:21:43 +01:00
rinpatch
a95d5da607
Don't show content if empty or zero width space
2019-01-17 20:18:28 +03:00
Ivan Tashkinov
954dc4a4ad
[ #502 ] Fixed user_count in /api/v1/instance to include only active local users.
2019-01-17 19:16:02 +03:00
Mark Felder
849c83ed46
formatting
2019-01-17 16:10:26 +00:00
Mark Felder
6bc9a641ba
Default to disabled in the code in case the setting is absent from config.exs
2019-01-17 16:01:25 +00:00
rinpatch
388ceb6a7d
Fix the issue with get_by_nickname never being called
2019-01-17 19:00:08 +03:00
Mark Felder
8c368d42a2
Make attachment links configurable
...
Thanks @href!
2019-01-17 15:48:14 +00:00
Ivan Tashkinov
2bfae25a1f
[ #491 ] Made user bio preserve full nicknames (nick@host).
2019-01-17 18:03:49 +03:00
rinpatch
4d5f15cd42
Introduce optional unfurling of nsfw content
2019-01-17 11:00:02 +03:00
rinpatch
0256bd2f1d
Use object url instead of a hack
2019-01-17 10:34:19 +03:00
rinpatch
fd3a558230
Apply feld's patch
2019-01-17 09:18:46 +03:00
rinpatch
5fa508cc2b
Remove @providers and call Pleroma.config on runtime
2019-01-16 18:04:41 +03:00
rinpatch
bb43f4cee9
Remove useless with in opengraph.ex
2019-01-16 18:02:46 +03:00
rinpatch
9a90b5d91a
oof
2019-01-16 18:01:17 +03:00
rinpatch
8a9f089812
remove id cast
2019-01-16 17:58:11 +03:00
rinpatch
5a08dee379
cache ap_id in id instead of caching user two times
2019-01-16 17:44:08 +03:00
rinpatch
82cf9b9751
forgot to remove this thing
2019-01-16 17:16:28 +03:00
rinpatch
293f6a8b71
join us now and share the software~. Also tests
2019-01-16 17:15:13 +03:00
lain
943324b661
MastoAPI: Don't break on missing users.
2019-01-16 15:13:09 +01:00
rinpatch
b44995866b
Replace map with reduce to remove nils
2019-01-16 16:52:01 +03:00
lambda
608cc65d43
Merge branch 'feature/improve-microformats' into 'develop'
...
improve microformats support
See merge request pleroma/pleroma!672
2019-01-16 09:06:47 +00:00
lambda
da4b670451
Merge branch '518_instance_stats_fix' into 'develop'
...
[#518 ] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers
Closes #518
See merge request pleroma/pleroma!673
2019-01-16 08:59:40 +00:00
rinpatch
ff01fd3c4f
Remove caching because it does not affect performance and may be even worse in some cases
2019-01-16 11:18:25 +03:00
Ivan Tashkinov
90433b988e
[ #518 ] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.
2019-01-16 11:07:46 +03:00
rinpatch
bfe2a11a6b
Add config doc
2019-01-16 10:45:56 +03:00
Ivan Tashkinov
0bc6d30f7d
[ #477 ] Minor refactoring (user search query).
2019-01-16 10:44:32 +03:00
rinpatch
a9c27e137d
Add a fallback function to handle generic params, just in case
2019-01-16 10:38:42 +03:00
rinpatch
a76793006b
Thanks you rinpatch, very cool
2019-01-16 10:35:06 +03:00
rinpatch
0039d45b5b
No need to use activity in the key
2019-01-16 10:30:47 +03:00
rinpatch
70b2bb6ede
add caching
2019-01-16 10:26:01 +03:00
rinpatch
dd1432d695
Disable previews for any activity, but create
2019-01-16 09:42:24 +03:00
William Pitcock
461ab9489d
formatter: improve microformats markup
2019-01-16 03:54:01 +00:00
William Pitcock
1ddab78247
html: allow microformats-related markup through the html filter
2019-01-16 03:54:01 +00:00
rinpatch
565caff3f4
cache HTML in OGP
2019-01-16 00:07:28 +03:00
rinpatch
9aa69e12b8
Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate
2019-01-15 23:25:28 +03:00
lambda
9a444c0d22
Merge branch 'bugfix/websub-hardening' into 'develop'
...
websub: improve error handling
See merge request pleroma/pleroma!670
2019-01-15 20:02:56 +00:00
rinpatch
2e630bea0d
Add twitter card, filter nsfw
2019-01-15 23:00:22 +03:00
William Pitcock
2d3241753f
http: add support for query parameters, use Jason for JSON encoding instead of Poison like everywhere else
2019-01-15 19:31:13 +00:00
rinpatch
70f140681f
Add space between name and nickname
2019-01-15 21:47:45 +03:00
rinpatch
e8eecd61b4
Formating
2019-01-15 21:20:27 +03:00
rinpatch
410fd9d774
Attach attachments
2019-01-15 21:17:56 +03:00
William Pitcock
17da432dbb
websub: improve error handling
2019-01-15 18:03:49 +00:00
rinpatch
ff6c9a5c96
Introduce get_by_id in Activity, replace newlines with spaces
2019-01-15 20:00:21 +03:00
rinpatch
850912b06b
refactor opengraph to a different module with a behaviour
2019-01-15 19:43:52 +03:00
rinpatch
8745c8c990
remove useless newlines after every tag. Make domain.com/username provide opengraph too
2019-01-15 18:34:47 +03:00
Ivan Tashkinov
5b8f9ff8c1
[ #477 ] User search tests. Normalized search rank in User.search.
2019-01-15 13:05:25 +03:00
rinpatch
2858fd2da2
add a fallback function
2019-01-15 12:11:07 +03:00
rinpatch
6f23139864
please don't bully me for this
2019-01-15 12:02:55 +03:00
rinpatch
4587a5712a
cringe
2019-01-15 11:59:05 +03:00
rinpatch
ce15e0659e
Fix some edge cases [nervous laughter]
2019-01-15 11:56:35 +03:00
lambda
646bb87816
Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'
...
Fix Elixir 1.8 type annotation issue
Closes #523
See merge request pleroma/pleroma!668
2019-01-15 08:51:59 +00:00
rinpatch
4656f433f9
Move metadata.ex out of ostatus
2019-01-15 11:00:17 +03:00
Haelwenn (lanodan) Monnier
9fcdca1bdc
Upload: Fix uploading with a : in the filename
2019-01-15 07:57:48 +01:00
Haelwenn (lanodan) Monnier
e3eb75bd23
Upload: Fix uploading with a ? in the filename
2019-01-15 07:40:39 +01:00
Maxim Filippov
e8eff9fe03
Fix Elixir 1.8 type annotation issue
2019-01-15 02:58:48 +02:00
rinpatch
f20bfc9ea5
Merge branch 'media-url-escape' into 'develop'
...
URI escape file upload URLs
See merge request pleroma/pleroma!665
2019-01-14 18:52:23 +00:00
lambda
fd2f1258fb
Merge branch 'load-all-dms' into 'develop'
...
Remove recent activity restriction.
See merge request pleroma/pleroma!644
2019-01-14 18:49:53 +00:00
Ivan Tashkinov
dc45ec62c2
[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.
2019-01-14 20:04:45 +03:00
Shadowfacts
42b7584068
URI escape file upload URLs
2019-01-14 11:31:44 -05:00
kaniini
de1da7b3d1
Merge branch 'feature/add-oembed-parser' into 'develop'
...
Add OEmbed parser
See merge request pleroma/pleroma!661
2019-01-14 07:28:04 +00:00
kaniini
fa0392e49c
Merge branch 'activitypub-likes' into 'develop'
...
Activitypub c2s likes
See merge request pleroma/pleroma!658
2019-01-14 07:27:05 +00:00
rinpatch
5f9786288d
Prefer ids to usernames
2019-01-14 09:52:52 +03:00
William Pitcock
6e5b0406b9
mrf: add no placeholder-text policy, strips pointless "." content from posts with images
2019-01-14 05:42:38 +00:00
rinpatch
e4dc3f71ae
Resolve merge conflict
2019-01-13 13:38:28 +03:00
Maxim Filippov
b8a77c5d70
Add OEmbed parser
2019-01-13 02:06:50 +02:00
sxsdv1
868034375c
Add likes to activitypub object representation
...
Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.
2019-01-12 20:24:41 +01:00
sxsdv1
581edd5a91
Add route to get object like activities
2019-01-12 20:24:38 +01:00
sxsdv1
36711e1c83
Handle client submitted activitypub like activity
2019-01-12 20:24:35 +01:00
sxsdv1
1eb7318831
Prepare all types objects before serialising
...
Activities returned from inbox can include other types of objects like
Article
2019-01-12 20:24:32 +01:00
Sadposter
9daf162461
Honour parameters on MastoAPI /favourites
2019-01-12 14:42:52 +00:00
Sadposter
144b48da95
Add link headers to MastoAPI /favourites
...
As documented at https://docs.joinmastodon.org/api/rest/favourites/
2019-01-12 14:03:35 +00:00
Egor Kislitsyn
b594a54d0c
unpin when deleting a status
2019-01-11 12:31:31 +07:00
kaniini
e4afe1359b
Merge branch 'activitypub-dereference-activity-id' into 'develop'
...
Support activity+json request for activity
See merge request pleroma/pleroma!641
2019-01-10 18:42:36 +00:00
Maxim Filippov
1f851a0723
Add Twitter Card parser
2019-01-10 18:09:56 +00:00
kaniini
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
2019-01-10 18:03:32 +00:00
Haelwenn
ab4c5f5bf7
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
...
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
2019-01-10 03:54:29 +00:00
William Pitcock
0bdbd4f968
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
...
ok @lanodan
2019-01-10 03:45:58 +00:00
William Pitcock
2ecf81f10c
common api: fix newlines in markdown code blocks
2019-01-10 03:37:37 +00:00
kaniini
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
2019-01-10 02:39:53 +00:00
kaniini
f85d108c41
Merge branch 'mass-follow' into 'develop'
...
Mass follow
See merge request pleroma/pleroma!642
2019-01-10 02:33:11 +00:00
kaniini
d203b0b4d3
Merge branch 'dm-optimizations' into 'develop'
...
Add activity visibility index.
See merge request pleroma/pleroma!646
2019-01-10 02:31:29 +00:00
rinpatch
b57db828c7
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'
...
Rich media: Remove :commit since a tuple is already returned
See merge request pleroma/pleroma!649
2019-01-09 18:42:00 +00:00
rinpatch
a2d7f0e0e9
Remove :commit since a tuple is already returned
2019-01-09 21:35:01 +03:00
lain
a99e156f2c
Add integer casts.
2019-01-09 18:17:23 +01:00
lain
7ac152ed38
TwitterAPI: Add follower/following pagination.
2019-01-09 18:14:32 +01:00
lambda
1881680e28
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
...
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
2019-01-09 16:26:38 +00:00
lain
5027f82cde
Add activity visibility index.
2019-01-09 16:45:09 +01:00
Egor Kislitsyn
44a1e69484
Add Twitter API for the pinned statuses
...
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
```
2019-01-09 19:54:19 +07:00
lain
9854978b8b
Remove recent activity restriction.
...
This should be fine now, everything should be covered by indices.
2019-01-09 12:38:23 +01:00
Egor Kislitsyn
1b06e6fdf3
only non-reblogs, self-authored, public statuses can be pinned
2019-01-09 17:40:15 +07:00
lain
65fc2df7cc
Use follow_all in autofollow.
2019-01-09 11:38:45 +01:00
lain
26938d65fd
Add User mass following function.
2019-01-09 11:35:23 +01:00
Egor Kislitsyn
28afcb7c31
move defaults from sample_config.exs to config.exs
2019-01-09 17:02:30 +07:00
Egor Kislitsyn
48591aab98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
...
# Conflicts:
# docs/config.md
2019-01-09 16:56:31 +07:00
sxsdv1
20c0dd1e24
Support activity+json request for activity
2019-01-09 09:33:30 +01:00
kaniini
5c5c8508c2
Merge branch 'hotfix/media-proxy-uri' into 'develop'
...
user: fix local vs remote determination in remote_or_auth_active?/1
See merge request pleroma/pleroma!640
2019-01-09 07:09:39 +00:00
William Pitcock
f15183178c
user: fix auth_active?/1 for remote users
2019-01-09 06:45:17 +00:00
William Pitcock
0015d43e13
user: factor out illogical User.Info.superuser?/1.
...
any actual callee will be dealing with a User struct to begin with, so
just check the child struct inside User.superuser?/1 with pattern matching.
2019-01-09 06:44:50 +00:00
William Pitcock
74f48beec3
user: remove entirely redundant remote_or_auth_active?/1.
...
auth_active?/1 can check remote users and return true directly.
2019-01-09 06:36:50 +00:00
William Pitcock
2af67353c5
user: harden auth_active?/1, superuser?/1, visible_for?/1
2019-01-09 06:21:21 +00:00
William Pitcock
595a970493
user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
2019-01-09 06:02:18 +00:00
Egor Kislitsyn
0c750bc432
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
2019-01-08 16:32:07 +07:00
Egor Kislitsyn
6428ef77ad
add default configuration for the pinned statuses and some doc
2019-01-08 16:11:03 +07:00
lain
0fae04c4e3
Add a setting for users to autofollow on sign up.
2019-01-08 09:57:53 +01:00
Egor Kislitsyn
e679da4c34
add pinned property to StatusView
2019-01-08 15:27:02 +07:00
Egor Kislitsyn
63dbd87568
rename post to status
2019-01-08 15:25:50 +07:00
lain
a16b17cc61
Actually put some onformation in the error user, make it actually properly parse
...
in conversations.
2019-01-07 20:59:30 +01:00
kaniini
74e1093732
Merge branch 'resilient-user-view' into 'develop'
...
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
2019-01-07 17:09:52 +00:00
Egor Kislitsyn
f24087f96e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
2019-01-07 20:55:32 +07:00
Egor Kislitsyn
380e9fba21
add pinned posts
2019-01-07 20:45:33 +07:00
lain
7382adf407
Make TwAPI UserView more resilient to issues.
...
Will work for missing users and badly migrated users.
2019-01-07 12:41:31 +01:00
scarlett
36fa5e8802
Check visible_for_user when performing a search using a direct link.
2019-01-07 10:36:31 +00:00
scarlett
52493467ac
Twitter API: Add a summary_html field.
...
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
2019-01-06 10:19:00 +00:00
Sadposter
042852ecf3
Add check to prevent multiple follow notifications from the same user
2019-01-05 22:54:25 +00:00
kaniini
8d047c7a72
Merge branch 'fix/user-search-null-name' into 'develop'
...
fix user search results for users with unset display name
Closes #499
See merge request pleroma/pleroma!625
2019-01-05 22:34:47 +00:00
kaniini
0b54c3d643
Merge branch 'fix_486' into 'develop'
...
fix 486: Add option --assume-yes to allow mix pleroma.user to work non-interactive
See merge request pleroma/pleroma!627
2019-01-05 22:33:38 +00:00
kaniini
576368237c
Merge branch 'activitypub-tombstone-fix' into 'develop'
...
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
2019-01-05 22:29:08 +00:00
scarlett
145d6fe6e9
Merge branch 'emoji-in-summary' into 'develop'
...
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
2019-01-05 21:52:02 +00:00
scarlett
6556be344d
Resolve some test failures.
2019-01-05 18:20:42 +00:00
scarlett
3c86d907d4
add some brakets to the emoji list.
2019-01-05 17:35:39 +00:00
scarlett
0787f0dfbe
Strip HTML in and allow emoji in summaries.
2019-01-05 17:28:47 +00:00
sxsdv1
2d7da5f437
Don't crash on AP request for tombstone
...
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
2019-01-05 11:16:05 +01:00
cascode
a81307251c
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name
2019-01-04 20:32:55 -08:00
rinpatch
ba17518a0a
Merge branch 'feature/rich-media-cachex' into 'develop'
...
rich media: use cachex to avoid flooding remote servers
See merge request pleroma/pleroma!629
2019-01-04 23:56:42 +00:00
William Pitcock
487c00d36d
rich media: disable cachex in test mode
2019-01-04 23:53:26 +00:00
kaniini
bf5aaefbb5
Merge branch 'fix/html-cache-content-collision' into 'develop'
...
Different caches based on the module. Remove scrubber version since it is not relevant anymore
See merge request pleroma/pleroma!628
2019-01-04 23:35:56 +00:00
William Pitcock
0964c207eb
rich media: use cachex to avoid flooding remote servers
2019-01-04 23:32:01 +00:00
Rin Toshaka
1e2d58982e
oopsies
2019-01-05 00:25:31 +01:00
Rin Toshaka
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
2019-01-05 00:19:46 +01:00
spctrl
4aa977d3b3
fix 486: Add option --assume-yes to allow it to work non-interactive
2019-01-04 22:11:46 +01:00
kaniini
4258dd8633
Merge branch 'feature/rich-media' into 'develop'
...
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
2019-01-04 20:50:18 +00:00
kaniini
ffea81b84f
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
...
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
2019-01-04 20:32:10 +00:00
Wim Vanderbauwhede
ba93396649
Patch to support image descriptions in Pleroma FE
2019-01-04 16:27:46 +00:00
Wim Vanderbauwhede
4c95545d19
Patch to support image descriptions in Pleroma FE
2019-01-04 15:35:41 +00:00
Wim Vanderbauwhede
fe2dceb66d
Patch to support image descriptions in Pleroma FE
2019-01-04 15:22:02 +00:00
cascode
5b23dfa1c5
handle null
2019-01-04 01:35:26 -08:00
kaniini
d9d62a110c
Merge branch 'mr/retry-queue-remove-fold' into 'develop'
...
rewrites List.foldl to Enum.each in RetryQueue
See merge request pleroma/pleroma!621
2019-01-03 22:30:02 +00:00
kaniini
eaaf701319
Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'
...
user: check that the follow request actually has an active account associated with it
See merge request pleroma/pleroma!623
2019-01-03 18:53:30 +00:00
rinpatch
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
2019-01-03 17:04:27 +00:00
William Pitcock
eb1a18d22f
user: check that the follow request actually has an active account associated with it
...
because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly
filter the follow requests for these failures.
2019-01-02 22:47:12 +00:00
Michael Loftis
943211b035
rewrites List.foldl to Enum.each
2019-01-02 21:21:40 +00:00
Maxim Filippov
48e81d3d40
Add RichMediaController and tests
2019-01-02 17:02:50 +03:00
sxsdv1
4e1cc2bab6
Implement delete activity
2019-01-01 23:20:43 +01:00
sxsdv1
551c3d9391
Split create activity specifics from update_outbox
2019-01-01 23:20:28 +01:00
Maxim Filippov
917d48d09b
Better variable name
2019-01-01 23:29:47 +03:00
Maxim Filippov
2aab4e03c3
Add OGP parser
2019-01-01 23:26:40 +03:00
kaniini
32bed66471
Merge branch 'pool-usage' into 'develop'
...
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
2019-01-01 20:12:34 +00:00
rinpatch
34fa709015
Merge branch 'configurable-federator' into 'develop'
...
Make Federator options configurable.
See merge request pleroma/pleroma!615
2019-01-01 18:55:59 +00:00
lambda
32541172cd
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
...
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
See merge request pleroma/pleroma!612
2019-01-01 13:48:59 +00:00
lain
400337b0a7
Make Federator options configurable.
2019-01-01 14:46:55 +01:00
lain
096a927805
Merge remote-tracking branch 'origin/develop' into pool-usage
2019-01-01 14:19:55 +01:00
lain
d4799e0dc2
Remove default pool, it's used automatically anyway.
2019-01-01 13:49:24 +01:00
Haelwenn (lanodan) Monnier
1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
2018-12-31 19:50:14 +01:00
kaniini
90e157ef80
Merge branch 'features/admin-api-user-views' into 'develop'
...
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
2018-12-31 15:49:34 +00:00
William Pitcock
980b5288ed
update copyright years to 2019
2018-12-31 15:41:47 +00:00
lambda
33e3a7ba7d
Merge branch 'fix/scrubber-cache' into 'develop'
...
[#481 ] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
2018-12-31 09:56:26 +00:00
Rin Toshaka
6ed9b31a5f
Eh?
2018-12-31 08:25:48 +01:00
Rin Toshaka
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
2018-12-31 08:19:48 +01:00
kaniini
8e7da98b18
Merge branch 'mr/retry-queue' into 'develop'
...
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
2018-12-30 21:47:50 +00:00
Rin Toshaka
dec23500d8
Resolve merge conflict
2018-12-30 21:00:40 +01:00
Rin Toshaka
ab3089d6a7
Fix comment in object.ex
2018-12-30 20:51:31 +01:00
Rin Toshaka
c50353e6ae
shame on me for not testing after revert
2018-12-30 20:44:17 +01:00
Rin Toshaka
3f9da55adc
Fix formating. Aparently my pre-commit hook broke.
2018-12-30 20:16:42 +01:00
Rin Toshaka
62af23bd26
Revert some changes in html.ex
2018-12-30 20:12:12 +01:00
Rin Toshaka
c119ea3a57
Friendship ended with Postgresql now Cachex is my best friend
2018-12-30 20:00:01 +01:00
Rin Toshaka
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
2018-12-30 19:33:36 +01:00
Rin Toshaka
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
2018-12-30 16:51:16 +01:00
Michael Loftis
cb286fdeba
Improves RetryQueue behavior
...
reduces to one single timer firing once a second
switches to a parallel worker model
2018-12-30 15:16:26 +00:00
Rin Toshaka
bce152aba0
Tidy up the code. Rename key to signature
2018-12-30 15:58:19 +01:00
Rin Toshaka
66d1c31461
Fix some stupid typos
2018-12-30 13:51:01 +01:00
sxsdv1
f40562b4e1
Respond with full activity to outbox post
2018-12-30 12:01:39 +01:00
sxsdv1
1e781715c8
Limit activity types accepted to outbox to only 'Create'
2018-12-30 12:01:39 +01:00
sxsdv1
569bad8210
Create activity when client posts to outbox
2018-12-30 12:01:39 +01:00
sxsdv1
26dc2dddab
Implement ActivityPub inbox view
...
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
2018-12-30 12:01:39 +01:00
Rin Toshaka
a32e23905a
Use Object.change instead of Ecto.Changeset.change
2018-12-30 11:08:19 +01:00
sxsdv1
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
2018-12-29 22:22:03 +01:00
Rin Toshaka
9a0163db53
use Kernel.put_in instead of Map.merge
2018-12-29 21:50:34 +01:00
vaartis
816db3f494
Remove the debugging IO.inspect
2018-12-29 17:44:26 +00:00
Haelwenn
f5d7b0003e
Merge branch 'fix_485' into 'develop'
...
Change 'name' to 'instance_name' so option is used when running non-interactive
See merge request pleroma/pleroma!607
2018-12-29 17:30:31 +00:00
Rin Toshaka
19f9889fbe
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
2018-12-29 17:45:50 +01:00
kaniini
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
2018-12-29 11:46:06 +00:00
spctrl
ab9cda315f
Change 'name' to 'instance_name' so option is used when running non-interactive
2018-12-29 12:43:54 +01:00
kaniini
dd8f2196f6
Merge branch '483_blocks_import_export' into 'develop'
...
[#483 ] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
2018-12-29 11:34:51 +00:00
Maksim Pechnikov
523848d1fd
Salmon# fixed publish an activity to remote accounts
2018-12-29 12:48:54 +03:00
Ivan Tashkinov
7bd49a3222
[ #483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
2018-12-29 12:26:23 +03:00
Ivan Tashkinov
b3574dccbb
[ #483 ] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
...
(<nick>@<our_instance_host>).
2018-12-29 12:15:46 +03:00
Ivan Tashkinov
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
2018-12-29 12:02:37 +03:00
kaniini
49cf5f9ce0
Merge branch '471_invalid_accounts_rendering' into 'develop'
...
[#471 ] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599
2018-12-29 03:03:18 +00:00
Ivan Tashkinov
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
2018-12-28 23:01:03 +03:00
Ivan Tashkinov
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
2018-12-28 22:47:42 +03:00
kaniini
68f483ef4c
Merge branch 'fix/no-attachment-links' into 'develop'
...
Treat any present value in "no_attachment_links" as true
Closes pleroma-fe#175
See merge request pleroma/pleroma!597
2018-12-28 18:33:14 +00:00
Ivan Tashkinov
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
2018-12-28 21:08:07 +03:00
Haelwenn (lanodan) Monnier
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
2018-12-28 17:38:32 +01:00
Ivan Tashkinov
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
2018-12-28 14:35:25 +03:00
Vyr Cossont
d8cc96cb1f
Fix Twitter timelines for private instances
2018-12-27 22:43:40 -08:00
kaniini
bee6acd51d
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
...
Create tombstone instead of object deletion
See merge request pleroma/pleroma!593
2018-12-27 19:37:55 +00:00
kaniini
cff0292d4b
Merge branch 'reserve-user-names' into 'develop'
...
Reserve a few user names
See merge request pleroma/pleroma!594
2018-12-27 19:35:06 +00:00
Ivan Tashkinov
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
2018-12-27 15:46:18 +03:00
Maxim Filippov
be70272ab0
Treat only true and "true" as true
2018-12-27 13:21:04 +03:00
vaartis
708a228919
Set ttl_interval to the seconds_valid time
2018-12-27 07:42:03 +00:00
Vyr Cossont
e4562105e7
Implement exclude_reblogs and include_rts
2018-12-26 21:38:00 -08:00
Maxim Filippov
838c024231
Treat any present value in "no_attachment_links" as true
2018-12-27 02:39:41 +03:00
Ekaterina Vaartis
448af3601a
Up captcha timer to 60 secs again, save used captchas in cachex
2018-12-27 00:16:43 +03:00
lain
551d80cc01
Expose restricted names in nodeinfo.
2018-12-26 12:46:16 +01:00
lain
5811e65e67
Add some hard limits on inserted activities.
2018-12-26 12:39:35 +01:00
lain
91724d160a
Reserve a few user names
...
These are all names that are used for domain.com/:route routes or projected to be.
2018-12-25 20:10:45 +01:00
Maxim Filippov
ca2e9ce9cc
Revert unneeded changes
2018-12-25 03:44:48 +03:00
Maxim Filippov
f75f707f6c
Revert Activity tombstones, add ObjectTombstone struct
2018-12-25 03:00:06 +03:00
Maxim Filippov
2bbec33c71
Fix failing tests
2018-12-25 00:29:13 +03:00
Maxim Filippov
18a4cbb244
Capitalize "tombstone"
2018-12-24 20:09:18 +03:00
Maxim Filippov
0f412cf6e6
Create tombstone instead of object deletion
2018-12-24 02:25:36 +03:00
William Pitcock
69ad1039ba
mix tasks: add legal boilerplate
2018-12-23 20:56:42 +00:00
William Pitcock
2791ce9a1f
add license boilerplate to pleroma core
2018-12-23 20:56:42 +00:00
lambda
005b4194ff
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
...
Fix "url" of Videos in transmogrifier
Closes #367
See merge request pleroma/pleroma!459
2018-12-23 14:46:58 +00:00
William Pitcock
34a4ed22c4
twitter api: add "Video" to supported activity types list
2018-12-23 14:00:54 +00:00
William Pitcock
79b51a97fe
twitter api: activity representer: remove peertube hack
2018-12-23 14:00:50 +00:00
William Pitcock
32dfc1d12a
mastodon api: status view: remove obsolete peertube hack
2018-12-23 13:40:33 +00:00
William Pitcock
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
2018-12-23 13:31:08 +00:00
lambda
a3e33fa177
Merge branch 'hotfix/activity-without-content' into 'develop'
...
Twitter ActivityView: fix crash with activity without content
See merge request pleroma/pleroma!572
2018-12-23 13:17:25 +00:00
Haelwenn (lanodan) Monnier
3aff8067e4
transmogrifier: When it’s a Video move "url" to "attachment"
2018-12-23 13:00:25 +00:00
Karen Konou
a7f07bb6e5
Implement kaniini's tweaks
2018-12-23 12:24:53 +01:00
Karen Konou
c76179419d
Renamed the things
2018-12-23 11:14:29 +01:00
Karen Konou
409ff60bf8
Fix formatting
2018-12-22 23:32:38 +01:00
Karen Konou
92362e1e22
Implement large thread filter
2018-12-22 23:18:31 +01:00
Ekaterina Vaartis
b386e560ba
Move the encryption out of kocaptcha into general captcha module
...
That way there won't be a need to reimplement it for other captcha services
2018-12-22 22:42:14 +03:00
Ekaterina Vaartis
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
2018-12-21 09:55:47 +03:00
kaniini
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
2018-12-20 13:28:36 +00:00
Ivan Tashkinov
7cab7de9ff
[ #114 ] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
...
Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
2018-12-20 14:48:48 +03:00
Ivan Tashkinov
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
2018-12-20 13:41:30 +03:00
Ivan Tashkinov
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
2018-12-20 13:05:42 +03:00
Ivan Tashkinov
501ce34d7f
[ #114 ] Stylistic adjustments.
2018-12-20 12:55:12 +03:00
Maksim
f1b93b5be7
[ #413 ] fix parse mentions
2018-12-20 09:35:01 +00:00
kaniini
fda148a9a2
Merge branch 'documentation/copy-pleroma-api' into 'develop'
...
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571
2018-12-20 04:01:54 +00:00
raeno
652f49d176
Remove extra bracket
2018-12-19 23:06:10 +04:00
raeno
7fb3780431
Merge branch 'develop' into oembed_provider
2018-12-19 22:39:44 +04:00
Ivan Tashkinov
b520d44b58
[ #114 ] mix format
2018-12-19 19:03:39 +03:00
Ivan Tashkinov
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
2018-12-19 18:56:52 +03:00
Ivan Tashkinov
a532ad5d72
[ #114 ] User.register/1 tweak.
2018-12-19 17:24:55 +03:00
Ivan Tashkinov
968d7490b6
[ #114 ] User.Info: renamed confirmation_update to confirmation_changeset.
2018-12-19 16:31:03 +03:00
Ivan Tashkinov
59fc5d15df
[ #114 ] User.Info: renamed confirmation_update to confirmation_change.
2018-12-19 16:27:16 +03:00
kaniini
f98ee9402f
Merge branch 'userless-admin' into 'develop'
...
Add a way to use the admin api without a user.
See merge request pleroma/pleroma!576
2018-12-19 00:12:39 +00:00
lain
f3eb414e28
Add a way to use the admin api without a user.
2018-12-18 21:08:52 +01:00
rinpatch
ef318fb8a9
Merge branch 'develop' into fix/formatter-ignore-html-chars
2018-12-18 21:39:36 +03:00
rinpatch
059dd6f681
Ignore HTML characters in formatter.ex
2018-12-18 21:38:15 +03:00
Haelwenn (lanodan) Monnier
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
2018-12-18 17:05:36 +01:00
href
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
2018-12-18 15:34:27 +01:00
Ivan Tashkinov
3371a45884
[ #114 ] Formatting fix.
2018-12-18 17:30:30 +03:00
Ivan Tashkinov
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
2018-12-18 17:22:46 +03:00
Ivan Tashkinov
aed0f90287
[ #114 ] Added pleroma.confirmation_pending to user views, adjusted view tests.
2018-12-18 17:22:45 +03:00
Ivan Tashkinov
b86057cc7f
[ #114 ] Refactored User.register_changeset to init confirmation data.
...
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
2018-12-18 17:22:42 +03:00
Ivan Tashkinov
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
2018-12-18 17:21:05 +03:00
Ivan Tashkinov
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
2018-12-18 17:18:53 +03:00
raeno
a300336459
Merge branch 'develop' into oembed_provider
2018-12-18 14:59:32 +01:00
href
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
2018-12-17 22:50:59 +01:00
lambda
3d980daa49
Merge branch '459_fix_user_profile_crash' into 'develop'
...
Fix update_profile failing due to OAuth token record in assigns instead of string
Closes #459
See merge request pleroma/pleroma!561
2018-12-17 20:16:15 +00:00
Maksim Pechnikov
92a5133c42
fix text field
2018-12-17 22:53:16 +03:00
lambda
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
2018-12-17 19:45:14 +00:00
lambda
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
2018-12-17 19:38:24 +00:00
lambda
98c31deaa9
Merge branch 'test-mix-tasks' into 'develop'
...
Add tests for Mix tasks
See merge request pleroma/pleroma!555
2018-12-17 19:37:05 +00:00
lambda
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
2018-12-17 19:30:05 +00:00
lain
e4763cd459
Fix tagging problems for existing instances.
2018-12-17 20:12:01 +01:00
vaartis
35522fef09
Use :ets.match_delete to delete old captchas
2018-12-17 20:35:21 +03:00
href
77b5154c82
Cowboy handler for Mastodon WebSocket
2018-12-17 17:06:18 +01:00
raeno
cc87880488
Support both OAuth token record and token string in UserView
2018-12-17 16:02:26 +01:00
lambda
567359790e
Merge branch 'testfix/webfinger-jrd' into 'develop'
...
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
See merge request pleroma/pleroma!554
2018-12-17 09:19:27 +00:00
Ekaterina Vaartis
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
2018-12-16 23:53:44 +03:00
Ekaterina Vaartis
3a31fdaf06
Change minutes_retained config to seconds_retained
2018-12-16 22:40:44 +03:00
Ekaterina Vaartis
6062885df6
Add a configurable auto-cleanup for captchas
2018-12-16 22:08:17 +03:00
href
5dcb7aecea
More put_view.
2018-12-16 17:51:22 +01:00
link0ff
22d483d4f7
Use bindings dbuser and dbname in sample_psql.eex
2018-12-16 18:25:31 +02:00
href
f672555ad3
Upgrade to Phoenix 1.4
2018-12-16 17:15:07 +01:00
eal
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
2018-12-16 11:21:26 +00:00
eal
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
2018-12-16 13:15:34 +02:00
Ekaterina Vaartis
8d55a549e6
Replace HTTPoison with Tesla for kocaptha
2018-12-15 22:43:28 +03:00
Ekaterina Vaartis
23549d3952
Formatting fixes
2018-12-15 22:08:26 +03:00
Ekaterina Vaartis
b5518da904
Separate captcha implementation into a behaviour and use it
2018-12-15 22:07:26 +03:00
Haelwenn (lanodan) Monnier
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
2018-12-15 17:56:12 +01:00
lambda
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
2018-12-15 15:23:51 +00:00
Rin Toshaka
4a895a46d1
Allow port specification in instance.ex
2018-12-15 11:00:54 +01:00
Ekaterina Vaartis
28c43a417e
Add an ability to disabled captcha
2018-12-15 03:12:47 +03:00
Ekaterina Vaartis
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
2018-12-15 03:12:44 +03:00
href
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
2018-12-14 20:30:35 +00:00
href
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
2018-12-14 20:22:24 +00:00
href
acec11626d
Merge branch 'fix/issue_272' into 'develop'
...
[#272 ] fix tags
See merge request pleroma/pleroma!540
2018-12-14 20:20:30 +00:00
Maksim Pechnikov
ea72ac549b
fix case when tags is invalid
2018-12-14 23:16:12 +03:00
raeno
30812f8451
Remove domain from sample_config template
2018-12-14 21:08:25 +01:00
raeno
b0c3211984
Scrub html from activity.content or user.bio for opengraph meta
2018-12-14 21:07:06 +01:00
raeno
90b00701ff
Merge branch 'develop' into oembed_provider
2018-12-14 20:28:35 +01:00
Maksim Pechnikov
d3ec09bb38
fix tags
2018-12-14 22:09:04 +03:00
raeno
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
2018-12-14 19:55:40 +01:00
href
980131b4db
Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
...
Improve web push
Closes #393 , #422 , and #452
See merge request pleroma/pleroma!524
2018-12-14 18:50:44 +00:00
Maksim Pechnikov
bc6262d250
fixed typo
2018-12-14 21:21:37 +03:00
href
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
2018-12-14 18:09:59 +01:00
href
412df2cd38
Warn if push is disabled..
2018-12-14 16:19:28 +01:00
Maksim Pechnikov
baead4ea4b
fix markdown formatting
2018-12-14 16:03:58 +03:00
href
91236c60c7
Merge branch 'feature/file-size-checking' into 'develop'
...
[#36 ] Add warnings when file upload fails
See merge request pleroma/pleroma!523
2018-12-14 13:00:24 +00:00
href
0b4c61e8d5
Fix warning
2018-12-14 13:56:42 +01:00
href
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
2018-12-14 13:22:10 +01:00
href
331396cbcd
Properly disable Web Push if no VAPID key is set
2018-12-14 13:05:51 +01:00
href
6822916183
Typos
2018-12-14 13:05:51 +01:00
href
b1bcd97a0f
Push: respect alerts settings
2018-12-14 13:05:49 +01:00
href
d8984b7bf8
Push: add missing notification_type field
2018-12-14 13:05:48 +01:00
href
7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe
2018-12-14 13:05:47 +01:00
Egor Kislitsyn
324933a0ac
improve push message format (compatibility with mastodon)
2018-12-14 13:05:46 +01:00
Egor Kislitsyn
658edb166f
fix and improve web push; add configuration docs
2018-12-14 13:05:29 +01:00
Ivan Tashkinov
69fd63e248
[ #114 ] Added invitesEnabled to metadata of nodeinfo.
2018-12-14 14:13:13 +03:00
Ivan Tashkinov
66380b0641
[ #114 ] Removed confirm_email action stub (to be addressed in a separate MR).
2018-12-14 14:01:00 +03:00
Ivan Tashkinov
07e93f9940
[ #114 ] Improved tests.
2018-12-14 13:52:04 +03:00
Ivan Tashkinov
9666376f5f
[ #114 ] Readded invites_enabled config setting, updated readme.
2018-12-14 12:37:06 +03:00
Ivan Tashkinov
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
2018-12-14 12:28:23 +03:00
Ivan Tashkinov
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
2018-12-14 12:28:22 +03:00
Ivan Tashkinov
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
2018-12-14 12:28:14 +03:00
href
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
2018-12-14 09:16:03 +00:00
Ivan Tashkinov
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
2018-12-14 12:09:55 +03:00
lambda
262cc6d44b
Merge branch 'fix/double-rt-or-fav' into 'develop'
...
Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542
2018-12-14 08:26:08 +00:00
eal
61ad2ce422
TwitterAPI: Include favorited post in json
2018-12-14 08:24:18 +02:00
eal
1ca080c862
Prevent accidental double RTs or favorites
2018-12-14 07:56:49 +02:00
raeno
c5c3ad90d0
Fix tests. Remove oembed template
2018-12-14 03:00:50 +01:00
raeno
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
2018-12-13 22:34:15 +01:00
raeno
018516d3f3
Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
2018-12-13 22:21:14 +01:00
raeno
49c4f7d604
Set Pleroma.instance.domain when config is generated
2018-12-13 22:17:53 +01:00
raeno
9b3a6cdb07
Extract opengraph/oembed into separate module
2018-12-13 22:17:53 +01:00
raeno
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
2018-12-13 22:17:53 +01:00
raeno
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
2018-12-13 22:17:53 +01:00
raeno
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
2018-12-13 22:17:53 +01:00
lambda
b19ee62252
Merge branch 'username-underscores' into 'develop'
...
Allow underscores/dashes in usernames.
Closes #429
See merge request pleroma/pleroma!537
2018-12-13 15:13:24 +00:00
Ivan Tashkinov
9e689de063
[ #114 ] Removed email_invite implementation (to be addressed separately).
2018-12-13 16:24:30 +03:00
Ivan Tashkinov
18b9467d1a
[ #114 ] Removed email_invite implementation (to be addressed separately).
2018-12-13 16:22:42 +03:00
Ivan Tashkinov
00744c6b03
[ #114 ] Initial implementation of user email invitations.
2018-12-13 14:30:48 +03:00
Ivan Tashkinov
908943352f
[ #114 ] Refactored password_reset (moved to TwitterAPI). Added homepage links to password reset result pages.
2018-12-13 13:17:49 +03:00
href
7214d57463
Extended nicknames: allow dashes.
2018-12-12 21:48:54 +01:00
link0ff
51dd294c48
Allow to set both admin and moderator at the same time in mix task User
2018-12-12 22:45:40 +02:00
link0ff
a40ba3ba57
Fix toggle_activated in mix task User
2018-12-12 22:30:16 +02:00
href
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
2018-12-12 18:57:33 +01:00
Ivan Tashkinov
bfff2399ff
[ #114 ] Routes and config for confirm_email and email_invite (Twitter API).
2018-12-12 20:15:43 +03:00
Ivan Tashkinov
e3a21bcd45
[ #114 ] Addressed warnings. Fix of with statement clause in password_reset.
2018-12-12 17:14:31 +03:00
Ivan Tashkinov
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
2018-12-12 17:04:39 +03:00
Ivan Tashkinov
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
2018-12-12 17:02:41 +03:00
Ivan Tashkinov
10c156d98f
[ #114 ] SMTP deps and config.
2018-12-12 17:01:34 +03:00
Maksim Pechnikov
89b3729afa
fix warnings
2018-12-12 09:09:19 +03:00
scarlett
213176c3c3
Add new frontend options to server-side config.
2018-12-10 23:15:01 +00:00
lain
d6bf06ab4f
Fix warnings.
2018-12-10 20:49:06 +01:00
lambda
0863ec2737
Merge branch 'fix_empty_bio_crash' into 'develop'
...
Fixes #415 . Do not crash during registration when hasn't filled bio field
Closes #415
See merge request pleroma/pleroma!529
2018-12-10 19:08:35 +00:00
lambda
8aa646ca31
Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'
...
Mix tasks: improve uploads.ex moduledoc
See merge request pleroma/pleroma!528
2018-12-10 19:06:39 +00:00
lambda
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
2018-12-10 19:05:16 +00:00
lambda
6786ad3d98
Merge branch 'fix/theora-detection-read-bytes' into 'develop'
...
Fix Theora detection in mime.ex
See merge request pleroma/pleroma!493
2018-12-10 19:04:06 +00:00
lambda
0554d91dcd
Merge branch 'anonymize-filter-text' into 'develop'
...
AnonymizeFilename: allow for a pre-defined text instead of random string
See merge request pleroma/pleroma!516
2018-12-10 19:03:06 +00:00
lambda
bda25b999b
Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
...
# Conflicts:
# lib/mix/tasks/pleroma/uploads.ex
2018-12-10 18:33:36 +00:00
lain
c81c74d847
Treat warnings as errors outside of tests.
2018-12-10 19:13:53 +01:00
Maksim Pechnikov
e94c3442f4
updates
2018-12-10 13:27:37 +03:00
rinpatch
993c8c8bd4
Keep the shortdoc descriptive
2018-12-10 08:03:17 +03:00
raeno
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
2018-12-10 01:01:43 +04:00
Rin Toshaka
cbe048bb3f
Mix tasks: improve uploads.ex moduledoc
2018-12-09 20:17:35 +01:00
Maksim Pechnikov
074fa790ba
fix compile warnings
2018-12-09 20:50:08 +03:00
Maksim Pechnikov
068353ac0b
formatting
2018-12-09 11:24:46 +03:00
Maksim Pechnikov
9442588ae9
fix hashtags in api response
2018-12-09 11:24:46 +03:00
Rin Toshaka
15616eda5e
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
2018-12-08 21:48:49 +01:00
lambda
5436aaad4f
Merge branch 'fix/add-upload.ex' into 'develop'
...
Mix Tasks: Add task uploads.ex for migrating local uploads.
See merge request pleroma/pleroma!517
2018-12-08 09:12:37 +00:00
lambda
beadeaffa1
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
...
Nodeinfo: remove null features; relay feature.
See merge request pleroma/pleroma!520
2018-12-08 09:12:06 +00:00
lambda
8fa5c66eab
Merge branch 'fix/media-proxy-url-encoded' into 'develop'
...
Media proxy: fix url encoding
See merge request pleroma/pleroma!521
2018-12-08 09:11:18 +00:00
lambda
4976a8b05f
Merge branch 'fix/typo-relay-ex' into 'develop'
...
[#283 ] Mix Tasks: Fix a typo in relay.ex
See merge request pleroma/pleroma!522
2018-12-08 09:08:56 +00:00
Rin Toshaka
6c73136aec
[ #283 ] Mix Tasks: Fix a typo in relay.ex
2018-12-08 08:30:34 +01:00
href
bdc8112e40
Media proxy: fix url encoding
2018-12-07 21:57:59 +01:00
Rin Toshaka
578051809f
Add uploadlimit to Twitter API config
2018-12-07 20:03:30 +01:00
lambda
7d86c0c53f
Merge branch 'fix/gopher-respect-ip' into 'develop'
...
[#155 ] Fix Gopher server binding only to default value
See merge request pleroma/pleroma!518
2018-12-07 18:49:40 +00:00
lambda
94ac0075bf
Merge branch 'media-proxy-follow-redirect' into 'develop'
...
Media proxy: follow HTTP redirects by default
Closes #421
See merge request pleroma/pleroma!519
2018-12-07 18:48:26 +00:00
href
134cc94cbd
Nodeinfo: remove null features; relay feature.
2018-12-07 19:44:45 +01:00
href
d8fcf7c5cf
Media proxy: follow HTTP redirects by default
2018-12-07 19:36:44 +01:00
lambda
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
2018-12-07 18:25:38 +00:00
Rin Toshaka
09f20de0d7
Make gopher respect ip
2018-12-07 19:21:58 +01:00
Rin Toshaka
fd5c7b445f
Fix a typo
2018-12-07 19:19:14 +01:00
Rin Toshaka
a02e0c18bc
Mix Tasks: Add task uploads.ex for migrating local uploads.
2018-12-07 15:13:57 +01:00
href
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
2018-12-07 14:07:11 +01:00
href
3c925e9d88
Emojis: Alphabetical ordering
2018-12-07 11:16:27 +01:00
Ivan Tashkinov
1cea97df64
[ #394 ] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
2018-12-07 12:27:32 +03:00
lambda
8764f64690
Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'
...
Add mix pleroma.user unsubscribe to mix doc
See merge request pleroma/pleroma!512
2018-12-07 09:23:56 +00:00
rinpatch
4e2250b1dd
Fix a typo in relay.ex moduledoc
2018-12-07 11:41:01 +03:00
Ivan Tashkinov
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
2018-12-07 11:04:39 +03:00
rinpatch
f7e23aee90
Oops
2018-12-07 10:44:54 +03:00
rinpatch
f661813807
Add mix pleroma.user unsubscribe to mix doc
2018-12-07 10:39:54 +03:00
rinpatch
08e10a70ec
Rename def to defval
2018-12-07 09:46:13 +03:00
Rin Toshaka
1d11c4cf11
add common.ex
2018-12-07 06:12:39 +01:00
Ivan Tashkinov
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
2018-12-06 22:26:25 +03:00
Rin Toshaka
71d5cf9ed8
Remove unused vars from user.ex
2018-12-06 18:25:39 +01:00
Ivan Tashkinov
7bcb6a183a
[ #394 ] Refactoring.
2018-12-06 20:23:16 +03:00
Rin Toshaka
66313cda02
Update instance.ex for web push
2018-12-06 18:16:51 +01:00
Rin Toshaka
88f92693f2
Merge develop
2018-12-06 18:11:22 +01:00
Ivan Tashkinov
7b19487389
[ #394 ] Added users.tags and admin routes to tag and untag users. Added tests.
2018-12-06 20:06:50 +03:00
Rin Toshaka
ca7b46fb3b
Refactor common functions to common.ex
2018-12-06 18:01:28 +01:00
Rin Toshaka
4a2a7ce636
Refactor common functions to common.ex
2018-12-06 18:00:24 +01:00
Rin Toshaka
3a84511df1
remove migrate_local_uploads.ex
2018-12-06 17:35:33 +01:00
kaniini
1d531fd2f3
Merge branch 'fix/mastodon-api-settings' into 'develop'
...
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
2018-12-06 16:01:58 +00:00
kaniini
abead01ab6
Merge branch 'correct-and-improve-http-options' into 'develop'
...
Correct and improve http options
See merge request pleroma/pleroma!505
2018-12-06 15:57:56 +00:00
kaniini
b0adea30b3
Merge branch 're-mrf' into 'develop'
...
Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499
2018-12-06 15:36:41 +00:00
rinpatch
2ae1128d9f
MastoAPI: Fix put_settings
2018-12-06 17:42:07 +03:00
scarlett
d27e3f269f
Rename regular expression 'have_re' to 'reply_prefix'.
2018-12-06 14:00:41 +00:00
Egor Kislitsyn
6f36e903b0
use User.avatar_url
2018-12-06 20:55:46 +07:00
Egor Kislitsyn
79668c08fc
cleanup
2018-12-06 20:50:20 +07:00
scarlett
3dff61ebec
Harden re: detection.
2018-12-06 13:48:12 +00:00
Egor Kislitsyn
3d492795b7
clean up
2018-12-06 20:42:00 +07:00
Egor Kislitsyn
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
2018-12-06 20:15:16 +07:00
Egor Kislitsyn
bac58b1524
show warning if VAPID is not set
2018-12-06 19:56:56 +07:00
Egor Kislitsyn
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
2018-12-06 19:55:58 +07:00
Egor Kislitsyn
04a48286e6
Add web push support
2018-12-06 19:29:04 +07:00
scarlett
6a6aaa0e1a
Use object.normalize.
2018-12-06 11:37:29 +00:00
Hakaba Hitoyo
a09ed0f5af
avoid mix format bug
2018-12-06 18:41:29 +09:00
kaniini
ccf0b46dd6
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
...
[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
2018-12-06 07:36:21 +00:00
Ivan Tashkinov
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
2018-12-06 10:26:17 +03:00
Hakaba Hitoyo
96ba95df2e
remove follow_redirect options
2018-12-06 11:38:33 +09:00
Hakaba Hitoyo
27792b2d77
remove pool and timeout options which duplicate with the default
2018-12-06 11:23:15 +09:00
Hakaba Hitoyo
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
2018-12-06 10:48:05 +09:00
kaniini
48a0315646
Merge branch 'follower-hiding' into 'develop'
...
Network hiding
Closes #356
See merge request pleroma/pleroma!490
2018-12-05 21:41:53 +00:00
Vald
194869c7db
added data attrs to twitter scrubber
2018-12-06 02:14:56 +05:30
lain
7d5720f2e4
Fix merge.
2018-12-05 21:31:02 +01:00
lain
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
2018-12-05 21:27:56 +01:00
lain
3ea4476445
MastodonAPI: Show users their own network.
2018-12-05 21:25:06 +01:00
lain
fdac215091
TwitterAPI: Show users their own network.
2018-12-05 21:14:06 +01:00
Vald
3ccfe226c0
added data attrs for user and tag
2018-12-06 01:05:41 +05:30
Ivan Tashkinov
3b5be09f45
[ #210 ] Stylistic change.
2018-12-05 21:48:21 +03:00
lain
839526a913
TwitterAPI: Add network hiding.
2018-12-05 19:22:40 +01:00
Rin Toshaka
dfc9c08796
formating
2018-12-05 19:12:23 +01:00
Rin Toshaka
ffec96d8cc
Everything should use Mix.Task.Run
2018-12-05 19:05:37 +01:00
lambda
5f0c2372bc
Merge branch 'support/oauth_fetch_token' into 'develop'
...
[#273 ] bugfix/273
See merge request pleroma/pleroma!502
2018-12-05 17:55:51 +00:00
Ivan Tashkinov
c4f3c5e939
[ #210 ] Stylistic change.
2018-12-05 20:23:28 +03:00
Rin Toshaka
facfd03bc1
Move relay tasks to relay.ex
2018-12-05 18:11:59 +01:00
Rin Toshaka
e8ba579efe
Switch from User.info_changeset because it is deprecated
2018-12-05 17:58:26 +01:00
Rin Toshaka
c3519132df
Sorry
2018-12-05 16:44:15 +01:00
Rin Toshaka
5427d2af3a
Update mix tasks since User.info.info_changeset is deprecated
2018-12-05 16:41:50 +01:00
Maksim Pechnikov
c524c50509
fix/273
2018-12-05 17:32:06 +03:00
Rin Toshaka
9938fa3293
Merge develop to refactor/mix-tasks
2018-12-05 14:16:55 +01:00
Ivan Tashkinov
848151f7cb
[ #210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check
...
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
2018-12-05 13:37:06 +03:00
Ivan Tashkinov
be187f82f7
[ #210 ] Further refactoring.
2018-12-05 11:48:50 +03:00
hakabahitoyo
a418547bdf
debug /api/v1/suggestions
2018-12-05 16:08:34 +09:00
William Pitcock
956f3c75ca
user: put default user info when registering a user
2018-12-05 03:35:41 +00:00
scarlett
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
2018-12-04 23:35:07 +00:00
kaniini
ec1ec32f20
Merge branch 'optional-retry-queue' into 'develop'
...
Make retry queue optional.
See merge request pleroma/pleroma!498
2018-12-04 19:00:18 +00:00
lain
925b05054f
Make retry queue optional.
...
At the moment, it can use a lot of memory really fast.
2018-12-04 19:54:42 +01:00
kaniini
114b95cee2
Merge branch 'feature/integration_tesla' into 'develop'
...
[#354 ] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
2018-12-04 18:41:00 +00:00
William Pitcock
b57d83e3c9
MRF: simple policy: fix media removal
2018-12-04 18:30:01 +00:00
Rin Toshaka
6396f1b58f
change new to gen in instance.ex . Refactor user.ex
2018-12-04 19:00:45 +01:00
Ivan Tashkinov
48e6193bf2
[ #210 ] Refactoring.
2018-12-04 19:24:41 +03:00
Ivan Tashkinov
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
2018-12-04 18:35:57 +03:00
Maksim Pechnikov
50e72f6c48
remove httpoison_mock
2018-12-04 18:09:22 +03:00
Maksim Pechnikov
dd8aee332c
formatting the code
2018-12-04 17:48:55 +03:00
Maksim Pechnikov
a9e4a97586
update test
2018-12-04 14:04:06 +03:00
Maksim Pechnikov
87109482f3
status_code -> status
2018-12-04 14:04:06 +03:00
Maksim Pechnikov
97252a27d9
fix http request in Salmon
2018-12-04 14:04:06 +03:00
Maksim Pechnikov
ec34de0c1f
WebSub fix test
2018-12-04 14:03:32 +03:00
Maksim Pechnikov
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
2018-12-04 14:03:32 +03:00
William Pitcock
d6ab701a14
formatting
2018-12-04 05:01:21 +00:00
William Pitcock
b3b52b58c3
activitypub: transmogrifier: remove obsolete fetch_obj_helper()
2018-12-04 04:52:09 +00:00
William Pitcock
fed9b5404c
object: rework Object.normalize() a bit to support transparent fetching
2018-12-04 04:52:09 +00:00
William Pitcock
02288b5f1c
twitterapi: fix bad rebase
2018-12-04 04:52:09 +00:00
William Pitcock
7a57db0d3a
federator: fix up contain_origin_from_id() call
2018-12-04 04:52:09 +00:00
William Pitcock
f85949cc69
object: factor out fetching functions into Pleroma.Object.Fetcher module
2018-12-04 04:52:09 +00:00
William Pitcock
e8caecb5c7
object: move object containment out of transmogrifier into it's own module
2018-12-04 04:52:09 +00:00
William Pitcock
1a360a4eaa
compact database task: fix formatting
2018-12-04 04:52:09 +00:00
William Pitcock
ef56488349
mix: add task to compact the database
2018-12-04 04:52:09 +00:00
William Pitcock
5d753e1c7c
activity: add helpers for updating activities in the database
2018-12-04 04:52:09 +00:00
William Pitcock
6f90f2c3ac
activitypub: rework thread filtering for split object view
2018-12-04 04:52:09 +00:00
William Pitcock
f168a2add6
ostatus: fix representing external objects
2018-12-04 04:52:09 +00:00
William Pitcock
cf139e3eec
activitypub: transmogrifier: ensure we send nested object in Create
2018-12-04 04:52:09 +00:00
William Pitcock
d6e65f9304
common api: fix up improper Object.normalize() calls
2018-12-04 04:52:09 +00:00
William Pitcock
d13d953385
activitypub: implement activity flattening
2018-12-04 04:52:09 +00:00
William Pitcock
57d90e7afe
activitypub: relay: fix improper use of Object.normalize()
2018-12-04 04:52:09 +00:00
William Pitcock
5ea64f4bf9
activity: minor cleanups to normalization functions to align them with the object normalizers
2018-12-04 04:52:09 +00:00
William Pitcock
5ba5df1321
object: normalize(): use object cache
2018-12-04 04:52:09 +00:00
William Pitcock
e8570758f9
twitterapi: fix remaining test failures
2018-12-04 04:52:09 +00:00
William Pitcock
3b8e5bcbeb
fix most tests
2018-12-04 04:52:09 +00:00
William Pitcock
dd66cc2ca6
ostatus: use Object.normalize() where appropriate when representing activities
2018-12-04 04:52:09 +00:00
William Pitcock
5d4a71906a
mastodon api: use Object.normalize() in a few missing spots
2018-12-04 04:52:09 +00:00
William Pitcock
e9b718cea2
mastodon api: status view: use Object.normalize()
2018-12-04 04:52:09 +00:00
William Pitcock
95a458f392
twitterapi: more object normalization work
2018-12-04 04:52:09 +00:00
William Pitcock
4482ce7e2d
activitypub: normalize objects when streaming them out
2018-12-04 04:52:09 +00:00
William Pitcock
d3fde9b5f2
ostatus: note handler: appropriately use Object.normalize()
2018-12-04 04:52:09 +00:00
William Pitcock
67038ae15e
common api: utils: access inReplyTo object ID correctly
2018-12-04 04:52:09 +00:00
William Pitcock
d6b266163b
common api: fetch visibility from normalized object
2018-12-04 04:52:09 +00:00
William Pitcock
0522b26883
gopher: use Object.normalize()
2018-12-04 04:52:09 +00:00
William Pitcock
663007b42c
activity: clean up direct use of object data
2018-12-04 04:52:09 +00:00
lambda
88b05aeabb
Merge branch 'fix/parse-user-bio' into 'develop'
...
Parse user's bio on register
See merge request pleroma/pleroma!492
2018-12-03 16:31:00 +00:00
lambda
42ef7cd227
Merge branch 'fix-media-proxy-defaults' into 'develop'
...
Fix media proxy config defaults
See merge request pleroma/pleroma!495
2018-12-03 16:14:58 +00:00
Maxim Filippov
4b70e5eae9
Parse bio for MastodonAPI
2018-12-03 18:59:50 +03:00
rinpatch
343b0adfa6
Merge branch 'develop' into fix/theora-detection-read-bytes
2018-12-03 00:34:04 +03:00
rinpatch
a3953ca37a
Change @read_bytes to 35
2018-12-03 00:22:19 +03:00
Rin Toshaka
03b2d1016d
F O R M A T I N G
2018-12-02 20:27:49 +01:00
Rin Toshaka
57c71f8468
Move generate_invite to user.ex
2018-12-02 20:26:15 +01:00
Rin Toshaka
d924b6cd3d
Refactor copypasta to a private function in instance.ex
2018-12-02 20:04:33 +01:00
Maxim Filippov
ce98d5eb9b
Parse user's bio on register
2018-12-02 22:03:53 +03:00
Rin Toshaka
cbe22deb51
Lint fix
2018-12-02 19:20:50 +01:00
Rin Toshaka
faf1f2b304
Move gen.instance to instance.ex
2018-12-02 19:18:06 +01:00
lain
8c9a4e8b40
TwitterAPI: Implement hide_network.
2018-12-02 18:14:13 +01:00
Rin Toshaka
7983b0bdfe
Move unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fix pleroma.user toggle_activated to work not only on local users.
2018-12-02 18:05:59 +01:00
lain
2a639de9b3
MastodonApi: Implement hide_network.
2018-12-02 17:48:00 +01:00
lain
6be0ab1e55
Hide network in ap.
2018-12-02 17:35:32 +01:00
href
43d5e4f7fa
Fix media proxy config defaults
2018-12-02 11:24:02 +01:00
lain
e3f3d13d99
Add uuid generation extension to sample_psql.eex.
2018-12-02 11:20:49 +01:00
lain
91065e1968
Fix background updating / handling.
2018-12-02 11:20:38 +01:00
Rin Toshaka
31b3ac05ac
Lint fix
2018-12-02 10:01:17 +01:00
Rin Toshaka
a8ef6b1190
Add admin option to pleroma.user new. Add user existence checking to toggle_activated
2018-12-02 09:36:31 +01:00
rinpatch
ae82852330
Move set_admin task to lib/mix/tasks/pleroma/user.ex
2018-12-01 18:55:52 +03:00
rinpatch
6f174cbb71
Delete reactivate user task
2018-12-01 18:34:26 +03:00
rinpatch
5f91d6b859
Fix toggle_deactivated to reactivate a deactivated user
2018-12-01 18:33:53 +03:00
rinpatch
fe2759bc9f
Attempt to resolve merge conflict
2018-12-01 18:12:27 +03:00
lain
f18b86fd5f
More fixes for Info schema.
2018-12-01 12:46:08 +01:00
lain
93f2dc19d9
TwitterAPI: Fix banner and background update.
2018-12-01 12:01:22 +01:00
lain
347df6421d
Fix masto api user updating.
2018-12-01 10:40:01 +01:00
lain
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-12-01 09:55:46 +01:00
lain
1c67277c80
Fix admin api.
2018-12-01 09:03:16 +01:00
href
e9982c521b
Upload filter: anonymize filename
...
It replaces the original filename with a randomly generated string.
2018-11-30 19:33:34 +01:00
kaniini
ca24ad2a2b
Merge branch 'feature/reverse-proxy' into 'develop'
...
reverse proxy / uploads
See merge request pleroma/pleroma!470
2018-11-30 18:15:44 +00:00
href
8e0e20631c
Reverse proxy: default max read duration at 30 secs.
2018-11-30 19:12:03 +01:00
lambda
e99bab8f27
Merge branch 'config-delete' into 'develop'
...
Add Pleroma.Config.delete/1
See merge request pleroma/pleroma!484
2018-11-30 17:57:06 +00:00
href
1d94c8f0f0
Fix supervisor order
...
This starts `Pleroma.Web.Endpoint` after all other processes and may
avoid some weird bugs (especially at start/restart).
Also properly ignores starting the gopher's gen_server if disabled.
2018-11-30 18:31:15 +01:00
href
253da275bd
Pleroma.Config.delete/1
2018-11-30 18:27:27 +01:00
href
7282937f33
MIME: video/audio ogg detection
2018-11-30 18:02:52 +01:00
href
680716b3c9
Config docs
2018-11-30 18:02:51 +01:00
href
65e7307d68
Upload: bring back base_url
2018-11-30 18:02:50 +01:00
href
5d92431350
Fix deprecation warnings
2018-11-30 18:02:50 +01:00
href
02d3dc6869
Uploads fun, part. 2
2018-11-30 18:02:37 +01:00
href
97b00d366f
reverse_proxy: more headers
2018-11-30 18:00:57 +01:00
href
a2640c8088
Parse correctly content-type & do not forward content-length
2018-11-30 18:00:57 +01:00
href
b19597f602
reverse proxy / uploads
2018-11-30 18:00:47 +01:00
lain
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
2018-11-30 17:34:20 +01:00
lain
8f1fffebc6
Fix transmogrifier test.
2018-11-30 17:31:05 +01:00
lain
d088ac6286
Fix OStatus user updates.
...
Breaks banner updating.
2018-11-30 17:21:58 +01:00
lain
48b95a9b95
Assorted fixes.
2018-11-30 17:08:02 +01:00
lain
d407f662af
Fix TwitterApiController.
2018-11-30 17:07:37 +01:00
lain
a6812bc9df
Remove "most recent notification" endpoint.
2018-11-30 16:47:37 +01:00
KokaKiwi
87098d1676
Streamer: Don't send unwanted DMs to list streams
2018-11-27 20:50:19 +01:00
lain
e002858071
Fix ostatus test.
2018-11-27 18:37:46 +01:00
lain
3c61df6b9e
Webfinger fixes.
2018-11-27 18:31:44 +01:00
lain
badbe2656c
More fixes.
2018-11-27 18:12:03 +01:00
kaniini
b9bc83097d
Merge branch 'ogg-theora-detection' into 'develop'
...
Add Theora detection to upload.ex
See merge request pleroma/pleroma!479
2018-11-27 16:55:56 +00:00
lain
ec464ef20a
HTTP sig fixes.
2018-11-27 17:42:45 +01:00
rinpatch
0d229613df
Fix lint error
2018-11-27 19:07:58 +03:00
rinpatch
7f20a3cf1f
Add Theora detection to upload.ex
2018-11-27 17:51:02 +03:00
Haelwenn
5ae6088d37
Merge branch 'feature/mrf-user-allowlist' into 'develop'
...
MRF: user allowlist module
See merge request pleroma/pleroma!477
2018-11-27 00:12:03 +00:00
kaniini
a76058fc1d
Merge branch 'fix/pleromafe-title' into 'develop'
...
Replace hardcoded <title>
See merge request pleroma/pleroma!476
2018-11-26 23:59:30 +00:00
William Pitcock
271f9f1335
nodeinfo: add mrf_user_allowlist data
2018-11-26 23:52:19 +00:00
William Pitcock
8c05d19c7f
MRF: add user allowlist module
2018-11-26 23:51:58 +00:00
Mark Felder
6cc94404d7
Replace this hardcoded <title>
2018-11-26 22:51:25 +00:00
Haelwenn (lanodan) Monnier
04daa0fa44
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
...
This fixes running mastofe with MIX_ENV=dev
2018-11-26 21:41:36 +01:00
shibayashi
591b11eafc
Add manifest-src to allow manifest.json
2018-11-26 20:48:24 +01:00
Haelwenn (lanodan) Monnier
ca029f0b69
Web.Streamer: Get unauthenticated statuses representation
2018-11-24 08:45:45 +01:00
Haelwenn (lanodan) Monnier
d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
2018-11-24 06:43:03 +01:00
Haelwenn (lanodan) Monnier
5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
...
reported by soka on CRTNet
2018-11-24 06:13:36 +01:00
kaniini
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
2018-11-22 00:28:04 +00:00
kaniini
182e3e8da2
Merge branch 'feature/improve-version' into 'develop'
...
Improved version string
See merge request pleroma/pleroma!467
2018-11-21 16:53:38 +00:00
kaniini
a591a044a9
Merge branch 'runtime-fixes' into 'develop'
...
Various runtime configuration fixes
See merge request pleroma/pleroma!468
2018-11-20 22:25:35 +00:00
lain
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-11-20 20:16:16 +01:00
lain
d3180e0ccc
Raise on usage of old function.
2018-11-20 20:14:38 +01:00
lain
0896cf4c0f
Fix most mastodon api bugs.
2018-11-20 20:12:39 +01:00
Haelwenn
c7d08bc1cf
Merge branch 'feature/retry-queue' into 'develop'
...
Federator: add retry queue.
See merge request pleroma/pleroma!323
2018-11-20 19:04:52 +00:00
William Pitcock
3456948cd1
mastodon api: fix up quite a few test failures
2018-11-20 19:02:23 +00:00
William Pitcock
ef6c64a5d2
activitypub: fix restrict_blocked()
2018-11-20 18:58:08 +00:00
William Pitcock
c196754b4d
mastodon api: account view: fix tests
2018-11-20 18:54:48 +00:00
William Pitcock
ece8656733
streamer: fix fetching the user's block list
2018-11-20 18:47:12 +00:00
William Pitcock
3356c7d1e9
oauth plug: fix deactivated check
2018-11-20 18:47:00 +00:00
William Pitcock
4ac849cb4a
common api: fix moderator check when deleting posts
2018-11-20 18:42:28 +00:00
William Pitcock
312676f711
user: fix user.info lookup in User.locked?()
2018-11-20 18:41:44 +00:00
lain
6f0b9a5163
Fix Notification tests.
2018-11-20 19:15:28 +01:00
lain
2887f4ff1d
Fix formatter tests.
2018-11-20 19:07:01 +01:00
href
bc5cf2c192
Improved version string
2018-11-20 17:55:03 +01:00
href
7f4c3a1e99
mediaproxy: fix empty url & add some tests
2018-11-20 17:50:03 +01:00
eal
689b46efc8
RetryQueue: tiny refractor, add tests
2018-11-19 18:08:41 +02:00
href
bcecdc3ab1
Various runtime configuration fixes
2018-11-19 10:09:24 +01:00
lain
fbb70d25fe
Several twitter api fixes.
2018-11-18 22:36:47 +01:00
lain
40d9d2098c
Fix user updating from AP.
2018-11-18 22:15:03 +01:00
lain
cafa15131a
Mix format.
2018-11-18 21:41:35 +01:00
lain
4c918392c6
Fix most User tests.
2018-11-18 21:40:52 +01:00
lain
e7cd6e9739
Fix setting of keys.
2018-11-18 19:33:43 +01:00
lain
fc3bcf335e
Fix following locked users.
2018-11-18 18:53:50 +01:00
lain
d5af41b577
Fix note count update.
2018-11-18 18:52:21 +01:00
lain
6f90ceb2ed
Fix follower count test.
2018-11-18 18:49:17 +01:00
lain
812f5b058a
Fix blocking.
2018-11-18 18:40:31 +01:00
lain
756764266c
Formatting.
2018-11-18 18:27:04 +01:00
lain
b396dba425
Fix follower count setting.
2018-11-18 18:24:16 +01:00
lain
5c8f07f0a8
Fix note counting.
2018-11-18 18:17:56 +01:00
lain
47d883d3ab
Fix User deactivation.
2018-11-18 18:06:02 +01:00
lain
50585d051b
Add User.Info module
...
To validate and mutate the user.info field.
2018-11-18 18:04:42 +01:00
eal
62299be094
Federator: add retry queue.
2018-11-18 17:46:29 +02:00
William Pitcock
f6be980f4f
activitypub: object view: avoid leaking private details
2018-11-17 22:30:53 +00:00
William Pitcock
98795172a7
ostatus controller: respond with AS2 objects instead of activities to notice URIs
2018-11-17 22:10:15 +00:00
William Pitcock
dfcfb184b1
activitypub: transmogrifier: make deletes secure
2018-11-17 21:22:57 +00:00
Haelwenn (lanodan) Monnier
0ca00b3a07
Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit
2018-11-17 22:12:14 +01:00
Haelwenn (lanodan) Monnier
44b6200103
lib/mix/tasks/relay*: Use a with block
2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier
12ccf0c4f8
Change Relay from status to {status, message}
2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier
4634d99d0d
Web.Router: Change right to permission group (except for function names)
2018-11-17 22:12:13 +01:00
William Pitcock
0d1375f274
federator: return :ok or :error depending on if an AP doc was accepted or not
2018-11-17 21:00:37 +00:00
William Pitcock
3d9266a8cb
federator: do origin containment when processing inbound messages
2018-11-17 20:43:43 +00:00
William Pitcock
c88533209c
activitypub: user fetching: use fetch_and_contain_remote_object_from_id()
2018-11-17 20:16:03 +00:00
William Pitcock
daa8ec3d62
activitypub: factor out AP object fetching to it's own function and add ID-based containment
2018-11-17 20:15:59 +00:00
Haelwenn (lanodan) Monnier
e0b0fde713
Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names)
2018-11-17 20:25:57 +01:00
Haelwenn (lanodan) Monnier
1a31d71187
lib/mix/tasks/relay_{un,}follow.ex: Use a with block
2018-11-17 20:25:57 +01:00
Haelwenn (lanodan) Monnier
ccd6b1956d
lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow
2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier
7fbfd2db96
lib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}follow
2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier
265c8c5209
Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t
2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier
4a79b89dba
lib/pleroma/plugs/user_is_admin_plug.ex: change 403 string to “User is not admin.”
2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier
f9d05902fe
lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves
2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier
a87ed2fad6
Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format
2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier
f48062488e
Add get endpoints for rights [AdminAPI]
2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier
59ce7fedce
Fix connection returns make generic right endpoint [AdminAPI]
2018-11-17 20:25:55 +01:00
Haelwenn (lanodan) Monnier
c5a2bd6a65
admin_api_controller.ex: fix remaining params at once
2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier
95b107b6cc
admin_api_controller.ex: Add documentation, fix get_invite_token
2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier
578a911737
admin_api_controller.ex: get_password_reset: fix params and response
2018-11-17 20:25:54 +01:00
Haelwenn (lanodan) Monnier
5732eef16b
lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController
2018-11-17 20:25:53 +01:00
Haelwenn (lanodan) Monnier
c8b8f1d32c
[Pleroma.Plugs.UserIsAdminPlug]: Check if admin is true instead of false, fix error reporting
2018-11-17 20:25:53 +01:00
Haelwenn (lanodan) Monnier
011a2e36b1
lib/mix/tasks/make_admin.ex: New task
2018-11-17 20:25:53 +01:00
Haelwenn (lanodan) Monnier
7076d45cb6
lib/pleroma/plugs/user_is_admin_plug.ex: Create
2018-11-17 20:25:52 +01:00
Haelwenn (lanodan) Monnier
77d2fd54dd
admin_api_controller: Have some basic code
2018-11-17 20:25:52 +01:00
Haelwenn (lanodan) Monnier
ee2e1328ad
admin_api_controller.ex: Create
2018-11-17 20:25:52 +01:00
William Pitcock
603fccf175
activitypub: fetch_object_from_id(): prefer actor over attributedTo to avoid spoofing
2018-11-17 18:17:17 +00:00
kaniini
05967472f2
Merge branch 'feature/uploader-mdii' into 'develop'
...
Feature / MDII Uploader
See merge request pleroma/pleroma!454
2018-11-17 16:41:09 +00:00
hakabahitoyo
59e079f641
fallbacking into local uploader
2018-11-17 20:16:25 +09:00
hakabahitoyo
8fd0556c78
better config reading
2018-11-17 18:14:42 +09:00
lain
f87b315618
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
2018-11-16 19:47:36 +01:00
lambda
2f639ea129
Merge branch 'feature/pleromafe-usersearch' into 'develop'
...
Add Twitter / Pleroma API user search
See merge request pleroma/pleroma!452
2018-11-16 18:13:47 +00:00
William Pitcock
c07464607d
http security: remove form-action from CSP definitions
2018-11-16 17:40:21 +00:00
lain
e8d8c84f79
Add better test for user search functionlity.
2018-11-16 18:31:32 +01:00
hakabahitoyo
55abd8482e
better config
2018-11-16 20:41:12 +09:00
hakabahitoyo
52224de39f
better extension detection
2018-11-16 20:22:36 +09:00
hakabahitoyo
4fbfacf5e1
debug
2018-11-15 16:08:55 +09:00
hakabahitoyo
8e707aba29
format
2018-11-15 15:11:59 +09:00
Hakaba Hitoyo
ebe658c169
debuf
2018-11-15 14:46:43 +09:00
Hakaba Hitoyo
698cb3587c
omplement mdii uploader
2018-11-15 14:38:45 +09:00
Hakaba Hitoyo
58af0787be
add mdii uploader
2018-11-15 14:19:10 +09:00
lain
27aa136aac
Format.
2018-11-14 20:41:12 +01:00
lain
7b170cd616
Add Pleroma user search api for PleromaFE.
2018-11-14 20:33:23 +01:00
lambda
cc45797f4e
Merge branch 'fix-media-proxy-filename' into 'develop'
...
media_proxy: use path only to retrieve filename
See merge request pleroma/pleroma!450
2018-11-14 18:17:10 +00:00
kaniini
69d557e86d
Merge branch 'twitter-api-direct-messages' into 'develop'
...
Twitter api direct messages
See merge request pleroma/pleroma!449
2018-11-14 08:52:08 +00:00
href
f52a1d1ec5
media_proxy: use path only to retrieve filename
2018-11-13 23:41:33 +01:00
lain
ea9a776d7b
TwitterApi: Add direct message endpoint
2018-11-13 20:08:50 +01:00
lain
2cf40237ff
MastodonAPI: Add pagination to private messages.
2018-11-13 19:46:34 +01:00
href
9b553a1087
media_proxy: CSP, content-disposition
...
* Adds CSP headers to the media proxy endpoint
* Sends `content-disposition: attachment; …` for non-image/video/audio
content types
The default list can be overwritten with `:media_proxy,
:safe_content_types` in the configuration.
* Also now appends the filename to the proxy URL (fixes some mobile apps,
it was requested a while ago)
2018-11-13 15:58:02 +01:00
shibayashi
87c76a9a2f
Add __Host- prefix when secure flag is enabled
2018-11-13 00:32:38 +01:00
scarlett
0ce5623134
Merge branch 'twitter-api-null-display-name' into 'develop'
...
Twitter API: Fall back to user.nickname if user has no name
Closes #375
See merge request pleroma/pleroma!444
2018-11-12 17:08:54 +00:00
scarlett
cb6fd73861
Twitter API: Fall back to user.nickname if user has no name
2018-11-12 15:52:13 +00:00
kaniini
54923c2e55
Merge branch 'feature/csp-plug' into 'develop'
...
migrate CSP management to CSPPlug
See merge request pleroma/pleroma!441
2018-11-12 15:30:42 +00:00
William Pitcock
2829fa4183
sample config: chase http_security change
2018-11-12 15:17:04 +00:00
William Pitcock
ee5932a504
http security: allow referrer-policy to be configured
2018-11-12 15:14:46 +00:00
William Pitcock
fe67665e19
rename CSPPlug to HTTPSecurityPlug.
2018-11-12 15:08:02 +00:00
KokaKiwi
1592fa2bea
Mastodon API: Fix list streaming
2018-11-11 14:18:15 +01:00
William Pitcock
df72978dce
csp plug: add support for certificate transparency
2018-11-11 06:55:44 +00:00
William Pitcock
331cf6ada1
csp plug: add sts support
2018-11-11 06:50:28 +00:00
William Pitcock
a2bf5426cb
sample config: document how to make CSPPlug send STS headers (off by default to allow for SSL debugging)
2018-11-11 06:42:14 +00:00
William Pitcock
f516e317ea
plugs: add CSPPlug
2018-11-11 06:10:21 +00:00
William Pitcock
419ed3a0ca
oauth: fix token decode regression
2018-11-11 05:26:39 +00:00
lambda
f745e823f0
Merge branch 'bugfix/json-ld-object-sanitization' into 'develop'
...
JSON-LD: object sanitization
See merge request pleroma/pleroma!438
2018-11-10 12:37:18 +00:00
William Pitcock
97e50f3191
activitypub: transmogrifier: sanitize internal representation details from outgoing objects
...
this causes JSON-LD parsers to get upset and has also lead to developer confusion from outside
projects which tried to parse our internal data. accordingly, it seems better to just remove
it.
2018-11-10 12:24:20 +00:00
Haelwenn (lanodan) Monnier
5ecb5629f6
lib/mix/tasks: s/@doc/@moduledoc/
2018-11-10 13:09:39 +01:00
Haelwenn (lanodan) Monnier
5e3207045e
lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy
2018-11-10 13:09:39 +01:00
Haelwenn (lanodan) Monnier
64c0289893
lib/mix/tasks: Add remaining documentation for mix tasks
2018-11-10 13:09:38 +01:00
Haelwenn (lanodan) Monnier
8b2541e4e7
Document the mix tasks in ex_doc instead
2018-11-10 13:09:37 +01:00
Haelwenn (lanodan) Monnier
e1814bb322
Document mix tasks
2018-11-10 13:09:37 +01:00
William Pitcock
f8310114a6
activitypub: object view: sanitize both the activity and the object when an activity is given for rendering
2018-11-10 12:04:09 +00:00
kaniini
c9c1f9dee2
Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'
...
ostatus: only federate activities concerning note objects
See merge request pleroma/pleroma!437
2018-11-10 11:50:02 +00:00
kaniini
7daa102fa4
Merge branch 'bugfix/local-jsonld-context' into 'develop'
...
Host LitePub JSON-LD context locally
See merge request pleroma/pleroma!435
2018-11-10 11:37:44 +00:00
William Pitcock
4f87b8362b
endpoint: move CORSPlug in front of Plug.Static
2018-11-10 11:23:50 +00:00
William Pitcock
03a9990baf
endpoint: fix formatting
2018-11-10 11:18:25 +00:00
William Pitcock
e6d246882d
federator: don't federate anything other than Note objects to OStatus
2018-11-10 10:06:10 +00:00
William Pitcock
e4971553c7
activitypub: utils: use same object type list for mention extraction as insertion
2018-11-09 13:40:39 +00:00
William Pitcock
b3c360ce2c
notification: add fallback get_notified_from_activity()
2018-11-09 09:07:40 +00:00
William Pitcock
b9871e7e5a
activitypub: utils: wrap Note objects in a Create when extracting mentions
2018-11-09 09:01:40 +00:00
William Pitcock
8c805ada32
user: remove obsolete User.get_notified_from_activity().
2018-11-09 09:01:40 +00:00
William Pitcock
6cadfcb21e
activitypub: utils: switch to using new Notification.get_notified_from_activity().
2018-11-09 09:01:40 +00:00
William Pitcock
cdfdd77e30
notification: implement new Notification.get_notified_from_activity()
2018-11-09 09:01:36 +00:00
William Pitcock
d26cd6c1bf
user: factor out user set fetching from User.get_notified_from_activity()
2018-11-09 08:23:45 +00:00
William Pitcock
81d6ca1783
user: implement AS2 mention extraction + unify Announce handling
2018-11-08 20:19:56 +00:00
William Pitcock
6b4064fa5d
activitypub: transmogrifier: unify mention extraction
2018-11-08 19:41:36 +00:00
William Pitcock
0a2c1a3419
user: add optional local_only param to get_notified_from_activity()
2018-11-08 19:30:55 +00:00
Haelwenn (lanodan) Monnier
2fab32ab61
Pleroma.Web.Endpoint: Whitelist schemas directory
2018-11-08 20:22:12 +01:00
Haelwenn (lanodan) Monnier
934125695d
Move /litepub-1.0.jsonld to /schemas/litepub-0.1.jsonld
2018-11-08 20:21:45 +01:00
William Pitcock
4e93d6ae14
common api: utils: flip to/cc for mentions
2018-11-08 19:17:01 +00:00
William Pitcock
3e33479c05
activitypub: transmogrifier: only consider to users as mention targets
2018-11-08 18:58:27 +00:00
William Pitcock
144dc048b8
user: only consider to recipients as mention targets
2018-11-08 18:58:24 +00:00
Haelwenn (lanodan) Monnier
abcacec97d
Pleroma.Web.ActivityPub.Utils: Use locally-served JSON-LD Litepub context instead of Github-hosted one
2018-11-08 19:38:38 +01:00
William Pitcock
da16ada424
utils: use litepub @context instead of that huge mess
2018-11-08 16:52:14 +00:00
William Pitcock
f733470037
user view: unify a @context entry that was missed
2018-11-08 16:51:48 +00:00
lambda
59cf7cf235
Merge branch 'small-jsonld-refactor' into 'develop'
...
Small jsonld refactor
See merge request pleroma/pleroma!433
2018-11-08 16:23:58 +00:00
lain
34bd411781
Unify json ld header handling.
2018-11-08 16:39:38 +01:00
lain
3b02fd9fb7
Small refactor.
2018-11-08 16:05:28 +01:00
kaniini
4d627a5117
Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'
...
qvitter notifications: add new "read notifications" API
See merge request pleroma/pleroma!431
2018-11-07 22:33:06 +00:00
kaniini
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
2018-11-07 22:32:34 +00:00
href
e42f2efae4
/api/v1/accounts/relationships Return an empty array if no id in params
...
This copies Mastodon API behaviour & fixes Mastalab app.
2018-11-07 16:32:57 +01:00
href
9070588493
Runtime config: MRF changes
2018-11-07 10:40:24 +01:00
William Pitcock
b2105a3131
twitterapi: add notification read endpoint
2018-11-06 23:25:07 +00:00
William Pitcock
f16c2e0b1b
notification: add Notification.set_read_up_to()
2018-11-06 22:50:43 +00:00
href
5bb88fd174
Runtime configuration
...
Related to #85
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
2018-11-06 19:41:15 +01:00
kaniini
a68c18f0ad
Merge branch 'unify-mastodon-oauth' into 'develop'
...
Unify Mastodon Login with OAuth login.
See merge request pleroma/pleroma!429
2018-11-06 16:18:12 +00:00
kaniini
0f3e78addb
Merge branch 'runtime-router' into 'develop'
...
Runtime configured router
See merge request pleroma/pleroma!426
2018-11-06 15:35:19 +00:00
lain
a8f1e30cb8
Formatting.
2018-11-06 16:05:58 +01:00
href
7d328c658d
Small wrapper module around Application.get_env/put_env
...
Same API as the old Pleroma.Config
2018-11-06 16:00:48 +01:00
lain
4f640c43ed
Unify Mastodon Login with OAuth login.
...
This removes duplication in the login code.
2018-11-06 15:19:11 +01:00
href
2bc924ba45
Get rid of Pleroma.Config in favor of Application
...
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
2018-11-06 15:12:53 +01:00
href
013f7ba8c1
Add federating plug & public tests
2018-11-06 14:45:04 +01:00
href
83911b1443
Fix wrong return when finmoji is disabled
2018-11-05 21:17:47 +01:00
href
fd0e7d18d9
handle_continue is OTP21+
2018-11-05 18:04:43 +01:00
href
6fe23c5458
Runtime configured router
2018-11-05 15:19:03 +01:00
href
d096bc17bf
revert endpoint position in supervision tree
2018-11-05 14:05:04 +01:00
href
763fc7b44f
Runtime configured emojis
...
The changes are a bit heavy since the emojis were loaded into module
attributes from filesystem.
This introduces a GenServer using an ETS table to cache in memory the
emojis, and allows a runtime-reload with `Pleroma.Emoji.reload()`.
2018-11-05 13:24:00 +01:00
kaniini
007f1c73b1
Merge branch 'feature/cors-again' into 'develop'
...
Add CORSPlug to make web-based OAuth easier.
See merge request pleroma/pleroma!420
2018-11-03 15:36:23 +00:00
Haelwenn (lanodan) Monnier
3e50bb667f
Pleroma.Web.MastodonAPI.StatusView: Content isn’t nullable
2018-11-03 14:42:47 +01:00
lain
e954cfcc2c
Add CORSPlug to make web-based OAuth easier.
2018-11-03 13:38:01 +01:00
lambda
4bcdbb12a4
Merge branch 'fix_hashtag_search' into 'develop'
...
Fix hashtag search
See merge request pleroma/pleroma!418
2018-11-02 20:05:56 +00:00
Mark Felder
0cca7edbe0
Fix hashtag search
...
When we lowercase the search it will succesfully do a case insenstive
match. Now #Linux will match #linux and #LINUX whereas previously it
would only match the exact case.
2018-11-02 19:38:57 +00:00
lain
45ebc8dd9a
Check for empty string in_reply_to ids.
2018-11-02 17:33:51 +01:00
Haelwenn (lanodan) Monnier
3c7d4ff271
Pleroma.Web.TwitterAPI.ActivityView: Harden TwitterAPI against remnant of prismo
2018-11-01 15:07:27 +01:00
William Pitcock
24ba08de13
twitter api: add support for rendering Page objects
2018-11-01 10:01:35 +00:00
William Pitcock
4d8f076125
mastodon api: add support for rendering Page objects
2018-11-01 10:00:16 +00:00
William Pitcock
9f03b5c4f7
activitypub: transmogrifier: add support for Page objects
2018-11-01 09:59:43 +00:00
Lee Starnes
585b29337c
Ensure filters have a filter_id
2018-11-01 09:17:02 +00:00
kaniini
eba9a62024
Merge branch 'feature/relay-tests' into 'develop'
...
relay tests
See merge request pleroma/pleroma!411
2018-11-01 09:10:51 +00:00
Haelwenn
40676d7683
Merge branch 'bugfix/prismo.news_article_url' into 'develop'
...
Bugfix/prismo.news article url
Closes #352
See merge request pleroma/pleroma!410
2018-11-01 09:05:16 +00:00
lain
1e9ced5af4
Test Relay, switch to runtime configuration.
2018-11-01 09:01:43 +00:00
lain
e6ec01afb6
Start configuration manager.
2018-11-01 09:01:24 +00:00
lain
9b77030d3c
Add basic configuration management module.
2018-11-01 09:01:03 +00:00
Haelwenn (lanodan) Monnier
b2da5262ea
Pleroma.Web.ActivityPub.Transmogrifier: fix_url when not a string/empty
...
Thanks prismo.news, I hate it
2018-11-01 09:56:37 +01:00
Haelwenn (lanodan) Monnier
755f166406
Pleroma.Web.MastodonAPI.StatusView: Do not fail when URL isn’t a string
2018-11-01 09:55:38 +01:00
William Pitcock
2b3a40d038
object: split object_cache from user_cache
2018-11-01 08:41:46 +00:00
William Pitcock
f584a603f9
user: make User.delete() return data consistent with Object.delete()
2018-11-01 07:56:21 +00:00
William Pitcock
2c3bfd7f76
user: delete user_info data in User.invalidate_cache()
2018-11-01 07:52:58 +00:00
William Pitcock
10f3958468
object: return the deleted object as well
2018-11-01 07:47:50 +00:00
William Pitcock
2bf358d7b4
activitypub: use Object.delete() instead of mutating the database and cache directly
2018-11-01 07:29:12 +00:00
William Pitcock
c4e43da63e
object: add safe object deletion function
2018-11-01 07:28:48 +00:00
Haelwenn (lanodan) Monnier
558e6a84d6
[Pleroma.Web.CommonAPI]: Delete post cache entry when it’s deleted
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/346
2018-11-01 06:52:01 +01:00
William Pitcock
47f76bf4b1
common api: allow self-liking objects
...
mastodon allows this, for whatever reason.
closes #347 .
2018-10-31 22:29:49 +00:00
kaniini
5fea3d9eca
Merge branch 'allow-abbr' into 'develop'
...
Allow use of the `abbr` HTML tag.
See merge request pleroma/pleroma!405
2018-10-30 23:22:48 +00:00
scarlett
795634c90f
Allow use of the abbr HTML tag.
2018-10-30 21:40:06 +00:00
scarlett
b92e38d2d4
Add user reactivation task.
2018-10-29 23:13:15 +00:00
kaniini
a880e0a527
Merge branch 'feature/upload-limits' into 'develop'
...
configurable media upload limits
Closes #118
See merge request pleroma/pleroma!401
2018-10-29 20:14:10 +00:00
William Pitcock
676c97b8c7
nodeinfo: expose configured upload limits
2018-10-29 20:07:52 +00:00
William Pitcock
36825932eb
s3 uploader: add new feature to force public attachment URIs to go through media proxy
2018-10-29 18:00:59 +00:00
William Pitcock
f407831120
common api: prefer formatting attachments using the attachment's name instead of URI
2018-10-29 17:59:24 +00:00
William Pitcock
784b3a615d
utils: fix another possible leak with private S3 backends using mediaproxy
...
same rationale as the other mediaproxy changes
2018-10-29 17:26:15 +00:00
William Pitcock
181f3bb56a
mastodon api: enforce upload limits for avatars and banners
2018-10-29 16:43:05 +00:00
William Pitcock
e12489e2fe
twitter api: enforce upload limits for avatars, banners and backgrounds
2018-10-29 16:43:05 +00:00
William Pitcock
167d3789a5
activitypub: upload: pass through an upload limit if one is provided
2018-10-29 16:43:05 +00:00
William Pitcock
fa483cd7c2
upload: add new optional argument designating an upload size limit
2018-10-29 16:43:00 +00:00
William Pitcock
5c6ec2d9fc
twitter/mastodon api: always use mediaproxy URLs in attachments
...
if using local media, the mediaproxy will not replace the URL anyway.
2018-10-29 15:19:32 +00:00
William Pitcock
69192f36ff
mix tasks: add new task to unsubscribe all users from, and then ban a remote user (e.g. followbots)
2018-10-28 19:47:56 +00:00
kaniini
39103a91be
Merge branch 'bugfix/broken-thread-filtering-false-positive' into 'develop'
...
activitypub: fix possible false positives with broken thread filtering
See merge request pleroma/pleroma!398
2018-10-28 05:52:51 +00:00
William Pitcock
72ea54de6e
activitypub: fix possible false positives with broken thread filtering
2018-10-28 05:45:33 +00:00
Greizgh
a494508320
Cleanup postgresql setup script
...
Drop unused CREATEDB privilege.
Do not try to handle multiple run.
2018-10-27 14:31:51 +02:00
kaniini
44762daf51
Merge branch 'feature/broken-thread-filtering' into 'develop'
...
broken thread filtering, part 1
See merge request pleroma/pleroma!394
2018-10-26 06:45:38 +00:00
William Pitcock
c302c619b9
http: fix mediaproxy
2018-10-26 06:38:08 +00:00
William Pitcock
26eb11c172
activitypub: add support for filtering broken threads out of timelines
2018-10-26 06:16:51 +00:00
William Pitcock
7338368ad9
http: enable keepalive / connection pooling ( closes #336 )
2018-10-26 03:06:42 +00:00
William Pitcock
f6cb963df2
activitypub utils: fix recipient check when the message is unaddressed (mastodon)
2018-10-26 01:24:22 +00:00
Haelwenn (lanodan) Monnier
7906dfe5a0
[Pleroma.Web.Nodeinfo.NodeinfoController]: Simplify features strings
2018-10-26 01:06:34 +02:00
Haelwenn (lanodan) Monnier
57330dd91b
[Pleroma.Web.Nodeinfo.NodeinfoController]: Have a list of supported features
2018-10-26 01:06:19 +02:00
kaniini
9fe9c09883
Merge branch 'finmoji-optional' into 'develop'
...
Make finmoji optional
See merge request pleroma/pleroma!391
2018-10-25 18:24:07 +00:00
scarlett
ae5beb7b64
Make finmoji optional
2018-10-25 17:58:46 +01:00
William Pitcock
ce70eb8c00
activitypub utils: fix user splicing
2018-10-25 05:24:01 +00:00
William Pitcock
2f1f1a4f30
activitypub: splice users into recipient lists when they receive messages at their personal inbox
...
closes #343
2018-10-25 05:02:21 +00:00
kaniini
9e9b1bd5ea
Merge branch 'bugfix/ap-uri-user-search' into 'develop'
...
transmogrifier: do not try to contain origin of something which doesn't have one
Closes #340
See merge request pleroma/pleroma!389
2018-10-25 04:38:46 +00:00
Haelwenn
79b1e4465f
Merge branch 'bugfix/233-handle-missing-StatusView' into 'develop'
...
[Pleroma.Web.MastodonAPI.StatusView]: Add fallback on missing handler for status.json
Closes #233
See merge request pleroma/pleroma!257
2018-10-25 04:35:29 +00:00
William Pitcock
5383887bd4
transmogrifier: do not try to contain origin of something which doesn't have one
2018-10-25 04:27:33 +00:00
Haelwenn (lanodan) Monnier
b386888a0e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: fallback for try_render/4
...
Better be sure than sorry
2018-10-25 06:21:11 +02:00
William Pitcock
1ed25c963a
twitterapi: activity view: add the other in_reply_to fields
2018-10-25 04:04:04 +00:00
William Pitcock
1b480e3514
user: add helper for fetching profile url (which may be different than ap id)
2018-10-25 04:01:59 +00:00
Haelwenn (lanodan) Monnier
b112112c11
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Wrap around render/4
2018-10-25 05:52:45 +02:00
Haelwenn (lanodan) Monnier
b0a940d5a2
[Pleroma.Web.MastodonAPI.StatusView]: Remove unused arguments
2018-10-25 05:24:03 +02:00
Haelwenn (lanodan) Monnier
2da0ffeb28
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex: Output an error when render(status.json) gives a nil
2018-10-25 05:24:03 +02:00
Haelwenn (lanodan) Monnier
0c10be8731
[Pleroma.Web.MastodonAPI.StatusView]: Remove nils from lists.json
2018-10-25 05:24:03 +02:00
Haelwenn (lanodan) Monnier
3b0e9287a5
[Pleroma.Web.MastodonAPI.StatusView]: Return nil as fallback for missing views
2018-10-25 05:24:01 +02:00
William Pitcock
fee43ae5e7
twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper
2018-10-25 02:59:04 +00:00
William Pitcock
f3f736afc4
activity: add helper to fetch an activity's parent
2018-10-25 02:47:55 +00:00
kaniini
945ce9910d
Merge branch 'bugfix/html-scrub-comments' into 'develop'
...
html: ensure comments are correctly scrubbed
See merge request pleroma/pleroma!384
2018-10-23 00:56:09 +00:00
William Pitcock
8613db0e3b
html: ensure comments are correctly scrubbed
2018-10-23 00:48:49 +00:00
