limepotato/akkoma
1
0
Fork 0
Code Pull requests Activity
12018 commits 27 branches 107 tags 315 MiB
Commit graph

4577 commits

Author SHA1 Message Date
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
rinpatch
7e23a48d38 rel me test: fix HTML so broken browsers (and therefore 
lexbor) refuse to parse it like mochiweb does
 2020-08-07 16:45:33 +03:00
rinpatch
325c7c924b Make Floki use fast_html 2020-08-07 16:45:33 +03:00
lain
de00a4c0f1 Mix Task Frontend Test: Capture IO. 2020-08-07 15:27:41 +02:00
lain
d97b76104e Mix Task Frontend: Add tests. 2020-08-07 15:10:34 +02:00
lain
34cbe9f44a Merge branch 'features/poll-validation' into 'develop' 
Poll and votes pipeline ingestion

Closes #1362 and #1852

See merge request pleroma/pleroma!2635
 2020-08-07 10:44:06 +00:00
Maksim Pechnikov
8e90cc58e7 Merge branch 'develop' into feature/update-welcome-setting-in-description 2020-08-07 09:48:34 +03:00
Maksim Pechnikov
6e6276b4f8 added test 2020-08-07 09:47:05 +03:00
Ivan Tashkinov
56ddf20208 Removed unused alias. 2020-08-07 09:43:49 +03:00
Ivan Tashkinov
1298a2ea2c Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 
# Conflicts:
#	mix.lock
 2020-08-07 09:38:05 +03:00
lain
bf95dfb240 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads 2020-08-06 15:22:20 +02:00
lain
10b0e55acf Merge branch 'whole-word-filter-hotfix' into 'develop' 
Update filter_view.ex to return whole_word actual value

See merge request pleroma/pleroma!2851
 2020-08-06 08:35:39 +00:00
Mary Kate
f785dba09b changelog for filter whole_word fix 2020-08-05 15:41:35 -05:00
Mary Kate
d6ab9f2132 update test for whole_word in filter 2020-08-05 15:36:25 -05:00
Roman Chvanikov
4672b61106 Merge branch 'develop' into command-available-check 2020-08-05 19:16:48 +03:00
lain
7755f49e28 Merge branch 'migrate-legacy-tags' into 'develop' 
Migrate legacy tags set by AdminFE to match TagPolicy, #2010

See merge request pleroma/pleroma!2836
 2020-08-05 16:03:11 +00:00
lain
9c96fc052a CommonValidations: Extract modification right checker 2020-08-05 17:26:53 +02:00
lain
2173945f90 MailerTest: Give it some time. 2020-08-05 17:26:03 +02:00
Roman Chvanikov
8c57a299b4 Handle non-list keys in Config.fetch/1 2020-08-05 18:23:12 +03:00
Roman Chvanikov
2299bfe4c1 Merge branch 'develop' into refactor/config-get 2020-08-05 17:46:24 +03:00
Roman Chvanikov
97b5701449 Update clear_config macro 2020-08-05 17:46:14 +03:00
Mark Felder
0f9aecbca4 Remove fallback to local database when LDAP is unavailable. 
In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.
 2020-08-05 08:18:16 -05:00
Mark Felder
f7146583e5 Remove LDAP mail attribute as a requirement for registering an account 2020-08-05 08:15:57 -05:00
Roman Chvanikov
6f60ac9f41 Refactor config 2020-08-05 13:00:49 +03:00
lain
19c108170e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation 2020-08-05 11:12:14 +02:00
lain
474aba984f Merge branch 'unique-app-id' into 'develop' 
Add unique index for apps.client_id, fixes #2022

Closes #2022

See merge request pleroma/pleroma!2844
 2020-08-05 09:08:50 +00:00
rinpatch
b1b6a7dfa8 Merge branch 'deactivated-user-posts' into 'develop' 
Deactivated user posts

Closes #2011

See merge request pleroma/pleroma!2845
 2020-08-04 19:17:30 +00:00
