Commit graph

624 commits

Author SHA1 Message Date
sadposter f82d9e1359 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-09-25 13:33:10 +01:00
Maksim Pechnikov 1a858134ed Merge branch 'develop' into issue/1218 2019-09-25 12:24:12 +03:00
Egor Kislitsyn 209395c7e6 Add User.change_info/2 and User.update_info/2 2019-09-24 19:50:07 +07:00
Egor Kislitsyn 79b25be4e1 Do not return tuple when unneeded 2019-09-24 15:03:20 +07:00
Haelwenn (lanodan) Monnier 447514dfa2
Bump copyright years of files changed in 2019
Done via the following command:
git diff 1e6c102bfc --stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
2019-09-18 23:21:11 +02:00
sadposter ab55e41626 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-09-14 00:20:56 +01:00
rinpatch f884987ace Merge branch 'admin-config-description' into 'develop'
Admin config description

Closes #1178 and #1209

See merge request pleroma/pleroma!1611
2019-09-13 12:36:24 +00:00
rinpatch 5a76d5d239 Add extended benchmark 2019-09-11 11:13:17 +03:00
Alex S 38b29779c3 refactoring 2019-09-11 09:25:33 +03:00
Alex S 57dc59d98d little fix 2019-09-11 09:25:33 +03:00
Alex S 8f5ee7db06 typo fix 2019-09-11 09:25:33 +03:00
Alex S 6721301086 some changes 2019-09-11 09:25:33 +03:00
Alex S 0559c82bdb fix 2019-09-11 09:25:33 +03:00
Alex S 511d93fa54 mix docs generates config.md 2019-09-11 09:25:33 +03:00
rinpatch 43f02dfe38 Revert "Parallelize template rendering"
This reverts commit 1ad71592ad.

Since it had no limit on the number on concurrent processes it OOM killed
instances while rendering hellthreads. When I tried introducing a
concurrency limit with Task.async_stream/manual folds it lead to about 3 times
worse performance on threads larger than 1000 activities (we are talking
30s vs 1.2 minutes), I think this is not worth the about 1.5 times
performance increase on smaller threads when using it.
2019-09-10 22:01:45 +03:00
Maksim Pechnikov cef2e980b1 division emoji.ex on loader.ex and emoji.ex 2019-08-30 07:30:54 +03:00
sadposter cc28184854 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-08-27 08:58:51 +01:00
lain 8340fe8fcc Merge branch 'digest-template' into 'develop'
Improve digest email template

See merge request pleroma/pleroma!1565
2019-08-20 12:55:51 +00:00
Maksim Pechnikov e652cef76b removes duplicates from relay subscription list 2019-08-19 13:39:18 +03:00
sadposter 3fc4b078f2 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-08-16 10:54:53 +01:00
rinpatch 1ad71592ad Parallelize template rendering 2019-08-15 18:05:50 +03:00
rinpatch a9e75fa6a4 Add a task to benchmark timeline rendering 2019-08-15 00:43:02 +03:00
Egor Kislitsyn 4b7f1c6995 Improve digest email template 2019-08-14 20:46:05 +07:00
sadposter 59c9b90169 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-08-10 23:43:32 +01:00
Sergey Suprunenko af4cf35e20 Strip internal fields including likes from incoming and outgoing activities 2019-08-10 18:47:40 +00:00
lain 29807ef6a5 Merge branch 'feature/digest-email' into 'develop'
Feature/digest email

See merge request pleroma/pleroma!1078
2019-08-08 14:38:33 +00:00
sadposter 325372b1e1 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-08-07 08:59:31 +01:00
Ariadne Conill cef3af5536 tasks: relay: add list task 2019-08-03 23:17:17 +00:00
Haelwenn (lanodan) Monnier 8815f07058
tasks/pleroma/user.ex: Fix documentation of --max-use and --expire-at
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1155

