40ff8f5964
Add tests for reserved char escaping in upload
2019-03-05 19:28:58 +03:00
bcd8ef65e0
Merge branch 'add-admin-to-node-info' into 'develop'
...
Include admins in nodeinfo
Closes #689
See merge request pleroma/pleroma!899
2019-03-05 07:05:44 +00:00
788a354ce0
Web.RelMe: Fix having other values in rel attr
...
One example of this is Github which puts a rel="nofollow me" on the
profile link.
2019-03-05 02:13:22 +01:00
d1de0a30cc
Include admins in nodeinfo
2019-03-05 03:17:24 +03:00
e34710b988
Format & update docs
2019-03-04 21:33:53 +03:00
9f3cb38012
helpers: use AutoLinker to validate URIs as well as the other tests
2019-03-04 18:31:49 +00:00
d7a278a733
tests: add tests for rich media helper functions
2019-03-04 18:31:49 +00:00
d45dbdce5a
Merge branch 'feature/add-status-text-to-notifications' into 'develop'
...
Add status text to notifications (mentions and reposts)
Closes #696
See merge request pleroma/pleroma!897
2019-03-04 18:29:13 +00:00
f620199836
Merge search endpoint into /users
2019-03-04 21:26:32 +03:00
cc7b35e097
Add status text to notifications (mentions and reposts)
2019-03-04 20:47:34 +03:00
ca5d894e68
Merge branch 'fix/like-adressing' into 'develop'
...
Stop adresssing like activities to actor's follower collection on non-public posts
See merge request pleroma/pleroma!896
2019-03-04 15:59:57 +00:00
33c614bce0
Stop adresssing like activities to actor's follower collection on non-public posts
2019-03-04 18:09:58 +03:00
aab86698a5
Expand "to" of delete activities
2019-03-04 11:18:45 +01:00
86e4b48a5e
Fix DM visibility for blocking users
2019-03-04 06:24:27 +03:00
ace4231628
Merge branch 'features/bio_rel_me' into 'develop'
...
Add rel=me to the User bio
Closes #423
See merge request pleroma/pleroma!813
2019-03-03 16:00:49 +00:00
6c6a2dbfdd
Merge branch 'feature/add-pagination-to-users-admin-api' into 'develop'
...
Add pagination and search to users
See merge request pleroma/pleroma!873
2019-03-03 15:59:15 +00:00
b531e366df
Merge branch 'get-follow-requests-sql' into 'develop'
...
Use sql query in User.get_follow_requests/1 for filtering logic
See merge request pleroma/pleroma!883
2019-03-03 15:51:32 +00:00
c93479c6f5
Merge branch 'count-only-public-statuses' into 'develop'
...
Increment user note count only on public activities #703
See merge request pleroma/pleroma!884
2019-03-03 15:49:19 +00:00
d5418e9ff7
Remove follow_request_count as it's not needed for FE anymore.
...
MastoFE uses `GET /api/v1/follow_requests` and PleromaFE uses
`GET /api/pleroma/friend_requests` which they query on the initial page
load.
2019-03-03 18:42:27 +03:00
9b63fda9c7
Merge branch 'fix/dont-show-dms-in-mentions-timeline' into 'develop'
...
[#675 ] Do not show DMs in mentions timeline
See merge request pleroma/pleroma!877
2019-03-03 11:13:59 +00:00
c46950d3b1
Increment user note count only on public activities
2019-03-03 14:08:43 +03:00
1a1f4520cd
Use sql query in User.get_follow_requests/1 for filtering logic
2019-03-02 22:18:56 +03:00
bf30df99cb
We do not guarantee the order of elements when we search
2019-03-02 17:32:40 +03:00
2ec8cf5665
Add pagination to search
2019-03-02 17:21:30 +03:00
f38c316e6e
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
...
Bugfix: OAuth scopes formatting
Closes #702
See merge request pleroma/pleroma!881
2019-03-02 06:39:07 +00:00
7b9868f343
Pleroma.UserTest: Add tests for rel=me
2019-03-02 06:59:09 +01:00
8e6f7fdb86
RelMe.maybe_put_rel_me/2: When true put "me" otherwise nil
2019-03-02 06:58:42 +01:00
25e588496a
Pleroma.Web.RelMeTest: Add test against Pleroma.Web.RelMe
2019-03-02 06:31:33 +01:00
bb9e40968a
Web.OAuth.OAuthControllerTest: Add test against token formatting
2019-03-02 04:10:57 +01:00
a25c1313ae
Format
2019-03-01 21:07:05 +03:00
aaa9fed1ca
Fix user_test
2019-03-01 20:58:47 +03:00
f384a9a256
Format
2019-03-01 20:23:19 +03:00
f1a4c3163b
Show current user in users list as well
2019-03-01 20:23:03 +03:00
5b08b470f6
Add "local" params to users search
2019-03-01 20:13:02 +03:00
9c6abec4d8
use commonapi.post instead of activitybulder
2019-03-01 15:48:04 +03:00
1341ee650e
[ #675 ] Do not show DMs in mentions timeline
2019-03-01 09:37:29 +03:00
46f29b9da1
Add search users endpoint
2019-02-28 19:04:47 +03:00
70e82a3465
Add test for the second page
2019-02-28 17:54:02 +03:00
cf426a719d
Merge branch 'with-mutes' into 'develop'
...
Add `with_muted` param.
Closes #683
See merge request pleroma/pleroma!872
2019-02-28 10:22:19 +00:00
089e2588a3
Merge branch 'speedup-follow-requests' into 'develop'
...
Speedup follow requests
Closes #677
See merge request pleroma/pleroma!871
2019-02-28 10:10:03 +00:00
3c849d0438
Merge branch 'deactivated-in-user-view' into 'develop'
...
Add activation status to the regular user view
See merge request pleroma/pleroma!874
2019-02-28 10:08:31 +00:00
6b11011039
Added deactivated to the user view
2019-02-28 09:08:34 +03:00
2883f75a3a
Add pagination to users admin API
2019-02-28 01:11:56 +03:00
bbbdbec4fd
Remove parts of the old activity view.
...
Not used anymore.
2019-02-27 17:24:51 +01:00
9ade1242c2
Add user muted status info to twitterapi.
2019-02-27 16:52:03 +01:00
c1ae495878
Add user muted status info to MastodonAPI.
2019-02-27 16:46:47 +01:00
c4235f96bd
Add `with_muted` param.
2019-02-27 16:37:42 +01:00
8d8cb08f94
Add follow request test.
2019-02-27 14:51:07 +01:00
1536640962
mastodon api: embed relationship card under account card for Pleroma FE convenience
2019-02-27 13:01:10 +00:00
5d961d536c
fix formatter
2019-02-27 15:40:30 +07:00
ed7fd6b47e
Add missing docs and tests
2019-02-27 03:08:03 +03:00
c3ac9424d2
AutoLinker
2019-02-26 23:32:26 +00:00
9e0686efa6
Move visibility into own module.
2019-02-22 13:29:52 +01:00
62296f5a25
Fix private post card handling.
2019-02-22 12:02:51 +01:00
7c722c08f5
Fix: Fixing an outbox related bug when local user activity is empty
2019-02-22 04:37:48 +00:00
e95dbecf3e
tests: fix formatting
2019-02-20 20:49:10 +00:00
aa45674be6
tests: add test for fetching AP objects with application/json.
2019-02-20 20:45:09 +00:00
3ee77e95b2
tests: fix tests
2019-02-20 17:23:05 +00:00
bff9eb5ef7
Reports
2019-02-20 16:51:25 +00:00
59c27f29c8
Add some nicer urls in status view.
2019-02-20 17:36:16 +01:00
b574d97c2e
[ #468 ] Added support for `push` OAuth scope (Mastodon 2.4+).
2019-02-20 17:27:41 +03:00
6fe7acd58e
[ #468 ] Merged `upstream/develop`.
2019-02-20 16:48:59 +03:00
11b3c10c54
Merge branch 'muting' into 'develop'
...
Implement muting, add it to the whole mastodon API
See merge request pleroma/pleroma!319
2019-02-20 13:19:37 +00:00
4196d9af11
Add test for User.mutes and so on.
2019-02-20 14:14:52 +01:00
9ae79bb71a
Add test for muting functionality.
2019-02-20 13:47:44 +01:00
337367d764
[ #468 ] More OAuth scopes-specific tests.
2019-02-20 12:27:28 +03:00
04ee877a20
[ #468 ] Added OAuth scopes-specific tests.
2019-02-19 22:28:21 +03:00
ad2cf4fd86
Add test for mastodon muting endpoints
2019-02-19 21:49:55 +03:00
25b9e7a8c3
Added admin API for changing user activation status
2019-02-19 19:37:02 +03:00
c0ecbf6669
[ #468 ] Merged `upstream/develop`.
2019-02-19 19:10:55 +03:00
833161b5d2
Merge branch 'feature/jobs' into 'develop'
...
Job Queue
See merge request pleroma/pleroma!732
2019-02-18 19:43:06 +00:00
7456338ed3
Merge branch 'feature/add-oauth-tokens-endpoint' into 'develop'
...
Add OAuth tokens endpoint
See merge request pleroma/pleroma!805
2019-02-18 04:02:41 +00:00
c23bd05737
Merge branch 'features/flavour-switching' into 'develop'
...
[MastoAPI] Add switching of frontend flavours
See merge request pleroma/pleroma!807
2019-02-18 04:01:51 +00:00
cd019a5927
Merge branch 'follow-request-count' into 'develop'
...
Follow request count
See merge request pleroma/pleroma!817
2019-02-18 04:01:26 +00:00
3f38a05571
Merge branch 'csv-export' into 'develop'
...
Add option to return all friends in twitter api.
Closes #602
See merge request pleroma/pleroma!833
2019-02-18 03:59:46 +00:00
fd17a0cc9b
Fix test
2019-02-18 00:10:48 +03:00
79e503b3f5
Merge branch 'docker-speedup' into 'develop'
...
Docker speedup
See merge request pleroma/pleroma!837
2019-02-17 17:38:25 +00:00
ae84af4ad0
Merge branch 'fix/hellthread-policy-recipient-check' into 'develop'
...
Fix recipient count in hellthread policy
See merge request pleroma/pleroma!836
2019-02-17 16:57:57 +00:00
71c8c60ded
More speedup, test fixes.
2019-02-17 17:47:24 +01:00
d0a94f98e0
more tests for HellthreadPolicy
2019-02-17 14:33:44 +03:00
bc4f77b10b
[ #468 ] Merged `upstream/develop`, resolved conflicts.
2019-02-17 14:07:04 +03:00
dcf24a3233
[ #468 ] Refactored OAuth scopes' defaults & missing selection handling.
2019-02-17 13:49:14 +03:00
72a4272d84
Web.MastodonAPI.MastodonAPIControllerTest: Add testing of the flavour switching
2019-02-16 19:52:46 +01:00
f469a8610f
Check that the welcome message is sent from the correct user.
2019-02-16 17:24:31 +01:00
38e15930cb
Add option to return all friends in twitter api.
...
Mainly useful for user export.
2019-02-16 17:01:15 +01:00
d812a347ca
Add optional welcome message.
2019-02-16 16:42:34 +01:00
921571c19b
Merge branch 'hellthread-filter-fix' into 'develop'
...
Hellthread filter fix
Closes #634
See merge request pleroma/pleroma!831
2019-02-15 13:18:35 +00:00
dca6bee2f7
Rename test, add check for follower collection when delisting
2019-02-15 13:43:14 +01:00
b63a5e309d
Merge branch 'bugfix/actor-containment' into 'develop'
...
activitypub: correctly handle bare URIs in user lookup
Closes #645
See merge request pleroma/pleroma!829
2019-02-15 12:27:03 +00:00
d943c90249
Add tests, change default config values, fix a bug
2019-02-15 12:47:50 +01:00
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.
2019-02-15 12:20:20 +03:00
32b1649434
test: user: add a test for whether user search returns a user or not
2019-02-14 20:05:08 +00:00
ea2698beb7
Merge branch 'bugfix/activitypub-reserialization' into 'develop'
...
activitypub transmogrifier: fix reserialization edge cases
See merge request pleroma/pleroma!826
2019-02-14 19:54:16 +00:00
907306174b
fix S3 links encoding in Mediaproxy
2019-02-14 15:55:21 +07:00
19756d68f2
Merge branch 'fix/credo-issues-test' into 'develop'
...
Fix credo issues in ./test
See merge request pleroma/pleroma!808
2019-02-14 03:55:26 +00:00
e031cc6473
tests: update tests for totalItems leak fix
2019-02-14 03:22:54 +00:00
64620d8980
activitypub: user view: do not expose oAuth endpoints for instance users
2019-02-14 02:41:21 +00:00
889ad95a2a
tests: add some reserialization tests based on IR differences
2019-02-14 00:59:18 +00:00
063baca5e4
[ #468 ] User UI for OAuth permissions restriction. Standardized storage format for `scopes` fields, updated usages.
2019-02-14 00:29:29 +03:00
d54c483964
tests: add tests for endpoints
2019-02-13 19:48:24 +00:00
88a4de24f9
User.follow_all: Respect blocks in both directions.
2019-02-13 13:52:27 +01:00
62a45bdc11
Add revoke token
2019-02-13 12:59:56 +03:00
61a4bc5095
Add OAuth tokens endpoint
2019-02-13 12:59:56 +03:00
379d04692c
Filter summary in keywordpolicy
2019-02-11 21:35:40 +03:00
ac72b578da
Merge branch 'develop' into feature/thread-muting
2019-02-11 12:10:49 +01:00
c01ef574c1
Refactor as per Rin's suggestions, add endpoint tests
2019-02-11 12:04:02 +01:00
d53e36bf1e
Revert "Merge branch 'object-creation' into 'develop'"
...
This reverts merge request !802
2019-02-11 08:07:39 +00:00
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
2019-02-11 13:54:21 +07:00
74579115a7
test: Change `lenght(…) == 0` to `Enum.empty?(…)`
2019-02-11 03:44:16 +01:00
8bb7e19b38
test: de-group alias/es
2019-02-11 03:44:15 +01:00
e0de0fcf22
Merge branch 'object-creation' into 'develop'
...
Do object insertion through Cachex
See merge request pleroma/pleroma!802
2019-02-10 07:39:27 +00:00
d5fe05c37e
Merge branch 'follow-enhancements' into 'develop'
...
Respect blocks in mass follow.
See merge request pleroma/pleroma!797
2019-02-09 21:03:42 +00:00
f8388be9c6
Do object insertion through Cachex
...
So we don't flood our postgres logs with errors. Should also make things
slightly faster.
2019-02-09 22:01:08 +01:00
6a150de3bd
Add unique index and unique constraint check, uniqueness test fails
2019-02-09 20:52:11 +01:00
478a05b4c9
Merged "check mute" test into the other two
2019-02-09 18:34:00 +01:00
a0d732ec55
it works!!
2019-02-09 17:47:57 +01:00
4430a0ad12
added another test
2019-02-09 14:34:42 +01:00
09189c3a7c
Made a test!
2019-02-09 14:23:51 +01:00
bbd0049fae
Respect blocks in mass follow.
2019-02-09 13:24:23 +01:00
b05a341187
oof
2019-02-09 08:12:30 +03:00
9a23f8f3ea
Add tests and fix a typo in docs
2019-02-08 20:23:26 +03:00
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
2019-02-06 22:34:44 +00:00
1220a17146
Merge branch 'bugfix/rich-media-card' into 'develop'
...
rich media cards: bugfixes and regression tests
See merge request pleroma/pleroma!785
2019-02-06 18:39:13 +00:00
26670b09a7
tests: add a rich media card that contains all relevant fields
2019-02-06 18:27:55 +00:00
6eb8c1eb92
test: add some regression tests for the rich media card rendering
2019-02-06 18:12:26 +00:00
5b1d7c3c56
fix tests
2019-02-06 12:17:41 +07:00
6f05f448f8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/jobs
2019-02-06 11:33:00 +07:00
035eaeb9b8
Allow to configure visibility for admin and moderator badges
2019-02-06 06:18:05 +03:00
398c81f9c8
Add is_admin and is_moderator boolean fields to the user view
2019-02-06 02:10:06 +03:00
73e6a1f1dd
test: twitterapi: fix another possible test failure case
2019-02-05 20:08:16 +00:00
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
2019-02-05 18:56:59 +00:00
c4d317ccb6
test: twitterapi: fix the test breakage for real
2019-02-05 18:49:02 +00:00
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
2019-02-04 20:50:28 +07:00
16ce129e38
Split hide_network into hide_followers & hide_followings (fixed)
2019-02-03 21:55:04 +03:00
69a38644bc
Merge branch '589-fix-cache' into 'develop'
...
Resolve "Update object cache on favs/boosts"
Closes #589
See merge request pleroma/pleroma!764
2019-02-03 18:19:40 +00:00
e61f0be951
Unbreak all the tests.
2019-02-03 18:54:39 +01:00
505a084058
Still do caching in tests.
2019-02-03 18:28:14 +01:00
3913b0196e
[ #582 ] Made single-pub task call Instance.set_reachable/1 if `set_reachable` is not specified.
...
Added tests.
2019-02-03 13:28:13 +03:00
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`).
2019-02-03 12:41:27 +03:00
486749064f
Revert "Merge branch 'feature/split-hide-network' into 'develop'"
...
This reverts merge request !733
2019-02-01 20:22:58 +00:00
7e384a2425
Merge branch 'develop' into 'develop'
...
Use nodeinfo 2.1
See merge request pleroma/pleroma!753
2019-02-01 19:18:46 +00:00
e8c7be38fc
add tests for nodeinfo 2.0 compat and 2.1's new field
2019-02-01 14:33:14 -03:00
0a82a7e6d6
Merge branch 'feature/split-hide-network' into 'develop'
...
Split hide_network into hide_followers & hide_followings
See merge request pleroma/pleroma!733
2019-02-01 17:05:29 +00:00
b3b0855456
Merge branch '534_federation_targets_reachability' into 'develop'
...
[#534 ] Unreachable federation targets retirement
Closes #534
See merge request pleroma/pleroma!703
2019-02-01 09:14:35 +00:00
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
2019-02-01 03:55:10 -03:00
308b35ebe2
User.follow_all: ensure its stays unique
2019-01-31 18:17:44 +01:00
106475f265
test: http mocks: formatting
2019-01-31 16:30:56 +00:00
3f5b784596
test: rich media: parser: add malformed data regression test
2019-01-31 16:19:53 +00:00
4e76f9fde1
test: add malformed OGP data fixture
2019-01-31 16:12:35 +00:00
a43a1c6d4e
Revert "Merge branch 'spc-fix-3' into 'develop'"
...
This reverts merge request !682
2019-01-31 12:16:23 +00:00
4d3655c479
Merge branch 'spc-fix-3' into 'develop'
...
Spc fix 3
See merge request pleroma/pleroma!682
2019-01-31 11:29:29 +00:00
00d4333373
Merge branch 'features/glitch-soc-frontend' into 'develop'
...
Features/glitch soc frontend
See merge request pleroma/pleroma!192
2019-01-31 10:16:11 +00:00
d3677d2b4d
Merge remote-tracking branch 'MAIN/develop' into feature/jobs
2019-01-31 15:07:49 +07:00
c53b96a024
Fix specs.
2019-01-30 19:45:31 +01:00
47ec690c54
Use race-condition free mass follow.
2019-01-30 19:33:25 +01:00
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
2019-01-29 13:54:10 +00:00
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
2019-01-29 13:12:28 +03:00
ebb3496386
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
...
Rich Media support, part 2.
See merge request pleroma/pleroma!719
2019-01-29 05:11:08 +00:00
61d6715714
rich media: oembed: return data in the same format as the other parsers
2019-01-28 21:13:25 +00:00
3e968f9ef2
Format
2019-01-28 21:40:08 +03:00
50d6183893
Split hide_network into hide_followers & hide_followings
2019-01-28 21:40:08 +03:00
55affbca7f
add a job queue
2019-01-28 22:17:17 +07:00
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
2019-01-28 15:39:14 +03:00
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
2019-01-28 15:25:06 +03:00
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.
2019-01-28 13:07:12 +01:00
1825118fd4
Correctly handle invalid credentials on auth login.
...
Closes #407
2019-01-28 11:41:47 +01:00
339c26e12b
test: add status posting with OGP link preview test
2019-01-28 06:19:00 +00:00
6096846f5f
API: kill /api/rich_media/parse endpoint
2019-01-28 05:53:17 +00:00
020b3b29d9
test: update twitterapi tests
2019-01-28 05:53:17 +00:00
364cf5369b
test: update mastodon status view tests
2019-01-28 05:53:17 +00:00
132d815f1f
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
2019-01-28 05:53:17 +00:00
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
2019-01-28 04:47:32 +01:00
2e277dd4ad
Fix objects.
2019-01-27 21:03:15 +01:00
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
2019-01-27 12:45:50 +00:00
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
2019-01-27 10:33:22 +01:00
155a884300
Merge branch 'flake-from-int' into 'develop'
...
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
2019-01-26 16:17:50 +00:00
d6015338c8
Flake: support integers in from_string/1
...
Some previously issued stateless tokens have integer ids in them.
2019-01-26 16:58:23 +01:00
1f7843b9b8
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
2019-01-26 15:24:16 +00:00
3f64379b13
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
2019-01-26 14:18:23 +00:00
d9f3af477d
Move definitions of RichMedia fixtures to test/support/http_request_mock.ex
2019-01-26 14:18:23 +00:00
22f2687f17
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters
2019-01-26 04:46:02 +01:00
5a84def6a6
Fix the logic in multi-hashtag TLs
2019-01-26 04:46:02 +01:00
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
2019-01-26 04:46:01 +01:00
d8f446f438
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline
2019-01-26 04:46:01 +01:00
499a4591a4
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null
2019-01-26 04:23:52 +01:00
d99650270b
[ #534 ] Federation reachability filtering tests.
2019-01-25 20:38:54 +03:00
aa8ddfdbe2
SPC fixes: Fix activities.
2019-01-25 18:14:48 +01:00
a45a903480
Fix OGP provider tests
2019-01-25 10:51:06 +03:00
3a5b3c5a3a
Merge remote-tracking branch 'pl/develop' into oembed_provider
2019-01-25 10:40:51 +03:00
4c99b6d35a
Merge branch 'fix/tusky-dm' into 'develop'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
2019-01-25 05:19:32 +00:00
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
2019-01-25 05:00:47 +00:00
4df71cd88b
Merge branch 'classic-flakeids' into 'develop'
...
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
2019-01-25 04:59:06 +00:00
9274cabe01
Use correct logic to determine "attentions" list
2019-01-24 23:30:43 +03:00
13d72826df
test: add anti-followbot policy tests
2019-01-24 09:50:40 +00:00
4333fea1dc
Send "hide_network" in user_view
2019-01-23 19:47:51 +03:00
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
2019-01-23 13:05:58 +01:00
e221c681dc
New frontend configuration mechanism.
2019-01-23 12:40:57 +01:00
422e60ad76
2019
2019-01-23 11:26:35 +01:00
9d63b27dcd
Test FlakeID old id compat & Ecto type
2019-01-23 11:26:34 +01:00
28d77e373c
Flake Ids for Users and Activities
2019-01-23 11:26:27 +01:00
34d59e4008
[ #502 ] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
2019-01-22 17:12:53 +03:00
762fafe738
Fix buggy test.
2019-01-21 17:54:11 +01:00
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
2019-01-21 13:03:32 +00:00
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
2019-01-21 12:35:10 +00:00
789a9843da
[ #530 ] Fixed test.
2019-01-21 14:30:01 +03:00
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
2019-01-21 08:00:41 +01:00
f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
2019-01-21 08:00:38 +01:00
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
2019-01-21 07:49:59 +01:00
5803672ae5
Merge branch '116-send-delete-event' into 'develop'
...
Send delete event over Mastodon streaming api
Closes #116
See merge request pleroma/pleroma!688
2019-01-20 23:06:21 +00:00
cf1f35a93a
Send delete event over Mastodon streaming api
...
Closes #116
2019-01-20 13:00:46 +01:00
501fba33d6
Merge branch 'add-custom-emoji-test' into 'develop'
...
Add a test to ensure #39 is fixed.
See merge request pleroma/pleroma!687
2019-01-20 10:58:19 +00:00
be0fb5dec4
Add a test to ensure #39 is fixed.
2019-01-20 11:48:53 +01:00
f3045a179e
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
...
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
2019-01-20 10:24:05 +00:00
cf3099231d
test: transmogrifier: verify directMessage flag is sent outbound based on declared visibility
2019-01-20 02:28:28 +00:00
21ac35fcc0
tests: add tests for DM sanitizer
2019-01-20 02:27:48 +00:00
8d06be35e0
activitypub: utils: add determine_explicit_mentions() and tests
2019-01-20 02:27:48 +00:00
42612b1c8d
Merge branch 'bugfix/improve-boost-targeting' into 'develop'
...
improve handling of non-public Announces
See merge request pleroma/pleroma!681
2019-01-19 23:44:08 +00:00
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
2019-01-19 07:36:58 +00:00
0a97badddd
Format
2019-01-19 04:26:52 +03:00
651a1d64b5
Add current user to mentioned
2019-01-19 04:25:15 +03:00
31517bec12
test: add regression test for to/cc clobbering
2019-01-18 22:32:01 +00:00
e116e55cab
Add actor to recipients
2019-01-18 22:40:52 +03:00
5d4d51e6dc
Add fixes for SPC users.
2019-01-18 19:25:37 +01:00
74346a7035
Fix merge conflict
2019-01-18 18:31:25 +03:00
7bc6208b2f
Fix ostatus test
2019-01-18 10:35:52 +03:00
ed8f55ab8e
[ #477 ] User: FTS and trigram search results mixing (to handle misspelled requests).
2019-01-18 10:35:45 +03:00
1b1af4798a
Use object instead of activity for metadata
2019-01-18 09:32:52 +03:00
65bb9b2fba
[ #491 ] Made full nicknames be preserved in user links text only in Bio.
2019-01-18 09:30:16 +03:00
64143d8040
Fix object id in OpenGraph test
2019-01-17 22:57:24 +03:00
954dc4a4ad
[ #502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users.
2019-01-17 19:16:02 +03:00
2bfae25a1f
[ #491 ] Made user bio preserve full nicknames (nick@host).
2019-01-17 18:03:49 +03:00
3b18789684
Fix test
2019-01-17 11:08:50 +03:00
293f6a8b71
join us now and share the software~. Also tests
2019-01-16 17:15:13 +03:00
943324b661
MastoAPI: Don't break on missing users.
2019-01-16 15:13:09 +01:00
608cc65d43
Merge branch 'feature/improve-microformats' into 'develop'
...
improve microformats support
See merge request pleroma/pleroma!672
2019-01-16 09:06:47 +00:00
da4b670451
Merge branch '518_instance_stats_fix' into 'develop'
...
[#518 ] Fix: /api/v1/instance ("domain_count"), /api/v1/instance/peers
Closes #518
See merge request pleroma/pleroma!673
2019-01-16 08:59:40 +00:00
90433b988e
[ #518 ] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.
2019-01-16 11:07:46 +03:00
8cea00e1dc
Remove OpenGraph test from Ostatus tests
2019-01-16 10:53:57 +03:00
85a5be6220
tests: fixup
2019-01-16 04:09:01 +00:00
5b8f9ff8c1
[ #477 ] User search tests. Normalized search rank in User.search.
2019-01-15 13:05:25 +03:00
fc965f982c
[ #477 ] Added FTS index for `users`. Fixed failing test.
2019-01-15 12:04:54 +03:00
9fcdca1bdc
Upload: Fix uploading with a : in the filename
2019-01-15 07:57:48 +01:00
e3eb75bd23
Upload: Fix uploading with a ? in the filename
2019-01-15 07:40:39 +01:00
f20bfc9ea5
Merge branch 'media-url-escape' into 'develop'
...
URI escape file upload URLs
See merge request pleroma/pleroma!665
2019-01-14 18:52:23 +00:00
dcbe5bd58c
Add attachment escaping test
2019-01-14 13:29:38 -05:00
dc45ec62c2
[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.
2019-01-14 20:04:45 +03:00
de1da7b3d1
Merge branch 'feature/add-oembed-parser' into 'develop'
...
Add OEmbed parser
See merge request pleroma/pleroma!661
2019-01-14 07:28:04 +00:00
fa0392e49c
Merge branch 'activitypub-likes' into 'develop'
...
Activitypub c2s likes
See merge request pleroma/pleroma!658
2019-01-14 07:27:05 +00:00
98d9ae0718
Add test for mastodon API /favourites endpoint
2019-01-13 15:17:47 +00:00
e4dc3f71ae
Resolve merge conflict
2019-01-13 13:38:28 +03:00
b8a77c5d70
Add OEmbed parser
2019-01-13 02:06:50 +02:00
868034375c
Add likes to activitypub object representation
...
Top level of the likes OrderedCollection is inlined to get immediate
access to totalItems. Because the count can be returned without scanning
the database for like activities the extra query is saved when the
client only wants to display the total.
2019-01-12 20:24:41 +01:00
581edd5a91
Add route to get object like activities
2019-01-12 20:24:38 +01:00
36711e1c83
Handle client submitted activitypub like activity
2019-01-12 20:24:35 +01:00
1eb7318831
Prepare all types objects before serialising
...
Activities returned from inbox can include other types of objects like
Article
2019-01-12 20:24:32 +01:00
728587fdaa
typo
2019-01-11 12:47:44 +07:00
b594a54d0c
unpin when deleting a status
2019-01-11 12:31:31 +07:00
e4afe1359b
Merge branch 'activitypub-dereference-activity-id' into 'develop'
...
Support activity+json request for activity
See merge request pleroma/pleroma!641
2019-01-10 18:42:36 +00:00
1f851a0723
Add Twitter Card parser
2019-01-10 18:09:56 +00:00
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
2019-01-10 18:03:32 +00:00
ab4c5f5bf7
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
...
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
2019-01-10 03:54:29 +00:00
490c80bc96
test: common api: add tests for format_input/4
2019-01-10 03:46:34 +00:00
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
2019-01-10 02:39:53 +00:00
f85d108c41
Merge branch 'mass-follow' into 'develop'
...
Mass follow
See merge request pleroma/pleroma!642
2019-01-10 02:33:11 +00:00
d203b0b4d3
Merge branch 'dm-optimizations' into 'develop'
...
Add activity visibility index.
See merge request pleroma/pleroma!646
2019-01-10 02:31:29 +00:00
a99e156f2c
Add integer casts.
2019-01-09 18:17:23 +01:00
7ac152ed38
TwitterAPI: Add follower/following pagination.
2019-01-09 18:14:32 +01:00
1881680e28
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
...
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
2019-01-09 16:26:38 +00:00
8df348a3da
Add test for summary_html
2019-01-09 17:18:37 +01:00
5027f82cde
Add activity visibility index.
2019-01-09 16:45:09 +01:00
6cbe63726d
improve tests
2019-01-09 19:54:37 +07:00
44a1e69484
Add Twitter API for the pinned statuses
...
```
# Only return statuses that have been pinned
GET /api/statuses/user_timeline.json?pinned=true
# Pin
POST /api/statuses/pin/:id
# Unpin
POST /api/statuses/unpin/:id
```
2019-01-09 19:54:19 +07:00
1b06e6fdf3
only non-reblogs, self-authored, public statuses can be pinned
2019-01-09 17:40:15 +07:00
26938d65fd
Add User mass following function.
2019-01-09 11:35:23 +01:00
48591aab98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
...
# Conflicts:
# docs/config.md
2019-01-09 16:56:31 +07:00
20c0dd1e24
Support activity+json request for activity
2019-01-09 09:33:30 +01:00
5c5c8508c2
Merge branch 'hotfix/media-proxy-uri' into 'develop'
...
user: fix local vs remote determination in remote_or_auth_active?/1
See merge request pleroma/pleroma!640
2019-01-09 07:09:39 +00:00
567651fb3f
test: user: add tests for visible_for?/2
2019-01-09 07:03:32 +00:00
f2a4f89abe
tests: user: add tests for superuser?/1
2019-01-09 06:50:31 +00:00
74f48beec3
user: remove entirely redundant remote_or_auth_active?/1.
...
auth_active?/1 can check remote users and return true directly.
2019-01-09 06:36:50 +00:00
4124c9aa4a
tests: user: add regression test for remote_or_auth_active?/1
2019-01-09 06:02:18 +00:00
0c750bc432
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
2019-01-08 16:32:07 +07:00
7b6c5f0a9d
improve test readability
2019-01-08 16:01:35 +07:00
0fae04c4e3
Add a setting for users to autofollow on sign up.
2019-01-08 09:57:53 +01:00
db6f4496eb
fix test
2019-01-08 15:32:06 +07:00
e679da4c34
add `pinned` property to `StatusView`
2019-01-08 15:27:02 +07:00
63dbd87568
rename `post` to `status`
2019-01-08 15:25:50 +07:00
a16b17cc61
Actually put some onformation in the error user, make it actually properly parse
...
in conversations.
2019-01-07 20:59:30 +01:00
74e1093732
Merge branch 'resilient-user-view' into 'develop'
...
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
2019-01-07 17:09:52 +00:00
f24087f96e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
2019-01-07 20:55:32 +07:00
380e9fba21
add pinned posts
2019-01-07 20:45:33 +07:00
7dcafb4894
MastoAPI: Add test.
2019-01-07 13:13:37 +01:00
7382adf407
Make TwAPI UserView more resilient to issues.
...
Will work for missing users and badly migrated users.
2019-01-07 12:41:31 +01:00
52493467ac
Twitter API: Add a summary_html field.
...
The intention here is to allow proper subject copying when it contains
emoji, obviously this will require minor frontend changes, though.
2019-01-06 10:19:00 +00:00
042852ecf3
Add check to prevent multiple follow notifications from the same user
2019-01-05 22:54:25 +00:00
8d047c7a72
Merge branch 'fix/user-search-null-name' into 'develop'
...
fix user search results for users with unset display name
Closes #499
See merge request pleroma/pleroma!625
2019-01-05 22:34:47 +00:00
576368237c
Merge branch 'activitypub-tombstone-fix' into 'develop'
...
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
2019-01-05 22:29:08 +00:00
145d6fe6e9
Merge branch 'emoji-in-summary' into 'develop'
...
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
2019-01-05 21:52:02 +00:00
57df7d6e1d
Add tests for emoji and lack of HTML in summaries.
2019-01-05 21:46:42 +00:00
096e121879
Remove redundant comma.
2019-01-05 18:25:36 +00:00
rinpatch
Haelwenn (lanodan) Monnier
eugenijm
Maxim Filippov
William Pitcock
kaniini
Karen Konou
lambda
lain
Egor Kislitsyn
KZ
Ivan Tashkinov
Ekaterina Vaartis
Mark Felder
Haelwenn
href
Luna
href
Shadowfacts
Sadposter
sxsdv1
scarlett