565caff3f4
cache HTML in OGP
6 years ago
9aa69e12b8
Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate
6 years ago
2e630bea0d
Add twitter card, filter nsfw
6 years ago
70f140681f
Add space between name and nickname
6 years ago
e8eecd61b4
Formating
6 years ago
410fd9d774
Attach attachments
6 years ago
17da432dbb
websub: improve error handling
6 years ago
ff6c9a5c96
Introduce get_by_id in Activity, replace newlines with spaces
6 years ago
850912b06b
refactor opengraph to a different module with a behaviour
6 years ago
8745c8c990
remove useless newlines after every tag. Make domain.com/username provide opengraph too
6 years ago
2858fd2da2
add a fallback function
6 years ago
ce15e0659e
Fix some edge cases [nervous laughter]
6 years ago
4656f433f9
Move metadata.ex out of ostatus
6 years ago
fd2f1258fb
Merge branch 'load-all-dms' into 'develop'
...
Remove recent activity restriction.
See merge request pleroma/pleroma!644
6 years ago
dc45ec62c2
[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.
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
6e5b0406b9
mrf: add no placeholder-text policy, strips pointless "." content from posts with images
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
9daf162461
Honour parameters on MastoAPI /favourites
6 years ago
144b48da95
Add link headers to MastoAPI /favourites
...
As documented at https://docs.joinmastodon.org/api/rest/favourites/
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
0bdbd4f968
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
...
ok @lanodan
6 years ago
2ecf81f10c
common api: fix newlines in markdown code blocks
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
b57db828c7
Merge branch 'hotfix/ogp-cachex-fix' into 'develop'
...
Rich media: Remove :commit since a tuple is already returned
See merge request pleroma/pleroma!649
6 years ago
a2d7f0e0e9
Remove :commit since a tuple is already returned
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
5027f82cde
Add activity visibility index.
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
9854978b8b
Remove recent activity restriction.
...
This should be fine now, everything should be covered by indices.
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
e679da4c34
add `pinned` property to `StatusView`
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
7382adf407
Make TwAPI UserView more resilient to issues.
...
Will work for missing users and badly migrated users.
6 years ago
36fa5e8802
Check visible_for_user when performing a search using a direct link.
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
6556be344d
Resolve some test failures.
6 years ago
3c86d907d4
add some brakets to the emoji list.
6 years ago
0787f0dfbe
Strip HTML in and allow emoji in summaries.
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
ba17518a0a
Merge branch 'feature/rich-media-cachex' into 'develop'
...
rich media: use cachex to avoid flooding remote servers
See merge request pleroma/pleroma!629
6 years ago
487c00d36d
rich media: disable cachex in test mode
6 years ago
bf5aaefbb5
Merge branch 'fix/html-cache-content-collision' into 'develop'
...
Different caches based on the module. Remove scrubber version since it is not relevant anymore
See merge request pleroma/pleroma!628
6 years ago
0964c207eb
rich media: use cachex to avoid flooding remote servers
6 years ago
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
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
ffea81b84f
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
...
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
6 years ago
d9d62a110c
Merge branch 'mr/retry-queue-remove-fold' into 'develop'
...
rewrites List.foldl to Enum.each in RetryQueue
See merge request pleroma/pleroma!621
6 years ago
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
943211b035
rewrites List.foldl to Enum.each
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
917d48d09b
Better variable name
6 years ago
2aab4e03c3
Add OGP parser
6 years ago
32bed66471
Merge branch 'pool-usage' into 'develop'
...
Update of hackney and tesla, removal of superflous default options.
See merge request pleroma/pleroma!614
6 years ago
34fa709015
Merge branch 'configurable-federator' into 'develop'
...
Make Federator options configurable.
See merge request pleroma/pleroma!615
6 years ago
32541172cd
Merge branch 'cleanup/admin-api-useless-if' into 'develop'
...
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
See merge request pleroma/pleroma!612
6 years ago
400337b0a7
Make Federator options configurable.
6 years ago
096a927805
Merge remote-tracking branch 'origin/develop' into pool-usage
6 years ago
d4799e0dc2
Remove default pool, it's used automatically anyway.
6 years ago
1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
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
980b5288ed
update copyright years to 2019
6 years ago
33e3a7ba7d
Merge branch 'fix/scrubber-cache' into 'develop'
...
[#481 ] Store scrubbed posts in Cachex
Closes #481
See merge request pleroma/pleroma!610
6 years ago
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
6 years ago
8e7da98b18
Merge branch 'mr/retry-queue' into 'develop'
...
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
6 years ago
dec23500d8
Resolve merge conflict
6 years ago
c119ea3a57
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
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
bce152aba0
Tidy up the code. Rename key to signature
6 years ago
66d1c31461
Fix some stupid typos
6 years ago
f40562b4e1
Respond with full activity to outbox post
6 years ago
1e781715c8
Limit activity types accepted to outbox to only 'Create'
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
a32e23905a
Use Object.change instead of Ecto.Changeset.change
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
9a0163db53
use Kernel.put_in instead of Map.merge
6 years ago
19f9889fbe
I am not sure what's going on anymore so I'll just commit and reset all the other files to HEAD
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
523848d1fd
Salmon# fixed publish an activity to remote accounts
6 years ago
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
49cf5f9ce0
Merge branch '471_invalid_accounts_rendering' into 'develop'
...
[#471 ] Prevented rendering of inactive local accounts
Closes #471
See merge request pleroma/pleroma!599
6 years ago
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
6 years ago
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
6 years ago
68f483ef4c
Merge branch 'fix/no-attachment-links' into 'develop'
...
Treat any present value in "no_attachment_links" as true
Closes pleroma-fe#175
See merge request pleroma/pleroma!597
6 years ago
6e9a15b181
[ #483 ] Blocked users export for TwitterAPI.
6 years ago
b43d630f30
Web.TwitterAPI.UserView: Add rights.admin
6 years ago
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
6 years ago
d8cc96cb1f
Fix Twitter timelines for private instances
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
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
6 years ago
be70272ab0
Treat only true and "true" as true
6 years ago
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
838c024231
Treat any present value in "no_attachment_links" as true
6 years ago
551d80cc01
Expose restricted names in nodeinfo.
6 years ago
5811e65e67
Add some hard limits on inserted activities.
6 years ago
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
005b4194ff
Merge branch 'bugfix/trans_fix_url_videos' into 'develop'
...
Fix "url" of Videos in transmogrifier
Closes #367
See merge request pleroma/pleroma!459
6 years ago
34a4ed22c4
twitter api: add "Video" to supported activity types list
6 years ago
79b51a97fe
twitter api: activity representer: remove peertube hack
6 years ago
32dfc1d12a
mastodon api: status view: remove obsolete peertube hack
6 years ago
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
6 years ago
a3e33fa177
Merge branch 'hotfix/activity-without-content' into 'develop'
...
Twitter ActivityView: fix crash with activity without content
See merge request pleroma/pleroma!572
6 years ago
3aff8067e4
transmogrifier: When it’s a Video move "url" to "attachment"
6 years ago
a7f07bb6e5
Implement kaniini's tweaks
6 years ago
c76179419d
Renamed the things
6 years ago
409ff60bf8
Fix formatting
6 years ago
92362e1e22
Implement large thread filter
6 years ago
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
6 years ago
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
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
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
6 years ago
fda148a9a2
Merge branch 'documentation/copy-pleroma-api' into 'develop'
...
Pleroma-API.md: Import from /wikis/Pleroma-only-api-endpoints
See merge request pleroma/pleroma!571
6 years ago
652f49d176
Remove extra bracket
6 years ago
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
b520d44b58
[ #114 ] `mix format`
6 years ago
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
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
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
6 years ago
3371a45884
[ #114 ] Formatting fix.
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
b86057cc7f
[ #114 ] Refactored User.register_changeset to init confirmation data.
...
Introduced User.register/1 to encapsulate User record creation and post-registration actions.
6 years ago
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
6 years ago
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
6 years ago
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
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.
6 years ago
3d980daa49
Merge branch '459_fix_user_profile_crash' into 'develop'
...
Fix update_profile failing due to OAuth token record in assigns instead of string
Closes #459
See merge request pleroma/pleroma!561
6 years ago
92a5133c42
fix text field
6 years ago
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
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
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
cc87880488
Support both OAuth token record and token string in UserView
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
5dcb7aecea
More put_view.
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
23549d3952
Formatting fixes
6 years ago
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
6 years ago
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
6 years ago
28c43a417e
Add an ability to disabled captcha
6 years ago
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
6 years ago
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
acec11626d
Merge branch 'fix/issue_272' into 'develop'
...
[#272 ] fix tags
See merge request pleroma/pleroma!540
6 years ago
ea72ac549b
fix case when tags is invalid
6 years ago
b0c3211984
Scrub html from activity.content or user.bio for opengraph meta
6 years ago
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
d3ec09bb38
fix tags
6 years ago
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
6 years ago
980131b4db
Merge branch 'pleroma-feature/compat/push-subscriptions' into 'develop'
...
Improve web push
Closes #393 , #422 , and #452
See merge request pleroma/pleroma!524
6 years ago
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
6 years ago
412df2cd38
Warn if push is disabled..
6 years ago
baead4ea4b
fix markdown formatting
6 years ago
91236c60c7
Merge branch 'feature/file-size-checking' into 'develop'
...
[#36 ] Add warnings when file upload fails
See merge request pleroma/pleroma!523
6 years ago
0b4c61e8d5
Fix warning
6 years ago
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
6 years ago
331396cbcd
Properly disable Web Push if no VAPID key is set
6 years ago
6822916183
Typos
6 years ago
b1bcd97a0f
Push: respect alerts settings
6 years ago
d8984b7bf8
Push: add missing notification_type field
6 years ago
7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe
6 years ago
324933a0ac
improve push message format (compatibility with mastodon)
6 years ago
658edb166f
fix and improve web push; add configuration docs
6 years ago
69fd63e248
[ #114 ] Added `invitesEnabled` to `metadata` of nodeinfo.
6 years ago
66380b0641
[ #114 ] Removed `confirm_email` action stub (to be addressed in a separate MR).
6 years ago
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
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
rinpatch