791bcfd90f
Merge branch 'develop' into feature/store-statuses-data-inside-flag
5 years ago
8eff05d4c6
Strip status data from Flag (when federating or closing/resolving report)
5 years ago
b777083f3f
Add `also_known_as` field to Pleroma.User
5 years ago
4c1dd55c48
Merge remote-tracking branch 'upstream/develop' into refactor/following-relationships
5 years ago
b08b1d5d91
Store status data inside Flag activity
5 years ago
c0246309a5
[ #1304 ] Extra bullet-proofing.
5 years ago
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
5 years ago
3f6a596922
activitypub: visibility: refactor is_public?() to use JSON-LD safe accessors
5 years ago
7c7f90bc4f
[ #1304 ] Merged `develop`, handled User.Info.invisible.
5 years ago
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
c6fba62666
Fix Relay
5 years ago
4ea1a61b00
Merge branch 'develop' into refactor/following-relationships
5 years ago
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
e8843974cb
[ #1304 ] Moved remaining fields from User.Info to User.
...
Misc. fixes / improvements.
5 years ago
c9280b9730
rework to use properties instead of compound typing, per SocialCG
5 years ago
ef659331b0
implement invisible support for remote users
5 years ago
1469a084d4
relay: set invisible to true
5 years ago
019147f115
Merge branch 'develop' into feature/relay-list
5 years ago
bae96de273
activitypub: tag containment checks for better error tracing
5 years ago
48059c03c9
fix up some tests
5 years ago
adb639db56
publisher: move remote_users() from Salmon module
5 years ago
4f82e42e4e
websub: remove entirely
5 years ago
2473702be2
Merge branch 'develop' into feature/relay-list
5 years ago
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
5 years ago
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
5 years ago
6977cddff9
Merge branch 'benchmark-finishing' into 'develop'
...
Benchmark finishing
Closes #755
See merge request pleroma/pleroma!1848
5 years ago
90d516d42b
Store status data inside flag activity
5 years ago
a97b642289
Mastodon API: Add `exclude_visibilities` parameter to the timeline and notification endpoints
5 years ago
cc6875b582
Add `GET /api/pleroma/admin/relay` endpoint - lists all followed relays
5 years ago
37812740c4
Transmogrifier: Correctly save incoming ids for Accept/Reject.
5 years ago
9b963064eb
Transmogrifier: Actually store who deleted a note.
5 years ago
059005ff82
Replace `user.following` with Pleroma.FollowingRelationship
5 years ago
29647dfd09
Transmogrifier: Save correct ids for incoming deletes.
5 years ago
c54ae662dc
Merge remote-tracking branch 'origin/develop' into benchmark-finishing
5 years ago
d7f9679ff2
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
24eecc3cb4
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
35068baf65
Merge branch 'develop' into feature/reports-groups-and-multiple-state-update
5 years ago
7aceaa517b
Admin API: Reports, grouped by status
5 years ago
9a2f71f4d5
mastodon api: fix exclude_replies ( closes #1287 )
5 years ago
73b6512907
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
91e90aa807
Merge branch 'misskey-compat' into 'reactions'
...
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
See merge request pleroma/pleroma!1783
5 years ago
58aeabd020
mrf/simple_policy: check actor against accept/reject
5 years ago
fefbd31c6e
Move local keys out of `user.info`
5 years ago
61097ba6ab
Merge branch 'develop' into 'reactions'
...
# Conflicts:
# CHANGELOG.md
5 years ago
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
4b8524f392
ActivityPub / Transmogrifier: Correctly store incoming Update id.
5 years ago
791d93ff0e
Make credo happy
5 years ago
977e711e22
Import object from self-Announce whenever possible
5 years ago
6a85f7d1ea
Transmogrifier: Extend misskey like compatibility.
5 years ago
d9aaea44ff
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
83631752af
removed legacy api: "/objects/:uuid/likes"
5 years ago
8dcc2f9f5e
Admin API: Allow changing the state of multiple reports at once
5 years ago
43a211bcb1
Transmogrifier: Handle misskey likes with reactions like EmojiReactions.
5 years ago
568a995d64
ActivityPub: Change addressing of Undo.
5 years ago
c9043c6c80
Transmogrifier: Handle incoming Undos for EmojiReactions.
5 years ago
9cfe9a57c5
CommonAPI: Add unreactions.
5 years ago
dfe5c958eb
ActivityPub: Add undo for emoji reactions.
5 years ago
557223b2b5
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
86880b9821
Inline object when Announcing a self-owned private object
5 years ago
427d0c2a00
Store private announcements in object.data["announcements"], filter them on display
5 years ago
fe538973dd
Ensure self-announces do not widen the audience of the original post
5 years ago
1f0be71ea4
Make activity announceable by its author.
5 years ago
2dad6dd020
Extract apps actions from `MastodonAPIController` to `AppController`
5 years ago
dae744478e
Transmogrifier: Handle compact objects in undos.
5 years ago
19bc0b8c79
.
5 years ago
08256e9299
ActivityPub: Federate reactions.
5 years ago
a7f22c6e93
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
b923842e96
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
26f66fb70a
Merge branch 'features/apc2s-media-upload' into 'develop'
...
AP C2S mediaUpload
Closes #1171
See merge request pleroma/pleroma!1706
5 years ago
84712c35f9
activitypub: object view: include child object for Listen activities
5 years ago
7cad6ea67a
pleroma api: hook up scrobbler controller
5 years ago
172c74a77b
activitypub: transmogrifier: implement support for Listen activities
5 years ago
1f9de2a8cd
activitypub: implement IR-level considerations for Listen activities
5 years ago
e9d1aa75d5
Revert subscription refactoring.
...
As discussed in pleroma-meta#2
This reverts commit eb9aa7aa10c4fbb56984
5 years ago
b4b147000c
Merge develop
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
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
b5dfe83433
Replace `Pleroma.FlakeId` with `flake_id` hex package
5 years ago
60cbea5bb2
Allow activities pagination via limit/offset
5 years ago
79b25be4e1
Do not return tuple when unneeded
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
38245f1336
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
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
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
0e6085da10
Fix pagination in AP outbox.json
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
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
d32894ae51
Move object internal fields to a constant
5 years ago
7dd51652f9
Merge branch 'develop' into issue/733
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
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
76c3e290fc
Merge develop
5 years ago
085d014f08
Fix `Transmogrifier.upgrade_user_from_ap_id/1`
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
d75bc728e7
Merge branch 'develop' into issue/733
5 years ago
8751809e1e
Merge branch 'develop' into support/tests
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
ba70a8cae6
Merge branch 'develop' into feature/delivery-tracking
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
2784962dba
Apply suggestion to lib/pleroma/web/activity_pub/activity_pub_controller.ex
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
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
39dc9b470c
Cleanup Pleroma.Activity and Pleroma.Web.ActivityPub.Utils
5 years ago
2b40e57a72
Merge branch 'develop' into test/activity_pub/transmogrifier.ex
5 years ago
769fb778d4
Track object/create activity fetches
5 years ago
8d4b661ecb
Transmogrifier: Strip internal emoji reaction fields.
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
fcf604fa43
added tests
5 years ago
a31af93e1d
added tests /activity_pub/transmogrifier.ex
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
c3f00447af
Merge remote-tracking branch 'remotes/upstream/develop' into 1149-oban-job-queue
5 years ago
39f99dc6cd
Merge branch 'develop' into support/tests
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
79dde58044
one more temp commit
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
a890451187
fetch_announcements -> take_announcements
5 years ago
8cbad5500c
add tests for activity_pub/utils.ex
5 years ago
9bc12b88b3
ActivityPub: Save emoji reactions in object.
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
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
f017260cdc
Merge remote-tracking branch 'origin/develop' into reactions
5 years ago
Maxim Filippov