Anon/pleroma
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
12,502 Commits 1 Branch 0 Tags 222 MiB
ada073f251
Commit Graph

457 Commits

Author SHA1 Message Date
Maksim Pechnikov
9bc5e18ade rename mix task: pleroma.user unsubscribe -> pleroma.user deactivate 2020-05-21 08:06:57 +03:00
Maksim Pechnikov
c96f425cb0 fixed mix pleroma.instance gen 2020-05-20 21:30:41 +03:00
Roman Chvanikov
01bd6a1e54 Merge branch 'develop' into feature/admin-api-status-count-per-instance 2020-05-18 11:56:27 +03:00
lain
4b28d812cf Merge branch 'restricted-relations-embedding' into 'develop' 
Restricted support for embedded relationships

See merge request pleroma/pleroma!2456
 2020-05-17 07:26:51 +00:00
Michael Weiss
ae3b0b4c0d
Fix digest mix task on OTP releases 
This is based on #2191, credit belongs to @rinpatch.
 2020-05-13 13:34:03 +02:00
Maksim Pechnikov
63477d07ad unsubscribes of friends when user deactivated 2020-05-12 08:14:42 +03:00
Roman Chvanikov
56819f7f06 Use index on refresh_counter_cache 2020-05-09 13:13:26 +03:00
Roman Chvanikov
01b06d6dbf Show progress in refresh_counter_cache task 2020-05-09 11:43:31 +03:00
Roman Chvanikov
39d2f2118a update counter_cache logic 2020-05-09 01:20:50 +03:00
Ivan Tashkinov
b2924ab1fb Merge remote-tracking branch 'remotes/origin/develop' into restricted-relations-embedding 2020-05-08 21:37:55 +03:00
Ivan Tashkinov
d5cdc907e3 Restricted embedding of relationships where applicable (statuses / notifications / accounts rendering). 
Added support for :skip_notifications for accounts listing (index.json).
Adjusted tests.
 2020-05-01 18:45:24 +03:00
lain
51f1dbf0a2 User deletion mix task: Use common pipeline. 2020-05-01 14:05:25 +02:00
Haelwenn
a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop' 
Creating trusted app from adminFE & mix task

Closes #1584

See merge request pleroma/pleroma!2252
 2020-04-17 09:19:35 +00:00
Ivan Tashkinov
a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses 2020-04-13 09:16:51 +03:00
rinpatch
2ba754ffe1 Fix mix tasks failing on OTP releases 
No idea why this was even added.
Closes #1678
 2020-04-12 18:49:31 +03:00
Alexander Strizhakov
b59ac37b2c
tests for emoji mix task 2020-04-06 11:13:59 +03:00
Ivan Tashkinov
98b96e45ab Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses 
# Conflicts:
#	CHANGELOG.md
 2020-04-01 20:08:14 +03:00
feld
ef7d2b0f11 Merge branch 'gun' into 'develop' 
Gun adapter

Closes #945

See merge request pleroma/pleroma!1861
 2020-04-01 17:05:09 +00:00
Ivan Tashkinov
2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance. 
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
 2020-04-01 19:49:09 +03:00
Alexander Strizhakov
1f29ecdcd7
sync with develop 2020-03-30 11:42:25 +03:00
Alexander Strizhakov
a6ee6784bc
creating trusted app from adminFE & mix task 2020-03-23 10:44:47 +03:00
Alexander Strizhakov
39ed608b13
Merge branch 'develop' into gun 2020-03-12 18:31:10 +03:00
rinpatch
7cdabdc0df Merge branch 'fix/1610-release-compilation-config-fix' into 'develop' 
Merging default release config on app start

Closes #1610

See merge request pleroma/pleroma!2288
 2020-03-11 15:16:18 +00:00
feld
f92c447bbc Merge branch 'relay-list-change' into 'develop' 
Relay list shows hosts without accepted follow

See merge request pleroma/pleroma!2240
 2020-03-11 15:10:09 +00:00
Alexander Strizhakov
282a93554f
merging release default config on app start 2020-03-11 16:25:53 +03:00
Alexander Strizhakov
b2eb1124d1
Merge branch 'develop' into gun 2020-03-07 12:41:37 +03:00
rinpatch
6d797b9928 Merge branch 'restart-fix-for-mix-tasks' into 'develop' 
Wait in mix task while pleroma is rebooted

See merge request pleroma/pleroma!2225
 2020-03-07 09:32:29 +00:00
Mark Felder
4427161ca3 Merge branch 'develop' into gun 2020-03-03 17:15:49 -06:00
Mark Felder
05da5f5cca Update Copyrights 2020-03-03 16:44:49 -06:00
Alexander Strizhakov
509c81e4b1
Merge branch 'develop' into gun 2020-03-03 10:08:07 +03:00
Alexander Strizhakov
cc98d010ed
relay list shows hosts without accepted follow 2020-03-02 09:27:20 +03:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07 
Done via the following command:
git diff fcd5dd259a --stat --name-only | xargs sed -i '/Pleroma Authors/c# Copyright © 2017-2020 Pleroma Authors <https:\/\/pleroma.social\/>'
 2020-03-02 06:08:45 +01:00
