rinpatch
e4dc3f71ae
Resolve merge conflict
6 years ago
Maxim Filippov
b8a77c5d70
Add OEmbed parser
6 years ago
sxsdv1
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
sxsdv1
581edd5a91
Add route to get object like activities
6 years ago
sxsdv1
36711e1c83
Handle client submitted activitypub like activity
6 years ago
sxsdv1
1eb7318831
Prepare all types objects before serialising
...
Activities returned from inbox can include other types of objects like
Article
6 years ago
Egor Kislitsyn
728587fdaa
typo
6 years ago
Egor Kislitsyn
b594a54d0c
unpin when deleting a status
6 years ago
kaniini
e4afe1359b
Merge branch 'activitypub-dereference-activity-id' into 'develop'
...
Support activity+json request for activity
See merge request pleroma/pleroma!641
6 years ago
Maxim Filippov
1f851a0723
Add Twitter Card parser
6 years ago
kaniini
11d08c6226
Merge branch 'twapi-follower-pagination' into 'develop'
...
Twapi follower pagination
See merge request pleroma/pleroma!648
6 years ago
Haelwenn
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
William Pitcock
490c80bc96
test: common api: add tests for format_input/4
6 years ago
kaniini
7f5efddd6e
Merge branch 'feature/pinned-posts' into 'develop'
...
Pinned Statuses
Closes #440
See merge request pleroma/pleroma!636
6 years ago
kaniini
d203b0b4d3
Merge branch 'dm-optimizations' into 'develop'
...
Add activity visibility index.
See merge request pleroma/pleroma!646
6 years ago
lain
a99e156f2c
Add integer casts.
6 years ago
lain
7ac152ed38
TwitterAPI: Add follower/following pagination.
6 years ago
lambda
1881680e28
Merge branch 'scarlett/pleroma-summary-html-api' into 'develop'
...
Scarlett/pleroma summary html api
See merge request pleroma/pleroma!647
6 years ago
lain
8df348a3da
Add test for summary_html
6 years ago
lain
5027f82cde
Add activity visibility index.
6 years ago
Egor Kislitsyn
6cbe63726d
improve tests
6 years ago
Egor Kislitsyn
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
Egor Kislitsyn
1b06e6fdf3
only non-reblogs, self-authored, public statuses can be pinned
6 years ago
sxsdv1
20c0dd1e24
Support activity+json request for activity
6 years ago
Egor Kislitsyn
0c750bc432
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn
7b6c5f0a9d
improve test readability
6 years ago
Egor Kislitsyn
db6f4496eb
fix test
6 years ago
Egor Kislitsyn
e679da4c34
add `pinned` property to `StatusView`
6 years ago
Egor Kislitsyn
63dbd87568
rename `post` to `status`
6 years ago
lain
a16b17cc61
Actually put some onformation in the error user, make it actually properly parse
...
in conversations.
6 years ago
kaniini
74e1093732
Merge branch 'resilient-user-view' into 'develop'
...
Make TwAPI UserView more resilient to issues.
See merge request pleroma/pleroma!634
6 years ago
Egor Kislitsyn
f24087f96e
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn
380e9fba21
add pinned posts
6 years ago
lain
7dcafb4894
MastoAPI: Add test.
6 years ago
lain
7382adf407
Make TwAPI UserView more resilient to issues.
...
Will work for missing users and badly migrated users.
6 years ago
scarlett
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
kaniini
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
scarlett
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
scarlett
57df7d6e1d
Add tests for emoji and lack of HTML in summaries.
6 years ago
scarlett
096e121879
Remove redundant comma.
6 years ago
scarlett
6556be344d
Resolve some test failures.
6 years ago
sxsdv1
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
kaniini
4258dd8633
Merge branch 'feature/rich-media' into 'develop'
...
URL previews in posts
Closes #402
See merge request pleroma/pleroma!617
6 years ago
Maxim Filippov
48e81d3d40
Add RichMediaController and tests
6 years ago
sxsdv1
4e1cc2bab6
Implement delete activity
6 years ago
sxsdv1
551c3d9391
Split create activity specifics from update_outbox
6 years ago
Maxim Filippov
2aab4e03c3
Add OGP parser
6 years ago
kaniini
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
kaniini
8e7da98b18
Merge branch 'mr/retry-queue' into 'develop'
...
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
6 years ago
Michael Loftis
cb286fdeba
Improves RetryQueue behavior
...
reduces to one single timer firing once a second
switches to a parallel worker model
6 years ago
sxsdv1
569bad8210
Create activity when client posts to outbox
6 years ago
sxsdv1
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
sxsdv1
aa082ca7b6
Wire up stub routes for client calls of activitypub inbox/outbox
...
Code style: remove wrapping function of outbox
6 years ago
kaniini
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
6 years ago
kaniini
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
Ivan Tashkinov
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
Ivan Tashkinov
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
Haelwenn (lanodan) Monnier
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
Vyr Cossont
d8cc96cb1f
Fix Twitter timelines for private instances
6 years ago
kaniini
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
kaniini
cff0292d4b
Merge branch 'reserve-user-names' into 'develop'
...
Reserve a few user names
See merge request pleroma/pleroma!594
6 years ago
Vyr Cossont
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
lain
551d80cc01
Expose restricted names in nodeinfo.
6 years ago
lain
5811e65e67
Add some hard limits on inserted activities.
6 years ago
Maxim Filippov
012b7ab5e6
Add test to check /object/:id does not leak the tombstone itself
6 years ago
Maxim Filippov
aeb89bece6
Remove unused test
6 years ago
Maxim Filippov
f75f707f6c
Revert Activity tombstones, add ObjectTombstone struct
6 years ago
Maxim Filippov
2bbec33c71
Fix failing tests
6 years ago
Maxim Filippov
18a4cbb244
Capitalize "tombstone"
6 years ago
Maxim Filippov
0f412cf6e6
Create tombstone instead of object deletion
6 years ago
William Pitcock
3c08d229db
tests: add legal boilerplate
6 years ago
William Pitcock
a2bceaf688
tests: twitter api: add test proving that peertube videos are correctly handled
6 years ago
William Pitcock
873938d223
tests: twitter api: activity view test: enable tesla mock
6 years ago
William Pitcock
9f48485f64
tests: mastodon api: add test verifying that peertube videos are correctly rendered
6 years ago
William Pitcock
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
6 years ago
Ivan Tashkinov
851db74f1c
[ #114 ] Fixed test.
6 years ago
Ivan Tashkinov
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
Ivan Tashkinov
f69cbf4755
[ #114 ] Added :user_id component to email confirmation path to improve the security.
...
Added tests for `confirm_email` action.
6 years ago
Ivan Tashkinov
968d7490b6
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_changeset`.
6 years ago
Ivan Tashkinov
59fc5d15df
[ #114 ] User.Info: renamed `confirmation_update` to `confirmation_change`.
6 years ago
Ivan Tashkinov
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
Ivan Tashkinov
aed0f90287
[ #114 ] Added `pleroma.confirmation_pending` to user views, adjusted view tests.
6 years ago
raeno
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
Maksim Pechnikov
92a5133c42
fix text field
6 years ago
lambda
078b8b6d22
Merge branch 'phoenix14' into 'develop'
...
Upgrade to Phoenix 1.4
Closes #451
See merge request pleroma/pleroma!560
6 years ago
href
b12a904911
Integration tests for mastodon websocket
6 years ago
lambda
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
href
f672555ad3
Upgrade to Phoenix 1.4
6 years ago
eal
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
eal
4c783e35c0
Mastodon API: Fix PUT /api/web/settings
6 years ago
Haelwenn (lanodan) Monnier
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
6 years ago
Haelwenn (lanodan) Monnier
5af91020f8
Web.WebFinger.WebFingerControllerTest: test against XML and JRD webfinger endpoints
6 years ago
href
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
Maksim Pechnikov
ea72ac549b
fix case when tags is invalid
6 years ago
raeno
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
raeno
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
Maksim Pechnikov
d3ec09bb38
fix tags
6 years ago
Ivan Tashkinov
07e93f9940
[ #114 ] Improved tests.
6 years ago
Ivan Tashkinov
a89e3b4b60
[ #114 ] Moved email_invite action to AdminAPIController, adjusted tests.
6 years ago
Ivan Tashkinov
3cbf16a5fe
[ #114 ] Added UserInviteToken creation, adjusted invitation email link to include it.
6 years ago
Ivan Tashkinov
cc83d7ffe7
[ #114 ] Naive implementation of email invitations.
6 years ago
href
30dc81667c
Merge branch '114_user_registration_emails' into 'develop'
...
[#114 ] User registration emails
Closes #114
See merge request pleroma/pleroma!531
6 years ago
lambda
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
eal
61ad2ce422
TwitterAPI: Include favorited post in json
6 years ago
eal
1ca080c862
Prevent accidental double RTs or favorites
6 years ago
raeno
c5c3ad90d0
Fix tests. Remove oembed template
6 years ago
raeno
b5de7c4c4d
Remove oembed for now, will submit it in another MR. Fix warnings
6 years ago
raeno
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
6 years ago
Ivan Tashkinov
18b9467d1a
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
6 years ago
Ivan Tashkinov
00744c6b03
[ #114 ] Initial implementation of user email invitations.
6 years ago
Ivan Tashkinov
4e7d98922e
[ #114 ] Added tests for "POST /api/account/password_reset".
6 years ago
Maksim Pechnikov
89b3729afa
fix warnings
6 years ago
lambda
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
lambda
ff10b9927b
Merge branch 'support/bugfix_272' into 'develop'
...
[#272 ] fix hashtags in api
See merge request pleroma/pleroma!510
6 years ago
lain
c81c74d847
Treat warnings as errors outside of tests.
6 years ago
raeno
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
6 years ago
Maksim Pechnikov
9442588ae9
fix hashtags in api response
6 years ago
Ivan Tashkinov
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
6 years ago
Ivan Tashkinov
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
Ivan Tashkinov
abbf347dc7
[ #394 ] View tests fix.
6 years ago
Ivan Tashkinov
22830c8fc9
[ #394 ] Formatting fix.
6 years ago
Ivan Tashkinov
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
kaniini
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
Ivan Tashkinov
3e90f688f1
[ #210 ] Mastodon: actor storing for media uploads, ownership check to update_media.
...
Refactoring.
6 years ago
kaniini
48a0315646
Merge branch 'follower-hiding' into 'develop'
...
Network hiding
Closes #356
See merge request pleroma/pleroma!490
6 years ago
lain
76d6b1c6ab
Merge remote-tracking branch 'origin' into follower-hiding
6 years ago
lain
3ea4476445
MastodonAPI: Show users their own network.
6 years ago
Vald
3c8ffe7ed3
resolved activity view test
6 years ago
Vald
028904c333
lint
6 years ago
Vald
911a877576
resolved api and controller test failures
6 years ago
lain
fdac215091
TwitterAPI: Show users their own network.
6 years ago
lain
839526a913
TwitterAPI: Add network hiding.
6 years ago
Ivan Tashkinov
ba345e4c29
[ #210 ] Formatting fix.
6 years ago
Ivan Tashkinov
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.
6 years ago
Ivan Tashkinov
53797d19c5
[ #210 ] Test update (replaced bang- with non-bang method).
6 years ago
Ivan Tashkinov
44ab3dbe2c
[ #210 ] Refactoring.
6 years ago
Ivan Tashkinov
826fc446d5
[ #210 ] TwitterAPI: implemented /api/media/metadata/create
...
to allow uploads description (alt text) setting.
6 years ago
Maksim Pechnikov
dd8aee332c
formatting the code
6 years ago
Maksim Pechnikov
5c6d47614d
all tests passed
6 years ago
Maksim Pechnikov
a9e4a97586
update test
6 years ago
Maksim Pechnikov
7ec64ac33f
update test
6 years ago
Maksim Pechnikov
80bfdb4e7d
update test
6 years ago
Maksim Pechnikov
6cfdc11e32
update test
6 years ago
Maksim Pechnikov
c508d41c34
add http requests mock
6 years ago
Maksim Pechnikov
87109482f3
status_code -> status
6 years ago
Maksim Pechnikov
ec34de0c1f
WebSub fix test
6 years ago
lambda
88b05aeabb
Merge branch 'fix/parse-user-bio' into 'develop'
...
Parse user's bio on register
See merge request pleroma/pleroma!492
6 years ago
Maxim Filippov
4b70e5eae9
Parse bio for MastodonAPI
6 years ago
Maxim Filippov
8148943368
Format files
6 years ago
Maxim Filippov
ce98d5eb9b
Parse user's bio on register
6 years ago