rinpatch
8dd7c099a7
Merge branch 'bugfix/streamer-follows' into 'develop'
...
streamer: use direct object for filter checks when there is no valid child object in an activity
Closes #1291
See merge request pleroma/pleroma!1931
5 years ago
kaniini
74135e1318
Merge branch 'feature/omit-relay-user' into 'develop'
...
AdminAPI: Omit relay user from users list
Closes #1349
See merge request pleroma/pleroma!1924
5 years ago
kaniini
61bcd4595f
Merge branch 'feature/fast_sanitize' into 'develop'
...
Switching to FastSanitize
See merge request pleroma/pleroma!1916
5 years ago
Ariadne Conill
4bf942583f
streamer: use direct object for filter checks when there is no valid child object in an activity
...
We call Object.normalize/1 to get the child object for situations like Announce.
However, the check is flawed and immediately fails if Object.normalize/1 fails.
Instead, we should use the activity itself in those cases to allow activities which
never have a child object to pass through the filter.
Closes #1291
5 years ago
Maxim Filippov
1b83a0694a
Fix moderation log crash
5 years ago
Maxim Filippov
743b622b7b
Force password reset for multiple users
5 years ago
Maxim Filippov
d75934b0d0
Undo dialyzer fix
5 years ago
Maxim Filippov
ced9f92327
Fix count
5 years ago
Maxim Filippov
6f9d3d30fa
AdminAPI: Omit relay user from users list
5 years ago
Maxim Filippov
59a149c69a
Fix "the call ... will never return" warning
5 years ago
Mark Felder
fcea6a9d2c
Merge branch 'develop' into feature/fast_sanitize
5 years ago
Egor Kislitsyn
61fc739ab8
Handle "Move" activity
5 years ago
kPherox
363e76d4da
Fix duplicate recipients
5 years ago
rinpatch
ae59b38203
Rip out the rest of htmlsanitizeex
5 years ago
rinpatch
77cfb08b8c
Remove commented-out code
5 years ago
kPherox
0c361eeb25
Add pending to handle incoming for Follow activity
5 years ago
rinpatch
08f6837065
Switch from HtmlSanitizeEx to FastSanitize
5 years ago
Egor Kislitsyn
4270861085
Merge branch 'develop' into feature/move-activity
5 years ago
lain
2480200759
Merge branch 'refactor/following-relationships' into 'develop'
...
Move following relationships to a separate table
Closes #1233
See merge request pleroma/pleroma!1814
5 years ago
Maxim Filippov
d56bc62275
Fix report parsing
5 years ago
Maxim Filippov
791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
5 years ago
Maxim Filippov
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
5 years ago
eugenijm
0580654485
Mark the conversations with the blocked user as read and update the blocking user's `unread_conversation_count`.
...
Since the conversations with the blocked user are invisible, they are excluded
from the blocking user's `unread_conversation_count`.
5 years ago
rinpatch
653054d301
Merge branch 'remove-unsed-info-fields-fn' into 'develop'
...
Remove unused Pleroma.User.info_fields/0
See merge request pleroma/pleroma!1882
5 years ago
Egor Kislitsyn
b777083f3f
Add `also_known_as` field to Pleroma.User
5 years ago
Egor Kislitsyn
dbee53c2df
Remove unused Pleroma.User.info_fields/0
5 years ago
stwf
2ab072f949
object fetcher error handling
5 years ago
Egor Kislitsyn
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
Maxim Filippov
b08b1d5d91
Store status data inside Flag activity
5 years ago
Ivan Tashkinov
c0246309a5
[ #1304 ] Extra bullet-proofing.
5 years ago
Ivan Tashkinov
065e9fac12
[ #1304 ] Adjusted User.Info references from Notification.
5 years ago
Ivan Tashkinov
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
Ivan Tashkinov
11cd994425
[ #1304 ] Fixed null::jsonb handling in User.Info migration.
5 years ago
Ariadne Conill
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
5 years ago
kaniini
6281e4795a
Merge branch 'feature/push-subject-for-dm' into 'develop'
...
Direct messages should provide a distinct push notification subject
See merge request pleroma/pleroma!1864
5 years ago
rinpatch
6712b6e4de
Merge branch 'fix/notifs-exclude-blocked-from-with-muted' into 'develop'
...
Do not include notifications from blocked users when with_muted is set
See merge request pleroma/pleroma!1869
5 years ago
rinpatch
2dbee29cf5
Do not include notifications from blocked users when with_muted is set
...
This is not what with_muted is for per documentation and it was agreed
on irc that this behavior doesn't make sense.
5 years ago
Ivan Tashkinov
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
5 years ago
Maksim Pechnikov
243719a965
Merge branch 'develop' into feature/masto_api_markers
5 years ago
Ivan Tashkinov
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
5 years ago
Egor Kislitsyn
c6fba62666
Fix Relay
5 years ago
Egor Kislitsyn
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
Ivan Tashkinov
ee04fbc35a
[ #1304 ]. Post-merge fixes. Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
5 years ago
Ivan Tashkinov
c6fdfbc4f1
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/notification.ex
# lib/pleroma/user.ex
# lib/pleroma/user/info.ex
# lib/pleroma/web/activity_pub/activity_pub.ex
# lib/pleroma/web/admin_api/admin_api_controller.ex
# lib/pleroma/web/ostatus/handlers/follow_handler.ex
# lib/pleroma/web/ostatus/ostatus.ex
# lib/pleroma/web/salmon/salmon.ex
# lib/pleroma/web/websub/websub.ex
# test/web/admin_api/admin_api_controller_test.exs
# test/web/federator_test.exs
# test/web/mastodon_api/controllers/conversation_controller_test.exs
# test/web/ostatus/ostatus_controller_test.exs
# test/web/ostatus/ostatus_test.exs
# test/web/salmon/salmon_test.exs
# test/web/websub/websub_test.exs
5 years ago
Ivan Tashkinov
b4cbf0568b
[ #1304 ] Analysis issue fix.
5 years ago
Ivan Tashkinov
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
5 years ago
Ariadne Conill
c9280b9730
rework to use properties instead of compound typing, per SocialCG
5 years ago
Ariadne Conill
ef659331b0
implement invisible support for remote users
5 years ago
Ariadne Conill
95871cb462
user: implement User.invisible?/1
5 years ago
Ariadne Conill
1469a084d4
relay: set invisible to true
5 years ago
Ariadne Conill
e7333db72a
user info: add invisible field
5 years ago
Haelwenn
f01dbc450c
Merge branch 'feature/mastofe-pwa' into 'develop'
...
MastoFE: Add PWA manifest.
See merge request pleroma/pleroma!1834
5 years ago
eugenijm
52ed2f8f2d
Pleroma API: `POST /api/v1/pleroma/conversations/read` to mark all user's conversations as read
5 years ago
KokaKiwi
638457ba94
MastoFE: Add PWA manifest.
5 years ago
Mark Felder
dcb23a85b6
Merge branch 'develop' into feature/push-subject-for-dm
5 years ago
Mark Felder
152caef51d
Direct messages should provide a distinct push notification subject
5 years ago
Maxim Filippov
019147f115
Merge branch 'develop' into feature/relay-list
5 years ago
Ariadne Conill
44e64af5e7
object: containment: simplify the pattern match for OStatus testsuite hack
5 years ago
Ariadne Conill
e99fdfc32d
object: containment: only allow OStatus references in test suite environment
5 years ago
Ariadne Conill
3c785b85a6
object: fetcher: fix up formatting
5 years ago
Ariadne Conill
bae96de273
activitypub: tag containment checks for better error tracing
5 years ago
Ariadne Conill
7295a05cee
object: containment: also allow OStatus object IDs through when comparing origins
5 years ago
Ariadne Conill
a177f22e02
object: fetcher: improve error reporting
5 years ago
Ariadne Conill
bf2107743f
object: containment: don't try to contain ostatus objects
5 years ago
Ariadne Conill
6f110fc04c
object fetcher: fix up error handling
5 years ago
Ariadne Conill
48059c03c9
fix up some tests
5 years ago
Ariadne Conill
d379b48769
kill almost all of the OStatus module
5 years ago
Ariadne Conill
6a1f4c5145
federator: remove OStatus incoming document support
5 years ago
Ariadne Conill
835ad52378
remove Salmon module
5 years ago
Ariadne Conill
beb9861f9d
router: disconnect Salmon
5 years ago
Ariadne Conill
a7b92bba68
webfinger: stop pulling Salmon data out of WebFinger
5 years ago
Ariadne Conill
c00ae10af8
feed: don't advertise salmon endpoint
5 years ago
Ariadne Conill
adb639db56
publisher: move remote_users() from Salmon module
5 years ago
Ariadne Conill
4f82e42e4e
websub: remove entirely
5 years ago
Ariadne Conill
b16a460916
federator: remove websub stuff
5 years ago
Ariadne Conill
25b7ff56c3
application: don't start Federator.init/1 anymore
5 years ago
rinpatch
39e996528c
Fix a migration wiping user info of users that don't have any mutes
...
And introduce safe_jsonb_set
5 years ago
Haelwenn (lanodan) Monnier
3c6fd0bb99
upload.ex: Remove deprecated configuration
5 years ago
Maxim Filippov
2473702be2
Merge branch 'develop' into feature/relay-list
5 years ago
kaniini
7511f3d192
Merge branch 'fix-streaming-with-sec-websocket-protocol' into 'develop'
...
Fix streaming websocket handshake with `Sec-WebSocket-Protocol`
See merge request pleroma/pleroma!1847
5 years ago
kaniini
733b73b71c
Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex
5 years ago
eugenijm
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
Maksim Pechnikov
66b5d0ff55
add Markers /api/v1/markers
5 years ago
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
lain
1bfdf57fc7
Merge branch 'user-search-experiments' into 'develop'
...
User search: Remove trigram and refactor the module
See merge request pleroma/pleroma!1850
5 years ago
feld
21f0757b0d
Merge branch 'feature/multiple-users-activation-permissions' into 'develop'
...
Ability to toggle activation status, permission group & delete multiple users
Closes admin-fe#39
See merge request pleroma/pleroma!1825
5 years ago
lain
6977cddff9
Merge branch 'benchmark-finishing' into 'develop'
...
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
5 years ago
rinpatch
0a5175ecbb
Order fts results by trigram
5 years ago
rinpatch
c10ce113d4
User search: Remove trigram and refactor the module
...
- Remove trigram as it tends to rank garbage results highly, resulting
in it prioritized above fts, which gives actually decent results. ACKed
by kaniini and lain on irc.
- Remove a test for handling misspelled requests, since we no longer have
trigram
- Remove a test for searching users with `nil` display names, because it
is unrealistic, we don't accept usernames that are not >1 char strings
- Make rank boosting for followers/followees sane again, previous values
resulted in garbage matches getting on top just because the users are
followers/followees
5 years ago
Maxim Filippov
da0e4879bc
DELETE /api/pleroma/admin/users now accepts nicknames array
5 years ago
Maxim Filippov
90d516d42b
Store status data inside flag activity
5 years ago
Alexander
e7bb762ec2
don't stream in benchmark env
5 years ago
kPherox
5bd0717de2
Add `Sec-WebSocket-Protocol` to response header
5 years ago
Egor Kislitsyn
1d46944fbd
Do not add `follower_address` to `following` for non local users
5 years ago
eugenijm
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
lain
e3b4a3e96b
Merge branch 'incoming-id-fixes' into 'develop'
...
Assorted transmogrifier fixes
See merge request pleroma/pleroma!1831
5 years ago
rinpatch
9bdbf0811b
Make MediaProxy failure tracking less brutal
...
The current failure tracking mechanism will never request anything that
didn't respond with a success, 403, 404, or 5xx codes. This is causing
issues when using in real fediverse because of weird status codes
some software has and timeouts being frequent. This patch changes
failure tracking mechanism to only never request the url again if it
responded with 400, 204, or the body is too large, otherwise it can be
re-requested in 60 seconds.
5 years ago
Maxim Filippov
cc6875b582
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
Maxim Filippov
c0aca32dd0
Merge branch 'develop' into feature/multiple-users-activation-permissions
5 years ago
Maxim Filippov
aaa4252f41
Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it
5 years ago
lain
422aa6befe
Ostatus DeleteHandler: Fix for new option format.
5 years ago
lain
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
lain
9b963064eb
Transmogrifier: Actually store who deleted a note.
5 years ago
Maxim Filippov
f5104f36bb
Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it
5 years ago
Egor Kislitsyn
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
lain
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
5 years ago
lain
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
lain
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Maxim Filippov
24eecc3cb4
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov
ad42837244
Ability to toggle activation status and permission group for a group of users
5 years ago
eugenijm
580a67f5ca
Mastodon API: Return `pleroma.direct_conversation_id` when viewing a status (`GET /api/v1/statuses/:id`)
5 years ago
Maxim Filippov
aa7fd616c7
Line is too long!
5 years ago
Maxim Filippov
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
Maxim Filippov
7aceaa517b
Admin API: Reports, grouped by status
5 years ago
lain
6c278cfe09
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Ariadne Conill
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
5 years ago
Sergey Suprunenko
4b3f77a99f
Extract RSS Feed functionality from OStatus
5 years ago
lain
d580eedfe9
Linting.
5 years ago
lain
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini
93bdc55306
Merge branch 'mrf/simple_policy/check_actor' into 'develop'
...
mrf/simple_policy: check actor against accept/reject
See merge request pleroma/pleroma!1806
5 years ago
Ivan Tashkinov
28fb98d69e
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
lain
91e90aa807
Merge branch 'misskey-compat' into 'reactions'
...
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783
5 years ago
Haelwenn
b4f3c16885
Merge branch '1234-mastodon-2-4-3-oauth-scopes' into 'develop'
...
[#1234 ] Mastodon 2.4.3 hierarchical OAuth scopes
Closes #1234
See merge request pleroma/pleroma!1643
5 years ago
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
kaniini
2411d09215
Merge branch 'refactoring/move-out-keys-from-user-info' into 'develop'
...
Move local keys out of `user.info`
See merge request pleroma/pleroma!1799
5 years ago
feld
1d8e956c32
Use the user.id instead of nickname in report URLs
...
Ensures links to profiles of remote users work.
5 years ago
Ivan Tashkinov
b93856874d
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
rinpatch
fefbd31c6e
Move local keys out of `user.info`
5 years ago
Ivan Tashkinov
06b3bb54c5
Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/account_controller.ex
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
lain
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
Ivan Tashkinov
f459aabdfa
Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions
...
# Conflicts:
# CHANGELOG.md
5 years ago
Haelwenn
9e34919dcd
Merge branch 'fix-prameter-name-of-accounts-update-credentials' into 'develop'
...
Fix custom fields of accounts update credentials
See merge request pleroma/pleroma!1597
5 years ago
kaniini
7a318d74e6
Merge branch 'split-masto-api/leftovers' into 'develop'
...
[#1278 ] Move a few more actions from MastodonAPIController
See merge request pleroma/pleroma!1761
5 years ago
kaniini
45b7f03f89
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Import object from self-Announce whenever possible
See merge request pleroma/pleroma!1770
5 years ago
kaniini
17ff4b43cb
Merge branch 'unread-conversation-count' into 'develop'
...
Add `pleroma.unread_conversation_count` to the Account entity
See merge request pleroma/pleroma!1796
5 years ago
eugenijm
8249924485
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
lain
1ed8fbc4d9
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
lain
276a520163
CommonAPI: Create profile updates as public.
...
This saves us lots of sending out because we can use sharedInbox.
5 years ago
lain
4b8524f392
ActivityPub / Transmogrifier: Correctly store incoming Update id.
5 years ago
Thibaut Girka
791d93ff0e
Make credo happy
5 years ago
Thibaut Girka
977e711e22
Import object from self-Announce whenever possible
5 years ago
kaniini
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
5 years ago
lain
6a85f7d1ea
Transmogrifier: Extend misskey like compatibility.
5 years ago
lain
d9aaea44ff
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Maksim Pechnikov
83631752af
removed legacy api: "/objects/:uuid/likes"
5 years ago
kaniini
e0c0ea9f13
Merge branch 'bugfix/widen-streamer-blocks' into 'develop'
...
widen streaming API block effects
See merge request pleroma/pleroma!1784
5 years ago
kaniini
5c04e81724
Merge branch 'user-info-unread-direct-conversation' into 'develop'
...
Add the `unread_conversation_count` field to the user info
See merge request pleroma/pleroma!1737
5 years ago
Maxim Filippov
8dcc2f9f5e
Admin API: Allow changing the state of multiple reports at once
5 years ago
Ariadne Conill
d1d058bf85
streamer: worker: actually use should_send? consistently
5 years ago
Ariadne Conill
5a0c018d2a
streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist
5 years ago
Ariadne Conill
2417b633ed
streamer: add missing copyright headers
5 years ago
lain
43a211bcb1
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
5 years ago
lain
568a995d64
ActivityPub: Change addressing of Undo.
5 years ago
lain
27110793a7
Merge branch 'featrue/job-monitor' into 'develop'
...
Add Pleroma.JobQueueMonitor
Closes #1274
See merge request pleroma/pleroma!1721
5 years ago
lain
27e914955e
Merge branch 'fix/nickname-fail' into 'develop'
...
Fix get_cached_by_nickname_or_id not allowing to get local users by nickname
Closes #1293
See merge request pleroma/pleroma!1777
5 years ago
rinpatch
8217292085
Fix get_cached_by_nickname_or_id not allowing to get local users by
...
nickname
Closes #1293
5 years ago
lain
01da6344b9
Merge branch 'bugfix/notification-nil-actor' into 'develop'
...
notification_view.ex: Make sure `account` isn’t empty
See merge request pleroma/pleroma!1779
5 years ago
Egor Kislitsyn
d3ac4e8083
Fix OAuthController
5 years ago
Haelwenn (lanodan) Monnier
5dc14c89ce
notification_view.ex: Make sure `account` isn’t empty
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
5 years ago
eugenijm
06d9df79c5
Mastodon API: Add `pleroma.unread_conversation_count` to the Account entity
5 years ago
lain
c9043c6c80
Transmogrifier: Handle incoming Undos for EmojiReactions.
5 years ago
Ivan Tashkinov
64095961fe
[ #1234 ] Merge remote-tracking branch 'remotes/upstream/develop' into 1234-mastodon-2-4-3-oauth-scopes
...
# Conflicts:
# CHANGELOG.md
# lib/pleroma/web/mastodon_api/controllers/mastodon_api_controller.ex
# lib/pleroma/web/router.ex
5 years ago
lain
4cb603e1df
PleromaAPI: Add unreacting.
5 years ago
lain
391c736292
PleromaAPI: Fix emoji_reactions_by
5 years ago
Egor Kislitsyn
e0c68eeb02
Move `:favourites` and `:bookmarks` actions to StatusController
5 years ago
Egor Kislitsyn
7f2bc57725
Move `follows`, `mutes` and `blocks` actions to AccountController
5 years ago
lain
9cfe9a57c5
CommonAPI: Add unreactions.
5 years ago
Egor Kislitsyn
d3c404af12
Add MastoFEController
5 years ago
lain
dfe5c958eb
ActivityPub: Add undo for emoji reactions.
5 years ago
Egor Kislitsyn
1c6e1055c8
Add CustomEmojiController
5 years ago
lain
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
kaniini
433f2c0f68
Merge branch 'split-masto-api/instance' into 'develop'
...
Extract instance actions from `MastodonAPIController` to `InstanceController`
See merge request pleroma/pleroma!1760
5 years ago
kaniini
debd0a3066
Merge branch 'accept-embedded-announce-object' into 'develop'
...
Inline object when Announcing a self-owned private object
See merge request pleroma/pleroma!1769
5 years ago
Thibaut Girka
86880b9821
Inline object when Announcing a self-owned private object
5 years ago
Thibaut Girka
3d61efa7c9
Rename misleading `get_announce_visibility` to `public_announce?`
5 years ago
Egor Kislitsyn
26693292f4
Remove `:enqueued` counter
5 years ago
Egor Kislitsyn
c8b01f6667
Extract instance actions from `MastodonAPIController` to `InstanceController`
5 years ago
kaniini
89ab673d00
Merge branch 'feature/send-identifier-on-oauth-error' into 'develop'
...
Send an identifier alongside with error message in OAuthController
See merge request pleroma/pleroma!1765
5 years ago
kaniini
8557176808
Merge branch 'split-masto-api/auth' into 'develop'
...
Extract auth actions from `MastodonAPIController` to `AuthController`
See merge request pleroma/pleroma!1759
5 years ago
kaniini
9b38bf4af4
Merge branch 'features/private-reblogs' into 'develop'
...
Allow receiving private self-announces over ActivityPub
See merge request pleroma/pleroma!1766
5 years ago
feld
1255ec888d
Revert "Add upload limits to /api/v1/instance"
...
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
5 years ago
Thibaut Girka
427d0c2a00
Store private announcements in object.data["announcements"], filter them on display
5 years ago
Sergey Suprunenko
c541b83bef
Track failed proxy urls and don't request them again
5 years ago
Thibaut Girka
43e3db0951
Fix returned visibility of announces in MastodonAPI
5 years ago
Thibaut Girka
4c1f158f5d
Allow users to announce privately, including own private notes
5 years ago
Maxim Filippov
b2273c695e
Discard identifier, if empty
5 years ago
Thibaut Girka
fe538973dd
Ensure self-announces do not widen the audience of the original post
5 years ago
KokaKiwi
1f0be71ea4
Make activity announceable by its author.
5 years ago
Maxim Filippov
0f9c2c8b87
Send an identifier alongside with error message in OAuthController
5 years ago
Egor Kislitsyn
af690d1033
Extract auth actions from `MastodonAPIController` to `AuthController`
5 years ago
Egor Kislitsyn
2dad6dd020
Extract apps actions from `MastodonAPIController` to `AppController`
5 years ago
Egor Kislitsyn
39695c4436
Extract suggestions actions from `MastodonAPIController` to `SuggestionController`
5 years ago
Egor Kislitsyn
585bc57edb
Extract media actions from `MastodonAPIController` to `MediaController`
5 years ago
Egor Kislitsyn
36a34c36fe
Extract poll actions from `MastodonAPIController` to `PollController`
5 years ago
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
lain
04a2910f33
Pleroma.Constants: Fix typo.
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