lambda
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
6 years ago
lambda
69454c8345
Merge branch 'feature/dm-sanity' into 'develop'
...
DM sanitization
See merge request pleroma/pleroma!458
6 years ago
Ivan Tashkinov
a4d3fec8a7
[ #502 ] Code comments update.
6 years ago
Ivan Tashkinov
aa480f4a8b
[ #530 ] Prevents user `info` from being overwritten because of race conditions
...
and non-partial update of embed (in WebFinger.ensure_keys_present and other places).
6 years ago
Haelwenn (lanodan) Monnier
98c8184c1f
Activity: get_create_activity_by_object_ap_id/1 → get_create_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier
2fdbd4d137
Activity: create_activity_by_object_id_query/1 → create_by_object_ap_id/1 when is_list
6 years ago
Haelwenn (lanodan) Monnier
f8ab1b7427
Activity: get_all_by_object_ap_id/1 → get_all_create_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
6 years ago
lain
cf1f35a93a
Send delete event over Mastodon streaming api
...
Closes #116
6 years ago
lambda
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
William Pitcock
aa37313416
activitypub: short-circuit is_public?() with directMessage flag check
6 years ago
William Pitcock
7c9749f793
transmogrifier: slightly clean up fix_explicit_addressing pipeline
6 years ago
William Pitcock
420651157b
transmogrifier: don't apply heuristics against messages which have `directMessage` set true
6 years ago
William Pitcock
ddae43eb43
activitypub: add is_private?/is_direct? helpers
6 years ago
William Pitcock
9adc80afff
common api: set directMessage flag on our own posts
6 years ago
William Pitcock
75dfa1f0b0
mastodon api: get_visibility(): DMs never have a cc list.
6 years ago
William Pitcock
681f40ee5c
activitypub: transmogrifier: fix up to/cc addressing brain damage caused by mastodon-style explicit DMs
6 years ago
William Pitcock
8d06be35e0
activitypub: utils: add determine_explicit_mentions() and tests
6 years ago
kaniini
42612b1c8d
Merge branch 'bugfix/improve-boost-targeting' into 'develop'
...
improve handling of non-public Announces
See merge request pleroma/pleroma!681
6 years ago
rinpatch
44693fbf6e
Formating
6 years ago
rinpatch
afd83db0d7
Provide local og:url for remote activities
6 years ago
kaniini
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
6 years ago
Maxim Filippov
651a1d64b5
Add current user to mentioned
6 years ago
Maxim Filippov
e116e55cab
Add actor to recipients
6 years ago
rinpatch
74346a7035
Fix merge conflict
6 years ago
rinpatch
997f4a5e09
Remove custom emojis and trailing whitespaces from previews
6 years ago
rinpatch
1b1af4798a
Use object instead of activity for metadata
6 years ago
Ivan Tashkinov
65bb9b2fba
[ #491 ] Made full nicknames be preserved in user links text only in Bio.
6 years ago
William Pitcock
75a9b2a851
activitypub: add a match clause for objects, not just activities
6 years ago
William Pitcock
dbc4e92509
activitypub: transmogrifier: do not clobber the addressing on relayed announcements
6 years ago
William Pitcock
33b473cc02
activitypub: allow is_public?() to work on any type of map representing an AS2 object
6 years ago
William Pitcock
8e9f1d5587
activitypub: relay: chase selective public announce changes
6 years ago
William Pitcock
2479e88815
activitypub: announce: add new public parameter
6 years ago
kaniini
ae8a5942cf
Merge branch 'bad-copy-paste' into 'develop'
...
Fix bad link in likes collection
See merge request pleroma/pleroma!679
6 years ago
sxsdv1
948fba6f76
Fix bad link in likes collection
...
Don't copy and paste, mkay
6 years ago
rinpatch
a95d5da607
Don't show content if empty or zero width space
6 years ago
Mark Felder
849c83ed46
formatting
6 years ago
Mark Felder
6bc9a641ba
Default to disabled in the code in case the setting is absent from config.exs
6 years ago
Mark Felder
8c368d42a2
Make attachment links configurable
...
Thanks @href!
6 years ago
rinpatch
4d5f15cd42
Introduce optional unfurling of nsfw content
6 years ago
rinpatch
0256bd2f1d
Use object url instead of a hack
6 years ago
rinpatch
fd3a558230
Apply feld's patch
6 years ago
rinpatch
5fa508cc2b
Remove @providers and call Pleroma.config on runtime
6 years ago
rinpatch
bb43f4cee9
Remove useless with in opengraph.ex
6 years ago
rinpatch
293f6a8b71
join us now and share the software~. Also tests
6 years ago
lain
943324b661
MastoAPI: Don't break on missing users.
6 years ago
rinpatch
b44995866b
Replace map with reduce to remove nils
6 years ago
rinpatch
ff01fd3c4f
Remove caching because it does not affect performance and may be even worse in some cases
6 years ago
rinpatch
bfe2a11a6b
Add config doc
6 years ago
rinpatch
a9c27e137d
Add a fallback function to handle generic params, just in case
6 years ago
rinpatch
a76793006b
Thanks you rinpatch, very cool
6 years ago
rinpatch
0039d45b5b
No need to use activity in the key
6 years ago
rinpatch
70b2bb6ede
add caching
6 years ago
rinpatch
dd1432d695
Disable previews for any activity, but create
6 years ago
rinpatch
565caff3f4
cache HTML in OGP
6 years ago
rinpatch
9aa69e12b8
Add behaviours to TwitterCard, remove some dumb stuff in Formatter.truncate
6 years ago
rinpatch
2e630bea0d
Add twitter card, filter nsfw
6 years ago
rinpatch
70f140681f
Add space between name and nickname
6 years ago
rinpatch
e8eecd61b4
Formating
6 years ago
rinpatch
410fd9d774
Attach attachments
6 years ago
William Pitcock
17da432dbb
websub: improve error handling
6 years ago
rinpatch
ff6c9a5c96
Introduce get_by_id in Activity, replace newlines with spaces
6 years ago
rinpatch
850912b06b
refactor opengraph to a different module with a behaviour
6 years ago
rinpatch
8745c8c990
remove useless newlines after every tag. Make domain.com/username provide opengraph too
6 years ago
rinpatch
2858fd2da2
add a fallback function
6 years ago
rinpatch
ce15e0659e
Fix some edge cases [nervous laughter]
6 years ago
rinpatch
4656f433f9
Move metadata.ex out of ostatus
6 years ago
lambda
fd2f1258fb
Merge branch 'load-all-dms' into 'develop'
...
Remove recent activity restriction.
See merge request pleroma/pleroma!644
6 years ago
Ivan Tashkinov
dc45ec62c2
[ #477 ] User search improvements: tsquery search with field weights, friends & followers boosting.
6 years ago
kaniini
de1da7b3d1
Merge branch 'feature/add-oembed-parser' into 'develop'
...
Add OEmbed parser
See merge request pleroma/pleroma!661
6 years ago
kaniini
fa0392e49c
Merge branch 'activitypub-likes' into 'develop'
...
Activitypub c2s likes
See merge request pleroma/pleroma!658
6 years ago
William Pitcock
6e5b0406b9
mrf: add no placeholder-text policy, strips pointless "." content from posts with images
6 years ago
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
Sadposter
9daf162461
Honour parameters on MastoAPI /favourites
6 years ago
Sadposter
144b48da95
Add link headers to MastoAPI /favourites
...
As documented at https://docs.joinmastodon.org/api/rest/favourites/
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
0bdbd4f968
common api: utils: remove newline to <br> conversion from bare HTML to be consistent with markdown
...
ok @lanodan
6 years ago
William Pitcock
2ecf81f10c
common api: fix newlines in markdown code blocks
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
rinpatch
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
rinpatch
a2d7f0e0e9
Remove :commit since a tuple is already returned
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
5027f82cde
Add activity visibility index.
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
lain
9854978b8b
Remove recent activity restriction.
...
This should be fine now, everything should be covered by indices.
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
e679da4c34
add `pinned` property to `StatusView`
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
7382adf407
Make TwAPI UserView more resilient to issues.
...
Will work for missing users and badly migrated users.
6 years ago
scarlett
36fa5e8802
Check visible_for_user when performing a search using a direct link.
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
6556be344d
Resolve some test failures.
6 years ago
scarlett
3c86d907d4
add some brakets to the emoji list.
6 years ago
scarlett
0787f0dfbe
Strip HTML in and allow emoji in summaries.
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
rinpatch
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
William Pitcock
487c00d36d
rich media: disable cachex in test mode
6 years ago
kaniini
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
William Pitcock
0964c207eb
rich media: use cachex to avoid flooding remote servers
6 years ago
Rin Toshaka
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
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
kaniini
ffea81b84f
Merge branch 'activitypub-c2s-delete-activity' into 'develop'
...
Activitypub c2s delete activity
See merge request pleroma/pleroma!618
6 years ago
kaniini
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
rinpatch
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
Michael Loftis
943211b035
rewrites List.foldl to Enum.each
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
917d48d09b
Better variable name
6 years ago
Maxim Filippov
2aab4e03c3
Add OGP parser
6 years ago
kaniini
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
rinpatch
34fa709015
Merge branch 'configurable-federator' into 'develop'
...
Make Federator options configurable.
See merge request pleroma/pleroma!615
6 years ago
lambda
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
lain
400337b0a7
Make Federator options configurable.
6 years ago
lain
096a927805
Merge remote-tracking branch 'origin/develop' into pool-usage
6 years ago
lain
d4799e0dc2
Remove default pool, it's used automatically anyway.
6 years ago
Haelwenn (lanodan) Monnier
1e6c102bfc
Web.AdminAPI.AdminAPIController: Remove a useless if in user_delete
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
William Pitcock
980b5288ed
update copyright years to 2019
6 years ago
lambda
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
Rin Toshaka
7e09c2bd7d
Move scrubber cache-related functions to Pleroma.HTML
6 years ago
kaniini
8e7da98b18
Merge branch 'mr/retry-queue' into 'develop'
...
Improves RetryQueue behavior
See merge request pleroma/pleroma!609
6 years ago
Rin Toshaka
dec23500d8
Resolve merge conflict
6 years ago
Rin Toshaka
c119ea3a57
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka
535fddd286
Friendship ended with Postgresql now Cachex is my best friend
6 years ago
Rin Toshaka
d9f40b05b3
Added get_stripped_html_for_object. Renamed a few things
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
Rin Toshaka
bce152aba0
Tidy up the code. Rename key to signature
6 years ago
Rin Toshaka
66d1c31461
Fix some stupid typos
6 years ago
sxsdv1
f40562b4e1
Respond with full activity to outbox post
6 years ago
sxsdv1
1e781715c8
Limit activity types accepted to outbox to only 'Create'
6 years ago