Alexander Strizhakov
6d48144a9d
use proper naming
...
for MediaProxyWarmingPolicy in ConcurrentLimiter
2021-01-21 09:50:18 +03:00
Ivan Tashkinov
e350898828
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-13 22:11:16 +03:00
Haelwenn (lanodan) Monnier
c4439c630f
Bump Copyright to 2021
...
grep -rl '# Copyright © .* Pleroma' * | xargs sed -i 's;Copyright © .* Pleroma .*;Copyright © 2017-2021 Pleroma Authors <https://pleroma.social/ >;'
2021-01-13 07:49:50 +01:00
lain
80167e62dd
Merge branch 'fix/missing_emoji_steal_dir' into 'develop'
...
Create dir for EmojiStealPolicy automatically
See merge request pleroma/pleroma!3218
2021-01-08 13:10:49 +00:00
lain
e1e7e4d379
Object: Rework how Object.normalize works
...
Now it defaults to not fetching, and the option is named.
2021-01-04 13:38:31 +01:00
Haelwenn
3966add048
Revert "Merge branch 'features/hashtag-column' into 'develop'"
...
This reverts merge request !2824
2020-12-28 12:02:16 +00:00
Haelwenn
b122b6ffa3
Merge branch 'features/hashtag-column' into 'develop'
...
Insert text representation of hashtags into object["hashtags"]
See merge request pleroma/pleroma!2824
2020-12-28 10:14:58 +00:00
Haelwenn (lanodan) Monnier
18b536c176
Pleroma.Object/1: take %Object{} as argument instead
2020-12-28 11:05:24 +01:00
Alexander Strizhakov
2e859794ee
non condition dir creation
2020-12-27 21:58:15 +03:00
Alexander Strizhakov
7bfb041658
insreasing test coverage for StealEmojiPolicy
2020-12-27 21:53:30 +03:00
Alexander Strizhakov
aafd7b44ce
check dir existence in policy
2020-12-27 21:53:30 +03:00
Ivan Tashkinov
4134abef63
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2020-12-26 22:23:05 +03:00
Haelwenn (lanodan) Monnier
87b13c5430
Create Object.hashtags/1 wrapper
2020-12-22 05:15:34 +01:00
Haelwenn (lanodan) Monnier
acb03d591b
Insert text representation of hashtags into object["hashtags"]
...
Includes a new mix task: pleroma.database fill_old_hashtags
2020-12-22 05:15:34 +01:00
Ivan Tashkinov
ee221277b0
Encapsulation of tags / hashtags fetching from objects.
2020-12-21 22:54:26 +03:00
lain
ab633e51ab
Linting
2020-12-21 16:48:35 +01: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
Alexander Strizhakov
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
Alexander Strizhakov
f97f24b067
making credo happy and test fix
2020-11-11 10:48:03 +03:00
Alexander Strizhakov
efc27f6464
fix for adminFE
...
- revert UserAllowPolicy description
- MRF descriptions order
2020-11-11 10:10:57 +03:00
Alexander Strizhakov
485697d96c
config descriptions for custom MRF policies
2020-11-10 19:20:14 +03:00
Ivan Tashkinov
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
2020-09-17 22:22:59 +03:00
Haelwenn (lanodan) Monnier
abf25e5d52
Create MRF.filter_pipeline to inject :object_data when present
2020-09-17 22:07:54 +03:00
Haelwenn (lanodan) Monnier
3a0f99ed35
KeywordPolicy: Still match when fields are absent
2020-09-17 22:07:54 +03:00
Ivan Tashkinov
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
2020-09-15 20:29:39 +03:00
Mark Felder
c0b36621f1
Ensure we only apply NSFW Simple policy on parsable objects
2020-09-11 23:22:14 -05:00
Ivan Tashkinov
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
Alexander Strizhakov
9bf1065a06
schedule activity expiration in Oban
2020-09-10 21:50:40 +03:00
Ivan Tashkinov
148bc24435
[ #2497 ] Removed Hackney-specific code
...
(no longer needed due to adapter options unification).
2020-09-10 11:54:10 +03:00
Mark Felder
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
2020-09-09 11:11:36 -05:00
Mark Felder
21efda2edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
2020-09-08 09:31:26 -05:00
Alibek Omarov
95688c90ad
ForceBotUnlistedPolicy: simplify code
2020-09-08 01:15:15 +02:00
Alibek Omarov
8b695c3eeb
ForceBotUnlistedPolicy: format
2020-09-07 22:53:45 +02:00
Alibek Omarov
699224a900
ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version
2020-09-07 22:15:42 +02:00
Alexander Strizhakov
696bf09433
passing adapter options directly without adapter key
2020-09-07 19:59:17 +03:00
Alexander Strizhakov
a83916fdac
adapter options unification
...
not needed options deletion
2020-09-07 19:59:17 +03:00
Ivan Tashkinov
88a6ee4a59
[ #2497 ] Func defs grouping fix.
2020-09-05 20:23:18 +03:00
Ivan Tashkinov
f170d47130
[ #2497 ] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs.
...
Removed :preview pool in favor of existing :media one. Misc. refactoring.
2020-09-05 20:19:09 +03:00
Mark Felder
4e6eb22b4a
Try to warm the cache with the preview image if preview proxy enabled
2020-08-21 12:19:35 -05:00
Egor Kislitsyn
91fbb5b21f
Fix ActivityExpirationPolicy
2020-08-04 18:26:37 +04:00
lain
56b5b9aa27
Merge branch 'follower-mrf-again' into 'develop'
...
Follower mrf again
See merge request pleroma/pleroma!2833
2020-08-03 14:22:11 +00:00
lain
10c792110e
MRF Object Age Policy: Don't break on messages without cc/to
2020-08-03 14:12:32 +02:00
lain
4b18a07392
Revert "Merge branch 'revert-1ac0969c' into 'develop'"
...
This reverts merge request !2825
2020-07-31 15:18:04 +00:00
lain
010d77ec85
Revert "Merge branch 'mrf-silence-2' into 'develop'"
...
This reverts merge request !2820
2020-07-31 15:17:09 +00:00
lain
1dd162a5f7
SimplePolicy: Fix problem with DM leaks.
2020-07-31 09:57:30 +02:00
Alex Gleason
702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence
2020-07-29 13:01:16 -05:00
Alex Gleason
93638935d7
SimpleMRF: :silence --> :followers_only
2020-07-29 12:58:08 -05:00
lain
edf8b6abfe
EnsureRePrepended: Don't break on chat messages.
2020-07-29 10:53:08 +02:00
Alex Gleason
2a99e7df8e
SimpleMRF silence: optimize, work okay with nil values in addressing
2020-07-28 20:32:58 -05:00
Alex Gleason
3c90f7f715
SimpleMRF: Let instances be silenced
2020-07-28 19:06:42 -05:00
Haelwenn (lanodan) Monnier
858d9fc7e8
MRF Policies: Return a {:reject, reason} instead of {:reject, nil}
2020-07-14 11:04:16 +02:00
Mark Felder
d23804f191
Use the Pleroma.Config alias
2020-07-09 10:53:51 -05:00
lain
04abee782b
AntiSpamLinkPolicy: Exempt local users.
2020-06-25 12:40:39 +02:00
Haelwenn
c7d69e9256
Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
...
Moving mrf settings from instance to separate mrf group
Closes #1631
See merge request pleroma/pleroma!2320
2020-06-23 16:38:27 +00:00
lain
35e9282ffd
HellthreadPolicy: Restrict to Notes and Articles.
2020-06-22 10:35:11 +02:00
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group
2020-06-16 18:32:18 +03:00
href
cb7be6eef2
Remove use of atoms in MRF.UserAllowListPolicy
2020-06-13 12:08:46 +03:00
Egor Kislitsyn
d44843e677
Restrict ActivityExpirationPolicy to Notes only
2020-06-08 17:56:34 +04:00
Egor Kislitsyn
a7627bdc7a
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-06-01 15:48:51 +04:00
Haelwenn (lanodan) Monnier
e688d4ee69
MRF.StealEmojiPolicy: New Policy
...
Inspired by https://git.pleroma.social/moonman/emoji-stealer-mrf/-/blob/master/steal_emoji_policy.ex
2020-05-14 09:59:56 +02:00
Egor Kislitsyn
c56c0a3d23
Merge branch 'develop' into global-status-expiration
2020-04-24 18:37:58 +04:00
Egor Kislitsyn
364eecc49f
Merge branch 'develop' into global-status-expiration
2020-04-20 20:37:56 +04:00
Alex Gleason
bedc558809
Merge remote-tracking branch 'upstream/develop' into accept-deletes
2020-04-20 10:15:40 -05:00
Alex Gleason
b54c8813d6
Add :reject_deletes option to SimplePolicy
2020-04-20 10:11:06 -05:00
Ilja
8b4de61d64
Fix ObjectAgePolicyTest
...
The policy didn't block old posts as it should.
* I fixed it and tested on a test server
* I added the settings to description so that this information is shown in nodeinfo
* TODO: I didn't work TTD and still need to fix the tests
2020-04-20 12:59:16 +00:00
Alex Gleason
9a3c74b244
Always accept deletions through SimplePolicy
2020-04-12 20:26:35 -05:00
Egor Kislitsyn
7f692343c8
Merge branch 'develop' into global-status-expiration
2020-04-10 14:20:48 +04:00
Egor Kislitsyn
d1c7f8e576
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-12 16:02:24 +04:00
Alexander Strizhakov
22d52f5691
same copyright date format
2020-03-04 09:41:23 +03: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
Egor Kislitsyn
0f386110c6
Merge remote-tracking branch 'origin/develop' into global-status-expiration
2020-03-03 00:32:34 +04:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
Egor Kislitsyn
011ede4536
Update documentation
2020-02-21 14:42:43 +04:00
Egor Kislitsyn
819cd46717
Auto-expire Create activities only
2020-02-20 22:04:02 +04:00
Mark Felder
cf94349287
Merge branch 'develop' into gun
2020-02-18 09:06:27 -06:00
lain
3fa2ac68df
Merge branch 'chore/standardize-mrf-behavior' into 'develop'
...
Standardize @behaviour usage in MRFs
See merge request pleroma/pleroma!2212
2020-02-18 14:36:10 +00:00
Alexander Strizhakov
514c899275
adding gun adapter
2020-02-18 08:19:01 +03:00
rinpatch
472132215e
Use floki's new APIs for parsing fragments
2020-02-16 01:55:26 +03:00
Mark Felder
478619782b
Standardize @behaviour usage in MRFs
2020-02-14 11:02:24 -06:00
Egor Kislitsyn
57878f8708
Improve readability
2020-02-14 15:50:31 +04:00
Egor Kislitsyn
241a3d744a
Add ActivityExpirationPolicy
2020-02-13 22:27:10 +04:00
feld
237b2068f9
Revert "Merge branch 'feat/floki-fasthtml' into 'develop'"
...
This reverts merge request !2194
2020-02-11 16:55:18 +00:00
rinpatch
ea1631d7e6
Make Floki use fast_html
2020-02-11 16:17:21 +03:00
Alexander Strizhakov
503d966e9f
Merge branch 'develop' into admin-be
2020-01-21 10:32:27 +03:00
Haelwenn (lanodan) Monnier
5c533e10e7
Bump credo to 1.1.5
2020-01-20 12:17:14 +01:00
Alex S
2753285b77
config editing through database
2020-01-10 15:51:59 +03:00
Egor Kislitsyn
ee6805850c
Set log level to debug for not important messages
2019-12-11 17:47:19 +07:00
Ariadne Conill
eecd64cc07
object age policy: remove debug logging
2019-11-14 19:56:14 -06:00
Ariadne Conill
5705cf0e3e
MRF: add ObjectAgePolicy which deals with old posts being imported
2019-11-14 19:48:10 -06: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
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject
2019-10-07 03:49:57 +02:00
Ivan Tashkinov
dd017c65a4
[ #1149 ] Refactored Oban workers API (introduced enqueue/3).
2019-08-31 21:58:42 +03:00
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
2019-08-31 19:08:56 +03:00
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
2019-08-31 14:25:43 +03:00
feld
7853b3f17d
Fix AntiFollowbotPolicy when trying to follow a relay
2019-08-30 00:38:03 +00:00
Ivan Tashkinov
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
2019-08-22 20:59:58 +03:00
Ariadne Conill
626e094589
MRF: fix up unserializable option lists in describe implementations
2019-08-14 18:54:17 +00:00
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
2019-08-14 21:44:50 +03:00
