0484f3a8b1
generating tokens with mix
2019-04-06 16:58:22 +07:00
325a268017
Redirect to the referer url after mastofe authorization
2019-04-05 23:36:42 +00:00
e9c075d05c
Mock :crypt.crypt/2 because otherwise the test fails on Mac OS
2019-04-05 22:48:11 +02:00
fac76bfa35
We actually want the user id not nickname in the test...
2019-04-05 12:11:19 -05:00
c746087f57
Also remove Repo functions in the tests
2019-04-05 11:59:56 -05:00
7895ee37fa
Add user following / unfollowing to the admin api.
2019-04-05 11:27:07 -05:00
a270e7a191
Mix format everything
2019-04-05 17:07:58 +01:00
f6e131eeb9
Don't use twitterAPI for subscription tests
2019-04-05 17:02:09 +01:00
9ca91cbb87
Change relationship direction of subscriptions
2019-04-05 17:02:07 +01:00
73afd13c21
Add subscription key to one test I forgot about
2019-04-05 15:37:36 +01:00
06cd547fc6
Format subscriptions related stuff
2019-04-05 15:30:34 +01:00
d56866c824
Add subscribed status to user view
...
Added in pleroma extensions, but can be moved whenever
2019-04-05 15:30:31 +01:00
75c4ceb4a2
Add tests for subscriptions
2019-04-05 15:30:29 +01:00
f1712cd2f1
Use PleromaJobQueue in Pleroma.Web.Push
2019-04-05 19:38:44 +07:00
47a236f753
[ #923 ] OAuth consumer mode refactoring, new tests, tests adjustments, readme.
2019-04-05 15:12:02 +03:00
3e7f2bfc2f
[ #923 ] OAuthController#callback adjustments (with tests).
2019-04-05 09:19:17 +03:00
45765918c3
[ #923 ] Merge remote-tracking branch 'remotes/upstream/develop' into twitter_oauth
...
# Conflicts:
# mix.exs
2019-04-04 23:43:08 +03:00
f7cd9131d4
[ #923 ] OAuth consumer controller tests. Misc. improvements.
2019-04-04 22:41:03 +03:00
cfa6e7289f
Improve Transmogrifier.upgrade_user_from_ap_id/2
2019-04-04 16:10:43 +07:00
0cb94cfa94
Merge branch 'fix-slow-relationships' into 'develop'
...
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
See merge request pleroma/pleroma!1011
2019-04-02 18:43:48 +00:00
256b492a58
Merge branch 'bugfix/wrong-date-format' into 'develop'
...
Support activities with dates in the Unix timestamp format
Closes #763
See merge request pleroma/pleroma!1004
2019-04-02 14:18:23 +00:00
a79ce94dd4
Merge branch 'feature/fake-statuses' into 'develop'
...
Add fake status submit
See merge request pleroma/pleroma!995
2019-04-02 14:17:43 +00:00
39bcf93007
Merge remote-tracking branch 'origin/develop' into fix-slow-relationships
2019-04-02 16:10:38 +02:00
fd07745d1b
ActivityPub Utils: Greatly speed up the follow / block activity fetching.
2019-04-02 16:08:55 +02:00
fa8483cb80
Merging develop into feature/770-add-emoji-tags
...
Conflict test/web/twitter_api/util_controller_test.exs
2019-04-02 20:39:52 +07:00
180b87257c
Merge branch 'bugfix/share-mastodon' into 'develop'
...
[OStatus] adds status to pleroma instance if the url given is a status
See merge request pleroma/pleroma!1002
2019-04-02 12:47:40 +00:00
ce9284b36f
Merge branch 'remove-user-activities' into 'develop'
...
[#757 ] Add mix task to delete user's activities
See merge request pleroma/pleroma!1008
2019-04-02 12:45:29 +00:00
b95cf3d490
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get_by` with existing functions
See merge request pleroma/pleroma!1010
2019-04-02 12:43:28 +00:00
9e0567ec52
Merge develop into feature/770-add-emoji-tags
2019-04-02 19:16:29 +07:00
fdb4357e9b
Rename fake param to preview and make the tests check that the object was not inserted to the db
2019-04-02 14:31:18 +03:00
20c619f85f
replace `Repo.get_by(User, nickname: nickname)` with `User.get_by_nickname(nickname)` in tests
2019-04-02 17:58:32 +07:00
091baf9316
Merge branch 'features/mastoapi/2.6.0-force-login-option' into 'develop'
...
MastoAPI 2.6.0 `force_login` option
Closes #734
See merge request pleroma/pleroma!999
2019-04-02 10:57:38 +00:00
26d509cc86
Merge branch 'get_by_id' into 'develop'
...
Replace `Repo.get(Module, id)` with `Module.get_by_id(id)` where possible
See merge request pleroma/pleroma!1009
2019-04-02 10:52:29 +00:00
95c92c49c9
Fix account lookup for nicknames beginning with numbers
2019-04-02 10:51:33 +00:00
9a59c26619
replace `Repo.get_by(User, ap_id: ap_id)` with `User.get_by_ap_id(ap_id)`
2019-04-02 17:47:52 +07:00
15ce710460
Added "GET /oauth/authorize" tests.
2019-04-02 13:43:33 +03:00
11c2d6bdc4
change `Repo.get(Activity, id)` => `Activity.get_by_id(id)` in tests
2019-04-02 17:08:03 +07:00
1b3d921921
change `Repo.get(User, id)` => `User.get_by_id(id)`
2019-04-02 17:01:26 +07:00
3db9235150
Ignore dates in wrong formats
2019-04-02 11:32:36 +02:00
a14742f495
add `user delete_activities` mix task
2019-04-02 16:30:11 +07:00
484162c187
test fix
2019-04-02 16:26:40 +07:00
9b2188da7c
refactoring of emoji tags config to use groups
2019-04-02 15:44:56 +07:00
aac48d0cc6
Merge remote-tracking branch 'remotes/upstream/develop' into features/mastoapi/2.6.0-conversations
2019-04-02 09:19:10 +03:00
6386c1c9c1
fetch url for OStatus to know if it is a/c or status
2019-04-02 10:26:09 +05:45
b6f9f7b8aa
Handle dates in the Unix timestamp format ( Fixes #763 )
2019-04-01 22:45:24 +02:00
1d01e8e656
[OStatus] adds status to pleroma instance if the url given is a status
2019-04-01 22:26:58 +05:45
17d3d05a71
code style
...
little fix
2019-04-01 17:54:30 +07:00
3601f03147
Adding tag to emoji ets table
...
changes in apis
2019-04-01 17:17:57 +07:00
e3bf6655ba
Add replying.
2019-03-31 21:24:29 +02:00
10fdc080a0
BBS: Tests and formatting.
2019-03-31 20:35:10 +02:00
1bb4d5d65b
Implement fake status submit
2019-03-29 21:59:04 +03:00
9a39d1d846
Replace Pleroma.Jobs with `pleroma_job_queue`
2019-03-29 12:46:05 +00:00
6b407872b4
mastodon_api_controller.ex: Use min_id in link header instead of since_id
2019-03-28 17:23:21 +01:00
cd90695a34
Add PUT /api/pleroma/notification_settings endpoint
2019-03-28 18:55:16 +03:00
55d086b520
Notification controls
...
Allow users to configure whether they want to receive notifications from people they follow / who follow them, people from remote / local instances
2019-03-28 07:52:07 +03:00
10c81fc902
Add user show endpoint for Pleroma admin API
2019-03-27 21:44:15 +03:00
926bf114b7
Merge branch 'feature/more-user-filters' into 'develop'
...
Add more user filters + move search to its own module
See merge request pleroma/pleroma!982
2019-03-27 11:33:13 +00:00
776bb5137f
Fix muting reblogs tests
2019-03-27 13:43:43 +03:00
3cf7539bca
Add more user filters + move search to its own module
2019-03-27 03:51:59 +05:00
a4ab60ac54
Add vapid_key to the `POST /api/v1/apps` response
2019-03-26 23:27:37 +03:00
691d1208b5
Add GET /api/v1/apps/verify_credentials
2019-03-26 21:53:28 +03:00
ff3b09f6b3
Merge branch 'fix/ap-icon' into 'develop'
...
Do not federate instance avatar
Closes #759
See merge request pleroma/pleroma!977
2019-03-26 16:12:50 +00:00
c6ab5ebe7c
Merge branch 'features/mastoapi/2.7.2-instance-attributes' into 'develop'
...
Mastodon 2.7.2 instance attributes (registrations, languages)
See merge request pleroma/pleroma!979
2019-03-26 16:01:52 +00:00
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
2019-03-26 16:59:28 +01:00
47b49ab1a1
Test for MastoAPI /api/v1/instance response structure (formatting fix).
2019-03-26 18:18:36 +03:00
9e3899bf36
Merge branch 'features/mastoapi/2.7.0-auth-error-messages' into 'develop'
...
Mastodon-based auth error messages. User#auth_active?/1 refactoring.
See merge request pleroma/pleroma!978
2019-03-26 15:13:55 +00:00
caf0e9cf33
Test for MastoAPI /api/v1/instance response structure.
2019-03-26 18:13:24 +03:00
21ff78cd40
Merge branch 'replies-count' into 'develop'
...
Increment replies_count (MastoAPI)
Closes #756
See merge request pleroma/pleroma!974
2019-03-26 14:49:09 +00:00
aacdcac1be
Credo is upset about me not remembering the alphabet
2019-03-26 17:35:45 +03:00
087662d4fb
Fix formatting
2019-03-26 17:18:18 +03:00
406d19331f
Remove ActivityRepresenter
2019-03-26 17:16:21 +03:00
568e348588
Increment replies_count on replies (MastoAPI)
2019-03-26 15:27:04 +03:00
263ca3dea2
Mastodon-based auth error messages. Defaulted User#auth_active?/1 to `true`.
2019-03-26 15:09:06 +03:00
26b0c802c3
fix up missing announcements with preloads
2019-03-25 07:38:09 +00:00
a32bcab04b
Merge branch 'fix/eldap-warnings' into 'develop'
...
Ignore compilation warnings for undefined module :eldap
See merge request pleroma/pleroma!956
2019-03-24 11:17:40 +00:00
4a3dd86a55
tests: fix up activity collision test
2019-03-23 03:17:51 +00:00
aaec91b9a1
relay test: don't do preloading (since follow objects are activities, it's a mess)
2019-03-23 01:23:02 +00:00
73efe95368
activitypub: allow skipping preload in some cases (like certain tests where the preload is obnoxious)
2019-03-23 01:09:12 +00:00
fee360e581
Merge branch 'safe-mentions' into 'develop'
...
NodeInfo: Return safe_dm_mentions feature flag.
See merge request pleroma/pleroma!964
2019-03-22 11:03:56 +00:00
e2afce34b6
NodeInfo: Return safe_dm_mentions feature flag.
2019-03-22 11:57:20 +01:00
3229c7a1d6
Ensure fts is prefered over trigram and use union_all instead of union in user search query
2019-03-22 08:39:49 +03:00
1c3d3d0c2b
Merge branch 'safe-mentions' into 'develop'
...
Add safe dm mode option.
See merge request pleroma/pleroma!958
2019-03-22 00:50:24 +00:00
a223e65f35
tests: fixup
2019-03-21 23:56:57 +00:00
3cc2554fa3
mastodon api: add conversation_id extension (ref #674 )
2019-03-21 23:25:41 +00:00
fea3696799
common api: move context functions from twitterapi
2019-03-21 23:24:04 +00:00
bf27190f7f
UtilController: Return state of safe dm mentions.
2019-03-21 16:20:58 +01:00
f858df819b
Skip tests in LDAPAuthorizationTest if :eldap module is unavailable
2019-03-21 12:31:16 +02:00
b68fb3dc17
Merge branch 'imageoptim' into 'develop'
...
used imageOptim to reduce size of image files
See merge request pleroma/pleroma!944
2019-03-21 00:59:24 +00:00
8468f3f6d4
Add safe dm mode option.
2019-03-20 21:09:36 +01:00
ed8a2935f5
Use ILIKE to search users
2019-03-20 01:37:40 +03:00
455bb526f6
test: add test for list sanitization
2019-03-19 17:53:40 +00:00
fd0aa58ee0
tests: add test for as:Public issues
2019-03-19 17:49:29 +00:00
00c5d7248f
fix UploadTest to use new image_tmp.jpg
2019-03-19 10:10:48 +01:00
a907522690
used imageOptim to reduce size of image files
2019-03-19 10:10:48 +01:00
43bd7f47db
Merge branch 'feature/order-users-by-nickname-admin-api' into 'develop'
...
Order users by nickname
See merge request pleroma/pleroma!945
2019-03-18 23:08:31 +00:00
1588688a11
Added support for exclude_types, limit, and min_id in Mastodon
...
notifications.
Unify Mastodon-compatible pagination logic.
2019-03-18 11:27:27 +03:00
42d034505a
Add test for conversation API beforehand
2019-03-17 16:51:26 +01:00
4ed2618f6c
Allow 'rel' attribute on `<a>` link with specific values (for hashtag recognition).
2019-03-17 11:03:19 -04:00
76a13bc5a2
Fix test
2019-03-17 13:29:28 +03:00
93291c3d7a
Order users by nickname
2019-03-17 13:23:31 +03:00
6d6f48d079
Merge branch 'feature/federated-flags' into 'develop'
...
Federated reports
See merge request pleroma/pleroma!935
2019-03-16 19:27:56 +00:00
28df397454
Merge branch 'feature/oauth-me' into 'develop'
...
oauth: add me property to token responses
See merge request pleroma/pleroma!942
2019-03-16 08:44:02 +00:00
c69dc2acf1
Merge branch 'feature/reblog-muting' into 'develop'
...
Implement mastodon's reblog hiding feature
See merge request pleroma/pleroma!916
2019-03-16 04:31:31 +00:00
40134598a8
test: fix defective ldap setup/teardown
2019-03-16 04:05:19 +00:00
e0edc706cf
oauth: add me property to token responses
2019-03-16 01:12:50 +00:00
43fb03be5a
Allow to mark a single notification as read
2019-03-15 23:56:14 +03:00
8b352af4dd
Merge branch 'feature/openldap-support' into 'develop'
...
OpenLDAP support
Closes #203
See merge request pleroma/pleroma!859
2019-03-15 19:57:09 +00:00
a070dd4a83
Add tests for LDAP authorization
2019-03-15 16:28:46 +02:00
ebfc10c834
Fix streamer test
2019-03-15 14:20:08 +01:00
da53c079db
Refactor to store user ap_id, add tests
2019-03-15 14:20:08 +01:00
13c298d354
Fix tests to assume reblogs shown by default
2019-03-15 14:18:21 +01:00
41fc67aa49
Merge branch 'mastoapi/mime_type' into 'develop'
...
Extend MastoAPI to provide attachment mimetypes
See merge request pleroma/pleroma!938
2019-03-15 09:48:50 +00:00
d7a34b604b
Extend MastoAPI to provide attachment mimetypes
2019-03-15 11:58:12 +03:00
0f42ea87d6
Merge branch 'notifications-is-seen' into 'develop'
...
MastoAPI notifications is_seen
See merge request pleroma/pleroma!934
2019-03-15 02:59:17 +00:00
100413bf2c
Add `is_seen` to MastoAPI notifications, extract rendering logic into separate NotificationView, add tests
2019-03-15 01:35:48 +03:00
cbdd11c381
Merge develop to bump elixir version in the CI so I don't get failing formatting
2019-03-14 22:33:20 +03:00
355f285a86
Fix uploaded media plug test
2019-03-14 22:26:54 +03:00
414d4b8088
test: add a test for accepting inbound Flag activities
2019-03-14 19:04:33 +00:00
e2fe796c63
Add some tests
2019-03-14 22:02:48 +03:00
257d8e78e5
Add tags
2019-03-14 01:52:24 +03:00
4872914d32
Add test when local is false
2019-03-13 17:56:15 +03:00
d5edff6ce6
Fix test
2019-03-13 16:14:31 +03:00
490d9cf7b1
Add "local" to users admin API
2019-03-13 16:04:44 +03:00
23960309a0
[Credo] Change quoted string with 3+ quotes to sigils
2019-03-13 04:26:56 +01:00
c42d34b2ec
[Credo] fix Credo.Check.Readability.MaxLineLength
2019-03-13 04:26:56 +01:00
fb82f6fc7c
[Credo] Remove parentesis on argument-less functions
2019-03-13 04:26:56 +01:00
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
6c8743d0c0
[Credo] Fix the warnings
2019-03-13 04:17:30 +01:00
25eb6cf1cb
Add "roles" to users admin API
2019-03-12 22:15:28 +03:00
c231ed610a
Merge branch 'masto-api-followers-following' into 'develop'
...
MastoAPI followers/following endpoints
See merge request pleroma/pleroma!924
2019-03-12 16:27:47 +00:00
984b5f8adf
MastoAPI followers/following endpoints
2019-03-12 16:01:24 +03:00
faf238c1b0
Fix upload tests
2019-03-12 15:33:15 +03:00
3474066f6d
MastoAPI Accounts: Add fetching by nickname.
...
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
2019-03-11 15:18:32 +01:00
2c8deecdd2
Merge branch 'add-local-field-to-status' into 'develop'
...
MastoAPI StatusView: Add locality indicator.
See merge request pleroma/pleroma!920
2019-03-11 13:26:12 +00:00
4811eefa6e
MastoAPI StatusView: Add locality indicator.
2019-03-11 13:48:27 +01:00
6038c8a753
Broadcast deleted activity id on deletion to conform to MastoAPI streamig spec
2019-03-11 09:02:03 +03:00
735f40047a
Merge branch 'delete-status' into 'develop'
...
Allow an admin to delete a user status #721 (MastoAPI)
See merge request pleroma/pleroma!914
2019-03-08 22:47:41 +00:00
130fc9eae6
Merge branch 'fetch-posts-on-first-federation' into 'develop'
...
Fetch user's outbox posts on first federation with that user
Closes #131
See merge request pleroma/pleroma!907
2019-03-08 22:33:31 +00:00
2827dfea50
Allow an admin to delete a user status
2019-03-08 20:21:56 +03:00
b775fded10
Add tests for fetch_ordered_collection
2019-03-08 16:28:40 +03:00
3c5926fe91
tests: add regression test
2019-03-07 12:20:04 +00:00
992145e64c
Merge branch 'bugfix/delete-activity-audience' into 'develop'
...
expand the audience of delete activities to all recipients of the deleted object
Closes #682
See merge request pleroma/pleroma!891
2019-03-07 11:31:08 +00:00
7342b5a45f
Preserve parameters in link headers (Mastodon API)
2019-03-07 09:12:16 +03:00
0fe715f3ba
Merge branch 'chore/merge-search-into-list-users' into 'develop'
...
Merge search endpoint into /users
See merge request pleroma/pleroma!898
2019-03-06 22:27:42 +00:00
07f8c79a69
Merge branch 'bugfix/rel-me_list' into 'develop'
...
Web.RelMe: Fix having other values in rel attr
See merge request pleroma/pleroma!901
2019-03-06 13:20:51 +00:00
bc7570c282
[ #647 ] tests for web push
2019-03-06 13:20:12 +00:00
96901b6554
Merge branch 'fix/escape-reserved-chars-in-filenames' into 'develop'
...
Properly escape reserved URI charachters in upload urls
Closes #700
See merge request pleroma/pleroma!905
2019-03-06 01:45:17 +00:00
28d5b40d0a
Add handling of objects not in database
2019-03-05 23:15:22 +01:00
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
6556be344d
Resolve some test failures.
2019-01-05 18:20:42 +00:00
2d7da5f437
Don't crash on AP request for tombstone
...
Because tombstone objects has no addressing the is_public?-predicate
would cause an error that propagated as a 500 error in the api
2019-01-05 11:16:05 +01:00
a81307251c
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name
2019-01-04 20:32:55 -08:00
4258dd8633
Merge branch 'feature/rich-media' into 'develop'
...
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
2019-01-04 20:50:18 +00:00
ffea81b84f
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
...
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
2019-01-04 20:32:10 +00:00
4c5ee4c62b
formatted
2019-01-04 10:18:43 -08:00
ab6ebbae67
added test for #499
2019-01-04 10:14:13 -08:00
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
2019-01-03 17:04:27 +00:00
48e81d3d40
Add RichMediaController and tests
2019-01-02 17:02:50 +03:00
4e1cc2bab6
Implement delete activity
2019-01-01 23:20:43 +01:00
551c3d9391
Split create activity specifics from update_outbox
2019-01-01 23:20:28 +01:00
2aab4e03c3
Add OGP parser
2019-01-01 23:26:40 +03:00
90e157ef80
Merge branch 'features/admin-api-user-views' into 'develop'
...
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
2018-12-31 15:49:34 +00:00
33e3a7ba7d
Merge branch 'fix/scrubber-cache' into 'develop'
...
[#481 ] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
2018-12-31 09:56:26 +00:00
9f5881cbb1
Fix a typo in user_test.ex
2018-12-31 08:34:14 +01:00
8e7da98b18
Merge branch 'mr/retry-queue' into 'develop'
...
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
2018-12-30 21:47:50 +00:00
05743e2000
Get default scrubbers from config instead of hardcoded
2018-12-31 00:12:14 +03:00
91d5a7e81c
Fix test failure
2018-12-31 00:03:03 +03:00
cb286fdeba
Improves RetryQueue behavior
...
reduces to one single timer firing once a second
switches to a parallel worker model
2018-12-30 15:16:26 +00:00
569bad8210
Create activity when client posts to outbox
2018-12-30 12:01:39 +01:00
26dc2dddab
Implement ActivityPub inbox view
...
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
2018-12-30 12:01:39 +01:00
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
2018-12-29 22:22:03 +01:00
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
2018-12-29 11:46:06 +00:00
dd8f2196f6
Merge branch '483_blocks_import_export' into 'develop'
...
[#483 ] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
2018-12-29 11:34:51 +00:00
242cc9a658
[ #483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
2018-12-29 12:27:12 +03:00
7bd49a3222
[ #483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
2018-12-29 12:26:23 +03:00
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
2018-12-29 12:02:37 +03:00
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
2018-12-28 21:08:07 +03:00
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
2018-12-28 17:38:32 +01:00
d8cc96cb1f
Fix Twitter timelines for private instances
2018-12-27 22:43:40 -08:00
bee6acd51d
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
...
Create tombstone instead of object deletion
See merge request pleroma/pleroma!593
2018-12-27 19:37:55 +00:00
cff0292d4b
Merge branch 'reserve-user-names' into 'develop'
...
Reserve a few user names
See merge request pleroma/pleroma!594
2018-12-27 19:35:06 +00:00
e4562105e7
Implement exclude_reblogs and include_rts
2018-12-26 21:38:00 -08:00
551d80cc01
Expose restricted names in nodeinfo.
2018-12-26 12:46:16 +01:00
5811e65e67
Add some hard limits on inserted activities.
2018-12-26 12:39:35 +01:00
012b7ab5e6
Add test to check /object/:id does not leak the tombstone itself
2018-12-25 23:40:57 +03:00
91724d160a
Reserve a few user names
...
These are all names that are used for domain.com/:route routes or projected to be.
2018-12-25 20:10:45 +01:00
340dd7a75e
Format
2018-12-25 03:47:20 +03:00
ab2ee43634
Fix Activity test
2018-12-25 03:41:14 +03:00
aeb89bece6
Remove unused test
2018-12-25 03:38:02 +03:00
f75f707f6c
Revert Activity tombstones, add ObjectTombstone struct
2018-12-25 03:00:06 +03:00
2bbec33c71
Fix failing tests
2018-12-25 00:29:13 +03:00
18a4cbb244
Capitalize "tombstone"
2018-12-24 20:09:18 +03:00
0f412cf6e6
Create tombstone instead of object deletion
2018-12-24 02:25:36 +03:00
3c08d229db
tests: add legal boilerplate
2018-12-23 20:57:10 +00:00
a2bceaf688
tests: twitter api: add test proving that peertube videos are correctly handled
2018-12-23 14:00:54 +00:00
873938d223
tests: twitter api: activity view test: enable tesla mock
2018-12-23 14:00:54 +00:00
9f48485f64
tests: mastodon api: add test verifying that peertube videos are correctly rendered
2018-12-23 13:44:01 +00:00
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
2018-12-23 13:31:08 +00:00
336e37d98f
Make captcha (kocaptcha) stateless
...
Also rename seconds_retained to seconds_valid since that's how it is
now. Put it down from 180 to 20 seconds. The answer data is now
stored in an encrypted text transfered to the client and back, so no
ETS is needed
2018-12-21 09:55:47 +03:00
61a88a6757
Merge branch 'ci-test-fix' into 'develop'
...
SetUserSessionIdPlugTest: try again to fix random ci failures
See merge request pleroma/pleroma!579
2018-12-20 16:31:08 +00:00
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
2018-12-20 13:28:36 +00:00
851db74f1c
[ #114 ] Fixed test.
2018-12-20 15:23:16 +03:00
7cab7de9ff
[ #114 ] Allowed unconfirmed users to authenticate if :account_activation_required is disabled prior to confirmation.
...
Ensured that no confirmation emails are sent if :account_activation_required is not true. Adjusted tests.
2018-12-20 14:48:48 +03:00
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
2018-12-20 13:41:30 +03:00
f1b93b5be7
[ #413 ] fix parse mentions
2018-12-20 09:35:01 +00:00
adbb265fc6
daaa8cd6 take two
2018-12-19 20:14:33 +01:00
7fb3780431
Merge branch 'develop' into oembed_provider
2018-12-19 22:39:44 +04:00
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
2018-12-19 16:31:03 +03:00
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
2018-12-19 16:27:16 +03:00
f98ee9402f
Merge branch 'userless-admin' into 'develop'
...
Add a way to use the admin api without a user.
See merge request pleroma/pleroma!576
2018-12-19 00:12:39 +00:00
f3eb414e28
Add a way to use the admin api without a user.
2018-12-18 21:08:52 +01:00
196d9c0fd0
Fix tests
2018-12-18 20:30:04 +01:00
8a67677d77
Add test
2018-12-18 22:10:56 +03:00
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
2018-12-18 17:22:46 +03:00
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
2018-12-18 17:22:45 +03:00
a300336459
Merge branch 'develop' into oembed_provider
2018-12-18 14:59:32 +01:00
daaa8cd66a
SetUserSessionIdPlugTest: try to fix random ci failures
2018-12-18 13:40:25 +01:00
b1860fe85a
Instance/Static runtime plug
...
This allows to set-up an arbitrary directory which overrides most of the
static files: index.html static/ emoji/ packs/ sounds/ images/ instance/
favicon.png.
If the files are not present in the directory, the bundled ones in
priv/static will be used.
2018-12-17 22:50:59 +01:00
7d9254fb4a
Merge branch 'fix-test' into 'develop'
...
Fix uploads test.
See merge request pleroma/pleroma!564
2018-12-17 20:24:58 +00:00
52bda3b456
Fix uploads test.
2018-12-17 20:55:24 +01:00
92a5133c42
fix text field
2018-12-17 22:53:16 +03:00
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
2018-12-17 19:45:14 +00:00
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
2018-12-17 19:38:24 +00:00
98c31deaa9
Merge branch 'test-mix-tasks' into 'develop'
...
Add tests for Mix tasks
See merge request pleroma/pleroma!555
2018-12-17 19:37:05 +00:00
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
2018-12-17 19:30:05 +00:00
e4763cd459
Fix tagging problems for existing instances.
2018-12-17 20:12:01 +01:00
de981ac5a2
Alias Kocaptcha in the test
2018-12-17 20:53:42 +03:00
b12a904911
Integration tests for mastodon websocket
2018-12-17 17:09:06 +01:00
567359790e
Merge branch 'testfix/webfinger-jrd' into 'develop'
...
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
See merge request pleroma/pleroma!554
2018-12-17 09:19:27 +00:00
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
2018-12-16 23:53:44 +03:00
73576ab64e
Fix captcha tests
2018-12-16 23:01:44 +03:00
f672555ad3
Upgrade to Phoenix 1.4
2018-12-16 17:15:07 +01:00
7c235b8874
Add more Mix task tests in relay_test.exs and uploads_test.exs.
...
Rename test/tasks/user.exs to test/tasks/user_test.exs.
2018-12-16 18:08:31 +02:00
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
2018-12-16 11:21:26 +00:00
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
2018-12-16 13:15:34 +02:00
2e72d49e37
Rename captcha_test.ex to exs
2018-12-16 07:35:45 +00:00
36f1af232a
Add tests for Mix tasks
2018-12-16 02:14:23 +02:00
c859cd1d61
Fix style
2018-12-15 23:39:23 +03:00
5f96c2d216
Add a test for kocaptcha
2018-12-15 23:38:19 +03:00
e8537208bd
Add a captcha mock for tests
2018-12-15 22:38:39 +03:00
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
2018-12-15 17:56:12 +01:00
5af91020f8
Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints
2018-12-15 16:17:44 +01:00
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
2018-12-14 20:30:35 +00:00
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
2018-12-14 20:22:24 +00:00
ea72ac549b
fix case when tags is invalid
2018-12-14 23:16:12 +03:00
90b00701ff
Merge branch 'develop' into oembed_provider
2018-12-14 20:28:35 +01:00
9ff61ed793
Fix tests
...
Notice test has been failing due to missing placeholder in index.html
I've tried to use fixtures to substitute that file in test environment but it became too much hassle. Fixtures are not copied to _build directory so I'd need to change file fetching logic. IMO it doesn't worth it since pleroma-fe already has this placeholder merged and all future updated of index.html will include it.
2018-12-14 20:23:51 +01:00
d3ec09bb38
fix tags
2018-12-14 22:09:04 +03:00
baead4ea4b
fix markdown formatting
2018-12-14 16:03:58 +03:00
07e93f9940
[ #114 ] Improved tests.
2018-12-14 13:52:04 +03:00
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
2018-12-14 12:28:23 +03:00
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
2018-12-14 12:28:22 +03:00
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
2018-12-14 12:28:14 +03:00
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
2018-12-14 09:16:03 +00:00
262cc6d44b
Merge branch 'fix/double-rt-or-fav' into 'develop'
...
Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542
2018-12-14 08:26:08 +00:00
61ad2ce422
TwitterAPI: Include favorited post in json
2018-12-14 08:24:18 +02:00
1ca080c862
Prevent accidental double RTs or favorites
2018-12-14 07:56:49 +02:00
c5c3ad90d0
Fix tests. Remove oembed template
2018-12-14 03:00:50 +01:00
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
2018-12-13 22:34:15 +01:00
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
2018-12-13 22:17:53 +01:00
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
2018-12-13 16:22:42 +03:00
00744c6b03
[ #114 ] Initial implementation of user email invitations.
2018-12-13 14:30:48 +03:00
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
2018-12-12 18:57:33 +01:00
4e7d98922e
[ #114 ] Added tests for "POST /api/account/password_reset".
2018-12-12 17:04:52 +03:00
89b3729afa
fix warnings
2018-12-12 09:09:19 +03:00
0863ec2737
Merge branch 'fix_empty_bio_crash' into 'develop'
...
Fixes #415 . Do not crash during registration when hasn't filled bio field
Closes #415
See merge request pleroma/pleroma!529
2018-12-10 19:08:35 +00:00
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
2018-12-10 19:05:16 +00:00
c81c74d847
Treat warnings as errors outside of tests.
2018-12-10 19:13:53 +01:00
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
2018-12-10 01:01:43 +04:00
9442588ae9
fix hashtags in api response
2018-12-09 11:24:46 +03:00
bdc8112e40
Media proxy: fix url encoding
2018-12-07 21:57:59 +01:00
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
2018-12-07 11:04:39 +03:00
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
2018-12-06 22:26:25 +03:00
abbf347dc7
[ #394 ] View tests fix.
2018-12-06 20:38:52 +03:00
22830c8fc9
[ #394 ] Formatting fix.
2018-12-06 20:13:07 +03:00
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
2018-12-06 20:06:50 +03:00
ccf0b46dd6
Merge branch '210_twitter_api_uploads_alt_text' into 'develop'
...
[#210 ] TwitterAPI: alt text support for uploaded images. Mastodon API uploads security fix.
See merge request pleroma/pleroma!496
2018-12-06 07:36:21 +00:00
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
2018-12-06 10:26:17 +03:00
48a0315646
Merge branch 'follower-hiding' into 'develop'
...
Network hiding
Closes #356
See merge request pleroma/pleroma!490
2018-12-05 21:41:53 +00:00
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
2018-12-05 21:27:56 +01:00
3ea4476445
MastodonAPI: Show users their own network.
2018-12-05 21:25:06 +01:00
3c8ffe7ed3
resolved activity view test
2018-12-06 01:54:04 +05:30
028904c333
lint
2018-12-06 01:46:53 +05:30
911a877576
resolved api and controller test failures
2018-12-06 01:46:30 +05:30
fdac215091
TwitterAPI: Show users their own network.
2018-12-05 21:14:06 +01:00
743a09132b
linting
2018-12-06 01:28:52 +05:30
812b20d49f
resolved formatter_test failures
2018-12-06 01:27:08 +05:30
839526a913
TwitterAPI: Add network hiding.
2018-12-05 19:22:40 +01:00
c524c50509
fix/273
2018-12-05 17:32:06 +03:00
ba345e4c29
[ #210 ] Formatting fix.
2018-12-05 13:43:00 +03:00
848151f7cb
[ #210 ] [TwitterAPI] Made actor be stored for uploads. Added ownership check
...
to `update_media` action. Added controller tests for `upload` and `update_media` actions.
Refactoring.
2018-12-05 13:37:06 +03:00
53797d19c5
[ #210 ] Test update (replaced bang- with non-bang method).
2018-12-05 11:56:31 +03:00
0f061bea0c
tests: add regression test for bug #408
2018-12-05 03:41:32 +00:00
a9e3e387c9
add test
2018-12-04 20:37:13 +03:00
44ab3dbe2c
[ #210 ] Refactoring.
2018-12-04 19:45:09 +03:00
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
2018-12-04 18:35:57 +03:00
50e72f6c48
remove httpoison_mock
2018-12-04 18:09:22 +03:00
dd8aee332c
formatting the code
2018-12-04 17:48:55 +03:00
5c6d47614d
all tests passed
2018-12-04 17:44:15 +03:00
a9e4a97586
update test
2018-12-04 14:04:06 +03:00
7ec64ac33f
update test
2018-12-04 14:04:06 +03:00
80bfdb4e7d
update test
2018-12-04 14:04:06 +03:00
6cfdc11e32
update test
2018-12-04 14:04:06 +03:00
c508d41c34
add http requests mock
2018-12-04 14:04:06 +03:00
87109482f3
status_code -> status
2018-12-04 14:04:06 +03:00
ec34de0c1f
WebSub fix test
2018-12-04 14:03:32 +03:00
d6ab701a14
formatting
2018-12-04 05:01:21 +00:00
419d4bd5e4
tests: add tests for Object.normalize()
2018-12-04 05:00:11 +00:00
f0439617ef
tests: some minor cleanups
2018-12-04 04:52:09 +00:00
f85949cc69
object: factor out fetching functions into Pleroma.Object.Fetcher module
2018-12-04 04:52:09 +00:00
e8caecb5c7
object: move object containment out of transmogrifier into it's own module
2018-12-04 04:52:09 +00:00
fe000f82f8
tests: activitypub: fix broken test due to invalid child object
2018-12-04 04:52:09 +00:00
f7e15d3257
tests: fix a lot of the remaining test failures
2018-12-04 04:52:09 +00:00
4ca4c83871
tests: fix most remaining failures
2018-12-04 04:52:09 +00:00
e8570758f9
twitterapi: fix remaining test failures
2018-12-04 04:52:09 +00:00
6f5f589f73
test: fix mastodon api test failure
2018-12-04 04:52:09 +00:00
88b05aeabb
Merge branch 'fix/parse-user-bio' into 'develop'
...
Parse user's bio on register
See merge request pleroma/pleroma!492
2018-12-03 16:31:00 +00:00
4b70e5eae9
Parse bio for MastodonAPI
2018-12-03 18:59:50 +03:00
8148943368
Format files
2018-12-02 22:08:53 +03:00
ce98d5eb9b
Parse user's bio on register
2018-12-02 22:03:53 +03:00
8c9a4e8b40
TwitterAPI: Implement hide_network.
2018-12-02 18:14:13 +01:00
2a639de9b3
MastodonApi: Implement hide_network.
2018-12-02 17:48:00 +01:00
6be0ab1e55
Hide network in ap.
2018-12-02 17:35:32 +01:00
91065e1968
Fix background updating / handling.
2018-12-02 11:20:38 +01:00
f18b86fd5f
More fixes for Info schema.
2018-12-01 12:46:08 +01:00
93f2dc19d9
TwitterAPI: Fix banner and background update.
2018-12-01 12:01:22 +01:00
347df6421d
Fix masto api user updating.
2018-12-01 10:40:01 +01:00
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-12-01 09:55:46 +01:00
1c67277c80
Fix admin api.
2018-12-01 09:03:16 +01:00
e9982c521b
Upload filter: anonymize filename
...
It replaces the original filename with a randomly generated string.
2018-11-30 19:33:34 +01:00
ca24ad2a2b
Merge branch 'feature/reverse-proxy' into 'develop'
...
reverse proxy / uploads
See merge request pleroma/pleroma!470
2018-11-30 18:15:44 +00:00
253da275bd
Pleroma.Config.delete/1
2018-11-30 18:27:27 +01:00
65e7307d68
Upload: bring back base_url
2018-11-30 18:02:50 +01:00
1d537bc74f
remove eal
...
i like you eal don't take it personally<3
2018-11-30 18:02:49 +01:00
02d3dc6869
Uploads fun, part. 2
2018-11-30 18:02:37 +01:00
b19597f602
reverse proxy / uploads
2018-11-30 18:00:47 +01:00
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
2018-11-30 17:34:20 +01:00
48b95a9b95
Assorted fixes.
2018-11-30 17:08:02 +01:00
d407f662af
Fix TwitterApiController.
2018-11-30 17:07:37 +01:00
a6812bc9df
Remove "most recent notification" endpoint.
2018-11-30 16:47:37 +01:00
6ac5d48575
More fixes
2018-11-29 00:25:43 +01:00
87098d1676
Streamer: Don't send unwanted DMs to list streams
2018-11-27 20:50:19 +01:00
e002858071
Fix ostatus test.
2018-11-27 18:37:46 +01:00
3c61df6b9e
Webfinger fixes.
2018-11-27 18:31:44 +01:00
5bd3b3a215
More and more fixes.
2018-11-27 18:21:05 +01:00
badbe2656c
More fixes.
2018-11-27 18:12:03 +01:00
f983c1d0c6
Fix CommonApi tests.
2018-11-27 17:31:14 +01:00
cc8952b45f
Web.MastodonApi.MastodonSocketTest: Add test for unauthenticated websocket
2018-11-24 08:51:35 +01:00
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
2018-11-22 00:28:04 +00:00
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
2018-11-20 20:16:16 +01:00
0896cf4c0f
Fix most mastodon api bugs.
2018-11-20 20:12:39 +01:00
5b3480d896
tests: fix up some more broken mastodon api testcases
2018-11-20 19:08:41 +00:00
c7d08bc1cf
Merge branch 'feature/retry-queue' into 'develop'
...
Federator: add retry queue.
See merge request pleroma/pleroma!323
2018-11-20 19:04:52 +00:00
c196754b4d
mastodon api: account view: fix tests
2018-11-20 18:54:48 +00:00
2887f4ff1d
Fix formatter tests.
2018-11-20 19:07:01 +01:00
7f4c3a1e99
mediaproxy: fix empty url & add some tests
2018-11-20 17:50:03 +01:00
689b46efc8
RetryQueue: tiny refractor, add tests
2018-11-19 18:08:41 +02:00
fbb70d25fe
Several twitter api fixes.
2018-11-18 22:36:47 +01:00
40d9d2098c
Fix user updating from AP.
2018-11-18 22:15:03 +01:00
fc3bcf335e
Fix following locked users.
2018-11-18 18:53:50 +01:00
d5af41b577
Fix note count update.
2018-11-18 18:52:21 +01:00
6f90ceb2ed
Fix follower count test.
2018-11-18 18:49:17 +01:00
8e3d8bde04
Fix user deactivation test.
2018-11-18 18:40:58 +01:00
5c8f07f0a8
Fix note counting.
2018-11-18 18:17:56 +01:00
47d883d3ab
Fix User deactivation.
2018-11-18 18:06:02 +01:00
f6be980f4f
activitypub: object view: avoid leaking private details
2018-11-17 22:30:53 +00:00
98795172a7
ostatus controller: respond with AS2 objects instead of activities to notice URIs
2018-11-17 22:10:15 +00:00
e10f839e9b
tests: federator: fix formatting
2018-11-17 21:41:08 +00:00
dfcfb184b1
activitypub: transmogrifier: make deletes secure
2018-11-17 21:22:57 +00:00
52681f7fd0
Web.AdminAPI.AdminAPIControllerTest: New Test
2018-11-17 22:12:14 +01:00
76bd80d462
test/plugs/user_is_admin_plug_test: New test
2018-11-17 22:12:13 +01:00
b1a6e8d80d
test: add sanity tests for federator handling of AP docs
2018-11-17 21:01:19 +00:00
55640c4804
tests: add a test to verify the general fake direction protection works in all cases
2018-11-17 20:31:20 +00:00
dc1d8e13b4
tests: add a testcase for user collision
2018-11-17 20:20:45 +00:00
1a940cb46e
tests: add tests for contain_origin_from_id()
2018-11-17 20:16:03 +00:00
b483ae0a72
tests: add a second spoofing variant
2018-11-17 18:25:32 +00:00
9c8adfb6ef
test: fix more test defects
2018-11-17 18:16:55 +00:00
d9cb081f07
tests: add additional spoofing tests
2018-11-17 18:12:11 +00:00
2ab8e28728
transmogrifier tests: fix defective spoofing test
2018-11-17 18:11:46 +00:00
010fcb73d7
test: httpoison mock: add second spoofing activity test
2018-11-17 18:11:17 +00:00
f87b315618
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
2018-11-16 19:47:36 +01:00
2f639ea129
Merge branch 'feature/pleromafe-usersearch' into 'develop'
...
Add Twitter / Pleroma API user search
See merge request pleroma/pleroma!452
2018-11-16 18:13:47 +00:00
e8d8c84f79
Add better test for user search functionlity.
2018-11-16 18:31:32 +01:00
62944b47fb
Reset http security settings to fix plug test
2018-11-17 00:45:21 +09:00
27aa136aac
Format.
2018-11-14 20:41:12 +01:00
7b170cd616
Add Pleroma user search api for PleromaFE.
2018-11-14 20:33:23 +01:00
ea9a776d7b
TwitterApi: Add direct message endpoint
2018-11-13 20:08:50 +01:00
2cf40237ff
MastodonAPI: Add pagination to private messages.
2018-11-13 19:46:34 +01:00
0ce5623134
Merge branch 'twitter-api-null-display-name' into 'develop'
...
Twitter API: Fall back to user.nickname if user has no name
Closes #375
See merge request pleroma/pleroma!444
2018-11-12 17:08:54 +00:00
db78c72868
Twitter API: Add tests for nil names.
2018-11-12 17:02:01 +00:00
ee5932a504
http security: allow referrer-policy to be configured
2018-11-12 15:14:46 +00:00
fe67665e19
rename CSPPlug to HTTPSecurityPlug.
2018-11-12 15:08:02 +00:00
54fdce9107
tests: add tests for CSPPlug
2018-11-11 07:26:31 +00:00
69b8c0e299
tests: add test for internal data stripping
2018-11-10 12:24:25 +00:00
c9c1f9dee2
Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'
...
ostatus: only federate activities concerning note objects
See merge request pleroma/pleroma!437
2018-11-10 11:50:02 +00:00
99a8ef967e
Merge branch 'tests/prismo-url-map' into 'develop'
...
Test that prismo url-map transforms into a string
See merge request pleroma/pleroma!414
2018-11-10 11:17:12 +00:00
1d9fcbf2ba
add missing prismo testcase data
2018-11-10 11:11:01 +00:00
c9df011215
tests: add tests for new OStatus.is_representable? function
2018-11-10 10:39:42 +00:00
dfc26d0fdd
tests: add testing for new notification behavior
2018-11-09 09:37:12 +00:00
719a8a1f82
tests: flip testing to/cc for mentions
2018-11-08 19:17:15 +00:00
59cf7cf235
Merge branch 'small-jsonld-refactor' into 'develop'
...
Small jsonld refactor
See merge request pleroma/pleroma!433
2018-11-08 16:23:58 +00:00
34bd411781
Unify json ld header handling.
2018-11-08 16:39:38 +01:00
3b02fd9fb7
Small refactor.
2018-11-08 16:05:28 +01:00
4d627a5117
Merge branch 'feature/qvitter-notifications-dismiss' into 'develop'
...
qvitter notifications: add new "read notifications" API
See merge request pleroma/pleroma!431
2018-11-07 22:33:06 +00:00
b451a92d78
Merge branch 'runtime-config' into 'develop'
...
Runtime configuration
See merge request pleroma/pleroma!430
2018-11-07 22:32:34 +00:00
d675b8a16f
tests: add tests for twitterapi endpoint
2018-11-06 23:25:16 +00:00
50bf174651
tests: add tests for Notification.set_read_up_to()
2018-11-06 23:02:55 +00:00
5bb88fd174
Runtime configuration
...
Related to #85
Everything should now be configured at runtime, with the exception of
the `Pleroma.HTML` scrubbers (the scrubbers used can be
changed at runtime, but their configuration is compile-time) because
it's building a module with a macro.
2018-11-06 19:41:15 +01:00
0f3e78addb
Merge branch 'runtime-router' into 'develop'
...
Runtime configured router
See merge request pleroma/pleroma!426
2018-11-06 15:35:19 +00:00
7d328c658d
Small wrapper module around Application.get_env/put_env
...
Same API as the old Pleroma.Config
2018-11-06 16:00:48 +01:00
36ca3c1b3e
format
2018-11-06 15:17:29 +01:00
2bc924ba45
Get rid of Pleroma.Config in favor of Application
...
Discussed in https://git.pleroma.social/pleroma/pleroma/merge_requests/426#note_7232
2018-11-06 15:12:53 +01:00
013f7ba8c1
Add federating plug & public tests
2018-11-06 14:45:04 +01:00
2fedd93931
Fix formatting.
2018-11-03 16:40:57 +01:00
81af7fd02d
Test for null-content activities.
2018-11-03 16:28:29 +01:00
7dfe611620
Test for case-insensitive mastodon hashtag timelines.
2018-11-03 11:41:40 +01:00
45ebc8dd9a
Check for empty string in_reply_to ids.
2018-11-02 17:33:51 +01:00
c5f26f3ce2
Test that prismo url-map transforms into a string
2018-11-01 11:30:50 +01:00
585b29337c
Ensure filters have a filter_id
2018-11-01 09:17:02 +00:00
1e9ced5af4
Test Relay, switch to runtime configuration.
2018-11-01 09:01:43 +00:00
9b77030d3c
Add basic configuration management module.
2018-11-01 09:01:03 +00:00
2b3a40d038
object: split object_cache from user_cache
2018-11-01 08:41:46 +00:00
2c092ed355
test: fixup test breakage caused by User.delete() harmonization
2018-11-01 08:23:49 +00:00
21dafa7cd0
tests: add tests for User + cache interactions
2018-11-01 08:11:02 +00:00
f55fc68f76
tests: add tests for object deletion
2018-11-01 07:37:07 +00:00
b92e38d2d4
Add user reactivation task.
2018-10-29 23:13:15 +00:00
2ac13061af
testsuite: formatting
2018-10-26 06:37:00 +00:00
0d0c1dcf44
tests: add testsuite for broken thread filter
2018-10-26 06:35:06 +00:00
b1d1f9bc27
tests: add test for user inbox
2018-10-25 05:24:17 +00:00
6cfba7db8d
tests: twitterapi: add additional fields
2018-10-25 04:06:42 +00:00
9563f3766d
tests: update for new in_reply_to_screen_name field
2018-10-25 03:03:44 +00:00
5e9a0e2460
Fix some typos in the list test.
2018-10-20 13:03:45 +03:00
a249cbf187
Add a test for List.get_lists_account_belongs
2018-10-19 21:24:15 +09:00
958c5e02e8
tests: add a testcase for matching osada users in the formatter
2018-10-17 19:27:05 +00:00
eacab0fb05
Delete Tokens and Authorizations on password change
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/320
2018-10-14 02:14:54 +02:00
ebc32045f0
test: add regression test for #316
2018-10-11 10:35:32 +00:00
497814cbbb
test: update test for new html scrub policy
2018-10-05 21:11:22 +00:00
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe340ab3cb90
2018-10-05 20:49:34 +00:00
a3cffd3566
formatter: Stop using phoenix HTML and format it ourselves
...
* Pheonix has an extra scheme whitelist conflicting with ours
* Pheonix doesn’t seems to do URL encoding, just HTML encoding
Closes: https://git.pleroma.social/pleroma/pleroma/issues/307
2018-09-28 17:32:27 +02:00
34b6d444d6
Merge branch 'feature/twitter_api/fields' into 'develop'
...
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
See merge request pleroma/pleroma!360
2018-09-28 09:25:27 +00:00
a74daabfae
[Pleroma.Web.TwitterAPI.UserViewTest]: Add test for mastodon-fields
2018-09-28 11:17:33 +02:00
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
2018-09-28 10:44:45 +02:00
d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs
2018-09-27 20:00:48 +02:00
eebe33e86a
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor
2018-09-27 20:00:47 +02:00
2c820e10b8
transmogrifier_test: incoming notices with tag not being an array (kroeg)
2018-09-27 20:00:47 +02:00
85b59d07b6
test: add smoketests for the scrubbing policies
2018-09-22 03:45:37 +00:00
56577d8b48
twitter api: add no_rich_text option to userview for account prefs
2018-09-22 03:24:40 +00:00
bd03644ca8
test: add tests for new User.html_filter_policy()
2018-09-22 03:02:05 +00:00
200ab27e7a
test: add test proving that users are refreshed when stale
2018-09-20 23:50:56 +00:00
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
2018-09-20 16:24:29 +02:00
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
2018-09-20 16:10:46 +02:00
85b8590109
Update status_view_test.exs
2018-09-10 23:40:29 +00:00
a4fe14de02
tests: break the cycle using pleroma.factory
2018-09-09 12:56:25 +00:00
fc92bb28b4
tests: try breaking the cycle a different way
2018-09-09 12:43:58 +00:00
33a5294fad
test: user enabled plug tests: fix circular reference
2018-09-09 12:23:48 +00:00
045953225e
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
...
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
2018-09-08 09:20:34 +00:00
619f67768a
Mastodon API: Add unsupported attributes to relationship responses
...
These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values.
2018-09-07 16:12:44 +02:00
d22af29bb4
Fix warning.
2018-09-05 22:42:50 +02:00
44b094908c
Update legacy passwords automatically.
2018-09-05 22:30:14 +02:00
ff38ffd9f8
Fix the tests
2018-09-05 22:20:59 +02:00
e601165426
Add UserEnabledPlug.
2018-09-05 21:53:53 +02:00
5ce1ebb179
Add SetUserSessionIdPlug.
2018-09-05 21:42:42 +02:00
4a3dbd9d4e
Merge branch 'fix/sign-in-with-toot' into 'develop'
...
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
2018-09-05 18:20:26 +00:00
12bc73dd28
Add EnsureUserKeyPlug, smaller fixes
2018-09-05 19:06:28 +02:00
32465b9939
Simplify AuthenticationPlug
2018-09-05 18:53:38 +02:00
9a96c93be7
Add SessionAuthenticationPlug.
2018-09-05 18:37:02 +02:00
a3f54fca4d
Add LegacyAuthenticationPlug
2018-09-05 18:17:33 +02:00
3cf17dc402
Add EnsureAuthenticatedPlug
2018-09-05 17:59:19 +02:00
faf5347748
Add UserFetcherPlug.
2018-09-05 17:44:38 +02:00
42bd985e66
Add BasicAuthDecoderPlug
2018-09-05 17:30:05 +02:00
1a8bc26e52
auth against sha512-crypt password hashes, upgrade to pbkdf2
2018-09-05 00:21:44 -04:00
76c67a41c1
Merge branch 'develop' into 'feature/staff-discovery-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
2018-09-03 14:55:42 +00:00
d3f6814feb
tests: add test for staffAccounts presence in nodeinfo
2018-09-03 14:48:36 +00:00
1c9e539b47
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
...
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
2018-09-03 12:33:36 +00:00
7ca2a2ddea
Merge branch 'nil-bio-emojis' into 'develop'
...
add nil clause for Formatter.get_emoji/1 to return an empty result
Closes #274
See merge request pleroma/pleroma!315
2018-09-03 05:54:11 +00:00
b7923aa304
Merge branch 'hotfix_broken_likes' into 'develop'
...
hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284
2018-09-02 12:37:00 +00:00
834515fb51
formatter: don't add XSS emoji
2018-09-02 00:04:09 +00:00
303af9ba4c
tests: add regression tests
2018-09-01 23:33:10 +00:00
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
2018-09-01 23:10:48 +02:00
0c2a0e3551
Specify default scope in verify_credentials
...
Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value.
2018-08-31 21:04:46 -07:00
a9c0f395cb
add nil clause for Formatter.get_emoji/1 to return an empty result
2018-08-31 14:29:23 -03:00
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
2018-08-31 09:51:20 +00:00
e7871ed05e
tests: add tests for evil HTML filtering
2018-08-31 03:34:56 +00:00
9cac7c957c
test: add testcase proving lists system does not leak non-public posts
2018-08-29 08:50:23 +00:00
0f1c629d65
better solution, added test.
2018-08-27 17:07:26 +03:00
6e030129fb
[MastodonAPI] Add filters
2018-08-27 15:09:05 +02:00
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
2018-08-27 15:09:04 +02:00
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
2018-08-27 08:29:25 +00:00
63094cfd3e
Merge branch 'feature/emoji-in-local-users' into 'develop'
...
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
2018-08-26 23:24:41 +00:00
86dca39640
tests: fix formatting
2018-08-26 23:19:45 +00:00
504a25f812
tests: add notification smoketests (ref #265 )
2018-08-26 22:42:02 +00:00
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
2018-08-26 21:06:15 +00:00
aab2bdddf4
twitter api: provide object descriptions as attachment description field
2018-08-25 00:12:58 +00:00
a8bd120ea6
tests: formatting
2018-08-24 18:33:36 +00:00
14d1187702
test: add testcase for formatter issue #163
2018-08-24 18:22:46 +00:00
bc36d40bee
tests: add a testcase for verifying that objects without a valid ID are always rejected
2018-08-23 01:25:27 +00:00
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
2018-08-21 16:58:44 +00:00
a6d4cc8917
Merge branch 'sanitize-bio' into 'develop'
...
mastodon api: sanitize the bio HTML
See merge request pleroma/pleroma!282
2018-08-21 16:56:24 +00:00
74c74decf5
Basic peertube support.
2018-08-21 18:24:09 +02:00
2b5db840ee
attempt to add html validation to mastodon api test case
2018-08-21 15:41:32 +01:00
e883587cc3
this should be looking at the follower's bio, not the user's bio.
...
fixes test.
2018-08-21 15:25:21 +01:00
f533daffdb
sync bio sanitization code in tests
2018-08-21 15:24:06 +01:00
183ccd1812
Merge branch 'dev-lanodan-url-regex' into 'develop'
...
lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69
2018-08-16 15:41:16 +00:00
5fbb14f5ec
Merge branch 'bugfix/federation-kroeg' into 'develop'
...
fix federation with kroeg
See merge request pleroma/pleroma!272
2018-08-16 15:20:15 +00:00
38361e7b5e
Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
...
Fix: Output repeats at ActivityPub outbox
Closes #191
See merge request pleroma/pleroma!175
2018-08-16 15:19:46 +00:00
8dc715b30b
Merge branch 'fix/normalize-file-extension' into 'develop'
...
Normalize file extension for uploaded files
Closes #218
See merge request pleroma/pleroma!233
2018-08-16 15:17:17 +00:00
8058443674
testsuite: add puckipedia test fixture
2018-08-16 15:10:57 +00:00
b8560e5ed5
testsuite: formatting
2018-08-14 17:15:33 +00:00
7fbcd4caaf
test: add kroeg fixtures
2018-08-14 17:09:17 +00:00
92caa2632b
Use Image type for emoji icons.
2018-08-13 16:21:18 +03:00
f9d13558c8
CommonAPI: add emoji to user source data on update
2018-08-13 15:27:20 +03:00
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
2018-08-12 12:04:15 +00:00
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
2018-08-08 09:24:50 +03:00
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
2018-08-08 08:38:25 +03:00
3026177206
test: use private visibility for twitterapi update consistency test, to ensure that a second activity isn't relayed
2018-08-06 11:29:03 +00:00
aea23468c6
test: nickname is no longer a required field
2018-08-06 08:46:06 +00:00
32a55e9695
[Pleroma.FormatterTest] Add test for XMPP link
2018-07-30 22:01:48 +02:00
1a2255ef7e
[Pleroma.FormatterTest]: .add_links: Add a space before the dot
...
A dot is legal in the url, even at the end, so I moved it for the test
2018-07-30 22:01:48 +02:00
9c1b6f11c5
improve test
2018-07-21 02:57:56 +09:00
908cefd84a
debug
2018-07-21 02:19:20 +09:00
9c2afb2e71
improve test
2018-07-21 01:44:35 +09:00
41b0ecef95
Merge branch 'tests/plume' into 'develop'
...
Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252
2018-07-19 07:35:34 +00:00
54963a6379
Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'
...
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
Closes #206
See merge request pleroma/pleroma!251
2018-07-19 07:31:33 +00:00
18cac1e36b
test: mastodon attachments: update for added description field
2018-07-17 03:40:48 +00:00
489453c246
tests: verify media description api support is working
2018-07-17 03:40:47 +00:00
24b5a75d09
Add test for Plume Articles
2018-07-12 23:08:28 +02:00
f1a29fc43c
test: ostatus controller: add AS2 fetching tests
2018-07-12 20:32:56 +00:00
4fb64c1d86
testsuite: twitter api: add summary where necessary
2018-07-12 16:12:25 +00:00
fe4387077a
Merge branch 'feature/default-scope' into 'develop'
...
default scope setting
See merge request pleroma/pleroma!239
2018-07-12 05:59:12 +00:00
4a922305af
Merge branch 'feature/article-support' into 'develop'
...
article support (plume, etc)
See merge request pleroma/pleroma!240
2018-07-12 05:58:39 +00:00
8546551257
activitypub: switch to using x509 representation for public keys instead of pkcs#1
2018-07-12 03:30:22 +00:00
66819ea784
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
2018-06-27 13:38:07 +00:00
32211c4ada
tests: add default_scope where appropriate
2018-06-27 13:17:07 +00:00
fc012491a5
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
...
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
2018-06-25 08:45:42 +00:00
6160a1b3c0
mix format
2018-06-24 15:24:41 -07:00
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
2018-06-23 23:20:30 -07:00
6316003946
fixes- found that TwitterAPI.Controller adds .json suffix already
2018-06-23 23:05:54 -07:00
359093d73b
Fake 2.4.0 API
2018-06-23 16:12:57 +02:00
082920044a
Normalize file extension for uploaded files
2018-06-21 14:04:12 -04:00
be800d7936
Merge branch 'bugfix/block-follow-relationships' into 'develop'
...
fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230
2018-06-19 09:42:45 +00:00
590e8d5555
tests: fix a completely bogus mastodon api test
2018-06-19 08:53:54 +00:00
3707a7fa42
tests: transmogrifier: ensure incoming blocks have the same effect as local blocks
2018-06-19 00:59:28 +00:00
e9ed7eb963
tests: prove that the block code is properly destroying follow relationships
2018-06-19 00:59:27 +00:00
a2c6778ce6
tests: add regression test for contentMap-only posts
2018-06-18 22:14:51 +00:00
72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
2018-06-15 22:14:17 +02:00
0a95b5594b
Add missing file extension if file does not have one
2018-06-14 12:16:34 -04:00
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
2018-06-14 07:19:36 +00:00
fc15f30a3c
fixup test
2018-06-13 21:45:27 -04:00
1555c66650
Add unretweet TwAPI endpoint and cleanup AP.unannounce
2018-06-13 21:33:36 -04:00
9c1cf1befb
formatting
2018-06-12 15:01:40 +03:00
f42ffbe9a8
Initial invites support + tests.
2018-06-12 14:55:16 +03:00
3f42806b1b
Merge branch 'develop' into 'develop'
...
Dedupe uploads
See merge request pleroma/pleroma!115
2018-06-12 08:26:26 +00:00
564c73ab24
Merge branch 'feature/list-streaming' into 'develop'
...
MastoAPI: Add streaming for lists.
See merge request pleroma/pleroma!183
2018-06-12 07:19:45 +00:00
c773f42ca4
tests: update twitterapi user view tests for new locked variable
2018-06-11 22:15:53 +00:00
f8e0942745
twitter api: add approve/deny endpoints
2018-06-11 22:15:53 +00:00
d116af3bee
tests: add tests for /api/pleroma/friend_requests
2018-06-11 22:15:53 +00:00
993312cdb3
twitterapi: add profile setting for locked/unlocked accounts
2018-06-11 22:15:53 +00:00
a0c5b42e29
tests: assert the state prior to mutating it as well as afterward
2018-06-11 22:15:53 +00:00
c99b9b9d92
testsuite: add mastodon api tests
2018-06-11 22:15:53 +00:00
7f79b467b1
Merge branch 'feature/domain-blocks' into 'develop'
...
Domain blocks
See merge request pleroma/pleroma!190
2018-06-11 11:19:45 +00:00
299ef74f2e
tests: add regression test for locking/unlocking account updates
2018-06-08 02:52:34 +00:00
3f0440ac3c
Dedupe uploads
2018-06-06 13:25:44 -06:00
0a0c6bf394
Merge branch 'bugfix/webfinger-xml-crash' into 'develop'
...
webfinger robustness improvements
See merge request pleroma/pleroma!195
2018-06-06 16:44:44 +00:00
1620ec502c
testsuite: update fixture URIs that were http
2018-06-06 16:36:58 +00:00
2cebaa7d3a
Add OAuth controller tests
...
Tests for Pleroma.Web.OAuth.OAuthController
2018-06-06 03:18:11 +02:00
4856962434
MastoAPI: add domain blocking.
2018-06-03 22:21:23 +03:00
8073af6e10
Better error handling for OstatusController.
2018-06-03 21:04:44 +02:00
87566b6e2f
user.ex: add domain blocks.
2018-06-03 22:01:37 +03:00
06439f64d0
Better error handling for ActivityPubController
2018-06-03 19:58:59 +02:00
4856ba596f
Better error handling for MastodonApiController.
2018-06-03 19:28:11 +02:00
0f70e83e8c
Better error handling in TwitterApiController.
2018-06-03 19:11:22 +02:00
98b8f08783
Merge branch 'fix/twitterapi-incorrect-follows-you' into 'develop'
...
TwitterAPI: fix "Follows you" being shown for the wrong user.
Closes pleroma-fe#89
See merge request pleroma/pleroma!185
2018-06-01 08:51:04 +00:00
935e544e19
TwitterAPI: fix "Follows you" being shown for the wrong user.
2018-05-31 15:27:42 +03:00
349400c06a
Fix url guessing attacks.
2018-05-30 20:00:27 +02:00
5d3fdbc082
MastoAPI: Add streaming for lists.
2018-05-30 16:48:59 +03:00
f569b67cda
tests: update for html changes
2018-05-27 13:03:34 +00:00
841ee8e3e4
Simplify DM query.
...
Should also use indexes better.
2018-05-26 16:25:32 +02:00
4b3ec53514
Merge branch 'develop' into csaurus/pleroma-feature/mstdn-direct-api
2018-05-26 16:00:59 +02:00
745072b2cc
Merge branch 'kaniini/pleroma-feature/activitypub-accept-reject-conformance' into develop
2018-05-26 15:15:52 +02:00
0a6c897c94
Formatting.
2018-05-26 15:11:50 +02:00
bfce29866f
Make Mastodon follow hack more explicit.
2018-05-26 15:07:21 +02:00
3839a11ef5
Don't treat remote accepts/rejects as local.
...
Also, use specialized functions to get safe data.
2018-05-26 14:07:46 +02:00
1db0dc3072
tests: add tests to verify the accept request is discarded if no follow activity could be found
2018-05-26 11:20:53 +00:00
7cf3cf77cf
activitypub transmogrifier: cleanups and tests for incoming accepts/rejects
2018-05-25 12:53:12 +00:00
1f3eb0f470
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
2018-05-25 06:12:30 +00:00
1d88abf2d4
user: do not allow refollowing somebody who has blocked a user
2018-05-25 03:18:35 +00:00
8d2ee70da1
testsuite: fix module name for CommonAPI.Test (was duplicated with CommonAPI.UtilsTest)
2018-05-25 03:18:34 +00:00
f3a71f2986
Merge branch 'feature/lists' into 'develop'
...
Mastodon List API
See merge request pleroma/pleroma!138
2018-05-24 20:22:43 +00:00
c2dcd767cf
Merge branch 'feature/incoming-remote-unfollow' into 'develop'
...
Add support for incoming remote unfollows and blocks/unblocks
See merge request pleroma/pleroma!158
2018-05-24 19:52:24 +00:00
c41012053a
Merge branch 'feature/change-password' into 'develop'
...
Feature/change password
See merge request pleroma/pleroma!166
2018-05-24 17:16:37 +00:00
3dbd9809d4
MastoAPI: add lists.
2018-05-24 15:34:39 +03:00
1cd6194dee
More efficient queries.
2018-05-24 12:44:26 +02:00
0b5bc62b33
Don't save double tags in AP objects we create
...
This crashed Mastodon workers.
2018-05-23 17:25:24 +02:00
06c97f211f
Merge branch 'feature/deps-migration' into 'develop'
...
Migrate to comeonin 4 and Cachex 3
See merge request pleroma/pleroma!162
2018-05-23 09:03:11 +00:00
72b93d13f8
Hook up block/unblock to TwitterAPI
2018-05-22 05:41:17 -04:00
b2c6ae7d82
Hook up unfollow and (un)block to MastoAPI + tests
2018-05-22 04:27:40 -04:00
4fd9df100f
Merge branch 'develop' into feature/mstdn-direct-api
2018-05-21 20:19:37 -04:00
69aa7c213a
Fixed test
2018-05-21 23:06:03 +01:00
d0690622cd
Added endpoint for changing passwords
2018-05-21 23:06:03 +01:00
75cfd9d34d
webfinger: fix finding the XRD uri for statusnet instances
2018-05-21 12:41:31 +00:00
d045b96f95
Add tests for incoming unfollow over OStatus
2018-05-21 05:11:13 -04:00
cc5373b846
Fix unblock handling
2018-05-21 05:00:58 -04:00
89c5de9096
Fix unfollows
2018-05-20 21:01:14 -04:00
56de0216ae
pass user to User.blocks?/2 instead of ap_id
2018-05-20 19:45:05 -04:00
1afd6d37bd
Merge remote-tracking branch 'upstream/develop' into feature/incoming-remote-unfollow
...
Fixed some conflicts in transmogrifier.ex
2018-05-20 19:17:15 -04:00
e55c6f311b
Migrate to comeonin 4 and Cachex 3
...
Also fix some warning in the code and add a missing alias
2018-05-20 20:08:40 +02:00
413de8e4bc
More fixes.
2018-05-20 19:26:09 +02:00
ff007af0c2
Return visilility in twitter api, too.
2018-05-20 18:01:24 +02:00
434601a5c3
Return private / direct posts on user timelines, too.
2018-05-20 16:15:18 +02:00
8b0c222b43
Merge branch 'feature/account-deletion' into 'develop'
...
Feature/account deletion
Closes #115
See merge request pleroma/pleroma!157
2018-05-20 10:57:19 +00:00
d46393f6ef
Fix test for blocks
2018-05-20 02:15:56 -04:00
1e43de0f86
Formatting and add tests for blocks/unblocks
2018-05-19 21:23:52 -04:00
6f39ecc41b
Support Undo like activities ( Fix #139 )
2018-05-19 22:14:15 +02:00
d1366f8d46
Modified deleting an account to run as a task
2018-05-19 13:35:49 +01:00
7831b38705
Merge branch 'feature/webfinger-mime-ld-json' into 'develop'
...
webfinger: handle application/ld+json links
See merge request pleroma/pleroma!159
2018-05-19 09:31:08 +00:00
df95118c81
Fix linking problem.
2018-05-19 11:27:14 +02:00
725b05d04a
run mix format
2018-05-19 08:48:15 +00:00
6e8de2faae
run mix format
2018-05-19 08:37:04 +00:00
4033ed6714
tests: add test for hubzilla follow activity too
2018-05-19 03:28:32 -05:00
19c96c8a19
tests: add tests for Transmogrifier.maybe_fix_user_object()
2018-05-19 03:28:30 -05:00
f32e19f668
webfinger: add tests
2018-05-19 01:28:27 -05:00
8d11bae0d5
Revert "Undo formatting in user.ex"
...
This reverts commit e6dc15b96c
2018-05-17 23:55:00 -04:00
e6dc15b96c
Undo formatting in user.ex
2018-05-17 23:53:34 -04:00
d8c842a771
Add support for incoming remote unfollows
2018-05-17 22:15:57 -04:00
1d4bbec6b3
Fix User search.
...
Now uses a trigram based search. This is a lot faster and gives better
results. Closes #185 .
2018-05-16 17:55:20 +02:00
d0ad13c12e
Add direct_note[_activity]_factory and a couple tests
2018-05-14 21:54:25 -04:00
987a52cf6f
Post direct status test
2018-05-13 21:21:42 -04:00
98b36d359a
Fixed formatting and test
2018-05-13 15:43:42 +01:00
5bfb7b4ce6
Moved account deletion stuff to somewhere that hopefully makes more sense
2018-05-13 14:36:02 +01:00
a16117225f
Added endpoint for user account deletion
2018-05-13 14:35:48 +01:00
89954a2ce7
Fix format.
2018-05-13 13:02:24 +02:00
c7a85de35c
Revert "Remove 'unlisted' handling for now."
...
This reverts commit 1027d1f696
2018-05-13 12:38:13 +02:00
1027d1f696
Remove 'unlisted' handling for now.
...
It's just too slow (over 1 second on small systems, haven't looked at
the queries in detail yet). We'll need some other way to handle it.
2018-05-13 12:07:11 +02:00
aeff2d6474
Merge branch 'feature/unrepeats' into 'develop'
...
Add unrepeats
Closes #69
See merge request pleroma/pleroma!113
2018-05-13 09:32:29 +00:00
ec531ca281
Add test.
2018-05-13 11:18:48 +02:00
694e376954
Update test fixture
2018-05-12 11:10:49 -04:00
16b793656d
Add tests for unrepeats
2018-05-11 15:30:47 -04:00
89603eda9e
do not create notification for yourself
2018-05-11 11:31:17 +02:00
6c2903d9a1
Merge branch 'feld-warnings' into 'develop'
...
Clean up warnings
See merge request pleroma/pleroma!144
2018-05-06 18:42:31 +00:00
9810153aeb
Streamer: Don't send out stream events for blocked users.
2018-05-05 13:40:47 +02:00
c464355d1a
Idempotency: Use special cache, keep for 6 hours.
2018-05-05 11:15:57 +02:00
ab4aa5720a
Fix a bunch of unused variable warnings
2018-05-04 20:59:01 +00:00
90c4bed0af
Don't expire idempotency cache for five minutes.
2018-05-04 21:15:39 +02:00
fcd3eca167
MastodonAPI: Support idempotency key.
2018-05-04 20:30:29 +02:00
8b4ee0ea51
Fix formatting
2018-05-04 03:19:48 -04:00
bc215f5684
Fix format.
2018-04-29 11:28:26 +02:00
b7584edcea
Merge branch 'patch-bio' into 'develop'
...
replace newlines in profiles with <br>
See merge request pleroma/pleroma!136
2018-04-29 09:26:47 +00:00
a7a40bb8f1
Merge branch 'fix/blocked-user-boosts' into 'develop'
...
ActivityPub.ex: do not return boosted statuses from blocked users.
See merge request pleroma/pleroma!111
2018-04-28 13:49:12 +00:00
6908f29e0a
Added a test (written by @andrewzah) for the MR
2018-04-28 12:01:43 +01:00
2d775bf1be
Merge branch 'feature/unrepeats' of git.pleroma.social:normandy/pleroma into feature/unrepeats
2018-04-25 01:58:50 -04:00
e981280fa7
Formatting fixes
2018-04-25 01:43:45 -04:00
9e0dd21ed6
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-25 00:46:28 -04:00
9972678a68
Add User.decrease_note_count and call it from ActivityPub.delete
2018-04-24 11:34:18 +02:00
8c0806539c
Embed announce activity data instead of linking to it
2018-04-22 21:28:51 -04:00
0574df273c
Small cleanup.
2018-04-22 10:01:10 +02:00
114ca9e069
Merge branch 'develop' into fix/note-count-not-updating
2018-04-22 09:56:24 +02:00
0c221943ef
Formatter: Use proper escaping for links.
2018-04-21 18:27:31 +02:00
22bfeac256
Update note count in ActivityPub.create.
2018-04-21 12:58:04 +03:00
9e6ae44729
Formatting fixes.
2018-04-21 09:43:53 +02:00
f0798440de
Use correct activity for undo
2018-04-20 23:22:16 -04:00
c5dc7e6e31
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into feature/unrepeats
2018-04-20 16:48:18 -04:00
a61e8ac154
Formatting.
2018-04-20 13:10:57 +02:00
fa37acfcc7
TwitterAPI: Add Qvitter notification endpoint.
2018-04-19 21:46:59 +03:00
7b4f55238e
Handle unrepeats via the TwitterAPI
2018-04-18 06:00:40 -04:00
687db1bc3a
Expose unannounce activity so that it can be tested
2018-04-18 03:39:42 -04:00
42279f54cf
Return target status in MastoAPI endpoint instead of reblog activity
2018-04-16 23:30:52 -04:00
5b0d0b9ab2
Add unreblogging tests
2018-04-14 22:34:06 -04:00
48380aeccc
ActivityPub.ex: do not return boosted statuses from blocked users.
2018-04-14 14:26:20 +03:00
2de2e29df2
Oops
2018-04-11 15:51:02 -04:00
3a5c0465eb
Add unit test for pinned statuses
2018-04-11 15:48:32 -04:00
70bcdf32bd
Only search in public data for now.
...
This should be the data the user is allowed to see later, but this
will stop accidental private message leaks.
2018-04-07 16:40:45 +02:00
60f92e406c
Accept port number in urls.
2018-04-06 16:35:54 +02:00
81600c94f4
Handle + in links.
2018-04-04 11:29:03 +02:00
806550c921
Use user url in mention if we have it.
2018-04-03 18:32:46 +02:00
b3b7ab5d9a
Load all users at once in timelines.
2018-04-02 16:35:41 +02:00
360c51f1f5
Use context_ids directly if we have them.
2018-04-02 15:28:35 +02:00
bc31bee7c4
Generates contexts and ids on insertion time.
2018-04-02 15:17:09 +02:00
a4db3a732f
Pre-fetch conversation ids.
2018-04-02 14:46:56 +02:00
0a14d155d6
Fail faster.
2018-04-02 13:13:14 +02:00
1b57522bba
Fix some test stuff.
2018-04-02 13:13:04 +02:00
2222e5599c
Don't fetch anything except ap_id for follower / following
...
collections.
Should speed up the queries because ecto doesn't have to parse the json.
2018-03-31 20:02:09 +02:00
802736679c
Remove unused ActivityRepresenter module.
2018-03-30 16:50:30 +02:00
e90f8f6c4b
TwApi ActivityView: Add delete activities.
2018-03-30 15:32:43 +02:00
1f32ba052c
TwApi ActivityView: Add follows.
2018-03-30 15:17:13 +02:00
4afbef39f4
Format the code.
2018-03-30 15:01:53 +02:00
c1d529ee94
TwApi ActivityView: Add announces.
2018-03-30 14:46:36 +02:00
1f1caab138
TwApi ActivityView: Add Like rendering.
2018-03-30 13:49:09 +02:00
361016349f
Add ActivityViewTest.
2018-03-30 12:57:55 +02:00
e30752bc79
Add basic activity view.
2018-03-27 22:24:19 +02:00
37e5014d3e
Reduce OP fetching queries.
2018-03-27 18:18:24 +02:00
ff7afe46b9
Don't try to fetch OP if none is there.
2018-03-27 17:43:08 +02:00
9556c8f6e7
Forgot to fix one of the links in a test
2018-03-27 02:08:46 -04:00
5ba2f4b6d8
Update tests to reflect hashtag link changes
2018-03-27 02:07:07 -04:00
2aea3bc632
activitypub transmogrifier: rewrite incoming hashtags
2018-03-24 16:42:17 -05:00
e3a81fe58f
Fetch the same data from json webfinger as from xml webfinger.
2018-03-24 14:45:54 +01:00
eb7ce61ca5
Fix hashtags.
2018-03-24 11:03:10 +01:00
5da2355e71
For outgoing objects, fake mastodon style ap id for ostatus.
2018-03-23 16:07:02 +01:00
32ae918843
Clear caches on test.
2018-03-22 12:44:32 +01:00
ff7afc0465
tests: webfinger: test quering a JSON response for activitypub actor URI
2018-03-22 00:36:13 -05:00
8aa639a450
webfinger: support JSON output
2018-03-22 00:35:51 -05:00
ec83175100
Use connection pools.
2018-03-19 17:42:09 +01:00
0ee6e8af26
mastodon api tests: invalidate user cache prior to importing a test reply
...
This is needed to ensure the user cache does not throw nil when creating the mentions
list.
Signed-off-by: lain <lain@soykaf.club>
2018-03-16 11:25:41 +01:00
59a76ea464
activitypub transmogrifier: rewrite non-http URLs using the object's external URL
...
Signed-off-by: lain <lain@soykaf.club>
2018-03-14 08:53:29 +01:00
368e085144
Don't validate on missing public key.
2018-03-11 14:47:37 +01:00
f29902a241
More signature debugging.
2018-03-11 14:37:23 +01:00
611ca385de
Merge branch 'develop' into feature/activitypub
2018-03-08 12:37:06 +01:00
a91adb146e
add test file.
2018-03-07 15:46:53 +01:00
fcf1937a40
Correctly handle unlisted messages coming in through Ostatus.
2018-03-07 15:45:13 +01:00
b82637f32d
Don't use special query for feed.
2018-03-06 16:04:29 +01:00
d2ad99298e
Handle incoming deletes.
2018-03-03 18:38:40 +01:00
e9de04b74b
Add support for outgoing update.
2018-02-25 21:08:32 +01:00
f61fd00db5
Make likes and announces public.
2018-02-25 18:20:06 +01:00
8a47974217
Fix specs.
2018-02-25 18:11:03 +01:00
4ea2a41014
Fix more specs.
2018-02-25 17:48:31 +01:00
d3b0167854
Fix salmon tests.
2018-02-25 17:06:12 +01:00
4d13cc0dc6
Fix specs.
2018-02-25 16:52:33 +01:00
8e7f63afde
Fix specs.
2018-02-25 16:40:37 +01:00
e3629af4da
Handle remote update activities.
2018-02-25 16:14:25 +01:00
b76de1ecd3
Some fixes to AP fetching.
2018-02-25 10:56:01 +01:00
e5fcc51a06
Remove unneccesary subscriptions on update.
2018-02-24 17:36:02 +01:00
fb02300234
Pleroma AP detection mechanism.
2018-02-24 13:06:53 +01:00
01d5ef65fa
More fixes to user upgrading.
2018-02-24 10:42:47 +01:00
aa79d64e0d
Correctly stitch mastodon -> ostatus replies.
2018-02-23 15:00:41 +01:00
eb3f14da86
Missing test skeleton.
2018-02-23 08:49:57 +01:00
37e406ae36
Get avatar and banner from AP users.
2018-02-22 08:14:15 +01:00
4816b09fa7
Add user upgrade function.
2018-02-21 22:21:40 +01:00
ec07e087bc
Make user bio optional
2018-02-21 23:31:57 +03:00
94db9ac4db
Merge branch 'develop' into feature/activitypub
2018-02-21 18:34:19 +01:00
810cf8618f
ActivityPub: Fetch missing activities on reply.
2018-02-21 15:22:24 +01:00
5bc810c452
Add moderator function.
2018-02-20 18:44:50 +01:00
95f7e7e2d5
Add some more tests.
2018-02-20 18:42:41 +01:00
297a2c7d3f
Ignore duplicate create activities.
2018-02-19 17:37:45 +01:00
6b6ab592ab
AP: Fix incoming conversations.
2018-02-19 10:39:03 +01:00
539340d914
Handle sensitive property.
2018-02-18 14:14:16 +01:00
20e6190ead
Transmogrify outgoing nsfw.
2018-02-18 14:07:13 +01:00
8ca66b5961
ActivityPub: Add conversation id.
2018-02-18 13:58:52 +01:00
6ab0aba50a
Transmogrify outgoing hashtags.
2018-02-18 13:51:03 +01:00
6046f10431
Actually fix incoming attachments.
2018-02-18 13:06:51 +01:00
77c6c424a6
ActivityPub: Make fake Create activities for objects without one.
2018-02-18 11:24:54 +01:00
fc9d361d17
Add mock.
2018-02-18 10:21:19 +01:00
81ea359a7c
ActivityPub: Handle incoming announces.
2018-02-17 21:57:31 +01:00
e3732ea3bc
Add test fixtures.
2018-02-17 21:56:52 +01:00
5e36b750c1
ActivityPub: Fetch an object from an id.
2018-02-17 21:56:33 +01:00
e1b12a7782
ActivityPub: Handle incoming likes.
2018-02-17 20:13:12 +01:00
ab27c90c9f
ActivityPub: Handle attachments.
2018-02-17 18:38:58 +01:00
fb7b926be3
Handle black name fields on incoming users.
2018-02-17 18:15:48 +01:00
7b26443a76
ActivityPub: Send out Accept after Follow.
2018-02-17 16:08:55 +01:00
e7b73359e3
ActivityPub: Partly handle incoming follows.
2018-02-17 14:55:44 +01:00
5682e48a25
ActivityPub: tags -> tag.
2018-02-17 14:20:53 +01:00
05ba6ca1b8
Do some transmogrifying for the output.
2018-02-17 14:11:20 +01:00
5a371892a0
Fix specs.
2018-02-17 10:26:44 +01:00
dea29d707c
Add post activity fixture.
2018-02-17 09:48:42 +01:00
5454ec6a6c
ActivityPubController: Handle inbox data.
2018-02-15 20:00:43 +01:00
ef0300889d
Transmogrifier: Handle basic notice creation.
2018-02-15 20:00:06 +01:00
a15f572800
OstatusTest: Remove insert_or_update test (moved to User).
2018-02-15 19:59:40 +01:00
ae26604378
ActivityPub: Refactor create function.
2018-02-15 19:59:35 +01:00
0aa56a853b
UserTest: Move insert_or_update test.
2018-02-15 19:58:12 +01:00
b331cb449a
Merge branch 'develop' into feature/activitypub
2018-02-12 10:24:15 +01:00
1bc34de4df
Add missing support file.
2018-02-12 10:23:21 +01:00
26ccb768d3
Make test output easier to read.
2018-02-12 10:14:11 +01:00
33a5d0a238
Fix some test warnings.
2018-02-12 09:33:01 +01:00
3c80d9b277
Fix spec.
2018-02-12 08:15:03 +01:00
8cf97ee8e1
ActivityPub: Basic note federation with Mastodon.
2018-02-11 20:43:33 +01:00
ce31f3a922
Twitter Representers: Handle Mastodon attachments.
2018-02-11 17:21:06 +01:00
ae1ec858f4
Basic AP user building.
2018-02-11 17:20:43 +01:00
c1d26751e6
Mocks: Add mastodon user json example.
2018-02-11 17:19:06 +01:00
52200998c9
Merge branch 'develop' into feature/activitypub
2018-02-11 09:50:55 +01:00
61c16193de
Merge branch 'move-backend-images' into 'develop'
...
Move avi.png & banner.png from /priv/static/static to /priv/static/images
See merge request pleroma/pleroma!60
2018-02-03 13:05:20 +00:00
ea6d1b2b17
move avi.png & banner.png from /priv/static/static to /priv/static/images
2018-02-03 20:43:14 +09:00
29be70c008
Add remote following of local profiles.
2018-02-02 00:14:05 +02:00
ab83e0de6d
TwitterAPI: Add is_local to user view.
2018-02-01 21:41:19 +02:00
ad0ab3a57b
Merge branch 'hakabahitoyo/pleroma-feature/atom-feed-logo' into develop
2018-01-30 12:20:39 +01:00
4501094606
Make specs less breaky.
2018-01-30 12:20:14 +01:00
1bb3ba02f3
Fix specs.
2018-01-30 12:17:01 +01:00
b3e7d7ae6d
Fetch external profile in the background.
2018-01-16 15:31:03 +02:00
80f6ac412a
Merge branch 'default-pictures' into 'develop'
...
Add a default profile picture and banner.
See merge request pleroma/pleroma!48
2018-01-15 20:26:49 +00:00
14b086eec2
Add a default profile picture and banner.
...
This removes the placehold.it dependency.
2018-01-15 22:18:17 +02:00
6e1cb86166
Fix instance test.
2018-01-14 08:28:35 +02:00
2a744cdff8
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-12-19 16:15:45 +01:00
f1f79c0dca
Fix timelines in subway tooter.
2017-12-19 16:15:07 +01:00
29c9812789
Merge branch 'fix/twitterapi-follow-lists' into 'develop'
...
Fix follower/following lists.
Closes #29
See merge request pleroma/pleroma!41
2017-12-18 22:44:15 +00:00
47887ac848
MastoAPI: Fix always-sensitive bugs.
2017-12-18 16:56:03 +01:00
1969773fb4
Fix follower/following lists.
...
Add tests.
2017-12-18 16:37:26 +02:00
4a13b84887
Add recipients field to activities.
...
Also do some very basic checks for AP message insertion.
2017-12-12 18:07:14 +01:00
9223038319
Fix some more tests.
2017-12-11 21:01:36 +02:00
e2e6365035
ActivityPub: Add controller tests.
2017-12-11 18:22:48 +01:00
da005d3332
ActivityPub: Add Objects View.
2017-12-11 18:19:46 +01:00
79b3397c17
Fix tests.
2017-12-11 18:41:03 +02:00
c3bcafc51b
HTTPSig: Add method to validate conn
2017-12-11 10:37:40 +01:00
30e9b22f96
Merge branch 'develop' into feature/activitypub
2017-12-09 11:00:56 +01:00
d5a13c10ac
Merge branch 'feature/user_deletion' into develop
2017-12-09 10:10:45 +01:00
bad499b3fd
Basic user deletion.
2017-12-08 17:50:11 +01:00
a3e68f0233
Allow parentheses in links.
2017-12-07 21:38:31 +02:00
6df6ad0b42
User deletion: Remove relationships.
2017-12-07 18:13:05 +01:00
a78ae2a685
Don't follow deactivated users.
2017-12-07 17:51:55 +01:00
b727ecc5e7
Add function to deactivate users.
2017-12-07 17:47:23 +01:00
0ec5aeb8a7
Don't log in deactivated users.
2017-12-07 17:41:34 +01:00
66c3813ea6
Add basic queue prioritization.
2017-12-05 18:21:30 +01:00
e7c2472abd
Fix tests.
2017-12-05 12:18:04 +01:00
d08a34e88b
OStatus: Add user bio as summary field
...
Fixes problem with bio federation.
2017-12-03 13:34:17 +01:00
5637d163e6
MastodonAPI: Add proper user count.
2017-11-30 14:59:44 +01:00
c680ae581d
Return xml notice at /notice path.
2017-11-27 17:24:52 +01:00
1625021a9c
Merge branch 'fix/self-follow' into 'develop'
...
Dont include the user in their own follower count.
See merge request pleroma/pleroma!29
2017-11-21 23:09:59 +00:00
3d29fc5462
Make /api/friends/ids test deterministic.
2017-11-20 19:16:43 +02:00
747a68a075
Treat internal emoji like external.
2017-11-20 17:53:21 +01:00
8d4e7b32c9
Ensure correct state in self-unfollow.
2017-11-20 09:26:31 +02:00
bd921ca5d7
Fix posts being streamed to non-local websocket channels.
2017-11-20 07:58:43 +02:00
edc3e5bc30
Make users in tests follow themselves by default.
...
Also fix the semantics of all tests to match.
2017-11-20 07:52:02 +02:00
4db5954786
Don't let the user unfollow their own account.
2017-11-20 07:50:56 +02:00
40ca379357
Fix flakey test.
2017-11-19 13:07:29 +01:00
ed3403ad8b
Merge branch 'formatting-fixes' into 'develop'
...
Formatting fixes
Closes #80
See merge request pleroma/pleroma!22
2017-11-18 15:58:44 +00:00
f53cdabcdf
Add #nsfw tag if sensitive content bit is set
2017-11-18 16:30:18 +02:00
fb118b2978
Don't insert newlines to generated HTML.
...
MastoFE doesn't like them.
2017-11-18 14:46:54 +02:00
66e78c3ec4
Escape HTML instead of discarding it.
2017-11-18 14:43:41 +02:00
a743940463
MastoAPI: Implement all streaming functions.
2017-11-16 16:49:51 +01:00
ced0d64d75
MastoAPI: Make attachment ids strings.
2017-11-15 18:58:39 +01:00
1cca544e20
Merge branch 'twitterapi-bitlbee' into 'develop'
...
TwitterAPI: Add missing endpoints for bitlbee.
Closes #67
See merge request pleroma/pleroma!18
2017-11-14 16:47:54 +00:00
f9828e578c
TwitterAPI: Add /users/show.
2017-11-14 17:34:48 +02:00
3533bf7eac
TwitterAPI: Add /friends/ids.
2017-11-14 16:04:58 +02:00
06c3ee3bac
Accept 1 as true.
2017-11-14 15:54:50 +02:00
c84723b679
MastoAPI: Add media timelines.
2017-11-14 15:41:16 +02:00
083cd169d2
MastoAPI: Fix repeat api bug.
...
Documentation was wrong, reblogging actually returns the reblog, not
the reblogged status.
2017-11-13 09:48:56 +01:00
08bc316742
Merge branch 'mastodon-notification-endpoints' into 'develop'
...
MastoAPI: Add notification endpoints get, clear and dismiss.
Closes #42
See merge request pleroma/pleroma!13
2017-11-12 11:08:06 +00:00
efcf54dc02
Merge branch 'mastoapi-update-credentials' into 'develop'
...
MastoAPI: Add update credentials endpoint.
Closes #61
See merge request pleroma/pleroma!15
2017-11-12 09:24:32 +00:00
fc7483cb3c
MastoAPI: Add update credentials endpoint.
2017-11-12 00:27:09 +02:00
a1923d20e8
MastoAPI: Fix reblog emojis.
2017-11-11 11:18:05 +01:00
1d3d66a841
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-10 17:37:54 +01:00
6e9c22c0af
MastoAPI: Use string ids everywhere.
2017-11-10 17:18:19 +01:00
e6a78c6ed0
MastoAPI: Add notification get, clear and dismiss.
2017-11-10 15:24:52 +02:00
1b8ad9f731
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-09 16:49:32 +01:00
266d9c008d
MastoAPI: Fetch statuses in search.
2017-11-09 16:48:45 +01:00
2247d7580e
Merge branch 'fix-tootdon-image-uploads' into 'develop'
...
Correct mimetype on bad uploads.
See merge request pleroma/pleroma!12
2017-11-09 14:41:44 +00:00
e942e1e552
Correct mimetype on bad uploads.
2017-11-09 15:01:59 +02:00
f1d27a5fbb
Add actor column to activities.
2017-11-09 10:41:19 +01:00
41b8a76e96
Re-fetch user data on salmon decode error.
2017-11-09 08:32:54 +01:00
f7fc048aeb
TwitterAPI user view: add follows_you.
2017-11-08 19:13:03 +02:00
4656cb9b99
TwitterAPI user view: add blocks.
2017-11-08 13:02:00 +02:00
6c0758e041
TwitterAPI: Add blocks.
2017-11-08 00:04:53 +02:00
d761b1543a
Merge branch 'authenticated-profile-fetching' into 'develop'
...
Allow profile fetching for authenticated users only.
Closes #54
See merge request pleroma/pleroma!7
2017-11-07 18:58:22 +00:00
7da978f3f5
Linkify fixes.
2017-11-07 12:06:37 +01:00
f85566324e
Allow profile fetching for authenticated users only.
2017-11-07 00:33:44 +02:00
7252f6b054
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into develop
2017-11-05 12:12:19 +01:00
046bee34d3
Fix bug when no posts are in the db.
2017-11-05 12:11:59 +01:00
c6b9b777da
MastoAPI: Add list of blocked users.
2017-11-03 08:51:17 +01:00
5bf92e50be
MastoAPI: Add blocking.
2017-11-03 08:38:05 +01:00
33beb51da4
MastoAPI: Add blocking to AccountView.
2017-11-03 08:23:31 +01:00
867ac1e4f5
Handle nil cases.
2017-11-02 22:47:48 +01:00
8ef58a266b
Don't return blocked users' activities in contexts.
2017-11-02 22:44:36 +01:00
a47727adde
Don't return activities from blocked users.
2017-11-02 22:37:26 +01:00
632da6c927
Don't create notifications if the user is blocked.
2017-11-02 22:08:22 +01:00
6a5f087174
Add blocks to User.
2017-11-02 21:57:37 +01:00
345ad870f7
Clean up user_test.exs.
2017-11-02 21:57:21 +01:00
9be286a900
Handle empty terms / tags.
2017-11-01 09:33:29 +01:00
6f05367325
Federate out content warnings.
2017-10-31 19:51:58 +01:00
e014cc6ed8
Allow using cws in mastodon api.
2017-10-31 19:44:36 +01:00
0c871e5c6e
Fix specs.
2017-10-31 17:57:26 +01:00
44295dd49a
MastoAPI: Include CW.
2017-10-31 17:49:47 +01:00
04217f52c9
TwitterAPI: Display cws.
2017-10-31 17:43:37 +01:00
4cbf17dac6
Save cws in the activitypub data.
2017-10-31 17:30:46 +01:00
4dcbb64f19
Avoid potentially slow count queries for user note count.
...
For a variety of reasons, posgresql won't use the available actor,
type index to do an index only scan. We now just increase the user
note count, which will lead to slightly wrong counts in some cases,
but it's better than the potentially very slow count query.
2017-10-31 16:37:11 +01:00
968a546d4a
MastoAPI: Return id as string instead of integer.
2017-10-31 14:51:41 +01:00
2f39bb6b43
Typo.
2017-10-31 14:46:01 +01:00
ce7f9f527c
MastoAPI: Always return an url for statuses.
...
External url if available, id if not.
2017-10-31 14:40:12 +01:00
502cb38cd6
Move user search to User module.
2017-10-30 19:23:16 +01:00
71f66bd458
Fix follow test semantics.
2017-10-29 14:25:11 +02:00
c56d28f96c
Fix return type of /api/v1/follows
2017-10-29 00:07:38 +03:00
8e94936553
Add tests.
2017-10-28 17:09:32 +03:00
64bc38e009
MastoAPI: Add emoji output.
2017-10-23 16:27:51 +02:00
b4f055b604
Don't reject already accepted subscriptions.
2017-10-05 12:53:16 +02:00
6268b7e0eb
HTTP Signatures: Work with all test vectors.
2017-09-18 18:10:21 +02:00
9cefbaf016
Start of HTTP Signatures.
2017-09-18 11:39:57 +02:00
6000f61727
MastoAPI: Add repeats to statusview.
2017-09-17 13:54:14 +02:00
422d0f324f
MastodonAPI: Add user favorites endpoint.
2017-09-17 13:09:49 +02:00
6d5bd4dcc0
TwitterAPI: Use correct endpoint for tag timeline.
2017-09-17 13:03:46 +02:00
255a681782
TwitterAPI: Add tag timeline.
2017-09-17 11:45:16 +02:00
003cb17b16
Add missing fixtures.
2017-09-17 00:33:58 +02:00
7c82b82197
Make emoji configurable in files.
2017-09-16 16:49:46 +02:00
959e993c7d
Apply incoming custom emoji.
2017-09-16 16:40:20 +02:00
16b1fcd271
Handle incoming emoji.
2017-09-16 16:27:48 +02:00
884006a9e9
Federate emoji out.
2017-09-16 16:14:23 +02:00
79aeb219d8
Small emoji refactor.
2017-09-16 15:47:45 +02:00
5d1f8dcd1c
TwitterAPI: Add search.
2017-09-16 14:33:47 +02:00
0872f5f394
Add undocumented default user default settings.
2017-09-16 11:52:33 +02:00
c36229c4aa
Add remote user fetching to search.
2017-09-16 11:26:20 +02:00
9f0a2a714b
Add basic search.
2017-09-16 10:42:24 +02:00
d659fcc195
MastoAPI: Fix date in account view.
2017-09-15 17:50:47 +02:00
50409326a8
Refactor posting and make character limit configurable.
2017-09-15 14:17:36 +02:00
3ca853fb61
MastoAPI: Follower-related changes
2017-09-14 18:30:05 +02:00
fc85c9f086
Add tag timelines.
2017-09-14 13:22:09 +02:00
a8701282d4
MastoAPI: fake out 'application' property.
2017-09-14 09:14:08 +02:00
6258c6b6b3
MastoAPI: Also return text_url in attachments.
2017-09-14 08:38:48 +02:00
7f3ce5c1a0
Cleanup.
2017-09-14 08:11:51 +02:00
641c24cdd4
Add media upload endpoint.
2017-09-14 08:08:32 +02:00
d168ef5a9e
MastoAPI: Add accounts getting.
2017-09-13 17:36:02 +02:00
94be93aad0
Allign datetime format with mastodon.
2017-09-13 16:26:02 +02:00
e6286152b9
Fix logic.
2017-09-13 16:05:39 +02:00
49929321c7
Add relationships to masto api.
2017-09-13 15:55:10 +02:00
1bc58230ee
Remove milliseconds from mastodon api response.
2017-09-12 13:31:17 +02:00
b58b35bf56
Use hash of attachment url as id.
...
Pretty hacky, let's see if we can get away with this.
2017-09-12 11:28:12 +02:00
44a650235b
MastoAPI: Remove domain ending from account name.
2017-09-12 09:34:39 +02:00
61adf676d5
Add basic mastodon notification support.
2017-09-11 18:53:19 +02:00
7616b202ea
Add user timelines to Masto Api.
2017-09-10 17:49:13 +02:00
fc10875895
Add attachments to mastoapi statuses.
2017-09-10 11:51:01 +02:00
e8975d06be
Add header image to masto api.
2017-09-10 10:37:34 +02:00
d625d8db7d
Add unfav to Mastodon API.
2017-09-09 18:30:02 +02:00
454dc18570
Add favoriting to Mastodon API.
2017-09-09 18:09:37 +02:00
66e4c710d4
Add reblogging to MastodonAPI.
2017-09-09 17:48:57 +02:00
4dc517a0bb
Add deletion to masto api.
2017-09-09 13:56:51 +02:00
be04f725e9
Add more Mastodon API methods.
2017-09-09 13:15:01 +02:00
2b7efff71b
Add Mastodon StatusView.
2017-09-09 12:10:29 +02:00
c6bdc5960c
Test for Mastodon AccountView
...
Handles users and mentions.
2017-09-09 12:09:53 +02:00
95cedd6000
Make auth tokens usable once and expire them.
2017-09-09 12:02:59 +02:00
d1c10ad2fb
Fix specs.
2017-09-05 09:35:00 +02:00
3438a120cc
Don't delete new delete activity...
2017-09-04 20:47:43 +02:00
fcf3128a56
Add TwAPI representer for deletes.
2017-09-04 20:03:28 +02:00
2348b272e0
Create deletes activities for incoming deletes.
2017-09-04 18:47:46 +02:00
5db535c0b1
Add delete to ActivityPub.
2017-09-04 18:47:33 +02:00
540dfb4617
Add delete activity representer.
2017-09-04 17:56:09 +02:00
10e40206c6
Output mastodon-style conversation ids.
2017-09-04 11:04:04 +02:00
1b1f861bad
Handle mastodon conversation ids.
2017-09-04 11:03:51 +02:00
4b03c43fd7
fix specs.
2017-08-29 17:22:22 +02:00
5142a8efbb
Add profile update.
2017-08-29 15:14:00 +02:00
171ef33cbb
More sensible attachment names.
2017-08-28 19:17:38 +02:00
fecbd099cd
Ignore padding for salmon public keys.
2017-08-25 15:09:05 +02:00
67bfa19b35
Set twitter-style possibly_sensitive boolena.
2017-08-24 16:27:37 +02:00
5dc278b1a6
Add activity_type to twitter api output.
2017-08-24 16:18:26 +02:00
08bd59e446
Extend webfinger capabilities.
2017-08-24 12:54:53 +02:00
1a001588e8
Don't break on empty mentions.
2017-08-24 12:54:01 +02:00
552cfdbe11
Fix deletion not deleting relevant actions.
2017-08-16 16:29:25 +02:00
7d34cec58d
escape attachment urls on creation.
2017-08-09 16:55:18 +02:00
a32784fe6d
Cowboy and Elixir don't seem to agree on uri encoding...
2017-08-09 16:45:05 +02:00
9c35456d77
URI encode filenames...
2017-08-09 15:21:34 +02:00
763756f879
Also fetch atom links.
2017-08-04 16:57:38 +02:00
25c733f402
Add href to in-reply-to.
...
THis should enable fetching from pleroma posts.
2017-08-01 17:35:19 +02:00
f226f46a09
Add basic incoming deletions.
2017-08-01 17:05:07 +02:00
558ab6e74e
Display html links correctly for remote activies.
2017-08-01 14:05:18 +02:00
00b722430f
Revert "Close br tags."
...
This reverts commit 2eba8e74cc
2017-07-31 13:27:38 +02:00
19e8421947
Revert "Wrap in <p>."
...
This reverts commit c81d0b6f89
2017-07-31 13:27:29 +02:00
3063e3b440
Revert "Remove newlines completely so mastodon doesn't bug out."
...
This reverts commit 0ca3ab7b59
2017-07-31 13:27:19 +02:00
0ca3ab7b59
Remove newlines completely so mastodon doesn't bug out.
2017-07-31 13:06:31 +02:00
c81d0b6f89
Wrap in <p>.
2017-07-31 12:16:44 +02:00
2eba8e74cc
Close br tags.
2017-07-31 10:46:29 +02:00
fc269fd319
Add html alternate link to atom.
2017-07-29 22:07:02 +02:00
72ca58c540
Save follower count and note count in user.
2017-07-22 17:42:15 +02:00
a027b0027c
Add friends endpoint.
2017-07-20 20:35:30 +02:00
94a394e3a8
Add followers endpoint.
2017-07-20 20:29:15 +02:00
44aef2183e
Add follower / friend fetching to user.
2017-07-20 19:37:41 +02:00
140f72725d
Use follower address in user entry.
2017-07-19 19:06:49 +02:00
396c32a6da
Add follower_address to users, add on generation.
2017-07-19 18:49:25 +02:00
7e9647b146
Fix undo activity.
2017-07-08 11:17:35 +02:00
e343c0c9c4
Add way to update most recent notification id.
2017-07-02 15:01:59 +02:00
9cda5b897a
Fix test.
2017-07-01 16:39:12 +02:00
201804b836
Only return posts in TwAPI conversations.
2017-06-30 16:41:09 +02:00
d4de38e8ff
Order conversation fetches like GS does.
2017-06-30 16:30:19 +02:00
6a44427915
Add tests for public recipients.
2017-06-30 16:08:59 +02:00
fc7016a88c
Don't add public recipient to notes that don't contain it.
2017-06-30 15:54:32 +02:00
1c074efeaf
Add external links to twapi.
2017-06-25 12:07:08 +02:00
429992fcc9
Save external link for notes.
2017-06-25 11:57:34 +02:00
6935fc3e01
Update user data on fetch if it changed.
2017-06-24 13:09:46 +02:00
6a184115a2
Longer timeouts for outgoing federation.
2017-06-23 12:25:53 +02:00
069daf644d
Replace UserRepresenter with UserView
2017-06-20 00:12:37 +03:00
66b4fee80e
Add finmoji.
2017-06-19 17:51:43 +02:00
6cac8e3c8b
Downcase tags coming in through the TwAPI.
2017-06-18 19:04:46 +02:00
5ff4a5eee3
Save incoming tags as lowercase.
2017-06-18 19:01:54 +02:00
fa82822932
Revert "Add invisible tags to TwAPI output."
...
This reverts commit a92a9dce94
2017-06-18 18:59:13 +02:00
d00571ff75
Fetch user feed on externalprofile request.
...
This is so we always have something to show.
2017-06-18 17:20:39 +02:00
fafb765c48
Output tags list in TwAPI.
2017-06-18 14:43:44 +02:00
8feec8d390
Strip unsafe html on output in TwAPI.
2017-06-18 13:40:35 +02:00
a9bfbcae80
Slightly better html link regex.
2017-06-18 13:29:30 +02:00
7b41e103e1
Remove html from user bios on display.
...
This is mainly to fix problems of bios coming from mastodong.
2017-06-18 13:17:35 +02:00
83c657afa5
Do some basic escaping.
2017-06-14 14:46:18 +02:00
1af9c77736
Move mention parsing to Formatter module.
2017-06-14 13:58:56 +02:00
eb18b9ebba
Enable user timelines.
2017-06-12 17:12:55 +02:00
6342fcd5dc
Save correct date for incoming notes.
2017-06-08 16:44:12 +02:00
00c032783d
Fix NaN statuses per day.
2017-06-05 15:47:37 +02:00
cdcb201bf5
Represent object publishing date in notes.
2017-06-02 22:47:49 +02:00
c7fdd1b7ff
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-06-01 11:24:03 +02:00
c6aa60c829
Shorten names in links.
2017-05-30 14:26:31 +02:00
bdcf42180f
Save remote user bio and update if we see new data.
2017-05-24 17:34:38 +02:00
94e980d6b4
Output proper published data in ostatus.
2017-05-24 13:54:25 +02:00
869e5ccfe1
Fix factory.
2017-05-24 13:53:20 +02:00
87c2c42bad
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-05-22 19:08:46 +02:00
47684c2a2c
Make email and nickname case insensitive.
2017-05-22 18:10:50 +02:00
1085675ec4
Output ref instead of href for conversation.
2017-05-20 10:44:57 +02:00
03b7b2fa24
Also show activities in OStatus.
2017-05-19 15:53:02 +02:00
f972966385
Fix specs.
2017-05-18 19:10:51 +02:00
8e02fa100f
Add categories to ostatus output.
2017-05-18 18:18:27 +02:00
48f9df2391
Keep newlines around.
2017-05-18 16:41:16 +02:00
a92a9dce94
Add invisible tags to TwAPI output.
2017-05-18 16:24:41 +02:00
beb7b0ef07
Handle incoming tags.
2017-05-18 15:58:18 +02:00
0da6ade619
Save tags in object.
2017-05-18 15:16:49 +02:00
9033bfffd2
Twitter API refactoring.
2017-05-17 18:00:20 +02:00
dcfd494e97
Add Formatter.
2017-05-17 18:00:09 +02:00
70024632ba
AP refactoring.
2017-05-16 18:19:04 +02:00
423194520e
Fix mention replacing.
2017-05-15 18:25:21 +02:00
dd12cf7296
Fix cws.
2017-05-11 17:59:11 +02:00
1b67a59795
Repair retweets.
2017-05-10 19:29:25 +02:00
f73cd6f3ce
Add problematic mastodon message.
2017-05-10 19:24:00 +02:00
153995f832
Correct active state websub name.
2017-05-10 18:54:43 +02:00
05f2cd0d93
Handle incoming follows.
...
Also Mastodon CWs.
2017-05-10 18:46:23 +02:00
34a1ce00ec
Set valid_until date.
2017-05-10 18:45:55 +02:00
36448d6483
Add externalprofile to TwAPI.
2017-05-10 18:44:57 +02:00
2e753e8cd7
Refresh subscriptions.
2017-05-10 18:44:06 +02:00
118c572006
Use changeset for remote user creation.
2017-05-10 10:16:20 +02:00
373753e595
Add some basic changesets.
2017-05-09 18:11:51 +02:00
1418d72749
Add class=attachment to attachment links.
2017-05-08 20:12:36 +02:00
3320c9b176
Fix remote users retweeting local stuff.
2017-05-08 18:19:45 +02:00
7303786160
Add some twapi fixes.
2017-05-07 20:20:53 +02:00
db08498a9f
Prevent double insertions.
2017-05-07 20:13:10 +02:00
4f9328c622
Preserve ids on favorites / retweets.
2017-05-07 20:05:03 +02:00
b403ea4d2b
Merge branch 'develop' into dtluna/pleroma-feature/unfollow-activity
2017-05-07 19:28:23 +02:00
a41aa4e489
Federate follow salmons.
2017-05-07 14:45:37 +02:00
95ab0dc3c5
Add conversation ids to twapi announce representer.
2017-05-07 12:46:21 +02:00
c51e15975a
Fix user fetching error.
2017-05-07 12:45:37 +02:00
7db76a0f0e
Address incoming messages to followers.
2017-05-06 14:23:39 +02:00
bda389d7d9
Subscribe to remote users on following.
2017-05-06 14:09:39 +02:00
2d9fdbcc0d
Don't call out if we have the favorited notice locally.
2017-05-05 16:27:03 +02:00
fa2610c795
Handle incoming favorites, fetch potentially missing messages.
2017-05-05 16:07:44 +02:00
d982f04a65
Mock HTTPoison in testing.
2017-05-05 14:16:54 +02:00
c85998ab8a
Parse incoming retweets.
2017-05-04 18:42:29 +02:00
97257c692c
Fix specs.
2017-05-03 20:06:20 +02:00
1077c5c58d
Remove reply-to for shares, mastodon gets confused.
2017-05-03 20:06:00 +02:00
5d7831ee3e
Add self links to federated statuses.
2017-05-03 18:10:19 +02:00
b34b046f16
Add user to announced status.
2017-05-03 17:51:36 +02:00
138641589d
OStatus announce representer.
2017-05-03 17:39:12 +02:00
df71c142cf
Remove doubled 'to' recipients.
2017-05-03 16:08:24 +02:00
8141024259
Attachment parsing, better magic key fetching.
2017-05-03 14:26:49 +02:00
16afea399d
Just give out the entry, not the whole feed.
2017-05-03 10:02:29 +02:00
9c42453e06
Return note objects as ostatus post activities.
2017-05-03 09:54:17 +02:00
018a1a390f
Use inReplyTo to find context.
2017-05-02 21:31:01 +02:00
33c803d6da
Add attachment link to posts.
2017-05-02 18:25:39 +02:00
102455bf29
Add avatar updating from incoming messages.
2017-05-02 17:13:41 +02:00
93de603966
Add an ostatus representer for like activities.
2017-05-02 16:35:53 +02:00
a3e82c5c24
Save context in likes / announces.
2017-05-02 15:54:14 +02:00
16f8406eb6
Add statusnet_profile_url to the TwAPI.
2017-05-02 14:36:04 +02:00
32a95d73da
Add twkn timeline.
2017-05-02 14:12:43 +02:00
6dd8335477
Mark incoming activties as non-local.
2017-05-02 10:47:04 +02:00
56bacc90d1
Fix specs, add local marker to actitivies.
2017-05-02 10:43:35 +02:00
89c1e90eb2
Don't crypt raw iolists.
2017-05-01 22:02:07 +02:00
ceb2f68432
Add type to rel=self link in feed.
2017-05-01 18:40:36 +02:00
e54e592d6c
Return webfinger for ap_ids.
2017-05-01 13:51:17 +02:00
6843755834
Make outgoing salmons work.
2017-05-01 13:14:58 +02:00
bed0b39813
Add function to fetch users from fqn.
2017-04-30 18:48:48 +02:00
bb1d08a47c
Return keys in webfinger.
2017-04-30 15:00:04 +02:00
09f7ed4214
Don't set statusnetConversationIds on replies anymore.
2017-04-30 14:26:29 +02:00
009fcd2acf
Stop adding statusnetConversationIds.
2017-04-30 14:02:04 +02:00
4c8111c334
Use conversation mapping objects to get / retrieve context from TwAPI.
2017-04-30 13:53:26 +02:00
f9912599c4
Pull in remote avatar on federation.
2017-04-30 12:53:49 +02:00
18edc299b2
Handle duplicates.
2017-04-30 12:36:47 +02:00
62607f37dc
Federate object id for posts in ostatus.
...
This is because ostatus doens't have an id for the activities.
2017-04-30 11:55:19 +02:00
84027ff00b
Handle comments.
2017-04-30 11:39:27 +02:00
d937a8e695
Add thr:in-reply-to to ostatus representer.
2017-04-30 11:17:34 +02:00
9d7c3190cc
Get create activity from created object id.
...
This is useful for Ostatus federation because ostatus doesn't have
different ids for objects and activities...
2017-04-30 11:16:41 +02:00
8a0d2b33d8
Keep ostatus id as activity id.
2017-04-30 09:25:46 +02:00
a16da387d2
Handle full incoming feeds.
2017-04-29 21:13:21 +02:00
20015b4b67
Save remote users with fqn as nickname.
2017-04-29 20:08:45 +02:00
ba1ea77001
Make key fetching use ostatus fetching.
2017-04-29 19:47:56 +02:00
427bac0966
Rework remote user subscription.
2017-04-29 19:06:01 +02:00
69922bc724
Add user info gathering.
2017-04-29 17:51:59 +02:00
ca40dda04c
Add some basic webfingering.
2017-04-28 17:41:12 +02:00
1422e7aa84
Handle incoming websub subscriptions.
2017-04-28 15:45:10 +02:00
a9b2ad1759
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-activity
2017-04-28 16:06:57 +03:00
451d18af63
Add proper callback route for websub confirmation.
2017-04-28 09:51:47 +02:00
90da25505f
Add discovery and subscription requests to websub.
2017-04-27 09:46:45 +02:00
1ea4325fec
Add user feed fixture.
2017-04-27 09:46:04 +02:00
d1dce56a85
Refactor XML parsing.
2017-04-27 09:43:58 +02:00
9e9d95ec99
Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus
2017-04-26 19:17:51 +02:00
7561158ab1
Merge branch 'feature/incoming_ostatus' of ssh.gitgud.io:lambadalambda/pleroma into feature/incoming_ostatus
2017-04-26 18:34:14 +02:00
c5fa682c31
Refactor, add beginnings of websub client subscriptions.
2017-04-26 18:33:10 +02:00
57bd59e407
Salmon creation.
2017-04-26 14:25:44 +02:00
f1ebf812ee
Add inReplyTo to incoming messages.
2017-04-26 10:22:51 +02:00
d9ebd785ab
Ostatus doesn't distinguish between activities / objects on create.
2017-04-26 10:08:13 +02:00
e8882ab3da
Merge branch 'develop' into feature/incoming_ostatus
2017-04-26 09:18:49 +02:00
22e936372e
Fix retweet spec.
2017-04-26 08:55:00 +02:00
2f0e13abe2
Merge branch 'develop' into dtluna/pleroma-bugfix/deny-self-repeats
2017-04-26 08:49:26 +02:00
b91ccef237
Output conversation id.
2017-04-26 08:47:22 +02:00
f980f6778b
Wire up mentions.
2017-04-25 18:03:14 +02:00
b438ea24ee
Add ostatus conversation as context.
2017-04-25 17:45:34 +02:00
ab0114fbaa
Return salmon path for users, basic incoming salmon handling.
2017-04-24 18:46:34 +02:00
34d3aea92f
Add incoming xml fixtures.
2017-04-24 18:46:02 +02:00
42105497ca
Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats
2017-04-24 14:17:23 +03:00
5b6070ec40
Deny whitespace statuses
2017-04-24 12:09:11 +03:00
f723b23691
Add error response to self-repeats
2017-04-24 01:11:38 +03:00
6b6bc9435c
Merge branch 'bugfix/deny-empty-posts' of ssh.gitgud.io:dtluna/pleroma into bugfix/deny-self-repeats
2017-04-24 01:05:02 +03:00
1e3791877c
Add error response on empty status
2017-04-23 19:08:25 +03:00
a3b9741a62
Merge branch 'feature/follow-unfollow-by-screen-name' into 'develop'
...
Follow and unfollow using screen_name
See merge request !9
2017-04-23 10:26:27 -04:00
4c216cba9c
Decode and verify salmons.
2017-04-23 15:21:58 +02:00
cef4a4d709
Fix utf8 problems with iolists.
2017-04-22 15:34:29 +02:00
04fb4f9c47
Add poco data to user.
2017-04-22 15:11:13 +02:00
923584d046
Remove unknown activities from feed.
2017-04-22 14:37:54 +02:00
c585f9e26c
Only handle subscription requests for now.
2017-04-22 13:48:10 +02:00
8fb73c28bb
Only have one subscription per callback.
2017-04-22 13:44:21 +02:00
1feb193731
Add rel=self link too feed.
2017-04-22 12:11:36 +02:00
77cb260628
add basic federation to websub.
2017-04-22 12:07:51 +02:00
39dc74f967
Add callback to websub subscription.
2017-04-22 12:05:48 +02:00
28b203d08f
Add Undo of Follow Activity insertion
2017-04-21 19:54:21 +03:00
1c00eb4a90
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into ostatus
2017-04-21 18:42:28 +02:00
a9b3f99d48
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-unfollow-by-screen-name
2017-04-21 18:36:03 +03:00
f51a672ac4
Return object id in Ostatus create activties.
2017-04-21 04:22:02 +02:00
424e0e7779
Add Websub verification.
2017-04-21 03:59:11 +02:00
1e88f102c4
Fix specs, add some user info.
2017-04-21 00:51:09 +02:00
1b9cc721a0
Websub controller beginnings.
2017-04-20 17:47:33 +02:00
3a56d7318f
Add statuses/mentions endpoint
2017-04-20 15:18:54 +03:00
cc330421fd
Better activities in ostatus.
2017-04-20 10:16:06 +02:00
01901d9835
Merge branch 'feature/unfollow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name
2017-04-20 10:46:27 +03:00
d952b6cd7b
Merge branch 'feature/follow-by-screen-name' of ssh.gitgud.io:dtluna/pleroma into feature/follow-unfollow-by-screen-name
2017-04-20 10:39:18 +03:00
eda742c78b
Merge branch 'feature/user-timeline' into 'develop'
...
Feature/user timeline
See merge request !8
2017-04-19 05:50:24 -04:00
d23f3e3cf3
Add webfinger and basic feed support.
2017-04-18 18:41:51 +02:00
470f5f7cd6
Add user timeline spec test
2017-04-17 16:31:19 +03:00
36e883cd4b
Add basic Ostatus user representer.
2017-04-17 14:12:36 +02:00
ce6cc84a4a
Add basic webfinger.
2017-04-17 13:44:41 +02:00
ac9817bdb0
Merge branch 'bugfix/repeated-follow-unfollow' into 'develop'
...
Add error messages for repeated follows and unfollows
See merge request !7
2017-04-17 05:46:59 -04:00
6a0e69a8a3
Fix syntax error.
2017-04-17 11:43:44 +02:00
a185ea63af
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-04-17 11:37:21 +02:00
6bfd521974
Switch cache implementation for size limiting.
2017-04-17 11:36:17 +02:00
369be708b2
Remove unnecesary queries
2017-04-16 17:42:15 +03:00
f6e632d25b
Remove unnecesary asserts
2017-04-16 17:39:34 +03:00
ef5033d7a7
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
2017-04-16 17:18:34 +03:00
f6547f7b7f
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
2017-04-16 17:13:42 +03:00
82914e1e4d
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
2017-04-16 17:12:28 +03:00
85bd480be3
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-16 17:10:25 +03:00
5229b01944
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
2017-04-16 17:08:17 +03:00
eb9358c8d6
Add basic Avatar updating code.
2017-04-16 16:06:19 +02:00
63f04b314d
Fix typo
2017-04-16 17:05:48 +03:00
4b4ece2c74
Add user timeline fetching without credentials
2017-04-16 16:44:30 +03:00
03a9c11d25
Display the users avatar if he has one set.
2017-04-16 15:40:50 +02:00
d7e3b72c6a
Add avatar objects to user, fix specs.
2017-04-16 15:28:28 +02:00
7617a593b9
Support data uris in uploads.
2017-04-16 14:23:30 +02:00
7a0046d127
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/user-timeline
2017-04-16 13:32:56 +03:00
9a8c348aed
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/unfollow-by-screen-name
2017-04-16 13:28:23 +03:00
ce1eef9c98
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-16 13:25:38 +03:00
b41f3eff84
Preserve newlines in messages.
2017-04-16 11:51:00 +02:00
5dac3727f1
Add registration to the TwAPI controller.
2017-04-16 11:01:24 +02:00
b1edd94baa
Add user registration to TwAPI.
2017-04-16 10:25:27 +02:00
03c6148bb3
Add user registration changeset.
2017-04-15 16:40:09 +02:00
4f7adb343c
Address liking / announcing to the original author.
2017-04-15 14:16:01 +02:00
4799dc6991
Add retweeting to TwAPI controller.
2017-04-15 14:09:54 +02:00
60c60de330
Add announcements / retweets to TwAPI.
2017-04-15 13:54:46 +02:00
21c397820f
Add announcements to activitypub.
2017-04-15 12:11:20 +02:00
7a47afed3c
Update object correctly after setting context.
2017-04-14 18:59:11 +02:00
c83f279a7d
Add unliking to TwAPI controller.
2017-04-14 18:27:17 +02:00
f4eea0847b
Add unfavoriting to TwAPI.
2017-04-14 18:15:15 +02:00
a926038cd0
Add unliking to activitypub.
2017-04-14 18:09:30 +02:00
03ddaead7e
Add basic user caching.
...
Expires after 5 seconds.
2017-04-14 17:13:51 +02:00
18cd04ade5
Add user timeline
2017-04-14 16:09:13 +03:00
fa0c279139
Favorite changes.
...
- Add 'likes' to activity, collection of ids of people who liked it.
- show if you favorited something or not.
- Don't allow double favorites
- Address favorites to the followers of the liked activity's author.
2017-04-14 15:07:24 +02:00
5cb446a148
Add favoriting to TwAPI controller.
2017-04-13 17:22:44 +02:00
d0da40dc81
Display like activities.
2017-04-13 17:05:53 +02:00
834c84b5dc
Update factory.
2017-04-13 17:05:35 +02:00
653d605e14
Add favoriting to twitter api.
2017-04-13 16:19:07 +02:00
1388054796
Add liking to ActivityPub.
2017-04-13 15:50:05 +02:00
f97c8e4379
Add utility functions for objects and activities.
2017-04-13 15:49:42 +02:00
4cac385411
Add factories for testing.
2017-04-13 15:49:24 +02:00
1ccbe562c9
Add actor to objects.
2017-04-13 14:56:19 +02:00
a8e50d602b
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into bugfix/repeated-follow-unfollow
2017-04-13 15:36:00 +03:00
3ff917b5dd
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/follow-by-screen-name
2017-04-13 15:18:18 +03:00
84c2012810
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into feature/help-test
2017-04-13 15:15:09 +03:00
d2bf099ae6
Fix twitter api date.
2017-04-12 19:34:58 +02:00
1b086834bd
Don't return html in the text field.
2017-04-12 17:22:29 +02:00
b666f11d2f
Add max_id fetching to activity fetching.
2017-04-12 17:12:00 +02:00
6a179a44be
Test friends timeline more thoroughly.
2017-04-12 16:53:46 +02:00
8eea09889b
Return directly addressed activities in friends timeline.
2017-04-12 16:45:23 +02:00
15655d992e
Fix user representation after following.
2017-04-12 16:38:55 +02:00
65ef18a715
Add error messages for repeated follows and unfollows
2017-04-12 17:34:36 +03:00
c0e5b3459f
Add unfollowing using screen_name parameter
2017-04-10 16:45:47 +03:00
896e40cd2b
Add following using screen_name parameter
2017-04-10 16:38:21 +03:00
59a406d94c
Add test for help/test resource
2017-04-10 16:00:57 +03:00
8f43992121
Merge branch 'develop' of ssh.gitgud.io:lambadalambda/pleroma into develop
2017-04-08 16:28:50 +03:00
bd247727e2
Remove vestigial file.
2017-04-05 11:59:25 +02:00
8075badafe
Add Follow activity insertion
2017-04-04 03:30:07 +03:00
a83fa053de
Parse mentions, save them, output them in TwAPI.
2017-04-03 18:28:19 +02:00
2e89d505d3
Connect attachments with objects, not activities.
2017-03-30 18:07:38 +02:00
6aa1523bb3
Put objects in inserted activties into the db.
2017-03-30 18:07:29 +02:00
73df2f8e5e
Add attachments to the TwAPI.
2017-03-30 17:07:22 +02:00
42c90855ba
Basic ObjectRepresenter.
2017-03-30 16:08:49 +02:00
32aa83f3a2
Short circuit user verification if cookie is present.
2017-03-30 15:29:49 +02:00
e7dc39e40c
Basic file uploading via TwAPI.
2017-03-29 02:07:56 +02:00
08fdbd6f3a
Add Uploads.
2017-03-29 01:39:01 +02:00
d2cdcc097b
Add conversation fetching to TwAPI controller.
2017-03-28 17:22:44 +02:00
0dd3373304
Return statusnet_conversation_id in TwAPI.
2017-03-28 14:49:21 +02:00
e25aea3fa7
Add conversation id to activities.
...
This is for compatibility with the TwAPI.
2017-03-28 14:40:09 +02:00
bb07efdaab
Fix spec.
2017-03-28 14:04:13 +02:00
e4de0ddc77
Add single status fetching to TwAPI.
2017-03-24 01:16:28 +01:00
866a2663d4
Add fetching of activities in context.
2017-03-24 00:09:08 +01:00
ae50b165cc
Add inReplyToStatus to TwAPI.
2017-03-24 00:00:06 +01:00
e56dba1563
Add context and inReplyTo.
2017-03-23 23:34:10 +01:00
74112ef99e
Add id to objects, too.
2017-03-23 21:22:49 +01:00
1f0f79d959
Generate ids for activities.
2017-03-23 17:56:49 +01:00
9ad045fd58
Return user specific json for logged in users.
2017-03-23 15:51:34 +01:00
30650e5bc6
Add unfollowing to TwAPI.
2017-03-23 13:13:09 +01:00
75e51b190d
Add following TwAPI endpoint.
2017-03-23 12:09:27 +01:00
e2e0cd75b7
Add friends timeline.
2017-03-22 17:25:59 +01:00
37e443ce6c
Add friends status fetching.
2017-03-22 16:51:20 +01:00
569d9bac17
Add fetching for recipients.
2017-03-22 14:45:17 +01:00
2db28df4cf
Add public timeline TwAPI.
2017-03-21 21:09:20 +01:00
b9d0e34506
Add since_id for activitypub fetching.
2017-03-21 20:31:48 +01:00
d4cf273f28
Add limiting to activity pub fetching.
2017-03-21 20:22:05 +01:00
ad303783af
Add status posting via TwAPI.
2017-03-21 18:17:35 +01:00
9a8850eb9e
Basic status creation and retrieval.
2017-03-21 17:53:20 +01:00
8de523c8ae
Basic AP objects.
2017-03-21 09:21:52 +01:00
093fd1832d
Add Twitter API verify_credentials endpoint.
2017-03-20 21:30:44 +01:00
980717fdce
Add Twitter API user representer.
2017-03-20 21:30:18 +01:00
e32dbfc9a5
Add basic auth.
2017-03-20 17:56:45 +01:00
a93f3421a7
Phoenix skeleton
2017-03-17 17:09:58 +01:00
4a6855d9ee
Provide plaintext representations of content/cw in MastoAPI
2017-01-01 03:10:08 +03:00
Alex S