Commit Graph

5635 Commits

Author SHA1 Message Date
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