feld
6adad96c79
Merge branch 'issue/2256' into 'develop'
...
[#2256 ] added subject actor to moderation log
See merge request pleroma/pleroma!3164
2020-12-04 17:49:05 +00:00
9dfda37821
More compact representation
2020-12-04 11:37:49 -06:00
3bf5c5b015
Ensure deleting entire group prints out settings that will be removed before actually removing them
2020-12-04 11:30:48 -06:00
696d39c3dc
Fix deleting an entire group. Also utilize Pleroma.ConfigDB.delete/1
2020-12-04 11:19:58 -06:00
685e5c8509
Use Pleroma.ConfigDB.delete/1 instead of rolling our own
2020-12-04 11:09:13 -06:00
4aad066091
Use Enum.any? to ensure we return true if there are results
2020-12-04 11:04:53 -06:00
1d04bd0894
Merge branch 'supported-emojos' into 'develop'
...
Update Emoji support to unicode 13.1, support all RGI emoji.
See merge request pleroma/pleroma!3186
2020-12-03 18:29:42 +00:00
a02eb88396
config_db search methods
2020-12-03 19:34:23 +03:00
7fd4f4908b
dump_key/2 no longer used
2020-12-03 10:03:44 -06:00
feld
60c4ac0f70
Apply 6 suggestion(s) to 1 file(s)
2020-12-03 16:03:14 +00:00
95e908e4e2
Credo
2020-12-03 09:58:24 -06:00
fa0d0b602f
Emoji: Also accept regional indicators
2020-12-03 16:17:39 +01:00
16bdc2bcd0
Make the --force flag for reset command consistent with the others and deduplicate db truncation
2020-12-02 16:34:23 -06:00
e379ab8277
Add --force flag for delete and reset commands
...
Bunch of reorganization and consolidation
2020-12-02 16:24:32 -06:00
20a911f9f7
Add comment for this mysterious behavior
2020-12-02 14:25:07 -06:00
25fab7da69
No need for a separate functions here
2020-12-02 14:20:11 -06:00
13947999ad
Use a callback strategy to short circuit the functions and print a nice error
2020-12-02 12:33:34 -06:00
a7b5280b5b
Centralize check that configdb is enabled which now raises an exception
2020-12-02 10:43:22 -06:00
53a5ec1952
Left public during debugging
2020-12-02 10:43:22 -06:00
5135a8189f
Use inspect instead of faking the output
2020-12-02 10:43:22 -06:00
6334ba9ad3
Remove unnecessary keys command
2020-12-02 10:43:22 -06:00
d0cb73527f
Ensure scary warning starts on a new line
2020-12-02 10:43:22 -06:00
0847e3e496
Print whole config when resetting and include a scary looking message.
2020-12-02 10:43:22 -06:00
d4320e0daf
Both are really atoms
2020-12-02 10:43:22 -06:00
4bdfcf1682
Transform strings to atoms for all cases, including when the atom is a module like Pleroma.Emails.Mailer
2020-12-02 10:43:22 -06:00
3df115b2b0
Support atoms and strings as args to the mix task
...
Improve output. Show the user what will be deleted before the prompt.
2020-12-02 10:43:22 -06:00
ae7d37de06
Fix deletion regression due to strings instead of atoms
...
Improve message after successful deletion
2020-12-02 10:43:22 -06:00
c6a0ca2213
Improve dumping groups and specific keys; add prompts for delete and reset
2020-12-02 10:43:22 -06:00
67437feafc
Support listing groups, listing keys in a group, and dumping the config based on group or specific key in that group
2020-12-02 10:43:22 -06:00
a51da3c1d8
Sort output by group
...
Not the best sorting, but better than nothing.
2020-12-02 10:43:22 -06:00
ada073f251
Rename keys to groups
2020-12-02 10:43:22 -06:00
e8a4062d9d
Document how to delete individual configuration groups and completely reset the config without SQL
2020-12-02 10:43:22 -06:00
a82ba66662
Better deletion message
2020-12-02 10:43:22 -06:00
6dcc36baa9
Add mix tasks to give additional recovery and debugging options
...
- pleroma.config dump: prints the entire config as it would be exported to the filesystem
- pleroma.config dump KEY: prints the configuration under a specific ConfigDB key in the database
- pleroma.config keylist: lists the available keys in ConfigDB
- pleroma.config keydel KEY: deletes ConfigDB entry stored under the key
This should prevent the need for users to manually execute SQL queries.
2020-12-02 10:43:22 -06:00
8fb259e739
Emoji: Only accept RGI emoji.
...
"recommended for general interchange"
2020-12-02 16:46:19 +01:00
c9afb350e7
Document follow relationship updates and cleanup
2020-12-02 19:16:36 +04:00
b6f5e9ac9c
Emoji: Remove unused emoji-data.txt
2020-12-02 16:15:31 +01:00
1adee08321
Emoji: Update to Unicode 13.1, switch base file, allow multichar.
2020-12-02 16:15:03 +01:00
04af0bbe44
User: Remove left-over (wrong) fix.
2020-12-02 13:39:29 +01:00
222312900e
User: Don't allow local users in remote changesets
2020-12-02 12:18:43 +01:00
35ba48494f
Stream follow updates
2020-12-02 00:18:58 +04:00
d50a3345ae
[ #3112 ] Allowed revoking same-user token from any apps. Added tests.
2020-11-30 21:55:48 +03:00
50e47a215f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-28 21:51:27 +03:00
f1b07a2b2b
OAuth form user remembering feature. Local MastoFE login / logout fixes.
2020-11-28 21:51:06 +03:00
6aadb1cb40
digest algorithm is taken from header
2020-11-27 08:10:52 +03:00
fb72f2034a
fix spec
2020-11-25 22:44:27 +03:00
751712d970
Prevent mix tasks from spewing any internal logging unless DEBUG is in the env
...
e.g., DEBUG=1 mix pleroma.config migrate_from_db
2020-11-25 12:52:39 -06:00
62993db499
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-25 21:48:18 +03:00
12a5981cc3
Session token setting on token exchange. Auth-related refactoring.
2020-11-25 21:47:23 +03:00
5eef4988bf
fix for elixir 1.11
...
load runtime configs in releases with config provider
2020-11-25 14:10:24 +03:00
67b15cc033
Search: Save detected pg version in a persistent term.
2020-11-23 15:29:55 +01:00
f9a4cf2097
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
2020-11-23 15:18:19 +01:00
489b12cde4
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-21 19:47:46 +03:00
ccc2cf0e87
Session-based OAuth auth fixes (token expiration check), refactoring, tweaks.
2020-11-21 19:47:25 +03:00
30ed7b502f
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-11-21 10:23:53 -06:00
feld
ecd1ef8cb5
Merge branch 'fix/2302-report-duplicates' into 'develop'
...
Fix for forwarded reports
Closes #2303 and #2302
See merge request pleroma/pleroma!3146
2020-11-20 18:40:15 +00:00
e4289792d2
Linting.
2020-11-20 16:38:05 +01:00
9a1e5f5d48
Search: Change search method based on detected pg version
2020-11-20 16:26:43 +01:00
a407e33c78
Application: Save postgres version in the environment
2020-11-20 16:26:22 +01:00
0a5b22bc3b
start limiters in mix tasks
2020-11-20 11:37:01 +03:00
feld
79a509ee61
Merge branch '2301-users-search-discoverability-fix' into 'develop'
...
[#2301 ] Proper handling of User.is_discoverable
Closes #2301
See merge request pleroma/pleroma!3162
2020-11-19 20:33:52 +00:00
feld
cd1b4155d5
Merge branch 'oban-jobs-to-simple-tasks' into 'develop'
...
Moving some background jobs into simple tasks
Closes #1790
See merge request pleroma/pleroma!3129
2020-11-19 20:32:32 +00:00
66f411fba0
added subject actor to moderation log
2020-11-19 22:13:45 +03:00
b27d8f7437
Merge remote-tracking branch 'remotes/origin/develop' into 2301-users-search-discoverability-fix
...
# Conflicts:
# CHANGELOG.md
2020-11-19 19:35:44 +03:00
5e04f4156c
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into websearch
2020-11-19 17:32:57 +01:00
e164c37139
[ #2301 ] Proper handling of `User.is_discoverable`: users appear in in-service search but are hidden from external services like search bots.
2020-11-19 19:30:02 +03:00
c8d11c3064
Merge branch '2317-old-reset-tokens' into 'develop'
...
Resolve "Don't allow old password reset tokens"
Closes #2317
See merge request pleroma/pleroma!3160
2020-11-19 16:22:14 +00:00
8b90d62506
Search: Only skip ordering the rum index.
2020-11-19 16:29:31 +01:00
a60242464e
Search: Add option to search with the websearch function
2020-11-19 16:12:01 +01:00
fcad3e716a
[ #2301 ] Quick fix: users with is_discoverable == false (default!) are included in search results.
2020-11-19 18:08:22 +03:00
46dab37351
little fix
2020-11-19 15:29:26 +03:00
5e2ba57327
Activity search: Fix order of results
...
Greatly speeds up the search for RUM.
2020-11-19 13:20:58 +01:00
11e0d5f9ac
Password Resets: Don't accept tokens above a certain age.
...
By default, one day
2020-11-19 12:27:06 +01:00
8a8c154b4e
test fixes
2020-11-19 09:58:32 +03:00
be0b874e1d
fix for mastodon forwarded reports
2020-11-19 09:53:14 +03:00
e2bf6b1f7e
fix for forwarded reports
2020-11-19 09:53:13 +03:00
6669ac5bf7
Merge branch 'develop' into 'hide-muted-reactions'
...
# Conflicts:
# CHANGELOG.md
2020-11-18 20:22:40 +00:00
feld
a1056aace1
Merge branch 'fix/mix-task-user-delete_activities' into 'develop'
...
Fix mix pleroma.user delete_activities task
See merge request pleroma/pleroma!3156
2020-11-18 18:57:47 +00:00
aae669d05e
Merge branch 'fix/webpush-and-emojireact' into 'develop'
...
Push notifications: add pleroma:emoji_reaction, improve tests
Closes #2185
See merge request pleroma/pleroma!3141
2020-11-18 18:33:48 +00:00
6b32e1de23
Merge branch 'frontend-admin-api' into 'develop'
...
Add an API to manage frontends
Closes #2238
See merge request pleroma/pleroma!3108
2020-11-18 17:51:57 +00:00
9c5d1cb9ed
fix tests
2020-11-18 09:58:51 +03:00
25eb222bed
Apply 1 suggestion(s) to 1 file(s)
2020-11-18 05:19:01 +00:00
ccddedb504
Credo
2020-11-17 20:33:30 +00:00
499faa82f6
Synchronize reaction notification text with PleromaFE's style
2020-11-17 20:22:24 +00:00
5d0bc5e028
Support both pleroma:chat_mention and pleroma:emoji_reaction for /api/v1/push/subscription
2020-11-17 20:21:48 +00:00
67a6abd071
Update OpenAPI spec/schema and test to verify support for pleroma:emoji_reaction subscriptions
2020-11-17 20:20:00 +00:00
83ec2f1384
Allow subscribing for pleroma:emoji_reaction push notifications
2020-11-17 20:20:00 +00:00
3ce11b830e
Add capability for emoji reaction push notifications
2020-11-17 20:20:00 +00:00
bb9650f3c2
FrontendController: Return error on installation error.
2020-11-17 16:43:07 +01:00
97201f7e37
Need to start web_resp cache or mix task fails
2020-11-17 15:15:53 +00:00
feld
d33b9e7b33
Merge branch 'remove/fedsockets' into 'develop'
...
Remove FedSockets
See merge request pleroma/pleroma!3155
2020-11-17 14:58:33 +00:00
f69fe36ebf
Merge branch 'develop' into frontend-admin-api
2020-11-17 18:34:04 +04:00
79d2d3f609
Merge branch 'develop' into hide-muted-reactions
2020-11-17 18:29:52 +04:00
2c55f7d7cb
Remove FedSockets
...
Current FedSocket implementation has a bunch of problems. It doesn't
have proper error handling (in case of an error the server just doesn't
respond until the connection is closed, while the client doesn't match
any error messages and just assumes there has been an error after 15s)
and the code is full of bad descisions (see: fetch registry which uses
uuids for no reason and waits for a response by recursively querying a
ets table until the value changes, or double JSON encoding).
Sometime ago I almost completed rewriting fedsockets from scrach to
adress these issues. However, while doing so, I realized that fedsockets
are just too overkill for what they were trying to accomplish, which is
reduce the overhead of federation by not signing every message.
This could be done without reimplementing failure states and endpoint
logic we already have with HTTP by, for example, using TLS cert auth,
or switching to a more performant signature algorithm. I opened
https://git.pleroma.social/pleroma/pleroma/-/issues/2262 for further
discussion on alternatives to fedsockets.
From discussions I had with other Pleroma developers it seems like they
would approve the descision to remove them as well,
therefore I am submitting this patch.
2020-11-17 17:28:30 +03:00
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-17 15:01:38 +01:00
81293e5aad
ActivityPubController: Don't return local only objects
2020-11-17 13:11:39 +01:00
b1466661eb
Use absolute URLs to thumbnail and background in /api/v1/instance
2020-11-16 21:29:15 +00:00
e4b202d905
added test
2020-11-16 22:23:28 +03:00
fb41bd1a85
Hide reactions from muted and blocked users
2020-11-16 22:50:14 +04:00
e1d25bad0c
fix tests
2020-11-16 21:45:37 +03:00
9546c1444c
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-11-14 19:48:47 -06:00
28da36975d
Merge branch 'bugfix/instance-gen_exiftool' into 'develop'
...
pleroma.instance: Fix Exiftool module name
See merge request pleroma/pleroma!3143
2020-11-14 21:43:07 +00:00
e2f573d68b
pleroma.instance: Fix Exiftool module name
2020-11-14 22:31:01 +01:00
36ec604521
added test
2020-11-14 08:30:22 +03:00
0d149502fe
Merge branch 'fixes_2034_reports_should_send_a_notification_to_admins' into 'develop'
...
fixes 2034 Make notifs view work for reports
Closes #2034
See merge request pleroma/pleroma!2912
2020-11-13 13:35:47 +00:00
70e4b86250
Make notifs view work for reports
...
* These are the first small steps for issue 2034 "Reports should send a notification to admins".
* I added a new type of notification "pleroma:report" to the the database manually (a migration will need to be written later)
* I added the new type to the notification_controller
* I made the view return the notification. It doesn't include the report itself (yet)
2020-11-13 13:35:46 +00:00
1830b6aae5
added error messages for posix error code
2020-11-13 15:21:59 +03:00
6ca709816f
Fix object spoofing vulnerability in attachments
...
Validate the content-type of the response when fetching an object,
according to https://www.w3.org/TR/activitypub/#x3-2-retrieving-objects .
content-type headers had to be added to many mocks in order to support
this, some of this was done with a regex. While I did go over the
resulting files to check I didn't modify anything unrelated, there is a
possibility I missed something.
Closes pleroma#1948
2020-11-12 15:25:33 +03:00
99bc175f02
Merge branch 'title-injection-change' into 'develop'
...
Title injection change
See merge request pleroma/pleroma!3132
2020-11-12 08:50:26 +00:00
2156de2fee
Ingest blurhash field during transmogrification
2020-11-11 13:39:02 -06:00
2254e5e595
Render blurhashes in Mastodon API
2020-11-11 12:51:13 -06:00
6fd72e9e85
Ingest blurhash for attachments if they were federated
2020-11-11 12:27:51 -06:00
d26a449396
Change endpoint path
2020-11-11 20:39:57 +04:00
435bf1f945
Remove FrontendInstallerWorker
2020-11-11 20:12:35 +04:00
631def2df2
RedirectController: Don't replace title, but inject into the meta
2020-11-11 17:10:59 +01:00
08cbd655d1
Merge branch 'develop' into frontend-admin-api
2020-11-11 19:53:40 +04:00
8da9f919f8
little changes for MRF config descriptions
...
- log level reduction, if policy doesn't implement config_description method
- docs in dev.md
2020-11-11 18:49:15 +03:00
af3f00292c
Fix formatting
2020-11-11 19:12:46 +04:00
0118ccb53c
Add `local` visibility
2020-11-11 18:54:01 +04:00
feld
3cd7ea693f
Merge branch 'feature/2222-config-descriptions-for-custom-modules' into 'develop'
...
Config descriptions for custom MRF policies
Closes #2222
See merge request pleroma/pleroma!3128
2020-11-11 13:48:03 +00:00
8d218ebaf5
Moving some background jobs into simple tasks
...
- fetching activity data
- attachment prefetching
- using limiter to prevent overload
2020-11-11 13:39:49 +03:00
f97f24b067
making credo happy and test fix
2020-11-11 10:48:03 +03:00
efc27f6464
fix for adminFE
...
- revert UserAllowPolicy description
- MRF descriptions order
2020-11-11 10:10:57 +03:00
485697d96c
config descriptions for custom MRF policies
2020-11-10 19:20:14 +03:00
88f6b61a5e
Merge branch '2260-wrong-report-link' into 'develop'
...
Resolve "Wrong user link in Report email"
Closes #2260
See merge request pleroma/pleroma!3121
2020-11-10 11:04:19 +00:00
d77fd6b3d0
Merge branch 'fix/html-title-load' into 'develop'
...
Fix title on load of Pleroma HTML, fixes #2281
Closes #2281
See merge request pleroma/pleroma!3125
2020-11-10 10:05:15 +00:00
0c68b9ac13
escaping summary and other fields in xml templates
2020-11-10 10:46:57 +03:00
e4a21084f0
Fix title on load of Pleroma HTML
2020-11-08 16:16:20 -07:00
cc45c69fff
Remove release_env
...
While taking a final look at instance.gen before releasing I noticed
that the release_env task outputs messages in broken english. Upon
further inspection it seems to have even more severe issues which, in
my opinion, warrant it's at least temporary removal:
- We do not explain what it actually does, anywhere. Neither the task
docs nor instance.gen, nor installation instructions.
- It does not respect FHS on OTP releases (uses /opt/pleroma/config even
though we store the config in /etc/pleroma/config.exs).
- It doesn't work on OTP releases, which is the main reason it exists.
Neither systemd nor openrc service files for OTP include it.
- It is not mentioned in install guides other than the ones for Debian
and OTP releases.
2020-11-08 11:56:09 +03:00
294628d981
Merge branch 'feature/expire-mutes' into 'develop'
...
Expiring mutes for users and activities
Closes #1817
See merge request pleroma/pleroma!2971
2020-11-05 12:44:16 +00:00
6d850c46dc
AdminEmail: Use AP id as user url.
2020-11-04 17:12:47 +01:00
7bbc328d66
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into stats-genserver-fix
2020-11-04 16:52:30 +01:00
dd2b3a8da9
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/expire-mutes
2020-11-04 16:51:42 +01:00
4800ee656b
Merge branch 'features/federation-status' into 'develop'
...
Add a federation_status endpoint showing unreachable instances
See merge request pleroma/pleroma!3086
2020-11-04 15:00:52 +00:00
5db4c823b2
Merge branch 'restrict-domain' into 'develop'
...
View a remote server's timeline
See merge request pleroma/pleroma!2713
2020-11-04 14:54:53 +00:00
73e66fd31f
Merge remote-tracking branch 'remotes/origin/develop' into auth-improvements
2020-11-04 17:48:10 +03:00
9c09ea01aa
Merge branch '2284-voters-count' into 'develop'
...
Always return voters_count in polls
See merge request pleroma/pleroma!3120
2020-11-04 14:44:45 +00:00
504a829edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/federation-status
2020-11-04 15:38:10 +01:00
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
2020-11-04 15:05:01 +01:00
bc4d9c4ffc
Merge branch 'hide-muted-chats' into 'develop'
...
Hide chats from muted users
Closes #2230
See merge request pleroma/pleroma!3116
2020-11-04 13:48:15 +00:00
ca95cbe0b4
Add `with_muted` param to ChatController.index/2
2020-11-04 16:40:12 +04:00
e46c95b826
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-admin-api
2020-11-04 13:23:18 +01:00
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-04 11:47:41 +01:00
92d252f364
Poll Schema: Update and fix.
2020-11-04 10:20:09 +01:00
1cfc3278c0
Poll View: Always return `voters_count`.
2020-11-04 10:14:00 +01:00
c37118e6f2
Conversations: A few refactors
2020-11-03 13:56:12 +01:00
91f6c32430
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into a1batross/pleroma-patch-4
2020-11-03 13:45:09 +01:00
7efc074ead
Permit fetching individual reports with notes preloaded
2020-11-02 13:06:59 -06:00
be52819a11
Hide chats from muted users
2020-11-02 17:51:54 +04:00
24ce324973
Merge branch 'bugfix/poll_replies_count' into 'develop'
...
side_effects: Don’t increase_replies_count when it’s an Answer
Closes #2274
See merge request pleroma/pleroma!3114
2020-11-02 12:08:20 +00:00
6163fbf553
Merge branch 'develop' into 'frontend-admin-api'
...
# Conflicts:
# lib/pleroma/web/router.ex
2020-11-02 10:43:45 +00:00
4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
2020-11-02 05:56:17 +01:00
feld
9fbe9ef774
Merge branch 'tesla-get-to-pleroma' into 'develop'
...
Use Pleroma.HTTP instead of Tesla
Closes #2275
See merge request pleroma/pleroma!3113
2020-11-01 19:31:17 +00:00
8f00d90f91
Use Pleroma.HTTP instead of Tesla
...
Closes #2275
As discovered in the issue, captcha used Tesla.get instead of
Pleroma.HTTP. I've also grep'ed the repo and changed the other place
where this was used.
2020-11-01 12:05:39 +03:00
feld
38b481d112
Merge branch 'feature/account-export' into 'develop'
...
Add account export
Closes #847
See merge request pleroma/pleroma!2918
2020-10-31 17:03:40 +00:00
04f6b48ac1
Auth subsystem refactoring and tweaks.
...
Added proper OAuth skipping for SessionAuthenticationPlug. Integrated LegacyAuthenticationPlug into AuthenticationPlug. Adjusted tests & docs.
2020-10-31 13:38:35 +03:00
8e41baff40
Add idempotency_key to the chat_message entity.
2020-10-31 05:50:59 +03:00
d1698267a2
Fix credo warning
2020-10-31 00:26:11 +04:00
d2113428c0
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-30 19:34:02 +04:00
d63ec02f31
ConversationView: fix formatting
2020-10-30 13:59:53 +01:00
9b93eef715
ConversationView: fix last_status.account being empty, fix current user being included in group conversations
2020-10-30 13:59:53 +01:00
241bd061fc
ConversationView: add current user to conversations, according to Mastodon behaviour
2020-10-30 12:58:51 +01:00
1cc8e94506
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-30 11:18:55 +00:00
131f3219e6
Merge branch 'issue/2069' into 'develop'
...
[#2069 ] unread_conversation_count
See merge request pleroma/pleroma!2939
2020-10-29 23:39:15 +00:00
feld
1cce1bd729
Merge branch 'issue/2137-user-filters-admin-fe' into 'develop'
...
[#2137 ] admin/users filters
See merge request pleroma/pleroma!3016
2020-10-29 21:06:15 +00:00
d83c2bd330
Add support for install via `file` and `build_url` params
2020-10-29 16:37:50 +04:00
fa902867c0
Merge remote-tracking branch 'origin/develop' into mutes-blocks-pagination
2020-10-29 15:35:42 +04:00
8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
2020-10-29 14:51:23 +04:00
9f5f7dc9f9
Fixed User.is_discoverable attribute rendering in Admin API User view.
2020-10-28 22:29:52 +03:00
da4a1e57b1
@doc fix.
2020-10-28 19:09:38 +03:00
ba50dc05a8
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# CHANGELOG.md
2020-10-28 19:03:40 +03:00
d2b140a525
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2261
2020-10-28 08:48:26 -05:00
4a2d7a7a5d
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-28 15:33:36 +04:00
feld
1204aaa2e3
Merge branch 'feature/autofollowing' into 'develop'
...
autofollowing_nicknames
See merge request pleroma/pleroma!3087
2020-10-27 22:55:31 +00:00
d8d4bd15d0
Merge branch '2236-no-name' into 'develop'
...
Resolve "Account cannot be fetched by some instances"
Closes #2236
See merge request pleroma/pleroma!3101
2020-10-27 22:44:31 +00:00
feld
03a318af9a
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 22:13:50 +00:00
d28f72a55a
FrontStatic plug: excluded invalid url
2020-10-27 22:59:27 +03:00
1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 18:59:19 +00:00
291189357b
Merge branch 'develop' into feature/account-export
2020-10-27 12:54:33 -05:00
9e54ef086b
Merge branch 'develop' into feature/account-export
2020-10-27 12:51:31 -05:00
feld
5aff479951
Merge branch '1668-prometheus-access-restrictions' into 'develop'
...
[#1668 ] App metrics endpoint (Prometheus) access restrictions
Closes #1668
See merge request pleroma/pleroma!3093
2020-10-27 17:47:56 +00:00
feld
e062329a17
Merge branch 'develop' into 'feature/autofollowing'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 17:42:24 +00:00
03e306785b
Add an API endpoint to install a new frontend
2020-10-27 19:20:21 +04:00
de6d49c8ce
ActivityPub: Add back debug call + explanation.
2020-10-26 16:33:26 +01:00
9542c5d0f4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
2020-10-26 16:30:48 +01:00
073ad7e6d9
Merge branch 'docs/ap_c2s' into 'develop'
...
AP C2S: Document our additional endpoints
See merge request pleroma/pleroma!3056
2020-10-26 02:09:20 +00:00
df61071422
Merge branch '2242-nsfw-case' into 'develop'
...
Resolve "Posts tagged with #NSFW from GS aren't marked as sensitive"
Closes #2242
See merge request pleroma/pleroma!3094
2020-10-23 19:39:42 +00:00
60e379ce0b
User: Correctly handle whitespace names.
2020-10-23 13:53:01 +02:00
feld
d6907e6e0c
Merge branch 'chore/elixir-1.11' into 'develop'
...
Elixir 1.11 compatibility / Phoenix 1.5+
See merge request pleroma/pleroma!3059
2020-10-22 20:33:52 +00:00
8a68673eed
[ #3059 ] Formatting fix.
2020-10-22 14:07:33 +03:00
8a55de1d78
[ #3059 ] Fixed Phoenix 1.5 telemetry processing.
2020-10-22 13:54:15 +03:00
8d251096fe
SideEffects: Correctly handle chat messages sent to yourself
2020-10-22 12:22:08 +02:00
ef627b9391
fix module name
2020-10-22 12:04:23 +03:00
44e5a57d1a
admin api: added user filters by `actor_types`
2020-10-22 11:53:28 +03:00
60663150b5
admin user search: added filter by `actor_type`
2020-10-22 11:53:28 +03:00
46b420aa60
need_confirmed -> unconfirmed
2020-10-22 11:50:49 +03:00
cf4f393794
added AdminApi.UserController
2020-10-22 11:50:49 +03:00
9ef46ce410
added 'unconfirmed' filter to admin/users
2020-10-22 11:50:49 +03:00
2ca98f2d94
Apply 1 suggestion(s) to 1 file(s)
2020-10-21 19:40:37 +00:00
034ac43f3a
Fix credo warnings
2020-10-20 17:47:04 +04:00
e87901c424
Merge remote-tracking branch 'origin/develop' into feature/account-export
2020-10-20 17:27:29 +04:00
ad605e3e16
Rename `Pleroma.Backup` to `Pleroma.User.Backup`
2020-10-20 17:16:58 +04:00
e97b254c6b
Transmogrifier: Refactor and unify incoming tag handling
2020-10-19 15:46:24 +02:00
39fd4d7639
Transmogrifier: Downcase incoming Hashtags
...
Also, set sensitive to true if we have an nsfw hashtag present.
2020-10-19 15:40:50 +02:00
98f32cf820
Fix tests
2020-10-19 17:19:45 +04:00
76c4e80e5a
Merge branch 'develop' into mutes-blocks-pagination
2020-10-19 15:40:03 +04:00
18a91d85e5
Merge branch 'develop' into feature/local-only-scope
2020-10-19 15:31:56 +04:00
0495a07dc7
Merge branch '2239-mute-fixes' into 'develop'
...
ActivityPub: Show own replies to muted users.
Closes #2239
See merge request pleroma/pleroma!3084
2020-10-19 04:26:35 +00:00
524fb0e4c2
[ #1668 ] Restricted access to app metrics endpoint by default. Added ability to configure IP whitelist for this endpoint.
...
Added tests and documentation.
2020-10-18 21:22:21 +03:00
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
2020-10-17 17:53:47 +03:00
d54233760f
[ #3053 ] Post-merge fix.
2020-10-17 13:33:57 +03:00
049ece1ef3
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
...
# Conflicts:
# lib/pleroma/web/feed/user_controller.ex
# lib/pleroma/web/o_status/o_status_controller.ex
# lib/pleroma/web/router.ex
# lib/pleroma/web/static_fe/static_fe_controller.ex
2020-10-17 13:12:39 +03:00
Mark Felder
1b8fd7e65a
Adds feature to permit e.g., local admins and community moderators to automatically follow all newly registered accounts
2020-10-16 17:36:02 +00:00
aafdc975bd
federation_status: Add ApiSpec
2020-10-16 01:14:15 +02:00
3b5a7a6b14
federation_status: New endpoint showing unreachable instances
2020-10-16 01:14:04 +02:00
fb056ce05b
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-15 16:39:01 -05:00
724e4b7f00
Apply 1 suggestion(s) to 1 file(s)
2020-10-15 21:03:48 +00:00
2030ffd490
fix test
2020-10-15 22:31:52 +03:00
cf53e300f8
added generate the release env to `pleroma.instance gen`
2020-10-15 22:31:00 +03:00
e2333f757a
Apply 1 suggestion(s) to 1 file(s)
2020-10-15 22:29:28 +03:00
499df7b73a
Apply 1 suggestion(s) to 1 file(s)
2020-10-15 22:29:18 +03:00
14054cd004
update task messages
2020-10-15 22:28:49 +03:00
20e68b30f0
added generated `pleroma.env`
2020-10-15 22:28:26 +03:00
2a475622ee
Add Pleroma.Constants.as_local_public/0
2020-10-15 19:07:00 +04:00
4f79bbbc31
Add local-only statuses
2020-10-15 18:37:44 +04:00
3985c1b450
Fix warnings
2020-10-15 16:54:59 +04:00
7a2f100061
ActivityPub: Show own replies to muted users.
...
Aligns mute with block behavior.
2020-10-15 12:28:25 +02:00
1fb9452131
Merge branch 'develop' into feature/account-export
2020-10-14 15:27:15 -05:00
feld
77bca41595
Apply 3 suggestion(s) to 3 file(s)
2020-10-14 19:33:54 +00:00
83770b7b39
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-14 12:33:24 -05:00
feld
2013705690
Merge branch 'feature/gen-magic' into 'develop'
...
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
2020-10-14 17:31:45 +00:00
9a85ec0da0
Merge branch 'refactor/locked_user_field' into 'develop'
...
Change user.locked field to user.is_locked
See merge request pleroma/pleroma!3077
2020-10-14 16:17:32 +00:00
ed61002815
Undo API breaking changes
2020-10-14 11:03:17 -05:00
b001237b79
Finish undoing API breakage
2020-10-14 10:44:18 -05:00
3242cfef20
Undo API breaking changes
2020-10-14 09:54:07 -05:00
dc38dc8472
Replace User.toggle_confirmation/1 with User.confirm/1, fixes #2235
2020-10-13 22:01:27 -05:00
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-10-13 19:26:04 -05:00
7d8f610720
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-13 19:25:18 -05:00
c3112fd13a
Merge remote-tracking branch 'upstream/develop' into registration-workflow
2020-10-13 19:20:00 -05:00
6734abcbd4
Add pagination for Mutes
2020-10-13 21:58:18 +04:00
f5d8af1db1
Move Consistency.FileLocation to ./test
...
This fixes a compilation fail because of Credo's absence in MIX_ENV=prod
2020-10-13 19:57:45 +02:00
33f4f39b1c
Add pagination for Blocks
2020-10-13 21:39:41 +04:00
b738f70953
Merge branch 'develop' into feature/gen-magic
2020-10-13 10:08:38 -05:00
64553ebae2
Merge branch 'develop' into chore/elixir-1.11
2020-10-13 09:54:53 -05:00
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
2020-10-13 09:54:29 -05:00
4ead0d564f
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-13 09:54:11 -05:00
8bacdc3680
Change user.discoverable field to user.is_discoverable
2020-10-13 09:45:08 -05:00
9968b7efed
Change user.locked field to user.is_locked
2020-10-13 09:31:13 -05:00
4c4ea9a348
changes after rebase
2020-10-13 17:10:34 +03:00
3cb9c88837
migration and warning for RemoteIp plug rename
2020-10-13 16:44:04 +03:00
5f2071c458
changes after rebase
2020-10-13 16:44:03 +03:00
7f5dbb0201
changes after rebase
2020-10-13 16:44:03 +03:00
b081080dd9
fixes after rebase
2020-10-13 16:44:02 +03:00
c4c5caedd8
changes after rebase
2020-10-13 16:44:02 +03:00
1d0e130cb3
fixes after rebase
2020-10-13 16:44:02 +03:00
0f8ab46a0e
fix after rebase
2020-10-13 16:44:00 +03:00
207211a2b3
update files consistency after rebase
2020-10-13 16:44:00 +03:00
3c8c540707
copyright
2020-10-13 16:43:59 +03:00
b6eb7997f5
special namespaces for phoenix and api_spec
2020-10-13 16:43:59 +03:00
9f4fe5485b
alias alphabetically order
2020-10-13 16:43:59 +03:00
3ef4e9d170
AdminSecretAuthenticationPlug module name
2020-10-13 16:43:58 +03:00
c497558d43
AuthenticationPlug module name
2020-10-13 16:43:58 +03:00
c1777e7479
BasicAuthDecoderPlug module name
2020-10-13 16:43:58 +03:00
970932689f
DigestPlug rename
2020-10-13 16:43:57 +03:00
66e0b0065b
Cache plug module name
2020-10-13 16:43:57 +03:00
c6baa811d6
EnsureAuthenticatedPlug module name
2020-10-13 16:43:57 +03:00
011525a3d1
EnsurePublicOrAuthenticatedPlug module name
2020-10-13 16:43:57 +03:00
8e301a4c37
EnsureUserKeyPlug module name
2020-10-13 16:43:56 +03:00
d6cb1a3b46
ExpectAuthenticatedCheckPlug module name
2020-10-13 16:43:56 +03:00
99e4ed21b1
ExpectPublicOrAuthenticatedCheckPlug module name
2020-10-13 16:43:56 +03:00
8c993c5f63
FederatingPlug module name
2020-10-13 16:43:55 +03:00
abc3c7689b
HTTPSecurityPlug module name and filename
2020-10-13 16:43:55 +03:00
5cd7030076
IdempotencyPlug module name
2020-10-13 16:43:55 +03:00
8dfaa54ffc
InstanceStatic module name
2020-10-13 16:43:55 +03:00
e2332d92ce
LegacyAuthenticationPlug module name
2020-10-13 16:43:54 +03:00
96d320bdfe
OAuthPlug module name
2020-10-13 16:43:54 +03:00
a6d8cef33e
OAuthScopesPlug module name
2020-10-13 16:43:54 +03:00
15772fda57
PlugHelper module name
2020-10-13 16:43:53 +03:00
4b1863ca4e
RateLimiter module name
2020-10-13 16:43:53 +03:00
3be8ab5103
RemoteIp module name
2020-10-13 16:43:50 +03:00
4b4c0eef36
SessionAuthenticationPlug module name
2020-10-13 16:42:53 +03:00
8249b75761
SetFormatPlug module name
2020-10-13 16:42:53 +03:00
c97c7d982f
SetLocalePlug module name
2020-10-13 16:42:52 +03:00
f7614d4718
SetUserSessionIdPlug module name
2020-10-13 16:42:52 +03:00
d36c9e210a
StaticFEPlug module name
2020-10-13 16:42:52 +03:00
a07688deb1
TrailingFormatPlug module name
2020-10-13 16:42:51 +03:00
a5987155f7
UploadedMedia module name
2020-10-13 16:42:51 +03:00
ebd6dd7c53
UserEnabledPlug module name
2020-10-13 16:42:51 +03:00
61c609884c
UserFetcherPlug module name
2020-10-13 16:42:51 +03:00
1d16cd0c3d
UserIsAdminPlug module name
2020-10-13 16:42:50 +03:00
2125286e90
fix for fallback controller
2020-10-13 16:42:50 +03:00
e267991a44
renaming LimiterSupervisor
2020-10-13 16:42:48 +03:00
6a87f94ee2
renaming ratelimiter supervisor
2020-10-13 16:38:48 +03:00
2501793f81
moving plugs into web dir
2020-10-13 16:38:19 +03:00
0374df1d12
other files consistency
2020-10-13 16:38:19 +03:00
fc7151a9c4
more files renamings
2020-10-13 16:38:19 +03:00
e8e4034c48
metadata providers consistency
2020-10-13 16:38:18 +03:00
b5b4395e4a
oauth consistency
2020-10-13 16:38:18 +03:00
103f3dcb9e
rich media parser ttl files consistency
2020-10-13 16:38:15 +03:00
6bf85440b3
mix tasks consistency
2020-10-13 16:33:24 +03:00
b573711e9c
file locations consistency
2020-10-13 16:33:24 +03:00
83ae45b000
Preload `/api/pleroma/frontend_configurations`, fixes #1932
2020-10-12 18:49:37 -05:00
66e00ace7c
Refactor User.post_register_action/1 emails
2020-10-12 17:21:08 -05:00
cb29769a22
Make User.confirm/1 and User.approve/1 idempotent
2020-10-12 16:42:59 -05:00
6ebec50df6
Refactor User.confirm/1, add more tests
2020-10-12 16:32:34 -05:00
feld
03855f9789
Merge branch 'improve/instance-gen' into 'develop'
...
#2159 Support enabling upload filters during instance gen
See merge request pleroma/pleroma!3070
2020-10-12 17:24:24 +00:00
8539e386c3
Add missing Copyright headers
2020-10-12 12:00:50 -05:00
6c61ef14c3
Support enabling upload filters during instance gen
2020-10-12 11:19:48 -05:00
bb8c0614ef
Move admin approval email logic into User.post_register_action/1
2020-10-11 21:46:10 -05:00
521e965884
Registration tests
2020-10-11 21:38:01 -05:00
28005563f0
Send approval pending email during registration
2020-10-11 20:50:09 -05:00
c69b205409
Registration: user state is separate from instance state
2020-10-11 19:25:34 -05:00
b2fed59209
Handle User.post_register_action/1 in steps
2020-10-11 18:52:35 -05:00
2498e569f1
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-11 22:34:48 +03:00
89c595b772
[ #3053 ] Removed target accessibility checks for OStatus endpoints delegating to RedirectController. Added tests.
2020-10-11 22:34:28 +03:00
e1eb54d389
[ #3053 ] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).
2020-10-11 13:37:19 +03:00
3ca98878d2
Deep link to the user account in AdminFE in account confirmation emails
2020-10-09 17:08:05 -05:00
04b514c567
Merge branch 'develop' into feature/gen-magic
2020-10-09 11:26:10 -05:00
9c672ecbb5
Remote Timeline: add Streaming support
2020-10-08 20:07:03 -05:00
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
2020-10-08 17:24:09 -05:00
5ec7d88b77
Aliases: fix URL regex
2020-10-08 16:33:47 -05:00
77b1ea68a7
Merge remote-tracking branch 'upstream/develop' into aliases
2020-10-08 15:44:48 -05:00
74be4de3f6
Merge branch 'fix/2209-remoteip' into 'develop'
...
#2209 RemoteIP CIDR helper, config and doc improvements
See merge request pleroma/pleroma!3057
2020-10-08 17:29:00 +00:00
ed6511a086
Lint
2020-10-07 15:28:29 -05:00
822e4472f3
Fix incorrect use of connect/1
...
Hint from Phoenix 1.4.17, which has a connect/7 shim:
lib/phoenix/socket/transport.ex:
def connect(endpoint, handler, _transport_name, transport, serializers, params, _pid \\ self()) do
IO.warn "Phoenix.Socket.Transport.connect/7 is deprecated"
handler.connect(%{
endpoint: endpoint,
transport: transport,
options: [serializer: serializers],
params: params
})
end
2020-10-07 15:06:16 -05:00
feld
d0eca5b125
Apply 2 suggestion(s) to 2 file(s)
2020-10-07 19:16:53 +00:00
8156940a49
Compatibility with phoenix_pubsub 2.0.0
2020-10-07 13:28:39 -05:00
70880d54f8
@env is not used
2020-10-07 12:55:16 -05:00
42e78a08b2
Fix rendering of reports
2020-10-07 12:30:55 -05:00
8caa6cf91d
Transport.connect/7 is deprecated
2020-10-07 11:47:10 -05:00
feld
6d1666a080
Apply 1 suggestion(s) to 1 file(s)
2020-10-07 16:44:52 +00:00
218a3e61e1
Fix incompatible types warning (Elixir 1.11)
2020-10-07 10:04:25 -05:00
d3106c69c8
Fix incompatible type (Elixir 1.11)
2020-10-07 10:02:20 -05:00
636c00037d
Fix duplicate @doc entries
2020-10-07 09:58:45 -05:00
bc3db72403
Use ModerationLog instead of Logger
2020-10-07 18:35:29 +04:00
8545d533dd
Use to_string/1 instead of :binary.list_to_bin/1
2020-10-07 18:35:29 +04:00
08972dd135
Use Path.join/2
2020-10-07 18:35:29 +04:00
9af9f02f4b
Use Gettext for error messages
2020-10-07 18:35:28 +04:00
d7a5291b4f
Use `Jason.encode/1` for likes and bookmarks
2020-10-07 18:35:28 +04:00
8baee855d9
Fix emails
2020-10-07 18:35:27 +04:00
e4792ce76a
Do not limit admins
2020-10-07 18:35:27 +04:00
17562bf414
Move API endpoints to `/api/v1/pleroma/backups`
2020-10-07 18:35:27 +04:00
a9efd441e2
Use `Pleroma.Repo.chunk_stream/2` instead of `Pleroma.RepoStreamer.chunk_stream/2`
2020-10-07 18:35:27 +04:00
e50314d9d3
Fix export
2020-10-07 18:35:26 +04:00
7c22c9afb4
Allow admins request user backups
2020-10-07 18:34:31 +04:00
7fdd81d000
Add "Your backup is ready" email
2020-10-07 18:34:30 +04:00
e52dd62e14
Add configurable temporary directory
2020-10-07 18:34:30 +04:00
27bc121ec0
Require email
2020-10-07 18:34:30 +04:00
cd13613db3
Fix query
2020-10-07 18:34:30 +04:00
86ce4afd93
Improve backup urls
2020-10-07 18:34:29 +04:00
2c73bfe122
Add API endpoints for Backups
2020-10-07 18:34:29 +04:00
739cb1463b
Add backups deletion
2020-10-07 18:34:29 +04:00
3ad7492f9d
Add config for Pleroma.Backup
2020-10-07 18:34:29 +04:00
a0ad9bd734
Add BackupWorker
2020-10-07 18:34:28 +04:00
4f3a633745
Add `backups` table
2020-10-07 18:34:28 +04:00
75e07ba206
Fix tests
2020-10-07 18:34:28 +04:00
be42ab70dc
Add backup upload
2020-10-07 18:34:28 +04:00
c01a818048
Add tests
2020-10-07 18:34:27 +04:00
9d564ffc29
Zip exported files
2020-10-07 18:34:27 +04:00
257e059e61
Add account export
2020-10-07 18:34:27 +04:00
7a2ed2fc90
Credo
2020-10-06 17:26:31 -05:00
d43d05005a
Move hardcoded default configuration into config.exs
2020-10-06 17:02:46 -05:00
cddca85c84
Merge branch 'develop' into revert/rich-media-censorship
2020-10-06 14:25:20 -05:00
2698bbc9f6
Merge branch 'filtering-following' into 'develop'
...
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
2020-10-06 18:11:34 +00:00
6c2264af24
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
2020-10-05 23:50:08 +03:00
094edde7c4
[ #3053 ] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
2020-10-05 23:48:00 +03:00
f497eb034d
activity_pub_controller.ex: Remove unused @doc block
...
[ci skip]
2020-10-05 21:11:00 +02:00
346cc3ac24
Merge branch 'develop' into feature/1893-remote-emoji-packs-pagination
2020-10-05 12:40:53 -05:00
35ee759e74
Add helper function to convert single IPs into CIDR format if they were not provided that way
2020-10-05 11:49:56 -05:00
9e96c9ae48
Merge branch 'fix/empty-params-openapi' into 'develop'
...
OpenAPI CastAndValidate: filter out empty params
Closes #2198
See merge request pleroma/pleroma!3047
2020-10-03 12:35:49 +00:00
f6024252ae
[ #3053 ] No auth check in StaticFEController, even on non-federating instances. Adjusted tests.
2020-10-02 22:18:02 +03:00
0d575735bf
No auth check in UserController.feed_redirect/2, even on non-federating instances.
2020-10-01 21:41:22 +03:00
7efadc3cbd
No auth check in OStatusController, even on non-federating instances.
2020-10-01 21:34:45 +03:00
cbdaabad34
web push http_client fix
2020-10-01 13:32:11 +03:00
2566467782
Merge branch '2201-i-hate-this' into 'develop'
...
User search: Once again, change uri handling.
Closes #2201
See merge request pleroma/pleroma!3048
2020-09-30 13:37:46 +00:00
90fee49c52
User search: Once again, change uri handling.
...
They can indeed be non-unique.
2020-09-30 14:14:41 +02:00
006b62fd12
OpenAPI CastAndValidate: filter out empty params
...
Closes #2198
2020-09-29 21:52:16 +03:00
b3a9ba09ec
More robust expires_at timestamp processing
2020-09-29 12:27:47 -05:00
2a11068a11
Merge branch 'ffmpeg-imagemagick-dependencies-documentation' into 'develop'
...
`ffmpeg` / `ImageMagick` handling as optional dependencies
See merge request pleroma/pleroma!3031
2020-09-29 14:48:30 +00:00
7d5c3883ac
[ #3031 ] Refactoring: moved system commands checks to ApplicationRequirements.
2020-09-29 16:28:06 +03:00
ba7f9459b4
Revert Rich Media censorship for sensitive statuses
...
The #NSFW hashtag test was broken anyway.
2020-09-28 18:22:59 -05:00
de993b856b
added `force` option to the unfollow operation
2020-09-28 09:16:42 +03:00
4e4f771082
Adjusted MediaProxyControllerTest to gracefully fail on missing dependencies. Installation docs update.
...
Added ffmpeg/imagemagick checks to launch checks (if media preview proxy is enabled). Added documentation on installing optional media / graphics packages (imagemagick, ffmpeg, exiftool).
2020-09-26 19:32:16 +03:00
dcdf75fbac
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 11:45:51 -05:00
feld
1672d8b37c
Merge branch 'feature/bulk-confirmation' into 'develop'
...
Bulk account confirmation actions
Closes #2085
See merge request pleroma/pleroma!2975
2020-09-25 16:15:01 +00:00
2bf2c68dee
Merge branch 'develop' into fix/deprecation-warning-welcome-message
2020-09-25 10:48:01 -05:00
8b84ca4901
Simplify the value comparison
2020-09-25 10:37:59 -05:00
5cd71208d9
Merge branch 'search-even-more' into 'develop'
...
More user search improvements
See merge request pleroma/pleroma!3032
2020-09-25 12:56:21 +00:00
f67c967c4a
Merge branch 'features/incoming-create-exists' into 'develop'
...
transmogrifier: Drop incoming create early if it already exists
See merge request pleroma/pleroma!3026
2020-09-25 12:44:33 +00:00
05b5241314
Linter fixes
2020-09-25 09:12:48 +02:00
a8c17ea25a
User Search: Also find user by uri
2020-09-25 08:46:14 +02:00
81faf540b3
Add some user feedback
2020-09-24 18:35:20 -05:00
e33360fdb9
Cannot use batches with User.try_send_confirmation_email/1
2020-09-24 18:23:47 -05:00
935ef21b02
Use the import
2020-09-24 16:47:34 -05:00
d0078bc404
User Search: Boost resolved results and exact ap_id matches.
2020-09-24 15:54:55 +02:00
5d7ec00bed
fixes after rebase
2020-09-24 09:42:30 +03:00
8c6ec4c111
pack routes change
2020-09-24 09:16:14 +03:00
dbbc801667
pagination for remote emoji packs
2020-09-24 09:12:39 +03:00
9b6d89ff8c
support for special chars in pack name
2020-09-24 09:12:37 +03:00
8af8eb5ce7
Chase Pleroma.RepoStreamer.chunk_stream -> Pleroma.Repo.chunk_stream
2020-09-23 12:32:47 -05:00
f3a1f9c3bb
Merge branch 'develop' into feature/bulk-confirmation
2020-09-23 11:56:22 -05:00
e02101e15c
Merge branch 'issue/2115' into 'develop'
...
[#2115 ] added paginate links to headers for /chats/:id/messages
See merge request pleroma/pleroma!2981
2020-09-23 12:09:38 +00:00
4dadb7c433
Merge branch 'user-query/filter-out-internal' into 'develop'
...
Filter out internal users by default
Closes #2147
See merge request pleroma/pleroma!3024
2020-09-23 11:51:04 +00:00
436d1a3c41
Merge branch 'develop' into 'issue/2115'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 11:49:19 +00:00
5e86a2809e
transmogrifier: Drop incoming create early if it already exists
2020-09-23 13:40:45 +02:00
8f5589cf66
Merge develop
2020-09-23 13:56:50 +03:00
a6c14041c4
Merge branch 'develop' into 'issue/1975'
...
# Conflicts:
# CHANGELOG.md
2020-09-23 09:16:00 +00:00
72d2b34d3b
Merge branch 'develop' into issue/1975
2020-09-22 21:42:10 +03:00
3104367931
Merge remote-tracking branch 'upstream/develop' into email-fix-develop
2020-09-22 13:37:02 -05:00
e2dcf039d2
Fix gun_pool_options deprecation warning message
2020-09-22 11:15:40 -05:00
2fc3b46ee7
Remove deprecation warning. We were supposed to remove backwards compat for this in 2.1.
2020-09-22 11:13:36 -05:00
c95859e45b
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into issue/2115
2020-09-22 17:13:46 +02:00
0e0ece251a
Filter out internal users by default
2020-09-22 16:56:11 +04:00
ee3052a2d8
ActivityPub: Return Announces when filtering by `following`.
2020-09-22 14:20:19 +02:00
e5927e92a6
Fix deprecation warning for welcome message
2020-09-21 17:08:49 -05:00
feld
a5c34e3123
Merge branch 'fix/fedsocket-useragent' into 'develop'
...
Minor Fedsocket improvements
See merge request pleroma/pleroma!3012
2020-09-21 21:06:32 +00:00
23d5d7cf59
Fix #2172 HTTP error on password reset
2020-09-21 14:09:26 -05:00
8b6ac45f3c
Allow emails to be sent again, #2101 #2172
...
https://github.com/swoosh/swoosh/issues/478#issuecomment-642393707
2020-09-21 13:28:02 -05:00
59680f27ff
Merge branch 'bugfix/federator-actor-error' into 'develop'
...
federator: normalize only actor, catch actor error
See merge request pleroma/pleroma!2986
2020-09-21 17:24:14 +00:00
9108e27c2f
Merge branch '2074-streaming-api-oauth-scopes-validation' into 'develop'
...
[#2074 ] OAuth scope checking in Streaming API
Closes #2074
See merge request pleroma/pleroma!3013
2020-09-21 17:15:54 +00:00
b36b6259d8
Merge branch 'issue/2099' into 'develop'
...
[#2099 ] Import/export mutes [BE]
See merge request pleroma/pleroma!2965
2020-09-21 16:25:17 +00:00
8afdbcdb1c
Force HTTP for fedsockets
2020-09-21 10:13:41 -05:00
f2f0a0260f
ActivityPub: Don't block-filter your own posts
...
We are filtering out replies to people you block, but that should
not include your own posts.
2020-09-21 16:08:38 +02:00
28d0986f83
Refactor mutes removing in CommonAPI and User
2020-09-20 20:58:17 +03:00
4987ee6256
Merge branch 'develop' into feature/expire-mutes
2020-09-20 19:27:27 +03:00
60b025b782
[ #2074 ] OAuth scope checking in Streaming API.
2020-09-19 19:16:55 +03:00
4b12e071ac
OpenAPI: make it possible to generate a spec without starting the app
...
Needed for api docs generation on pleroma.social that will come later
2020-09-19 16:26:15 +03:00
51116b5392
OpenAPI: fix various errors pointed out by editor.swagger.io
2020-09-19 16:26:15 +03:00
26859c549c
Add user agent to fedsocket requests
2020-09-19 07:26:46 -05:00
ed3bc53fa1
Merge branch 'develop' into issue/2099
2020-09-18 22:13:05 +03:00
feld
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
2020-09-18 18:38:20 +00:00
26c571df33
FedSockets: fix log spam on cached rejects
2020-09-18 16:09:37 +03:00
f2ef9735c5
Federate data through persistent websocket connections
2020-09-18 11:58:22 +00:00
2ec0dcf001
Merge branch 'develop' into issue/2099
2020-09-18 07:08:37 +03:00
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
2020-09-17 22:22:59 +03:00
7bf269fe83
Fix MRF reject for ChatMessage
2020-09-17 22:07:54 +03:00
abf25e5d52
Create MRF.filter_pipeline to inject :object_data when present
2020-09-17 22:07:54 +03:00
3a0f99ed35
KeywordPolicy: Still match when fields are absent
2020-09-17 22:07:54 +03:00
beefc022dd
Merge branch 'omit-nondiscoverable-from-search' into 'develop'
...
User search should respect discoverable flag
See merge request pleroma/pleroma!2997
2020-09-17 17:59:38 +00:00
feld
608824b97e
Merge branch 'instance-docs' into 'develop'
...
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
Closes #1516
See merge request pleroma/pleroma!2931
2020-09-17 16:54:53 +00:00
6bbd65fb09
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
...
[#2130 ] Fixed OAuth OOB authentication for users with enabled MFA
Closes #2130
See merge request pleroma/pleroma!2979
2020-09-17 19:51:54 +03:00
608017b7df
Merge branch 'fix/streaming-termination-errors' into 'develop'
...
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
2020-09-17 19:50:51 +03:00
0465bdbd49
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
...
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
2020-09-17 19:50:23 +03:00
bb70b231d0
Merge branch 'reply-visibility-user-guard' into 'develop'
...
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
See merge request pleroma/pleroma!2999
2020-09-17 19:49:08 +03:00
22d49993d9
Merge branch 'bugfix/mrf-ingestion' into 'develop'
...
Bugfix: MRF and Pipeline Ingestion
See merge request pleroma/secteam/pleroma!15
2020-09-17 19:48:33 +03:00
41939e3175
User search respect discoverable flag
2020-09-17 12:15:50 -04:00
eff7f9892d
Merge branch 'hotfix/rich-media-compile-error' into 'develop'
...
RichMedia: fix a compilation error due to nonexistent variable
See merge request pleroma/pleroma!2996
2020-09-17 19:06:10 +03:00
dee4639dbb
Merge branch 'feat/rich-media-head' into 'develop'
...
RichMedia: Do a HEAD request to check content type/length
See merge request pleroma/pleroma!2995
2020-09-17 19:04:50 +03:00
f7e40f7ef1
Deny ConfigDB migration when deprecated settings found
2020-09-17 09:32:50 -05:00
2a7c9ac147
Merge branch 'nondiscoverable-user-metadata' into 'develop'
...
search indexing metadata should respect discoverable flag
See merge request pleroma/pleroma!2998
2020-09-17 14:20:03 +00:00
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-17 17:14:20 +03:00
7cdbd91d83
[ #2497 ] Configurability of :min_content_length (preview proxy). Refactoring, documentation, tests.
2020-09-17 17:13:40 +03:00
7c60789ba5
Merge branch 'develop' into 'nondiscoverable-user-metadata'
...
# Conflicts:
# CHANGELOG.md
2020-09-17 14:09:01 +00:00
db80b9d630
RichMedia: Fix log spam on failures and resetting TTL on cached errors
2020-09-17 16:56:39 +03:00
c711a2b157
Return the file content for `GET /api/pleroma/admin/instance_document/:document_name`
2020-09-17 16:55:53 +03:00
582ad5d4e1
AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API
2020-09-17 16:48:07 +03:00
44e8b6037a
Merge branch 'develop' into feature/expire-mutes
2020-09-17 14:54:00 +03:00
7a73850928
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation
2020-09-17 13:26:04 +02:00
5a8ea0a5b0
small refactoring
2020-09-17 09:13:43 +03:00
b867f9d7ae
Merge branch 'develop' into issue/2099
2020-09-17 08:41:35 +03:00
a781f41f96
[ #2497 ] Media preview proxy: misc. improvements (`static` param support, dynamic fifo pipe path), refactoring.
2020-09-16 22:30:42 +03:00
3a9baa9d0d
Merge branch '2144-empty-users' into 'develop'
...
User: Remote users don't need to be confirmed or approved
Closes #2144
See merge request pleroma/pleroma!3003
2020-09-16 15:47:07 +00:00
7a88b726bf
User: Remote users don't need to be confirmed or approved
2020-09-16 17:29:16 +02:00
a4f80e1e74
Merge branch 'feat/connection-worker-monitor-flush' into 'develop'
...
ConnectionPool Worker: use monitor flush instead of checking ref
See merge request pleroma/pleroma!3002
2020-09-16 15:10:20 +00:00
adb1b0282d
ConnectionPool Worker: use monitor flush instead of checking ref
...
`:flush` removes the DOWN message if one had arrived, so this check
should no longer be necessary.
2020-09-16 17:29:07 +03:00
eca8d26784
Merge branch 'chores/mrf-loglevel' into 'develop'
...
Fetcher: Correctly return MRF reject reason
See merge request pleroma/pleroma!2990
2020-09-16 13:37:04 +00:00
adbd0032fa
Merge branch 'features/validators-video' into 'develop'
...
Pipeline Ingestion: Video and Article
See merge request pleroma/pleroma!2908
2020-09-16 13:36:27 +00:00
6b088ed76a
Merge branch 'issue/2089' into 'develop'
...
[#2089 ] fix notifications
See merge request pleroma/pleroma!3000
2020-09-16 12:22:48 +00:00
599f8bb152
RepoStreamer.chunk_stream -> Repo.chunk_stream
2020-09-16 09:47:18 +03:00
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-15 20:29:39 +03:00
3ab59a6f3c
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
2020-09-15 13:00:56 +03:00
5c4ff5c73c
Merge branch 'fix/mrf-simple-welcome-chats' into 'develop'
...
Ensure we only apply media_nsfw simple policy on parsable objects
Closes #2133
See merge request pleroma/pleroma!2992
2020-09-15 08:25:10 +00:00
709723182d
Ensure SimplePolicy's tags in string representation don't trip up the object validator
2020-09-14 17:06:42 -05:00
38b2db297b
search indexing metadata respects discoverable flag
2020-09-14 13:18:11 -04:00
bb407edce4
RichMedia: fix a compilation error due to nonexistent variable
...
No idea why this passed Gitlab CI
2020-09-14 15:46:00 +03:00
f70335002d
RichMedia: Do a HEAD request to check content type/length
...
This shouldn't be too expensive, since the connections are pooled,
but it should save us some bandwidth since we won't fetch non-html
files and files that are too large for us to process (especially
since you can't cancel a request without closing the connection
with HTTP1).
2020-09-14 14:45:58 +03:00
f66a15c4a5
RichMedia parser: do not set a cache TTL for unchanging errors
2020-09-14 14:44:25 +03:00
3e53ab4e98
added notification constraints
2020-09-14 14:08:12 +03:00
489a107cf4
Apply 1 suggestion(s) to 1 file(s)
2020-09-13 11:54:15 +00:00
c5830ac037
Merge develop
2020-09-13 12:24:57 +03:00
527afb813a
Remove unused require
2020-09-13 12:23:45 +03:00
cd234a5321
[ #2497 ] Media preview proxy: preview bypass for small images
...
(basing on Content-Length and Content-Type).
2020-09-12 11:20:41 +03:00
32831f371f
[ #2497 ] Media preview proxy: redirecting to media proxy url in case of preview error or unsupported content type.
2020-09-12 10:33:42 +03:00
c0b36621f1
Ensure we only apply NSFW Simple policy on parsable objects
2020-09-11 23:22:14 -05:00
9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation
2020-09-11 14:13:38 -05:00
e229536e5c
Chat Moderation: use explicit `sender` and `recipient` fields
2020-09-11 14:11:00 -05:00
02d70228b5
AdminAPI: fix delete chat message
2020-09-11 14:10:35 -05:00
9dd0b23da4
AdminAPI: show chat
2020-09-11 14:10:28 -05:00
f13b52a703
AdminAPI: list messages in a chat
2020-09-11 14:10:19 -05:00
c41430b23e
Refactor with Chat.for_user_query/1
2020-09-11 14:10:13 -05:00
fb0de07343
AdminAPI: list chats for a user
2020-09-11 14:10:05 -05:00
b40a627ab0
AdminAPI: delete a chat message
2020-09-11 14:09:58 -05:00
f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1
2020-09-11 14:09:50 -05:00
f1f44069ae
Fetcher: Correctly return MRF reject reason
2020-09-11 20:00:41 +02:00
0bda85857e
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
...
# Conflicts:
# lib/pleroma/instances/instance.ex
2020-09-11 17:19:58 +03:00
89a7efab69
ConnectionPool: Log possible HTTP1 blocks
2020-09-11 15:37:39 +03:00
36c9197ac3
Apply 1 suggestion(s) to 1 file(s)
2020-09-11 10:46:16 +00:00
dbc013f24c
instance: Handle not getting a favicon
2020-09-11 11:37:46 +02:00
f18178cb09
AttachmentValidator: directly embed url schema and pass it fix_media_type
2020-09-11 01:40:20 +02:00
1b3d5956b1
Pipeline Ingestion: Article
2020-09-11 01:40:20 +02:00
2132b24a9d
object_validators: likes & announcements as [ObjectID]
2020-09-11 01:39:39 +02:00
846b59ccb0
Pipeline Ingestion: Video
2020-09-11 01:39:39 +02:00
b73e9ef686
transmogrifier: Call strip_internal_fields on pipeline ingestion
2020-09-11 01:39:38 +02:00
da876d09e8
federator: normalize only actor, catch actor error
2020-09-11 00:56:21 +02:00
55562ca936
Merge branch 'develop' into feature/gen-magic
2020-09-10 16:05:22 -05:00
4d18a50f3c
[ #2497 ] Formatting fix.
2020-09-10 21:54:26 +03:00
15aece7238
remove validate_expires_at from enqueue method
2020-09-10 21:52:31 +03:00
2c2094d4b2
configurable lifetime for ephemeral activities
2020-09-10 21:51:59 +03:00
f24828a3e8
oban warning
2020-09-10 21:51:30 +03:00
eb5ff715f7
pin/unpin for activities with expires_at option
2020-09-10 21:50:41 +03:00
b3485a6dbf
little clean up
2020-09-10 21:50:41 +03:00
357d971a10
expiration for new pipeline
2020-09-10 21:50:41 +03:00
93e1c8df9d
reject activity creation
...
if passed expires_at option and expiring activities are not configured
2020-09-10 21:50:41 +03:00
4981b5a1a3
copyright header
2020-09-10 21:50:41 +03:00
629a8de9cb
deprecation warning
...
changed namespace for activity expiration configuration
2020-09-10 21:50:41 +03:00
de4c935071
don't expire pinned posts
2020-09-10 21:50:41 +03:00
9bf1065a06
schedule activity expiration in Oban
2020-09-10 21:50:40 +03:00
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
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
53cf7fef6e
Merge branch 'fix/streaming-termination-errors' into 'develop'
...
Fix two pseudo-errors in websocket handler
Closes #2131
See merge request pleroma/pleroma!2982
2020-09-10 18:40:54 +00:00
45c299e5b5
Merge branch '2130-mfa-users-oauth-login-fix' into 'develop'
...
[#2130 ] Fixed OAuth OOB authentication for users with enabled MFA
Closes #2130
See merge request pleroma/pleroma!2979
2020-09-10 18:38:48 +00:00
dc4e06e199
[ #2497 ] Removed support for thumbnail_max_* params for media preview proxy
...
(per https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2497#note_70771 )
2020-09-10 21:28:07 +03:00
01fa68fe45
Websocket handler: fix never matching code on failed auth
...
`:cowboy_req.reply` does not return tuples since 2.0, see
https://ninenines.eu/docs/en/cowboy/2.4/manual/cowboy_req.reply/
2020-09-10 21:26:52 +03:00
e16e8f9816
Websocket handler: do not raise if handler is terminated before switching protocols
...
Closes #2131
2020-09-10 21:14:23 +03:00
cb06e98da2
websocket handler: Do not log client ping frames as errors
2020-09-10 21:14:23 +03:00
e8bfb50fa3
pass options without adapter key
2020-09-10 20:09:44 +03:00
8af1fd3223
oban warning
2020-09-10 16:01:20 +03:00
7dd986a563
expire mfa tokens through Oban
2020-09-10 16:01:19 +03:00
3ce658b930
schedule expired oauth tokens deletion with Oban
2020-09-10 16:01:19 +03:00
9853c90abb
added paginate links to headers for /chats/:id/messages
2020-09-10 12:39:29 +03:00
148bc24435
[ #2497 ] Removed Hackney-specific code
...
(no longer needed due to adapter options unification).
2020-09-10 11:54:10 +03:00
ab56dd54e7
use Pleroma.HTTP in emoji packs tasks
2020-09-10 11:23:39 +03:00
cad69669fc
[ #2130 ] Fixed OAuth OOB authentication for users with enabled MFA.
2020-09-09 22:44:38 +03:00
b4860c57a6
[ #2497 ] Formatting fix.
2020-09-09 19:43:36 +03:00
68a74d6659
[ #2497 ] Added missing alias, removed legacy `:adapter` option specification for HTTP.get/_.
2020-09-09 19:30:42 +03:00
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
2020-09-09 11:11:36 -05:00
de2499e54b
don't run update in tests
2020-09-09 10:48:18 +03:00
d23d0c27c2
Handle possibility of user account in a bulk operation not having an email address
2020-09-08 16:48:54 -05:00
75b6fef25d
Add mix task for bulk [un]confirming the local instance users
2020-09-08 16:39:41 -05:00
23ca5f75af
Make it possible to bulk send confirmation emails to all unconfirmed users
2020-09-08 16:39:08 -05:00
0d2814ec8e
Metadata: Move restriction check from Feed provider to activated_providers
2020-09-08 20:21:34 +03:00
2011142ed9
Use :restrict_unauthenticated testing for more granular control
2020-09-08 20:21:34 +03:00
a85ed6defb
Do not serve RSS/Atom feeds when instance is private
2020-09-08 20:21:34 +03:00
14d07081fd
Feed provider only generates a redirect, so always activate it.
...
Making this configurable is misleading.
2020-09-08 20:21:34 +03:00
ff07014b26
Disable providers of user and status metadata when instance is private
2020-09-08 20:21:34 +03:00
630444ee08
Do not make RelMe metadata provider optional.
...
There's really no sound reason to turn this off anyway.
2020-09-08 20:21:34 +03:00
947ee55ae2
user: harden get_friends_query(), get_followers_query() and their wrappers
2020-09-08 20:21:34 +03:00
16c451f8f1
search: Apply following filter only when user is usable
2020-09-08 20:21:34 +03:00
10ef532c63
AP C2S: Restrict character limit on Note
2020-09-08 20:21:34 +03:00
a781ac6ca5
Fix atom leak in AdminAPIController
2020-09-08 20:21:34 +03:00
feld
Mark Felder