kPherox
a0f101ee80
Merge remote-tracking branch 'upstream/develop' into fix-prameter-name-of-accounts-update-credentials
5 years ago
lain
dae744478e
Transmogrifier: Handle compact objects in undos.
5 years ago
Ivan Tashkinov
6ffa2b5f66
[ #1260 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
lain
19bc0b8c79
.
5 years ago
lain
08256e9299
ActivityPub: Federate reactions.
5 years ago
lain
6068d2254e
PleromaAPIController: Fixes and refactoring.
5 years ago
Egor Kislitsyn
0c6009dd2e
Extract mascot actions from `MastodonAPIController` to MascotController
5 years ago
Egor Kislitsyn
987e0b8be8
Move update_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn
c0ce2d5faf
Move account_register, relationships and verify_credentials to MastodonAPI.AccountController
5 years ago
Egor Kislitsyn
3c5ecb70b4
Add PleromaAPI.AccountController
5 years ago
Egor Kislitsyn
e7aef27c00
Fix merge
5 years ago
lain
a7f22c6e93
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain
b923842e96
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
5 years ago
kaniini
0e356cc800
Merge branch 'split-masto-api/reports' into 'develop'
...
Extract report actions from `MastodonAPIController` to `ReportController`
See merge request pleroma/pleroma!1744
5 years ago
kaniini
74d8fadf37
Merge branch 'split-masto-api/conversations' into 'develop'
...
Extract conversation actions from `MastodonAPIController` to ConversationController
See merge request pleroma/pleroma!1743
5 years ago
Egor Kislitsyn
b7f27a4f58
Extract report actions from `MastodonAPIController` to `ReportController`
...
Update MastodonAPI.ReportView
5 years ago
Ariadne Conill
1d7cbdaf7b
change new scrobble endpoint
5 years ago
Ariadne Conill
e653edd182
split scrobble functions into their own controller
5 years ago
Ariadne Conill
a6e1469767
router: change scrobble timeline route from now-playing to scrobbles
5 years ago
Ariadne Conill
8b34b221cb
common api: add some missing IR bits for listen activities' children
5 years ago
Ariadne Conill
84712c35f9
activitypub: object view: include child object for Listen activities
5 years ago
Ariadne Conill
71eff09e56
common api: make sure the generated IR is actually federatable
5 years ago
Ariadne Conill
7cad6ea67a
pleroma api: hook up scrobbler controller
5 years ago
Ariadne Conill
2c82d8603b
common api: implement scrobbling
5 years ago
Ariadne Conill
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
5 years ago
Ariadne Conill
1f9de2a8cd
activitypub: implement IR-level considerations for Listen activities
5 years ago
Ariadne Conill
b7877e9b1c
mastodon api: implement rendering of listen activities
5 years ago
Egor Kislitsyn
d4d88b3361
Extract conversation actions from `MastodonAPIController` to ConversationController
5 years ago
rinpatch
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10
, reversing
changes made to c4fbb56984
.
5 years ago
kaniini
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
5 years ago
Maksim Pechnikov
1053319cd6
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Haelwenn (lanodan) Monnier
9202904da9
status_controller.ex: Posting media status without content defined
5 years ago
rinpatch
374f83d29b
Fix not being able to post empty statuses with attachments
...
Attachment field was filled in after the empty status check
5 years ago
minibikini
f9380289eb
Add `remote_ip` plug
5 years ago
kaniini
92d08d4113
Merge branch 'split-masto-api/follow-requests' into 'develop'
...
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
See merge request pleroma/pleroma!1730
5 years ago
kaniini
68bf99baf2
Merge branch 'split-masto-api/domain-blocks' into 'develop'
...
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
See merge request pleroma/pleroma!1729
5 years ago
kaniini
27a3221d57
Merge branch 'split-masto-api/scheduled-statuses' into 'develop'
...
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
See merge request pleroma/pleroma!1728
5 years ago
Egor Kislitsyn
408750b94e
Extract domain blocks actions from `MastodonAPIController` to `DomainBlockController`
5 years ago
Egor Kislitsyn
99c5a35890
Extract follow requests actions from `MastodonAPIController` to `FollowRequestController`
5 years ago
Egor Kislitsyn
8d31530119
Cleanup ScheduledActivityView
5 years ago
Egor Kislitsyn
0a5b106ddd
Extract scheduled statuses actions from `MastodonAPIController` to `ScheduledActivityController`
5 years ago
Egor Kislitsyn
621377f378
Extract filter actions from `MastodonAPIController` to `FilterController`
5 years ago
Egor Kislitsyn
6c7c35dbe1
Fix SubscriptionNotificationView
5 years ago
kaniini
91e2bcf218
Merge branch 'refactor/status-controller' into 'develop'
...
Extract status actions from `MastodonAPIController` to `StatusController`
See merge request pleroma/pleroma!1719
5 years ago
Ariadne Conill
14294243a2
mastodon api: implement follow_requests_count
5 years ago
Egor Kislitsyn
5ea5c58a85
Move view logic from StatusController.context to StatusView and add a test
5 years ago
kaniini
eb9aa7aa10
Merge branch 'refactor/subscription' into 'develop'
...
Refactor subscription functionality
Closes #1130
See merge request pleroma/pleroma!1664
5 years ago
Egor Kislitsyn
98d1347a4e
Extract status actions from `MastodonAPIController` into `StatusController`
5 years ago
kaniini
219771288c
Merge branch 'refactor/common_api' into 'develop'
...
Refactor `CommonAPI.post/2`
See merge request pleroma/pleroma!1713
5 years ago
kaniini
dc0fdb5e84
Merge branch 'refactor/timeline-controller' into 'develop'
...
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
5 years ago
Maksim Pechnikov
73ae38ca04
add deprecated tag
5 years ago
Maksim Pechnikov
b4fc96f640
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Maxim Filippov
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Maksim Pechnikov
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Roman Chvanikov
b4b147000c
Merge develop
5 years ago
Egor Kislitsyn
3572cf29b7
Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
Egor Kislitsyn
c57ad0a402
Cleanup CommonAPI
5 years ago
Egor Kislitsyn
de3e90e536
Add ActivityDraft.with_valid/2
5 years ago
Egor Kislitsyn
eed774d058
Add CommonAPI.ActivityDraft
5 years ago
kaniini
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
5 years ago
kaniini
a39e065916
Merge branch 'feature/return-link-for-password-reset' into 'develop'
...
Admin API: Return link alongside with token on password reset
See merge request pleroma/pleroma!1691
5 years ago
kaniini
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
5 years ago
Hakaba Hitoyo
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
kaniini
3ff57f1fd3
Merge branch 'hex-flake-id' into 'develop'
...
Replace `Pleroma.FlakeId` with `flake_id` hex package
See merge request pleroma/pleroma!1692
5 years ago
kaniini
beabc49e35
Merge branch 'feature/activities-pagination-by-offset' into 'develop'
...
Allow activities pagination via limit/offset
See merge request pleroma/pleroma!1714
5 years ago
kaniini
1b9cd4c866
Merge branch 'fix/do-not-embed-first-pages-in-collections' into 'develop'
...
Don't embed the first page in inboxes/outboxes and refactor the views to follow View/Controller pattern
See merge request pleroma/pleroma!1716
5 years ago
rinpatch
f92d7d52c2
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
5 years ago
rinpatch
f2880d7d29
Credo considered harmful
5 years ago
rinpatch
c7d8ccd0c4
Remove useless with clause
5 years ago
rinpatch
1ddd403339
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch
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.
5 years ago
Ekaterina Vaartis
118d6dcdf4
Fix nodeinfo handling
5 years ago
Ekaterina Vaartis
ba9d35a904
Add an API endpoint for listing remote packs
5 years ago
vaartis
a6e85215e1
Credo fix (remove parens on function definition)
5 years ago
vaartis
f21dbbc021
Move emoji_dir_path & cache_seconds_per_file
5 years ago
Ekaterina Vaartis
cdbe7cd37a
When listing emoji packs, be sure to create the directory
5 years ago
Egor Kislitsyn
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
Maksim Pechnikov
1a858134ed
Merge branch 'develop' into issue/1218
5 years ago
Maxim Filippov
60cbea5bb2
Allow activities pagination via limit/offset
5 years ago
Haelwenn (lanodan) Monnier
0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
5 years ago
Egor Kislitsyn
035f22f784
Fix Credo warnings
5 years ago
Egor Kislitsyn
1bea67cb5e
Cleanup Pleroma.User
5 years ago
Egor Kislitsyn
209395c7e6
Add User.change_info/2 and User.update_info/2
5 years ago
Maxim Filippov
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Egor Kislitsyn
a66a7a328f
Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
Egor Kislitsyn
79b25be4e1
Do not return tuple when unneeded
5 years ago
Maksim Pechnikov
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
kaniini
29dd8ab9c0
Merge branch 'feature/force-password-reset' into 'develop'
...
Admin API: Add ability to require password reset
See merge request pleroma/pleroma!1705
5 years ago
kaniini
760df67a7b
Merge branch 'remove-direct-messages-from-public-timeline' into 'develop'
...
Fix private and direct statuses not being filtered out from the public timeline for an authenticated user.
Closes #1223
See merge request pleroma/pleroma!1703
5 years ago
kaniini
ad9595ca55
Merge branch 'test/activity_pub/transmogrifier.ex' into 'develop'
...
added tests /activity_pub/transmogrifier.ex
See merge request pleroma/pleroma!1651
5 years ago
Steven Fuchs
e1d2d69c87
Clean up views
5 years ago
Ekaterina Vaartis
e63f167f01
Also pretty print pack.json
5 years ago
Maksim Pechnikov
494bb6bac6
updated tests
5 years ago
Maksim Pechnikov
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
Maksim Pechnikov
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
rinpatch
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
5 years ago
rinpatch
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
5 years ago
Haelwenn (lanodan) Monnier
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
5 years ago
Haelwenn (lanodan) Monnier
2ad50583f0
Document and test /api/ap/whoami
5 years ago
Maxim Filippov
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Maxim Filippov
72a01f1350
Use router helper to generate reset password link
5 years ago
Maxim Filippov
6f25668215
Admin API: Add ability to force user's password reset
5 years ago
eugenijm
7cf1252455
Mastodon API: Fix private and direct statuses not being filtered out from the public timeline for an authenticated user (`GET /api/v1/timelines/public`)
5 years ago
lain
b80c41a14f
Merge branch 'outbox_pagination' into 'develop'
...
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
5 years ago
D Anzorge
0e6085da10
Fix pagination in AP outbox.json
5 years ago
Ivan Tashkinov
6f67aed3ac
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/admin_api/admin_api_controller.ex
5 years ago
eugenijm
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
Maksim Pechnikov
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
Haelwenn
f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
5 years ago
rinpatch
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
5 years ago
Haelwenn (lanodan) Monnier
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
--stat --name-only | cat - | xargs sed -i 's/2017-2018 Pleroma Authors/2017-2019 Pleroma Authors/'
5 years ago
Ekaterina Vaartis
b585134c90
Get the nodeinfo address from the well-known
5 years ago
Ekaterina Vaartis
a1325d5fd9
Change path from nodeinfo to metadata->features
5 years ago
Ekaterina Vaartis
d51e5e447e
Move emoji reloading to admin api
5 years ago
Ekaterina Vaartis
7680aec17d
Move emoji api to pleroma api dir
5 years ago
Ekaterina Vaartis
36f2275dc9
A feature for shareable emoji packs, use it in download_from & tests
5 years ago
Ekaterina Vaartis
74fb6d8647
Move EmojiAPIController from EmojiAPI to PleromaAPI
5 years ago
Ekaterina Vaartis
6cd651a38b
Make the emoji controller api more RESTy
5 years ago
Ekaterina Vaartis
3971bf9c5f
Change :sha to :checksum
5 years ago
Ekaterina Vaartis
7c784128fd
Change emoji api responses to JSON
5 years ago
Ekaterina Vaartis
f24731788e
Move emoji pack list from /list to /
5 years ago
vaartis
cb125ffaf7
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
5 years ago
Ekaterina Vaartis
8f509e6d1e
Use with w/ pack_info_res
5 years ago
Ekaterina Vaartis
8790365fef
Remove unused variable
5 years ago
vaartis
b8a214b0ab
Split list_packs
5 years ago
vaartis
f251225cae
Apply suggestions to emoji_api_controller.ex
5 years ago
vaartis
c049c32270
Fixed a typo in create_archive_and_cache
5 years ago
vaartis
163082de6f
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
5 years ago
Ekaterina Vaartis
f6d4acc871
Fix credo warnings
5 years ago
Ekaterina Vaartis
87057101b0
Add documentation for the emoji api endpoints
5 years ago
Ekaterina Vaartis
9eb2ee4df0
Allow importing old (emoji.txt / plain) packs from the filesystem
5 years ago
Ekaterina Vaartis
13cd93a0d3
Use && insted of "and" for checking shared-files for packs
...
share-files can be nil and "and" does not like that
5 years ago
Ekaterina Vaartis
f5131540dc
Add a way to create emoji packs via an endpoint
5 years ago
Ekaterina Vaartis
8dbdd5c280
Allow uploading new emojis to packs from URLs
5 years ago
Ekaterina Vaartis
16edfef12e
Handle empty shortcode/filename/new_shortcode/new_filename
5 years ago
Ekaterina Vaartis
9afe7258dd
Implememt emoji pack file updating + write tests
5 years ago
Ekaterina Vaartis
261d92f9c2
Update the pack fallback-src sha generation condition
...
The old one would not regenerate sha when fallback src changed
5 years ago
Ekaterina Vaartis
bcc0bfd0c5
Add an endpoint for emoji pack metadata updating
5 years ago
Ekaterina Vaartis
b78973d27f
fallback can't have pack.json, reflect that in code
...
having pacj.json and sha256 in a fallback pack would cause a circular dependency of itself
5 years ago
Ekaterina Vaartis
2a94eca096
Change YAML to JSON
5 years ago
Ekaterina Vaartis
2d4b8f3d20
Add an endpoint for deleting emoji packs
5 years ago
Ekaterina Vaartis
3a8669b487
Fix responses for emoji pack controlller
5 years ago
Ekaterina Vaartis
7a0c755d0a
Send ok for emoji reloading as text, not as json
5 years ago
Ekaterina Vaartis
ee620ecbf1
Add caching for emoji pack sharing
5 years ago
Ekaterina Vaartis
7fb7dd9e0e
Only find SHA256 for packs that are shared
5 years ago
Ekaterina Vaartis
54b8e683bc
Swap TOML for YAML to get YAML generation for packs from fallbacks
...
If fallback url doesn't have a pack.yml file, one from the source will
be used
5 years ago
Ekaterina Vaartis
b791a08656
Implement API actions on packs
...
That incldues listing them and downloading them from other instances
or from the remote url
5 years ago
feld
ab2ca3038f
Merge branch 'hide-follower-following-count' into 'develop'
...
Add a setting to hide follows/followers stats from the user profile
See merge request pleroma/pleroma!1663
5 years ago
feld
25b4365656
Merge branch 'admin_api_invite_tokens' into 'develop'
...
POST for creating invite tokens in admin api
See merge request pleroma/pleroma!1637
5 years ago
rinpatch
d32894ae51
Move object internal fields to a constant
5 years ago
rinpatch
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
5 years ago
Maxim Filippov
384b7dd40d
Fix response
5 years ago
Maxim Filippov
f89728ad95
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
Ivan Tashkinov
551f2fa59e
[ #1234 ] Added changelog entry, removed admin OAuth scopes.
5 years ago
Ivan Tashkinov
c98e761d28
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
Alex S
a18f1e7cd7
namings
5 years ago
Alex S
2263c8b6b9
little fixes
5 years ago
Alex S
4faf2b1555
post for creating invite tokens in admin api
5 years ago
Ivan Tashkinov
b4d775161c
[ #1234 ] Undone reordering-related changes in router.ex.
5 years ago
Maxim Filippov
f9dd121ad3
Admin API: Return link alongside with token on password reset
5 years ago
Ivan Tashkinov
01c1078015
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
Maksim Pechnikov
0447c42715
Merge branch 'develop' into issue/733
5 years ago
Ivan Tashkinov
76068873db
[ #1234 ] Defined admin OAuth scopes, refined other scopes. Added tests.
5 years ago
rinpatch
ef2e2c5e12
Merge branch 'feature/return-total-for-reports' into 'develop'
...
Admin API: Return total for reports
See merge request pleroma/pleroma!1628
5 years ago
Maksim Pechnikov
7dd51652f9
Merge branch 'develop' into issue/733
5 years ago
Haelwenn
2301de3d75
Merge branch 'fix/upgrade_user_from_ap_id' into 'develop'
...
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
See merge request pleroma/pleroma!1677
5 years ago
rinpatch
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
5 years ago
Steven Fuchs
80c5c3495b
remove remaining errors from tests
5 years ago
Roman Chvanikov
9fa2586abd
Refactor SubscriptionNotificationView
5 years ago
Roman Chvanikov
e9f69a3eb7
Move pleroma_api controllers into controllers sub-folders
5 years ago
Roman Chvanikov
7d1773bc6b
Rename SubscriptionNotificationController list and get actions to index and show
5 years ago
Roman Chvanikov
a76168e743
Cleanup PleromaAPIController
5 years ago
Roman Chvanikov
a81f80233d
Apply suggestion to lib/pleroma/web/router.ex
5 years ago
Roman Chvanikov
f9be517c7f
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
Roman Chvanikov
c0f776faec
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
Roman Chvanikov
2688b876ab
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
Ivan Tashkinov
e7afb67c5c
[ #1260 ] Rate-limiting for create authentication and related requests.
5 years ago
eugenijm
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (`hide_follows_count` and `hide_followers_count`)
5 years ago
Roman Chvanikov
6042e21b25
Move subscription notifications to a separate controller
5 years ago
Roman Chvanikov
56b60798c2
Code style fixes
5 years ago
Roman Chvanikov
76c3e290fc
Merge develop
5 years ago
Maxim Filippov
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Egor Kislitsyn
085d014f08
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
5 years ago
Maxim Filippov
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
5 years ago
Egor Kislitsyn
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd33126
, reversing
changes made to 4fabf83ad0
.
5 years ago
kaniini
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
Steven Fuchs
aab264db82
Streamer refactoring
5 years ago
kaniini
17142a3720
Merge branch 'feature/delivery-tracking' into 'develop'
...
Track signed fetches of objects and use them for delete federation
See merge request pleroma/pleroma!1661
5 years ago
kaniini
d1a84ceec8
Merge branch 'feature/optimize_rich_media_parser' into 'develop'
...
added prepare html for RichMedia.Parser
See merge request pleroma/pleroma!1672
5 years ago
Maksim Pechnikov
d75bc728e7
Merge branch 'develop' into issue/733
5 years ago
Ivan Tashkinov
efbc2edba1
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# lib/pleroma/web/activity_pub/activity_pub_controller.ex
# lib/pleroma/web/router.ex
5 years ago
Ivan Tashkinov
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
5 years ago
Maksim Pechnikov
b4cf74c106
added prepare html for RichMedia.Parser
5 years ago
Maksim Pechnikov
8751809e1e
Merge branch 'develop' into support/tests
5 years ago
Ivan Tashkinov
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
5 years ago
Roman Chvanikov
d7457c9165
Merge branch 'develop' into refactor/subscription
5 years ago
Ivan Tashkinov
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
rinpatch
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
lain
1be09bde2d
Merge branch 'refactor/add_link_headers' into 'develop'
...
Refactor `add_link_headers/7` -> `add_link_headers/3`
See merge request pleroma/pleroma!1636
5 years ago
rinpatch
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
5 years ago
Roman Chvanikov
0bd2b85edb
Separate Subscription Notifications from regular Notifications
5 years ago
rinpatch
8900cb68ae
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch
2784962dba
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
lain
53a3ad6043
Merge branch 'cleanup-activity' into 'develop'
...
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
5 years ago
lain
3ff5532220
Linting.
5 years ago
lain
a7f31bf06c
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain
e5b3ad3d04
ActivityPub: Use is_unicode_emoji? function.
5 years ago
Haelwenn
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
5 years ago
rinpatch
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
5 years ago
rinpatch
3896a51b8a
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch
5170170483
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
rinpatch
fb96facc32
Remove unused functions and fix credo issues
5 years ago
rinpatch
ce23529d91
Use delivery info when federating deletes
5 years ago
Egor Kislitsyn
25d8216804
Add email change endpoint
5 years ago
Egor Kislitsyn
39dc9b470c
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
5 years ago
Maksim Pechnikov
2b40e57a72
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
rinpatch
b0e6058021
Parse http signature for request to objects/activities
5 years ago
Maksim Pechnikov
936951826e
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
rinpatch
769fb778d4
Track object/create activity fetches
5 years ago
lain
8d4b661ecb
Transmogrifier: Strip internal emoji reaction fields.
5 years ago
lain
05e9776517
PleromaAPIController: Add endpoint to fetch emoji reactions.
5 years ago
Maksim Pechnikov
4f548cb2b7
added test for Ostatus
5 years ago
Mark Felder
74e4c72c4a
Fix double quotes in error logs
...
Example:
pleroma: [error] Couldn't fetch ""https://pleroma.soykaf.com/objects/6288a14b-0623-40fc-a26a-0d358f8a11ca "", error: nil
5 years ago
Maksim Pechnikov
007e0c1ce1
added tests
5 years ago
Haelwenn
46ae62d159
Merge branch 'patch-5' into 'develop'
...
Mastodon API: URI encode hashtag name in generated URLs
See merge request pleroma/pleroma!1642
5 years ago
lain
fb7332aec7
Merge branch 'fix/oom-parallel-rendering' into 'develop'
...
Revert "Parallelize template rendering"
See merge request pleroma/pleroma!1654
5 years ago
Alex S
a1f2dfb10a
expanding regex sigils to use modifiers
5 years ago
Maksim Pechnikov
fcf604fa43
added tests
5 years ago
rinpatch
43f02dfe38
Revert "Parallelize template rendering"
...
This reverts commit 1ad71592ad
.
Since it had no limit on the number on concurrent processes it OOM killed
instances while rendering hellthreads. When I tried introducing a
concurrency limit with Task.async_stream/manual folds it lead to about 3 times
worse performance on threads larger than 1000 activities (we are talking
30s vs 1.2 minutes), I think this is not worth the about 1.5 times
performance increase on smaller threads when using it.
5 years ago
Maksim Pechnikov
a31af93e1d
added tests /activity_pub/transmogrifier.ex
5 years ago
Egor Kislitsyn
b40b10b53d
Add an endpoint to get multiple statuses by IDs
5 years ago
Maxim Filippov
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
minibikini
11e12b5761
Add Pleroma.Plugs.Cache
5 years ago
feld
edbaf78176
Merge branch 'fix/read-inbox' into 'develop'
...
Fix `ActivityPubController.read_inbox/2`
Closes #1248
See merge request pleroma/pleroma!1649
5 years ago
Egor Kislitsyn
e0f84d0043
Fix `ActivityPubController.read_inbox/2`
5 years ago
Ivan Tashkinov
b63faf9819
[ #1234 ] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
5 years ago
Ivan Tashkinov
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
shadowfacts
e5c6bf3673
Mastodon API: URI encode hashtag name in generated URLs
...
Otherwise hashtags with word characters other than those allowed in URLs (e.g. Japanese characters) produce hashtag URLs that are invalid.
5 years ago
Maksim Pechnikov
8c6cdff3cc
Merge branch 'develop' into issue/1218
5 years ago
Maksim Pechnikov
39f99dc6cd
Merge branch 'develop' into support/tests
5 years ago
Ariadne Conill
5effb2cbca
activitypub: help ecto build a better query for thread mute filtering
...
using an indexed value in thread_mute table helps ecto build a better query.
5 years ago
Maksim Pechnikov
ab2f21e470
tests for mastodon_api_controller.ex
5 years ago
Maksim Pechnikov
eb74c3d5c7
Merge branch 'develop' into issue/1218
5 years ago
Ivan Tashkinov
ca1ba1e272
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# test/web/twitter_api/twitter_api_controller_test.exs
5 years ago
Egor Kislitsyn
40b3289c26
Refactor `add_link_headers/7` -> `add_link_headers/3`
5 years ago
rinpatch
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
5 years ago
Maxim Filippov
736165c082
Reverse reports list
5 years ago
Alex S
79dde58044
one more temp commit
5 years ago
Haelwenn
fe7cf44c40
Merge branch 'feature/mastoapi-accounts-external' into 'develop'
...
Mastdon API: Add ability to get a remote account by nickname to `/api/v1/accounts/:id`
See merge request pleroma/pleroma!1622
5 years ago
rinpatch
26fe6f70c9
Move checking for restrict_local to User.get_cached_by_id_or_nickname
5 years ago
rinpatch
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
Ivan Tashkinov
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
rinpatch
3e30f6e198
Merge branch 'fix/safe-render-notifications' into 'develop'
...
Do not crash if one notification failed to render
See merge request pleroma/pleroma!1630
5 years ago
rinpatch
558969a0fd
Do not crash if one notification failed to render
5 years ago
Maksim Pechnikov
ae506ca997
fix formatting
5 years ago
Maksim
e2011a667c
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
5 years ago
Maksim
8306078de1
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
5 years ago
lain
99ea990a16
PleromaAPIController: Add emoji reactions.
5 years ago
Maxim Filippov
af746fa4a8
Return total for reports
5 years ago
Maxim Filippov
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
Maksim Pechnikov
a890451187
fetch_announcements -> take_announcements
5 years ago
Maksim Pechnikov
8cbad5500c
add tests for activity_pub/utils.ex
5 years ago
rinpatch
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
5 years ago
rinpatch
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
5 years ago
lain
9bc12b88b3
ActivityPub: Save emoji reactions in object.
5 years ago
rinpatch
cc1d1ee406
Mastdon API: Add ability to get a remote account by nickname to
...
`/api/v1/accounts/:id`
5 years ago
Maxim Filippov
9c96b17e16
Add pagination to logs
5 years ago
Ivan Tashkinov
dd017c65a4
[ #1149 ] Refactored Oban workers API (introduced `enqueue/3`).
5 years ago
Ivan Tashkinov
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
Ivan Tashkinov
e890ea7e82
[ #1149 ] Added Oban job for "activity_expiration". Merged remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# config/config.exs
5 years ago
rinpatch
70eed0594c
credo fixes
5 years ago
rinpatch
bd3ed3a622
Add back /api/qvitter/statuses/notifications/read.json
5 years ago
rinpatch
64410497d2
Remove TwitterAPI representers
5 years ago
rinpatch
985122cc03
Remove Activity, User and Notification views from TwitterAPI
5 years ago
rinpatch
90c2dae9a4
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
5 years ago
Maksim Pechnikov
6ef0103ca0
added Emoji struct
5 years ago
Maxim Filippov
f182f0f6bd
Add ability to search moderation logs
5 years ago
Maksim Pechnikov
d8098d142a
added Emoji.Formatter
5 years ago
Maksim Pechnikov
d7808b5db4
added code\path fields without html tags in ets
5 years ago
feld
7853b3f17d
Fix AntiFollowbotPolicy when trying to follow a relay
5 years ago
Haelwenn
d9d7765383
Merge branch 'fix-osada-follow' into 'develop'
...
Transmogrifier: Fix follow handling when the actor is an object.
Closes #1211
See merge request pleroma/pleroma!1604
5 years ago
lain
b770ed1d99
CommonAPI: Support emoji reactions.
5 years ago
lain
f017260cdc
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain
66519f2100
Merge branch 'list-controller' into 'develop'
...
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
5 years ago
Maxim Filippov
5e4fde1d3d
Filter logs by date
5 years ago
Maksim
ffcd742aa0
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
lain
c30cc039e4
Transmogrifier: Use Containment.get_actor to get actors.
5 years ago
Maksim Pechnikov
00abe099cd
added tests for ActivityPub.like\unlike
5 years ago
rinpatch
eb1739c596
Remove most of TwitterAPIController
5 years ago
lain
a0b21c8928
Transmogrifier: Handle incoming emoji reactions.
5 years ago
lain
6e1ec4c5da
ActivityPub: Basic EmojiReactions.
5 years ago
lain
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
5 years ago
Egor Kislitsyn
4194abbc8f
Move mastodon_api/*_controller.ex to mastodon_api/controllers/
5 years ago
Egor Kislitsyn
30510ade0e
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
5 years ago
Egor Kislitsyn
4d82bc8b0b
Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
5 years ago
kPherox
8ca4f145a5
Extract if block into private function
5 years ago
kaniini
6dc24422dc
Merge branch 'issue/1177' into 'develop'
...
[#1177 ] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
5 years ago
Maxim Filippov
37dd3867bb
Log admin/moderator actions
5 years ago
kPherox
b15e226593
Change to delete empty name field
5 years ago
kPherox
705b5adfc4
Fix type of fields_attributes
...
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
5 years ago
kPherox
45e21a9df4
Rename fields to fields_attributes
5 years ago
lain
90986667ce
Merge branch 'admin-create-users' into 'develop'
...
user creation admin api will create multiple users
See merge request pleroma/pleroma!1170
5 years ago
lain
efb8818e9e
Activity Expiration: Switch to 'expires_in' system.
5 years ago
Maksim Pechnikov
654d291b6d
update tests
5 years ago
Maksim Pechnikov
6062017493
put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
5 years ago
lain
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
Ivan Tashkinov
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
5 years ago
Maksim Pechnikov
8dc6a6b210
fix /inbox for Relay
5 years ago
Maksim Pechnikov
399ca9133b
fix test
5 years ago
Maksim Pechnikov
f95b67c933
Merge branch 'develop' into issue/1177
5 years ago
Ivan Tashkinov
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
Ivan Tashkinov
256ff09aa8
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# lib/pleroma/application.ex
# lib/pleroma/scheduled_activity_worker.ex
# lib/pleroma/web/federator/retry_queue.ex
# lib/pleroma/web/oauth/token/clean_worker.ex
# test/user_test.exs
# test/web/federator_test.exs
5 years ago
Egor Kislitsyn
a79ebac592
Improve AP routes rate limit
5 years ago
Maksim Pechnikov
64bfb41c55
fixed unfollow for relay actor
5 years ago
Sachin Joshi
37229af15f
remove old user create and delete routes for admin
5 years ago
lain
f740d786a3
Merge branch 'rate-limit-ap-routes' into 'develop'
...
[#1174 ] Rate limit AP routes
See merge request pleroma/pleroma!1586
5 years ago
lain
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
5 years ago
Egor Kislitsyn
8d899d6197
Add `:ap_routes` rate limit
5 years ago
lain
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
5 years ago
lain
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
5 years ago
Maxim Filippov
5171aa5b4d
Refactor check_actor_is_active
5 years ago
kaniini
18c8c8d176
Merge branch 'feature/hide-muted-threads-from-timeline' into 'develop'
...
Hide muted theads from home/public timelines unless `with_muted` is set
See merge request pleroma/pleroma!1575
5 years ago
lain
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
5 years ago
Egor Kislitsyn
158231cd20
Add configurable colors and logo for the digest template
5 years ago
rinpatch
1ad71592ad
Parallelize template rendering
5 years ago
rinpatch
a4a3e3becd
Hide muted theads from home/public timelines unless `with_muted` is set
5 years ago
Maxim Filippov
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maxim Filippov
2b94ae3b39
Do not check if actor is active when deleting a user
5 years ago
rinpatch
bd5ad0af78
Cache follow state
5 years ago
rinpatch
31d576de0c
Merge branch 'misc-otp-issues' into 'develop'
...
Misc OTP issues
See merge request pleroma/pleroma!1567
5 years ago
rinpatch
dc902ad3df
Merge branch 'fix/http-signatures-post' into 'develop'
...
activitypub: publisher: add (request-target) to http signature when POSTing
See merge request pleroma/pleroma!1569
5 years ago
kaniini
1754f8ce6d
Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex
5 years ago
Ariadne Conill
5bb418a90d
activitypub: publisher: add (request-target) to http signature when POSTing
5 years ago
Ariadne Conill
626e094589
MRF: fix up unserializable option lists in describe implementations
5 years ago
Ivan Tashkinov
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
stwf
574856ef01
streamline Streamer pings
5 years ago
stwf
15ef521009
Isolate OAuth.Token.CleanWorker
5 years ago
stwf
51bdf0cab6
use default child_specs
5 years ago
lain
d3af9e19ed
Conversations: Load relations in one query.
5 years ago
lain
f73212b2a3
Conversation: Render new participation on update.
5 years ago
lain
df81abb68c
Conversations: Use correct oauth paths for extended api.
5 years ago
Egor Kislitsyn
4b7f1c6995
Improve digest email template
5 years ago
lain
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
Egor Kislitsyn
e457fcc479
Add `:max_remote_account_fields` config option
5 years ago
Egor Kislitsyn
f7bbf99caa
Use info.fields instead of source_data for remote users
5 years ago
Egor Kislitsyn
7d6f8a7fd7
Linkify custom fields values in ActivityPub.UserViewx
5 years ago
Egor Kislitsyn
5178f960c3
Support user attachment update in Transmogrifier
5 years ago
Egor Kislitsyn
88598c9baf
Add profile custom fields to ActivityPub.UserView
5 years ago
Egor Kislitsyn
a22f540fc4
Add custom fields to TwitterAPI.UserView
5 years ago