squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
9,961 Commits 154 Branches 42 Tags 503 MiB
8bdf18d7c1
Commit Graph

6196 Commits

Author SHA1 Message Date
lain
8bdf18d7c1 CommonAPI: Linkify chat messages. 2020-05-30 12:30:31 +02:00
lain
2c9465cc51 SafeText: Let through basic html. 2020-05-30 12:17:18 +02:00
lain
3898dd69a6 SideEffects: Ensure a chat is present before streaming something out. 2020-05-29 16:05:02 +02:00
lain
767ce8b803 StreamerView: Actually send Chats, not ChatMessages. 2020-05-29 16:02:45 +02:00
lain
863c02b25d SideEffects: Stream out chat messages. 2020-05-29 15:44:03 +02:00
lain
c86a88edec Streamer: Add a chat message stream. 2020-05-29 15:24:41 +02:00
lain
af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-29 12:36:17 +02:00
rinpatch
396bc69aee Merge branch 'fix/mediaproxy-bypass-emoji' into 'develop' 
Fix profile emojis bypassing mediaproxy and harden CSP

Closes #1810

See merge request pleroma/pleroma!2596
 2020-05-29 09:46:31 +00:00
rinpatch
27180611df HTTP Security plug: make starting csp string generation more readable 2020-05-29 12:32:48 +03:00
lain
1d30608e20 Merge branch 'fix/1557-gets-local-pack' into 'develop' 
get-packs for local generated pack

Closes #1557

See merge request pleroma/pleroma!2604
 2020-05-28 17:08:30 +00:00
lain
f6ddf0cc50 Merge branch 'feature/1792-update-actor-type' into 'develop' 
Validate actor type

See merge request pleroma/pleroma!2593
 2020-05-28 16:58:28 +00:00
Alexander Strizhakov
ae05792d2a
get-packs for local generated pack 2020-05-28 19:41:34 +03:00
Mark Felder
95f6240889 Fix minor spelling error 2020-05-27 14:34:37 -05:00
rinpatch
29ff6d414b HTTP security plug: Harden img-src and media-src when MediaProxy is enabled 2020-05-27 21:41:19 +03:00
rinpatch
455a402c8a HTTP Security plug: rewrite &csp_string/0 
- Directives are now separated with ";" instead of " ;",
according to https://www.w3.org/TR/CSP2/#policy-parsing
the space is optional
- Use an IO list, which at the end gets converted to a binary as
opposed to ++ing a bunch of arrays with binaries together and joining
them to a string. I doubt it gives any significant real world advantage,
but the code is cleaner and now I can sleep at night.
- The static part of csp is pre-joined to a single binary at compile time.
Same reasoning as the last point.
 2020-05-27 21:31:47 +03:00
rinpatch
8f6d428880 AccountView: Use mediaproxy URLs for emojis 
Also use atom keys in emoji maps instead of binaries

Closes #1810
 2020-05-27 19:44:02 +03:00
rinpatch
d35be02e70 Merge branch 'refactor-add-mention-step-one' into 'develop' 
Fix ObjectView calling into strange functions

Closes #1807

See merge request pleroma/pleroma!2580
 2020-05-27 14:17:12 +00:00
rinpatch
91f73a7592 Merge branch 'notification-fixes' into 'develop' 
Notification performance fixes

See merge request pleroma/pleroma!2595
 2020-05-27 13:45:14 +00:00
Alexander Strizhakov
047a11c48f Apply suggestion to lib/pleroma/web/admin_api/controllers/admin_api_controller.ex 2020-05-27 10:55:42 +00:00
lain
b8e029b5ea Notification: Actually preload objects. 2020-05-27 12:41:06 +02:00
lain
b9e2678b9e Merge branch 'fav-speedup' into 'develop' 
ActivityPub: Change ordering to `nulls last` in favorites query

See merge request pleroma/pleroma!2594
 2020-05-27 08:02:00 +00:00
lain
7e13200869 ActivityPub: Change ordering to nulls last in favorites query 
This makes it use our existing index and speeds up the query.
 2020-05-27 09:46:12 +02:00
Alexander Strizhakov
3249141588
validate actor type 2020-05-27 10:14:22 +03:00
rinpatch
cf139b06a3 Merge branch 'fav-speedup' into 'develop' 
Fix favorites query performance