[ci skip]
2019-08-02 23:38:02 +02:00
Roman Chvanikov 9d4f34fbcb Merge branch 'develop' into feature/digest-email 2019-08-02 18:16:04 +03:00
sadposter 3cc6cb266b Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-31 14:23:03 +01:00
Alexander Strizhakov 51b3b6d816 Admin changes 2019-07-30 16:36:05 +00:00
Ariadne Conill b93498eb52 constants: add as_public constant and use it everywhere 2019-07-29 02:43:19 +00:00
sadposter e11058c20c add user show task 2019-07-22 01:17:59 +01:00
sadposter c2737d13df Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-20 14:28:30 +01:00
sadposter ed1ce20c5a add email util tasks 2019-07-20 14:28:25 +01:00
Roman Chvanikov 36049f08ef Merge develop 2019-07-20 01:03:25 +03:00
Ariadne Conill 9a8eb2c94d mix: add pleroma.user unsubscribe_all_from_instance 2019-07-19 19:25:29 +00:00
Roman Chvanikov 9bca70b10a Merge develop 2019-07-16 16:19:19 +03:00
sadposter 32ce409514 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-16 11:21:31 +01:00
Alex S b8607c151c migrating task refactor 2019-07-15 15:45:27 +03:00
Alex S c66044b923 atom keys with leading : 2019-07-15 11:00:55 +03:00
sadposter d4348eeb62 Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-14 22:03:20 +01:00
Roman Chvanikov b052a9d4d0 Update DigestEmailWorker to compile and send emails via queue 2019-07-14 22:32:11 +03:00
Roman Chvanikov eae991b06a merge develop 2019-07-12 18:08:27 +03:00
kaniini 75be90a6d1 Merge branch 'release/listener' into 'develop'
add listener port and ip option for 'pleroma.instance gen' and enable its test

See merge request pleroma/pleroma!1393
2019-07-10 05:14:08 +00:00
feld 93a0eeab16 Add license/copyright to all project files 2019-07-10 05:13:23 +00:00
sadposter dbeb8f43fe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-09 21:08:12 +01:00
Sachin Joshi 6d0ae264fc add listener port and ip option for 'pleroma.instance gen' and enable its test 2019-07-10 01:46:49 +05:45
Roman Chvanikov 371d39e160 Merge develop 2019-07-09 21:21:09 +03:00
Alexander Strizhakov 4e6e5d8042 reverse proxy tests 2019-07-09 16:54:13 +00:00
sadposter ed709aec2c Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop 2019-07-06 18:41:06 +01:00
Haelwenn (lanodan) Monnier 977c2d0448
tasks/pleroma/instance.ex: Change :upload_dir to :uploads_dir
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1058
2019-07-05 06:19:27 +02:00
sadposter 4d8f97453b Add activity get mix task 2019-07-01 17:58:51 +01:00
Roman Chvanikov 657277ffc0 Resolve conflicts 2019-06-29 00:52:50 +03:00
lain 2286f62a36 Merge branch 'release-docs' into 'develop'
Docs on OTP releases

