luna/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
7259 commits 4 branches 74 tags 294 MiB
Commit graph

4712 commits

Author SHA1 Message Date
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
 2019-10-18 04:42:02 +00:00
kaniini
733b73b71c Apply suggestion to lib/pleroma/web/mastodon_api/websocket_handler.ex 2019-10-18 04:36:37 +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
1bfdf57fc7 Merge branch 'user-search-experiments' into 'develop' 
User search: Remove trigram and refactor the module

See merge request pleroma/pleroma!1850
 2019-10-16 12:29:08 +00:00
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
 2019-10-16 12:14:47 +00:00
lain
6977cddff9 Merge branch 'benchmark-finishing' into 'develop' 
Benchmark finishing

Closes #755

See merge request pleroma/pleroma!1848
 2019-10-16 11:54:49 +00:00
rinpatch
0a5175ecbb Order fts results by trigram 2019-10-16 13:49:33 +03:00
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
 2019-10-16 12:52:47 +03:00
Maxim Filippov
da0e4879bc DELETE /api/pleroma/admin/users now accepts nicknames array 2019-10-15 17:33:29 +02:00
Alexander
e7bb762ec2
don't stream in benchmark env 2019-10-15 15:16:17 +03:00
kPherox
5bd0717de2
Add Sec-WebSocket-Protocol to response header 2019-10-15 21:09:44 +09:00
Ekaterina Vaartis
fbe5a00475 For pleroma.emoji downloaded packs, generate pack.json instead 2019-10-15 09:53:28 +03:00
eugenijm
a97b642289 Mastodon API: Add exclude_visibilities parameter to the timeline and notification endpoints 2019-10-14 02:57:21 +03:00
lain
e3b4a3e96b Merge branch 'incoming-id-fixes' into 'develop' 
Assorted transmogrifier fixes

See merge request pleroma/pleroma!1831
 2019-10-13 15:37:49 +00:00
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.
 2019-10-11 22:52:38 +03:00
Maxim Filippov
cc6875b582 Add GET /api/pleroma/admin/relay endpoint - lists all followed relays 2019-10-11 19:12:29 +03:00
Maxim Filippov
c0aca32dd0 Merge branch 'develop' into feature/multiple-users-activation-permissions 2019-10-11 15:59:35 +03:00
Maxim Filippov
aaa4252f41 Deprecate POST/DELETE /api/pleroma/admin/users/:nickname/permission_group/:permission_group instead of deleting it 2019-10-11 15:58:45 +03:00
lain
422aa6befe Ostatus DeleteHandler: Fix for new option format. 2019-10-11 12:53:09 +02:00
lain
37812740c4 Transmogrifier: Correctly save incoming ids for Accept/Reject. 2019-10-11 11:48:58 +02:00
lain
9b963064eb Transmogrifier: Actually store who deleted a note. 2019-10-11 11:25:45 +02:00
Maxim Filippov
f5104f36bb Deprecate /api/pleroma/admin/users/:nickname/toggle_activation instead of deleting it 2019-10-11 00:24:31 +03:00
lain
29647dfd09 Transmogrifier: Save correct ids for incoming deletes. 2019-10-10 17:17:33 +02:00
lain
c54ae662dc Merge remote-tracking branch 'origin/develop' into benchmark-finishing 2019-10-10 14:40:59 +02:00
lain
1357ec1a10 Merge branch 'add-direct-conversation-id-to-status-show-page' into 'develop' 
Add `pleroma.direct_conversation_id` to `GET /api/v1/statuses/:id`

See merge request pleroma/pleroma!1822
 2019-10-09 15:10:08 +00:00