See merge request pleroma/pleroma!2591
 2020-05-26 16:33:13 +00:00
rinpatch
3601c0015c Merge branch '1808-pleroma-sucks' into 'develop' 
Resolve "Don't fail message ingestions when we can't update a user"

Closes #1808

See merge request pleroma/pleroma!2576
 2020-05-26 15:57:01 +00:00
rinpatch
ed08da9135 Merge branch '1813-throttling' into 'develop' 
Mastodon API Controllers: Use the correct params for rate limiting.

Closes #1813

See merge request pleroma/pleroma!2586
 2020-05-26 15:55:09 +00:00
lain
d8d99fd4cf Activity.Queries: Use correct actor restriction. 2020-05-26 17:46:16 +02:00
Egor Kislitsyn
2069ec5006
Fix Oban warnings 2020-05-26 16:11:42 +04:00
lain
51bc6674f6 Mastodon API Controllers: Use the correct params for rate limiting. 2020-05-26 13:45:54 +02:00
Ivan Tashkinov
d7a57004ef [#1501] Made user feed contain public and unlisted activities. 2020-05-25 23:27:47 +03:00
lain
dbd07d29a3 Streamer: Don't crash on streaming chat notifications 2020-05-25 17:27:45 +02:00
lain
6bd7070b00 Transmogrifier: Use a simpler way to get mentions. 2020-05-25 15:08:43 +02:00
lain
5fef405208 User: Change signature of get_users_from_set 2020-05-25 15:06:35 +02:00
lain
f20dff451e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1808-pleroma-sucks 2020-05-25 14:01:16 +02:00
lain
ee35bb5ac2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-25 13:57:27 +02:00
lain
ec470c4c77 Merge branch 'openapi/admin/status' into 'develop' 
Add OpenAPI spec for AdminAPI.StatusController

See merge request pleroma/pleroma!2566
 2020-05-25 11:40:54 +00:00
lain
d0c26956da User: Don't error out if we want to refresh a user but can't 2020-05-25 12:46:14 +02:00
rinpatch
7bc2ec0aa2 Merge branch 'mastodon-migration-compat' into 'develop' 
Add compatibility routes for converted mastodon instances

Closes #1797

See merge request pleroma/pleroma!2572
 2020-05-24 19:05:57 +00:00
lain
ddbbefeb2e Merge branch 'feature/configure-filename-truncate' into 'develop' 
Configurable filename truncation threshold

Closes #1799

See merge request pleroma/pleroma!2573
 2020-05-22 16:05:35 +00:00
Roman Chvanikov
5d60b25e69 Apply suggestion to lib/pleroma/web/common_api/utils.ex 2020-05-22 15:44:10 +00:00
Roman Chvanikov
cc82229ba7 Add filename_display_max_length config 2020-05-22 18:19:25 +03:00
lain
91c8467582 OStatusController: Add Mastodon activity compat route. 2020-05-22 17:11:59 +02:00
lain
355aa3bdc7 ActivityPubController: Add Mastodon activity compat route. 2020-05-22 17:06:12 +02:00
lain
8a4bd9e5d1 OStatusController: Add Mastodon compatibility route for objects. 2020-05-22 16:47:22 +02:00
rinpatch
1fa7aa9fc5 Merge branch 'emoji-react-better-errors' into 'develop' 
EmojiReactionController: Return more appropriate error.

See merge request pleroma/pleroma!2569
 2020-05-22 14:36:08 +00:00
Egor Kislitsyn
ba106aa9c8
Fix notifications mark as read API 2020-05-22 18:15:36 +04:00
lain
ca755f9a73 ActivityPubController: Add Mastodon compatibility route. 2020-05-22 16:15:29 +02:00
lain
bcb549531f EmojiReactionController: Return more appropriate error. 2020-05-22 14:38:28 +02:00
Haelwenn
7b02bfca51 Merge branch 'announce-validator' into 'develop' 
Announce validator

See merge request pleroma/pleroma!2567
 2020-05-22 05:47:53 +00:00
Haelwenn
a57e7f3503 Merge branch '1113-op-mentioning' into 'develop' 
CommonAPI: Change public->private implicit addressing.

Closes #1113

See merge request pleroma/pleroma!2563
 2020-05-22 05:22:07 +00:00