Alex Gleason
184742af5e
Unique apps.client_id for new installations, fixes #2022 2020-08-04 13:31:40 -05:00
Egor Kislitsyn
91fbb5b21f
Fix ActivityExpirationPolicy 2020-08-04 18:26:37 +04:00
lain
878c7f3f30 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation 2020-08-04 15:28:41 +02:00
lain
532d6f94ae Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads 2020-08-04 15:10:36 +02:00
lain
36aa34a1a8 MastodonAPITest: Do the needful 2020-08-04 15:08:51 +02:00
Haelwenn (lanodan) Monnier
0f088d8ce3
question_validator: Allow content to be an empty-string (blank) 2020-08-04 14:29:16 +02:00
lain
1a00713744 CommonValidations: Treat deactivated users as not present. 2020-08-04 14:17:03 +02:00
lain
0cfadcf2ca TransmogrifierTest: Add test for deactivated users 2020-08-04 14:15:32 +02:00
lain
e92c040ad3 CommonAPITest: Add test that deactivated users can't post. 2020-08-04 14:08:12 +02:00
lain
953f71bcfa App Test: Make more resilient 2020-08-04 13:38:30 +02:00
Roman Chvanikov
56e9bf3393 Unify Config.get behaviour for atom/list key param 2020-08-04 14:35:47 +03:00
lain
28584bb224 Merge branch 'email-blacklist' into 'develop' 
Add email blacklist, fixes #1404

Closes #1404

See merge request pleroma/pleroma!2837
 2020-08-04 11:00:30 +00:00
Alex Gleason
4f57e85ab9
Email blacklist: Update phrasing again 2020-08-03 22:20:49 -05:00
Alex Gleason
058daf498f
Email blacklist: Update response phrasing 2020-08-03 19:57:53 -05:00
lain
e3953923ac Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop' 
fixes 1957 Add option to send user chatmessage instead of dm

Closes #1957

See merge request pleroma/pleroma!2782
 2020-08-03 21:01:56 +00:00
Ilja
cbf8bfc694 Improved WelcomeChatMessageTest 
* Checks if message is the same using ==/2 instead of =~/2
 2020-08-03 20:13:43 +02:00
lain
56b5b9aa27 Merge branch 'follower-mrf-again' into 'develop' 
Follower mrf again

See merge request pleroma/pleroma!2833
 2020-08-03 14:22:11 +00:00
lain
de3bdc63ad AccountControllerTest: Add test for message returned. 2020-08-03 15:00:14 +02:00
lain
5876d5123c Merge branch 'object-age-fix' into 'develop' 
MRF Object Age Policy: Don't break on messages without cc/to

See merge request pleroma/pleroma!2840
 2020-08-03 12:50:10 +00:00
lain
10c792110e MRF Object Age Policy: Don't break on messages without cc/to 2020-08-03 14:12:32 +02:00
Alex Gleason
f9301044ed
Add ReportNote test 2020-08-02 17:45:15 -05:00
Alex Gleason
77b48cb4ce
Factory: Add report_activity_factory 2020-08-02 16:36:55 -05:00
Alex Gleason
dc88b6f091
Add email blacklist, fixes #1404 2020-08-02 14:53:42 -05:00
Alex Gleason
c2c3dd4613
Migrate legacy tags set by AdminFE to match TagPolicy, #2010 2020-08-02 13:42:23 -05:00
Ilja
f671d7e68c Add welcome chatmessages 
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
 2020-08-02 15:54:59 +02:00
lain
4b18a07392 Revert "Merge branch 'revert-1ac0969c' into 'develop'" 
This reverts merge request !2825
 2020-07-31 15:18:04 +00:00
lain
010d77ec85 Revert "Merge branch 'mrf-silence-2' into 'develop'" 
This reverts merge request !2820
 2020-07-31 15:17:09 +00:00
lain
1ac0969c72 Merge branch 'mrf-silence-2' into 'develop' 
MRF silencing alternative solution

See merge request pleroma/pleroma!2820
 2020-07-31 14:43:33 +00:00
