nekojanai/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
10397 commits 3 branches 72 tags 294 MiB
Commit graph

6490 commits

Author SHA1 Message Date
lain
31761340fe Merge branch 'feature/support-bot-field-in-update-credentials' into 'develop' 
Support 'bot' field in account update_credentials

Closes #1600 and #1467

See merge request pleroma/pleroma!2662
 2020-06-20 09:57:12 +00:00
lain
0e789bc55f Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex 2020-06-20 09:39:50 +00:00
lain
4cb7b1ebc6 Apply suggestion to lib/mix/tasks/pleroma/config.ex 2020-06-20 09:34:34 +00:00
lain
7d542450b1 Merge branch 'develop' into '1865-media-only' 
# Conflicts:
#   CHANGELOG.md
 2020-06-20 09:33:18 +00:00
Alexander Strizhakov
1a704e1f1e
fix for packs pagination 2020-06-20 10:56:28 +03:00
Haelwenn (lanodan) Monnier
3d4cfc9c5f
Stop filling conversation field on incoming objects (legacy, unused) 
conversation field is still set for outgoing federation for compatibility.
 2020-06-20 00:08:26 +02:00
feld
f928267773 Merge branch 'issue/1855' into 'develop' 
#1855 MediaProxy cache invalidation via Admin API

See merge request pleroma/pleroma!2648
 2020-06-19 20:38:22 +00:00
