79e503b3f5
Merge branch 'docker-speedup' into 'develop'
...
Docker speedup
See merge request pleroma/pleroma!837
6 years ago
ae84af4ad0
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
...
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
6 years ago
71c8c60ded
More speedup, test fixes.
6 years ago
d0a94f98e0
more tests for HellthreadPolicy
6 years ago
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
6 years ago
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
6 years ago
72a4272d84
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
6 years ago
f469a8610f
Check that the welcome message is sent from the correct user.
6 years ago
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
6 years ago
d812a347ca
Add optional welcome message.
6 years ago
921571c19b
Merge branch 'hellthread-filter-fix' into 'develop'
...
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
6 years ago
dca6bee2f7
Rename test, add check for follower collection when delisting
6 years ago
b63a5e309d
Merge branch 'bugfix/actor-containment' into 'develop'
...
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
6 years ago
d943c90249
Add tests, change default config values, fix a bug
6 years ago
ecdf0657ba
Add logic for keeping follow_request_count up-to-date on the `follow`,
...
`approve_friend_request`, and `deny_friend_request` actions.
Add follow_request_count to the user view.
6 years ago
32b1649434
test: user: add a test for whether user search returns a user or not
6 years ago
ea2698beb7
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
...
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
6 years ago
907306174b
fix S3 links encoding in Mediaproxy
6 years ago
19756d68f2
Merge branch 'fix/credo-issues-test' into 'develop'
...
Fix credo issues in ./test
See merge request pleroma/pleroma!808
6 years ago
e031cc6473
tests: update tests for totalItems leak fix
6 years ago
64620d8980
activitypub: user view: do not expose oAuth endpoints for instance users
6 years ago
889ad95a2a
tests: add some reserialization tests based on IR differences
6 years ago
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
6 years ago
d54c483964
tests: add tests for endpoints
6 years ago
88a4de24f9
User.follow_all: Respect blocks in both directions.
6 years ago
62a45bdc11
Add revoke token
6 years ago
61a4bc5095
Add OAuth tokens endpoint
6 years ago
379d04692c
Filter summary in keywordpolicy
6 years ago
ac72b578da
Merge branch 'develop' into feature/thread-muting
6 years ago
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
6 years ago
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
6 years ago
305d219413
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/federator/federator.ex
# lib/pleroma/web/websub/websub.ex
6 years ago
74579115a7
test: Change `lenght(…) == 0` to `Enum.empty?(…)`
6 years ago
8bb7e19b38
test: de-group alias/es
6 years ago
e0de0fcf22
Merge branch 'object-creation' into 'develop'
...
Do object insertion through Cachex
See merge request pleroma/pleroma!802
6 years ago
d5fe05c37e
Merge branch 'follow-enhancements' into 'develop'
...
Respect blocks in mass follow.
See merge request pleroma/pleroma!797
6 years ago
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
6 years ago
6a150de3bd
Add unique index and unique constraint check, uniqueness test fails
6 years ago
478a05b4c9
Merged "check mute" test into the other two
6 years ago
a0d732ec55
it works!!
6 years ago
4430a0ad12
added another test
6 years ago
09189c3a7c
Made a test!
6 years ago
bbd0049fae
Respect blocks in mass follow.
6 years ago
b05a341187
oof
6 years ago
9a23f8f3ea
Add tests and fix a typo in docs
6 years ago
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
6 years ago
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
6 years ago
26670b09a7
tests: add a rich media card that contains all relevant fields
6 years ago
6eb8c1eb92
test: add some regression tests for the rich media card rendering
6 years ago
5b1d7c3c56
fix tests
6 years ago
6f05f448f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
6 years ago
035eaeb9b8
Allow to configure visibility for admin and moderator badges
6 years ago
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
6 years ago
73e6a1f1dd
test: twitterapi: fix another possible test failure case
6 years ago
eb2b1960e0
Merge branch 'feature/split-hide-network-v2' into 'develop'
...
Split hide_network into hide_followers & hide_followings (fixed)
See merge request pleroma/pleroma!765
6 years ago
c4d317ccb6
test: twitterapi: fix the test breakage for real
6 years ago
3a3a3996b7
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/federator/federator.ex
6 years ago
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
6 years ago
69a38644bc
Merge branch '589-fix-cache' into 'develop'
...
Resolve "Update object cache on favs/boosts"
Closes #589
See merge request pleroma/pleroma!764
6 years ago
e61f0be951
Unbreak all the tests.
6 years ago
505a084058
Still do caching in tests.
6 years ago
3913b0196e
[ #582 ] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified.
...
Added tests.
6 years ago
b40b4bc4e5
[ #582 ] Optimized federation retirement by reducing the number of SQL calls
...
(calling `Instances.set_reachable/1` only if instance had `unreachable_since`,
calling `Instances.set_unreachable/1` only if instance had nil `unreachable_since`).
6 years ago
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
6 years ago
7e384a2425
Merge branch 'develop' into 'develop'
...
Use nodeinfo 2.1
See merge request pleroma/pleroma!753
6 years ago
e8c7be38fc
add tests for nodeinfo 2.0 compat and 2.1's new field
6 years ago
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
6 years ago
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
6 years ago
c05928dbda
use nodeinfo 2.1, add repository field
...
that is the only change from nodeinfo 2.0 to 2.1
also this makes the nodeinfo tests use 2.1.json instead of 2.0.json
6 years ago
308b35ebe2
User.follow_all: ensure its stays unique
6 years ago
106475f265
test: http mocks: formatting
6 years ago
3f5b784596
test: rich media: parser: add malformed data regression test
6 years ago
4e76f9fde1
test: add malformed OGP data fixture
6 years ago
a43a1c6d4e
Revert "Merge branch 'spc-fix-3' into 'develop'"
...
This reverts merge request !682
6 years ago
4d3655c479
Merge branch 'spc-fix-3' into 'develop'
...
Spc fix 3
See merge request pleroma/pleroma!682
6 years ago
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
6 years ago
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
6 years ago
c53b96a024
Fix specs.
6 years ago
47ec690c54
Use race-condition free mass follow.
6 years ago
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
6 years ago
ebb3496386
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
...
Rich Media support, part 2.
See merge request pleroma/pleroma!719
6 years ago
61d6715714
rich media: oembed: return data in the same format as the other parsers
6 years ago
3e968f9ef2
Format
6 years ago
50d6183893
Split hide_network into hide_followers & hide_followings
6 years ago
55affbca7f
add a job queue
6 years ago
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
6 years ago
8e8a1e1ba8
Return new-style config if old-style config is set to false.
...
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
6 years ago
1825118fd4
Correctly handle invalid credentials on auth login.
...
Closes #407
6 years ago
339c26e12b
test: add status posting with OGP link preview test
6 years ago
6096846f5f
API: kill /api/rich_media/parse endpoint
6 years ago
020b3b29d9
test: update twitterapi tests
6 years ago
364cf5369b
test: update mastodon status view tests
6 years ago
132d815f1f
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
6 years ago
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
6 years ago
2e277dd4ad
Fix objects.
6 years ago
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
6 years ago
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
6 years ago
155a884300
Merge branch 'flake-from-int' into 'develop'
...
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
6 years ago
d6015338c8
Flake: support integers in from_string/1
...
Some previously issued stateless tokens have integer ids in them.
6 years ago
1f7843b9b8
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
6 years ago
3f64379b13
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
6 years ago
d9f3af477d
Move definitions of RichMedia fixtures to test/support/http_request_mock.ex
6 years ago
22f2687f17
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters
6 years ago
5a84def6a6
Fix the logic in multi-hashtag TLs
6 years ago
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
6 years ago
d8f446f438
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline
6 years ago
499a4591a4
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null
6 years ago
d99650270b
[ #534 ] Federation reachability filtering tests.
6 years ago
aa8ddfdbe2
SPC fixes: Fix activities.
6 years ago
a45a903480
Fix OGP provider tests
6 years ago
3a5b3c5a3a
Merge remote-tracking branch 'pl/develop' into oembed_provider
6 years ago
4c99b6d35a
Merge branch 'fix/tusky-dm' into 'develop'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
6 years ago
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
6 years ago
4df71cd88b
Merge branch 'classic-flakeids' into 'develop'
...
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
6 years ago
9274cabe01
Use correct logic to determine "attentions" list
6 years ago
13d72826df
test: add anti-followbot policy tests
6 years ago
4333fea1dc
Send "hide_network" in user_view
6 years ago
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
6 years ago
e221c681dc
New frontend configuration mechanism.
6 years ago
422e60ad76
2019
6 years ago
9d63b27dcd
Test FlakeID old id compat & Ecto type
6 years ago
28d77e373c
Flake Ids for Users and Activities
6 years ago
34d59e4008
[ #502 ] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
6 years ago
762fafe738
Fix buggy test.
6 years ago
8cd853ce0c
Merge branch '530_federator_user_info_overwrite_fix' into 'develop'
...
[#530 ] Prevents user `info` from being overwritten because of race conditions
Closes #530
See merge request pleroma/pleroma!691
6 years ago
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
6 years ago
789a9843da
[ #530 ] Fixed test.
6 years ago
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
6 years ago
f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
6 years ago
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
6 years ago
5803672ae5
Merge branch '116-send-delete-event' into 'develop'
...
Send delete event over Mastodon streaming api
Closes #116
See merge request pleroma/pleroma!688
6 years ago
cf1f35a93a
Send delete event over Mastodon streaming api
...
Closes #116
6 years ago
501fba33d6
Merge branch 'add-custom-emoji-test' into 'develop'
...
Add a test to ensure #39 is fixed.
See merge request pleroma/pleroma!687
6 years ago
be0fb5dec4
Add a test to ensure #39 is fixed.
6 years ago
f3045a179e
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
...
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
6 years ago
cf3099231d
test: transmogrifier: verify directMessage flag is sent outbound based on declared visibility
6 years ago
21ac35fcc0
tests: add tests for DM sanitizer
6 years ago
8d06be35e0
activitypub: utils: add determine_explicit_mentions() and tests
6 years ago
42612b1c8d
Merge branch 'bugfix/improve-boost-targeting' into 'develop'
...
improve handling of non-public Announces
See merge request pleroma/pleroma!681
6 years ago
651ce1c97b
Merge branch '491_full_mentions_in_user_bio' into 'develop'
...
[#491 ] Made user bio preserve full nicknames (nick@host)
Closes #491
See merge request pleroma/pleroma!676
6 years ago
0a97badddd
Format
6 years ago
651a1d64b5
Add current user to mentioned
6 years ago
31517bec12
test: add regression test for to/cc clobbering
6 years ago
e116e55cab
Add actor to recipients
6 years ago
5d4d51e6dc
Add fixes for SPC users.
6 years ago
74346a7035
Fix merge conflict
6 years ago
7bc6208b2f
Fix ostatus test
6 years ago
ed8f55ab8e
[ #477 ] User: FTS and trigram search results mixing (to handle misspelled requests).
6 years ago
lambda