9396b2f8cf
Merge branch 'features/apc2s-pagination' into 'develop'
...
Fix AP C2S pagination
Closes #866 and #751
See merge request pleroma/pleroma!2491
2020-06-08 00:58:31 +03:00
fcf51a77ba
Merge branch 'features/staticfe-sanitization' into 'develop'
...
static_fe: Sanitize HTML
Closes #1614
See merge request pleroma/pleroma!2299
2020-03-16 00:14:04 +03:00
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
8f79f433bc
Hide follower counter when hiding is activated
2019-12-17 13:34:07 +07:00
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
a11a7176d5
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/activity_pub/transmogrifier.ex
2019-10-21 11:05:09 +03:00
c9280b9730
rework to use properties instead of compound typing, per SocialCG
2019-10-19 23:21:37 +00:00
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
fefbd31c6e
Move local keys out of `user.info`
2019-10-06 16:56:36 +03:00
2dad6dd020
Extract apps actions from `MastodonAPIController` to `AppController`
2019-10-01 15:21:46 +07:00
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
2019-09-30 11:21:49 +00:00
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
f92d7d52c2
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
2019-09-25 13:38:45 +00:00
d87be2ec96
Don't embed the first page in inboxes/outboxes and refactor the views to
...
follow View/Controller pattern
Note that I mentioned the change in 1.1 section because I intend to
backport this, if this is not needed I will move it back to Unreleased.
2019-09-25 15:59:04 +03:00
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-23 21:32:50 +03:00
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
2019-09-23 20:00:12 +02:00
0e6085da10
Fix pagination in AP outbox.json
2019-09-19 16:09:07 +02:00
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
2019-09-19 07:35:34 +03:00
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
2019-09-17 14:45:47 +03:00
007e0c1ce1
added tests
2019-09-11 23:19:06 +03:00
f7bbf99caa
Use info.fields instead of source_data for remote users
2019-08-14 14:52:54 +07:00
7d6f8a7fd7
Linkify custom fields values in ActivityPub.UserViewx
2019-08-14 14:52:54 +07:00
88598c9baf
Add profile custom fields to ActivityPub.UserView
2019-08-14 14:52:54 +07:00
1fce56c7df
Refactor
2019-08-03 18:37:20 +00:00
16cfb89240
Only add `preferredUsername` to service actor json when the underlying user actually has a username
2019-08-03 18:28:08 +00:00
a187dbb326
Add preferredUsername to service actors so Mastodon can resolve them
2019-08-03 17:24:57 +00:00
cf9cb953d5
activitypub: represent internal fetch actor
2019-07-17 17:34:57 +00:00
1f6ac7680d
ActivityPub User view: Following/Followers refactoring
...
- Render the collection items if the user requesting == the user
rendered
- Do not render the first page if hide_{followers,follows} is set, just
give the URI to it
2019-07-12 19:41:55 +03:00
045803346d
move key generation functions into Pleroma.Keys module
2019-05-22 03:58:15 +00:00
2f76a40d02
formatter.ex: Add get_emoji_map/1
2019-05-03 16:27:50 +02:00
10a7a4a868
AP UserView: Refactor banner / avatar display code, add test.
2019-03-26 16:59:28 +01:00
6f090f981b
Attempt to fix incorrect federation of default instance avatars
2019-03-25 18:47:04 -05:00
a3a9cec483
[Credo] fix Credo.Check.Readability.AliasOrder
2019-03-13 04:26:54 +01:00
7c722c08f5
Fix: Fixing an outbox related bug when local user activity is empty
2019-02-22 04:37:48 +00:00
72ba5b4ab7
activitypub: user view: formatting
2019-02-14 03:13:07 +00:00
5307c211b8
activitypub: user view: report totalItems=0 for follows/followers when hidden
2019-02-14 03:10:00 +00:00
6542b86292
activitypub: user view: remove totalItems from user outbox
...
(this is based on a counter in User.Info, but the counter is not reliable.)
2019-02-14 03:02:45 +00:00
ee2fa1a314
activitypub: user view: remove totalInbox from user inbox view
...
It is not really feasible to quickly calculate the totalItems value and
it shouldn't be trusted anyway.
2019-02-14 03:01:39 +00:00
64620d8980
activitypub: user view: do not expose oAuth endpoints for instance users
2019-02-14 02:41:21 +00:00
9bd6ed975e
activitypub: user view: use route helpers instead of hardcoded URIs
2019-02-13 19:34:43 +00:00
29e946ace4
activitypub: user view: add oauthRegistrationEndpoint to user profiles
2019-02-13 19:34:43 +00:00
db8abd958d
activitypub: user view: fix up endpoints rendering
2019-02-13 19:34:43 +00:00
90facd3598
user view: add AP C2S oauth endpoints to local user profiles
2019-02-13 19:34:43 +00:00
6a6a5b3251
de-group alias/es
2019-02-09 16:31:17 +01:00
60ea29dfe6
Credo fixes: alias grouping/ordering
2019-02-09 14:59:20 +01:00
74518d0b60
hide_followings was renamed to hide_followers in the FE, but never synced up in the BE
...
This was a dirty regex replace which worked on my server
2019-02-06 22:34:44 +00:00
f753043ce0
Fix if clause in activity_pub user_view
2019-02-06 18:42:19 +01:00
50d6183893
Split hide_network into hide_followers & hide_followings
2019-01-28 21:40:08 +03:00
28d77e373c
Flake Ids for Users and Activities
2019-01-23 11:26:27 +01:00
980b5288ed
update copyright years to 2019
2018-12-31 15:41:47 +00:00
Haelwenn