Mark Felder
fb056ce05b
Merge branch 'develop' into refactor/discoverable_user_field
4 years ago
Egor Kislitsyn
2a475622ee
Add Pleroma.Constants.as_local_public/0
4 years ago
Egor Kislitsyn
4f79bbbc31
Add local-only statuses
4 years ago
lain
7a2f100061
ActivityPub: Show own replies to muted users.
...
Aligns mute with block behavior.
4 years ago
feld
77bca41595
Apply 3 suggestion(s) to 3 file(s)
4 years ago
feld
2013705690
Merge branch 'feature/gen-magic' into 'develop'
...
Use libmagic via majic
Closes #1736
See merge request pleroma/pleroma!2534
4 years ago
Mark Felder
b001237b79
Finish undoing API breakage
4 years ago
Alex Gleason
755f58168b
Merge remote-tracking branch 'upstream/develop' into restrict-domain
4 years ago
Mark Felder
b738f70953
Merge branch 'develop' into feature/gen-magic
4 years ago
Mark Felder
64553ebae2
Merge branch 'develop' into chore/elixir-1.11
4 years ago
Mark Felder
409f694e4f
Merge branch 'develop' into refactor/locked_user_field
4 years ago
Mark Felder
4ead0d564f
Merge branch 'develop' into refactor/discoverable_user_field
4 years ago
Mark Felder
8bacdc3680
Change user.discoverable field to user.is_discoverable
4 years ago
Mark Felder
9968b7efed
Change user.locked field to user.is_locked
4 years ago
Alexander Strizhakov
9f4fe5485b
alias alphabetically order
4 years ago
Alexander Strizhakov
66e0b0065b
Cache plug module name
4 years ago
Alexander Strizhakov
c6baa811d6
EnsureAuthenticatedPlug module name
4 years ago
Alexander Strizhakov
8c993c5f63
FederatingPlug module name
4 years ago
Mark Felder
8539e386c3
Add missing Copyright headers
4 years ago
Ivan Tashkinov
2498e569f1
Merge remote-tracking branch 'remotes/origin/develop' into ostatus-controller-no-auth-check-on-non-federating-instances
4 years ago
Ivan Tashkinov
e1eb54d389
[ #3053 ] Rollback of access control changes in ActivityPubController (base actions: :user, :object, :activity).
4 years ago
Mark Felder
04b514c567
Merge branch 'develop' into feature/gen-magic
4 years ago
Alex Gleason
3f9263fb16
Merge remote-tracking branch 'upstream/develop' into restrict-origin
4 years ago
Mark Felder
218a3e61e1
Fix incompatible types warning (Elixir 1.11)
4 years ago
Mark Felder
636c00037d
Fix duplicate @doc entries
4 years ago
rinpatch
2698bbc9f6
Merge branch 'filtering-following' into 'develop'
...
ActivityPub: Return Announces when filtering by `following`.
See merge request pleroma/pleroma!3022
4 years ago
Ivan Tashkinov
094edde7c4
[ #3053 ] Unauthenticated access control for OStatus-related controllers and ActivityPubController (base actions: :user, :object, :activity). Tests adjustments.
4 years ago
Haelwenn (lanodan) Monnier
f497eb034d
activity_pub_controller.ex: Remove unused @doc block
...
[ci skip]
4 years ago
Maksim Pechnikov
de993b856b
added `force` option to the unfollow operation
4 years ago
Haelwenn (lanodan) Monnier
5e86a2809e
transmogrifier: Drop incoming create early if it already exists
4 years ago
lain
ee3052a2d8
ActivityPub: Return Announces when filtering by `following`.
4 years ago
lain
f2f0a0260f
ActivityPub: Don't block-filter your own posts
...
We are filtering out replies to people you block, but that should
not include your own posts.
4 years ago
feld
6c052bd5b6
Merge branch 'media-preview-proxy-nostream' into 'develop'
...
Media preview proxy
See merge request pleroma/pleroma!3001
4 years ago
Steven Fuchs
f2ef9735c5
Federate data through persistent websocket connections
4 years ago
Ivan Tashkinov
a428800405
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
...
# Conflicts:
# CHANGELOG.md
4 years ago
Haelwenn (lanodan) Monnier
abf25e5d52
Create MRF.filter_pipeline to inject :object_data when present
4 years ago
Haelwenn (lanodan) Monnier
3a0f99ed35
KeywordPolicy: Still match when fields are absent
4 years ago
Ivan Tashkinov
d9fb5bc08a
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
rinpatch
eca8d26784
Merge branch 'chores/mrf-loglevel' into 'develop'
...
Fetcher: Correctly return MRF reject reason
See merge request pleroma/pleroma!2990
4 years ago
rinpatch
adbd0032fa
Merge branch 'features/validators-video' into 'develop'
...
Pipeline Ingestion: Video and Article
See merge request pleroma/pleroma!2908
4 years ago
Ivan Tashkinov
2f155fb89f
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream
4 years ago
eugenijm
3ab59a6f3c
Mastodon API: fix the public timeline returning an error when the `reply_visibility` parameter is set to `self` for an unauthenticated user
4 years ago
Mark Felder
709723182d
Ensure SimplePolicy's tags in string representation don't trip up the object validator
4 years ago
Mark Felder
c0b36621f1
Ensure we only apply NSFW Simple policy on parsable objects
4 years ago
Haelwenn (lanodan) Monnier
f1f44069ae
Fetcher: Correctly return MRF reject reason
4 years ago
Ivan Tashkinov
0bda85857e
Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy
...
# Conflicts:
# lib/pleroma/instances/instance.ex
4 years ago
Haelwenn (lanodan) Monnier
f18178cb09
AttachmentValidator: directly embed url schema and pass it fix_media_type
4 years ago
Haelwenn (lanodan) Monnier
1b3d5956b1
Pipeline Ingestion: Article
4 years ago
Haelwenn (lanodan) Monnier
2132b24a9d
object_validators: likes & announcements as [ObjectID]
4 years ago
Haelwenn (lanodan) Monnier
846b59ccb0
Pipeline Ingestion: Video
4 years ago
Haelwenn (lanodan) Monnier
b73e9ef686
transmogrifier: Call strip_internal_fields on pipeline ingestion
4 years ago
Mark Felder
55562ca936
Merge branch 'develop' into feature/gen-magic
4 years ago
Alexander Strizhakov
357d971a10
expiration for new pipeline
4 years ago
Alexander Strizhakov
93e1c8df9d
reject activity creation
...
if passed expires_at option and expiring activities are not configured
4 years ago
Alexander Strizhakov
9bf1065a06
schedule activity expiration in Oban
4 years ago
rinpatch
541a3eede2
Merge branch 'chores/remove-ostatus-fixtures' into 'develop'
...
Remove OStatus in testsuite
See merge request pleroma/pleroma!2968
4 years ago
Ivan Tashkinov
148bc24435
[ #2497 ] Removed Hackney-specific code
...
(no longer needed due to adapter options unification).
4 years ago
Mark Felder
4ee99dafcc
Merge branch 'develop' into media-preview-proxy
4 years ago
Haelwenn (lanodan) Monnier
10ef532c63
AP C2S: Restrict character limit on Note
4 years ago
Haelwenn (lanodan) Monnier
ee0e05f930
Drop unused "inReplyToAtomUri" in objects
4 years ago
Mark Felder
21efda2edb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted
4 years ago
Alibek Omarov
95688c90ad
ForceBotUnlistedPolicy: simplify code
4 years ago
Alibek Omarov
8b695c3eeb
ForceBotUnlistedPolicy: format
4 years ago
Alibek Omarov
699224a900
ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version
4 years ago
Alexander Strizhakov
696bf09433
passing adapter options directly without adapter key
4 years ago
Alexander Strizhakov
a83916fdac
adapter options unification
...
not needed options deletion
4 years ago
Ivan Tashkinov
88a6ee4a59
[ #2497 ] Func defs grouping fix.
4 years ago
Ivan Tashkinov
f170d47130
[ #2497 ] Adjusted media proxy preview invalidation. Allowed client-side caching for media preview. Adjusted prewarmer to fetch only proxiable URIs.
...
Removed :preview pool in favor of existing :media one. Misc. refactoring.
4 years ago
Mark Felder
85446cc30c
Merge branch 'develop' into media-preview-proxy
4 years ago
lain
9433311923
Merge branch 'bugfix/incoming-poll-emoji' into 'develop'
...
Fix emoji in Question, force generated context/context_id insertion
Closes #1870
See merge request pleroma/pleroma!2915
4 years ago
rinpatch
126461942b
User table: ensure bio is always a string
...
Gets rid of '|| ""' in multiple places and fixes #2067
4 years ago
Haelwenn (lanodan) Monnier
b960cede9a
common_fixes: Force inserting context and context_id
4 years ago
Haelwenn (lanodan) Monnier
a142da3e4f
Add new Emoji Ecto.Type and fix emoji in Question
4 years ago
Haelwenn (lanodan) Monnier
2ecc7d9230
transmogrifier: Remove mastodon emoji-format from emoji field
4 years ago
Mark Felder
479578b148
Merge branch 'develop' into feld-2168-media-preview-proxy
4 years ago
feld
d39abd02ac
Merge branch 'relay-fix-admin-fe' into 'develop'
...
Relay fix for admin-fe
See merge request pleroma/pleroma!2902
4 years ago
Mark Felder
4e6eb22b4a
Try to warm the cache with the preview image if preview proxy enabled
4 years ago
Haelwenn (lanodan) Monnier
36c125a071
Pipeline Ingestion: Event
4 years ago
Alexander Strizhakov
7dc275b69b
relay fix for admin-fe
4 years ago
Haelwenn (lanodan) Monnier
5316e231b0
Pipeline Ingestion: Audio (Part 2)
4 years ago
lain
3998ef9d64
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio
4 years ago
lain
548ca43bcf
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes
4 years ago
Haelwenn (lanodan) Monnier
2f8c3c842d
common_fixes: Remove Utils.make_date call
4 years ago
Haelwenn (lanodan) Monnier
c9d6638461
common_fixes: Get fixes common from Audio and Question
4 years ago
Haelwenn (lanodan) Monnier
2bc08d5573
Pipeline Ingestion: Audio
4 years ago
Haelwenn (lanodan) Monnier
7a273087ed
object_validators: Use ecto_types where available
4 years ago
Ivan Tashkinov
95529ab709
[ #2046 ] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default).
4 years ago
feld
14a06e63f6
Merge branch 'fix/activity-expirations-again' into 'develop'
...
Fix activity expirations again
See merge request pleroma/pleroma!2866
4 years ago
Haelwenn (lanodan) Monnier
4f3c955f26
side_effects: Fix typo on notification
4 years ago
lain
2e347e8286
ActivityPub: Remove `reject`, move everything to the Pipeline.
4 years ago
lain
7224bf309e
Transmogrifier: Move Rejects to the Pipeline
4 years ago
lain
500576dcb6
Linting fixes.
4 years ago
lain
25bfee0d12
ActivityPub: Remove ActivityPub.accept
...
Switch to the pipeline in CommonAPI and SideEffects
4 years ago
lain
f988d82e46
Transmogrifier: Handle accepts with the pipeline
4 years ago
lain
3f6d50111e
Linter fixes.
4 years ago
lain
da3f9b9988
Transmogrifier: Remove handling of orphaned accepts
...
This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older.
4 years ago
lain
8b1e8bec2f
AcceptValidation: Codify accept rules.
4 years ago
lain
f1a0c10b17
AcceptValidator: Add basic validator with tests.
4 years ago
lain
8f9fbc86c0
Transmogrifier: Small readability changes.
4 years ago
lain
677abbf0ee
Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again
4 years ago