Haelwenn (lanodan) Monnier
ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation 2020-07-31 13:57:21 +02:00
Ivan Tashkinov
27b0a8b155 [#1985] Prevented force login on registration if account approval and/or email confirmation needed. 
Refactored login code in OAuthController, reused in AccountController. Added tests.
 2020-07-31 14:13:38 +03:00
lain
1dd162a5f7 SimplePolicy: Fix problem with DM leaks. 2020-07-31 09:57:30 +02:00
Haelwenn
d1cf1108ac Merge branch 'render-preview-cards-in-chats' into 'develop' 
Render preview cards in chats

See merge request pleroma/pleroma!2816
 2020-07-30 20:08:03 +00:00
Haelwenn
87fe31fb5c Merge branch '1993-confirm-users-on-registration' into 'develop' 
AccountController: Don't explicitly ask to keep users unconfirmed.

Closes #1993

See merge request pleroma/pleroma!2809
 2020-07-30 20:01:04 +00:00
lain
781b270863 ChatMessageReferenceView: Display preview cards. 2020-07-30 19:57:26 +02:00
lain
873ff5ce14 Merge branch 'hide-reactions' into 'develop' 
Let favourites and emoji reactions optionally be hidden

See merge request pleroma/pleroma!2804
 2020-07-30 12:41:47 +00:00
lain
e2e66e50d3 SimplePolicyTest: Add test for leaking DMs. 2020-07-30 14:29:00 +02:00
lain
d39b72c8fa Merge branch 'feature/captcha-expose-timeout' into 'develop' 
Expose seconds_valid in Pleroma Captcha API endpoint

Closes #1954

See merge request pleroma/pleroma!2812
 2020-07-30 08:41:46 +00:00
Maksim Pechnikov
cff7bb5cd4 Merge branch 'develop' into issue/1933-update-dependency 2020-07-30 08:52:13 +03:00
Mark Felder
33f0427809 Expose seconds_valid in Pleroma Captcha API endpoint 2020-07-29 16:07:22 -05:00
Alex Gleason
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence 2020-07-29 13:01:16 -05:00
Alex Gleason
93638935d7
SimpleMRF: :silence --> :followers_only 2020-07-29 12:58:08 -05:00
Alex Gleason
00d090004e
:show_reactions, refactor the other test 2020-07-29 12:50:11 -05:00
Alex Gleason
026a51cb27
:show_reactions, add CHANGELOG.md, refactor test 2020-07-29 12:45:32 -05:00
Alex Gleason
d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions 2020-07-29 12:43:39 -05:00
lain
dc36d6e9d2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin 2020-07-29 16:24:22 +02:00
lain
a6d3bb5f30 Merge branch 'issue/1023' into 'develop' 
[#1023] added generated  `pleroma.env`

See merge request pleroma/pleroma!2763
 2020-07-29 13:45:15 +00:00
lain
d9bf2c58df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration 2020-07-29 14:42:09 +02:00
Haelwenn
269b61a240 Merge branch '1996-dont-break-on-chatmessages' into 'develop' 
EnsureRePrepended: Don't break on chat messages.

Closes #1996

See merge request pleroma/pleroma!2808
 2020-07-29 12:20:04 +00:00
lain
de5c7e20a3 Merge branch 'bugfix/remote-user-atom' into 'develop' 
feed/user_controller: Return 404 when the user is remote

Closes #1911

See merge request pleroma/pleroma!2811
 2020-07-29 12:16:20 +00:00
Haelwenn (lanodan) Monnier
2e27847573
feed/user_controller: Return 404 when the user is remote 2020-07-29 14:02:02 +02:00
lain
79f9ddd8b7 Merge branch 'by-approval' into 'develop' 
Registrations "by approval" mode

Closes #1931

See merge request pleroma/pleroma!2757
 2020-07-29 11:27:26 +00:00
lain
6a25f72a75 FrontendStatic: Work correctly for other frontend types. 2020-07-29 13:02:48 +02:00
lain
c25c21dd22 AccountController: Don't explicitly ask to keep users unconfirmed. 
Confirmation is set in User.register_changeset based on the config
settings.
 2020-07-29 11:47:03 +02:00
lain
edf8b6abfe EnsureRePrepended: Don't break on chat messages. 2020-07-29 10:53:08 +02:00
Maksim Pechnikov
15b8446cdb updated dev & test packages 2020-07-29 06:47:56 +03:00
Alex Gleason
3c90f7f715
SimpleMRF: Let instances be silenced 2020-07-28 19:06:42 -05:00
Alex Gleason
3b7c454418
Let favourites and emoji reactions optionally be hidden 2020-07-28 14:58:30 -05:00
lain
ad5c42628a FrontendStatic: Add plug to serve frontends based on configuration. 2020-07-28 17:35:16 +02:00
Alex Gleason
f688c8df82
Fix User.registration_reason HTML sanitizing issues 2020-07-27 20:36:31 -05:00
Alex Gleason
f43518eb74
Lint, fix test 2020-07-27 19:22:31 -05:00
Alex Gleason
6f44a0ee84
Add configurable registration_reason limit 2020-07-27 15:13:34 -05:00
Alex Gleason
6747bf2e16
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-27 12:29:18 -05:00
lain
9e6f4694dd Pipeline: Unify embedded_object / object_data, move to validator. 2020-07-27 16:39:50 +02:00
lain
762c9ea564 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into embedded-object-federation 2020-07-27 16:19:45 +02:00
lain
2a3abfd326 Merge branch 'issue/1934-welcome-email' into 'develop' 
[#1934] welcome email

See merge request pleroma/pleroma!2786
 2020-07-27 12:34:36 +00:00
Alex Gleason
6931dbfa58
Merge remote-tracking branch 'upstream/develop' into by-approval 2020-07-26 15:46:14 -05:00
Maksim Pechnikov
643664d583 added migrate old settings to new 2020-07-25 09:16:43 +03:00
Lain Soykaf
1dd6de03ee CommonAPI Tests: Check that undoing objects federates them as embeds. 2020-07-24 14:54:13 +02:00
Lain Soykaf
3d13fb05f8 Side Effects: On undoing, put information about the undone object. 2020-07-24 14:40:22 +02:00
Lain Soykaf
91f3cf9bc6 Pipeline: Add embedded object federation. 2020-07-24 14:06:41 +02:00
feld
51627a10e5 Merge branch 'unblock-domain-via-query' into 'develop' 
Allow unblocking a domain via query params

Closes #1971

See merge request pleroma/pleroma!2783
 2020-07-23 20:06:11 +00:00
Mark Felder
4bfad0b483 Support blocking via query parameters as well and document the change. 2020-07-23 12:59:40 -05:00
Haelwenn
6100b90209 Merge branch '1976-status-view-fixes' into 'develop' 
StatusView: Handle badly formatted emoji reactions.

Closes #1976

See merge request pleroma/pleroma!2788
 2020-07-23 16:58:36 +00:00
Maksim Pechnikov
67ab9a7928 Merge branch 'develop' into issue/1934-welcome-email 2020-07-23 16:36:27 +03:00
lain
76aa49a0c5 Merge branch '1973-chats-fix-with-restrict-unauthenticated' into 'develop' 
[#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated setting

Closes #1973

See merge request pleroma/pleroma!2791
 2020-07-23 12:52:02 +00:00
Ivan Tashkinov
9ea51a6de5 [#2791] AccountView: renamed :force option to :skip_visibility_check. 2020-07-23 15:08:30 +03:00
lain
b2ba70eec4 Merge branch 'bugfix/mrf-reject-logging' into 'develop' 
Fix #783: Make MRF reject log as info level instead of error

Closes #783

See merge request pleroma/pleroma!2758
 2020-07-23 11:08:29 +00:00
lain
250e0369c7 Merge branch 'issue/1878' into 'develop' 
[#1878] fix reset confirmation email in admin section

See merge request pleroma/pleroma!2751
 2020-07-23 10:56:33 +00:00
lain
a81581472f Merge branch 'linkify' into 'develop' 
Fix Linkify

See merge request pleroma/pleroma!2792
 2020-07-23 10:28:52 +00:00
Maksim Pechnikov
7991ddad58 added warning to use old keys 2020-07-23 09:01:37 +03:00
Alex Gleason
b6488a4db4
Update linkify migration tests to use config from ConfigDB 2020-07-22 16:11:53 -05:00
Alex Gleason
c7a0016f9f
Migration to fix malformed Pleroma.Formatter config 2020-07-22 14:32:45 -05:00
Alex Gleason
b87a1f8eaf
Refactor require_migration/1 into a test helper function 2020-07-22 14:32:44 -05:00
Alex Gleason
67389b77af
Add AutolinkerToLinkify migration test 2020-07-22 14:32:24 -05:00
Ivan Tashkinov
6f5f7af607 [#1973] Fixed accounts rendering in GET /api/v1/pleroma/chats with truish :restrict_unauthenticated. 
Made `Pleroma.Web.MastodonAPI.AccountView.render("show.json", _)` demand :for or :force option in order to prevent incorrect rendering of empty map instead of expected user representation with truish :restrict_unauthenticated setting.
 2020-07-22 19:06:00 +03:00
lain
1c9752cff4 Merge branch 'fix/pleroma-api-emoji-packs' into 'develop' 
Fix /api/pleroma/emoji/packs index endpoint.

See merge request pleroma/pleroma!2777
 2020-07-22 15:09:32 +00:00
Lain Soykaf
0cb9e1da74 StatusView: Handle badly formatted emoji reactions. 2020-07-22 14:44:06 +02:00
Maksim Pechnikov
5879d36854 fix sender for welcome email 2020-07-22 15:34:47 +03:00
Maksim Pechnikov
8d6f7aec21 Merge branch 'develop' into issue/1023 2020-07-22 09:24:16 +03:00
Maksim Pechnikov
7cafb96c02 added tests 2020-07-22 08:58:06 +03:00
Mark Felder
109836306c Test that Emoji Packs can be listed when instance is not public 2020-07-21 17:27:13 -05:00
lain
5b1eeb06d8 Revert "Merge branch 'revert-2b5d9eb1' into 'develop'" 
This reverts merge request !2784
 2020-07-21 22:18:17 +00:00
lain
696c13ce54 Revert "Merge branch 'linkify' into 'develop'" 
This reverts merge request !2677
 2020-07-21 22:17:34 +00:00
lain
2b5d9eb105 Merge branch 'linkify' into 'develop' 
AutoLinker --> Linkify, update to latest version

See merge request pleroma/pleroma!2677
 2020-07-21 19:35:43 +00:00
lain
fa2421dd7e Merge branch 'gopher-fix' into 'develop' 
Gopher: using atom keys in search params

See merge request pleroma/pleroma!2775
 2020-07-21 19:31:03 +00:00
Ivan Tashkinov
b8021016eb [#2497] Resolved merge conflicts. 2020-07-21 20:03:14 +03:00
Egor Kislitsyn
bdb3375933
Allow unblocking a domain via query params 2020-07-21 16:06:46 +04:00
Alexander Strizhakov
6afc6717d6
copy tmp file if test depends on it 2020-07-21 10:31:58 +03:00
Maksim Pechnikov
3edaecae96 added welcome email 2020-07-21 09:25:53 +03:00
Ivan Tashkinov
bdf57b8ef4 Merge remote-tracking branch 'remotes/origin/develop' into 2168-media-preview-proxy 
# Conflicts:
#	config/config.exs
#	lib/pleroma/web/media_proxy/media_proxy.ex
#	mix.lock
#	test/web/media_proxy/media_proxy_test.exs
 2020-07-19 20:05:37 +03:00
Alex Gleason
ae74c52e22
Test angry face in formatter D:< #1968 2020-07-18 15:26:23 -05:00
Alex Gleason
48f8b26c92
OpenAPI: Add :id to follower/following endpoints, fixes #1958 2020-07-17 12:35:28 -05:00
Alex Gleason
15f8921b11
Test that unapproved users can never log in regardless of admin settings 2020-07-17 12:26:52 -05:00
Alex Gleason
5756843736
Fully delete users with status :approval_pending 2020-07-17 12:19:41 -05:00