Alexander Strizhakov
400fbc7629
wait in mix task while pleroma is rebooted 2020-03-01 12:36:09 +03:00
Alexander Strizhakov
814b275af7
Merge branch 'develop' into gun 2020-02-29 11:34:50 +03:00
lain
fda6f35a46 Merge branch 'feat/instance-gen-improvements' into 'develop' 
small instance.gen task improvements

See merge request pleroma/pleroma!2245
 2020-02-26 08:26:16 +00:00
rinpatch
3bbfebd1c2 instance.gen task: make example instance name less confusing 
See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217
 2020-02-26 00:32:34 +03:00
rinpatch
359faa8645 instance.gen task: remind to transfer the config to the database after 
migrations
 2020-02-25 22:13:08 +03:00
rinpatch
cfa28dee32 instance.gen task: make instance name default to the domain 2020-02-25 21:59:37 +03:00
Egor Kislitsyn
22018adae6
Fix Dialyzer warnings 2020-02-25 18:34:56 +04:00
rinpatch
035c2c1415 Merge branch 'fix/instance-gen-custom-static' into 'develop' 
instance.gen task: fix crash when using custom static directory

Closes #1082

See merge request pleroma/pleroma!2237
 2020-02-24 20:52:10 +00:00
rinpatch
5e4fe0e8f7 instance.gen task: fix crash when using custom static directory 
Closes #1082
 2020-02-24 23:42:24 +03:00
eugenijm
7ad5c51f23 Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope 2020-02-24 21:46:37 +03:00
Alexander Strizhakov
8efae966b1
open conn in separate task 2020-02-24 19:56:27 +03:00
Alexander Strizhakov
514c899275
adding gun adapter 2020-02-18 08:19:01 +03:00
rinpatch
8fda6303ba Fix email mix task on OTP releases 
Closes pleroma#1548
 2020-02-09 03:27:29 +03:00
Haelwenn (lanodan) Monnier
4eb935be78
Create pleroma.email mix task 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
 2020-01-28 16:49:38 +01:00
Alexander Strizhakov
6252e82f85
respect settings from database in mix tasks 2020-01-25 10:33:27 +03:00
Alexander Strizhakov
e8e57e398f
restart config id after truncate 2020-01-23 17:48:45 +03:00
Alexander Strizhakov
4344c5d5b9
truncate config table on migrate to db task 2020-01-23 17:23:02 +03:00
Alexander Strizhakov
f01ab6cd29
some refactor and tests 2020-01-21 18:42:00 +03:00
Alexander Strizhakov
efb8ef5abe
releases support 2020-01-18 17:14:50 +03:00
Alexander Strizhakov
7676ed8239
some clean up 2020-01-17 16:28:44 +03:00
Alexander Strizhakov
ce027fd0ef
revert non needable 2020-01-17 15:13:24 +03:00
Alexander Strizhakov
9e10b90b5b
configure only console backend 2020-01-17 15:06:42 +03:00
Alexander Strizhakov
b310feeccb
compile fix 2020-01-17 15:00:20 +03:00
Alexander Strizhakov
60ba2339a2
saving to DB only added by user settings 2020-01-17 11:45:44 +03:00
Alexander Strizhakov
29155137fd
renaming 
Pleroma.Web.AdminAPI.Config -> Pleroma.ConfigDB
 2020-01-16 08:50:27 +03:00
Alexander Strizhakov
66de2b159b
don't migrate Pleroma.Web.EndPoint settings 
don't set Logger level to all tasks
 2020-01-15 17:08:45 +03:00
Alexander Strizhakov
3453b27015
don't migrate prometheus settings 2020-01-10 21:24:06 +03:00
Alexander Strizhakov
eadb674c41
don't migrate configurable_from_database setting 2020-01-10 19:44:30 +03:00
Alexander Strizhakov
7d128ca208
dynamic_configuration renaming 
and moving it from instance settings
 2020-01-10 19:34:19 +03:00
Alexander
a71393dd29
fix for endpoints after env update 2020-01-10 15:52:00 +03:00
Alexander
0656816c77
tests for setttings without an explicit key 2020-01-10 15:51:59 +03:00
Alex S
2753285b77
config editing through database 2020-01-10 15:51:59 +03:00
Ivan Tashkinov
835ac2157c Merge remote-tracking branch 'remotes/upstream/develop' into 1427-oauth-admin-scopes 
# Conflicts:
#	CHANGELOG.md
 2019-12-10 08:55:14 +03:00
Maksim Pechnikov
9dfaa0b832 fix loads config variable with large value from db 2019-12-09 22:29:44 +03:00
lain
f3c2363f4a Merge branch 'fix/user-list-task' into 'develop' 
Fix `mix pleroma.user list` task

See merge request pleroma/pleroma!2029
 2019-12-09 14:44:56 +00:00
