lain
8c2c325598
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms
2020-04-17 15:51:24 +02:00
lain
ca598e9c27
AccountView: Return user ap_id.
2020-04-16 15:27:35 +02:00
Egor Kislitsyn
cf4ebba774
Cleanup SubscriptionController
2020-04-15 23:14:47 +04:00
Maksim Pechnikov
4b3b1fec4e
added an endpoint for getting unread notification count
2020-04-15 21:19:43 +03:00
lain
4576520461
Revert "Merge branch 'issue/1276' into 'develop'"
...
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
Haelwenn (lanodan) Monnier
9172d719cc
profile emojis in User.emoji instead of source_data
2020-04-10 06:20:02 +02:00
Maksim Pechnikov
2b7d7bbd2d
Merge branch 'develop' into issue/1276
2020-04-07 14:09:43 +03:00
lain
349b9d86dc
Merge branch 'remake-remodel-2' into 'develop'
...
Ingestion Pipeline Revamp
See merge request pleroma/pleroma!2315
2020-04-06 11:59:01 +00:00
Ivan Tashkinov
aa78325117
[ #2323 ] Fixed a typo causing /accounts/relationships to render default relationships. Improved the tests.
2020-04-02 19:23:30 +03:00
Maksim Pechnikov
dbcfac11b4
Merge branch 'develop' into issue/1276
2020-04-02 14:47:17 +03:00
ef7d2b0f11
Merge branch 'gun' into 'develop'
...
Gun adapter
Closes #945
See merge request pleroma/pleroma!1861
2020-04-01 17:05:09 +00:00
Haelwenn (lanodan) Monnier
185520d1b4
Provide known-good user.uri, remove User.profile_url/1
2020-03-31 23:55:29 +02:00
Haelwenn (lanodan) Monnier
b30fb1f3bb
User: Fix use of source_data in profile_url/1
2020-03-31 23:54:20 +02:00
Haelwenn (lanodan) Monnier
2553400a66
Initial failing test statement against funkwhale channels
2020-03-31 23:54:20 +02:00
Alexander Strizhakov
f497cf2f7c
Merge branch 'develop' into gun
2020-03-30 12:15:23 +03:00
Haelwenn
e999c67cee
Merge branch 'feature/funkwhale-audio' into 'develop'
...
Add support for funkwhale Audio activity
Closes #764 and #1624
See merge request pleroma/pleroma!2287
2020-03-29 19:18:22 +00:00
Maksim Pechnikov
dfd2c74184
Merge branch 'develop' into issue/1276
2020-03-29 06:57:34 +03:00
Ivan Tashkinov
dfbc05d496
Misc refactoring / tweaks (ThreadMute.exists?/2).
2020-03-27 08:01:03 +03:00
Ivan Tashkinov
460e41585c
Further preloading (more endpoints), refactoring, tests.
2020-03-25 20:33:34 +03:00
Haelwenn (lanodan) Monnier
15be6ba9c2
AccountView: fix for other forms of <br> in bio
...
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-03-22 16:41:01 +01:00
lain
1aa8aa7d7f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-2
2020-03-20 14:52:58 +01:00
lain
3c2c32b460
Merge branch 'remake-remodel' into develop
2020-03-19 18:00:55 +01:00
Alexander Strizhakov
f9ecb513fa
Merge branch 'develop' into gun
2020-03-18 14:08:21 +03:00
Alexander Strizhakov
f3791add99
removing with_move parameter
2020-03-16 20:07:45 +03:00
Haelwenn (lanodan) Monnier
863ec33ba2
Add support for funkwhale Audio activity
...
reel2bits fixture not included as it lacks the Actor fixture for it.
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1624
Closes: https://git.pleroma.social/pleroma/pleroma/issues/764
2020-03-11 13:46:42 +01:00
Maksim Pechnikov
edb659dc57
Merge branch 'develop' into issue/1276
2020-03-08 14:10:59 +03:00
Alexander Strizhakov
f0753eed0f
removing try block in tesla request
...
added mocks for tests which fail with Tesla.Mock.Error
2020-03-05 17:31:06 +03:00
Mark Felder
05da5f5cca
Update Copyrights
2020-03-03 16:44:49 -06:00
Haelwenn (lanodan) Monnier
6da6540036
Bump copyright years of files changed after 2020-01-07
...
Done via the following command:
git diff fcd5dd259a
2020-03-02 06:08:45 +01:00
Maksim Pechnikov
28701c08ad
Merge branch 'develop' into issue/1276
2020-02-17 08:56:03 +03:00
Haelwenn (lanodan) Monnier
1257331291
MastodonAPI.StatusView: Do not use site_name
...
site_name allow to spoof the origin of the domain and so hacks like:
<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg " />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/ ">
2020-02-15 00:36:09 +01:00
Maksim Pechnikov
da44ee5b0f
Merge branch 'develop' into issue/1276
2020-02-13 09:20:34 +03:00
Maksim Pechnikov
b87533760b
Merge branch 'develop' into issue/1276
2020-02-10 07:59:52 +03:00
Lain Soykaf
f875b9650a
EmojiReactions: Add Mastodon-aligned reaction endpoints, change response
2020-02-07 14:52:13 +01:00
Lain Soykaf
8a79f20c21
EmojiReactions: Rename to EmojiReacts
2020-02-06 18:09:57 +01:00
df0b00b32d
Merge branch 'mastoapi-non-html-strings' into 'develop'
...
mastodon API: do not sanitize html in non-html fields
See merge request pleroma/pleroma!2167
2020-02-06 16:08:23 +00:00
rinpatch
983a87175e
mastodon API: do not sanitize html in non-html fields
2020-02-02 14:46:32 +03:00
lain
a802e07241
Emoji Reactions: Add reacted field to emoji reactions
2020-01-29 11:39:06 +01:00
Maksim Pechnikov
e442ea5722
Merge branch 'develop' into issue/1276
2020-01-27 15:20:47 +03:00
lain
347f3ed2c6
Emoji reactions: Change api format once more
2020-01-24 10:52:24 +01:00
lain
615b72238e
Notifications: Add emoji reaction notifications
2020-01-22 20:06:12 +01:00
lain
dd3fc50ea4
Emoji reactions: Change cache and reply format
2020-01-22 13:57:42 +01:00
lain
4c5b5f14dc
StatusView: Add emoji_reactions
2020-01-20 16:24:20 +01:00
d2f1c4f658
Add ActivityPub Object Event type support
...
Adds Event support in the same way Video objects are handled, with the
name of the object as message header.
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2019-12-17 16:16:21 +01:00
701815e64c
[ActivityPub] Configurable ActivityPub actor type
2019-12-10 13:19:26 +00:00
Maksim Pechnikov
95e6a2acd9
Merge branch 'develop' into issue/1342
2019-12-08 21:25:26 +03:00
Maksim Pechnikov
6fbafb1cdc
Merge branch 'develop' into issue/1276
2019-12-08 20:14:28 +03:00
rinpatch
8404f8c8fb
Merge branch 'improve-move-notificaions-api' into 'develop'
...
Add `with_move` query param to the notifications API
See merge request pleroma/pleroma!2032
2019-12-08 13:07:05 +00:00
Maksim Pechnikov
3fe7a1fd35
Merge branch 'develop' into issue/1342
2019-12-05 15:46:27 +03:00
Maksim Pechnikov
49bb0a130f
Merge branch 'develop' into issue/1276
2019-12-05 12:22:19 +03:00
Egor Kislitsyn
d4953474ac
Merge branch 'develop' into improve-move-notificaions-api
2019-12-05 14:55:48 +07:00
Ivan Tashkinov
30caf3e51e
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
lain
e9993acdbb
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-12-04 16:35:59 +01:00
Maksim Pechnikov
ed7f850ad2
fix test
2019-12-04 16:22:01 +03:00
Egor Kislitsyn
624e720aa4
Add with_move query param to the notifications API
2019-12-03 22:13:38 +07:00
lain
7722e5a67a
Merge branch 'feature/move-activity' into 'develop'
...
Support "Move" activity
Closes #1316
See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
Ivan Tashkinov
52cc7de82c
Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
...
# Conflicts:
# mix.lock
2019-11-29 10:17:59 +03:00
Maksim Pechnikov
a52da55eb9
added User.NotificationSetting struct
2019-11-28 22:08:30 +03:00
lain
50b152766f
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into bugfix/1442-dont-return-nil-for-following-count
2019-11-27 14:48:28 +01:00
Egor Kislitsyn
f595cfe623
Remove User.user_info/2
2019-11-27 19:43:47 +07:00
Egor Kislitsyn
1fc28a4b44
Add a view for the move notification
2019-11-27 17:52:02 +07:00
Ivan Tashkinov
de892d2fe1
[ #1335 ] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality.
2019-11-20 15:46:11 +03:00
Ivan Tashkinov
ba5cc30165
[ #1335 ] Implemented notification mutes and reblog mutes as UserRelationships. User to UserRelationship relations and functions refactoring.
2019-11-19 23:22:10 +03:00
Ivan Tashkinov
c31ddce51e
[ #1335 ] Reorganized users.mutes as relation to UserMute entity.
2019-11-15 21:38:54 +03:00
Egor Kislitsyn
3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity
2019-11-14 16:39:45 +07:00
Egor Kislitsyn
e6d7e27bd6
Add allow_following_move setting to User
2019-11-12 18:45:28 +07:00
Ivan Tashkinov
3db988250b
[ #1335 ] User: refactored :blocks field into :blocked_users relation.
...
Introduced UserBlock.
2019-11-10 16:30:21 +03:00
lain
1bd1f62af5
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel
2019-11-05 15:21:00 +01:00
Maksim Pechnikov
ff6c727739
Merge branch 'develop' into issue/1276
2019-11-04 20:24:53 +03:00
eugenijm
ed29be24cb
Mastodon API, streaming: Add pleroma.direct_conversation_id to the conversation stream event payload.
2019-11-04 18:36:16 +03:00
Maksim Pechnikov
209319c8d2
update marker api
2019-10-30 23:49:05 +03:00
rinpatch
ae59b38203
Rip out the rest of htmlsanitizeex
2019-10-30 09:20:13 +03:00
Maksim Pechnikov
99cf1ef9be
Merge branch 'develop' into issue/1276
2019-10-24 09:23:59 +03:00
Ivan Tashkinov
8cc809e44e
Merge remote-tracking branch 'remotes/upstream/develop' into 1304-user-info-deprecation
...
# Conflicts:
# lib/pleroma/notification.ex
2019-10-23 17:22:42 +03:00
Maksim Pechnikov
d4270397dc
Marker: added unread_count field
2019-10-22 14:51:46 +03:00
Maksim Pechnikov
243719a965
Merge branch 'develop' into feature/masto_api_markers
2019-10-21 11:32:28 +03:00
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
2019-10-20 20:43:18 +03:00
Ariadne Conill
c2ae6310dc
tests: mastodon api: fix broken test that used OStatus
2019-10-18 15:46:46 +00:00
Ariadne Conill
d379b48769
kill almost all of the OStatus module
2019-10-18 14:50:09 +00:00
eugenijm
359dd1890e
Mastodon API: Mark the conversation as read for the author when they send a new direct message
2019-10-17 16:49:39 +03:00
Maksim Pechnikov
66b5d0ff55
add Markers /api/v1/markers
2019-10-17 15:26:59 +03:00
Ivan Tashkinov
10ff01acd9
[ #1304 ] Moved all non-mutes / non-blocks fields from User.Info to User. WIP.
2019-10-16 21:59:21 +03:00
lain
6e4f52f8a2
Introduce new ingestion pipeline structure, implement internal Likes with it.
2019-10-16 16:16:39 +02:00
eugenijm
8249924485
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
2019-10-05 20:12:00 +03:00
kaniini
e07e9cb75e
Revert "Merge branch 'user-info-unread-direct-conversation' into 'develop'"
...
This reverts merge request !1737
2019-10-05 10:00:05 +00:00
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
2019-10-04 17:33:18 +00:00
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
2019-10-04 11:28:20 +00:00
Haelwenn (lanodan) Monnier
5dc14c89ce
notification_view.ex: Make sure account isn’t empty
...
Related: https://git.pleroma.social/pleroma/pleroma/issues/1203
2019-10-04 07:11:53 +02:00
eugenijm
06d9df79c5
Mastodon API: Add pleroma.unread_conversation_count to the Account entity
2019-10-04 00:53:23 +03:00
Egor Kislitsyn
36a34c36fe
Extract poll actions from MastodonAPIController to PollController
2019-10-01 11:44:34 +07:00
Egor Kislitsyn
e7aef27c00
Fix merge
2019-09-30 19:10:54 +07:00
Ariadne Conill
b7877e9b1c
mastodon api: implement rendering of listen activities
2019-09-30 10:39:17 +00:00
kaniini
6d74a7528c
Merge branch 'feature/follow-requests-count' into 'develop'
...
Mastodon API: add follow_requests_count
See merge request pleroma/pleroma!1726
2019-09-29 11:44:31 +00:00
Ariadne Conill
14294243a2
mastodon api: implement follow_requests_count
2019-09-27 04:22:40 +00:00
Egor Kislitsyn
98d1347a4e
Extract status actions from MastodonAPIController into StatusController
2019-09-27 10:51:15 +07:00
5fb72170a7
Revert "add _discoverable_ keyword into ActivityPub @context"
...
This reverts commit 3aef4bdf8f37efd1055a84c5fca12ec4559a17f5.
2019-09-26 02:57:41 +00:00
rinpatch
b0ec82d24a
Merge branch 'chores/bump-copyright-year' into 'develop'
...
Bump copyright years of files changed in 2019
See merge request pleroma/pleroma!1698
2019-09-18 21:57:49 +00:00
Haelwenn (lanodan) Monnier
447514dfa2
Bump copyright years of files changed in 2019
...
Done via the following command:
git diff 1e6c102bfc
2019-09-18 23:21:11 +02:00
eugenijm
450bf7a63c
Mastodon API: Add a setting to hide follow/follower count from the user view (hide_follows_count and hide_followers_count)
2019-09-17 14:45:47 +03:00
rinpatch
b312ca3d52
Mastodon API Poll view: Fix handling of polls without an end date
2019-09-05 12:03:39 +03:00
