fee43ae5e7
twitterapi: activity view: implement in_reply_to_screen_name using the new graph walking helper
6 years ago
f3f736afc4
activity: add helper to fetch an activity's parent
6 years ago
945ce9910d
Merge branch 'bugfix/html-scrub-comments' into 'develop'
...
html: ensure comments are correctly scrubbed
See merge request pleroma/pleroma!384
6 years ago
8613db0e3b
html: ensure comments are correctly scrubbed
6 years ago
a253c1466e
New frontend options
6 years ago
a249cbf187
Add a test for List.get_lists_account_belongs
6 years ago
e8c698af41
Add an endpoint /api/v1/accounts/:id/lists to get lists to which account belongs
6 years ago
ad3181895c
Merge branch 'bugfix/html-scrub-schemes' into 'develop'
...
lib/pleroma/html.ex: Fix scheme lists
See merge request pleroma/pleroma!377
6 years ago
595d855f0e
html scrubbing policies: restrict img tags to http/https only for mediaproxy compatibility
6 years ago
2154c5dcd8
lib/pleroma/html.ex: Use macros for valid_schemes, change config for schemes
6 years ago
582dbe5c8d
formatter: fix matching osada users
6 years ago
7562912f6a
Use maybe_direct_follow for follow imports
6 years ago
d7654c77de
lib/pleroma/html.ex: Use a function as a variable (broken for some reason)
6 years ago
50e0a9ae56
lib/pleroma/html.ex: Fix scheme lists
...
Gosh please don’t break ourselves…
Also this is copy-paste of the list in lib/pleroma/formatter.ex,
I think this should be put in a common variable, but where?
6 years ago
30efa86c05
common api: enable tag linking in markdown mode
6 years ago
eacab0fb05
Delete Tokens and Authorizations on password change
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/320
6 years ago
51eaece3ea
user: break out local cases for maybe_direct_follow
6 years ago
2c29329d39
user: local users are always AP-enabled ( closes #316 )
6 years ago
111841ad34
common api: take the combination of the subject and content for length limit enforcement
...
closes #315
6 years ago
08d5ad71b6
nodeinfo: allow opting out of MRF transparency
6 years ago
7b3fff9af8
{mastodon api, twitter api}: make the follow handshake timeout configurable
6 years ago
7f530f6f80
mastodon api: relationship view: better handle no pre-existing follow activity
6 years ago
e69faf550c
user: add wait_and_refresh() for async three-way handshake case
6 years ago
3e751496e3
mastodon api: account view: fetch follow state and use it to populate `requested` field
6 years ago
a71b822013
activitypub: always track following state for async reasons
6 years ago
8ce217776d
activitypub transmogrifier: better manage follow state
6 years ago
4f7a468659
user: only pre-create follow relationships on OStatus
...
closes #306
6 years ago
bd76d9cee6
nodeinfo: add accepted post formats to metadata
6 years ago
285ac80c36
config: allow for accepted post formats to be configured
6 years ago
52b05137c5
formatter: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
16307da311
twitterapi: frontend config: add formattingOptionsEnabled
6 years ago
b1be9415ef
Revert "Merge branch 'revert-a26d5e6b' into 'develop'"
...
This reverts commit d31bbb1cfe340ab3cb90
6 years ago
f2efc8dcfb
nodeinfo_controller: Fix JSON rendering
...
This is the last noedinfo difference from my own branch
6 years ago
28651df478
MRF Transparency
6 years ago
56d31db130
Pleroma.Web.Nodeinfo.NodeinfoController: Further transparency, breaks API of previous one
6 years ago
8226953f1d
[Pleroma.Web.Nodeinfo.NodeinfoController]: Transparency on MRF Simple
6 years ago
4f03bb2299
Merge branch 'bugfix/fix-mrf-reject-match' into 'develop'
...
activitypub: fix error condition match
See merge request pleroma/pleroma!365
6 years ago
4db1bc2c0e
activitypub: fix error condition match
6 years ago
a3cffd3566
formatter: Stop using phoenix HTML and format it ourselves
...
* Pheonix has an extra scheme whitelist conflicting with ours
* Pheonix doesn’t seems to do URL encoding, just HTML encoding
Closes: https://git.pleroma.social/pleroma/pleroma/issues/307
6 years ago
34b6d444d6
Merge branch 'feature/twitter_api/fields' into 'develop'
...
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
See merge request pleroma/pleroma!360
6 years ago
82b57ebad1
[Pleroma.Web.TwitterAPI.UserView]: Add mastodon-fields in "fields"
6 years ago
707077edde
activitypub: don't fall back to OStatus fetching when MRF rejects an object
6 years ago
5c312ad677
activitypub inbox: only accept unsigned/invalid-signature relayed creates, nothing else
...
although the previous handling assumed any unsigned/invalid signature message was a Create,
lets make it more explicit
6 years ago
c739737998
transmogrifier: get_actor called without casting attributedTo in actor and actor is nil
6 years ago
9446b02bdf
transmogrifier: Just make attachement maps into a list and reroll
6 years ago
e53da692fb
transmogrifier: Use the correct variable and prefer inspect in case of a bad type being passed on
6 years ago
d830a243a3
transmogrifier: more robustly handle dereferencing pointer URIs
6 years ago
4c3a80de96
transmogrifier: Use oneliners when applicable
6 years ago
ed8dfa3029
transmogrifier: reformat `cond` block by hand
6 years ago
eebe33e86a
transmogrifier: Add support for array-less hashtags, add broken announce, harden get_actor
6 years ago
f3291acc91
transmogrifier: pro-actively add support for Hashtag without array in tag
6 years ago
22927f3a34
transmogrifier: Use a cond, add proactive support for arrays
6 years ago
0aac72f1d3
[Pleroma.Web.ActivityPub.Transmogrifier]: quick fix when tag is a Map
6 years ago
28e8a8ab36
[Pleroma.Web.ActivityPub.Transmogrifier]: fix emoji in tag when it’s not in a array [kroeg]
...
Also simplified the code for name trimming.
And not copying the Map.merge part as it looks buggy.
See: https://queer.hacktivis.me/objects/a9f21ebc-9a12-4a6c-89d5-3d46955c6ee8
6 years ago
f8a0cb9c0b
[Pleroma.Web.ActivityPub.Transmogrifier]: fix when attachment contain is just a Map [kroeg]
6 years ago
a4abb124ea
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix when inReplyTo is a inlined post [kroeg]
6 years ago
523757be52
[Pleroma.Web.ActivityPub.ActivityPub]: Harden getting endpoints [kroeg]
6 years ago
f77ec96707
Uploaders.S3: Replace unsafe characters in object key
...
According to [the S3 docs][s3], the characters safe for use in object keys are:
* 0-9
* a-z
* A-Z
* !
* -
* _
* .
* *
* '
* (
* )
(The / character is not listed but mentioned being safe outside of the list.)
Several characters that are valid in filenames can cause problems, for example
spaces are not valid in URLs and need to be escaped,
sequences of spaces can become squeezed by S3,
some characters like \ are documented to require “significant special handling”.
To avoid these problems, this change encodes the filename
before using it as part of the S3 object name
by replacing all characters except those documented as “safe” with dashes.
[s3]: https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingMetadata.html
6 years ago
d94ee5cd50
Mastodon API: Support push subscription CRUD
6 years ago
c2d592c9c5
Assign token to connection
6 years ago
7f0e291483
html: twittertext: add missing catchall scrub function
6 years ago
56577d8b48
twitter api: add no_rich_text option to userview for account prefs
6 years ago
df00a364fb
mastodon api: formatting
6 years ago
c2b69798dd
twitter api: add support for disabling rich text
6 years ago
958e085acb
mastodon api: add support for user-supplied html policy
6 years ago
2f5b026548
twitter api: add support for user-specified html policy
6 years ago
735cdfb848
user: add User.html_filter_policy()
6 years ago
8ae9424edb
html: default to using normal scrub policy if provided scrub policy is nil
6 years ago
4cb6331843
Merge branch 'feature/dynamic-user-refresh' into 'develop'
...
user: implement dynamic refresh of profiles
See merge request pleroma/pleroma!350
6 years ago
0fe165165f
Merge branch 'task-204-on-options-request' into 'develop'
...
Return 204 response on options request
See merge request pleroma/pleroma!347
6 years ago
8e28e8a18f
mix: remove fix_ap_users task, now obsolete
6 years ago
c9f6eb9a41
user: implement dynamic refresh of profiles (gets rid of need for fix_ap_users task)
6 years ago
40c51f118f
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.5.0
6 years ago
f74725df41
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Remove unused variables
6 years ago
33a1e92584
[Pleroma.Web.Router]: Fake /api/v1/endorsements
6 years ago
a8eaecadee
[Pleroma.Web.MastodonAPI.AccountView]: relationship.json: fake endorsed value (false)
6 years ago
43d0b7bf7a
[Pleroma.Web.MastodonAPI.StatusView] add replies_count
6 years ago
c9585ec007
twitter api: fix mimetype fallback when attachments use a URI instead of a URL object
6 years ago
0cac493fdc
mastodon api: default attachment type to image if one is not present
6 years ago
f4fcea5258
Revert "Mastodon API: Fake support for loading filters"
...
This reverts commit c1d07da4e16e030129fb
6 years ago
9b0f2d572b
Return 204 response on options request
6 years ago
a7d0ecdc7c
html: add policy which transforms inline images to pass through the media proxy
6 years ago
cd13fa17fd
html: allow scrubbing policies to be stackable
6 years ago
342ed84446
MRF: add policy for normalizing HTML markup (local and remote) to a specific policy
6 years ago
95376ac1fe
html: add the ability to override the default scrub policy
6 years ago
c2650f0ffb
Merge branch 'feature/html-scrub-policy' into 'develop'
...
html scrub policy
See merge request pleroma/pleroma!339
6 years ago
39aed5348a
Add visible_in_picker to status emojis
6 years ago
d3248e13e3
activitypub: transmogrifier: allow profile updates from bots
6 years ago
e0b8c0ccba
MRF: reject non-public: use pattern match to remove unnecessary if block
6 years ago
88094c266d
MRF: simple policy: refactor module to use guards and pattern matching
6 years ago
97253df3ee
MRF: simple policy: contain media removal/nsfw ops to create activities only
6 years ago
e82ce2a4b3
formatting
6 years ago
358f88e10a
html: allow inline images by default (because of custom emoji)
6 years ago
40e2f6e500
html: add default scrubbing profile and configuration knobs
6 years ago
ac486fc59b
everywhere: use Pleroma.HTML module instead of HtmlSanitizeEx directly
6 years ago
255f46d7ab
html: new module providing a configurable markup scrubbing policy
6 years ago
801d645c6b
TASK: Fix formatting
6 years ago
b79c126ee0
Add missing URL encoding in create authorization redirect
6 years ago
4e1bb7bccb
make limit for /api/v1/suggestions
6 years ago
045953225e
Merge branch 'moonman/pleroma-sha512-crypt' into 'develop'
...
auth overhaul and legacy GS auth
See merge request pleroma/pleroma!331
6 years ago
530561a091
Merge branch 'add-secure-and-samesite-cookie-flags' into 'develop'
...
Add Secure and SameSite cookie flags
See merge request pleroma/pleroma!302
6 years ago
3e4f39116b
Merge branch 'feature/custom_media_url' into 'develop'
...
[Pleroma.Uploaders.Local]: Add configuration for custom url path
See merge request pleroma/pleroma!318
6 years ago
c1d07da4e1
Mastodon API: Fake support for loading filters
6 years ago
619f67768a
Mastodon API: Add unsupported attributes to relationship responses
...
These attributes are documented as required by the Mastodon API.
Since we don’t support them (I think?), respond with default values.
6 years ago
70163aec9b
Add LegacyAuthenticationPlug to router.
6 years ago
44b094908c
Update legacy passwords automatically.
6 years ago
3aba585e7a
Add Plugs to router.
6 years ago
e601165426
Add UserEnabledPlug.
6 years ago
5ce1ebb179
Add SetUserSessionIdPlug.
6 years ago
4a3dbd9d4e
Merge branch 'fix/sign-in-with-toot' into 'develop'
...
Fix sign-in and sign-out with Toot!
See merge request pleroma/pleroma!306
6 years ago
636ad3e155
Add new plugs to router.
6 years ago
12bc73dd28
Add EnsureUserKeyPlug, smaller fixes
6 years ago
32465b9939
Simplify AuthenticationPlug
6 years ago
9a96c93be7
Add SessionAuthenticationPlug.
6 years ago
a3f54fca4d
Add LegacyAuthenticationPlug
6 years ago
3cf17dc402
Add EnsureAuthenticatedPlug
6 years ago
faf5347748
Add UserFetcherPlug.
6 years ago
42bd985e66
Add BasicAuthDecoderPlug
6 years ago
8b020e03a6
change cond to if else
6 years ago
1a8bc26e52
auth against sha512-crypt password hashes, upgrade to pbkdf2
6 years ago
76c67a41c1
Merge branch 'develop' into 'feature/staff-discovery-api'
...
# Conflicts:
# lib/pleroma/web/nodeinfo/nodeinfo_controller.ex
6 years ago
9a21ff5f61
nodeinfo: add staffAccounts field to metadata
6 years ago
1c9e539b47
Merge branch 'feature/mastodon_api_2.4.x' into 'develop'
...
Add/Fix Mastodon endpoints for 2.4.3 compatibility
See merge request pleroma/pleroma!266
6 years ago
b1124f1605
report chat and gopher support at /nodeinfo/2.0.json
6 years ago
b61430163b
user: add moderator_user_query()
6 years ago
7ca2a2ddea
Merge branch 'nil-bio-emojis' into 'develop'
...
add nil clause for Formatter.get_emoji/1 to return an empty result
Closes #274
See merge request pleroma/pleroma!315
6 years ago
35515cfa66
Update mastodon_api_controller.ex
6 years ago
26f8697400
Update mastodon_api_controller.ex
6 years ago
2b2bd0e047
Render notification IDs as strings, not numbers
6 years ago
4257f784bc
sloop around get_emoji/1 to check is_binary and have a fallthrough
...
default that returns empty
6 years ago
754deb26dd
[Pleroma.Uploaders.Local]: Add configuration for custom url path
...
One use-case being an external caching proxy
6 years ago
b7923aa304
Merge branch 'hotfix_broken_likes' into 'develop'
...
hotfix for broken like completely breaking the notifications API
See merge request pleroma/pleroma!284
6 years ago
834515fb51
formatter: don't add XSS emoji
6 years ago
3c7280934e
Merge branch 'security/activitypub-spoofing' into 'develop'
...
security: activitypub spoofing
See merge request pleroma/pleroma!321
6 years ago
03e92977cb
transmogrifier: fix peertube/plume actor handling
6 years ago
0b2c051a04
activitypub: fix possibility of spoofing by containing remote objects to the same domain as their actor
6 years ago
e2ce0e9e05
run `mix format`.
6 years ago
84d84e4ca4
OAuth: Support /revoke endpoint for revoking tokens
...
(for compatibility with Mastodon)
6 years ago
ad2a7972e7
OAuth: Set `created_at` in token exchange response
...
(for compatibility with Mastodon)
6 years ago
b60d232719
AccountView: `sensitive` is supposed to be a boolean, not a string
6 years ago
c921d99898
config: add ability to disable Pleroma FE config management ( closes #276 )
6 years ago
2e2f458705
Merge branch 'lanodan/code-dup_in_mastoapi_search' into 'develop'
...
Clean code duplication in MastoAPI search(v1/v2)
See merge request pleroma/pleroma!316
6 years ago
0c2a0e3551
Specify default scope in verify_credentials
...
Certain Mastodon/Pleroma front ends call verify_credentials to get the
default scope of a new toot.
Currently, Pleroma hardcodes this value to "public".
This patch changes it to the user's default_scope value.
6 years ago
8885d16e1b
[Pleroma.Web.MastodonAPI.MastodonAPIController].search(2)?: Remove code duplication
6 years ago
a9c0f395cb
add nil clause for Formatter.get_emoji/1 to return an empty result
6 years ago
58539e1357
Revert "Merge branch 'feature/rich-text' into 'develop'"
...
This reverts merge request !309
6 years ago
856b5e1ca4
config: chase pleroma-fe updates from MR pleroma-fe!324.
6 years ago
a26d5e6b2a
Merge branch 'feature/rich-text' into 'develop'
...
rich text support
See merge request pleroma/pleroma!309
6 years ago
6aa65b68b8
common api: add support for formatting messages outside of twitter-style plain text
6 years ago
e838969495
Merge branch 'use-media-proxy-in-suggestions-api' into 'develop'
...
use media proxy for the suggestions api
See merge request pleroma/pleroma!305
6 years ago
65e8d47cfb
Merge branch 'backendhack' into 'develop'
...
Flexible Storage Backends
See merge request pleroma/pleroma!304
6 years ago
adffad5502
increase uploader behaviour documentation accuracy.
6 years ago
af01f0196a
Add backend failure handling with :ok | :error so the uploader can handle it.
...
defaulting to :ok, since that's the currently level of error handling.
6 years ago
29b5e30c46
activity: drop recipients_to/recipients_cc fields
6 years ago
de9acebbf3
activitypub: use jsonb query for containment instead of recipients_to/recipients_cc.
6 years ago
ddc6f32b75
Fix Mastodon API when actor's nickname is null
6 years ago
cce9d008f9
streamer: contain list updates in the same way as we do with the database query
6 years ago
ded9091206
mastodon api: use bounded AP object graph query to enforce containment of private statuses
6 years ago
643fae6e36
activitypub: allow querying the activity/object graph bounded to a specific to/cc set
6 years ago
81673b8136
activity: add recipients_to and recipients_cc fields
6 years ago
d424e9fa5f
fix S3 ref in sample config to generate proper path.
6 years ago
ab9e5d64d6
add a sample swift config
6 years ago
2ff25ac0ce
A hobbldey-working swift client.
...
apparently, all elixir openstack libraries are trash
luckily, the APIs are stupid easy.
6 years ago
9fc20ed572
works now, tested with profile photo upload on local backend.
6 years ago
dad39b24a1
add the behaviour, work on actually making it work.
6 years ago
18ad8aaecf
Explicitly set 'http_only' to true
6 years ago
8d2d7a8859
Implement uploader behaviour
...
run formatter <#
6 years ago
4656a07e9e
Set SameSite flag to 'Strict'
6 years ago
6cbfb5ab5d
use media proxy for suggestions api
6 years ago
0df558a6a5
cleaning up a bit.
6 years ago
709816a0f8
example of flexible storage backends
6 years ago
d22f66655b
upload: formatting
6 years ago
1596185ac6
upload: add the S3 support itself
6 years ago
03c35e579b
sample config: add S3 public endpoint option
6 years ago
86c007ddd2
upload: strip exif data before finalizing the file path
6 years ago
e95d958b52
sample config: show how amazon s3 support is activated, including third-party clones like wasabi
6 years ago
0c4493f144
Fix formatting
6 years ago
b9a642da1e
Add Secure and SameSite cookie flags
6 years ago
0f1c629d65
better solution, added test.
6 years ago
6973b77e94
[Pleroma.Web.MastodonAPI.FilterView] fix expires_at being a unsafe variable
6 years ago
9bddb39ff0
[Pleroma.Web.MastodonAPI.FilterView]: expires_at should be null when N/A
6 years ago
d571a571fe
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Bump mastodon_api_level to 2.4.3
6 years ago
6e030129fb
[MastodonAPI] Add filters
6 years ago
a5adb251ab
[Pleroma.Web.MastodonAPI.AccountView]: Add fields support
6 years ago
d008f2d69c
[Pleroma.Web.MastodonAPI.AccountView]: Add bot field
6 years ago
97e20d2932
[MastodonAPI] the tag field isn’t fixed to a static type in pleroma
6 years ago
83efaa3af6
[MastodonAPI] Add streaming of hashtags
6 years ago
5dd6542db5
formatting
6 years ago
1089d3658e
user: fix up notification last calculation [NOT related to upstream]
6 years ago
46c7c2380c
Merge branch 'feature/relay' into 'develop'
...
message relay
Closes #144
See merge request pleroma/pleroma!264
6 years ago
440b459cd1
Merge branch 'bugfix/announce-timeline-flooding' into 'develop'
...
activitypub: filter destination list for announce activities differently than normal (closes #164 )
Closes #164
See merge request pleroma/pleroma!227
6 years ago
63094cfd3e
Merge branch 'feature/emoji-in-local-users' into 'develop'
...
Add emoji to local user profiles.
Closes #202
See merge request pleroma/pleroma!271
6 years ago
bc3c30430e
fix formatting
6 years ago
1ad5cbed51
Merge branch 'bugfix/common-api-visibility-orphan' into 'develop'
...
common api: properly handle replying to orphaned threads
See merge request pleroma/pleroma!299
6 years ago
741c6ad671
common api: handle replying to orphaned threads
6 years ago
c9e4c45e0e
Merge branch 'login-with-email' into 'develop'
...
When logging in, try treating the login as an email
Closes #245
See merge request pleroma/pleroma!295
6 years ago
0f5bff8c66
Merge branch 'develop' into 'feature/relay'
...
# Conflicts:
# lib/pleroma/web/activity_pub/utils.ex
6 years ago
946a0769c4
remove unused settings from /api/statusnet/config
6 years ago
540cce5d10
When logging in, try treating the login as an email
...
Closes #245
6 years ago
ffa552f1a4
Merge branch 'feature/twitterapi-object-description' into 'develop'
...
twitter api: provide object descriptions as attachment description field
See merge request pleroma/pleroma!293
6 years ago
aab2bdddf4
twitter api: provide object descriptions as attachment description field
6 years ago
290798b821
http: fix TLS server name indication
...
by default, hackney only sent TLS server name indication if TLS was locked
to TLS 1.2.
since there are many instances out there not speaking TLS 1.2, it is not
acceptable to lock SNI to TLS 1.2.
closes #261
6 years ago
be7a6db1f5
Merge branch 'bugfix/formatter-single-char-nicks' into 'develop'
...
formatter: fix single char local nicknames
Closes #163
See merge request pleroma/pleroma!290
6 years ago
9ded0ee1a5
Merge branch 'config/fe-collapse-subject' into 'develop'
...
fe config: add collapse_message_with_subject fe option
See merge request pleroma/pleroma!289
6 years ago
3e10d13909
formatter: adjust regexp captures to match local users with single character nicknames ( closes #163 )
6 years ago
09cb402203
fe config: add collapse_message_with_subject fe option
6 years ago
ba6e3eba33
Move invite task to pleroma namespace
...
Some other minor changes were made to make it consistent with the behavior of
other tasks both within Pleroma and the conventions set by dependencies such as
Phoenix. Namely, the task is named `gen.invite` and `IO.puts` has been replaced
with references to `Mix.shell()` where appropriate.
6 years ago
8a1dc0de92
Refactor Mix tasks
...
1. Move Mix tasks into a `pleroma` namespace, to avoid
collisions with dependent packages.
2. Rename and condense tasks into two `pleroma.user` and
`pleroma.gen.instance` tasks for consistency with Hex and Phoenix.
3. Add additional functionality to the tasks to make them more
user-friendly. Arguments with sensible defaults were demoted to flags
and in the interactive `generate_config` (renamed to
`pleroma.gen.instance`), flags were added to allow non-interactive
use, though interactive use remains the primary interface. That task
also now prompts the user for database parameters.
4. Documentation has been added to both tasks such that `mix help` now
shows useful information.
5. Finally, use of IO.puts in tasks has been replaced with Mix.shell()
equivalents to make the behavior more consistent with Mix tasks in
other packages, and such that variables like MIX_QUIET are respected.
The only exception is in `mix pleroma.user reset_password`, wherein
the URL must always be printed regardless of the value of MIX_QUIET
since that's its entire purpose.
6 years ago
bf9f68b681
debug
6 years ago
a909fe45a6
formatting
6 years ago
52b44184b4
transmogrifier: reject activities lacking a valid ID
6 years ago
9b046d2a84
fixed notifications API completely breaking if there's a like for
...
missing (deleted) post.
6 years ago
d5bdd55b5d
[Pleroma.Web.TwitterAPI.UserView]: Do not fail if user.bio is nil
6 years ago
5dde6e4a00
[Pleroma.Web.MastodonAPI.StatusView] Fix rendering peertube videos
6 years ago
f6b06d2ac8
Merge branch 'feature/peertube_2' into 'develop'
...
rebase/update of feature/peertube
See merge request pleroma/pleroma!217
6 years ago
a6d4cc8917
Merge branch 'sanitize-bio' into 'develop'
...
mastodon api: sanitize the bio HTML
See merge request pleroma/pleroma!282
6 years ago
046741c60d
[Pleroma.Web.MastodonAPI.StatusView] Support Peertube Video titles
6 years ago
f5b056e3ce
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix likes
6 years ago
3b8ef24532
Fix attachement rendering
6 years ago
a6b021a52b
Render peertube videos in mastodon.
6 years ago
c381d0b577
Use activitypub to fetch posts.
...
This falls back to ostatus.
6 years ago
74c74decf5
Basic peertube support.
6 years ago
ef4f982e2c
Pleroma.Web.ActivityPub.Transmogrifier: Fix actor being a list of objects (Peertube)
6 years ago
1495d04789
fix test for converting bio \r\n to <br>.
6 years ago
cdb3dd48ab
Format
6 years ago
5debd7b5cc
Twitter API: Support Mastodon-style bios
...
(multi-line, with links, and user mentions)
6 years ago
175f0bebbc
mastodon api: sanitize the bio HTML
6 years ago
c1b8a6a73b
Merge branch 'feature/formatter-consistent-hashtag-mentions' into 'develop'
...
formatter: consistent presentation of hashtags and mentions
See merge request pleroma/pleroma!280
6 years ago
c033d2004b
formatting
6 years ago
145546e52a
common api: format hashtags in the same way as we format mentions
6 years ago
f1c407e777
Merge branch 'fix/redirect-on-user-fetch' into 'develop'
...
ActivityPub: follow redirects when fetching user
See merge request pleroma/pleroma!278
6 years ago
51a21284c6
ActivityPub: follow redirects when fetching user
6 years ago
6698749073
Fix typo in app creation response
...
Mastodon sends redirect_uri (singular), so should Pleroma.
6 years ago
a3ef2ebb35
mastodon api controller: client_name, not name
6 years ago
b5a92b1199
mastodon api: add undocumented fields to json response, return app id as string like mastodon itself does
6 years ago
183ccd1812
Merge branch 'dev-lanodan-url-regex' into 'develop'
...
lib/pleroma/formatter.ex: Fix URL regex
Closes #127
See merge request pleroma/pleroma!69
6 years ago
c004b6ea0a
Merge branch 'mastofe/system-font' into 'develop'
...
Mastodon frontend: Use system font
See merge request pleroma/pleroma!247
6 years ago
5fbb14f5ec
Merge branch 'bugfix/federation-kroeg' into 'develop'
...
fix federation with kroeg
See merge request pleroma/pleroma!272
6 years ago
38361e7b5e
Merge branch 'fix/put-repeats-at-activitypub-outbox' into 'develop'
...
Fix: Output repeats at ActivityPub outbox
Closes #191
See merge request pleroma/pleroma!175
6 years ago
8dc715b30b
Merge branch 'fix/normalize-file-extension' into 'develop'
...
Normalize file extension for uploaded files
Closes #218
See merge request pleroma/pleroma!233
6 years ago
9908cf8fda
Merge branch 'feature/suggestions-api-with-third-party-recommendation-engine' into 'develop'
...
Feature / Suggestions API with third party recommendation engine
See merge request pleroma/pleroma!254
6 years ago
f446e75577
activitypub: transmogrifier: add necessary translations for kroeg
6 years ago
92caa2632b
Use Image type for emoji icons.
6 years ago
1ed1ff17a4
ActivityPub user view: include tag if present.
6 years ago
f9d13558c8
CommonAPI: add emoji to user source data on update
6 years ago
8c0c930041
formatting
6 years ago
ffd9ad1f0c
Fix for elixir 1.7.
6 years ago
13440a80e1
Merge branch 'feature/invites' into 'develop'
...
Invites
Closes #108
See merge request pleroma/pleroma!208
6 years ago
1e9d152d60
Update generate_invite_token.ex
6 years ago
9de6145737
Merge branch 'fix/remote-follow-errormessage' into 'develop'
...
Remote follow: don't show confusing error if already following
See merge request pleroma/pleroma!267
6 years ago
ae9c4983d7
Merge branch 'bugfix/gopher-empty-lines' into 'develop'
...
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
See merge request pleroma/pleroma!270
6 years ago
e81f788cb8
Merge branch 'emoji-in-account-view' into 'develop'
...
Render emoji in user profiles
See merge request pleroma/pleroma!265
6 years ago
af30f3f648
lib/pleroma/gopher/server.ex: Fix errorneous empty lines
6 years ago
e7b00f202f
fix gopher server informational messages
...
some gopher clients did not accept those lines due to a missing tab
6 years ago
db5cdfa333
Remote follow: don't show confusing error if already following
6 years ago
37b802682c
HTML-sanitize usernames before emojifying.
6 years ago
ed9738e031
Add tests for emoji in user profiles
...
Also use the correct field in TwitterAPI...
6 years ago
cee63ad3f7
TwitterAPI user view: add screen_name_html and description_html.
6 years ago
c2d1a5e9c4
MastoAPI AccountView: render profile emoji.
6 years ago
59b42531a3
Merge branch 'bugfix/duplicate-follow-requests' into 'develop'
...
user: filter out duplicate follow requests
Closes #228
See merge request pleroma/pleroma!263
6 years ago
d91fd48edf
user: do not leak virtuals in account search
6 years ago
ecfd4b2106
user: hide virtual actors from statistics queries
6 years ago
de6be63b1b
activitypub: do not show observable effects of non-public boosts
6 years ago
5202d4ce10
relay: do not relay in test mode
6 years ago
0ca9b9ff96
run mix format
6 years ago
5abf9ad602
relay: reintroduce @allow_relay
6 years ago
1e1a29f084
activitypub: relay: fix up AS2 actor object
6 years ago
e49131bb72
relay: move to /relay endpoint from / due to webapp issues
6 years ago
2b628f2341
relay: only relay create activities
6 years ago
ae3cb652b6
user: set up a valid followers address to use
6 years ago
56dc8db582
activitypub: relay: add relay following/followers collection URLs
6 years ago
1c40a631e8
federator: actually relay the public activities
6 years ago
f9b0fc4ddb
relay: remove @allow_relay for the moment
6 years ago
266b314051
relay: fix invoking federator, use a timer to sleep the mix task to force a context switch
6 years ago
99be3d3dcc
relay: add relay follow/unfollow tasks
6 years ago
1c90f88393
user: remote actors can have no nickname if they are virtual services
6 years ago
7bed350a23
config: allow relaying to be disabled
6 years ago
b7ca7f282a
activitypub: refactor relay concerns into new relay module
6 years ago
00e890264c
activitypub: represent relay actor at instance root
6 years ago
4807a52284
user: support creating an actor which represents the instance itself
6 years ago
275c42e438
user: filter out duplicate follow requests
6 years ago
0ee29994a5
formatter: preserve case of hashtags
...
when generating hashtag links, we used the casefolded version that we use in
the link URLs, instead of the original version.
accordingly, adjust the formatter to use the original text for the links, while
keeping the casefolded version for the URLs.
6 years ago
f72cfada1a
add suggestions/web config
6 years ago
3be58ad34e
activitypub: actually send digest header when federating
...
this is needed for backwards compatibility with non-digest pleroma instances
6 years ago
d5091c3175
Allow additionnal schemes in the config
6 years ago
8da406afa2
activitypub: verify remote http signature digests by recomputing the digest and replacing the digest header
6 years ago
2890aef9e8
activitypub: add digest header to outbound messages and sign it
6 years ago
3623504e5d
[Pleroma.Formatter]: Add support for non-HTTP schemes in URIs
...
The call to the regex in add_links is there just to be sure it’s a legal URI, it can be removed if you want to get more performance.
The URI Schemes list is sorted, but with http(s) at the start (in case it might make it faster for common links).
Closes: https://git.pleroma.social/pleroma/pleroma/issues/127
6 years ago
bc2668bb63
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
cc9c062b55
merge
6 years ago
41b0ecef95
Merge branch 'tests/plume' into 'develop'
...
Articles/Notes with a actor list outside object
See merge request pleroma/pleroma!252
6 years ago
54963a6379
Merge branch 'bugfix/activitystreams-notice-urls' into 'develop'
...
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
Closes #206
See merge request pleroma/pleroma!251
6 years ago
6f23fb53d3
Merge branch 'feature/fe-configuration' into 'develop'
...
serverside frontend configuration
See merge request pleroma/pleroma!256
6 years ago
b12d17d2ce
configurable timeout
6 years ago
e4dd58307a
better configuration
6 years ago
b23630076f
TwitterAPI: present pleroma frontend config in API
6 years ago
cf219b6add
config: make instance description configurable
6 years ago
5b4a21317d
correct error message
6 years ago
8ff336e02a
debug
6 years ago
2b7b1b3e6b
add suggestionsThirdPartyEngine into /nodeinfo/2.0.json
6 years ago
d76f0d87be
do nothing if configuration is skipped
6 years ago
df3233e7e7
improve getting host name
6 years ago
99c0252314
mastodon api: support descriptions in media api, add PUT endpoint for updating metadata about a media upload
6 years ago
cd19d37a90
mastodon api: use object name as alt text
6 years ago
f10291a1d3
upload: use generic Document object type instead of Image (mastodon compatibility)
...
Mastodon does not use the object name as alt text when the object is an Image.
6 years ago
e7c580828c
format
6 years ago
2eeaf01627
id field
6 years ago
127882a5d5
configurable
6 years ago
eb0afda3a7
http access to third party user recommendation
6 years ago
5469fb9561
Merge remote-tracking branch 'upstream/develop' into feature/filter_exif
6 years ago
3812b627ca
better mock /api/v1/suggestions
6 years ago
4a21c1b343
mock /api/v1/suggestions
6 years ago
f944f8157a
/api/v1/suggestions endpoint
6 years ago
7501481db4
[Pleroma.Web.ActivityPub.Transmogrifier] Add Person finding
6 years ago
8472fba2a7
[Pleroma.Web.ActivityPub.Transmogrifier]: Fix actor key outside of object
...
The code here is copied from feature/peertube by lain.
Co-authored-by: lain <lain@soykaf.club>
6 years ago
0899588e4d
ostatus: return AS2 objects on /notice and /activities URLs like with /objects.
6 years ago
d93789dfde
Merge branch 'feature/object-normalization' into 'develop'
...
object normalization
See merge request pleroma/pleroma!238
6 years ago
ceffb91065
Merge branch 'feature/mediaproxy-nodeinfo' into 'develop'
...
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
Closes #229
See merge request pleroma/pleroma!235
6 years ago
b1fcfcfae1
Merge branch 'bugfix/activitypub-object-actor' into 'develop'
...
activitypub: more robustly handle object-to-actor associations
See merge request pleroma/pleroma!250
6 years ago
590d4df77c
activitypub: more robustly handle object-to-actor associations
6 years ago
b832df1e15
formatting
6 years ago
f03e57f764
twitter api: activity representer: add summary field for testsuite
6 years ago
152a526237
twitter api: refactor activity html generation, add support for Articles
6 years ago
3b799f22b7
twitterapi: activity view: expose message summary text
6 years ago
b806aa36c8
Update nodeinfo_controller.ex
6 years ago
fe4387077a
Merge branch 'feature/default-scope' into 'develop'
...
default scope setting
See merge request pleroma/pleroma!239
6 years ago
4a922305af
Merge branch 'feature/article-support' into 'develop'
...
article support (plume, etc)
See merge request pleroma/pleroma!240
6 years ago
14054dd582
Merge branch 'feature/auto-shortcodes' into 'develop'
...
Feature: automatic shortcodes for emoji
See merge request pleroma/pleroma!245
6 years ago
33b0334216
Merge branch 'bugfix/status-url-field' into 'develop'
...
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
Closes #231
See merge request pleroma/pleroma!246
6 years ago
8546551257
activitypub: switch to using x509 representation for public keys instead of pkcs#1
6 years ago
4326cb9920
[Pleroma.Web.Nodeinfo.NodeinfoController]: add mediaProxy metadata
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/229
6 years ago
7a351cb36f
[Pleroma.Web.MastodonAPI.StatusView]: Fill the url field for statuses
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/231
6 years ago
835345754d
/web/* template: Add class system-font
6 years ago
748fff6544
Fix auto-shortcode emoji
...
Emoji were broken due to `Pleroma.Formatter` not knowing about the
auto-shortcode emoji. This moves that logic from
`Pleroma.Web.TwitterAPI.UtilController` to `Pleroma.Formatter`.
Additionally, it's now possible to specify multiple shortcode globs, and
the default globs were changed to `["/emoji/custom/**/*.png"]`, since
that's in the .gitignore and the files there would have to be shortcode
emoji anyway.
6 years ago
c171f9790b
Move emoji glob setting to config.exs
...
Also, a bit of formatting, and the glob includes an "/emoji/" prefix to
make it more intuitive to users
6 years ago
0bfbf15b37
Allow emojis to be added automatically
6 years ago
971bb4f2bd
activity interpretation: formatting
6 years ago
66819ea784
twitter api: use ActivityView.render_content() where appropriate instead of duplicating the logic
6 years ago
ea982e7503
mastodon api: add interpreter for Article activity types
6 years ago
121c1f6230
twitter api: refactor activity html generation, add support for Articles
6 years ago
bd479606ba
utils: make_create_data: add support for Article objects
6 years ago
c42f28b82c
transmogrifier: accept Article activities
6 years ago
2f14996d9a
twitter api: allow setting default_scope
6 years ago
dcdf7b6686
twitter api: user view: show default message scope if known
6 years ago
4f6de34f4f
mastodon api: use info["default_scope"] if available for post scope
6 years ago
7c63e70de1
activitypub: use Activity.normalize() in several places instead of using Activity.get_by_ap_id() directly.
6 years ago
6f4ca7ddf7
ostatus: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
6 years ago
5b240c3b18
federator: use Activity.normalize() instead of directly using Activity.get_by_ap_id().
6 years ago
bc05548370
ostatus: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
49da04c509
common api: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
15d624e077
activitypub: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
fb04fecfb4
streamer: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
47189531c5
user: use Object.normalize() instead of Object.get_by_ap_id() directly.
6 years ago
b036a19c21
activity: add normalize() to find a complete activity given either URI or partial structure
6 years ago
a200943240
object: add helper functions to handle various forms of a given object and return a normalized one
6 years ago
dc8ace29d1
use the correct end file
6 years ago
ca63585a32
maybe I should learn proper elixir ;D
6 years ago
d8d43f1173
do the filtering
6 years ago
c67cf8e9af
format...
6 years ago
cb21bf5fc2
filter exif data #187
6 years ago
beb940a57e
[Pleroma.Web.MastodonAPI.MastodonAPIController]: Add rights to initial_state
...
Related to https://git.pleroma.social/pleroma/mastofe/issues/20
6 years ago
fc012491a5
Merge branch 'fix/mutes.json-emptyarray' into 'develop'
...
Return empty array from /api/qvitter/mutes.json
See merge request pleroma/pleroma!234
6 years ago
dfc96f222c
Merge branch 'feature/configurable-blocks' into 'develop'
...
Add more configurability to how blocks work
See merge request pleroma/pleroma!203
6 years ago
ea214b8ba6
combined outgoing_blocks with statement
6 years ago
6160a1b3c0
mix format
6 years ago
1299bccc7d
return unquoted empty array from /api/qvitter/mutes.json
6 years ago
6316003946
fixes- found that TwitterAPI.Controller adds .json suffix already
6 years ago
f2badd4424
return empty array for api/qvitter/mutes.json queries instead of html
6 years ago
c4038ede07
fix mind-crushingly dumb syntax error
6 years ago
f4990283de
change moved attributes into normal variables
6 years ago
4e099fcfa9
move configurable module attributes into relevant functions
6 years ago
5a4a45b875
[Pleroma.Web.MastodonApi.MastodonApiController] Add initial_state.meta.max_toot_chars
6 years ago
a05c0ff61d
[Pleroma.Web.MastodonApi.MastodonApiController] Add /api/v2/search
6 years ago
359093d73b
Fake 2.4.0 API
6 years ago
c45133377a
lib/pleroma/web/activity_pub/mrf/simple_policy.ex: mix format
...
Hnng!
6 years ago
082920044a
Normalize file extension for uploaded files
6 years ago
60d6038be5
mrf simple: add accept lists
...
accept lists supplement reject lists by requiring that any message accepted by contained
by the accept list.
in other words, this functionality can be used to implement instances similar to
awoo.space.
6 years ago
90cf75f4a7
Merge branch 'features/column_media_streaming' into 'develop'
...
Add streaming to media tabs of federated and local TLs
See merge request pleroma/pleroma!225
6 years ago
be800d7936
Merge branch 'bugfix/block-follow-relationships' into 'develop'
...
fix follow relationship leaks when blocked
See merge request pleroma/pleroma!230
6 years ago
056305dfa7
user: add helper function to fetch a user given only an ap_id (fix tests)
6 years ago
db0731b6ac
Merge branch 'feature/exclude-replies-filter' into 'develop'
...
activitypub: support filtering activities by whether or not they are a reply (closes #109 )
Closes #109
See merge request pleroma/pleroma!226
6 years ago
320ca7b11e
user: when processing a block in User.block(), ensure all follow relationships are broken
...
this is needed for activitypub conformance
ref #213
6 years ago
c95941e64d
activitypub transmogrifier: fix handling of contentMap.
6 years ago
7e0f62acee
object: add helper functions to handle various forms of a given object and return a normalized one
6 years ago
6f384d35dd
ostatus: we need to include the original author of a message as a mention
...
this is due to the use of activity.recipients which may not necessarily contain the original
author if the actors are not following each other.
6 years ago
591c82620e
activitypub: filter destination list for announce activities differently than normal ( closes #164 )
6 years ago
4f589998ee
activitypub: support filtering activities by whether or not they are a reply ( closes #109 )
6 years ago
b670d4d683
MastodonAPI: Add streaming to media tabs of federated and local TLs
6 years ago
0b1ca6a584
Token-generating task
6 years ago
2e294ee44a
Merge branch 'develop' into feature/configurable-blocks
6 years ago
1ea4a18ad8
Merge branch 'feature/configure-mrf-rejectnonpublic' into 'develop'
...
Configs for mrf_rejectnonpublic
See merge request pleroma/pleroma!205
6 years ago
a938d07df1
Merge branch 'bugfix/mastofe_thread_render' into 'develop'
...
lib/pleroma/web/mastodon_api/views/status_view.ex: Fix status.json so it renders threads
See merge request pleroma/pleroma!223
6 years ago
72c2915ecd
Pleroma.Web.MastodonAPI.StatusView: Fix status.json so it renders threads
6 years ago
00d7d109ef
Fix typo
6 years ago
de20c8d620
Merge branch 'fix/missing-file-extension' into 'develop'
...
Add missing file extension if file does not have one
See merge request pleroma/pleroma!222
6 years ago
0a95b5594b
Add missing file extension if file does not have one
6 years ago
12c7a023de
upload.ex: add MPEG Layer 3 file header.
6 years ago
2723fb5150
Merge branch 'bugfix/mrf-orphaning' into 'develop'
...
activitypub transmogrifier: handle activity lookup failure
Closes #156
See merge request pleroma/pleroma!216
6 years ago
8c7fdcb31b
Merge branch 'feature/twitterapi-unrepeat' into 'develop'
...
Add TwitterAPI unretweet endpoint and cleanup AP.unannounce
See merge request pleroma/pleroma!218
6 years ago
2c303b3302
Merge branch 'bugfix/oauth2-param-name' into 'develop'
...
oauth: support either name or username parameter with grant_type=password
Closes #180
See merge request pleroma/pleroma!219
6 years ago
William Pitcock