denys/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
11837 commits 11 branches 79 tags 293 MiB
Commit graph

6995 commits

Author SHA1 Message Date
eugenijm
582ad5d4e1 AdminAPI: Allow to modify Terms of Service and Instance Panel via Admin API 2020-09-17 16:48:07 +03:00
lain
7a73850928 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into alexgleason/pleroma-chat-moderation 2020-09-17 13:26:04 +02:00
Maksim Pechnikov
5a8ea0a5b0 small refactoring 2020-09-17 09:13:43 +03:00
Maksim Pechnikov
b867f9d7ae Merge branch 'develop' into issue/2099 2020-09-17 08:41:35 +03:00
Ivan Tashkinov
a781f41f96 [#2497] Media preview proxy: misc. improvements (static param support, dynamic fifo pipe path), refactoring. 2020-09-16 22:30:42 +03:00
rinpatch
3a9baa9d0d Merge branch '2144-empty-users' into 'develop' 
User: Remote users don't need to be confirmed or approved

Closes #2144

See merge request pleroma/pleroma!3003
 2020-09-16 15:47:07 +00:00
lain
7a88b726bf User: Remote users don't need to be confirmed or approved 2020-09-16 17:29:16 +02:00
rinpatch
a4f80e1e74 Merge branch 'feat/connection-worker-monitor-flush' into 'develop' 
ConnectionPool Worker: use monitor flush instead of checking ref

See merge request pleroma/pleroma!3002
 2020-09-16 15:10:20 +00:00
rinpatch
adb1b0282d ConnectionPool Worker: use monitor flush instead of checking ref 
`:flush` removes the DOWN message if one had arrived, so this check
should no longer be necessary.
 2020-09-16 17:29:07 +03:00
rinpatch
eca8d26784 Merge branch 'chores/mrf-loglevel' into 'develop' 
Fetcher: Correctly return MRF reject reason

See merge request pleroma/pleroma!2990
 2020-09-16 13:37:04 +00:00
rinpatch
adbd0032fa Merge branch 'features/validators-video' into 'develop' 
Pipeline Ingestion: Video and Article

See merge request pleroma/pleroma!2908
 2020-09-16 13:36:27 +00:00
lain
6b088ed76a Merge branch 'issue/2089' into 'develop' 
[#2089] fix notifications

See merge request pleroma/pleroma!3000
 2020-09-16 12:22:48 +00:00
Maksim Pechnikov
599f8bb152 RepoStreamer.chunk_stream -> Repo.chunk_stream 2020-09-16 09:47:18 +03:00
Ivan Tashkinov
2f155fb89f Merge remote-tracking branch 'remotes/origin/develop' into media-preview-proxy-nostream 2020-09-15 20:29:39 +03:00
eugenijm
3ab59a6f3c Mastodon API: fix the public timeline returning an error when the reply_visibility parameter is set to self for an unauthenticated user 2020-09-15 13:00:56 +03:00
Haelwenn
5c4ff5c73c Merge branch 'fix/mrf-simple-welcome-chats' into 'develop' 
Ensure we only apply media_nsfw simple policy on parsable objects

Closes #2133

See merge request pleroma/pleroma!2992
 2020-09-15 08:25:10 +00:00
Mark Felder
709723182d Ensure SimplePolicy's tags in string representation don't trip up the object validator 2020-09-14 17:06:42 -05:00
stwf
38b2db297b search indexing metadata respects discoverable flag 2020-09-14 13:18:11 -04:00
rinpatch
bb407edce4 RichMedia: fix a compilation error due to nonexistent variable 
No idea why this passed Gitlab CI
 2020-09-14 15:46:00 +03:00
rinpatch
f70335002d RichMedia: Do a HEAD request to check content type/length 
This shouldn't be too expensive, since the connections are pooled,
but it should save us some bandwidth since we won't fetch non-html
files and files that are too large for us to process (especially
since you can't cancel a request without closing the connection
with HTTP1).
 2020-09-14 14:45:58 +03:00
rinpatch
f66a15c4a5 RichMedia parser: do not set a cache TTL for unchanging errors 2020-09-14 14:44:25 +03:00
Maksim Pechnikov
3e53ab4e98 added notification constraints 2020-09-14 14:08:12 +03:00
Maksim
489a107cf4 Apply 1 suggestion(s) to 1 file(s) 2020-09-13 11:54:15 +00: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
Maksim Pechnikov
9853c90abb added paginate links to headers for /chats/:id/messages 2020-09-10 12:39:29 +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
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