Ivan Tashkinov
13926537b6 Merge remote-tracking branch 'remotes/origin/develop' into 1427-oauth-admin-scopes 2019-12-06 00:26:31 +03:00
Ivan Tashkinov
af42c00cff [#1427] Reworked admin scopes support. 
Requalified users.is_admin flag as legacy accessor to admin actions in case token lacks admin scope(s).
 2019-12-06 00:25:44 +03:00
Egor Kislitsyn
356a936ecb Fix mix pleroma.user list task 2019-12-02 18:11:45 +07:00
Maksim Pechnikov
a36607c27e add mix task to set\unset privacy option of notification 2019-11-28 22:13:28 +03:00
rinpatch
c2ad9fd5f9 Merge branch 'list-users' into 'develop' 
Add CLI list users command

See merge request pleroma/pleroma!1990
 2019-11-21 20:33:11 +00:00
Alex Schroeder
fbc379d689 Add CLI list users command 2019-11-21 21:07:06 +01:00
Mark Felder
edaae845af Some tasks try to set log level in test environment, but we were stripping logs belog :warn. 
Ensure console backend logs in test environment are :warn, but mix tasks run in test env
do not run with :debug because it's far too verbose.
 2019-11-20 11:55:30 -06:00
Mark Felder
ff9133b978 Allow mix tasks to always run with debug logging 2019-11-19 16:01:17 -06:00
Alexander
6a4201e0b4
fix for migrate task 2019-11-10 22:54:37 +03:00
Egor Kislitsyn
4c1dd55c48 Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships 2019-10-24 14:55:36 +07:00
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships 2019-10-21 14:19:15 +07:00
Ivan Tashkinov
c6fdfbc4f1 Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation 
# Conflicts:
#	CHANGELOG.md
#	lib/pleroma/notification.ex
#	lib/pleroma/user.ex
#	lib/pleroma/user/info.ex
#	lib/pleroma/web/activity_pub/activity_pub.ex
#	lib/pleroma/web/admin_api/admin_api_controller.ex
#	lib/pleroma/web/ostatus/handlers/follow_handler.ex
#	lib/pleroma/web/ostatus/ostatus.ex
#	lib/pleroma/web/salmon/salmon.ex
#	lib/pleroma/web/websub/websub.ex
#	test/web/admin_api/admin_api_controller_test.exs
#	test/web/federator_test.exs
#	test/web/mastodon_api/controllers/conversation_controller_test.exs
#	test/web/ostatus/ostatus_controller_test.exs
#	test/web/ostatus/ostatus_test.exs
#	test/web/salmon/salmon_test.exs
#	test/web/websub/websub_test.exs
 2019-10-20 20:43:18 +03:00
Ivan Tashkinov
e8843974cb [#1304] Moved remaining fields from User.Info to User. 
Misc. fixes / improvements.
 2019-10-20 13:42:42 +03:00
rinpatch
fd6d05dc45 Merge branch 'mix-emoji-task-pack-json' into 'develop' 
For pleroma.emoji downloaded packs, generate pack.json instead

See merge request pleroma/pleroma!1748
 2019-10-19 08:51:03 +00:00
Maxim Filippov
019147f115 Merge branch 'develop' into feature/relay-list 2019-10-18 18:35:58 +02:00
rinpatch
39e996528c Fix a migration wiping user info of users that don't have any mutes 
And introduce safe_jsonb_set
 2019-10-18 15:22:07 +03:00
Ivan Tashkinov
10ff01acd9 [#1304] Moved all non-mutes / non-blocks fields from User.Info to User. WIP. 2019-10-16 21:59:21 +03:00
Ekaterina Vaartis
fbe5a00475 For pleroma.emoji downloaded packs, generate pack.json instead 2019-10-15 09:53:28 +03:00
Maxim Filippov
cc6875b582 Add GET /api/pleroma/admin/relay endpoint - lists all followed relays 2019-10-11 19:12:29 +03:00
Egor Kislitsyn
059005ff82
Replace user.following with Pleroma.FollowingRelationship 2019-10-11 02:35:32 +07:00
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users 2019-10-09 13:11:57 +07:00
rinpatch
1cae564b5d Move config task docs to a separate file and mark it as WIP 2019-10-03 14:12:57 +03:00
rinpatch
e00403af23 Mix tasks: derive moduledoc from doc files 2019-10-03 14:00:23 +03:00
rinpatch
6baa037903 Move database maintenance tasks docs to a separate file 2019-10-03 11:17:29 +03:00
rinpatch
b4ca864c6b Move user tasks docs to a separate file 2019-10-03 10:15:24 +03:00
rinpatch
d39ccc2e7f Move uploads task docs to a separate file 2019-10-03 09:35:21 +03:00
rinpatch
808d0a0170 Move relay docs to a separate file 2019-10-03 09:10:31 +03:00
rinpatch
6435ba83cd Move instance CLI task docs to a text file 2019-10-03 09:06:06 +03:00
rinpatch
869ea2ab90 Move digest email docs to a separate file and improve styling 2019-10-03 01:10:36 +03:00
rinpatch
bd9c7807fb Move emoji task docs to a separate file 2019-10-03 01:03:47 +03:00
kaniini
48a82c4609 Merge branch 'refactor/user' into 'develop' 
Simplify updating user's `info`

See merge request pleroma/pleroma!1712
 2019-09-26 03:00:38 +00: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
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
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
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
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
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
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
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
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
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
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
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
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