dc0fdb5e84
Merge branch 'refactor/timeline-controller' into 'develop'
...
Extract timeline actions from `MastodonAPIController` into `TimelineController`
See merge request pleroma/pleroma!1648
5 years ago
73ae38ca04
add deprecated tag
5 years ago
b4fc96f640
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
e7836adf21
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
3d722dc200
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
75290cbfbd
Add Pleroma.JobQueueMonitor
5 years ago
b4b147000c
Merge develop
5 years ago
3572cf29b7
Extract timeline actions from `MastodonAPIController` into `TimelineController`
5 years ago
c57ad0a402
Cleanup CommonAPI
5 years ago
de3e90e536
Add ActivityDraft.with_valid/2
5 years ago
eed774d058
Add CommonAPI.ActivityDraft
5 years ago
6abe12dced
Merge branch 'refactor/notification-controller' into 'develop'
...
Extract notification actions from `MastodonAPIController` into `NotificationController`
See merge request pleroma/pleroma!1646
5 years ago
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
48a82c4609
Merge branch 'refactor/user' into 'develop'
...
Simplify updating user's `info`
See merge request pleroma/pleroma!1712
5 years ago
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
5 years ago
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
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
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
f92d7d52c2
Apply suggestion to lib/pleroma/web/activity_pub/views/user_view.ex
5 years ago
f2880d7d29
Credo considered harmful
5 years ago
c7d8ccd0c4
Remove useless with clause
5 years ago
1ddd403339
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
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
1fd9c60f87
Fix emoji tags for shareable packs to be "pack:{name}"
5 years ago
118d6dcdf4
Fix nodeinfo handling
5 years ago
ba9d35a904
Add an API endpoint for listing remote packs
5 years ago
a6e85215e1
Credo fix (remove parens on function definition)
5 years ago
f21dbbc021
Move emoji_dir_path & cache_seconds_per_file
5 years ago
cdbe7cd37a
When listing emoji packs, be sure to create the directory
5 years ago
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
1a858134ed
Merge branch 'develop' into issue/1218
5 years ago
60cbea5bb2
Allow activities pagination via limit/offset
5 years ago
0dc8f3d6d2
/api/ap/uploadMedia → /api/ap/upload_media
5 years ago
035f22f784
Fix Credo warnings
5 years ago
1bea67cb5e
Cleanup Pleroma.User
5 years ago
209395c7e6
Add User.change_info/2 and User.update_info/2
5 years ago
5e9759cd7d
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
a66a7a328f
Extract notification actions from `MastodonAPIController` into `NotificationController`
5 years ago
79b25be4e1
Do not return tuple when unneeded
5 years ago
d75d0ae134
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
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
19263f30c3
Merge branch 'support-rel-ugc' into 'develop'
...
Add support for `rel="ugc"`
Closes #1255
See merge request pleroma/pleroma!1679
5 years ago
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
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
e1d2d69c87
Clean up views
5 years ago
e63f167f01
Also pretty print pack.json
5 years ago
63af6951fa
add tunable for stream uploads, as needed for jortage to work.
5 years ago
494bb6bac6
updated tests
5 years ago
179fa32dd5
Merge branch 'develop' into tests/mastodon_api_controller.ex
5 years ago
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
fd48bd80eb
Merge branch 'better-emoji-packs' into 'develop'
...
Shareable emoji packs
Closes #833 and #1096
See merge request pleroma/pleroma!1551
5 years ago
6b3d5ed6db
Emoji API Controller: Follow phoenix directory structure
5 years ago
815b904508
Add support for AP C2S uploadMedia
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1171
5 years ago
2ad50583f0
Document and test /api/ap/whoami
5 years ago
d72d4757a8
Format
5 years ago
02bbcd6180
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
72a01f1350
Use router helper to generate reset password link
5 years ago
6f25668215
Admin API: Add ability to force user's password reset
5 years ago
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
b80c41a14f
Merge branch 'outbox_pagination' into 'develop'
...
Fix AP outbox pagination
See merge request pleroma/pleroma!1700
5 years ago
0e6085da10
Fix pagination in AP outbox.json
5 years ago
1d285e6fad
moving to separate dir
5 years ago
924d7e6aa6
generating remote activities
5 years ago
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
95c948110c
Add `rel="ugc"` to hashtags and mentions
5 years ago
cf3041220a
Add support for `rel="ugc"`
5 years ago
fe5e0b7846
Mastodon API: Return `pleroma.direct_conversation_id` when creating direct messages (`POST /api/v1/statuses`)
5 years ago
d4ed3a35b8
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
f95a2b2cda
Merge branch 'issue/733' into 'develop'
...
[#733 ] added test for Ostatus
See merge request pleroma/pleroma!1657
5 years ago
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
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
5 years ago
b585134c90
Get the nodeinfo address from the well-known
5 years ago
a1325d5fd9
Change path from nodeinfo to metadata->features
5 years ago
d51e5e447e
Move emoji reloading to admin api
5 years ago
7680aec17d
Move emoji api to pleroma api dir
5 years ago
36f2275dc9
A feature for shareable emoji packs, use it in download_from & tests
5 years ago
74fb6d8647
Move EmojiAPIController from EmojiAPI to PleromaAPI
5 years ago
6cd651a38b
Make the emoji controller api more RESTy
5 years ago
3971bf9c5f
Change :sha to :checksum
5 years ago
7c784128fd
Change emoji api responses to JSON
5 years ago
f24731788e
Move emoji pack list from /list to /
5 years ago
cb125ffaf7
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
5 years ago
8f509e6d1e
Use with w/ pack_info_res
5 years ago
8790365fef
Remove unused variable
5 years ago
b8a214b0ab
Split list_packs
5 years ago
f251225cae
Apply suggestions to emoji_api_controller.ex
5 years ago
c049c32270
Fixed a typo in create_archive_and_cache
5 years ago
163082de6f
Apply suggestion to lib/pleroma/web/emoji_api/emoji_api_controller.ex
5 years ago
f6d4acc871
Fix credo warnings
5 years ago
87057101b0
Add documentation for the emoji api endpoints
5 years ago
9eb2ee4df0
Allow importing old (emoji.txt / plain) packs from the filesystem
5 years ago
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
f5131540dc
Add a way to create emoji packs via an endpoint
5 years ago
8dbdd5c280
Allow uploading new emojis to packs from URLs
5 years ago
16edfef12e
Handle empty shortcode/filename/new_shortcode/new_filename
5 years ago
9afe7258dd
Implememt emoji pack file updating + write tests
5 years ago
261d92f9c2
Update the pack fallback-src sha generation condition
...
The old one would not regenerate sha when fallback src changed
5 years ago
bcc0bfd0c5
Add an endpoint for emoji pack metadata updating
5 years ago
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
2a94eca096
Change YAML to JSON
5 years ago
b0ecd412f5
Clean out old emojis on reload
5 years ago
2d4b8f3d20
Add an endpoint for deleting emoji packs
5 years ago
3a8669b487
Fix responses for emoji pack controlller
5 years ago
7a0c755d0a
Send ok for emoji reloading as text, not as json
5 years ago
ee620ecbf1
Add caching for emoji pack sharing
5 years ago
7fb7dd9e0e
Only find SHA256 for packs that are shared
5 years ago
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
b791a08656
Implement API actions on packs
...
That incldues listing them and downloading them from other instances
or from the remote url
5 years ago
6a42641b8d
Add pack.toml loading
5 years ago
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
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
e32d099a3a
Merge branch 'feature/poll-refresh' into 'develop'
...
Poll refetching
See merge request pleroma/pleroma!1694
5 years ago
5028b7b578
Fix credo issues
5 years ago
c096dd86e5
Do not refetch local objects
5 years ago
eb87a86b5b
Preserve internal fields when reinjecting
5 years ago
d32894ae51
Move object internal fields to a constant
5 years ago
e3f902b3a1
Set updated_at even if the object stayed the same
5 years ago
a9c700ff15
Fix wrong argument order when calling NaiveDateTime.diff
5 years ago
7ef575d11e
Initial poll refresh support
...
Implement refreshing the object with an interval and call the function
when getting the poll.
5 years ago
384b7dd40d
Fix response
5 years ago
f89728ad95
Merge branch 'develop' into feature/return-link-for-password-reset
5 years ago
e4f3d7f69d
Apply suggestion to lib/pleroma/plugs/oauth_scopes_plug.ex
5 years ago
551f2fa59e
[ #1234 ] Added changelog entry, removed admin OAuth scopes.
5 years ago
c98e761d28
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
5 years ago
a18f1e7cd7
namings
5 years ago
2263c8b6b9
little fixes
5 years ago
4faf2b1555
post for creating invite tokens in admin api
5 years ago
e501c822c9
markdown.ex: put two-spaces before the description-newline
5 years ago
4785596a2c
markdown.ex: end suggestions list with a newline
...
Otherwise we end up with suggestion on the same level as the childs
Markdown is a fuck…
5 years ago
d2097fd0f5
markdown.ex: \n\n on >1 suggestions, 2-spaces on one
5 years ago
d6182a3c8f
markdown.ex: Make suggestion(s) plural only if on >1
5 years ago
c0c5628200
description.exs: remove empty strings on descriptions
5 years ago
106afaed58
markdown.ex: do not fail if there is no children
5 years ago
e0d8c8897e
docs/markdown.ex: do no print empty suggestions
5 years ago
b4d775161c
[ #1234 ] Undone reordering-related changes in router.ex.
5 years ago
f9dd121ad3
Admin API: Return link alongside with token on password reset
5 years ago
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
7f211a48e0
docs/markdown.ex: child header as "- key (type): description"
5 years ago
0447c42715
Merge branch 'develop' into issue/733
5 years ago
76068873db
[ #1234 ] Defined admin OAuth scopes, refined other scopes. Added tests.
5 years ago
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
7dd51652f9
Merge branch 'develop' into issue/733
5 years ago
6193157f19
Fix notification warnings
5 years ago
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
95a4a19417
Merge branch 'support/tests' into 'develop'
...
add tests for activity_pub/utils.ex
See merge request pleroma/pleroma!1627
5 years ago
80c5c3495b
remove remaining errors from tests
5 years ago
9fa2586abd
Refactor SubscriptionNotificationView
5 years ago
e9f69a3eb7
Move pleroma_api controllers into controllers sub-folders
5 years ago
7d1773bc6b
Rename SubscriptionNotificationController list and get actions to index and show
5 years ago
a76168e743
Cleanup PleromaAPIController
5 years ago
a81f80233d
Apply suggestion to lib/pleroma/web/router.ex
5 years ago
f9be517c7f
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
c0f776faec
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
2688b876ab
Apply suggestion to lib/pleroma/web/pleroma_api/subscription_notification_controller.ex
5 years ago
e7afb67c5c
[ #1260 ] Rate-limiting for create authentication and related requests.
5 years ago
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
a21584556f
Update oban to 0.8.1
...
This version uses a different locking mechanism, which gets rid of
`WARNING: you don't own a lock of type ShareLock` log spam
5 years ago
6042e21b25
Move subscription notifications to a separate controller
5 years ago
56b60798c2
Code style fixes
5 years ago
76c3e290fc
Merge develop
5 years ago
df15ed13d1
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
085d014f08
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
5 years ago
219dca1b00
Merge branch 'develop' into feature/return-total-for-reports
5 years ago
96816ceaa2
Revert "Merge branch 'revert-4fabf83a' into 'develop'"
...
This reverts commit fe7fd331264fabf83ad0
5 years ago
c623b4324d
Revert "Merge branch 'streamer-refactoring' into 'develop'"
...
This reverts merge request !1653
5 years ago
aab264db82
Streamer refactoring
5 years ago
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
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
d75bc728e7
Merge branch 'develop' into issue/733
5 years ago
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
e6f43a831b
[ #1234 ] Permissions-related fixes / new functionality (Masto 2.4.3 scopes).
5 years ago
b4cf74c106
added prepare html for RichMedia.Parser
5 years ago
8751809e1e
Merge branch 'develop' into support/tests
5 years ago
610236d6be
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
5 years ago
9c64a25713
Merge branch 'config-changes' into 'develop'
...
two separate files for config.md and generated config.md
See merge request pleroma/pleroma!1666
5 years ago
62bbba80f3
Merge branch 'fix/truncate-remote-user-fields' into 'develop'
...
Truncate remote user fields
See merge request pleroma/pleroma!1619
5 years ago
d7457c9165
Merge branch 'develop' into refactor/subscription
5 years ago
6bcedb693c
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# docs/config.md
# mix.lock
5 years ago
5c5ebd3861
Mastodon API: Respect post privacy in favourited/reblogged endpoints
5 years ago
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
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
5 years ago
ac4a748fad
Disallow NULLs in deliveries
5 years ago
6fe2f554c3
Emoji: Generate emoji detecting functions at compile time.
...
Suggested by jvalim
5 years ago
69faec031d
markdown generation to the new file
5 years ago
0bd2b85edb
Separate Subscription Notifications from regular Notifications
5 years ago
8900cb68ae
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
05f8a066a1
Apply suggestion to lib/pleroma/delivery.ex
5 years ago
2784962dba
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
53a3ad6043
Merge branch 'cleanup-activity' into 'develop'
...
Cleanup `Pleroma.Activity` and add more tests
See merge request pleroma/pleroma!1623
5 years ago
3ff5532220
Linting.
5 years ago
a7f31bf06c
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
e5b3ad3d04
ActivityPub: Use is_unicode_emoji? function.
5 years ago
0d9609894f
Merge branch 'feature/change-email' into 'develop'
...
Add email change endpoint
Closes #1156
See merge request pleroma/pleroma!1580
5 years ago
f884987ace
Merge branch 'admin-config-description' into 'develop'
...
Admin config description
Closes #1178 and #1209
See merge request pleroma/pleroma!1611
5 years ago
3896a51b8a
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
5170170483
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
fb96facc32
Remove unused functions and fix credo issues
5 years ago
ce23529d91
Use delivery info when federating deletes
5 years ago
25d8216804
Add email change endpoint
5 years ago
39dc9b470c
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
5 years ago
d8a178274b
fix Activity.get_by_id
5 years ago
2b40e57a72
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
a697f0d791
Emoji: Add function to detect if a character is an emoji
5 years ago
51609217c2
Merge branch 'fix/error-log-double-quotes' into 'develop'
...
Fix double quotes in error logs
See merge request pleroma/pleroma!1656
5 years ago
b0e6058021
Parse http signature for request to objects/activities
5 years ago
936951826e
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
dabc4a00f5
Put the cache with the right key when using a tracking function
5 years ago
769fb778d4
Track object/create activity fetches
5 years ago
8d4b661ecb
Transmogrifier: Strip internal emoji reaction fields.
5 years ago
05e9776517
PleromaAPIController: Add endpoint to fetch emoji reactions.
5 years ago
4f548cb2b7
added test for Ostatus
5 years ago
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
007e0c1ce1
added tests
5 years ago
56828abf6d
Use Jason for rendering responses
...
Although Jason readme says Phoenix 1.4+ already does it by default, [it actually does it only for new projects](3bfb9f6e90/lib/phoenix.ex (L58-L59)
5 years ago
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
fb7332aec7
Merge branch 'fix/oom-parallel-rendering' into 'develop'
...
Revert "Parallelize template rendering"
See merge request pleroma/pleroma!1654
5 years ago
5a76d5d239
Add extended benchmark
5 years ago
38b29779c3
refactoring
5 years ago
be32d90a0c
little refactor
5 years ago
5ff12e7df1
some changes
5 years ago
57dc59d98d
little fix
5 years ago
35757b6d0e
don't add behaviour to suggestions
5 years ago
0624e06a9c
little fix
5 years ago
8f5ee7db06
typo fix
5 years ago
6721301086
some changes
5 years ago
0559c82bdb
fix
5 years ago
a1f2dfb10a
expanding regex sigils to use modifiers
5 years ago
511d93fa54
mix docs generates config.md
5 years ago
67e4300931
description formatters
5 years ago
fcf604fa43
added tests
5 years ago
43f02dfe38
Revert "Parallelize template rendering"
...
This reverts commit 1ad71592ad
5 years ago
a31af93e1d
added tests /activity_pub/transmogrifier.ex
5 years ago
b40b10b53d
Add an endpoint to get multiple statuses by IDs
5 years ago
d1abf7a358
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
11e12b5761
Add Pleroma.Plugs.Cache
5 years ago
edbaf78176
Merge branch 'fix/read-inbox' into 'develop'
...
Fix `ActivityPubController.read_inbox/2`
Closes #1248
See merge request pleroma/pleroma!1649
5 years ago
e0f84d0043
Fix `ActivityPubController.read_inbox/2`
5 years ago
b63faf9819
[ #1234 ] Mastodon 2.4.3 hierarchical scopes initial support (WIP).
5 years ago
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
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
8c6cdff3cc
Merge branch 'develop' into issue/1218
5 years ago
39f99dc6cd
Merge branch 'develop' into support/tests
5 years ago
40a61532ca
activity: when restricting deactivated users, precalculate the user list
...
the PostgreSQL query planner is easily confused due to the complexity of
certain queries we make. while we plan to simplify these queries through
unification of activities and objects, we are not yet there. it has been
discovered that using a precalculated list of deactivated users encourages
the query planner to prefer simpler indices instead of the
activity_visibility index.
accordingly, drop the subquery and precalc the user list instead.
5 years ago
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
ab2f21e470
tests for mastodon_api_controller.ex
5 years ago
b3f6f6a409
generating remote users
5 years ago
252e5db45c
docs fixes
5 years ago
eb74c3d5c7
Merge branch 'develop' into issue/1218
5 years ago
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
40b3289c26
Refactor `add_link_headers/7` -> `add_link_headers/3`
5 years ago
896ffabe37
Merge branch 'so-long-twitterapi' into 'develop'
...
Removing TwitterAPI
See merge request pleroma/pleroma!1605
5 years ago
3523bdcf26
Call TrailingFormatPlug for /api/pleroma/emoji
...
Apparently Pleroma-FE still calls it with trailing '.json'
5 years ago
736165c082
Reverse reports list
5 years ago
a1125bd564
generatoin and fetching
5 years ago
79dde58044
one more temp commit
5 years ago
db690bede9
temp commit
5 years ago
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
26fe6f70c9
Move checking for restrict_local to User.get_cached_by_id_or_nickname
5 years ago
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
5 years ago
79cf629e1a
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
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
558969a0fd
Do not crash if one notification failed to render
5 years ago
ae506ca997
fix formatting
5 years ago
e2011a667c
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
5 years ago
8306078de1
Apply suggestion to lib/pleroma/web/activity_pub/utils.ex
5 years ago
99ea990a16
PleromaAPIController: Add emoji reactions.
5 years ago
af746fa4a8
Return total for reports
5 years ago
3542ca6702
Merge branch 'develop' into feature/moderation-log-filters
5 years ago
cb99cfcc65
don't try to truncate non-strings
5 years ago
2975da284b
truncate remote user bio/display name
5 years ago
a890451187
fetch_announcements -> take_announcements
5 years ago
8cbad5500c
add tests for activity_pub/utils.ex
5 years ago
3face45467
Mastodon API: Add `pleroma.thread_muted` to Status entity
...
Needed for pleroma-fe!941
5 years ago
7c3838090f
Apply suggestion to lib/pleroma/notification.ex
5 years ago
c2b6c1b089
Extend `/api/pleroma/notifications/read` to mark multiple notifications
...
as read and make it respond with Mastoapi entities
5 years ago
9bc12b88b3
ActivityPub: Save emoji reactions in object.
5 years ago
cc1d1ee406
Mastdon API: Add ability to get a remote account by nickname to
...
`/api/v1/accounts/:id`
5 years ago
eb17cc17a1
[ #1149 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
...
# Conflicts:
# CHANGELOG.md
5 years ago
b15cfd80ef
Return "total" optionally
5 years ago
a4c5f71e93
Return total from pagination + tests
5 years ago
b49085c156
[ #1149 ] Refactoring: GenServer workers renamed to daemons, `use Oban.Worker` moved to helper.
5 years ago
d0f07e55d2
use atom key for fields
5 years ago
05c935c396
mix format
5 years ago
35ef470d00
truncate fields for remote users instead
5 years ago
9c96b17e16
Add pagination to logs
5 years ago
dd017c65a4
[ #1149 ] Refactored Oban workers API (introduced `enqueue/3`).
5 years ago
a90ea8ba15
[ #1149 ] Addressed code review comments (code style, jobs pruning etc.).
5 years ago
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
70eed0594c
credo fixes
5 years ago
bd3ed3a622
Add back /api/qvitter/statuses/notifications/read.json
5 years ago
64410497d2
Remove TwitterAPI representers
5 years ago
985122cc03
Remove Activity, User and Notification views from TwitterAPI
5 years ago
90c2dae9a4
Remove most of Pleroma.Web.TwitterAPI.TwitterAPI
5 years ago
6ef0103ca0
added Emoji struct
5 years ago
4d6e22bb9b
Style
5 years ago
f182f0f6bd
Add ability to search moderation logs
5 years ago
d8098d142a
added Emoji.Formatter
5 years ago
5c90b70733
Apply suggestion to lib/pleroma/emoji/loader.ex
5 years ago
d7808b5db4
added code\path fields without html tags in ets
5 years ago
cef2e980b1
division emoji.ex on loader.ex and emoji.ex
5 years ago
7853b3f17d
Fix AntiFollowbotPolicy when trying to follow a relay
5 years ago
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
b770ed1d99
CommonAPI: Support emoji reactions.
5 years ago
f017260cdc
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
66519f2100
Merge branch 'list-controller' into 'develop'
...
Extract list actions from `MastodonAPIController` into `ListController`
See merge request pleroma/pleroma!1600
5 years ago
5e4fde1d3d
Filter logs by date
5 years ago
ffcd742aa0
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
5 years ago
c30cc039e4
Transmogrifier: Use Containment.get_actor to get actors.
5 years ago
00abe099cd
added tests for ActivityPub.like\unlike
5 years ago
cd78e63a25
[ #1149 ] Bugfix: Pleroma.Workers.Subscriber / "verify_websub" works with WebsubServerSubscription.
5 years ago
eb1739c596
Remove most of TwitterAPIController
5 years ago
a0b21c8928
Transmogrifier: Handle incoming emoji reactions.
5 years ago
6e1ec4c5da
ActivityPub: Basic EmojiReactions.
5 years ago
3da65292b3
Transmogrifier: Fix follow handling when the actor is an object.
5 years ago
4194abbc8f
Move mastodon_api/*_controller.ex to mastodon_api/controllers/
5 years ago
30510ade0e
Extract MastodonAPIController's list actions into MastodonAPI.ListController; Add more tests
5 years ago
4d82bc8b0b
Extract MastodonAPI.MastodonAPIController.errors/2 to MastodonAPI.FallbackController
5 years ago
3b1b631c2a
Add validation in Pleroma.List.create/2
5 years ago
8ca4f145a5
Extract if block into private function
5 years ago
6dc24422dc
Merge branch 'issue/1177' into 'develop'
...
[#1177 ] fixed unfollow for relay actor
See merge request pleroma/pleroma!1589
5 years ago
37dd3867bb
Log admin/moderator actions
5 years ago
503139b343
Merge branch 'fix-all-custom-fields-deleted' into 'develop'
...
Fix not to use unupdated attachments when all fields are deleted
See merge request pleroma/pleroma!1596
5 years ago
b15e226593
Change to delete empty name field
5 years ago
705b5adfc4
Fix type of fields_attributes
...
Convert tuple list to map list when parameters is `:urlencoded` or `:multipart`
5 years ago
45e21a9df4
Rename fields to fields_attributes
5 years ago
3549cd9754
Change to use attachment only when fields do not exist
5 years ago
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
efb8818e9e
Activity Expiration: Switch to 'expires_in' system.
5 years ago
1692fa8945
ActivityExpirationWorker: Fix merge issues.
5 years ago
654d291b6d
update tests
5 years ago
6062017493
put_resp_header("content-type", "application/activity+json") -> put_resp_content_type("application/activity+json")
5 years ago
cc6c0b4ba6
Merge remote-tracking branch 'origin/develop' into sixohsix/pleroma-post_expiration
5 years ago
581123f8bb
[ #1149 ] Introduced `quantum` job scheduler. Documentation & config changes.
5 years ago
c056736daa
[ #1149 ] Publisher worker fix (atomized `params` keys).
5 years ago
c29686309e
[ #1149 ] Upgraded `oban` from 0.6.0 to 0.7.1.
5 years ago
8dc6a6b210
fix /inbox for Relay
5 years ago
399ca9133b
fix test
5 years ago
f95b67c933
Merge branch 'develop' into issue/1177
5 years ago
7101ba1a21
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
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
a79ebac592
Improve AP routes rate limit
5 years ago
64bfb41c55
fixed unfollow for relay actor
5 years ago
37229af15f
remove old user create and delete routes for admin
5 years ago
f740d786a3
Merge branch 'rate-limit-ap-routes' into 'develop'
...
[#1174 ] Rate limit AP routes
See merge request pleroma/pleroma!1586
5 years ago
74f7f308f8
Merge branch 'fix/admin-api-user-deletion' into 'develop'
...
Fix deactivated user deletion
See merge request pleroma/pleroma!1546
5 years ago
8d899d6197
Add `:ap_routes` rate limit
5 years ago
8340fe8fcc
Merge branch 'digest-template' into 'develop'
...
Improve digest email template
See merge request pleroma/pleroma!1565
5 years ago
ef43016b2c
Merge branch 'feature/custom-fields' into 'develop'
...
Add custom profile fields
See merge request pleroma/pleroma!1488
5 years ago
5171aa5b4d
Refactor check_actor_is_active
5 years ago
d2c9befc64
Merge branch 'develop' into 'fix/reverse-proxy-body-too-large'
...
# Conflicts:
# CHANGELOG.md
5 years ago
75a5dd41ee
Add more tests for Database tasks and DigestEmailWorker
5 years ago
49ae3191df
Merge branch 'hotfix/user_unfollow' into 'develop'
...
[#1177 ] fixed User.unfollow with synchronization external user
See merge request pleroma/pleroma!1579
5 years ago
e652cef76b
removes duplicates from relay subscription list
5 years ago
475fcb3e6c
Merge branch 'fix/bugfix-blocked-user-follow-reqs' into 'develop'
...
Clear follow requests when blocking a user
See merge request pleroma/pleroma!1583
5 years ago
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
94e336d9d5
clear follow requests when blocking a user
5 years ago
ef82f868d9
Formatting
5 years ago
3315a2a1c3
fixed User.unfollow with synchronization external user
5 years ago
7ab2dbbdb6
Merge branch 'pleroma-conversations' into 'develop'
...
Extended Pleroma Conversations
See merge request pleroma/pleroma!1535
5 years ago
158231cd20
Add configurable colors and logo for the digest template
5 years ago
6a3b1a526e
max_body_size -> max_body_length, as it should be
5 years ago
fba3c16d20
Fix OAuth cleanup worker unconditionally starting
...
!1576 removed enabled/disabled check from the worker, in favor of just
not starting it in application.ex if disabled. However a line
unconditionally starting the worker was removed
5 years ago
1c8f58a30e
Merge branch 'features/formatting-sub_sup' into 'develop'
...
html.ex: Allow sub and sup elements by default
Closes #1191
See merge request pleroma/pleroma!1572
5 years ago
1ad71592ad
Parallelize template rendering
5 years ago
a4a3e3becd
Hide muted theads from home/public timelines unless `with_muted` is set
5 years ago
9fb71ce7f4
Merge branch 'cache-follow-state' into 'develop'
...
Cache follow state
Closes #1180
See merge request pleroma/pleroma!1573
5 years ago
ec969eec51
Merge branch 'develop' into 'fix/admin-api-user-deletion'
...
# Conflicts:
# CHANGELOG.md
5 years ago
2b94ae3b39
Do not check if actor is active when deleting a user
5 years ago
e8a8d50138
Collect stats immediately after init
5 years ago
bd5ad0af78
Cache follow state
5 years ago
a9e75fa6a4
Add a task to benchmark timeline rendering
5 years ago
a6a814420d
html.ex: Allow sub and sup elements by default
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1191
5 years ago
31d576de0c
Merge branch 'misc-otp-issues' into 'develop'
...
Misc OTP issues
See merge request pleroma/pleroma!1567
5 years ago
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
1754f8ce6d
Apply suggestion to lib/pleroma/web/activity_pub/publisher.ex
5 years ago
5bb418a90d
activitypub: publisher: add (request-target) to http signature when POSTing
5 years ago
626e094589
MRF: fix up unserializable option lists in describe implementations
5 years ago
8778c16dac
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
a180c1360e
[ #1149 ] Oban mailer job. Adjusted tests.
5 years ago
c43152f6c1
fix formatting
5 years ago
d81f63845a
Implement Pleroma.Stats as GenServer
5 years ago
574856ef01
streamline Streamer pings
5 years ago
15ef521009
Isolate OAuth.Token.CleanWorker
5 years ago
51bdf0cab6
use default child_specs
5 years ago
d3af9e19ed
Conversations: Load relations in one query.
5 years ago
c9970feee2
Fix compatibility with Elixir 1.8
5 years ago
f73212b2a3
Conversation: Render new participation on update.
5 years ago
df81abb68c
Conversations: Use correct oauth paths for extended api.
5 years ago
4b7f1c6995
Improve digest email template
5 years ago
560dbad538
Merge remote-tracking branch 'origin/develop' into pleroma-conversations
5 years ago
672fcbc7b7
Limit custom fields for old remote users
5 years ago
e457fcc479
Add `:max_remote_account_fields` config option
5 years ago
f7bbf99caa
Use info.fields instead of source_data for remote users
5 years ago
2c35d4b0b0
Add configurable account field name length limit
5 years ago
db3c05f6b4
Add configurable account field value length limit
5 years ago
7d6f8a7fd7
Linkify custom fields values in ActivityPub.UserViewx
5 years ago
5178f960c3
Support user attachment update in Transmogrifier
5 years ago
88598c9baf
Add profile custom fields to ActivityPub.UserView
5 years ago
a22f540fc4
Add custom fields to TwitterAPI.UserView
5 years ago
e0ac5c7a66
Add custom profile fields
5 years ago
kaniini