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

7265 commits

Author SHA1 Message Date
Maksim Pechnikov 3e53ab4e98 added notification constraints 2020-09-14 14:08:12 +03:00
Ivan Tashkinov cd234a5321 [#2497] Media preview proxy: preview bypass for small images 
(basing on Content-Length and Content-Type).
 2020-09-12 11:20:41 +03:00
Ivan Tashkinov 32831f371f [#2497] Media preview proxy: redirecting to media proxy url in case of preview error or unsupported content type. 2020-09-12 10:33:42 +03:00
Mark Felder c0b36621f1 Ensure we only apply NSFW Simple policy on parsable objects 2020-09-11 23:22:14 -05:00
Alex Gleason 9733c9d065
Merge remote-tracking branch 'upstream/develop' into chat-moderation 2020-09-11 14:13:38 -05:00
Alex Gleason e229536e5c
Chat Moderation: use explicit sender and recipient fields 2020-09-11 14:11:00 -05:00
Alex Gleason 02d70228b5
AdminAPI: fix delete chat message 2020-09-11 14:10:35 -05:00
Alex Gleason 9dd0b23da4
AdminAPI: show chat 2020-09-11 14:10:28 -05:00
Alex Gleason f13b52a703
AdminAPI: list messages in a chat 2020-09-11 14:10:19 -05:00
Alex Gleason c41430b23e
Refactor with Chat.for_user_query/1 2020-09-11 14:10:13 -05:00
Alex Gleason fb0de07343
AdminAPI: list chats for a user 2020-09-11 14:10:05 -05:00
Alex Gleason b40a627ab0
AdminAPI: delete a chat message 2020-09-11 14:09:58 -05:00
Alex Gleason f88dc1937e
MastodonAPI.StatusView.get_user/1 --> CommonAPI.get_user/1 2020-09-11 14:09:50 -05:00
Haelwenn (lanodan) Monnier f1f44069ae
Fetcher: Correctly return MRF reject reason 2020-09-11 20:00:41 +02:00
Ivan Tashkinov 0bda85857e Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy 
# Conflicts:
#	lib/pleroma/instances/instance.ex
 2020-09-11 17:19:58 +03:00
rinpatch 89a7efab69 ConnectionPool: Log possible HTTP1 blocks 2020-09-11 15:37:39 +03:00
Haelwenn 36c9197ac3 Apply 1 suggestion(s) to 1 file(s) 2020-09-11 10:46:16 +00:00
Haelwenn (lanodan) Monnier dbc013f24c
instance: Handle not getting a favicon 2020-09-11 11:37:46 +02:00
Haelwenn (lanodan) Monnier f18178cb09
AttachmentValidator: directly embed url schema and pass it fix_media_type 2020-09-11 01:40:20 +02:00
Haelwenn (lanodan) Monnier 1b3d5956b1
Pipeline Ingestion: Article 2020-09-11 01:40:20 +02:00
Haelwenn (lanodan) Monnier 2132b24a9d
object_validators: likes & announcements as [ObjectID] 2020-09-11 01:39:39 +02:00
Haelwenn (lanodan) Monnier 846b59ccb0
Pipeline Ingestion: Video 2020-09-11 01:39:39 +02:00
Haelwenn (lanodan) Monnier b73e9ef686
transmogrifier: Call strip_internal_fields on pipeline ingestion 2020-09-11 01:39:38 +02:00
Haelwenn (lanodan) Monnier da876d09e8
federator: normalize only actor, catch actor error 2020-09-11 00:56:21 +02:00
Ivan Tashkinov 4d18a50f3c [#2497] Formatting fix. 2020-09-10 21:54:26 +03:00
Alexander Strizhakov 15aece7238 remove validate_expires_at from enqueue method 2020-09-10 21:52:31 +03:00
Alexander Strizhakov 2c2094d4b2 configurable lifetime for ephemeral activities 2020-09-10 21:51:59 +03:00
Alexander Strizhakov f24828a3e8 oban warning 2020-09-10 21:51:30 +03:00
Alexander Strizhakov eb5ff715f7 pin/unpin for activities with expires_at option 2020-09-10 21:50:41 +03:00
Alexander Strizhakov b3485a6dbf little clean up 2020-09-10 21:50:41 +03:00
Alexander Strizhakov 357d971a10 expiration for new pipeline 2020-09-10 21:50:41 +03:00
Alexander Strizhakov 93e1c8df9d reject activity creation 
if passed expires_at option and expiring activities are not configured
 2020-09-10 21:50:41 +03:00
Alexander Strizhakov 4981b5a1a3 copyright header 2020-09-10 21:50:41 +03:00
Alexander Strizhakov 629a8de9cb deprecation warning 
changed namespace for activity expiration configuration
 2020-09-10 21:50:41 +03:00
Alexander Strizhakov de4c935071 don't expire pinned posts 2020-09-10 21:50:41 +03:00
Alexander Strizhakov 9bf1065a06 schedule activity expiration in Oban 2020-09-10 21:50:40 +03:00
rinpatch 0254696e30 Merge branch 'feature/1790-oban-overuse-clear-oauth-token' into 'develop' 
Feature/1790 removing expired tokens through Oban scheduled jobs

See merge request pleroma/pleroma!2957
 2020-09-10 18:45:04 +00:00
rinpatch 541a3eede2 Merge branch 'chores/remove-ostatus-fixtures' into 'develop' 
Remove OStatus in testsuite

See merge request pleroma/pleroma!2968
 2020-09-10 18:41:00 +00:00
rinpatch 53cf7fef6e Merge branch 'fix/streaming-termination-errors' into 'develop' 
Fix two pseudo-errors in websocket handler

Closes #2131

See merge request pleroma/pleroma!2982
 2020-09-10 18:40:54 +00:00
rinpatch 45c299e5b5 Merge branch '2130-mfa-users-oauth-login-fix' into 'develop' 
[#2130] Fixed OAuth OOB authentication for users with enabled MFA

Closes #2130

See merge request pleroma/pleroma!2979
 2020-09-10 18:38:48 +00:00
Ivan Tashkinov dc4e06e199 [#2497] Removed support for thumbnail_max_* params for media preview proxy 
(per https://git.pleroma.social/pleroma/pleroma/-/merge_requests/2497#note_70771)
 2020-09-10 21:28:07 +03:00
rinpatch 01fa68fe45 Websocket handler: fix never matching code on failed auth 
`:cowboy_req.reply` does not return tuples since 2.0, see
https://ninenines.eu/docs/en/cowboy/2.4/manual/cowboy_req.reply/
 2020-09-10 21:26:52 +03:00
rinpatch e16e8f9816 Websocket handler: do not raise if handler is terminated before switching protocols 
Closes #2131
 2020-09-10 21:14:23 +03:00
rinpatch cb06e98da2 websocket handler: Do not log client ping frames as errors 2020-09-10 21:14:23 +03:00
Alexander Strizhakov e8bfb50fa3
pass options without adapter key 2020-09-10 20:09:44 +03:00
Alexander Strizhakov 8af1fd3223
oban warning 2020-09-10 16:01:20 +03:00
Alexander Strizhakov 7dd986a563
expire mfa tokens through Oban 2020-09-10 16:01:19 +03:00
Alexander Strizhakov 3ce658b930
schedule expired oauth tokens deletion with Oban 2020-09-10 16:01:19 +03:00
Ivan Tashkinov 148bc24435 [#2497] Removed Hackney-specific code 
(no longer needed due to adapter options unification).
 2020-09-10 11:54:10 +03:00
Alexander Strizhakov ab56dd54e7
use Pleroma.HTTP in emoji packs tasks 2020-09-10 11:23:39 +03:00
Ivan Tashkinov cad69669fc [#2130] Fixed OAuth OOB authentication for users with enabled MFA. 2020-09-09 22:44:38 +03:00
Ivan Tashkinov b4860c57a6 [#2497] Formatting fix. 2020-09-09 19:43:36 +03:00
Ivan Tashkinov 68a74d6659 [#2497] Added missing alias, removed legacy :adapter option specification for HTTP.get/_. 2020-09-09 19:30:42 +03:00
Mark Felder 4ee99dafcc Merge branch 'develop' into media-preview-proxy 2020-09-09 11:11:36 -05:00
rinpatch 0d2814ec8e Metadata: Move restriction check from Feed provider to activated_providers 2020-09-08 20:21:34 +03:00
Mark Felder 2011142ed9 Use :restrict_unauthenticated testing for more granular control 2020-09-08 20:21:34 +03:00
Mark Felder a85ed6defb Do not serve RSS/Atom feeds when instance is private 2020-09-08 20:21:34 +03:00
Mark Felder 14d07081fd Feed provider only generates a redirect, so always activate it. 
Making this configurable is misleading.
 2020-09-08 20:21:34 +03:00
Mark Felder ff07014b26 Disable providers of user and status metadata when instance is private 2020-09-08 20:21:34 +03:00
Mark Felder 630444ee08 Do not make RelMe metadata provider optional. 
There's really no sound reason to turn this off anyway.
 2020-09-08 20:21:34 +03:00
Haelwenn (lanodan) Monnier 947ee55ae2 user: harden get_friends_query(), get_followers_query() and their wrappers 2020-09-08 20:21:34 +03:00
Haelwenn (lanodan) Monnier 16c451f8f1 search: Apply following filter only when user is usable 2020-09-08 20:21:34 +03:00
Haelwenn (lanodan) Monnier 10ef532c63 AP C2S: Restrict character limit on Note 2020-09-08 20:21:34 +03:00
Egor Kislitsyn a781ac6ca5 Fix atom leak in AdminAPIController 2020-09-08 20:21:34 +03:00
rinpatch 27c3973b78 Merge branch 'temp-hackney-fix' into 'develop' 
temp hackney fix

See merge request pleroma/pleroma!2951
 2020-09-08 19:45:44 +03:00
rinpatch 7490b76bbf Merge branch 'fix/upload-filter-exiftool-webp' into 'develop' 
Skip processing webp image files because we can't strip EXIF

Closes #2080

See merge request pleroma/pleroma!2924
 2020-09-08 19:45:44 +03:00
Haelwenn (lanodan) Monnier 921f926e96
Remove OStatus in testsuite 2020-09-08 18:43:57 +02:00
Haelwenn (lanodan) Monnier ee0e05f930
Drop unused "inReplyToAtomUri" in objects 2020-09-08 18:43:57 +02:00
Alexander Strizhakov 87d2805791
combo fixes 2020-09-08 17:40:23 +02:00
Mark Felder 21efda2edb Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into unlisted 2020-09-08 09:31:26 -05:00
rinpatch 0a05670b44 Merge branch 'fix/upload-filter-exiftool-webp' into 'develop' 
Skip processing webp image files because we can't strip EXIF

Closes #2080

See merge request pleroma/pleroma!2924
 2020-09-08 12:21:33 +00:00
rinpatch 4b76d7ce67 Merge branch 'fix/admin-controller-atom-leak' into 'develop' 
Fix atom leak in AdminAPIController

See merge request pleroma/secteam/pleroma!6
 2020-09-08 14:00:00 +03:00
lain 9b85592b8b Merge branch 'fix/rich-media-fake-statuses' into 'develop' 
Rich Media: Do not cache URLs for preview statuses

Closes #1987

See merge request pleroma/pleroma!2956
 2020-09-08 13:56:42 +03:00
rinpatch 964bc8e2e8 Merge branch 'bugfix/favicon-too-long' into 'develop' 
instance: Drop favicon URLs longer than 255 characters

Closes #2116

See merge request pleroma/pleroma!2949
 2020-09-08 13:55:52 +03:00
feld 43b07c31cb Merge branch 'fix/2095-deactivated-account-reset' into 'develop' 
Disallow password resets for deactivated accounts

Closes #2095

See merge request pleroma/pleroma!2935
 2020-09-08 13:53:47 +03:00
rinpatch dccbed856d Merge branch 'http-fixes' into 'develop' 
Improvements and fixes for http requests

See merge request pleroma/pleroma!2904
 2020-09-08 13:53:16 +03:00
rinpatch ea4b6c64d6 Merge branch 'feat/rich-media-improvements' into 'develop' 
Rich media improvements

See merge request pleroma/pleroma!2944
 2020-09-08 13:00:49 +03:00
rinpatch 8c3241df44 Merge branch 'fix/2047-rich-media-parser' into 'develop' 
RichMedia parser fix

Closes #2047

See merge request pleroma/pleroma!2941
 2020-09-08 13:00:15 +03:00
rinpatch 13e606941c Merge branch 'fix/2087-metadata' into 'develop' 
Fix/2087 metadata

See merge request pleroma/secteam/pleroma!11
 2020-09-08 12:55:30 +03:00
rinpatch 74d46a1b09 Merge branch 'secfix/search-crash' into 'develop' 
Fix crash done via search

See merge request pleroma/secteam/pleroma!12
 2020-09-08 12:53:11 +03:00
rinpatch 84acfab156 Merge branch 'fix-searching-following' into 'develop' 
search: fix 'following' query parameter

See merge request pleroma/pleroma!2943
 2020-09-08 12:53:02 +03:00
rinpatch 718c7cc847 Merge branch 'fix/apc2s-limits' into 'develop' 
AP C2S: Restrict character limit on Note

Closes #2

See merge request pleroma/secteam/pleroma!9
 2020-09-08 12:51:38 +03:00
Mark Felder 4ea07f74e9 Revert/simplify. 
We only need to check the content-type. There's no chance a webp file
will get mismatched as another image type.
 2020-09-08 12:29:38 +03:00
Mark Felder 216c84a8f4 Bypass the filter based on content-type as well in case a webp image is uploaded with the wrong file extension. 2020-09-08 12:29:38 +03:00
Mark Felder 2165a24974 Improve upload filter return values so we can identify when filters make no changes to the input 2020-09-08 12:29:38 +03:00
Mark Felder fa347b9c2f Fix uploading webp image files when Exiftool Upload Filter is enabled 2020-09-08 12:29:38 +03:00
Alibek Omarov 95688c90ad ForceBotUnlistedPolicy: simplify code 2020-09-08 01:15:15 +02:00
Alibek Omarov 8b695c3eeb ForceBotUnlistedPolicy: format 2020-09-07 22:53:45 +02:00
Alibek Omarov 699224a900 ForceBotUnlistedPolicy: initial add, tiny clean up from my previous version 2020-09-07 22:15:42 +02:00
Alexander Strizhakov 18d21aed00
deprecation warnings 2020-09-07 19:59:17 +03:00
Alexander Strizhakov 696bf09433
passing adapter options directly without adapter key 2020-09-07 19:59:17 +03:00
Alexander Strizhakov a83916fdac
adapter options unification 
not needed options deletion
 2020-09-07 19:59:17 +03:00
Alexander Strizhakov ee67c98e55
removing Stats worker from Oban cron jobs 2020-09-07 19:16:14 +03:00
rinpatch 6c6de8e5df Merge branch 'temp-hackney-fix' into 'develop' 
temp hackney fix

See merge request pleroma/pleroma!2951
 2020-09-07 12:47:43 +00:00
rinpatch d5c286b802 Merge branch 'bugfix/favicon-too-long' into 'develop' 
instance: Drop favicon URLs longer than 255 characters

Closes #2116

See merge request pleroma/pleroma!2949
 2020-09-07 11:12:30 +00:00
lain fdab01ab56 Merge branch 'fix/rich-media-fake-statuses' into 'develop' 
Rich Media: Do not cache URLs for preview statuses

Closes #1987

See merge request pleroma/pleroma!2956
 2020-09-07 10:19:19 +00:00
Haelwenn (lanodan) Monnier 08aef7dd4e
instance: Log catch favicon errors as warnings 2020-09-07 08:40:52 +02:00
Maksim Pechnikov 917d325972 added api spec 2020-09-07 07:17:30 +03:00
Maksim Pechnikov 5ae56aafb2 added import mutes 2020-09-06 21:42:51 +03:00
Mark Felder 563718cab9 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into media-preview-proxy 2020-09-06 08:15:34 -05:00