lou_de_sel/akkoma
1
0
Fork 0
forked from AkkomaGang/akkoma
Code Issues Pull requests Projects Releases Packages Wiki Activity
8713 commits 3 branches 68 tags 292 MiB
Commit graph

5353 commits

Author SHA1 Message Date
lain
fda6f35a46 Merge branch 'feat/instance-gen-improvements' into 'develop' 
small instance.gen task improvements

See merge request pleroma/pleroma!2245
 2020-02-26 08:26:16 +00:00
rinpatch
3bbfebd1c2 instance.gen task: make example instance name less confusing 
See https://git.pleroma.social/pleroma/pleroma/merge_requests/2245#note_52217
 2020-02-26 00:32:34 +03:00
rinpatch
359faa8645 instance.gen task: remind to transfer the config to the database after 
migrations
 2020-02-25 22:13:08 +03:00
rinpatch
cfa28dee32 instance.gen task: make instance name default to the domain 2020-02-25 21:59:37 +03:00
Egor Kislitsyn
22018adae6
Fix Dialyzer warnings 2020-02-25 18:34:56 +04:00
rinpatch
035c2c1415 Merge branch 'fix/instance-gen-custom-static' into 'develop' 
instance.gen task: fix crash when using custom static directory

Closes #1082

See merge request pleroma/pleroma!2237
 2020-02-24 20:52:10 +00:00
rinpatch
5e4fe0e8f7 instance.gen task: fix crash when using custom static directory 
Closes #1082
 2020-02-24 23:42:24 +03:00
eugenijm
7ad5c51f23 Admin API: GET /api/pleroma/admin/stats to get status count by visibility scope 2020-02-24 21:46:37 +03:00
lain
81f29e7c6a Merge branch 'bugfix/captcha-nil-answer_data' into 'develop' 
Bugfix: return invalid when answer_data is nil

Closes #1585

See merge request pleroma/pleroma!2236
 2020-02-24 14:54:22 +00:00
Haelwenn (lanodan) Monnier
f9fe6a9e30
Captcha: return invalid when answer_data is nil 2020-02-24 02:49:53 +01:00
Ivan Tashkinov
8f0ca19b9c Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 
# Conflicts:
#	CHANGELOG.md
#	config/config.exs
 2020-02-22 09:31:43 +03:00
Haelwenn
c5570e0493 Merge branch 'single_emoji_reaction' into 'develop' 
Single emoji reaction

Closes #1578

See merge request pleroma/pleroma!2226
 2020-02-20 23:50:40 +00:00
lain
3eddd9caa6 Merge branch 'require-signature' into 'develop' 
Add an option to require fetches to be signed

Closes #1444

See merge request pleroma/pleroma!2071
 2020-02-20 12:13:21 +00:00
lain
c69b04c490 Merge branch 'features/remote-follow-userpage-redirect' into 'develop' 
remote_follow_controller.ex: Redirect to the user page on success

Closes #1245

See merge request pleroma/pleroma!2123
 2020-02-20 12:04:29 +00:00
Ivan Tashkinov
0c65a8c3d0 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 
# Conflicts:
#	config/config.exs
 2020-02-20 15:00:48 +03:00
lain
e0b2de6385 Merge branch 'feature/new-registrations-digest' into 'develop' 
New users digest email

Closes #1514

See merge request pleroma/pleroma!2128
 2020-02-20 11:58:37 +00:00
