Ivan Tashkinov
e7864a32d7
[ #3213 ] Removed DISTINCT clause from ActivityPub.fetch_activities_query/2.
2021-01-25 22:31:23 +03:00
Ivan Tashkinov
694d98be55
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-25 21:24:07 +03:00
537ba1c5e0
Merge branch 'develop' into refactor/deactivated_user_field
2021-01-25 09:45:06 -06:00
Ivan Tashkinov
c041e9c630
[ #3213 ] HashtagsTableMigrator: failures handling fix, retry function.
...
Changed default hashtags filtering strategy to non-aggregate approach.
2021-01-21 20:23:08 +03:00
Ivan Tashkinov
2634a16b4c
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
...
# Conflicts:
# CHANGELOG.md
2021-01-21 20:20:35 +03:00
Alexander Strizhakov
6d48144a9d
use proper naming
...
for MediaProxyWarmingPolicy in ConcurrentLimiter
2021-01-21 09:50:18 +03:00
Ivan Tashkinov
48b399cedb
[ #3213 ] Refactoring of HashtagsTableMigrator. Hashtag timeline performance optimization (auto switch to non-aggregate join strategy when efficient).
2021-01-16 20:22:14 +03:00
Mark Felder
860b5c7804
Change user.deactivated field to user.is_active
2021-01-15 11:24:46 -06:00
Ivan Tashkinov
e350898828
Merge remote-tracking branch 'remotes/origin/develop' into feature/object-hashtags-rework
2021-01-13 22:11:16 +03:00
Ivan Tashkinov
3e4d84729a
[ #3213 ] Prototype of data migrations functionality / HashtagsTableMigrator.
2021-01-13 22:07:38 +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
cf0eb0c1c5
Merge branch 'object-normalize-refactor' into 'develop'
...
Object: Rework how Object.normalize works
See merge request pleroma/pleroma!3229
2021-01-07 11:09:18 +00:00
64116f63d9
URI.encode custom emojis
2021-01-05 12:29:51 -06:00
lain
20a269ed69
Merge branch 'fix/pagination-regression' into 'develop'
...
Do not try to guess which pagination we need by the existence of an :offset param.
Closes #2399
See merge request pleroma/pleroma!3230
2021-01-05 12:40:45 +00:00
lain
f0e6cff583
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1526-account-aliases
2021-01-05 12:42:30 +01:00
lain
d44850d7a5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into object-normalize-refactor
2021-01-05 10:48:32 +01:00
lain
8e5904daa5
SideEffects.DeleteTest: asyncify.
...
Replace Mock with Mox, mock out Logger.
2021-01-04 18:40:59 +01:00
83f27282ba
Do not try to guess which pagination we need by the existence of an :offset param.
...
Require explicit request to get offset pagination.
2021-01-04 10:13:17 -06: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
2aa60e7592
Apply 1 suggestion(s) to 1 file(s)
2020-12-31 09:58:43 -06:00
Ivan Tashkinov
303055456f
Alternative implementation of hashtag-filtering queries in ActivityPub. Fixed GROUP BY clause for aggregation on hashtags.
2020-12-31 12:45:23 +03:00
Alex Gleason
11d40e92b7
Render AKAs in Actor endpoints
2020-12-30 18:53:27 -06:00
2597b028f7
Make pagination type conditional
2020-12-30 16:37:04 -06:00
085d4e6cfc
Continue to use ActivityPub.fetch_user_activities/3, make it pass :offset
2020-12-30 16:10:10 -06: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
Ivan Tashkinov
14fae94c0e
[ #3213 ] Made Object.hashtags/1 work with :hashtags assoc. Adjusted tests.
2020-12-28 00:08:09 +03: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
Ivan Tashkinov
cbb19d0e18
[ #3213 ] Hashtag-filtering functions in ActivityPub. Mix task for migrating hashtags to hashtags table.
2020-12-26 22:20:55 +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
lain
5db1e6c8d3
Pipeline test: Switch from Mock to Mox.
...
Speeds up the test and makes it possible to run async.
2020-12-21 16:35:12 +01:00
lain
713612c377
Cachex: Make caching provider switchable at runtime.
...
Defaults to Cachex.
2020-12-18 17:44:46 +01:00
Egor Kislitsyn
35ba48494f
Stream follow updates
2020-12-02 00:18:58 +04:00
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
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
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
Ivan Tashkinov
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
Alexander Strizhakov
8a8c154b4e
test fixes
2020-11-19 09:58:32 +03:00
Alexander Strizhakov
be0b874e1d
fix for mastodon forwarded reports
2020-11-19 09:53:14 +03:00
Alexander Strizhakov
e2bf6b1f7e
fix for forwarded reports
2020-11-19 09:53:13 +03:00
d33b9e7b33
Merge branch 'remove/fedsockets' into 'develop'
...
Remove FedSockets
See merge request pleroma/pleroma!3155
2020-11-17 14:58:33 +00:00
rinpatch
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
lain
fec1ed802e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-17 15:01:38 +01:00
lain
81293e5aad
ActivityPubController: Don't return local only objects
2020-11-17 13:11:39 +01:00
Mark Felder
2156de2fee
Ingest blurhash field during transmogrification
2020-11-11 13:39:02 -06:00
Mark Felder
6fd72e9e85
Ingest blurhash for attachments if they were federated
2020-11-11 12:27:51 -06:00
Alexander Strizhakov
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
Egor Kislitsyn
0118ccb53c
Add local visibility
2020-11-11 18:54:01 +04: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
lain
329aa19c9f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-restrict-domain
2020-11-04 15:05:01 +01:00
lain
c7bcbfbc1d
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/local-only-scope
2020-11-04 11:47:41 +01:00
lain
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
Haelwenn (lanodan) Monnier
4caad4e910
side_effects: Don’t increase_replies_count when it’s an Answer
2020-11-02 05:56:17 +01:00
eugenijm
8e41baff40
Add idempotency_key to the chat_message entity.
2020-10-31 05:50:59 +03:00
Egor Kislitsyn
8542d2efee
Merge remote-tracking branch 'origin/develop' into feature/local-only-scope
2020-10-29 14:51:23 +04:00
Ivan Tashkinov
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
minibikini
1bfd8528bb
Merge branch 'develop' into 'feature/local-only-scope'
...
# Conflicts:
# CHANGELOG.md
2020-10-27 18:59:19 +00:00
lain
de6d49c8ce
ActivityPub: Add back debug call + explanation.
2020-10-26 16:33:26 +01:00
lain
9542c5d0f4
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 2236-no-name
2020-10-26 16:30:48 +01:00
Haelwenn
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
rinpatch
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
lain
60e379ce0b
User: Correctly handle whitespace names.
2020-10-23 13:53:01 +02:00
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
lain
8d251096fe
SideEffects: Correctly handle chat messages sent to yourself
2020-10-22 12:22:08 +02:00
lain
e97b254c6b
Transmogrifier: Refactor and unify incoming tag handling
2020-10-19 15:46:24 +02:00
lain
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
Egor Kislitsyn
18a91d85e5
Merge branch 'develop' into feature/local-only-scope
2020-10-19 15:31:56 +04:00
Haelwenn
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
Ivan Tashkinov
9ea31b373f
Merge remote-tracking branch 'remotes/origin/develop' into chore/elixir-1.11
2020-10-17 17:53:47 +03:00
Ivan Tashkinov
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
fb056ce05b
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-15 16:39:01 -05:00
Egor Kislitsyn
2a475622ee
Add Pleroma.Constants.as_local_public/0
2020-10-15 19:07:00 +04:00
Egor Kislitsyn
4f79bbbc31
Add local-only statuses
2020-10-15 18:37:44 +04:00
lain
7a2f100061
ActivityPub: Show own replies to muted users.
...
Aligns mute with block behavior.
2020-10-15 12:28:25 +02:00
77bca41595
Apply 3 suggestion(s) to 3 file(s)
2020-10-14 19:33:54 +00:00
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
Mark Felder
b001237b79
Finish undoing API breakage
2020-10-14 10:44:18 -05:00
Alex Gleason
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
2020-10-13 19:26:04 -05:00
Mark Felder
b738f70953
Merge branch 'develop' into feature/gen-magic
2020-10-13 10:08:38 -05:00
Mark Felder
64553ebae2
Merge branch 'develop' into chore/elixir-1.11
2020-10-13 09:54:53 -05:00
Mark Felder
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
2020-10-13 09:54:29 -05:00
Mark Felder
4ead0d564f
Merge branch 'develop' into refactor/discoverable_user_field
2020-10-13 09:54:11 -05:00
Mark Felder
8bacdc3680
Change user.discoverable field to user.is_discoverable
2020-10-13 09:45:08 -05:00
Mark Felder
9968b7efed
Change user.locked field to user.is_locked
2020-10-13 09:31:13 -05:00
Alexander Strizhakov
9f4fe5485b
alias alphabetically order
2020-10-13 16:43:59 +03:00
Alexander Strizhakov
66e0b0065b
Cache plug module name
2020-10-13 16:43:57 +03:00
Alexander Strizhakov
c6baa811d6
EnsureAuthenticatedPlug module name
2020-10-13 16:43:57 +03:00
Alexander Strizhakov
8c993c5f63
FederatingPlug module name
2020-10-13 16:43:55 +03:00
Mark Felder
8539e386c3
Add missing Copyright headers
2020-10-12 12:00:50 -05:00
