fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-12-27 11:08:28 +00:00
Code Issues Packages Projects Releases Wiki Activity
10750 commits 27 branches 108 tags 316 MiB
Commit graph

6423 commits

Author SHA1 Message Date
Mark Felder d44ec2bf4c Remove camelCase from the keys 2020-07-02 12:55:08 -05:00
rinpatch 4c044f6225 Merge branch 'fetcher-fixes' into 'develop' 
Don't fail fetching when the user in a replied-to message can't be fetched.

See merge request pleroma/pleroma!2711
 2020-07-02 10:17:51 +00:00
lain bad08f34ca Credo fixes. 2020-07-02 09:57:31 +02:00
lain 311b7c19d0 Streamer: Align announce streaming with polling. 2020-07-02 09:50:26 +02:00
lain 61fe94d698 SideEffects: Refactor. 2020-07-02 09:33:50 +02:00
lain fedfe8f7d6 ActivityPub: Handle clashing nicknames for the same ap id 
If we get a new user (identified by ap_id) that would have the same
nickname as an existing user, give the existing user a nickname that
is prepended with the user id, as this will never clash.

This can happen when a user switches server software and that soft-
ware generates ap ids in a different way.
 2020-07-01 12:26:07 +02:00
lain ce92e6e5ce Fetcher: Work when we can't get the OP. 2020-07-01 11:48:51 +02:00
Mark Felder 5a8e0208b1 Add fields limits to instance metadata, add tests 2020-06-30 15:25:10 -05:00
Mark Felder 0883a706dc Merge branch 'develop' into activation-meta 2020-06-30 15:09:03 -05:00
Ivan Tashkinov 3d2989278c [#1892] Excluded bot actors (applications, services) from search results. 2020-06-30 21:26:39 +03:00
Mark Felder d69af7f742 Rename user.settings column 
This is used exclusively by MastoFE/GlitchFE now
 2020-06-30 11:50:53 -05:00
lain 8b7055e25e Credo fixes 2020-06-30 11:55:58 +02:00
lain 0176b7bca2 Merge branch 'preload-fixups-2' into preloadfixups 2020-06-30 11:40:34 +02:00
lain 2382a2a151 Preload: Load the correct instance panel 2020-06-30 11:35:54 +02:00
rinpatch 7bb3618939 Merge branch 'fix-notification-filtering' into 'develop' 
Notifications: Never return `nil` in the notification list.

See merge request pleroma/pleroma!2705
 2020-06-29 18:06:25 +00:00
lain 09c5991f82 Apply suggestion to lib/pleroma/notification.ex 2020-06-29 16:04:14 +00:00
lain 90083a754d Notifications: Never return nil in the notification list. 2020-06-29 17:48:18 +02:00
Egor Kislitsyn 979f02ec94
Fix CastAndValidate plug 2020-06-29 17:33:00 +04:00
Egor Kislitsyn 67d92ac7b7
Remove /statusnet/config 2020-06-29 17:00:37 +04:00
Egor Kislitsyn 8693e01799
Fix warning 2020-06-29 16:29:51 +04:00
Alexander Strizhakov 6512ef6879
excluding attachment links from RichMedia 2020-06-29 15:25:57 +03:00
Egor Kislitsyn 4a306720e8
Merge branch 'develop' into remove-twitter-api 2020-06-29 16:09:49 +04:00
lain 59540131c1 Credo fixes. 2020-06-29 14:09:03 +02:00
lain f308196b75 Token Response: Remove empty file. 2020-06-29 13:52:50 +02:00
lain e374872fe7 AccountOperation: Correctly describe create response. 2020-06-29 13:49:48 +02:00
lain bb168ed94a OAuth: Extract view-type functions to a view. 2020-06-29 13:39:09 +02:00
lain 8630a6c7f5 Preloaders: Use strings as keys. 2020-06-29 11:41:00 +02:00
lain a19f8778af User preloader: Put user info at correct key 2020-06-29 11:06:20 +02:00
lain 577da132da Merge branch '1031-parent-visible' into 'develop' 
Resolve "Add `pleroma.parent_visible` to the status view"

Closes #1031

See merge request pleroma/pleroma!2679
 2020-06-29 08:39:51 +00:00
Haelwenn (lanodan) Monnier 9f51b03eed
ApiSpec.Schemas.Account: import description from differences_in_mastoapi_responses 2020-06-29 03:31:33 +02:00
Haelwenn (lanodan) Monnier 1566543bec
object/fetcher: Pass full Transmogrifier error 2020-06-26 20:10:47 +02:00
Haelwenn (lanodan) Monnier 244655e884
MastoAPI: Show source field when deleting 2020-06-26 19:52:20 +02:00
Mark Felder 69848d5c97 Rename notification "privacy_option" setting 2020-06-26 12:45:46 -05:00
Haelwenn bf1c5e255a Merge branch 'block-handling' into 'develop' 
Handle blocks with the pipeline

See merge request pleroma/pleroma!2685
 2020-06-26 17:41:00 +00:00
Haelwenn 09478c9cf7 Merge branch '1258-anti-link-spam-exemption' into 'develop' 
AntiSpamLinkPolicy: Exempt local users.

Closes #1258

See merge request pleroma/pleroma!2686
 2020-06-26 16:59:46 +00:00
Mark Felder fd5e797379 Simplify notification filtering settings further 2020-06-26 11:24:28 -05:00
Mark Felder b950fb01db Merge branch 'develop' into refactor/notification_settings 2020-06-26 10:23:19 -05:00
lain a5bbfa21a1 StaticFE: Prioritize json in requests. 2020-06-26 16:27:39 +02:00
lain f378e93bf4 AccountController: Return scope in proper format. 2020-06-26 16:15:27 +02:00
lain a2002ebb63 Preloading: Fix nodeinfo url. 2020-06-26 14:48:23 +02:00
lain 4a7a34ae8c Preloading: Return correct data for statusnet stuff. 2020-06-26 14:47:38 +02:00
lain 7ed2296416 Nodeinfo: Add chat information back in. 2020-06-26 13:04:15 +02:00
lain 15a8b70318 User: Don't unfollow on block when the relevant setting is set. 2020-06-26 12:06:00 +02:00
lain c3383d4fab BlockValidator: Restore old behavior for incoming blocks. 2020-06-26 11:58:40 +02:00
Haelwenn (lanodan) Monnier 27c33f216a
activity_draft: Add source field 2020-06-26 05:48:25 +02:00
Haelwenn (lanodan) Monnier d6c958b4c2
nodeinfo: Fix MRF transparency 2020-06-26 05:33:59 +02:00
feld 8288419686 Merge branch 'preload-data' into 'develop' 
Preload data into index.html

Closes #1660

See merge request pleroma/pleroma!2381
 2020-06-25 21:35:39 +00:00
Mark Felder 433c01b370 Merge branch 'develop' into refactor/notification_settings 2020-06-25 14:26:21 -05:00
lain 04abee782b AntiSpamLinkPolicy: Exempt local users. 2020-06-25 12:40:39 +02:00
lain 1cd1977c0f Merge branch 'issue/1872-ex_aws' into 'develop' 
[#1872] use Pleroma.HTTP for ExAws.S3

See merge request pleroma/pleroma!2683
 2020-06-25 10:14:19 +00:00
lain 84f9ca1956 Blocking: Don't federate if the options is set. 2020-06-25 12:03:14 +02:00
lain 44bb7cfccd ActivityPub: Remove block. 2020-06-25 11:51:33 +02:00
lain 8cfb58a8c0 AccountController: Extract blocking to CommonAPI. 2020-06-25 11:44:04 +02:00
lain e38293c8f1 Transmogrifier: Switch to pipeline for Blocks. 2020-06-25 11:33:54 +02:00
lain 89e5b2046b ObjectValidator: Basic Block support. 2020-06-25 11:13:35 +02:00
lain 0e26ef2ab9 Merge branch 'fix/following-request-from-deactivated' into 'develop' 
Filter outstanding follower requests from deactivated accounts

Closes #1771

See merge request pleroma/pleroma!2682
 2020-06-25 06:50:44 +00:00
Maksim Pechnikov 439a1a0218 added wrapper Pleroma.HTTP for ExAws.S3 2020-06-25 07:12:29 +03:00
Mark Felder 67ab580553 Filter outstanding follower requests from deactivated accounts 2020-06-24 17:18:53 -05:00
Maksim Pechnikov cc837f9d15 fixed config/descpiption.exs 2020-06-24 21:21:33 +03:00
Alexander Strizhakov aae1af8cf1
fix for emoji pagination in pack show 2020-06-24 18:06:30 +03:00
lain 4c5fb831b3 Status schema: Add parent_visible. 2020-06-24 14:33:00 +02:00
lain 35f6770436 StatusView: Add pleroma.parent_visible 2020-06-24 13:29:08 +02:00
lain 88ccade1cb Merge branch 'feature/admin-api-status-count-per-instance' into 'develop' 
admin api status count per instance

See merge request pleroma/pleroma!2500
 2020-06-24 10:42:07 +00:00
Maksim Pechnikov 721fc7c554 added wrapper Pleroma.HTTP for Tzdata.HTTPClient 2020-06-24 09:12:32 +03:00
lain 98af7b59e4 Merge branch 'update-validator' into 'develop' 
Update validator

See merge request pleroma/pleroma!2668
 2020-06-23 18:10:33 +00:00
Roman Chvanikov 1471b70ef1 Merge develop 2020-06-23 20:56:55 +03:00
Haelwenn c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop' 
Moving mrf settings from instance to separate mrf group

Closes #1631

See merge request pleroma/pleroma!2320
 2020-06-23 16:38:27 +00:00
Maksim Pechnikov a8d967762e migrate to oban 2.0-rc1 2020-06-23 15:09:01 +03:00
lain b7f297f0bd Merge branch 'issue/1798' into 'develop' 
[#1798] fixed migration the settings to DB

See merge request pleroma/pleroma!2655
 2020-06-23 10:54:15 +00:00
lain aee815b478 ObjectValidator: Clarify type of object. 2020-06-23 12:37:05 +02:00
lain 2c603f2009 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into update-validator 2020-06-23 10:17:12 +02:00
Maksim Pechnikov 2715c40e1d added tests 2020-06-23 06:59:00 +03:00
Haelwenn (lanodan) Monnier c116b6d6d6
ActivityPubController: Update upload_media @doc 
Small cherry-pick from https://git.pleroma.social/pleroma/pleroma/-/merge_requests/1810
 2020-06-23 04:42:44 +02:00
Haelwenn d21ef5e66b Merge branch 'fix/missing-default-instance_thumbnail_config' into 'develop' 
Add missing default config value for :instance, instance_thumbnail

See merge request pleroma/pleroma!2672
 2020-06-23 01:55:33 +00:00
Mark Felder df5e048cbb Do not need a function to provide fallback value with default defined in config.exs 2020-06-22 17:39:02 -05:00
Haelwenn 98f014d3be Merge branch 'warning/mastofe-settings-blob' into 'develop' 
Add warning against parsing/reusing MastoFE settings blob

See merge request pleroma/pleroma!2671
 2020-06-22 21:59:21 +00:00
Haelwenn (lanodan) Monnier 8f6ba4b22f
Add warning against parsing/reusing MastoFE settings blob 2020-06-22 23:45:29 +02:00
lain 46f7e51b27 Merge branch 'add-muted-to-notifications' into 'develop' 
Add `pleroma.is_muted` property to notifications

Closes #1812

See merge request pleroma/pleroma!2670
 2020-06-22 15:40:09 +00:00
Egor Kislitsyn b3a549e916
Update NotificationOperation spec 2020-06-22 19:18:33 +04:00
Egor Kislitsyn 7e6f43c0d7
Add is_muted to notifications 2020-06-22 19:03:04 +04:00
Maksim Pechnikov b0a40fc2e4 added verify RUM settings before start app 2020-06-22 17:27:49 +03:00
lain 59bdef0c33 Merge branch 'feature/1739-account-endpoints' into 'develop' 
account visibility in masto api

Closes #1739

See merge request pleroma/pleroma!2488
 2020-06-22 12:37:10 +00:00
lain 8b5bdd164e Merge branch 'fix/1825-admin-api-error-codes' into 'develop' 
Proper error codes for error in adminFE

Closes #1825

See merge request pleroma/pleroma!2665
 2020-06-22 12:25:12 +00:00
lain b05f795326 Credo fixes 2020-06-22 14:02:29 +02:00
lain e785cd5cae ActivityPub: Remove update and switch to pipeline. 2020-06-22 13:59:45 +02:00
rinpatch c75ba63bef Merge branch '1865-media-only' into 'develop' 
Resolve "/api/v1/accounts/:id/statuses?only_media=true returns media that is not owned"

Closes #1865

See merge request pleroma/pleroma!2650
 2020-06-22 11:34:07 +00:00
lain 9438f83f83 Transmogrifier: Handle Update with the pipeline. 2020-06-22 13:16:05 +02:00
lain 31a4d42ce0 SideEffects: Handle user updating. 2020-06-22 13:15:37 +02:00
rinpatch 282f492cd5 Merge branch '1883-mrf-chat' into 'develop' 
HellthreadPolicy: Restrict to Notes and Articles.

Closes #1883

See merge request pleroma/pleroma!2666
 2020-06-22 10:00:13 +00:00
lain 93ae1c8bd3 Merge branch 'feature/1854-emoji-pagination' into 'develop' 
Emoji and packs pagination

Closes #1854

See merge request pleroma/pleroma!2658
 2020-06-22 08:41:09 +00:00
lain 35e9282ffd HellthreadPolicy: Restrict to Notes and Articles. 2020-06-22 10:35:11 +02:00
Alexander Strizhakov b5f13af7ba Apply suggestion to lib/pleroma/web/api_spec/operations/pleroma_emoji_pack_operation.ex 2020-06-20 10:59:08 +00:00
Alexander Strizhakov c5863438ba
proper error codes for error in adminFE 2020-06-20 13:53:57 +03:00
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 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
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
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
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
lain 0365053c8d AttachmentValidator: Check if the mime type is valid. 2020-06-07 09:19:00 +02:00
lain 40fc4e974e Notfication: Add validation of notification types 2020-06-06 16:59:08 +02:00
lain f4cf4ae16e ChatController: Use new oauth scope *:chats. 2020-06-06 16:48:02 +02:00
Haelwenn (lanodan) Monnier e1b07402ab
User: Add raw_bio, storing unformatted bio 
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
 2020-06-06 16:23:16 +02:00
lain f77d4a302d Credo fixes. 2020-06-06 15:51:08 +02:00
lain 9189b489ee Migrations: Move Notification migration code to helper 2020-06-06 15:33:02 +02:00
lain 9fa3f0b156 Notification: Change type of type to an enum. 2020-06-06 13:08:45 +02:00
lain ca0e6e702b ChatMessageReference -> Chat.MessageReference 2020-06-06 11:51:10 +02:00
lain 137adef6e0 ChatMessageReference: Use FlakeId.Ecto.Type 
No need for compat because this is brand new.
 2020-06-06 10:42:24 +02:00
lain 239d03499e Chat: creation_cng -> changeset 
Make our usage of this more uniform.
 2020-06-06 10:38:45 +02:00
lain 4e8c0eecd5 WebPush: Don't break on contentless chat messages. 2020-06-06 09:46:07 +02:00
Egor Kislitsyn 167812a3f2
Fix pagination 2020-06-05 23:18:29 +04:00