Ivan Tashkinov
3432294657 [#1505] Fixed @spec for Queries.by_object_in_reply_to_id/3 2020-02-20 14:48:46 +03:00
lain
314928333a Pleroma API: Add endpoint to get reaction information on a single emoji 2020-02-19 17:16:45 +01:00
lain
cf8307e71c Merge branch 'fix/status-view/expires_at' into 'develop' 
Fix `status.expires_at` type

Closes #1573

See merge request pleroma/pleroma!2222
 2020-02-18 14:56:59 +00:00
Ivan Tashkinov
61d9f43e46 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-18 17:46:09 +03:00
lain
3fa2ac68df Merge branch 'chore/standardize-mrf-behavior' into 'develop' 
Standardize @behaviour usage in MRFs

See merge request pleroma/pleroma!2212
 2020-02-18 14:36:10 +00:00
lain
c07efd5b42 Merge branch 'need-reboot-flag' into 'develop' 
need_reboot flag for adminFE

See merge request pleroma/pleroma!2188
 2020-02-18 14:32:03 +00:00
Egor Kislitsyn
2ef70b55f5
Fix status.expires_at type 2020-02-18 14:52:11 +04:00
rinpatch
472132215e Use floki's new APIs for parsing fragments 2020-02-16 01:55:26 +03:00
Ivan Tashkinov
269d592181 [#1505] Restricted max thread distance for fetching replies on incoming federation (in addition to reply-to depth restriction). 2020-02-15 20:41:38 +03:00
Haelwenn (lanodan) Monnier
1257331291
MastodonAPI.StatusView: Do not use site_name 
site_name allow to spoof the origin of the domain and so hacks like:

<!-- served on https://hacktivis.me/tmp/joinmastodon.org.html -->
<meta property="og:image" content="https://hacktivis.me/datalove/img/meme/pleroma/mastodon%2C%20forbidden%20amuse%20yourself.jpeg" />
<meta property="og:title" content="Mastodon: Forbidden Amuse Yourself" />
<meta property="og:site_name" content="joinmastodon.org" />
<meta http-equiv="refresh" content="0; url=http://joinmastodon.org/">
 2020-02-15 00:36:09 +01:00
Mark Felder
478619782b Standardize @behaviour usage in MRFs 2020-02-14 11:02:24 -06:00
rinpatch
9906c6fb6f Merge branch 'fix/mrf-transparency-disabling-federation-status' into 'develop' 
NodeInfo: Fix federating status not being reported when MRF transparency is disabled

Closes #1568

See merge request pleroma/pleroma!2206
 2020-02-13 18:08:43 +00:00
rinpatch
23049a077e NodeInfo: Fix federating status not being reported when MRF 
transparency is disabled

Closes #1568
 2020-02-13 19:53:39 +03:00
feld
b312c36b8e Merge branch 'develop' into 'fix/rename-no_attachment_links-setting' 
# Conflicts:
#   config/description.exs
 2020-02-13 14:37:55 +00:00
Egor Kislitsyn
19516af74e
Fix status.expires_in validation 2020-02-12 20:20:44 +04:00
Mark Felder
ff9fd4ca89 Fix the confusingly named and inverted logic of "no_attachment_links" 
The setting is now simply "attachment_links" and the boolean value does
what you expect. A double negative is never possible and describing the
functionality is no longer a philospher's worst nightmare.
 2020-02-11 15:39:19 -06:00
Egor Kislitsyn
50d9fcbe29
Hotlink logo instead of attachment 2020-02-11 23:33:05 +04:00
feld
237b2068f9 Revert "Merge branch 'feat/floki-fasthtml' into 'develop'" 
This reverts merge request !2194
 2020-02-11 16:55:18 +00:00
rinpatch
ea1631d7e6 Make Floki use fast_html 2020-02-11 16:17:21 +03:00
lain
24c526a0b1 Merge remote-tracking branch 'origin/develop' into uguu-uwu-notices-bulge 2020-02-11 13:58:36 +01:00
Egor Kislitsyn
6875ccb6bf
Merge branch 'develop' into feature/new-registrations-digest 2020-02-11 13:54:55 +04:00
rinpatch
94e5ca1105 Merge branch 'issue/1383' into 'develop' 
[#1383] Switch periodic jobs from quantum to oban

See merge request pleroma/pleroma!2015
 2020-02-11 00:04:06 +00:00
Maksim Pechnikov
6813c0302c Merge branch 'develop' into issue/1383 2020-02-10 20:49:20 +03:00
rinpatch
c55301e760 Fix a compilation error under certain circumstances 
I've noticed that sometimes when switching from develop to stable and back,
develop fails to compile and rm -r ing the _build and deps dirs doesn't
help at all.

This is due to Admin API controller needing to generate JSON description
of the config at compile time.  Evaluating `config/description.exs`
calls `Generator.list_modules_in_dir/2`, which in turn predicts the
module names of files in the directory and tries to convert the
predicted name to *existing* atoms. Sometimes the compiler will
call that function before compiling the modules in the said directory,
so the conversion will of course fail.

This fixes it by removing the requirement of the atoms being existent.
The function is not subjected to any untrusted user input so this should
be safe. An ideal fix would be to block the compilation of docs before
all modules are compiled and then get a list of compiled elixir modules
under the namespace we want instead of directory hacks, but I have not
been able to figure out how to do that.
 2020-02-10 18:41:02 +03:00
Ivan Tashkinov
24e49d14f2 [#1505] Removed wrapping of reply URIs into first element, added comments to transmogrifier tests. 2020-02-09 17:34:48 +03:00
Ivan Tashkinov
6ea3c06d8d [#1505] Minor refactoring. 2020-02-09 14:09:01 +03:00
Ivan Tashkinov
7c3991f59e [#1505] Fixed replies serialization (included objects' ids instead of activities' ids). 2020-02-09 10:17:21 +03:00
rinpatch
8fda6303ba Fix email mix task on OTP releases 
Closes pleroma#1548
 2020-02-09 03:27:29 +03:00
Ivan Tashkinov
4e6bbdc7b5 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-08 19:59:37 +03:00
Ivan Tashkinov
d458f4fdca [#1505] Added tests, changelog entry, tweaked config settings related to replies output on outgoing federation. 2020-02-08 19:58:02 +03:00
lain
964b4d82a0 Merge branch 'fix/upload-limit-otp' into 'develop' 
Actually fix upload limit on OTP releases

Closes #1109

See merge request pleroma/pleroma!2185
 2020-02-08 14:02:36 +00:00
Alexander Strizhakov
dad23e3766
need_reboot flag 2020-02-08 13:00:02 +03:00
rinpatch
15ea75cd2a Actually fix upload limit on OTP releases 
Closes #1109
 2020-02-07 20:14:06 +03:00
Haelwenn
1262357ddb Merge branch 'cancel-follow-request' into 'develop' 
Add support for cancellation of a follow request

Closes #1522

See merge request pleroma/pleroma!2175
 2020-02-07 16:10:43 +00:00
Lain Soykaf
d85bcc8627 Questions: Add timezone to closed property 2020-02-07 16:57:46 +01:00
Lain Soykaf
4538a1ee01 EmojiReactions: Remove old API endpoints 2020-02-07 15:01:45 +01:00
Lain Soykaf
f875b9650a EmojiReactions: Add Mastodon-aligned reaction endpoints, change response 2020-02-07 14:52:13 +01:00
Egor Kislitsyn
bc2e98b200
Add User.get_follow_state/2 2020-02-07 16:17:34 +04:00
Lain Soykaf
8a79f20c21 EmojiReactions: Rename to EmojiReacts 2020-02-06 18:09:57 +01:00
feld
df0b00b32d Merge branch 'mastoapi-non-html-strings' into 'develop' 
mastodon API: do not sanitize html in non-html fields

See merge request pleroma/pleroma!2167
 2020-02-06 16:08:23 +00:00
Egor Kislitsyn
8b9742ecf5 Cancellation of a follow request for a remote user 2020-02-06 18:02:33 +04:00
Alexander Strizhakov
c85aa6e87f
removing confusing error 2020-02-06 12:50:36 +03:00
rinpatch
15cb1f6804 Merge branch 'fix/unpinnable-polls' into 'develop' 
fix not being able to pin polls

See merge request pleroma/pleroma!2172
 2020-02-05 21:04:16 +00:00
rinpatch
72d767998c Merge branch 'removing-admin-api-endpoint' into 'develop' 
Removing migrate_from_db endpoint from admin api

See merge request pleroma/pleroma!2177
 2020-02-05 21:03:56 +00:00
feld
b21e59da5f Merge branch 'remove-linker-scheme-option' into 'develop' 
Remove AutoLinker `scheme` option from the config

See merge request pleroma/pleroma!2176
 2020-02-05 20:32:45 +00:00
Alexander Strizhakov
5db6ac8ee4
removing migrate_from_db endpoint from admin api 2020-02-05 20:36:21 +03:00
Egor Kislitsyn
3909b5b7b3
Remove AutoLinker scheme option from the config 2020-02-05 21:13:56 +04:00
rinpatch
49e80a1537 Merge branch 'feature/restart-pleroma-from-outside-application' into 'develop' 
Restarting pleroma from outside application

See merge request pleroma/pleroma!2144
 2020-02-05 16:59:21 +00:00
Egor Kislitsyn
8c71f7e11a Add support for cancellation of a follow request 2020-02-05 20:22:15 +04:00
Ivan Tashkinov
e84fee5b86 Merge remote-tracking branch 'remotes/origin/develop' into 1505-threads-federation 2020-02-05 07:56:36 +03:00
Maksim Pechnikov
2c40c8b4a2 Merge branch 'develop' into issue/1383 2020-02-03 21:42:36 +03:00
rinpatch
50f5a92021 fix not being able to pin polls 2020-02-02 14:55:06 +03:00
rinpatch
983a87175e mastodon API: do not sanitize html in non-html fields 2020-02-02 14:46:32 +03:00
Roman Chvanikov
8057157ee3 Make attachments cleanup optional 2020-01-31 01:20:37 +03:00
rinpatch
c27d1d65bf Merge branch 'fix/disable-rate-limiter-for-socket-localhost' into 'develop' 
Disable rate limiter for socket/localhost

Closes #1380

See merge request pleroma/pleroma!2064
 2020-01-30 19:24:04 +00:00
rinpatch
5b62acf6e9 Merge branch 'develop' into fix/disable-rate-limiter-for-socket-localhost 2020-01-30 22:16:55 +03:00
lain
774cba84f5 Merge branch 'reenable-rate-limit-and-remote-ip' into 'develop' 
Re-enable rate limiter and enable remote ip

See merge request pleroma/pleroma!2164
 2020-01-30 18:47:44 +00:00
lain
a0d9d42eaa Emoji Reactions: Actually use the validation. 2020-01-30 16:07:37 +01:00
feld
e2f2602fdc Merge branch 'emoji-api-errors' into 'develop' 
Emoji api error if emoji dir is not writable

Closes admin-fe#62

See merge request pleroma/pleroma!2161
 2020-01-30 14:13:40 +00:00
feld
df200ea7a4 Merge branch 'http-security-warning' into 'develop' 
Warn if HTTPSecurityPlug is disabled

Closes #1528

See merge request pleroma/pleroma!2155
 2020-01-30 14:11:29 +00:00
feld
b3e9c87724 Update emoji_api_controller.ex 2020-01-30 14:09:41 +00:00
feld
36becd5573 Update http_security_plug.ex 2020-01-30 14:07:41 +00:00
rinpatch
263abe3ba5 Merge branch 'emoji-reactions-reacted' into 'develop' 
Emoji reactions: Add `reacted` field

See merge request pleroma/pleroma!2160
 2020-01-30 13:16:04 +00:00
rinpatch
889965141a RemoteIp: only trust X-Forwarded-For 
Our nginx config will happily pass `Forwarded`/`X-Real-IP` from the
client. Caddy, Apache and Varnish pass `X-Forwarded-For` as well anyway.
 2020-01-30 00:06:58 +03:00
Haelwenn
946de2299c Merge branch 'fix-streaming-reblog' into 'develop' 
Streamer: Correctly handle reblog mutes

Closes #1129 and #1438

See merge request pleroma/pleroma!2156
 2020-01-29 20:21:32 +00:00
Egor Kislitsyn
e07e7888d7
Fix credo warning 2020-01-29 18:53:43 +04:00
Egor Kislitsyn
2bd4d6289b
Make the warning more scarier 2020-01-29 18:43:23 +04:00
Alexander Strizhakov
e7fee0d6fa
emoji api error on not writable dir 2020-01-29 15:31:34 +03:00
lain
b3a877d6c9 Emoji Reactions: Correctly handle deleted users 2020-01-29 11:43:36 +01:00
lain
a802e07241 Emoji Reactions: Add reacted field to emoji reactions 2020-01-29 11:39:06 +01:00
Alexander Strizhakov
1f4fbe9d98
title parse improvement 2020-01-29 11:13:34 +03:00
Maksim Pechnikov
21a2a05407 Merge branch 'develop' into issue/1383 2020-01-28 20:39:20 +03:00
lain
cedee2793d Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/remote-follow-userpage-redirect 2020-01-28 17:52:42 +01:00
lain
12b6fcdb8c Merge branch 'features/task-test-email' into 'develop' 
Create pleroma.email mix task

Closes #1061

See merge request pleroma/pleroma!2118
 2020-01-28 16:42:57 +00:00
lain
2c121b2623 Merge branch 'fix/1524-link_preview' into 'develop' 
Meta tags parser respects first title tag

Closes #1524

See merge request pleroma/pleroma!2157
 2020-01-28 16:38:14 +00:00
Alexander Strizhakov
7bd4c14581
meta tag parser respect first title header 2020-01-28 19:29:27 +03:00
lain
d385789a45 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into feature/tag_feed 2020-01-28 17:06:36 +01:00
Haelwenn
271935953a Merge branch 'whole-db-removal' into 'develop' 
Remove `whole_db` parameter everywhere, it's not used anymore

See merge request pleroma/pleroma!2152
 2020-01-28 15:51:45 +00:00
Haelwenn (lanodan) Monnier
4eb935be78
Create pleroma.email mix task 
Closes: https://git.pleroma.social/pleroma/pleroma/issues/1061
 2020-01-28 16:49:38 +01:00
lain
77f24525ca Streamer: Correctly handle reblog mutes 2020-01-28 16:40:44 +01:00
Egor Kislitsyn
6302b40791
Warn if HTTPSecurityPlug is disabled 2020-01-28 19:14:09 +04:00
feld
d9cb8acd3e Merge branch 'fix/attachments-cleanup' into 'develop' 
Fix attachments cleanup with custom base_url

See merge request pleroma/pleroma!2154
 2020-01-28 14:52:57 +00:00
Roman Chvanikov
d18a2e4e36 Add test for custom base_url when deleting an attachment 2020-01-28 17:22:24 +03:00
Roman Chvanikov
804a702f97 Fix base_url string trimming 2020-01-28 17:07:46 +03:00