Alexander Strizhakov
15aece7238
remove validate_expires_at from enqueue method
2020-09-10 21:52:31 +03:00
Alexander Strizhakov
2c2094d4b2
configurable lifetime for ephemeral activities
2020-09-10 21:51:59 +03:00
Alexander Strizhakov
eb5ff715f7
pin/unpin for activities with expires_at option
2020-09-10 21:50:41 +03:00
Alexander Strizhakov
93e1c8df9d
reject activity creation
...
if passed expires_at option and expiring activities are not configured
2020-09-10 21:50:41 +03:00
Alexander Strizhakov
de4c935071
don't expire pinned posts
2020-09-10 21:50:41 +03:00
Alexander Strizhakov
9bf1065a06
schedule activity expiration in Oban
2020-09-10 21:50:40 +03:00
rinpatch
0254696e30
Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop'
...
Feature/1790 removing expired tokens through Oban scheduled jobs
See merge request pleroma/pleroma!2957
2020-09-10 18:45:04 +00:00
rinpatch
541a3eede2
Merge branch 'chores/remove-ostatus-fixtures' into 'develop'
...
Remove OStatus in testsuite
See merge request pleroma/pleroma!2968
2020-09-10 18:41:00 +00:00
rinpatch
275602daa7
Streaming integration tests: remove unexpected error assumption
...
For some reason instead of fixing unexpected errors, we made tests
assert they indeed trigger... Now that the errors are fixed these were
failing
2020-09-10 21:28:47 +03:00
Alexander Strizhakov
7dd986a563
expire mfa tokens through Oban
2020-09-10 16:01:19 +03:00
Alexander Strizhakov
3ce658b930
schedule expired oauth tokens deletion with Oban
2020-09-10 16:01:19 +03:00
Maksim Pechnikov
9853c90abb
added paginate links to headers for /chats/:id/messages
2020-09-10 12:39:29 +03:00
Ivan Tashkinov
68a74d6659
[ #2497 ] Added missing alias, removed legacy `:adapter` option specification for HTTP.get/_.
2020-09-09 19:30:42 +03:00
Mark Felder
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
2020-09-09 11:11:36 -05:00
Mark Felder
b900c06d4e
Add tests for the bulk confirm/unconfirm tasks
2020-09-09 09:02:07 -05:00
Mark Felder
6c79a60649
Add test for pleroma.user set --confirmed
...
Order now matters because of testing shell_info
2020-09-09 08:44:01 -05:00
rinpatch
0d2814ec8e
Metadata: Move restriction check from Feed provider to activated_providers
2020-09-08 20:21:34 +03:00
Mark Felder
a85ed6defb
Do not serve RSS/Atom feeds when instance is private
2020-09-08 20:21:34 +03:00
Mark Felder
44ced17634
Fix test so setting doesn't leak
2020-09-08 20:21:34 +03:00
Mark Felder
ff07014b26
Disable providers of user and status metadata when instance is private
2020-09-08 20:21:34 +03:00
Haelwenn (lanodan) Monnier
10ef532c63
AP C2S: Restrict character limit on Note
2020-09-08 20:21:34 +03:00
Haelwenn
073f5490ec
Merge branch 'bugfix/mock' into 'develop'
...
mockfix but for non-secteam because gitlab
See merge request pleroma/pleroma!2973
2020-09-08 19:46:23 +03:00
rinpatch
7490b76bbf
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
...
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
2020-09-08 19:45:44 +03:00
Haelwenn (lanodan) Monnier
921f926e96
Remove OStatus in testsuite
2020-09-08 18:43:57 +02:00
Haelwenn (lanodan) Monnier
ee0e05f930
Drop unused "inReplyToAtomUri" in objects
2020-09-08 18:43:57 +02:00
Alexander Strizhakov
fd7e9bdd25
don't run async tests, which use Mock
2020-09-08 17:40:23 +02:00
feld
bf048ab72f
Merge branch 'develop' into 'develop'
...
ForceBotUnlistedPolicy
See merge request pleroma/pleroma!2967
2020-09-08 14:52:51 +00:00
Haelwenn (lanodan) Monnier
f6723dc9bd
account_view_test: Remove empty test
2020-09-08 16:33:22 +02:00
Haelwenn (lanodan) Monnier
788dececff
test: remove extraneous :instances_favicons config bits
2020-09-08 16:32:54 +02:00
Mark Felder
21efda2edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
2020-09-08 09:31:26 -05:00
rinpatch
0a05670b44
Merge branch 'fix/upload-filter-exiftool-webp' into 'develop'
...
Skip processing webp image files because we can't strip EXIF
Closes #2080
See merge request pleroma/pleroma!2924
2020-09-08 12:21:33 +00:00
rinpatch
ce3474f4d3
Disable favicon scraping in tests
2020-09-08 15:09:10 +03:00
lain
9b85592b8b
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
2020-09-08 13:56:42 +03:00
rinpatch
964bc8e2e8
Merge branch 'bugfix/favicon-too-long' into 'develop'
...
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
2020-09-08 13:55:52 +03:00
feld
43b07c31cb
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
2020-09-08 13:53:47 +03:00
rinpatch
dccbed856d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
2020-09-08 13:53:16 +03:00
rinpatch
ea4b6c64d6
Merge branch 'feat/rich-media-improvements' into 'develop'
...
Rich media improvements
See merge request pleroma/pleroma!2944
2020-09-08 13:00:49 +03:00
rinpatch
8c3241df44
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-08 13:00:15 +03:00
rinpatch
13e606941c
Merge branch 'fix/2087-metadata' into 'develop'
...
Fix/2087 metadata
See merge request pleroma/secteam/pleroma!11
2020-09-08 12:55:30 +03:00
rinpatch
84acfab156
Merge branch 'fix-searching-following' into 'develop'
...
search: fix 'following' query parameter
See merge request pleroma/pleroma!2943
2020-09-08 12:53:02 +03:00
rinpatch
718c7cc847
Merge branch 'fix/apc2s-limits' into 'develop'
...
AP C2S: Restrict character limit on Note
Closes #2
See merge request pleroma/secteam/pleroma!9
2020-09-08 12:51:38 +03:00
Mark Felder
4ea07f74e9
Revert/simplify.
...
We only need to check the content-type. There's no chance a webp file
will get mismatched as another image type.
2020-09-08 12:29:38 +03:00
Mark Felder
216c84a8f4
Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension.
2020-09-08 12:29:38 +03:00
Mark Felder
3a98960c26
Verify webp files are not processed with exiftool
2020-09-08 12:29:38 +03:00
Mark Felder
2165a24974
Improve upload filter return values so we can identify when filters make no changes to the input
2020-09-08 12:29:38 +03:00
Alibek Omarov
d074e54013
ForceBotUnlistedPolicy: try to fix test 2
2020-09-07 23:28:29 +02:00
Alibek Omarov
0a25c92cfa
ForceBotUnlistedPolicy: try to fix test
2020-09-07 23:18:36 +02:00
Alibek Omarov
d2fd1d3481
ForceBotUnlistedPolicy: fix test extension
2020-09-07 23:04:07 +02:00
Alibek Omarov
8b695c3eeb
ForceBotUnlistedPolicy: format
2020-09-07 22:53:45 +02:00
Alibek Omarov
57cf0cc3b3
ForceBotUnlistedPolicy: add test
2020-09-07 22:50:57 +02:00
Alexander Strizhakov
18d21aed00
deprecation warnings
2020-09-07 19:59:17 +03:00
Alexander Strizhakov
696bf09433
passing adapter options directly without adapter key
2020-09-07 19:59:17 +03:00
Alexander Strizhakov
ee67c98e55
removing Stats worker from Oban cron jobs
2020-09-07 19:16:14 +03:00
rinpatch
d5c286b802
Merge branch 'bugfix/favicon-too-long' into 'develop'
...
instance: Drop favicon URLs longer than 255 characters
Closes #2116
See merge request pleroma/pleroma!2949
2020-09-07 11:12:30 +00:00
lain
fdab01ab56
Merge branch 'fix/rich-media-fake-statuses' into 'develop'
...
Rich Media: Do not cache URLs for preview statuses
Closes #1987
See merge request pleroma/pleroma!2956
2020-09-07 10:19:19 +00:00
Haelwenn (lanodan) Monnier
08aef7dd4e
instance: Log catch favicon errors as warnings
2020-09-07 08:40:52 +02:00
Maksim Pechnikov
917d325972
added api spec
2020-09-07 07:17:30 +03:00
Maksim Pechnikov
5ae56aafb2
added import mutes
2020-09-06 21:42:51 +03:00
Ivan Tashkinov
759f8bc3ae
[ #2497 ] Fixed MediaProxyWarmingPolicyTest.
2020-09-06 15:30:11 +03:00
rinpatch
170599c390
RichMedia: do not log webpages missing metadata as errors
...
Also fixes the return value of Parser.parse on errors, previously
was just `:ok` due to the logger call in the end
2020-09-05 22:05:35 +03:00
rinpatch
e198ba492e
Rich Media: Do not cache URLs for preview statuses
...
Closes #1987
2020-09-05 20:53:46 +03:00
Ivan Tashkinov
c3b02341bf
[ #2497 ] Made media preview proxy fall back to media proxy instead of to source url. Adjusted tests. Refactoring.
2020-09-05 16:16:35 +03:00
Mark Felder
85446cc30c
Merge branch 'develop' into media-preview-proxy
2020-09-03 10:34:06 -05:00
lain
9433311923
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'
...
Fix emoji in Question, force generated context/context_id insertion
Closes #1870
See merge request pleroma/pleroma!2915
2020-09-03 11:50:30 +00:00
lain
5da3677607
Frontend mix task: Add tests.
2020-09-03 11:40:17 +02:00
feld
d1a6f67b1d
Merge branch 'fix/2095-deactivated-account-reset' into 'develop'
...
Disallow password resets for deactivated accounts
Closes #2095
See merge request pleroma/pleroma!2935
2020-09-02 17:11:24 +00:00
lain
119e11f455
Merge branch 'bugfix/mastoapi-lists' into 'develop'
...
Fix removing an account from a list
Closes #2103
See merge request pleroma/pleroma!2940
2020-09-02 17:03:45 +00:00
Mark Felder
cbf7f0e029
Disallow password resets for deactivated accounts.
...
Ensure all responses to password reset events are identical.
2020-09-02 09:09:13 -05:00
rinpatch
19691389b9
Rich media: Add failure tracking
2020-09-02 14:59:52 +03:00
rinpatch
47ff425cfd
Merge branch 'fix/2047-rich-media-parser' into 'develop'
...
RichMedia parser fix
Closes #2047
See merge request pleroma/pleroma!2941
2020-09-02 09:38:43 +00:00
rinpatch
b2d776d77d
Merge branch 'http-fixes' into 'develop'
...
Improvements and fixes for http requests
See merge request pleroma/pleroma!2904
2020-09-02 09:36:56 +00:00
Alexander Strizhakov
79f65b4374
correct pool and uniform headers format
2020-09-02 09:16:51 +03:00
Karol Kosek
868057871a
search: fix 'following' query parameter
...
The parameter included the accounts that are following you (followers)
instead of those you are actually following.
Co-Authored-By: Haelwenn (lanodan) Monnier <contact@hacktivis.me>
2020-09-02 02:08:43 +02:00
Alexander Strizhakov
03d06062ab
don't fail on url fetch
2020-09-01 19:39:07 +03:00
Haelwenn (lanodan) Monnier
d872858046
Fix removing an account from a list
...
Mastodon (Frontend) changed a different method for deletes,
keeping old format as mastodon documentation is too loose
2020-09-01 12:49:32 +02:00
rinpatch
126461942b
User table: ensure bio is always a string
...
Gets rid of '|| ""' in multiple places and fixes #2067
2020-09-01 10:45:42 +03:00
Haelwenn (lanodan) Monnier
a142da3e4f
Add new Emoji Ecto.Type and fix emoji in Question
2020-09-01 08:34:57 +02:00
Haelwenn
9d63b2c9db
Merge branch 'chat-relation-constraints' into 'develop'
...
Chats: Add cascading delete on both referenced users.
See merge request pleroma/pleroma!2934
2020-08-31 20:55:05 +00:00
lain
0b621a834a
Chats: Add cascading delete on both referenced users.
...
Also remove the now-superfluous join in the chat controller,
which was only used to filter out these cases.
2020-08-31 16:48:17 +02:00
Mark Felder
3737f38432
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-30 11:28:45 -05:00
Maksim Pechnikov
f0fefc4f5c
marks notifications as read after mute
2020-08-28 18:17:44 +03:00
Haelwenn
6b01a09a08
Merge branch '2078-list-fixes' into 'develop'
...
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"
Closes #2070 and #2078
See merge request pleroma/pleroma!2923
2020-08-27 17:05:53 +00:00
lain
78939c1d16
ChatController: Don't die if the recipient is gone.
2020-08-27 12:13:18 +02:00
Mark Felder
2cfe2dc81b
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-26 16:37:57 -05:00
lain
cfc99fe05c
TimelineController: Keys are atoms now.
...
Closes #2078
Closes #2070
2020-08-26 15:37:30 +02:00
feld
fb33321fa2
Merge branch 'feature/1952-read-muted-notifications' into 'develop'
...
Automatically mark notifications about statuses from muted users and threads as read
Closes #1952
See merge request pleroma/pleroma!2893
2020-08-25 21:32:32 +00:00
Mark Felder
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
2020-08-25 11:57:23 -05:00
lain
112bec5225
Webfinger: Handle bogus ids better.
2020-08-25 17:35:59 +02:00
lain
c1d51944c7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads
2020-08-25 11:44:51 +02:00
feld
d39abd02ac
Merge branch 'relay-fix-admin-fe' into 'develop'
...
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
2020-08-24 17:03:18 +00:00
Maksim Pechnikov
14ec12ac95
added tests
2020-08-24 15:01:45 +03:00
Maksim Pechnikov
f5845ff033
upload emoji zip file
2020-08-22 10:42:02 +03:00
lain
e1c8c599ff
Merge branch 'features/validators-event' into 'develop'
...
Pipeline Ingestion: Event
See merge request pleroma/pleroma!2909
2020-08-21 16:10:30 +00:00
Alexander Strizhakov
1f8c32b773
adding actor type in user show
2020-08-21 10:38:56 +03:00
Haelwenn (lanodan) Monnier
36c125a071
Pipeline Ingestion: Event
2020-08-20 21:49:26 +02:00
lain
c1277be041
AudioHandlingTest: Make mock explicit
2020-08-19 14:36:42 +02:00
lain
9aae342e7a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2
2020-08-19 14:10:11 +02:00
Alexander Strizhakov
c68bcae362
fix for sometimes failing tests
2020-08-19 12:57:29 +03:00
Alexander Strizhakov
7dc275b69b
relay fix for admin-fe
2020-08-19 08:41:39 +03:00
Maksim Pechnikov
7794d7c694
added Pleroma.Web.PleromaAPI.EmojiFileController
2020-08-19 06:50:20 +03:00
Haelwenn (lanodan) Monnier
5316e231b0
Pipeline Ingestion: Audio (Part 2)
2020-08-19 00:06:31 +02:00
Haelwenn
3d5d8c05c9
Merge branch '2064-image-blanking' into 'develop'
...
Resolve "Make default image description blank"
Closes #2064
See merge request pleroma/pleroma!2899
2020-08-18 19:02:33 +00:00
Ivan Tashkinov
da116d81fb
[ #2497 ] Added video preview proxy. Switched from exexec to Port.
2020-08-18 18:23:27 +03:00
Ivan Tashkinov
27e7999a15
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
2020-08-18 18:02:09 +03:00
lain
f0a8d723bb
Transmogrifier Test: Extract audio tests.
2020-08-18 13:37:28 +02:00
lain
aabc26a573
Pleroma.Upload: Set default upload name / description based on config.
2020-08-18 13:21:30 +02:00
Alex Gleason
a0f5eb1a55
Test that `POST /api/pleroma/delete_account` purges the user
2020-08-18 00:24:28 -05:00
Alex Gleason
dcc8926ff1
Test purging a user with User.delete/1
2020-08-18 00:10:09 -05:00
Alex Gleason
c12c576ee2
Also purge bio and display name
2020-08-17 22:11:45 -05:00
Alex Gleason
d55faa2f8f
Purge a local user upon deletion, fixes #2062
2020-08-17 21:52:28 -05:00
lain
34b099fffa
Merge branch 'issue/1936' into 'develop'
...
[#1936 ] Ability to search for banned MediaProxy URLs 
See merge request pleroma/pleroma!2873
2020-08-17 13:05:20 +00:00
Sergey Suprunenko
25c69e271a
Make notifications about new statuses from muted threads read
2020-08-17 00:11:33 +02:00
Maksim Pechnikov
f6da12f45d
fix search media proxy urls
2020-08-16 06:54:48 +03:00
Ivan Tashkinov
60ac83a4c1
[ #2046 ] Added test for pleroma/restrict_unauthenticated defaults on private instance. Updated docs and changelog.
2020-08-15 18:30:20 +03:00
Sergey Suprunenko
0865f36965
Mark notifications about statuses from muted users as read automatically
2020-08-15 15:27:41 +02:00
Ivan Tashkinov
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
2020-08-14 20:55:45 +03:00
feld
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
2020-08-13 17:38:19 +00:00
Haelwenn
f99b8a25eb
Merge branch 'reject' into 'develop'
...
Move Accepts and Rejects to the Pipeline
See merge request pleroma/pleroma!2878
2020-08-13 16:04:43 +00:00
lain
5be25b3e38
Merge branch '1152-deletion' into 'develop'
...
User deletion issue exploration
See merge request pleroma/pleroma!2879
2020-08-13 09:06:33 +00:00
Maksim Pechnikov
56470647de
Merge branch 'develop' into issue/1936
2020-08-13 09:00:25 +03:00
Alexander Strizhakov
3ab83f837e
don't load pinned activities in due_expirations
2020-08-12 19:46:47 +03:00
feld
dfc56de167
Merge branch 'feature/update-welcome-setting-in-description' into 'develop'
...
Update :welcome settings in description.exs
Closes #2024
See merge request pleroma/pleroma!2843
2020-08-12 16:18:40 +00:00
lain
05ff666f99
AdminApiControllerTest: Add test that `deleted` users get deactivated.
2020-08-12 16:31:00 +02:00
lain
7224bf309e
Transmogrifier: Move Rejects to the Pipeline
2020-08-12 14:48:51 +02:00
lain
62f7cca9a1
Transmogrifier Tests: Extract rejections.
2020-08-12 13:39:54 +02:00
lain
bb92ad44a6
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject
2020-08-12 12:53:04 +02:00
lain
0589e9156a
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 17:49:24 +02:00
lain
f988d82e46
Transmogrifier: Handle accepts with the pipeline
2020-08-11 17:26:01 +02:00
lain
9dda13bfa1
Transmogrifier Test: Remove mastodon hack test.
2020-08-11 16:22:15 +02:00
lain
3f6d50111e
Linter fixes.
2020-08-11 16:07:42 +02:00
lain
da3f9b9988
Transmogrifier: Remove handling of orphaned accepts
...
This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older.
2020-08-11 15:41:19 +02:00
lain
8b1e8bec2f
AcceptValidation: Codify accept rules.
2020-08-11 15:32:52 +02:00
lain
f1a0c10b17
AcceptValidator: Add basic validator with tests.
2020-08-11 15:13:07 +02:00
Ivan Tashkinov
2def3cbf41
Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy
...
# Conflicts:
# config/config.exs
# mix.lock
2020-08-11 15:13:29 +03:00
lain
8f9fbc86c0
Transmogrifier: Small readability changes.
2020-08-11 14:02:09 +02:00
lain
54a6855ddf
Transmogrifier Tests: Extract Accept handling
2020-08-11 14:01:45 +02:00
lain
686002164a
Merge branch '204-fix' into 'develop'
...
Fix 500 errors when returning :no_content, fixes #2029
Closes #2029
See merge request pleroma/pleroma!2856
2020-08-11 09:18:56 +00:00
lain
9a9121805c
Apply 1 suggestion(s) to 1 file(s)
2020-08-11 09:08:27 +00:00
lain
677abbf0ee
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
2020-08-11 10:55:10 +02:00
lain
7e4932362b
SideEffects: Handle strange deletion case.
2020-08-11 10:54:38 +02:00
Maksim Pechnikov
345ac512e4
added paginate+search for admin/MediaProxy URLs
2020-08-11 10:30:13 +03:00
feld
78484fe0ef
Merge branch 'admin-active-filter' into 'develop'
...
Admin API: Filter out unapproved users when the `active` filter is on
Closes #2037
See merge request pleroma/pleroma!2872
2020-08-10 17:16:38 +00:00
Egor Kislitsyn
249f21dcbb
Admin API: Filter out unapproved users when the `active` filter is on
2020-08-10 18:27:39 +04:00
lain
5c4548d5e7
Revert "Merge branch 'issue/1023' into 'develop'"
...
This reverts merge request !2763
2020-08-10 13:05:13 +00:00
lain
66122a11b5
AccountController: Build the correct update activity.
...
Will fix federation issues.
2020-08-10 10:33:05 +02:00
lain
d0fc48ea67
Merge branch 'develop' into 'feat/floki-fast-html-2'
...
# Conflicts:
# config/config.exs
2020-08-09 10:53:58 +00:00
Egor Kislitsyn
e5557bf8ba
Add mix task to add expiration to all local statuses
2020-08-08 16:29:40 +04:00
Mark Felder
54e2af8293
Merge branch 'develop' into fix/ldap-auth-issues
2020-08-07 14:55:22 -05:00
Alex Gleason
673e8e3ac1
Force 204 responses to be empty, fixes #2029
2020-08-07 13:02:39 -05:00
lain
50d5bdfd31
Mix Task Frontend test: Expand.
2020-08-07 16:03:06 +02:00