Egor Kislitsyn
b2e9700785
cleanup
6 years ago
Egor Kislitsyn
55affbca7f
add a job queue
6 years ago
lain
f53d464db0
Put deprecation warnings undre Pleroma.Config.
6 years ago
Ivan Tashkinov
d3f9e6f6fe
[ #534 ] Merged `upstream/develop`.
6 years ago
Ivan Tashkinov
1d2f41642c
[ #534 ] Various tweaks. Tests for Instances and Instance.
6 years ago
lain
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
lain
f1d58c5c49
Don't run warnings in a task.
6 years ago
Haelwenn
de0fb88a9c
Merge branch 'safe-render-activities' into 'develop'
...
remove unnecessary filter (re !723 )
See merge request pleroma/pleroma!729
6 years ago
href
df2f7b39dd
re f83bae7c: remove unnecessary filter
6 years ago
lain
f231313b70
Add deprecation warning mechanism.
6 years ago
lain
1825118fd4
Correctly handle invalid credentials on auth login.
...
Closes #407
6 years ago
Ivan Tashkinov
9560abea10
[ #534 ] Refactoring / tweaks per MR review.
6 years ago
William Pitcock
ddc7ae2c1a
mastodon api: card: force OGP images through mediaproxy
6 years ago
William Pitcock
ebeabdcc72
rich media: helpers: clean up unused aliases
6 years ago
William Pitcock
91ef64a1ec
activitypub: prime OGP crawler cache when new messages are inserted into the database
6 years ago
William Pitcock
8e42251e06
rich media: add helpers module, use instead of MastodonAPI module
6 years ago
William Pitcock
24a103a1fe
mastodon api: formatting
6 years ago
William Pitcock
6096846f5f
API: kill /api/rich_media/parse endpoint
6 years ago
William Pitcock
07a9a891ad
twitter api: fix up activity representer
6 years ago
William Pitcock
de42646634
rich media: add try/rescue to ensure we catch parsing and fetching failures
6 years ago
William Pitcock
5d895093fd
twitter api: embed card in twitterapi posts
6 years ago
William Pitcock
5a37ddc2dc
mastodon api: embed card in status object
6 years ago
William Pitcock
132d815f1f
mastodon api: factor out status card fetching, move status card rendering to statusview, add opengraph extended data
6 years ago
Haelwenn (lanodan) Monnier
cda1470e02
[MastoAPI][GlitchAPI] Add bookmarks
6 years ago
Haelwenn (lanodan) Monnier
872241d7c5
/web/index template: Modify for glitch-soc
6 years ago
href
71bb90073b
/notice/:id - send the FE index even if 404
...
this allows to open private activities by URL when you are logged in,
and to let the FE display a 404 page
6 years ago
lambda
16ab1437d6
Merge branch 'safe-render-activities' into 'develop'
...
Views: wrap activity rendering in a rescue
See merge request pleroma/pleroma!723
6 years ago
lain
2e277dd4ad
Fix objects.
6 years ago
kaniini
ea12371a01
Merge branch 'discard-invalid-likes' into 'develop'
...
Transmogrifier: fix incoming objects with invalid likes
See merge request pleroma/pleroma!724
6 years ago
href
77f2137383
Transmogrifier: fix incoming objects with invalid likes
6 years ago
href
f83bae7c22
Views: wrap activity rendering in a rescue
...
this avoids complete timeline breakage when an activity fucks up
rendering.
6 years ago
kaniini
9af798ad40
Merge branch 'flake-random-worker-id' into 'develop'
...
Flake: random worker id
See merge request pleroma/pleroma!721
6 years ago
href
e0e0cc5ab0
Flake: random worker id
6 years ago
kaniini
5eb81d2c72
Merge branch 'features/mastoapi-multi-hashtag' into 'develop'
...
MastodonAPI multi-hashtag
See merge request pleroma/pleroma!652
6 years ago
Haelwenn (lanodan) Monnier
a65c188593
Web.MastodonAPI.AccountView: Add is_moderator and is_admin
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/557
6 years ago
William Pitcock
8f2f471e94
rich media: gracefully handle fetching nil URIs
6 years ago
kaniini
155a884300
Merge branch 'flake-from-int' into 'develop'
...
Flake: support integers in from_string/1
See merge request pleroma/pleroma!715
6 years ago
href
d6015338c8
Flake: support integers in from_string/1
...
Some previously issued stateless tokens have integer ids in them.
6 years ago
kaniini
3e66723f7e
Merge branch 'join-in-preloads' into 'develop'
...
Join on preloads to avoid N+1 queries
See merge request pleroma/pleroma!714
6 years ago
Haelwenn (lanodan) Monnier
de956b9e04
Web.MastodonAPI.MastodonAPIController: tag+any bookmark params in a array and flatten it
6 years ago
William Pitcock
1f7843b9b8
mastodon api: use OGP uri instead of page_url for deducing domain name, fix test
6 years ago
William Pitcock
86037e9c39
mastodon api: use HTML.extract_first_external_url()
6 years ago
href
8018ae7ae5
Join on preloads to avoid N+1 queries
6 years ago
William Pitcock
be9abb2cc5
html: add utility function to extract first URL from an object and cache the result
6 years ago
William Pitcock
78047d57bf
mastodon api: provider_name setting is required too on the card
6 years ago
Haelwenn (lanodan) Monnier
39863236eb
Web.MastodonAPI.MastodonAPIController: generic get_status_card/1 function for MastoAPI 2.6.x
...
Mastodon API 2.6.x added a card key to the Status object so the Card can be shown in the timeline without an extra request at each status.
6 years ago
Haelwenn (lanodan) Monnier
3f64379b13
Web.MastodonAPI.MastodonAPIController: Add Rich-Media support
6 years ago
Haelwenn (lanodan) Monnier
5a84def6a6
Fix the logic in multi-hashtag TLs
6 years ago
Haelwenn (lanodan) Monnier
4ad0ad14ed
Web.ActivityPub.ActivityPub: Simplify multi-hashtag, add tests
6 years ago
Haelwenn (lanodan) Monnier
1a9bb4daa0
[Web.ActivityPub.ActivityPub]: Fix restrict_tag()
...
Thanks to Senko-san <kurisu@iscute.moe> for the help on array-matching
6 years ago
Haelwenn (lanodan) Monnier
f9cae0d04f
[WIP,MastoAPI] Multi-tag timelines
6 years ago
Haelwenn (lanodan) Monnier
15aa45ae8a
Web.ActivityPub.ActivityPub: Fix check_remote_limit/1 against activities with content: nil
6 years ago
Ivan Tashkinov
060d280e64
[ #534 ] Made Salmon.send_to_user calls be handled through Federator.enqueue.
6 years ago
lain
aa8ddfdbe2
SPC fixes: Fix activities.
6 years ago
Ivan Tashkinov
465adedb7c
[ #534 ] Websub fix: made SQL use UTC time zone when comparing with `valid_until` (instead of postgresql-server default time zone).
6 years ago
Ivan Tashkinov
656ed7c84a
[ #534 ] Configurable outgoing federation reachability timeout.
6 years ago
rinpatch
3a5b3c5a3a
Merge remote-tracking branch 'pl/develop' into oembed_provider
6 years ago
kaniini
4c99b6d35a
Merge branch 'fix/tusky-dm' into 'develop'
...
Add actor to recipients list
Closes #390
See merge request pleroma/pleroma!683
6 years ago
kaniini
c9b418e547
Merge branch 'develop' into 'oembed_provider'
...
# Conflicts:
# lib/pleroma/activity.ex
6 years ago
kaniini
4df71cd88b
Merge branch 'classic-flakeids' into 'develop'
...
Flake Ids for Users and Activities
Closes #450
See merge request pleroma/pleroma!645
6 years ago
Maxim Filippov
9274cabe01
Use correct logic to determine "attentions" list
6 years ago
Ivan Tashkinov
3e9399ec0b
[ #534 ] Optimized bulk publish ops to filter on reachability early. `Instance` refactoring.
6 years ago
href
a3ba72d978
Fix clippy with one/five lines
6 years ago
Ivan Tashkinov
8654a591f0
[ #534 ] Updating external instances reachability on incoming federation.
6 years ago
href
be43aa2875
FlakeId: ignore null mac for workerid, use first mac
6 years ago
William Pitcock
54ec6d09b0
mrf: add anti-followbot policy
6 years ago
Ivan Tashkinov
20b54366ee
[ #534 ] Federation publish requests status control (enforced 2xx response code check).
6 years ago
Maxim Filippov
4333fea1dc
Send "hide_network" in user_view
6 years ago
Ivan Tashkinov
f161a92cb1
[ #534 ] Initial implementation of unreachable federation targets retirement.
6 years ago
kaniini
4a278cd80a
Merge branch 's3-namespace' into 'develop'
...
S3 uploader: support for namespaced bucket
Closes #532
See merge request pleroma/pleroma!699
6 years ago
lain
2de208817c
Merge branch 'develop' into rename/pleroma_activity_consistency
6 years ago
lain
e221c681dc
New frontend configuration mechanism.
6 years ago
href
a92c43bc4b
Clippy!
6 years ago
href
973c9eed18
Treat User.Info pinned ids as strings
6 years ago
href
e36a434b99
FlakeId.from_string/1: remove old, un-needed conversion
6 years ago
href
422e60ad76
2019
6 years ago
href
cdc5e6ff5c
ActivityPub: restrict_since/restrict_max: ignore empty param
6 years ago
href
9d63b27dcd
Test FlakeID old id compat & Ecto type
6 years ago
href
28d77e373c
Flake Ids for Users and Activities
6 years ago
Haelwenn
707cd9389c
Merge branch 'fix/activity_get_by_id' into 'develop'
...
Add get_by_id to activity.ex
See merge request pleroma/pleroma!695
6 years ago
Ivan Tashkinov
34d59e4008
[ #502 ] Fixed User.active_local_user_query to return users with nil or missing `info.deactivated`. Adjusted test.
6 years ago
rinpatch
e460820fcf
Add get_by_id to activity.ex
6 years ago
href
f9a3269099
Uploader callback controller
6 years ago
href
99763999c1
reverse_proxy - always override plug's cache-control
6 years ago
href
97412d9f94
S3 Namespace
6 years ago
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
7390192c03
Activity: mix format (2 empty lines)
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
4ad5a0abb9
Activity: all_by_object_ap_id_q/1 → create_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier
75e4c8f0b2
Activity: all_non_create_by_object_ap_id_q → by_object_ap_id
6 years ago
Haelwenn (lanodan) Monnier
b82c6dc536
Activity: all_by_object_ap_id/1 → get_all_by_object_ap_id/1
6 years ago
Haelwenn (lanodan) Monnier
f94cc6d824
Mix.Tasks.Pleroma.Instance: Generate signing_salt
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/533
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
lain
5834b08fe7
Set custom similarity limit.
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
lain
b108aeee08
Make use of the indices.
...
Indices in postgresql rely on operators, so they won't be used if you use only functions.
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
lain
bd6c12592e
Add migration to fix spc users.
6 years ago
lain
5d4d51e6dc
Add fixes for SPC users.
6 years ago
rinpatch
74346a7035
Fix merge conflict
6 years ago
Ivan Tashkinov
79e44042bc
[ #477 ] User trigram index adjustment.
6 years ago
Ivan Tashkinov
ed8f55ab8e
[ #477 ] User: FTS and trigram search results mixing (to handle misspelled requests).
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
98d9dcd509
Merge branch '502_instance_stats_active_users_count_fix' into 'develop'
...
[#502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users
Closes #502
See merge request pleroma/pleroma!678
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
Ivan Tashkinov
954dc4a4ad
[ #502 ] Fixed `user_count` in `/api/v1/instance` to include only active local users.
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
rinpatch
388ceb6a7d
Fix the issue with get_by_nickname never being called
6 years ago
Mark Felder
8c368d42a2
Make attachment links configurable
...
Thanks @href!
6 years ago
Ivan Tashkinov
2bfae25a1f
[ #491 ] Made user bio preserve full nicknames (nick@host).
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
9a90b5d91a
oof
6 years ago
rinpatch
8a9f089812
remove id cast
6 years ago
rinpatch
5a08dee379
cache ap_id in id instead of caching user two times
6 years ago
rinpatch
82cf9b9751
forgot to remove this thing
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
lambda
608cc65d43
Merge branch 'feature/improve-microformats' into 'develop'
...
improve microformats support
See merge request pleroma/pleroma!672
6 years ago
lambda
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
6 years ago
rinpatch
ff01fd3c4f
Remove caching because it does not affect performance and may be even worse in some cases
6 years ago
Ivan Tashkinov
90433b988e
[ #518 ] Fixed /api/v1/instance ("domain_count" value) and /api/v1/instance/peers responses.
6 years ago
rinpatch
bfe2a11a6b
Add config doc
6 years ago
Ivan Tashkinov
0bc6d30f7d
[ #477 ] Minor refactoring (user search query).
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
William Pitcock
461ab9489d
formatter: improve microformats markup
6 years ago
William Pitcock
1ddab78247
html: allow microformats-related markup through the html filter
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
lambda
9a444c0d22
Merge branch 'bugfix/websub-hardening' into 'develop'
...
websub: improve error handling
See merge request pleroma/pleroma!670
6 years ago
rinpatch
2e630bea0d
Add twitter card, filter nsfw
6 years ago
William Pitcock
2d3241753f
http: add support for query parameters, use Jason for JSON encoding instead of Poison like everywhere else
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
Ivan Tashkinov
5b8f9ff8c1
[ #477 ] User search tests. Normalized search rank in User.search.
6 years ago
rinpatch
2858fd2da2
add a fallback function
6 years ago
rinpatch
6f23139864
please don't bully me for this
6 years ago
rinpatch
4587a5712a
cringe
6 years ago
rinpatch
ce15e0659e
Fix some edge cases [nervous laughter]
6 years ago
lambda
646bb87816
Merge branch 'fix/elixir-1-8-type-annotation' into 'develop'
...
Fix Elixir 1.8 type annotation issue
Closes #523
See merge request pleroma/pleroma!668
6 years ago
rinpatch
4656f433f9
Move metadata.ex out of ostatus
6 years ago
Haelwenn (lanodan) Monnier
9fcdca1bdc
Upload: Fix uploading with a : in the filename
6 years ago
Haelwenn (lanodan) Monnier
e3eb75bd23
Upload: Fix uploading with a ? in the filename
6 years ago
Maxim Filippov
e8eff9fe03
Fix Elixir 1.8 type annotation issue
6 years ago
rinpatch
f20bfc9ea5
Merge branch 'media-url-escape' into 'develop'
...
URI escape file upload URLs
See merge request pleroma/pleroma!665
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
Shadowfacts
42b7584068
URI escape file upload URLs
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
rinpatch
5f9786288d
Prefer ids to usernames
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
f85d108c41
Merge branch 'mass-follow' into 'develop'
...
Mass follow
See merge request pleroma/pleroma!642
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
lain
65fc2df7cc
Use follow_all in autofollow.
6 years ago
lain
26938d65fd
Add User mass following function.
6 years ago
Egor Kislitsyn
28afcb7c31
move defaults from sample_config.exs to config.exs
6 years ago
Egor Kislitsyn
48591aab98
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
...
# Conflicts:
# docs/config.md
6 years ago
sxsdv1
20c0dd1e24
Support activity+json request for activity
6 years ago
kaniini
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
6 years ago
William Pitcock
f15183178c
user: fix auth_active?/1 for remote users
6 years ago
William Pitcock
0015d43e13
user: factor out illogical User.Info.superuser?/1.
...
any actual callee will be dealing with a User struct to begin with, so
just check the child struct inside User.superuser?/1 with pattern matching.
6 years ago
William Pitcock
74f48beec3
user: remove entirely redundant remote_or_auth_active?/1.
...
auth_active?/1 can check remote users and return true directly.
6 years ago
William Pitcock
2af67353c5
user: harden auth_active?/1, superuser?/1, visible_for?/1
6 years ago
William Pitcock
595a970493
user: use pattern matching to determine if user is local or remote instead of the previous hairy logic
6 years ago
Egor Kislitsyn
0c750bc432
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/pinned-posts
6 years ago
Egor Kislitsyn
6428ef77ad
add default configuration for the pinned statuses and some doc
6 years ago
lain
0fae04c4e3
Add a setting for users to autofollow on sign up.
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
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
Sadposter
042852ecf3
Add check to prevent multiple follow notifications from the same user
6 years ago
kaniini
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
6 years ago
kaniini
0b54c3d643
Merge branch 'fix_486' into 'develop'
...
fix 486: Add option --assume-yes to allow mix pleroma.user to work non-interactive
See merge request pleroma/pleroma!627
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
cascode
a81307251c
Merge branch 'develop' of git.pleroma.social:cascode/pleroma into fix/user-search-null-name
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
1e2d58982e
oopsies
6 years ago
Rin Toshaka
846082e54f
Different caches based on the module. Remove scrubber version since it is not relevant anymore
6 years ago
spctrl
4aa977d3b3
fix 486: Add option --assume-yes to allow it to work non-interactive
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
Wim Vanderbauwhede
ba93396649
Patch to support image descriptions in Pleroma FE
6 years ago
Wim Vanderbauwhede
4c95545d19
Patch to support image descriptions in Pleroma FE
6 years ago
Wim Vanderbauwhede
fe2dceb66d
Patch to support image descriptions in Pleroma FE
6 years ago
cascode
5b23dfa1c5
handle null
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
kaniini
eaaf701319
Merge branch 'fix/follow-requests-deleted-accounts' into 'develop'
...
user: check that the follow request actually has an active account associated with it
See merge request pleroma/pleroma!623
6 years ago
rinpatch
b73a1a33de
Merge branch 'captcha' into 'develop'
...
Make captcha (kocaptcha) stateless
See merge request pleroma/pleroma!585
6 years ago
William Pitcock
eb1a18d22f
user: check that the follow request actually has an active account associated with it
...
because of user refetch, accounts can stop existing (get_from_ap_id() can fail), accordingly
filter the follow requests for these failures.
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
6ed9b31a5f
Eh?
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
ab3089d6a7
Fix comment in object.ex
6 years ago
Rin Toshaka
c50353e6ae
shame on me for not testing after revert
6 years ago
Rin Toshaka
3f9da55adc
Fix formating. Aparently my pre-commit hook broke.
6 years ago
Rin Toshaka
62af23bd26
Revert some changes in html.ex
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
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
Rin Toshaka
a32e23905a
Use Object.change instead of Ecto.Changeset.change
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
Rin Toshaka
9a0163db53
use Kernel.put_in instead of Map.merge
6 years ago
vaartis
816db3f494
Remove the debugging IO.inspect
6 years ago
Haelwenn
f5d7b0003e
Merge branch 'fix_485' into 'develop'
...
Change 'name' to 'instance_name' so option is used when running non-interactive
See merge request pleroma/pleroma!607
6 years ago
Rin Toshaka
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
kaniini
3dc5f04976
Merge branch 'carrot-bullying' into 'develop'
...
Add some hard limits on inserted activities.
See merge request pleroma/pleroma!595
6 years ago
spctrl
ab9cda315f
Change 'name' to 'instance_name' so option is used when running non-interactive
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
Maksim Pechnikov
523848d1fd
Salmon# fixed publish an activity to remote accounts
6 years ago
Ivan Tashkinov
7bd49a3222
[ #483 ] User.get_by_nickname/1: ensured case-insensitive matching for local FQN. Added tests.
6 years ago
Ivan Tashkinov
b3574dccbb
[ #483 ] User.get_by_nickname/1: allowed retrieving user by fully-qualified local nickname
...
(<nick>@<our_instance_host>).
6 years ago
Ivan Tashkinov
67b4297f4d
[ #483 ] Refactored blocks and follows import, added tests.
6 years ago
kaniini
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
Ivan Tashkinov
700661b761
[ #483 ] Blocked users list import (TwitterAPI).
6 years ago
Ivan Tashkinov
0a41786624
[ #467 ] Refactored valid / invalid user rendering.
6 years ago
kaniini
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
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
Ivan Tashkinov
0d1788ce44
[ #471 ] Factored out User.visible_for?/2.
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
Ivan Tashkinov
e6aeb1d4a5
[ #471 ] Prevented rendering of inactive local accounts.
6 years ago
Maxim Filippov
be70272ab0
Treat only true and "true" as true
6 years ago
vaartis
708a228919
Set ttl_interval to the seconds_valid time
6 years ago
Vyr Cossont
e4562105e7
Implement exclude_reblogs and include_rts
6 years ago
Maxim Filippov
838c024231
Treat any present value in "no_attachment_links" as true
6 years ago
Ekaterina Vaartis
448af3601a
Up captcha timer to 60 secs again, save used captchas in cachex
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
lain
91724d160a
Reserve a few user names
...
These are all names that are used for domain.com/:route routes or projected to be.
6 years ago
Maxim Filippov
ca2e9ce9cc
Revert unneeded changes
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
69ad1039ba
mix tasks: add legal boilerplate
6 years ago
William Pitcock
2791ce9a1f
add license boilerplate to pleroma core
6 years ago
lambda
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
William Pitcock
34a4ed22c4
twitter api: add "Video" to supported activity types list
6 years ago
William Pitcock
79b51a97fe
twitter api: activity representer: remove peertube hack
6 years ago
William Pitcock
32dfc1d12a
mastodon api: status view: remove obsolete peertube hack
6 years ago
William Pitcock
71f6d9f418
transmogrifier: significantly rework handling of peertube videos, add test
6 years ago
lambda
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
Haelwenn (lanodan) Monnier
3aff8067e4
transmogrifier: When it’s a Video move "url" to "attachment"
6 years ago
Karen Konou
a7f07bb6e5
Implement kaniini's tweaks
6 years ago
Karen Konou
c76179419d
Renamed the things
6 years ago
Karen Konou
409ff60bf8
Fix formatting
6 years ago
Karen Konou
92362e1e22
Implement large thread filter
6 years ago
Ekaterina Vaartis
b386e560ba
Move the encryption out of kocaptcha into general captcha module
...
That way there won't be a need to reimplement it for other captcha services
6 years ago
Ekaterina Vaartis
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
kaniini
2e2030ada8
Merge branch '114_email_confirmation' into 'develop'
...
[#114 ] Email confirmation
See merge request pleroma/pleroma!546
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
8adcd1e80f
[ #114 ] Removed flash messages rendering on redirects.
6 years ago
Ivan Tashkinov
501ce34d7f
[ #114 ] Stylistic adjustments.
6 years ago
Maksim
f1b93b5be7
[ #413 ] fix parse mentions
6 years ago
kaniini
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
raeno
652f49d176
Remove extra bracket
6 years ago
raeno
7fb3780431
Merge branch 'develop' into oembed_provider
6 years ago
Ivan Tashkinov
b520d44b58
[ #114 ] `mix format`
6 years ago
Ivan Tashkinov
279096228c
[ #114 ] Made MastodonAPI and TwitterAPI user show actions return 404 for auth-inactive users
...
unless requested by admin or moderator.
6 years ago
Ivan Tashkinov
a532ad5d72
[ #114 ] User.register/1 tweak.
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
kaniini
f98ee9402f
Merge branch 'userless-admin' into 'develop'
...
Add a way to use the admin api without a user.
See merge request pleroma/pleroma!576
6 years ago
lain
f3eb414e28
Add a way to use the admin api without a user.
6 years ago
rinpatch
ef318fb8a9
Merge branch 'develop' into fix/formatter-ignore-html-chars
6 years ago
rinpatch
059dd6f681
Ignore HTML characters in formatter.ex
6 years ago
Haelwenn (lanodan) Monnier
a6dfe1fc6b
Documentation: Move generated files to priv/static/doc, add it to endpoint.ex
6 years ago
href
f58f20abbb
Twitter ActivityView: fix crash when activity content is nil
6 years ago
Ivan Tashkinov
3371a45884
[ #114 ] Formatting fix.
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
Ivan Tashkinov
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
Ivan Tashkinov
1de0aa2f10
[ #114 ] Account confirmation email, registration as unconfirmed (config-based), auth prevention for unconfirmed.
6 years ago
Ivan Tashkinov
a05cb10a95
[ #114 ] Email confirmation route, action, node setting, User.Info fields.
6 years ago
raeno
a300336459
Merge branch 'develop' into oembed_provider
6 years ago
href
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
lambda
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
Maksim Pechnikov
92a5133c42
fix text field
6 years ago
lambda
52ac7dce5c
Merge branch 'captcha' into 'develop'
...
Captcha
See merge request pleroma/pleroma!550
6 years ago
lambda
c6d5f189d9
Merge branch 'fix-tags' into 'develop'
...
Fix tagging problems for existing instances.
See merge request pleroma/pleroma!562
6 years ago
lambda
98c31deaa9
Merge branch 'test-mix-tasks' into 'develop'
...
Add tests for Mix tasks
See merge request pleroma/pleroma!555
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
lain
e4763cd459
Fix tagging problems for existing instances.
6 years ago
vaartis
35522fef09
Use :ets.match_delete to delete old captchas
6 years ago
href
77b5154c82
Cowboy handler for Mastodon WebSocket
6 years ago
raeno
cc87880488
Support both OAuth token record and token string in UserView
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
Ekaterina Vaartis
ef6829382a
Clean captchas up periodically, not schedule it after theyre created
6 years ago
Ekaterina Vaartis
3a31fdaf06
Change minutes_retained config to seconds_retained
6 years ago
Ekaterina Vaartis
6062885df6
Add a configurable auto-cleanup for captchas
6 years ago
href
5dcb7aecea
More put_view.
6 years ago
link0ff
22d483d4f7
Use bindings dbuser and dbname in sample_psql.eex
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
Ekaterina Vaartis
8d55a549e6
Replace HTTPoison with Tesla for kocaptha
6 years ago
Ekaterina Vaartis
23549d3952
Formatting fixes
6 years ago
Ekaterina Vaartis
b5518da904
Separate captcha implementation into a behaviour and use it
6 years ago
Haelwenn (lanodan) Monnier
cddab5700b
WebFinger: Sends a 400 when resource param is missing, fix XRD typo in test
6 years ago
lambda
cc6689cc20
Merge branch 'fix/views-ignore-unhandled-activites' into 'develop'
...
TwitterAPI.ActivityView: Ignore unhandled activities
See merge request pleroma/pleroma!547
6 years ago
Rin Toshaka
4a895a46d1
Allow port specification in instance.ex
6 years ago
Ekaterina Vaartis
28c43a417e
Add an ability to disabled captcha
6 years ago
Ekaterina Vaartis
a2399c1c7c
Add base CAPTCHA support (currently only kocaptcha)
6 years ago
href
e74f384b68
Merge branch 'fix/issue_433' into 'develop'
...
[#433 ] fix markdown formatting
See merge request pleroma/pleroma!545
6 years ago
href
bfe27c1b55
Merge branch '114_email_invites' into 'develop'
...
[#114 ] Email invites
See merge request pleroma/pleroma!541
6 years ago
href
acec11626d
Merge branch 'fix/issue_272' into 'develop'
...
[#272 ] fix tags
See merge request pleroma/pleroma!540
6 years ago
Maksim Pechnikov
ea72ac549b
fix case when tags is invalid
6 years ago
raeno
30812f8451
Remove domain from sample_config template
6 years ago
raeno
b0c3211984
Scrub html from activity.content or user.bio for opengraph meta
6 years ago
raeno
90b00701ff
Merge branch 'develop' into oembed_provider
6 years ago
Maksim Pechnikov
d3ec09bb38
fix tags
6 years ago
raeno
46486595ff
Handle "users/:id" links as well. Fix comments in MR.
6 years ago
href
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
Maksim Pechnikov
bc6262d250
fixed typo
6 years ago
href
84b9a9d497
TwitterAPI.ActivityView: Ignore unhandled activities
6 years ago
href
412df2cd38
Warn if push is disabled..
6 years ago
Maksim Pechnikov
baead4ea4b
fix markdown formatting
6 years ago
href
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
href
0b4c61e8d5
Fix warning
6 years ago
href
ec0e613eca
Pleroma.Activity.mastodon_notification_type/1
6 years ago
href
331396cbcd
Properly disable Web Push if no VAPID key is set
6 years ago
href
6822916183
Typos
6 years ago
href
b1bcd97a0f
Push: respect alerts settings
6 years ago
href
d8984b7bf8
Push: add missing notification_type field
6 years ago
href
7facbb2b8d
Push.Subscription: convert base64 to base64 urlsafe
6 years ago
Egor Kislitsyn
324933a0ac
improve push message format (compatibility with mastodon)
6 years ago
Egor Kislitsyn
658edb166f
fix and improve web push; add configuration docs
6 years ago
Ivan Tashkinov
69fd63e248
[ #114 ] Added `invitesEnabled` to `metadata` of nodeinfo.
6 years ago
Ivan Tashkinov
66380b0641
[ #114 ] Removed `confirm_email` action stub (to be addressed in a separate MR).
6 years ago
Ivan Tashkinov
07e93f9940
[ #114 ] Improved tests.
6 years ago
Ivan Tashkinov
9666376f5f
[ #114 ] Readded `invites_enabled` config setting, updated readme.
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
Ivan Tashkinov
f81213910f
[ #114 ] Addressed MR comments. Removed functionality to be extracted to other MRs.
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
018516d3f3
Refactor ostatus_controller, extract metatags redirection to Redirector itself. Set 'html' as default type for ostatus links
6 years ago
raeno
49c4f7d604
Set Pleroma.instance.domain when config is generated
6 years ago
raeno
9b3a6cdb07
Extract opengraph/oembed into separate module
6 years ago
raeno
d903e34cac
Add opengraph/twitter_card:summary support. Add config to toggle on/off specific metadata
6 years ago
raeno
8902942128
WIP. Implement oembed route and handle both json/xml for "Note" type activity
6 years ago
raeno
21afdf6d99
Insert meta tags into static index.html on the fly for OStatus#notice
6 years ago
lambda
b19ee62252
Merge branch 'username-underscores' into 'develop'
...
Allow underscores/dashes in usernames.
Closes #429
See merge request pleroma/pleroma!537
6 years ago
Ivan Tashkinov
9e689de063
[ #114 ] Removed `email_invite` implementation (to be addressed separately).
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
908943352f
[ #114 ] Refactored `password_reset` (moved to TwitterAPI). Added homepage links to password reset result pages.
6 years ago
href
7214d57463
Extended nicknames: allow dashes.
6 years ago
link0ff
51dd294c48
Allow to set both admin and moderator at the same time in mix task User
6 years ago
link0ff
a40ba3ba57
Fix toggle_activated in mix task User
6 years ago
href
7d9ddbe689
Allow underscores in usernames.
...
Fixes #429 .
6 years ago
Ivan Tashkinov
bfff2399ff
[ #114 ] Routes and config for `confirm_email` and `email_invite` (Twitter API).
6 years ago
Ivan Tashkinov
e3a21bcd45
[ #114 ] Addressed warnings. Fix of `with` statement clause in `password_reset`.
6 years ago
Ivan Tashkinov
f5afb11032
[ #114 ] Initial implementation of user password reset emails (user-initiated).
6 years ago
Ivan Tashkinov
12905ce1ad
[ #114 ] Added /dev/mailbox dev-only route (emails preview). Added mailer config examples.
6 years ago
Ivan Tashkinov
10c156d98f
[ #114 ] SMTP deps and config.
6 years ago
Maksim Pechnikov
89b3729afa
fix warnings
6 years ago
scarlett
213176c3c3
Add new frontend options to server-side config.
6 years ago
lain
d6bf06ab4f
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
8aa646ca31
Merge branch 'fix/mix-task-uploads-moduledoc' into 'develop'
...
Mix tasks: improve uploads.ex moduledoc
See merge request pleroma/pleroma!528
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
lambda
6786ad3d98
Merge branch 'fix/theora-detection-read-bytes' into 'develop'
...
Fix Theora detection in mime.ex
See merge request pleroma/pleroma!493
6 years ago
lambda
0554d91dcd
Merge branch 'anonymize-filter-text' into 'develop'
...
AnonymizeFilename: allow for a pre-defined text instead of random string
See merge request pleroma/pleroma!516
6 years ago
lambda
bda25b999b
Merge branch 'develop' into 'fix/mix-task-uploads-moduledoc'
...
# Conflicts:
# lib/mix/tasks/pleroma/uploads.ex
6 years ago
lain
c81c74d847
Treat warnings as errors outside of tests.
6 years ago
Maksim Pechnikov
e94c3442f4
updates
6 years ago
rinpatch
993c8c8bd4
Keep the shortdoc descriptive
6 years ago
raeno
9ba4a1c5fe
Fixes #415 . Properly handle nil and empty string by User.parse_bio
6 years ago
Rin Toshaka
cbe048bb3f
Mix tasks: improve uploads.ex moduledoc
6 years ago
Maksim Pechnikov
074fa790ba
fix compile warnings
6 years ago
Maksim Pechnikov
068353ac0b
formatting
6 years ago
Maksim Pechnikov
9442588ae9
fix hashtags in api response
6 years ago
Rin Toshaka
15616eda5e
Make uploadlimit an object that stores upload limits for avatars, banners, backgrounds, general content
6 years ago
lambda
5436aaad4f
Merge branch 'fix/add-upload.ex' into 'develop'
...
Mix Tasks: Add task uploads.ex for migrating local uploads.
See merge request pleroma/pleroma!517
6 years ago
lambda
beadeaffa1
Merge branch 'fix/nodeinfo-nil-features' into 'develop'
...
Nodeinfo: remove null features; relay feature.
See merge request pleroma/pleroma!520
6 years ago
lambda
8fa5c66eab
Merge branch 'fix/media-proxy-url-encoded' into 'develop'
...
Media proxy: fix url encoding
See merge request pleroma/pleroma!521
6 years ago
lambda
4976a8b05f
Merge branch 'fix/typo-relay-ex' into 'develop'
...
[#283 ] Mix Tasks: Fix a typo in relay.ex
See merge request pleroma/pleroma!522
6 years ago
Rin Toshaka
6c73136aec
[ #283 ] Mix Tasks: Fix a typo in relay.ex
6 years ago
href
bdc8112e40
Media proxy: fix url encoding
6 years ago
Rin Toshaka
578051809f
Add uploadlimit to Twitter API config
6 years ago
lambda
7d86c0c53f
Merge branch 'fix/gopher-respect-ip' into 'develop'
...
[#155 ] Fix Gopher server binding only to default value
See merge request pleroma/pleroma!518
6 years ago
lambda
94ac0075bf
Merge branch 'media-proxy-follow-redirect' into 'develop'
...
Media proxy: follow HTTP redirects by default
Closes #421
See merge request pleroma/pleroma!519
6 years ago
href
134cc94cbd
Nodeinfo: remove null features; relay feature.
6 years ago
href
d8fcf7c5cf
Media proxy: follow HTTP redirects by default
6 years ago
lambda
94d8f1ab30
Merge branch '394_user_tags' into 'develop'
...
[#394 ] User tags
Closes #394
See merge request pleroma/pleroma!508
6 years ago
Rin Toshaka
09f20de0d7
Make gopher respect ip
6 years ago
Rin Toshaka
fd5c7b445f
Fix a typo
6 years ago
Rin Toshaka
a02e0c18bc
Mix Tasks: Add task uploads.ex for migrating local uploads.
6 years ago
href
3b27f61ffa
AnonymizeFilename: allow for a pre-defined text instead of random string
...
Improve docs
6 years ago
href
3c925e9d88
Emojis: Alphabetical ordering
6 years ago
Ivan Tashkinov
1cea97df64
[ #394 ] Refactoring of User.tag and User.untag (removed User.tag_or_untag etc.)
6 years ago
lambda
8764f64690
Merge branch 'fix/add-user-unsubscribe-to-doc' into 'develop'
...
Add mix pleroma.user unsubscribe to mix doc
See merge request pleroma/pleroma!512
6 years ago
rinpatch
4e2250b1dd
Fix a typo in relay.ex moduledoc
6 years ago
Ivan Tashkinov
6ed5044c4e
[ #394 ] Refactoring (using Ecto.Multi; "untag" route change).
6 years ago
rinpatch
f7e23aee90
Oops
6 years ago
rinpatch
f661813807
Add mix pleroma.user unsubscribe to mix doc
6 years ago
rinpatch
08e10a70ec
Rename def to defval
6 years ago
Rin Toshaka
1d11c4cf11
add common.ex
6 years ago
Ivan Tashkinov
7a2162bbcb
[ #394 ] User view (Twitter & Mastadon API): wrapped "tags" in "pleroma" map.
6 years ago
Rin Toshaka
71d5cf9ed8
Remove unused vars from user.ex
6 years ago
Ivan Tashkinov
7bcb6a183a
[ #394 ] Refactoring.
6 years ago
Rin Toshaka
66313cda02
Update instance.ex for web push
6 years ago
Rin Toshaka
88f92693f2
Merge develop
6 years ago
Ivan Tashkinov
7b19487389
[ #394 ] Added `users.tags` and admin routes to tag and untag users. Added tests.
6 years ago
Rin Toshaka
ca7b46fb3b
Refactor common functions to common.ex
6 years ago
Rin Toshaka
4a2a7ce636
Refactor common functions to common.ex
6 years ago
Rin Toshaka
3a84511df1
remove migrate_local_uploads.ex
6 years ago
kaniini
1d531fd2f3
Merge branch 'fix/mastodon-api-settings' into 'develop'
...
Fix put_settings and remove info_changeset
See merge request pleroma/pleroma!507
6 years ago
kaniini
abead01ab6
Merge branch 'correct-and-improve-http-options' into 'develop'
...
Correct and improve http options
See merge request pleroma/pleroma!505
6 years ago
kaniini
b0adea30b3
Merge branch 're-mrf' into 'develop'
...
Add a MRF Policy for appending re: to identical subjects in replies.
See merge request pleroma/pleroma!499
6 years ago
rinpatch
2ae1128d9f
MastoAPI: Fix put_settings
6 years ago
scarlett
d27e3f269f
Rename regular expression 'have_re' to 'reply_prefix'.
6 years ago
Egor Kislitsyn
6f36e903b0
use `User.avatar_url`
6 years ago
Egor Kislitsyn
79668c08fc
cleanup
6 years ago
scarlett
3dff61ebec
Harden re: detection.
6 years ago
Egor Kislitsyn
3d492795b7
clean up
6 years ago
Egor Kislitsyn
4944498133
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/plugs/oauth_plug.ex
6 years ago
Egor Kislitsyn
bac58b1524
show warning if VAPID is not set
6 years ago
Egor Kislitsyn
8b4397c704
Merge branch 'develop' into feature/compat/push-subscriptions
...
# Conflicts:
# lib/mix/tasks/sample_config.eex
# lib/pleroma/web/twitter_api/controllers/util_controller.ex
# mix.exs
# mix.lock
6 years ago
Egor Kislitsyn
04a48286e6
Add web push support
6 years ago
scarlett
6a6aaa0e1a
Use object.normalize.
6 years ago
Hakaba Hitoyo
a09ed0f5af
avoid mix format bug
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
Hakaba Hitoyo
96ba95df2e
remove follow_redirect options
6 years ago
Hakaba Hitoyo
27792b2d77
remove pool and timeout options which duplicate with the default
6 years ago
Hakaba Hitoyo
505d820827
Merge remote-tracking branch 'origin/debug-suggestions-api' into correct-and-improve-http-options
6 years ago
kaniini
48a0315646
Merge branch 'follower-hiding' into 'develop'
...
Network hiding
Closes #356
See merge request pleroma/pleroma!490
6 years ago
Vald
194869c7db
added data attrs to twitter scrubber
6 years ago
lain
7d5720f2e4
Fix merge.
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
lain
fdac215091
TwitterAPI: Show users their own network.
6 years ago
Vald
3ccfe226c0
added data attrs for user and tag
6 years ago
Ivan Tashkinov
3b5be09f45
[ #210 ] Stylistic change.
6 years ago
lain
839526a913
TwitterAPI: Add network hiding.
6 years ago
Rin Toshaka
dfc9c08796
formating
6 years ago
Rin Toshaka
ffec96d8cc
Everything should use Mix.Task.Run
6 years ago
lambda
5f0c2372bc
Merge branch 'support/oauth_fetch_token' into 'develop'
...
[#273 ] bugfix/273
See merge request pleroma/pleroma!502
6 years ago
Ivan Tashkinov
c4f3c5e939
[ #210 ] Stylistic change.
6 years ago
Rin Toshaka
facfd03bc1
Move relay tasks to relay.ex
6 years ago
Rin Toshaka
e8ba579efe
Switch from User.info_changeset because it is deprecated
6 years ago
Rin Toshaka
c3519132df
Sorry
6 years ago
Rin Toshaka
5427d2af3a
Update mix tasks since User.info.info_changeset is deprecated
6 years ago
Maksim Pechnikov
c524c50509
fix/273
6 years ago
Rin Toshaka
9938fa3293
Merge develop to refactor/mix-tasks
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
be187f82f7
[ #210 ] Further refactoring.
6 years ago
hakabahitoyo
a418547bdf
debug /api/v1/suggestions
6 years ago
William Pitcock
956f3c75ca
user: put default user info when registering a user
6 years ago
scarlett
8a1df182cf
Add a MRF Policy for appending re: to identical subjects in replies.
6 years ago
kaniini
ec1ec32f20
Merge branch 'optional-retry-queue' into 'develop'
...
Make retry queue optional.
See merge request pleroma/pleroma!498
6 years ago
lain
925b05054f
Make retry queue optional.
...
At the moment, it can use a lot of memory really fast.
6 years ago
kaniini
114b95cee2
Merge branch 'feature/integration_tesla' into 'develop'
...
[#354 ] Move all http interactions to Tesla
See merge request pleroma/pleroma!487
6 years ago
William Pitcock
b57d83e3c9
MRF: simple policy: fix media removal
6 years ago
Rin Toshaka
6396f1b58f
change new to gen in instance.ex . Refactor user.ex
6 years ago
Ivan Tashkinov
48e6193bf2
[ #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
50e72f6c48
remove httpoison_mock
6 years ago
Maksim Pechnikov
dd8aee332c
formatting the code
6 years ago
Maksim Pechnikov
a9e4a97586
update test
6 years ago
Maksim Pechnikov
87109482f3
status_code -> status
6 years ago
Maksim Pechnikov
97252a27d9
fix http request in Salmon
6 years ago
Maksim Pechnikov
ec34de0c1f
WebSub fix test
6 years ago
Maksim Pechnikov
3ce16e5a56
init tesla and updated the http requests in Pleroma.Web.Websub
6 years ago
William Pitcock
d6ab701a14
formatting
6 years ago
William Pitcock
b3b52b58c3
activitypub: transmogrifier: remove obsolete fetch_obj_helper()
6 years ago
William Pitcock
fed9b5404c
object: rework Object.normalize() a bit to support transparent fetching
6 years ago
William Pitcock
02288b5f1c
twitterapi: fix bad rebase
6 years ago
William Pitcock
7a57db0d3a
federator: fix up contain_origin_from_id() call
6 years ago
William Pitcock
f85949cc69
object: factor out fetching functions into Pleroma.Object.Fetcher module
6 years ago
William Pitcock
e8caecb5c7
object: move object containment out of transmogrifier into it's own module
6 years ago
William Pitcock
1a360a4eaa
compact database task: fix formatting
6 years ago
William Pitcock
ef56488349
mix: add task to compact the database
6 years ago
William Pitcock
5d753e1c7c
activity: add helpers for updating activities in the database
6 years ago
William Pitcock
6f90f2c3ac
activitypub: rework thread filtering for split object view
6 years ago
William Pitcock
f168a2add6
ostatus: fix representing external objects
6 years ago
William Pitcock
cf139e3eec
activitypub: transmogrifier: ensure we send nested object in Create
6 years ago
William Pitcock
d6e65f9304
common api: fix up improper Object.normalize() calls
6 years ago
William Pitcock
d13d953385
activitypub: implement activity flattening
6 years ago
William Pitcock
57d90e7afe
activitypub: relay: fix improper use of Object.normalize()
6 years ago
William Pitcock
5ea64f4bf9
activity: minor cleanups to normalization functions to align them with the object normalizers
6 years ago
William Pitcock
5ba5df1321
object: normalize(): use object cache
6 years ago
William Pitcock
e8570758f9
twitterapi: fix remaining test failures
6 years ago
William Pitcock
3b8e5bcbeb
fix most tests
6 years ago
William Pitcock
dd66cc2ca6
ostatus: use Object.normalize() where appropriate when representing activities
6 years ago
William Pitcock
5d4a71906a
mastodon api: use Object.normalize() in a few missing spots
6 years ago
William Pitcock
e9b718cea2
mastodon api: status view: use Object.normalize()
6 years ago
William Pitcock
95a458f392
twitterapi: more object normalization work
6 years ago
William Pitcock
4482ce7e2d
activitypub: normalize objects when streaming them out
6 years ago
William Pitcock
d3fde9b5f2
ostatus: note handler: appropriately use Object.normalize()
6 years ago
William Pitcock
67038ae15e
common api: utils: access inReplyTo object ID correctly
6 years ago
William Pitcock
d6b266163b
common api: fetch visibility from normalized object
6 years ago
William Pitcock
0522b26883
gopher: use Object.normalize()
6 years ago
William Pitcock
663007b42c
activity: clean up direct use of object data
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
lambda
42ef7cd227
Merge branch 'fix-media-proxy-defaults' into 'develop'
...
Fix media proxy config defaults
See merge request pleroma/pleroma!495
6 years ago
Maxim Filippov
4b70e5eae9
Parse bio for MastodonAPI
6 years ago
rinpatch
343b0adfa6
Merge branch 'develop' into fix/theora-detection-read-bytes
6 years ago
rinpatch
a3953ca37a
Change @read_bytes to 35
6 years ago
Rin Toshaka
03b2d1016d
F O R M A T I N G
6 years ago
Rin Toshaka
57c71f8468
Move generate_invite to user.ex
6 years ago
Rin Toshaka
d924b6cd3d
Refactor copypasta to a private function in instance.ex
6 years ago
Maxim Filippov
ce98d5eb9b
Parse user's bio on register
6 years ago
Rin Toshaka
cbe22deb51
Lint fix
6 years ago
Rin Toshaka
faf1f2b304
Move gen.instance to instance.ex
6 years ago
lain
8c9a4e8b40
TwitterAPI: Implement hide_network.
6 years ago
Rin Toshaka
7983b0bdfe
Move unsubscribe user task to pleroma/user.ex. Delete unsubscribe_user.ex. Fix pleroma.user toggle_activated to work not only on local users.
6 years ago
lain
2a639de9b3
MastodonApi: Implement hide_network.
6 years ago
lain
6be0ab1e55
Hide network in ap.
6 years ago
href
43d5e4f7fa
Fix media proxy config defaults
6 years ago
lain
e3f3d13d99
Add uuid generation extension to sample_psql.eex.
6 years ago
lain
91065e1968
Fix background updating / handling.
6 years ago
Rin Toshaka
31b3ac05ac
Lint fix
6 years ago
Rin Toshaka
a8ef6b1190
Add admin option to pleroma.user new. Add user existence checking to toggle_activated
6 years ago
rinpatch
ae82852330
Move set_admin task to lib/mix/tasks/pleroma/user.ex
6 years ago
rinpatch
6f174cbb71
Delete reactivate user task
6 years ago
rinpatch
5f91d6b859
Fix toggle_deactivated to reactivate a deactivated user
6 years ago
rinpatch
fe2759bc9f
Attempt to resolve merge conflict
6 years ago
lain
f18b86fd5f
More fixes for Info schema.
6 years ago
lain
93f2dc19d9
TwitterAPI: Fix banner and background update.
6 years ago
lain
347df6421d
Fix masto api user updating.
6 years ago
lain
c443c9bd72
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
lain
1c67277c80
Fix admin api.
6 years ago
href
e9982c521b
Upload filter: anonymize filename
...
It replaces the original filename with a randomly generated string.
6 years ago
kaniini
ca24ad2a2b
Merge branch 'feature/reverse-proxy' into 'develop'
...
reverse proxy / uploads
See merge request pleroma/pleroma!470
6 years ago
href
8e0e20631c
Reverse proxy: default max read duration at 30 secs.
6 years ago
lambda
e99bab8f27
Merge branch 'config-delete' into 'develop'
...
Add Pleroma.Config.delete/1
See merge request pleroma/pleroma!484
6 years ago
href
1d94c8f0f0
Fix supervisor order
...
This starts `Pleroma.Web.Endpoint` after all other processes and may
avoid some weird bugs (especially at start/restart).
Also properly ignores starting the gopher's gen_server if disabled.
6 years ago
href
253da275bd
Pleroma.Config.delete/1
6 years ago
href
7282937f33
MIME: video/audio ogg detection
6 years ago
href
680716b3c9
Config docs
6 years ago
href
65e7307d68
Upload: bring back base_url
6 years ago
href
5d92431350
Fix deprecation warnings
6 years ago
href
02d3dc6869
Uploads fun, part. 2
6 years ago
href
97b00d366f
reverse_proxy: more headers
6 years ago
href
a2640c8088
Parse correctly content-type & do not forward content-length
6 years ago
href
b19597f602
reverse proxy / uploads
6 years ago
lain
d0ec2812bd
Merge remote-tracking branch 'origin' into validate-user-info
6 years ago
lain
8f1fffebc6
Fix transmogrifier test.
6 years ago
lain
d088ac6286
Fix OStatus user updates.
...
Breaks banner updating.
6 years ago
lain
48b95a9b95
Assorted fixes.
6 years ago
lain
d407f662af
Fix TwitterApiController.
6 years ago
lain
a6812bc9df
Remove "most recent notification" endpoint.
6 years ago
KokaKiwi
87098d1676
Streamer: Don't send unwanted DMs to list streams
6 years ago
lain
e002858071
Fix ostatus test.
6 years ago
lain
3c61df6b9e
Webfinger fixes.
6 years ago
lain
badbe2656c
More fixes.
6 years ago
kaniini
b9bc83097d
Merge branch 'ogg-theora-detection' into 'develop'
...
Add Theora detection to upload.ex
See merge request pleroma/pleroma!479
6 years ago
lain
ec464ef20a
HTTP sig fixes.
6 years ago
rinpatch
0d229613df
Fix lint error
6 years ago
rinpatch
7f20a3cf1f
Add Theora detection to upload.ex
6 years ago
Haelwenn
5ae6088d37
Merge branch 'feature/mrf-user-allowlist' into 'develop'
...
MRF: user allowlist module
See merge request pleroma/pleroma!477
6 years ago
kaniini
a76058fc1d
Merge branch 'fix/pleromafe-title' into 'develop'
...
Replace hardcoded <title>
See merge request pleroma/pleroma!476
6 years ago
William Pitcock
271f9f1335
nodeinfo: add mrf_user_allowlist data
6 years ago
William Pitcock
8c05d19c7f
MRF: add user allowlist module
6 years ago
Mark Felder
6cc94404d7
Replace this hardcoded <title>
6 years ago
Haelwenn (lanodan) Monnier
04daa0fa44
Plugs.HTTPSecurityPlug: Activate upgrade-insecure-requests only when there is https
...
This fixes running mastofe with MIX_ENV=dev
6 years ago
shibayashi
591b11eafc
Add manifest-src to allow manifest.json
6 years ago
Haelwenn (lanodan) Monnier
ca029f0b69
Web.Streamer: Get unauthenticated statuses representation
6 years ago
Haelwenn (lanodan) Monnier
d388a99143
Web.MastodonAPI.MastodonSocket: Put access_token at function-level
6 years ago
Haelwenn (lanodan) Monnier
5346fabf14
Web.MastodonAPI.MastodonSocket: Add unauthentified websocket endpoints
...
reported by soka on CRTNet
6 years ago
kaniini
675653ceb7
Merge branch 'feature/admin-api' into 'develop'
...
Add a admin API
See merge request pleroma/pleroma!366
6 years ago
kaniini
182e3e8da2
Merge branch 'feature/improve-version' into 'develop'
...
Improved version string
See merge request pleroma/pleroma!467
6 years ago
kaniini
a591a044a9
Merge branch 'runtime-fixes' into 'develop'
...
Various runtime configuration fixes
See merge request pleroma/pleroma!468
6 years ago
lain
0bea0308f1
Merge branch 'validate-user-info' of git.pleroma.social:pleroma/pleroma into validate-user-info
6 years ago
lain
d3180e0ccc
Raise on usage of old function.
6 years ago
lain
0896cf4c0f
Fix most mastodon api bugs.
6 years ago
Haelwenn
c7d08bc1cf
Merge branch 'feature/retry-queue' into 'develop'
...
Federator: add retry queue.
See merge request pleroma/pleroma!323
6 years ago
William Pitcock
3456948cd1
mastodon api: fix up quite a few test failures
6 years ago
William Pitcock
ef6c64a5d2
activitypub: fix restrict_blocked()
6 years ago
William Pitcock
c196754b4d
mastodon api: account view: fix tests
6 years ago
William Pitcock
ece8656733
streamer: fix fetching the user's block list
6 years ago
William Pitcock
3356c7d1e9
oauth plug: fix deactivated check
6 years ago
William Pitcock
4ac849cb4a
common api: fix moderator check when deleting posts
6 years ago
William Pitcock
312676f711
user: fix user.info lookup in User.locked?()
6 years ago
lain
6f0b9a5163
Fix Notification tests.
6 years ago
lain
2887f4ff1d
Fix formatter tests.
6 years ago
href
bc5cf2c192
Improved version string
6 years ago
href
7f4c3a1e99
mediaproxy: fix empty url & add some tests
6 years ago
eal
689b46efc8
RetryQueue: tiny refractor, add tests
6 years ago
href
bcecdc3ab1
Various runtime configuration fixes
6 years ago
lain
fbb70d25fe
Several twitter api fixes.
6 years ago
lain
40d9d2098c
Fix user updating from AP.
6 years ago
lain
cafa15131a
Mix format.
6 years ago
lain
4c918392c6
Fix most User tests.
6 years ago
lain
e7cd6e9739
Fix setting of keys.
6 years ago
lain
fc3bcf335e
Fix following locked users.
6 years ago
lain
d5af41b577
Fix note count update.
6 years ago
lain
6f90ceb2ed
Fix follower count test.
6 years ago
lain
812f5b058a
Fix blocking.
6 years ago
lain
756764266c
Formatting.
6 years ago
lain
b396dba425
Fix follower count setting.
6 years ago
lain
5c8f07f0a8
Fix note counting.
6 years ago
lain
47d883d3ab
Fix User deactivation.
6 years ago
lain
50585d051b
Add User.Info module
...
To validate and mutate the user.info field.
6 years ago
eal
62299be094
Federator: add retry queue.
6 years ago
William Pitcock
f6be980f4f
activitypub: object view: avoid leaking private details
6 years ago
William Pitcock
98795172a7
ostatus controller: respond with AS2 objects instead of activities to notice URIs
6 years ago
William Pitcock
dfcfb184b1
activitypub: transmogrifier: make deletes secure
6 years ago
Haelwenn (lanodan) Monnier
0ca00b3a07
Web.AdminAPI.AdminAPIController: Fixes bugs found with ExUnit
6 years ago
Haelwenn (lanodan) Monnier
44b6200103
lib/mix/tasks/relay*: Use a with block
6 years ago
Haelwenn (lanodan) Monnier
12ccf0c4f8
Change Relay from `status` to `{status, message}`
6 years ago
Haelwenn (lanodan) Monnier
4634d99d0d
Web.Router: Change right to permission group (except for function names)
6 years ago
William Pitcock
0d1375f274
federator: return :ok or :error depending on if an AP doc was accepted or not
6 years ago
William Pitcock
3d9266a8cb
federator: do origin containment when processing inbound messages
6 years ago
William Pitcock
c88533209c
activitypub: user fetching: use fetch_and_contain_remote_object_from_id()
6 years ago
William Pitcock
daa8ec3d62
activitypub: factor out AP object fetching to it's own function and add ID-based containment
6 years ago
Haelwenn (lanodan) Monnier
e0b0fde713
Web.AdminAPI.AdminAPIController: Change right to permission group (except for function names)
6 years ago
Haelwenn (lanodan) Monnier
1a31d71187
lib/mix/tasks/relay_{un,}follow.ex: Use a with block
6 years ago
Haelwenn (lanodan) Monnier
ccd6b1956d
lib/pleroma/web/admin_api/admin_api_controller.ex: Support status reply of Relay.{un,}follow
6 years ago
Haelwenn (lanodan) Monnier
7fbfd2db96
lib/mix/tasks/relay_{un,}follow.ex: Support status reply of Relay.{un,}follow
6 years ago
Haelwenn (lanodan) Monnier
265c8c5209
Pleroma.Web.ActivityPub.Relay: make {un,}follow return :ok only if it worked, :error if it didn’t
6 years ago
Haelwenn (lanodan) Monnier
4a79b89dba
lib/pleroma/plugs/user_is_admin_plug.ex: change 403 string to “User is not admin.”
6 years ago
Haelwenn (lanodan) Monnier
f9d05902fe
lib/pleroma/web/admin_api/admin_api_controller.ex: An admin cannot un-admin themselves
6 years ago
Haelwenn (lanodan) Monnier
a87ed2fad6
Pleroma.Web.AdminAPI.AdminAPIController: user_create statement format
6 years ago
Haelwenn (lanodan) Monnier
f48062488e
Add get endpoints for rights [AdminAPI]
6 years ago
Haelwenn (lanodan) Monnier
59ce7fedce
Fix connection returns make generic right endpoint [AdminAPI]
6 years ago
Haelwenn (lanodan) Monnier
c5a2bd6a65
admin_api_controller.ex: fix remaining params at once
6 years ago
Haelwenn (lanodan) Monnier
95b107b6cc
admin_api_controller.ex: Add documentation, fix get_invite_token
6 years ago
Haelwenn (lanodan) Monnier
578a911737
admin_api_controller.ex: get_password_reset: fix params and response
6 years ago
Haelwenn (lanodan) Monnier
5732eef16b
lib/pleroma/web/admin_api/admin_api_controller.ex: Pleroma.Web.AdminAPI.Controller → Pleroma.Web.AdminAPI.AdminAPIController
6 years ago
Haelwenn (lanodan) Monnier
c8b8f1d32c
[Pleroma.Plugs.UserIsAdminPlug]: Check if admin is true instead of false, fix error reporting
6 years ago
Haelwenn (lanodan) Monnier
011a2e36b1
lib/mix/tasks/make_admin.ex: New task
6 years ago
Haelwenn (lanodan) Monnier
7076d45cb6
lib/pleroma/plugs/user_is_admin_plug.ex: Create
6 years ago
Haelwenn (lanodan) Monnier
77d2fd54dd
admin_api_controller: Have some basic code
6 years ago
Haelwenn (lanodan) Monnier
ee2e1328ad
admin_api_controller.ex: Create
6 years ago
William Pitcock
603fccf175
activitypub: fetch_object_from_id(): prefer `actor` over `attributedTo` to avoid spoofing
6 years ago
kaniini
05967472f2
Merge branch 'feature/uploader-mdii' into 'develop'
...
Feature / MDII Uploader
See merge request pleroma/pleroma!454
6 years ago
hakabahitoyo
59e079f641
fallbacking into local uploader
6 years ago
hakabahitoyo
8fd0556c78
better config reading
6 years ago
lain
f87b315618
TwitterAPI: Fix dm_timeline displaying only half of the conversation.
6 years ago
lambda
2f639ea129
Merge branch 'feature/pleromafe-usersearch' into 'develop'
...
Add Twitter / Pleroma API user search
See merge request pleroma/pleroma!452
6 years ago
William Pitcock
c07464607d
http security: remove form-action from CSP definitions
6 years ago
lain
e8d8c84f79
Add better test for user search functionlity.
6 years ago
hakabahitoyo
55abd8482e
better config
6 years ago
hakabahitoyo
52224de39f
better extension detection
6 years ago
hakabahitoyo
4fbfacf5e1
debug
6 years ago
hakabahitoyo
8e707aba29
format
6 years ago
Hakaba Hitoyo
ebe658c169
debuf
6 years ago
Hakaba Hitoyo
698cb3587c
omplement mdii uploader
6 years ago
Hakaba Hitoyo
58af0787be
add mdii uploader
6 years ago
lain
27aa136aac
Format.
6 years ago
lain
7b170cd616
Add Pleroma user search api for PleromaFE.
6 years ago
lambda
cc45797f4e
Merge branch 'fix-media-proxy-filename' into 'develop'
...
media_proxy: use path only to retrieve filename
See merge request pleroma/pleroma!450
6 years ago
kaniini
69d557e86d
Merge branch 'twitter-api-direct-messages' into 'develop'
...
Twitter api direct messages
See merge request pleroma/pleroma!449
6 years ago
href
f52a1d1ec5
media_proxy: use path only to retrieve filename
6 years ago
lain
ea9a776d7b
TwitterApi: Add direct message endpoint
6 years ago
lain
2cf40237ff
MastodonAPI: Add pagination to private messages.
6 years ago
href
9b553a1087
media_proxy: CSP, content-disposition
...
* Adds CSP headers to the media proxy endpoint
* Sends `content-disposition: attachment; …` for non-image/video/audio
content types
The default list can be overwritten with `:media_proxy,
:safe_content_types` in the configuration.
* Also now appends the filename to the proxy URL (fixes some mobile apps,
it was requested a while ago)
6 years ago
shibayashi
87c76a9a2f
Add __Host- prefix when secure flag is enabled
6 years ago
scarlett
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
6 years ago
scarlett
cb6fd73861
Twitter API: Fall back to user.nickname if user has no name
6 years ago
kaniini
54923c2e55
Merge branch 'feature/csp-plug' into 'develop'
...
migrate CSP management to CSPPlug
See merge request pleroma/pleroma!441
6 years ago
William Pitcock
2829fa4183
sample config: chase http_security change
6 years ago
William Pitcock
ee5932a504
http security: allow referrer-policy to be configured
6 years ago
William Pitcock
fe67665e19
rename CSPPlug to HTTPSecurityPlug.
6 years ago
KokaKiwi
1592fa2bea
Mastodon API: Fix list streaming
6 years ago
William Pitcock
df72978dce
csp plug: add support for certificate transparency
6 years ago
William Pitcock
331cf6ada1
csp plug: add sts support
6 years ago
William Pitcock
a2bf5426cb
sample config: document how to make CSPPlug send STS headers (off by default to allow for SSL debugging)
6 years ago
William Pitcock
f516e317ea
plugs: add CSPPlug
6 years ago
William Pitcock
419ed3a0ca
oauth: fix token decode regression
6 years ago
lambda
f745e823f0
Merge branch 'bugfix/json-ld-object-sanitization' into 'develop'
...
JSON-LD: object sanitization
See merge request pleroma/pleroma!438
6 years ago
William Pitcock
97e50f3191
activitypub: transmogrifier: sanitize internal representation details from outgoing objects
...
this causes JSON-LD parsers to get upset and has also lead to developer confusion from outside
projects which tried to parse our internal data. accordingly, it seems better to just remove
it.
6 years ago
Haelwenn (lanodan) Monnier
5ecb5629f6
lib/mix/tasks: s/@doc/@moduledoc/
6 years ago
Haelwenn (lanodan) Monnier
5e3207045e
lib/mix/tasks/unsubscribe_user.ex: Fix syntax from bad line copy
6 years ago
Haelwenn (lanodan) Monnier
64c0289893
lib/mix/tasks: Add remaining documentation for mix tasks
6 years ago
Haelwenn (lanodan) Monnier
8b2541e4e7
Document the mix tasks in ex_doc instead
6 years ago
Haelwenn (lanodan) Monnier
e1814bb322
Document mix tasks
6 years ago
William Pitcock
f8310114a6
activitypub: object view: sanitize both the activity and the object when an activity is given for rendering
6 years ago
kaniini
c9c1f9dee2
Merge branch 'bugfix/ostatus-as2-reflection' into 'develop'
...
ostatus: only federate activities concerning note objects
See merge request pleroma/pleroma!437
6 years ago
kaniini
7daa102fa4
Merge branch 'bugfix/local-jsonld-context' into 'develop'
...
Host LitePub JSON-LD context locally
See merge request pleroma/pleroma!435
6 years ago
William Pitcock
4f87b8362b
endpoint: move CORSPlug in front of Plug.Static
6 years ago
William Pitcock
03a9990baf
endpoint: fix formatting
6 years ago
William Pitcock
e6d246882d
federator: don't federate anything other than Note objects to OStatus
6 years ago
William Pitcock
e4971553c7
activitypub: utils: use same object type list for mention extraction as insertion
6 years ago
William Pitcock
b3c360ce2c
notification: add fallback get_notified_from_activity()
6 years ago
William Pitcock
b9871e7e5a
activitypub: utils: wrap Note objects in a Create when extracting mentions
6 years ago
William Pitcock
8c805ada32
user: remove obsolete User.get_notified_from_activity().
6 years ago
William Pitcock
6cadfcb21e
activitypub: utils: switch to using new Notification.get_notified_from_activity().
6 years ago
William Pitcock
cdfdd77e30
notification: implement new Notification.get_notified_from_activity()
6 years ago
William Pitcock
d26cd6c1bf
user: factor out user set fetching from User.get_notified_from_activity()
6 years ago
William Pitcock
81d6ca1783
user: implement AS2 mention extraction + unify Announce handling
6 years ago
William Pitcock
6b4064fa5d
activitypub: transmogrifier: unify mention extraction
6 years ago
William Pitcock
0a2c1a3419
user: add optional local_only param to get_notified_from_activity()
6 years ago