Sergey Suprunenko
ac0344dd24
Only accounts with Service actor_type are considered as bots 2020-06-19 21:19:00 +02:00
Sergey Suprunenko
b63646169d
Add support for bot field in update_credentials 2020-06-19 21:18:07 +02:00
lain
75670a99e4 UpdateValidator: Only allow updates from the user themselves. 2020-06-19 16:38:57 +02:00
lain
cafdf18408 Merge branch '1873-pagination-fixes' into 'develop' 
[#1873] :offset pagination param support, hashtags pagination

Closes #1873

See merge request pleroma/pleroma!2659
 2020-06-19 13:42:57 +00:00
lain
372533b7c3 Merge branch 'dry-up-follower-update' into 'develop' 
User: update_follower_count refactor.

See merge request pleroma/pleroma!2649
 2020-06-19 13:40:34 +00:00
lain
abdb540d45 ObjectValidators: Add basic UpdateValidator. 2020-06-19 15:30:30 +02:00
Ivan Tashkinov
5237a2df9f [#1873] Fixes missing :offset pagination param support. Added pagination support for hashtags search. 2020-06-19 16:14:06 +03:00
Alexander Strizhakov
02ca8a363f
default page size for files 2020-06-19 14:46:38 +03:00
Alexander Strizhakov
3e3f9253e6
adding overall count for packs and files 2020-06-19 10:17:24 +03:00
Alexander Strizhakov
4975ed86bc
emoji pagination for pack show action 2020-06-18 18:50:03 +03:00
Alexander Strizhakov
3becdafd33
emoji packs pagination 2020-06-18 14:32:21 +03:00
Maksim Pechnikov
c9b5e3feda revert 'database' option to rejected keys 2020-06-18 05:29:31 +03:00
Maksim Pechnikov
4044f24e2e fix test 2020-06-18 05:06:28 +03:00
Mark Felder
2731ea1334 Change references from "deleted_urls" to "banned_urls" as nothing is handled via media deletions anymore; all actions are manual operations by an admin to ban the url 2020-06-17 13:13:55 -05:00
Mark Felder
c08c9db0c1 Remove misleading is_ prefix from boolean function 2020-06-17 13:02:01 -05:00
Mark Felder
71a5d9bffb Empty list as default 2020-06-17 12:54:02 -05:00
Mark Felder
3462d4b995 Merge branch 'develop' into issue/1855 2020-06-17 12:50:06 -05:00
lain
d772361e62 Merge branch 'fix/1787-mogrify-args' into 'develop' 
Moving custom ecto types in context folders

See merge request pleroma/pleroma!2652
 2020-06-17 15:53:24 +00:00
Egor Kislitsyn
d4b5a9730e
Remove poll from notification_type OpenAPI spec 2020-06-17 18:47:59 +04:00
Maksim
9a371bf5f6 Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex 2020-06-17 13:12:38 +00:00
Maksim
44ce97a9c9 Apply suggestion to lib/pleroma/web/media_proxy/invalidations/script.ex 2020-06-17 13:12:32 +00:00
Maksim
74fd761637 Apply suggestion to lib/pleroma/web/media_proxy/invalidation.ex 2020-06-17 12:56:30 +00:00
rinpatch
4ec2fb967e Merge branch 'features/users-raw_bio' into 'develop' 
User: Add raw_bio, storing unformatted bio

See merge request pleroma/pleroma!2326
 2020-06-17 10:34:23 +00:00
Alexander Strizhakov
a77b0388f4
credo fix 2020-06-17 10:31:06 +03:00
Maksim Pechnikov
02a5648feb fixed migration the settings to DB 2020-06-17 09:15:35 +03:00
rinpatch
5c0e1039ce Chunk the notification type backfill migration 
Long-term we want that migration to be done entirely in SQL,
but for now this is a hotfix to not cause OOMs on large databases.

This is using a homegrown version of `Repo.stream`, it's worse in
terms of performance than the upstream since it doesn't use the same
prepared query for chunk queries, but unlike the upstream it supports
preloads.
 2020-06-16 23:53:13 +03:00
Haelwenn
b536e57124 Merge branch '1866-last-status-stuff' into 'develop' 
Resolve "/api/v1/conversations returns the wrong `last_status`"

Closes #1866

See merge request pleroma/pleroma!2647
 2020-06-16 18:10:00 +00:00
Alexander Strizhakov
b66e6eb521
fixes for tests 2020-06-16 19:03:45 +03:00
Alexander Strizhakov
ed189568f3
moving mrf settings from instance to separate group 2020-06-16 18:32:18 +03:00
Alexander Strizhakov
3c2cee33ad
moving custom ecto types in context folders 2020-06-16 17:50:33 +03:00
Alexander Strizhakov
32c6576b60
naming 2020-06-16 15:54:22 +03:00
Alexander Strizhakov
e1603ac8fe
fix attemps to merge map 2020-06-16 15:54:22 +03:00
Alexander Strizhakov
9a4fde9766
Mogrify args as custom tuples 2020-06-16 15:53:28 +03:00
lain
1eb6cedaad ActivityPub: When restricting to media posts, only show 'Creates'. 2020-06-16 13:08:27 +02:00
Maksim Pechnikov
b023110799 fixed a visibility of functions 2020-06-15 20:48:22 +03:00
stwf
faba1a6e33 fix tests 2020-06-15 12:25:03 -04:00
lain
e1ee8bc1da User: update_follower_count refactor. 2020-06-15 14:29:34 +02:00
Maksim Pechnikov
579763126f Merge branch 'develop' into issue/1855 2020-06-15 15:24:55 +03:00
Egor Kislitsyn
58e4e3db8b
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers 2020-06-15 16:03:40 +04:00
Maksim Pechnikov
62b8c31b7a added tests 2020-06-15 14:55:00 +03:00
lain
b7df7436c8 Conversations: Return last dm for conversation, not last message. 2020-06-15 12:27:13 +02:00
Maksim Pechnikov
2e8a236cef fix invalidates media url's 2020-06-14 21:02:57 +03:00
eugenijm
b15cfc3d36 Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page 2020-06-14 18:27:11 +03:00
rinpatch
271ea5068f Merge branch '1851-favorites-pagination' into 'develop' 
StatusController: Correctly paginate favorites.

Closes #1851

See merge request pleroma/pleroma!2636
 2020-06-13 17:20:43 +00:00
lain
1d625c29a0 ControllerHelper: Always return id field. 2020-06-13 13:12:43 +02:00
lain
4b865bba10 Apply suggestion to lib/pleroma/web/controller_helper.ex 2020-06-13 10:37:15 +00:00
href
cb7be6eef2 Remove use of atoms in MRF.UserAllowListPolicy 2020-06-13 12:08:46 +03:00
Egor Kislitsyn
520367d6fd Fix atom leak in Rich Media Parser 2020-06-13 12:08:46 +03:00
Mark Felder
26f710b9e3 Merge branch 'develop' into preload-data 2020-06-12 16:52:52 -05:00
Haelwenn
4115701f71 Merge branch 'recipients-experiments' into 'develop' 
ActivityPub: Don't show announces of your own objects in timeline.

See merge request pleroma/pleroma!2637
 2020-06-12 16:57:13 +00:00
Egor Kislitsyn
09d31d24de
Return an empty map from Pleroma.Web.RichMedia.Parsers.OGP.parse/2 2020-06-12 18:39:51 +04:00
Egor Kislitsyn
697cf92024
Merge remote-tracking branch 'origin/develop' into merge-ogp-twitter-parsers 2020-06-12 18:25:29 +04:00
lain
e557265a03 Merge branch 'global-status-expiration' into 'develop' 
Global status expiration

See merge request pleroma/pleroma!2208
 2020-06-12 14:14:09 +00:00
Mark Felder
34593d6aa5 Merge branch 'develop' into features/mix-task-reset-mfa 2020-06-12 08:43:50 -05:00
lain
1419c67f4d Merge branch 'feature/cli-reload-emoji' into 'develop' 
Add command to reload emoji packs from cli for OTP users

Closes #1814

See merge request pleroma/pleroma!2639
 2020-06-12 13:32:59 +00:00
Maksim Pechnikov
f9dcf15ecb added admin api for MediaProxy cache invalidation 2020-06-12 14:49:54 +03:00
Ivan Tashkinov
2188097066 [#1794] Fixes URI query handling for hashtags extraction in search. 2020-06-12 14:25:41 +03:00
Haelwenn (lanodan) Monnier
40970f6bb9
New mix task: pleroma.user reset_mfa <nickname> 2020-06-11 22:54:48 +02:00
Egor Kislitsyn
2419776e19
Deprecate Pleroma.Web.RichMedia.Parsers.OGP 2020-06-11 23:11:46 +04:00
Mark Felder
7f7a1a4676 Check for media proxy base_url, not Upload base_url 2020-06-11 11:05:22 -05:00
Mark Felder
8a59fde0e5 Merge branch 'develop' into fix/csp-mediaproxy-base-url 2020-06-11 10:25:00 -05:00
Egor Kislitsyn
1f35acce54
Merge OGP parser with TwitterCard 2020-06-11 17:57:31 +04:00
Ivan Tashkinov
b28cec4271 [#1794] Fixes URI query handling for hashtags extraction in search. 2020-06-11 16:05:14 +03:00
lain
5e44e9d698 Apply suggestion to lib/pleroma/web/controller_helper.ex 2020-06-10 18:56:46 +00:00
Mark Felder
7c47f791a8 Add command to reload emoji packs from cli for OTP users 
Not useful for source releases as we don't have a way to automate connecting to the running instance.
 2020-06-10 13:02:08 -05:00
rinpatch
99afc7f4e4 HTTP security plug: add media proxy base url host to csp 2020-06-10 20:09:16 +03:00
rinpatch
7aa6c82937 Merge branch 'remake-remodel-dms' into 'develop' 
Chats / ChatMessages

See merge request pleroma/pleroma!2429
 2020-06-10 12:05:45 +00:00
lain
9e411372d0 ActivityPub: Don't show announces of your own objects in timeline. 2020-06-10 12:10:09 +02:00
lain
86fec45f40 ControllerHelper: Fix wrong comparison. 2020-06-10 11:09:45 +02:00
lain
b4c50be9df Apply suggestion to lib/pleroma/web/controller_helper.ex 2020-06-10 08:12:29 +00:00
lain
be7c322865 Apply suggestion to lib/pleroma/web/controller_helper.ex 2020-06-10 08:02:35 +00:00
lain
c4f267b3be Apply suggestion to lib/pleroma/web/controller_helper.ex 2020-06-10 08:02:26 +00:00
lain
1b746cfbbb Merge branch 'add-url-to-admin-account-view' into 'develop' 
Add `url` field to AdminAPI.AccountView

See merge request pleroma/pleroma!2633
 2020-06-09 12:59:14 +00:00
Egor Kislitsyn
3dd1de61a7 Add url field to AdminAPI.AccountView 2020-06-09 16:02:42 +04:00
lain
063e6b9841 StatusController: Correctly paginate favorites. 
Favorites were paginating wrongly, because the pagination headers
where using the id of the id of the `Create` activity, while the
ordering was by the id of the `Like` activity. This isn't easy to
notice in most cases, as they usually have a similar order because
people tend to favorite posts as they come in. This commit adds a
way to give different pagination ids to the pagination helper, so
we can paginate correctly in cases like this.
 2020-06-09 10:53:40 +02:00
lain
064c4f86f3 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-09 09:36:07 +02:00
lain
40d5058cc4 Merge branch 'remake-remodel-dms' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-09 09:21:44 +02:00
lain
e1bc37d118 MigrationHelper: Move notification backfilling to own module. 2020-06-09 09:20:55 +02:00
lain
fc04a138d4 Apply suggestion to lib/pleroma/notification.ex 2020-06-08 20:01:37 +00:00
Haelwenn (lanodan) Monnier
fe1cb56fdc
transmogrifier: MIME.valid?/1 for mediaType 
No issues with the rest of the network yet but this makes sure it will work
once https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2429
is merged.
 2020-06-08 21:04:30 +02:00
Roman Chvanikov
604a83ae3e merge develop 2020-06-08 19:21:07 +03:00
Egor Kislitsyn
d44843e677
Restrict ActivityExpirationPolicy to Notes only 2020-06-08 17:56:34 +04:00
Egor Kislitsyn
da22119c2f
Merge branch 'develop' into global-status-expiration 2020-06-08 17:21:47 +04:00
lain
d192492658 Merge branch 'openapi/admin/relay' into 'develop' 
Add OpenAPI spec for AdminAPI.RelayController

See merge request pleroma/pleroma!2579
 2020-06-08 11:07:01 +00:00
lain
c450b248cc Merge branch 'feature/delete-follow-requests-on-user-deletion' into 'develop' 
Delete outgoing pending follow requests on user deletion

See merge request pleroma/pleroma!2631
 2020-06-08 10:54:43 +00:00
lain
3b5282bef2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-08 11:19:18 +02:00
lain
89b85f6529 ChatController: Remove nonsensical pagination. 2020-06-08 11:09:53 +02:00
lain
7d66dd180a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-08 10:18:10 +02:00
lain
fe2a5d0614 ChatController: Make last_read_id mandatory. 2020-06-07 20:22:08 +02:00
Sergey Suprunenko
8d9e586887
Delete pending follow requests on user deletion 2020-06-07 17:31:37 +02:00
lain
801e668a97 ChatController: Add last_read_id option to mark_as_read. 2020-06-07 15:38:33 +02:00
lain
2cdaac4330 SideEffects: Move streaming of chats to after the transaction. 2020-06-07 14:52:56 +02:00
lain
1a11f0e453 Chats: Change id to flake id. 2020-06-07 14:25:30 +02:00