c53b96a024
Fix specs.
6 years ago
d03a116654
Merge branch 'hj-happiness-improvement' into 'develop'
...
New frontend configuration mechanism.
Closes #445
See merge request pleroma/pleroma!700
6 years ago
92753b0cd9
[ #534 ] Made federation push sender be determined basing on content instead of `referer` header. Updated tests.
6 years ago
ebb3496386
Merge branch 'feature/rich-media-part-2-electric-boogaloo' into 'develop'
...
Rich Media support, part 2.
See merge request pleroma/pleroma!719
6 years ago
61d6715714
rich media: oembed: return data in the same format as the other parsers
6 years ago
3e968f9ef2
Format
6 years ago
50d6183893
Split hide_network into hide_followers & hide_followings
6 years ago
55affbca7f
add a job queue
6 years ago
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
6 years ago
8e8a1e1ba8
Return new-style config if old-style config is set to false.
...
This is in preparation for 1.0. We'll be able to switch the config to the new
mechanism on PleromaFE then as well.
6 years ago
1825118fd4
Correctly handle invalid credentials on auth login.
...
Closes #407
6 years ago
339c26e12b
test: add status posting with OGP link preview test
6 years ago
6096846f5f
API: kill /api/rich_media/parse endpoint
6 years ago
020b3b29d9
test: update twitterapi tests
6 years ago
364cf5369b
test: update mastodon status view tests
6 years ago
132d815f1f
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
6 years ago
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
6 years ago
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
6 years ago
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
6 years ago
1f7843b9b8
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
6 years ago
3f64379b13
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
6 years ago
d9f3af477d
Move definitions of RichMedia fixtures to test/support/http_request_mock.ex
6 years ago
22f2687f17
Web.MastodonAPI.MastodonAPIControllerTest: Update for difference between all and any parameters
6 years ago
5a84def6a6
Fix the logic in multi-hashtag TLs
6 years ago
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
6 years ago
d8f446f438
Web.MastodonAPI.MastodonAPIControllerTest: Add test against multi-hashtag timeline
6 years ago
499a4591a4
Web.ActivityPub.ActivityPubTest: test against inserting activities with content: null
6 years ago
d99650270b
[ #534 ] Federation reachability filtering tests.
6 years ago
a45a903480
Fix OGP provider tests
6 years ago
3a5b3c5a3a
Merge remote-tracking branch 'pl/develop' into oembed_provider
6 years ago
4c99b6d35a
Merge branch 'fix/tusky-dm' into 'develop'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
6 years ago
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
6 years ago
4df71cd88b
Merge branch 'classic-flakeids' into 'develop'
...
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
6 years ago
9274cabe01
Use correct logic to determine "attentions" list
6 years ago
13d72826df
test: add anti-followbot policy tests
6 years ago
4333fea1dc
Send "hide_network" in user_view
6 years ago
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
6 years ago
e221c681dc
New frontend configuration mechanism.
6 years ago
28d77e373c
Flake Ids for Users and Activities
6 years ago
34d59e4008
[ #502 ] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
6 years ago
762fafe738
Fix buggy test.
6 years ago
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
6 years ago
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
6 years ago
f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
6 years ago
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
6 years ago
5803672ae5
Merge branch '116-send-delete-event' into 'develop'
...
Send delete event over Mastodon streaming api
Closes #116
See merge request pleroma/pleroma!688
6 years ago
cf1f35a93a
Send delete event over Mastodon streaming api
...
Closes #116
6 years ago
501fba33d6
Merge branch 'add-custom-emoji-test' into 'develop'
...
Add a test to ensure #39 is fixed.
See merge request pleroma/pleroma!687
6 years ago
be0fb5dec4
Add a test to ensure #39 is fixed.
6 years ago
f3045a179e
Merge branch 'i1t/pleroma-477_user_search_improvements' into 'develop'
...
I1t/pleroma 477 user search improvements
See merge request pleroma/pleroma!685
6 years ago
cf3099231d
test: transmogrifier: verify directMessage flag is sent outbound based on declared visibility
6 years ago
21ac35fcc0
tests: add tests for DM sanitizer
6 years ago
8d06be35e0
activitypub: utils: add determine_explicit_mentions() and tests
6 years ago
42612b1c8d
Merge branch 'bugfix/improve-boost-targeting' into 'develop'
...
improve handling of non-public Announces
See merge request pleroma/pleroma!681
6 years ago
0a97badddd
Format
6 years ago
651a1d64b5
Add current user to mentioned
6 years ago
31517bec12
test: add regression test for to/cc clobbering
6 years ago
e116e55cab
Add actor to recipients
6 years ago
74346a7035
Fix merge conflict
6 years ago
7bc6208b2f
Fix ostatus test
6 years ago
ed8f55ab8e
[ #477 ] User: FTS and trigram search results mixing (to handle misspelled requests).
6 years ago
1b1af4798a
Use object instead of activity for metadata
6 years ago
64143d8040
Fix object id in OpenGraph test
6 years ago
954dc4a4ad
[ #502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users.
6 years ago
3b18789684
Fix test
6 years ago
293f6a8b71
join us now and share the software~. Also tests
6 years ago
943324b661
MastoAPI: Don't break on missing users.
6 years ago
608cc65d43
Merge branch 'feature/improve-microformats' into 'develop'
...
improve microformats support
See merge request pleroma/pleroma!672
6 years ago
90433b988e
[ #518 ] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.
6 years ago
8cea00e1dc
Remove OpenGraph test from Ostatus tests
6 years ago
85a5be6220
tests: fixup
6 years ago
fc965f982c
[ #477 ] Added FTS index for `users`. Fixed failing test.
6 years ago
de1da7b3d1
Merge branch 'feature/add-oembed-parser' into 'develop'
...
Add OEmbed parser
See merge request pleroma/pleroma!661
6 years ago
fa0392e49c
Merge branch 'activitypub-likes' into 'develop'
...
Activitypub c2s likes
See merge request pleroma/pleroma!658
6 years ago
98d9ae0718
Add test for mastodon API /favourites endpoint
6 years ago
e4dc3f71ae
Resolve merge conflict
6 years ago
b8a77c5d70
Add OEmbed parser
6 years ago
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.
6 years ago
581edd5a91
Add route to get object like activities
6 years ago
36711e1c83
Handle client submitted activitypub like activity
6 years ago
1eb7318831
Prepare all types objects before serialising
...
Activities returned from inbox can include other types of objects like
Article
6 years ago
728587fdaa
typo
6 years ago
b594a54d0c
unpin when deleting a status
6 years ago
e4afe1359b
Merge branch 'activitypub-dereference-activity-id' into 'develop'
...
Support activity+json request for activity
See merge request pleroma/pleroma!641
6 years ago
1f851a0723
Add Twitter Card parser
6 years ago
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
6 years ago
ab4c5f5bf7
Merge branch 'bugfix/markdown-newline-codeblocks' into 'develop'
...
common api: fix newlines in markdown code blocks
See merge request pleroma/pleroma!651
6 years ago
490c80bc96
test: common api: add tests for format_input/4
6 years ago
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
6 years ago
d203b0b4d3
Merge branch 'dm-optimizations' into 'develop'
...
Add activity visibility index.
See merge request pleroma/pleroma!646
6 years ago
a99e156f2c
Add integer casts.
6 years ago
7ac152ed38
TwitterAPI: Add follower/following pagination.
6 years ago
1881680e28
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
...
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
6 years ago
8df348a3da
Add test for summary_html
6 years ago
5027f82cde
Add activity visibility index.
6 years ago
6cbe63726d
improve tests
6 years ago
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
```
6 years ago
1b06e6fdf3
only non-reblogs, self-authored, public statuses can be pinned
6 years ago
20c0dd1e24
Support activity+json request for activity
6 years ago
0c750bc432
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
7b6c5f0a9d
improve test readability
6 years ago
db6f4496eb
fix test
6 years ago
e679da4c34
add `pinned` property to `StatusView`
6 years ago
63dbd87568
rename `post` to `status`
6 years ago
a16b17cc61
Actually put some onformation in the error user, make it actually properly parse
...
in conversations.
6 years ago
74e1093732
Merge branch 'resilient-user-view' into 'develop'
...
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
6 years ago
f24087f96e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
380e9fba21
add pinned posts
6 years ago
7dcafb4894
MastoAPI: Add test.
6 years ago
7382adf407
Make TwAPI UserView more resilient to issues.
...
Will work for missing users and badly migrated users.
6 years ago
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.
6 years ago
576368237c
Merge branch 'activitypub-tombstone-fix' into 'develop'
...
Don't crash on AP request for tombstone
See merge request pleroma/pleroma!630
6 years ago
145d6fe6e9
Merge branch 'emoji-in-summary' into 'develop'
...
Strip HTML in and allow emoji in summaries.
See merge request pleroma/pleroma!631
6 years ago
57df7d6e1d
Add tests for emoji and lack of HTML in summaries.
6 years ago
096e121879
Remove redundant comma.
6 years ago
6556be344d
Resolve some test failures.
6 years ago
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
6 years ago
4258dd8633
Merge branch 'feature/rich-media' into 'develop'
...
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
6 years ago
48e81d3d40
Add RichMediaController and tests
6 years ago
4e1cc2bab6
Implement delete activity
6 years ago
551c3d9391
Split create activity specifics from update_outbox
6 years ago
2aab4e03c3
Add OGP parser
6 years ago
90e157ef80
Merge branch 'features/admin-api-user-views' into 'develop'
...
User/Account views: Add rights.admin
Closes #472
See merge request pleroma/pleroma!589
6 years ago
8e7da98b18
Merge branch 'mr/retry-queue' into 'develop'
...
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
6 years ago
cb286fdeba
Improves RetryQueue behavior
...
reduces to one single timer firing once a second
switches to a parallel worker model
6 years ago
569bad8210
Create activity when client posts to outbox
6 years ago
26dc2dddab
Implement ActivityPub inbox view
...
More or less verbatim copied from the outbox template with only changes
to the activities fetched and url reported
6 years ago
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
6 years ago
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
6 years ago
dd8f2196f6
Merge branch '483_blocks_import_export' into 'develop'
...
[#483 ] Blocked users list import & export
Closes #483
See merge request pleroma/pleroma!603
6 years ago
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
d8cc96cb1f
Fix Twitter timelines for private instances
6 years ago
bee6acd51d
Merge branch 'feature/create-tombstone-instead-of-delete' into 'develop'
...
Create tombstone instead of object deletion
See merge request pleroma/pleroma!593
6 years ago
cff0292d4b
Merge branch 'reserve-user-names' into 'develop'
...
Reserve a few user names
See merge request pleroma/pleroma!594
6 years ago
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
551d80cc01
Expose restricted names in nodeinfo.
6 years ago
5811e65e67
Add some hard limits on inserted activities.
6 years ago
012b7ab5e6
Add test to check /object/:id does not leak the tombstone itself
6 years ago
aeb89bece6
Remove unused test
6 years ago
f75f707f6c
Revert Activity tombstones, add ObjectTombstone struct
6 years ago
2bbec33c71
Fix failing tests
6 years ago
18a4cbb244
Capitalize "tombstone"
6 years ago
0f412cf6e6
Create tombstone instead of object deletion
6 years ago
3c08d229db
tests: add legal boilerplate
6 years ago
a2bceaf688
tests: twitter api: add test proving that peertube videos are correctly handled
6 years ago
873938d223
tests: twitter api: activity view test: enable tesla mock
6 years ago
9f48485f64
tests: mastodon api: add test verifying that peertube videos are correctly rendered
6 years ago
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
6 years ago
851db74f1c
[ #114 ] Fixed test.
6 years ago
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.
6 years ago
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
6 years ago
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
b096e30cff
[ #114 ] Added email confirmation resend action. Added tests
...
for registration, authentication, email confirmation, confirmation resending.
Made admin methods create confirmed users.
6 years ago
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
92a5133c42
fix text field
6 years ago
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
6 years ago
b12a904911
Integration tests for mastodon websocket
6 years ago
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
6 years ago
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
28478a9c4f
Merge branch 'fix/masto-put-settings' into 'develop'
...
Mastodon API: Fix PUT /api/web/settings
See merge request pleroma/pleroma!557
6 years ago
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
6 years ago
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
6 years ago
5af91020f8
Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints
6 years ago
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
ea72ac549b
fix case when tags is invalid
6 years ago
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
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.
6 years ago
d3ec09bb38
fix tags
6 years ago
07e93f9940
[ #114 ] Improved tests.
6 years ago
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
6 years ago
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
6 years ago
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
6 years ago
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
6 years ago
262cc6d44b
Merge branch 'fix/double-rt-or-fav' into 'develop'
...
Prevent accidental double RTs or favorites
See merge request pleroma/pleroma!542
6 years ago
61ad2ce422
TwitterAPI: Include favorited post in json
6 years ago
1ca080c862
Prevent accidental double RTs or favorites
6 years ago
c5c3ad90d0
Fix tests. Remove oembed template
6 years ago
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
6 years ago
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
00744c6b03
[ #114 ] Initial implementation of user email invitations.
6 years ago
4e7d98922e
[ #114 ] Added tests for "POST /api/account/password_reset".
6 years ago
89b3729afa
fix warnings
6 years ago
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
6 years ago
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
6 years ago
c81c74d847
Treat warnings as errors outside of tests.
6 years ago
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
6 years ago
9442588ae9
fix hashtags in api response
6 years ago
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
6 years ago
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
abbf347dc7
[ #394 ] View tests fix.
6 years ago
22830c8fc9
[ #394 ] Formatting fix.
6 years ago
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
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
6 years ago
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
6 years ago
lain