See merge request pleroma/pleroma!1315
2019-06-28 15:26:09 +00:00
Alexander Strizhakov c6705144a2 don't delete config settings on admin update 2019-06-27 04:19:44 +00:00
Maksim a0c4ebb4d7 [#184] small refactoring reset password 2019-06-24 19:01:56 +00:00
kaniini 8b7860f12f Merge branch 'admin-config' into 'develop'
Admin config

See merge request pleroma/pleroma!1328
2019-06-23 05:42:37 +00:00
Alex S 982cad0268 support for config groups 2019-06-23 08:16:16 +03:00
rinpatch 3ac5ecbac1 Support RUM indexes in the config generator 2019-06-22 12:54:16 +03:00
rinpatch 51760c84b9 Merge branch 'develop' into release-docs 2019-06-22 12:44:20 +03:00
rinpatch ebee9f59d8 Ecto tasks: Resolve relative path using the application directory
instead of cwd and load the application before doing anything

In OTP releases cwd != app directory and the configuration is read
only if the application is loaded
2019-06-22 04:17:04 +03:00
rinpatch ee4e7c6570 Remove the getting started steps from pleroma.instance gen task
They are not compatible with every platform, different for OTP releases
and may become outdated. We are better off just telling people to refer
to the installation guides for their particular platform
2019-06-22 02:07:05 +03:00
rinpatch 452d5d3231 Merge branch 'develop' into release-docs 2019-06-22 02:00:18 +03:00
rinpatch e76115989a Move config templates to priv so they can be found in releases 2019-06-21 19:54:04 +03:00
rinpatch 89fead9250 Default DB configuration to false and set the default database name to
`pleroma` instead of `pleroma_dev`
2019-06-21 06:42:04 +03:00
rinpatch 2437f51284 Merge branch 'fix/config-gen-releases' into 'develop'
Refactor mix tasks a bit and make config generator work with releases

See merge request pleroma/pleroma!1312
2019-06-20 21:25:34 +00:00
Alexander Strizhakov 32320c1ee9 Fixes for dynamic configuration 2019-06-20 17:43:57 +00:00
rinpatch 69070e641d Allow setting upload/static directories in the config generator 2019-06-20 03:59:16 +03:00
rinpatch 144e2e3e0b Remove deprecated dedupe_media from the config template 2019-06-20 03:40:00 +03:00
rinpatch fe3a830b80 Remove a useless binding from config template call 2019-06-20 02:34:19 +03:00
rinpatch 8c7a382027 Rename Pleroma.Mix.Tasks.Common -> Mix.Pleroma and import it's functions
instead of aliasing

This seems to be the convention for functions that can be reused between
different mix tasks in all Elixir projects I've seen and it gets rid on
an error message when someone runs mix pleroma.common

Also in this commit by accident:
- Move benchmark task under a proper namespace
- Insert a space after the prompt
2019-06-20 02:08:02 +03:00
Ivan Tashkinov 363618207c Apply suggestion to lib/mix/tasks/pleroma/user.ex 2019-06-19 19:39:53 +00:00
Ivan Tashkinov 71fb75b7ef User sign out mix task. 2019-06-19 22:29:36 +03:00
Alexander Strizhakov e4fa6b99ac aliases for mix tasks
ecto.migrate
ecto.rollback
2019-06-19 10:33:33 +00:00
Alexander Strizhakov c2ca1f22a2 it is changed in compile time
we can't change module attributes and endpoint settings in runtime
2019-06-14 15:45:05 +00:00
rinpatch 7223c1b643 Use Mix.shell().yes? if available 2019-06-08 20:10:48 +03:00
rinpatch d7ec0898e5 Make mix tasks work in a release 2019-06-08 17:40:40 +03:00
rinpatch bc597d888c Mix Tasks: Switch to Application.ensure_all_started instead of
Mix.Task.run and ensure serve_endpoints is set to false

In release environments there is no Mix.Task.run and serve_endpoints
must be set to true for the endpoints to start, so we need to ensure it
is set to false before starting Pleroma for executing a mix task.
2019-06-07 12:37:20 +03:00
Roman Chvanikov 01fe5abad1 Resolve conflicts 2019-06-07 01:20:50 +03:00
Egor Kislitsyn 94b9e9d844 Update benchmark mix task 2019-06-05 16:37:43 +07:00
Roman Chvanikov 3e17610587 Add task to test emails 2019-06-04 02:48:21 +03:00
Roman Chvanikov ce47017c89 Merge develop 2019-05-29 18:18:22 +03:00
rinpatch 54e10a3e55 Disable timeouts for object pruning query 2019-05-22 20:10:52 +03:00
William Pitcock a023ca004c prune objects task: use Repo.delete_all() 2019-05-22 03:12:48 +00:00
William Pitcock 16b260fb19 add mix task to prune the object database using a configured retention period 2019-05-21 21:38:56 +00:00
Sergey Suprunenko 2c303afc8b Remove duplicated entries in users' following lists 2019-05-16 20:04:08 +00:00
Mark Felder efa61c1610 Move to pleroma.database mix task 2019-05-16 13:14:48 -05:00
Mark Felder ebb0482116 Merge branch 'develop' into conversations-import 2019-05-16 13:11:17 -05:00
Alexander Strizhakov 73ae58fdfa Feature/896 toggling confirmation 2019-05-16 13:23:41 +00:00
lain f168a1cbdc Merge remote-tracking branch 'origin/develop' into conversations-import 2019-05-15 17:47:29 +02:00
Mark Felder 498bfdf403 Switch to Jason over Poison 2019-05-13 15:37:38 -05:00
Alexander Strizhakov a2be420f94 differences_in_mastoapi_responses.md: fullname & bio are optionnal
[ci skip]
2019-05-13 18:35:45 +00:00
Mark Felder 786f2c7a84 Update shortdoc description 2019-05-13 11:16:54 -05:00
Roman Chvanikov f1f7a11222 Merge develop 2019-05-11 14:45:54 +07:00
lain 6d19bb4eae Conversations: Add mix task to 'import' old DMs. 2019-05-08 18:09:07 +02:00
Alex S a76e2622ca emoji dowload follow redirects 2019-05-08 19:05:25 +07:00
Roman Chvanikov b6b5b16ba4 Merge develop 2019-05-08 17:08:06 +07:00
Alexander Strizhakov ce6ca0fefe Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/845-improve-status-deletion 2019-05-06 16:45:22 +00:00
lain 0e37fddd5a Search: Add fts index on objects table. 2019-05-03 19:21:09 +02:00
Alex S f11e7037c2 test fixes 2019-05-01 16:09:53 +07:00
Roman Chvanikov 0f0cc2703b Merge develop 2019-04-30 20:17:52 +07:00
rinpatch 952a4ae68e Fix unclosed ` and put synopsis into a code block in pleroma.emoji mix
task docs
2019-04-22 11:02:31 +03:00
Egor b9cdf6d3b9 Use User.get_cached* everywhere 2019-04-22 07:20:43 +00:00
Ekaterina Vaartis 153f5375a6 Replace MD5 with SHA256 for emoji pack verification 2019-04-21 22:28:41 +03:00
Ekaterina Vaartis d5c0fd35e1 Wrap the docstrings to 70 characters 2019-04-21 22:16:46 +03:00
Roman Chvanikov 60f213bb1a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/digest-email 2019-04-20 19:43:06 +07:00
Roman Chvanikov 64a2c6a041 Digest emails 2019-04-20 19:42:19 +07:00
Ekaterina Vaartis 53a3e61016 Fix priv/static/instance/static to be just instance/static
It was a misunderstanding
2019-04-20 15:08:51 +03:00
Ekaterina Vaartis 31cff7dbca Document the pleroma.emoji task 2019-04-20 15:06:07 +03:00
Ekaterina Vaartis 1e311d6662 Add a newline at the end of pack in ls-packs 2019-04-20 11:34:03 +03:00
Ekaterina Vaartis 9bd5e2dec9 Make emoji default_manifest a config option 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis 98d4b3de53 Treat the manifest path as a file if it doesn't start with http 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis aaaa428512 mix format 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis a141f0807b Assume packs without emoji.txt only have emoji pictures, unhardcode
unhardcode: remove hardcoded /instance/static and actually use the config option
as it is used in other places.

packs without emoji.txt: these are now assumed to have .png files that
are all emojis, their names are used as shortcodes
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis eff725c3af Add a task to generate emoji packs 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis c5b7286b5f Move helper functions of emoji manager task down in the file 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis 06db3ee1a8 Add MD5 verification for emoji pack source 2019-04-20 11:17:17 +03:00
Ekaterina Vaartis af5494f942 Separate emoji pack file lists in a different file
The file should be in the same directory as the manifest file
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis 21b39c54a3 Allow using a custom manfest and getting multiple packs at once
A custom manifest can be provided as a command-line options --manifest/-m
2019-04-20 11:17:17 +03:00
Ekaterina Vaartis c26724cc55 Remove finmoji and add a way to download emojis in packs
These packs are stored in a git repo on pleroma gitlab
2019-04-20 11:17:17 +03:00
rinpatch 73b8c5387b Add some logging 2019-04-19 00:17:37 +03:00
rinpatch 945325013a remove query timeouts 2019-04-18 23:58:59 +03:00
rinpatch 099f89367e Replace embedded object migration with a mix task 2019-04-18 23:34:01 +03:00
rinpatch a11ca87f40 Add a migration to remove embeded objects 2019-04-18 13:10:38 +03:00
rinpatch 627e5a0a49 Merge branch 'develop' into feature/database-compaction 2019-04-17 12:22:32 +03:00
Alex S fe511a6c65 Merge branch 'develop' into feature/788-separate-email-addresses 2019-04-10 18:06:54 +07:00
Alex S fe13a1d78c adding notify_email setting for trigger emails 2019-04-10 17:57:41 +07:00
Alex S 012bb5dcc9 renaming expire_at -> expires_at
keyword style change
2019-04-08 16:01:28 +07:00
Alex S ce8d457132 little channges 2019-04-06 22:38:35 +07:00
Alex S 47b07cec49 token -> invite renaming 2019-04-06 20:24:22 +07:00
Alex S 0484f3a8b1 generating tokens with mix 2019-04-06 16:58:22 +07:00
Sachin Joshi cd41584ac4 Generate permissive or restrictive robots.txt in the config generator 2019-04-03 22:12:58 +05:45
lambda ce9284b36f Merge branch 'remove-user-activities' into 'develop'
[#757] Add mix task to delete user's activities

See merge request pleroma/pleroma!1008
2019-04-02 12:45:29 +00:00
Egor Kislitsyn 1b3d921921 change Repo.get(User, id) => User.get_by_id(id) 2019-04-02 17:01:26 +07:00
Egor Kislitsyn a14742f495 add user delete_activities mix task 2019-04-02 16:30:11 +07:00
Egor Kislitsyn a1869f5272 Merge remote-tracking branch 'pleroma/develop' into remove-user-activities 2019-04-02 15:41:30 +07:00
William Pearson 3dadaa4432 robots.txt
Add default robots.txt that allows bots access to all paths.
Add mix task to generate robots.txt taht allows bots access to no paths.
Document custom emojis, MRF and static_dir
static_dir documentation includes docs for the robots.txt Mix task.
2019-03-15 02:28:18 +00:00
Haelwenn (lanodan) Monnier 4b73ca638e
[Credo][CI] Add readability as it’s fixed 2019-03-13 04:26:56 +01:00
Haelwenn (lanodan) Monnier a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder 2019-03-13 04:26:54 +01:00
Egor Kislitsyn 16e598ec11 fix wording 2019-03-12 22:12:05 +07:00
Egor Kislitsyn d013b58e84 add mix pleroma.user delete_activities NICKNAME task 2019-03-12 22:04:08 +07:00
Haelwenn (lanodan) Monnier 6ca633ddd3
Mix.Tasks.Pleroma.Uploads: Disable Enum.reduce warning on line 100 (unsure) 2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier 6a6a5b3251
de-group alias/es 2019-02-09 16:31:17 +01:00
Haelwenn (lanodan) Monnier bd9b5fffbc
Mix.Tasks.Pleroma.Uploads: Fix typo in documentation 2019-02-09 14:59:21 +01:00
Haelwenn (lanodan) Monnier 8bcfac93a8
Make credo happy 2019-02-09 14:59:20 +01:00
William Pitcock 93e136d70b mix: add user tag/untag task 2019-02-04 17:04:05 +00:00
Haelwenn (lanodan) Monnier f94cc6d824
Mix.Tasks.Pleroma.Instance: Generate signing_salt
Closes: https://git.pleroma.social/pleroma/pleroma/issues/533
2019-01-21 01:16:41 +01:00
spctrl 4aa977d3b3 fix 486: Add option --assume-yes to allow it to work non-interactive 2019-01-04 22:11:46 +01:00
spctrl ab9cda315f Change 'name' to 'instance_name' so option is used when running non-interactive 2018-12-29 12:43:54 +01:00
William Pitcock 69ad1039ba mix tasks: add legal boilerplate 2018-12-23 20:56:42 +00:00
Ivan Tashkinov b096e30cff [#114] Added email confirmation resend action. Added tests
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
2018-12-18 17:22:46 +03:00
link0ff 22d483d4f7 Use bindings dbuser and dbname in sample_psql.eex 2018-12-16 18:25:31 +02:00
Rin Toshaka 4a895a46d1 Allow port specification in instance.ex 2018-12-15 11:00:54 +01:00
link0ff 51dd294c48 Allow to set both admin and moderator at the same time in mix task User 2018-12-12 22:45:40 +02:00
link0ff a40ba3ba57 Fix toggle_activated in mix task User 2018-12-12 22:30:16 +02:00
lambda bda25b999b Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
# Conflicts:
#   lib/mix/tasks/pleroma/uploads.ex
2018-12-10 18:33:36 +00:00
Maksim Pechnikov e94c3442f4 updates 2018-12-10 13:27:37 +03:00
rinpatch 993c8c8bd4 Keep the shortdoc descriptive 2018-12-10 08:03:17 +03:00
Rin Toshaka cbe048bb3f Mix tasks: improve uploads.ex moduledoc 2018-12-09 20:17:35 +01:00
Maksim Pechnikov 074fa790ba fix compile warnings 2018-12-09 20:50:08 +03:00
lambda 5436aaad4f Merge branch 'fix/add-upload.ex' into 'develop'
Mix Tasks: Add task uploads.ex for migrating local uploads.

See merge request pleroma/pleroma!517
2018-12-08 09:12:37 +00:00
Rin Toshaka 6c73136aec [#283] Mix Tasks: Fix a typo in relay.ex 2018-12-08 08:30:34 +01:00
Rin Toshaka fd5c7b445f Fix a typo 2018-12-07 19:19:14 +01:00
Rin Toshaka a02e0c18bc Mix Tasks: Add task uploads.ex for migrating local uploads. 2018-12-07 15:13:57 +01:00
lambda 8764f64690 Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'
Add mix pleroma.user unsubscribe to mix doc

See merge request pleroma/pleroma!512
2018-12-07 09:23:56 +00:00
rinpatch 4e2250b1dd Fix a typo in relay.ex moduledoc 2018-12-07 11:41:01 +03:00
rinpatch f7e23aee90 Oops 2018-12-07 10:44:54 +03:00
rinpatch f661813807 Add mix pleroma.user unsubscribe to mix doc 2018-12-07 10:39:54 +03:00
rinpatch 08e10a70ec Rename def to defval 2018-12-07 09:46:13 +03:00
Rin Toshaka 1d11c4cf11 add common.ex 2018-12-07 06:12:39 +01:00
Rin Toshaka 71d5cf9ed8 Remove unused vars from user.ex 2018-12-06 18:25:39 +01:00
Rin Toshaka 66313cda02 Update instance.ex for web push 2018-12-06 18:16:51 +01:00
Rin Toshaka 88f92693f2 Merge develop 2018-12-06 18:11:22 +01:00
Rin Toshaka ca7b46fb3b Refactor common functions to common.ex 2018-12-06 18:01:28 +01:00
Rin Toshaka 4a2a7ce636 Refactor common functions to common.ex 2018-12-06 18:00:24 +01:00
Rin Toshaka 3a84511df1 remove migrate_local_uploads.ex 2018-12-06 17:35:33 +01:00
Egor Kislitsyn 4944498133 Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
#	lib/pleroma/application.ex
#	lib/pleroma/plugs/oauth_plug.ex
2018-12-06 20:15:16 +07:00
Egor Kislitsyn 8b4397c704 Merge branch 'develop' into feature/compat/push-subscriptions
# Conflicts:
#	lib/mix/tasks/sample_config.eex
#	lib/pleroma/web/twitter_api/controllers/util_controller.ex
#	mix.exs
#	mix.lock
2018-12-06 19:55:58 +07:00
Egor Kislitsyn 04a48286e6 Add web push support 2018-12-06 19:29:04 +07:00
Rin Toshaka dfc9c08796 formating 2018-12-05 19:12:23 +01:00
Rin Toshaka ffec96d8cc Everything should use Mix.Task.Run 2018-12-05 19:05:37 +01:00
Rin Toshaka facfd03bc1 Move relay tasks to relay.ex 2018-12-05 18:11:59 +01:00
Rin Toshaka e8ba579efe Switch from User.info_changeset because it is deprecated 2018-12-05 17:58:26 +01:00
Rin Toshaka c3519132df Sorry 2018-12-05 16:44:15 +01:00
Rin Toshaka 5427d2af3a Update mix tasks since User.info.info_changeset is deprecated 2018-12-05 16:41:50 +01:00
Rin Toshaka 9938fa3293 Merge develop to refactor/mix-tasks 2018-12-05 14:16:55 +01:00
Rin Toshaka 6396f1b58f change new to gen in instance.ex . Refactor user.ex 2018-12-04 19:00:45 +01:00
William Pitcock 1a360a4eaa compact database task: fix formatting 2018-12-04 04:52:09 +00:00
William Pitcock ef56488349 mix: add task to compact the database 2018-12-04 04:52:09 +00:00
Rin Toshaka 03b2d1016d F O R M A T I N G 2018-12-02 20:27:49 +01:00
Rin Toshaka 57c71f8468 Move generate_invite to user.ex 2018-12-02 20:26:15 +01:00
Rin Toshaka d924b6cd3d Refactor copypasta to a private function in instance.ex 2018-12-02 20:04:33 +01:00
Rin Toshaka cbe22deb51 Lint fix 2018-12-02 19:20:50 +01:00
Rin Toshaka faf1f2b304 Move gen.instance to instance.ex 2018-12-02 19:18:06 +01:00
Rin Toshaka 7983b0bdfe Move unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fix pleroma.user toggle_activated to work not only on local users. 2018-12-02 18:05:59 +01:00
lain e3f3d13d99 Add uuid generation extension to sample_psql.eex. 2018-12-02 11:20:49 +01:00
Rin Toshaka 31b3ac05ac Lint fix 2018-12-02 10:01:17 +01:00
Rin Toshaka a8ef6b1190 Add admin option to pleroma.user new. Add user existence checking to toggle_activated 2018-12-02 09:36:31 +01:00
rinpatch ae82852330 Move set_admin task to lib/mix/tasks/pleroma/user.ex 2018-12-01 18:55:52 +03:00
rinpatch 6f174cbb71 Delete reactivate user task 2018-12-01 18:34:26 +03:00
rinpatch 5f91d6b859 Fix toggle_deactivated to reactivate a deactivated user 2018-12-01 18:33:53 +03:00
rinpatch fe2759bc9f Attempt to resolve merge conflict 2018-12-01 18:12:27 +03:00
href 02d3dc6869
Uploads fun, part. 2 2018-11-30 18:02:37 +01:00
href b19597f602
reverse proxy / uploads 2018-11-30 18:00:47 +01:00
Haelwenn (lanodan) Monnier 44b6200103
lib/mix/tasks/relay*: Use a with block 2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier 12ccf0c4f8
Change Relay from status to {status, message} 2018-11-17 22:12:13 +01:00
Haelwenn (lanodan) Monnier 1a31d71187
lib/mix/tasks/relay_{un,}follow.ex: Use a with block 2018-11-17 20:25:57 +01:00
Haelwenn (lanodan) Monnier 7fbfd2db96
lib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}follow 2018-11-17 20:25:56 +01:00
Haelwenn (lanodan) Monnier 011a2e36b1
lib/mix/tasks/make_admin.ex: New task 2018-11-17 20:25:53 +01:00
William Pitcock 2829fa4183 sample config: chase http_security change 2018-11-12 15:17:04 +00:00
William Pitcock a2bf5426cb sample config: document how to make CSPPlug send STS headers (off by default to allow for SSL debugging) 2018-11-11 06:42:14 +00:00
Haelwenn (lanodan) Monnier 5ecb5629f6
lib/mix/tasks: s/@doc/@moduledoc/ 2018-11-10 13:09:39 +01:00
Haelwenn (lanodan) Monnier 5e3207045e
lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy 2018-11-10 13:09:39 +01:00
Haelwenn (lanodan) Monnier 64c0289893
lib/mix/tasks: Add remaining documentation for mix tasks 2018-11-10 13:09:38 +01:00
Haelwenn (lanodan) Monnier 8b2541e4e7
Document the mix tasks in ex_doc instead 2018-11-10 13:09:37 +01:00
Haelwenn (lanodan) Monnier e1814bb322
Document mix tasks 2018-11-10 13:09:37 +01:00
William Pitcock f584a603f9 user: make User.delete() return data consistent with Object.delete() 2018-11-01 07:56:21 +00:00
scarlett b92e38d2d4 Add user reactivation task. 2018-10-29 23:13:15 +00:00
William Pitcock 69192f36ff mix tasks: add new task to unsubscribe all users from, and then ban a remote user (e.g. followbots) 2018-10-28 19:47:56 +00:00
Greizgh a494508320 Cleanup postgresql setup script
Drop unused CREATEDB privilege.
Do not try to handle multiple run.
2018-10-27 14:31:51 +02:00
William Pitcock 8e28e8a18f mix: remove fix_ap_users task, now obsolete 2018-09-20 23:50:56 +00:00
Thurloat d424e9fa5f fix S3 ref in sample config to generate proper path. 2018-08-28 23:49:23 -03:00
Thurloat ab9e5d64d6 add a sample swift config 2018-08-28 22:39:33 -03:00
William Pitcock 03c35e579b sample config: add S3 public endpoint option 2018-08-28 00:18:24 +00:00
William Pitcock e95d958b52 sample config: show how amazon s3 support is activated, including third-party clones like wasabi 2018-08-27 23:30:53 +00:00
kaniini 0f5bff8c66 Merge branch 'develop' into 'feature/relay'
# Conflicts:
#   lib/pleroma/web/activity_pub/utils.ex
2018-08-26 21:06:15 +00:00
Jorty ba6e3eba33 Move invite task to pleroma namespace
Some other minor changes were made to make it consistent with the behavior of
other tasks both within Pleroma and the conventions set by dependencies such as
Phoenix. Namely, the task is named `gen.invite` and `IO.puts` has been replaced
with references to `Mix.shell()` where appropriate.
2018-08-23 12:46:13 -04:00
Jorty 8a1dc0de92 Refactor Mix tasks
1. Move Mix tasks into a `pleroma` namespace, to avoid
   collisions with dependent packages.

2. Rename and condense tasks  into two `pleroma.user` and
   `pleroma.gen.instance` tasks for consistency with Hex and Phoenix.

3. Add additional functionality to the tasks to make them more
   user-friendly. Arguments with sensible defaults were demoted to flags
   and in the interactive `generate_config` (renamed to
   `pleroma.gen.instance`), flags were added to allow non-interactive
   use, though interactive use remains the primary interface. That task
   also now prompts the user for database parameters.

4. Documentation has been added to both tasks such that `mix help` now
   shows useful information.

5. Finally, use of IO.puts in tasks has been replaced with Mix.shell()
   equivalents to make the behavior more consistent with Mix tasks in
   other packages, and such that variables like MIX_QUIET are respected.
   The only exception is in `mix pleroma.user reset_password`, wherein
   the URL must always be printed regardless of the value of MIX_QUIET
   since that's its entire purpose.
2018-08-23 11:33:16 -04:00
lambda 13440a80e1 Merge branch 'feature/invites' into 'develop'
Invites

Closes #108

See merge request pleroma/pleroma!208
2018-08-12 12:04:15 +00:00
lambda 1e9d152d60 Update generate_invite_token.ex 2018-08-12 11:11:08 +00:00
William Pitcock 266b314051 relay: fix invoking federator, use a timer to sleep the mix task to force a context switch 2018-08-06 08:22:12 +00:00
William Pitcock 99be3d3dcc relay: add relay follow/unfollow tasks 2018-08-06 08:22:12 +00:00
Henry Jameson 0b1ca6a584 Token-generating task 2018-06-17 14:30:07 +03:00
eal 3326205f95 set_moderator: ensureall applications are started. 2018-06-12 15:42:40 +03:00
lambda 3f42806b1b Merge branch 'develop' into 'develop'
Dedupe uploads

See merge request pleroma/pleroma!115
2018-06-12 08:26:26 +00:00
lambda f34232da86 Update sample_config.eex 2018-06-12 07:23:45 +00:00
William Pitcock 3208611bfc mix: add task for setting an account as locked or not 2018-06-11 22:15:27 +00:00
eal 18837c2fed make_moderator.ex: set cache on update 2018-06-11 22:53:38 +03:00
Sir_Boops 3f0440ac3c
Dedupe uploads 2018-06-06 13:25:44 -06:00
lambda ad563669c8 Merge branch 'feature/remote-user-deactivation' into 'develop'
remote user deactivation

See merge request pleroma/pleroma!154
2018-05-19 09:30:09 +00:00
lain 1d4bbec6b3 Fix User search.
Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185.
2018-05-16 17:55:20 +02:00
William Pitcock a6a6915aaf add mix task for deactivating a user by nickname 2018-05-13 19:05:03 -05:00
Mark Felder aaacebd906 Fix unused variables, imports, and aliases 2018-05-04 21:42:20 +00:00
Mark Felder 636f0fa402 Clean up unused aliases and imports 2018-05-04 21:25:31 +00:00
lain 0b4ff1bfe2 fix again 2018-04-19 21:44:11 +02:00
lain 7b96a756fb fix again 2018-04-19 13:04:29 +02:00
lain 77fc40d5d7 Fix generate config 2018-04-19 12:52:24 +02:00
eal e30a056476 Revert "Ask for proxy URL if proxy enabled."
The most common case is running it on the same server.
2018-04-19 13:29:14 +03:00
eal b586ead6b8 rm_user: also ensure that cache is running. 2018-04-18 17:52:25 +03:00
eal 4e3fc530db Fix rm_user task. 2018-04-18 17:39:27 +03:00
Phenethylamine 13a64b82e3 Switch to User.delete for rm_user task 2018-04-12 14:30:53 -04:00
Phenethylamine 4478b9115c Add rm_user mix task 2018-04-12 02:43:48 -04:00
lain b910483c16 Fix register_user task. 2018-04-10 21:05:53 +02:00
lain 4afbef39f4 Format the code. 2018-03-30 15:01:53 +02:00
lain 6744710908 Fixes 4: In Da Hood. 2018-02-24 10:58:16 +01:00
lain 42f30d67fa Fixes Christmas Special 2018-02-24 10:52:12 +01:00
lain 541a4cbbb6 Oh no! More fixes! 2018-02-24 10:51:15 +01:00
lain 1555b7fab5 Add AP fixup task. 2018-02-21 22:59:00 +01:00
lain 56cfe71858 Add moderator task. 2018-02-21 18:33:36 +01:00
lain 765671a5b0 Add password reset task. 2018-02-21 18:24:17 +01:00
eal d56ab43609 Ask for proxy URL if proxy enabled.
Also change the true/false question to y/n
2018-01-12 22:38:14 +02:00
Sebastian Huebner 29b7e822fb
added question about activating mediaproxy to config generator 2018-01-09 12:31:11 +01:00
Henry Jameson 964e2dd2f0 unfuck 2017-12-04 04:06:52 +03:00
Henry Jameson 6b60f5f64a made psql script compatible with migrations or generate_config reruns 2017-12-04 03:56:54 +03:00
Henry Jameson 071f518028 reverts config gen 2017-12-04 03:56:54 +03:00
Henry Jameson a884e08271 fix 2017-12-04 03:56:54 +03:00
Henry Jameson 4071403117 fixes 2017-12-04 03:56:54 +03:00
Henry Jameson 0673511d39 first version of safe DB setup 2017-12-04 03:56:54 +03:00
Lain Iwakura 44dc694882 Add configuration generation tool, update readme. 2017-11-23 16:22:20 +01:00
Roger Braun 40706b4c4f Use changeset in user registration mix task. 2017-04-15 16:42:02 +02:00
Roger Braun 8c2aad1cab Make new users follow themselves. 2017-04-14 17:29:27 +02:00
Roger Braun 567ec494c5 Add user registration mix task. 2017-04-05 12:27:25 +02:00