Maxim Filippov
ad42837244 Ability to toggle activation status and permission group for a group of users 2019-10-09 17:03:54 +03:00
Egor Kislitsyn
d537bfd4e1
Add a task to re-count statuses for all users 2019-10-09 13:11:57 +07:00
eugenijm
580a67f5ca Mastodon API: Return pleroma.direct_conversation_id when viewing a status (GET /api/v1/statuses/:id) 2019-10-09 07:27:09 +03:00
Ariadne Conill
9a2f71f4d5 mastodon api: fix exclude_replies (closes #1287) 2019-10-07 12:29:33 +00:00
Sergey Suprunenko
4b3f77a99f Extract RSS Feed functionality from OStatus 2019-10-07 12:20:41 +00:00
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
 2019-10-07 10:19:24 +00:00
Ivan Tashkinov
28fb98d69e Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions 
# Conflicts:
#	CHANGELOG.md
 2019-10-07 11:06:30 +03:00
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
 2019-10-07 02:14:45 +00:00
Haelwenn (lanodan) Monnier
58aeabd020
mrf/simple_policy: check actor against accept/reject 2019-10-07 03:49:57 +02:00
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
 2019-10-06 14:32:56 +00:00
feld
1d8e956c32 Use the user.id instead of nickname in report URLs 
Ensures links to profiles of remote users work.
 2019-10-06 14:13:04 +00:00
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
 2019-10-06 17:12:17 +03:00
rinpatch
fefbd31c6e Move local keys out of user.info 2019-10-06 16:56:36 +03:00
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
 2019-10-06 11:43:49 +03:00
Ivan Tashkinov
f459aabdfa Merge remote-tracking branch 'remotes/upstream/develop' into 1260-rate-limited-auth-actions 
# Conflicts:
#	CHANGELOG.md
 2019-10-06 09:30:49 +03:00
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
 2019-10-06 04:41:06 +00:00
kaniini
7a318d74e6 Merge branch 'split-masto-api/leftovers' into 'develop' 
[#1278] Move a few more actions from MastodonAPIController

See merge request pleroma/pleroma!1761
 2019-10-05 19:28:53 +00:00
kaniini
45b7f03f89 Merge branch 'accept-embedded-announce-object' into 'develop' 
Import object from self-Announce whenever possible

See merge request pleroma/pleroma!1770
 2019-10-05 19:28:29 +00:00
kaniini
17ff4b43cb Merge branch 'unread-conversation-count' into 'develop' 
Add `pleroma.unread_conversation_count` to the Account entity

See merge request pleroma/pleroma!1796
 2019-10-05 19:28:07 +00:00
eugenijm
8249924485 Mastodon API: Add pleroma.unread_conversation_count to the Account entity 2019-10-05 20:12:00 +03:00
lain
276a520163 CommonAPI: Create profile updates as public. 
This saves us lots of sending out because we can use sharedInbox.
 2019-10-05 14:53:50 +02:00
lain
4b8524f392 ActivityPub / Transmogrifier: Correctly store incoming Update id. 2019-10-05 14:49:45 +02:00
Thibaut Girka
791d93ff0e Make credo happy 2019-10-05 13:56:40 +02:00
Thibaut Girka
977e711e22 Import object from self-Announce whenever possible 2019-10-05 13:56:40 +02: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
Maksim Pechnikov
83631752af removed legacy api: "/objects/:uuid/likes" 2019-10-04 22:35:26 +03:00
kaniini
e0c0ea9f13 Merge branch 'bugfix/widen-streamer-blocks' into 'develop' 
widen streaming API block effects

See merge request pleroma/pleroma!1784
 2019-10-04 17:39:06 +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
Ariadne Conill
d1d058bf85 streamer: worker: actually use should_send? consistently 2019-10-04 15:42:25 +00:00
Ariadne Conill
5a0c018d2a streamer: worker: check for lack of intersectionality between a user's blocklist and an activity's recipientlist 2019-10-04 15:41:55 +00:00
Ariadne Conill
2417b633ed streamer: add missing copyright headers 2019-10-04 15:21:45 +00:00
lain
568a995d64 ActivityPub: Change addressing of Undo. 2019-10-04 16:32:42 +02:00
lain
27110793a7 Merge branch 'featrue/job-monitor' into 'develop' 
Add Pleroma.JobQueueMonitor

Closes #1274

See merge request pleroma/pleroma!1721
 2019-10-04 12:52:11 +00:00
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
 2019-10-04 11:54:05 +00:00
rinpatch
8217292085 Fix get_cached_by_nickname_or_id not allowing to get local users by 
nickname

Closes #1293
 2019-10-04 14:44:09 +03: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
Egor Kislitsyn
d3ac4e8083
Fix OAuthController 2019-10-04 13:30:46 +07: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
rinpatch
1cae564b5d Move config task docs to a separate file and mark it as WIP 2019-10-03 14:12:57 +03:00
rinpatch
e00403af23 Mix tasks: derive moduledoc from doc files 2019-10-03 14:00:23 +03:00
rinpatch
6baa037903 Move database maintenance tasks docs to a separate file 2019-10-03 11:17:29 +03:00
rinpatch
b4ca864c6b Move user tasks docs to a separate file 2019-10-03 10:15:24 +03:00
rinpatch
d39ccc2e7f Move uploads task docs to a separate file 2019-10-03 09:35:21 +03:00
rinpatch
808d0a0170 Move relay docs to a separate file 2019-10-03 09:10:31 +03:00
rinpatch
6435ba83cd Move instance CLI task docs to a text file 2019-10-03 09:06:06 +03:00
rinpatch
869ea2ab90 Move digest email docs to a separate file and improve styling 2019-10-03 01:10:36 +03:00
rinpatch
bd9c7807fb Move emoji task docs to a separate file 2019-10-03 01:03:47 +03:00
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
 2019-10-02 20:42:40 +03:00
Egor Kislitsyn
e0c68eeb02
Move :favourites and :bookmarks actions to StatusController 2019-10-02 21:31:19 +07:00
Egor Kislitsyn
7f2bc57725
Move follows, mutes and blocks actions to AccountController 2019-10-02 21:22:21 +07:00
Egor Kislitsyn
d3c404af12
Add MastoFEController 2019-10-02 20:36:08 +07:00
Egor Kislitsyn
1c6e1055c8
Add CustomEmojiController 2019-10-02 19:16:34 +07:00
kaniini
433f2c0f68 Merge branch 'split-masto-api/instance' into 'develop' 
Extract instance actions from `MastodonAPIController` to `InstanceController`

See merge request pleroma/pleroma!1760
 2019-10-02 10:46:14 +00:00
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
 2019-10-02 10:45:55 +00:00
Thibaut Girka
86880b9821 Inline object when Announcing a self-owned private object 2019-10-02 12:15:06 +02:00
Thibaut Girka
3d61efa7c9 Rename misleading get_announce_visibility to public_announce? 2019-10-02 10:48:34 +02:00
Egor Kislitsyn
26693292f4
Remove :enqueued counter 2019-10-02 14:50:25 +07:00
Egor Kislitsyn
c8b01f6667
Extract instance actions from MastodonAPIController to InstanceController 2019-10-02 14:13:52 +07:00
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
 2019-10-02 07:04:33 +00:00
kaniini
8557176808 Merge branch 'split-masto-api/auth' into 'develop' 
Extract auth actions from `MastodonAPIController` to `AuthController`

See merge request pleroma/pleroma!1759
 2019-10-02 07:02:56 +00:00
kaniini
9b38bf4af4 Merge branch 'features/private-reblogs' into 'develop' 
Allow receiving private self-announces over ActivityPub

See merge request pleroma/pleroma!1766
 2019-10-02 07:02:24 +00:00
feld
1255ec888d Revert "Add upload limits to /api/v1/instance" 
This reverts commit db27c0dd8b18763ff2abb124ee8d641a4580cdaa.
 2019-10-01 22:16:29 +00:00
Thibaut Girka
427d0c2a00 Store private announcements in object.data["announcements"], filter them on display 2019-10-01 22:39:25 +02:00
Sergey Suprunenko
c541b83bef Track failed proxy urls and don't request them again 2019-10-01 20:00:27 +00:00
Thibaut Girka
43e3db0951 Fix returned visibility of announces in MastodonAPI 2019-10-01 20:38:29 +02:00
Thibaut Girka
4c1f158f5d Allow users to announce privately, including own private notes 2019-10-01 20:00:59 +02:00
Maxim Filippov
b2273c695e Discard identifier, if empty 2019-10-01 19:43:22 +03:00
Thibaut Girka
fe538973dd Ensure self-announces do not widen the audience of the original post 2019-10-01 18:38:57 +02:00
KokaKiwi
1f0be71ea4 Make activity announceable by its author. 2019-10-01 17:47:43 +02:00
Maxim Filippov
0f9c2c8b87 Send an identifier alongside with error message in OAuthController 2019-10-01 18:10:04 +03:00
Egor Kislitsyn
af690d1033
Extract auth actions from MastodonAPIController to AuthController 2019-10-01 15:54:45 +07:00
Egor Kislitsyn
2dad6dd020
Extract apps actions from MastodonAPIController to AppController 2019-10-01 15:21:46 +07:00