Tusooa Zhu
4c5bc3e9f7
Pass remote follow avatar into media proxy
2022-07-12 15:44:38 -04:00
becf7dced6
Merge branch 'develop' into default-db-name
2022-07-12 16:44:10 +00:00
7dfc3f3d0e
Change default Postgres user/DB to akkoma
2022-07-12 12:41:30 -04:00
8215434c65
also resolve @full@tags in mfm ( #62 )
...
Reviewed-on: AkkomaGang/akkoma#62
2022-07-11 13:48:43 +00:00
ff6c8455fb
[ #58 ] ensure all users are linked in MFM content ( #61 )
...
Reviewed-on: AkkomaGang/akkoma#61
2022-07-11 11:48:29 +00:00
5ad256f170
[ #58 ] pre-link MFM content ( #59 )
...
Reviewed-on: AkkomaGang/akkoma#59
2022-07-10 17:06:25 +00:00
82fa766ed7
Remove precompiled javascript ( #55 )
...
Reviewed-on: AkkomaGang/akkoma#55
2022-07-08 13:03:18 +00:00
bc6bfe383f
Add configurable theme color ( #53 )
...
Reviewed-on: AkkomaGang/akkoma#53
2022-07-06 20:00:43 +00:00
a9c82b62f2
Fixes for elasticsearch 8 ( #52 )
...
Reviewed-on: AkkomaGang/akkoma#52
2022-07-06 18:57:00 +00:00
3d9dabd914
Fix config path lookup ( #51 )
...
Reviewed-on: AkkomaGang/akkoma#51
Co-authored-by: norm <normandy@biribiri.dev>
Co-committed-by: norm <normandy@biribiri.dev>
2022-07-06 18:28:41 +00:00
1486ad0c6e
import logger
2022-07-05 14:45:28 +01:00
a036a01a1e
mix format
2022-07-04 17:38:16 +01:00
364b6969eb
Use finch everywhere ( #33 )
...
Reviewed-on: AkkomaGang/akkoma#33
2022-07-04 16:30:38 +00:00
sfr
058bf96798
implement Move activities ( #45 )
...
Reviewed-on: AkkomaGang/akkoma#45
Co-authored-by: sfr <sol@solfisher.com>
Co-committed-by: sfr <sol@solfisher.com>
2022-07-04 16:29:39 +00:00
95ef3a8b1e
Use Akkoma modification for collections
2022-07-03 19:36:30 +01:00
05081cd81b
Add collection fetching module
2022-07-03 19:20:59 +01:00
0a3a552696
Add support for a first
reference in pinned objects
2022-07-03 17:25:20 +01:00
3f7c64f30b
Fix broken attachments from owncast ( #31 )
...
Reviewed-on: AkkomaGang/akkoma#31
2022-07-01 11:14:55 +00:00
2937495712
fix ES import from live ( #29 )
...
Reviewed-on: AkkomaGang/akkoma#29
2022-06-30 18:44:31 +00:00
bc9e76cce7
Add documentation for ES search
2022-06-30 17:36:57 +01:00
635a3c223a
Add elasticsearch tests
2022-06-30 16:53:21 +01:00
1ecdb19de5
Refactor ES on top of search behaviour
2022-06-30 16:28:31 +01:00
Ekaterina Vaartis
563b964690
Change updateId to uid because apparently that's the new name
2022-06-29 20:49:45 +01:00
Ekaterina Vaartis
b7462040cc
Change the meilisearch key auth to conform to 0.25.0
2022-06-29 20:49:45 +01:00
Ekaterina Vaartis
7f53aa400b
Don't try removing deleted users and such from index as posts
2022-06-29 20:49:45 +01:00
Ekaterina Vaartis
7aebff799b
Fix meilisearch tests and jobs for oban
2022-06-29 20:49:45 +01:00
Ekaterina Vaartis
5def4a7d49
Use oban for search indexing
2022-06-29 20:49:45 +01:00
Ekaterina Vaartis
54b2a86f47
Add a search backend behaviour
2022-06-29 20:49:45 +01:00
Ekaterina Vaartis
a4914add8c
Don't support meilisearch < 0.24.0, since it breaks things
2022-06-29 20:49:45 +01:00
Ekaterina Vaartis
cc3319ac1d
Make chunk size configurable
2022-06-29 20:49:45 +01:00
Ekaterina Vaartis
bac70a2bc1
Implement suggestions from the Meilisearch MR
...
- Index unlisted posts
- Move version check outside of the streaming and only do it once
- Use a PUT request instead of checking manually if there is need to insert
- Add error handling, sort of
2022-06-29 20:49:45 +01:00
Ekaterina Vaartis
c128798418
Rename Activity.Search to Search.DatabaseSearch
2022-06-29 20:49:44 +01:00
Ekaterina Vaartis
ea582fbf93
Rename search.ex to database_search.ex and add search/2
2022-06-29 20:49:00 +01:00
Ekaterina Vaartis
0769f06bd1
Style fixes
2022-06-29 20:49:00 +01:00
Ekaterina Vaartis
5dd908552c
Move the search.ex file so credo doesn't complain
2022-06-29 20:48:59 +01:00
Ekaterina Vaartis
86971fceaa
Support reindexing meilisearch >=0.24.0
...
It has has a different error code key
2022-06-29 20:48:44 +01:00
Ekaterina Vaartis
9e7d7ebd48
Add a reindex option
...
Signed-off-by: Ekaterina Vaartis <vaartis@kotobank.ch>
2022-06-29 20:48:44 +01:00
Ekaterina Vaartis
d99a2be351
Only add local posts to index in activity_pub
...
Remote ones are already added in another place
2022-06-29 20:48:44 +01:00
Ekaterina Vaartis
51faa28568
Set content-type to application/json
2022-06-29 20:48:44 +01:00
Ekaterina Vaartis
afcdd2f437
Modify some meilisearch variables
2022-06-29 20:48:44 +01:00
Ekaterina Vaartis
37913c8ddf
Use proper deleted object for removing from index
2022-06-29 20:48:44 +01:00
Ekaterina Vaartis
a937a98df5
Don't try removing from index again in common_api
...
It's already removed in the side effects of the pipeline
2022-06-29 20:48:44 +01:00
Ekaterina Vaartis
0802c0666b
Move add_to_index / remove_from_index to Pleroma.Actitivy.Search
2022-06-29 20:48:44 +01:00
Ekaterina Vaartis
5ed1759091
Reorder ranking rules for (maybe) better results
2022-06-29 20:48:44 +01:00
Ekaterina Vaartis
41f3572152
Fix activity being passed to objec_to_search_data
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
d1079f1aa3
Add the meilisearch.stats command
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
d5cc272a91
Add a message with a count of posts to index
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
dbf556cdcf
Implement meilisearch auth
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
5360cc1097
Make indexing logs rewrite themselves
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
0cf3654907
Rework task indexing to share code with the main module
...
The code in the main module now scrubs new posts too
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
117f525fd6
Adjust content indexing to skip more unneeded stuff
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
14ef6ce80f
Mark only content as searchable for meilisearch
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
b3401ba7bd
Also index incoming federated posts
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
52a872432d
Make the chunk size smaller
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
a586ce0ddd
Use content instead of source and scrub it
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
c3a04166a0
Tweak search ordering to hopefully return newer results
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
7b3701e6b9
Make meilisearch sort on publish date converted to unix time
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
abf82a63ec
Make the indexing batch differently and more, show number indexed
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
e5ac2ffa07
Ensure only indexing public posts and implement clearing and delete
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
41db5c8653
Add logging to milisiearch index and make it use desc(id)
2022-06-29 20:48:29 +01:00
Ekaterina Vaartis
e961cf2689
Initial meilisearch implementation, doesn't delete posts yet
2022-06-29 20:48:28 +01:00
8f140deb8f
StealEmojiPolicy: fix String rejected_shortcodes
...
* rejected_shortcodes is defined as a list of strings in the
configuration description. As such, database-based configuration was
led to handle those settings as strings, and not as the actually
expected type, Regex.
* This caused each message passing through this MRF, if a rejected
shortcode was set and the emoji did not exist already on the instance,
to fail federating, as an exception was raised, swiftly caught and
mostly silenced.
* This commit fixes the issue by introducing new behavior: strings are
now handled as perfect matches for an emoji shortcode (meaning that if
the emoji-to-be-pulled's shortcode is in the blacklist, it will be
rejected), while still supporting Regex types as before.
2022-06-29 20:47:45 +01:00
Ilja
661d0ba481
Also use actor_type to determine if an account is a bot in antiFollowbotPolicy
2022-06-29 20:47:44 +01:00
Tusooa Zhu
3fd87b6a75
Skip cache when /objects or /activities is authenticated
...
Ref: fix-local-public
2022-06-29 20:47:27 +01:00
Tusooa Zhu
932e5df19e
Allow to skip cache in Cache plug
...
Ref: fix-local-public
2022-06-29 20:47:26 +01:00
Tusooa Zhu
33d821256e
Fix incorrect fallback when English is set to first language
2022-06-29 20:47:10 +01:00
Tusooa Zhu
2df25e6666
Support fallbacking to other languages
2022-06-29 20:47:10 +01:00
Tusooa Zhu
fcfb5a4967
Lint
2022-06-29 20:47:10 +01:00
Tusooa Zhu
07bd35227a
Support multiple locales from userLanguage cookie
2022-06-29 20:47:10 +01:00
Tusooa Zhu
fa95bc8725
Support multiple locales formally
...
elixir gettext current does not fully support fallback to another language [0].
But it might in the future. We adapt it so that all languages in Accept-Language
headers are received by Pleroma.Web.Gettext. User.languages is now a comma-separated
list.
[0]: https://github.com/elixir-gettext/gettext/issues/303
2022-06-29 20:47:10 +01:00
Tusooa Zhu
845e5769ce
Make lint happy
2022-06-29 20:47:10 +01:00
Tusooa Zhu
ef73f61b07
Fallback to a variant if the language in general is not supported
...
For an example, here, zh is not supported, but zh_Hans and zh_Hant
are. If the user asks for zh, we should choose a variant for them
instead of fallbacking to default.
Some browsers (e.g. Firefox) does not allow users to customize
their language codes. For example, there is no zh-Hans, but only
zh, zh-CN, zh-TW, zh-HK, etc. This provides a workaround for
those users suffering from bad design decisions.
2022-06-29 20:47:10 +01:00
Tusooa Zhu
72bdb0640f
Allow user to register with custom language
2022-06-29 20:46:51 +01:00
Tusooa Zhu
1b77308644
Allow update_credentials to update User.language
2022-06-29 20:45:35 +01:00
Tusooa Zhu
7726148472
Send emails i18n'd using backend-stored user language
2022-06-29 20:45:19 +01:00
Tusooa Zhu
c301a95276
Make all emails translatable
2022-06-29 20:45:05 +01:00
Tusooa Zhu
63a0536d55
Make mail and mailer translatable
2022-06-29 20:45:05 +01:00
Tusooa Zhu
39cfecb188
Make static fe translatable
2022-06-29 20:45:05 +01:00
Tusooa Zhu
03aac29531
Fix tests
2022-06-29 20:45:05 +01:00
Tusooa Zhu
c6652fccae
Make mfa pages translatable
2022-06-29 20:45:03 +01:00
Tusooa Zhu
8f8d2abb12
Make oauth pages translatable
2022-06-29 20:44:48 +01:00
Tusooa Zhu
793922f1d8
Use proper lang attributes in htmls
2022-06-29 20:44:16 +01:00
Tusooa Zhu
ec57e3480c
Make tag feed translatable
2022-06-29 20:44:16 +01:00
Tusooa Zhu
50913c4dc5
Make password reset pages translatable
2022-06-29 20:44:16 +01:00
Tusooa Zhu
8f08c902a5
Make lint happy
2022-06-29 20:44:16 +01:00
Tusooa Zhu
ed1d9e91bc
Make remote follow pages translatable
2022-06-29 20:44:15 +01:00
Tusooa Zhu
775f997c40
Prefer userLanguage cookie over Accept-Language header in detecting locale
...
https://git.pleroma.social/pleroma/pleroma-meta/-/issues/60
2022-06-29 20:43:41 +01:00
Ilja
a20d2847e2
After code review
...
Use patern matching to see if someone was superuser before
2022-06-29 20:43:41 +01:00
Ilja
1048bc1bb9
Delete report notifs when demoting from superuser
...
When someone isn't a superuser any more, they shouldn't see the reporsts any more either.
Here we delete the report notifications from a user when that user gets updated from being a superuser to a non-superuser.
2022-06-29 20:43:41 +01:00
8de65de3b9
Add unicode 14 support
...
and add a test with a unicode 14 emoji
2022-06-29 20:43:41 +01:00
2342fface1
Add visibility check in context path ( #26 )
...
Reviewed-on: AkkomaGang/akkoma#26
2022-06-29 09:33:57 +00:00
064c36274c
Purge gopher frontend
2022-06-27 17:31:16 +01:00
e6cd61619f
Purge SSH frontend ( #23 )
...
Reviewed-on: AkkomaGang/akkoma#23
2022-06-27 11:32:06 +00:00
d392fafa06
Remove debug prints
2022-06-25 18:43:19 +01:00
f2ff05637f
Allow for embedding object data in publish
2022-06-25 18:41:26 +01:00
45b7d18871
update api spec for custom emoji reaction
2022-06-25 15:45:10 +01:00
cac39ef817
Bugfix: standardise scheme for emoji reactions
2022-06-25 15:27:46 +01:00
3928cecf6b
ensure local statuses are not visible remotely
2022-06-22 17:06:40 +01:00
34e11cef47
check for local_public? on AP route
2022-06-22 16:35:12 +01:00
502382da45
cherry-pick security from upstream
2022-06-22 16:25:05 +01:00
f2f8b81fc4
Use mediaproxy for emoji notifications if enabled
2022-06-17 14:27:22 +02:00
f15c9e8b08
format everything
2022-06-15 18:22:30 +01:00
5b11543c96
update pleroma-fe url
2022-06-15 18:18:23 +01:00
6e1d9c63da
allow %{source} dict in no_empty
2022-06-14 17:41:25 +01:00
abefbcec64
Merge branch 'mfm' into develop
2022-06-14 16:25:47 +01:00
0627da0027
mix format
2022-06-14 16:25:28 +01:00
829ae13572
ensure tests pass
2022-06-14 16:24:03 +01:00
4fb2251221
Allow authoring MFM
2022-06-14 15:56:12 +01:00
3f06ccc9e3
allow source
from misskey
2022-06-14 10:56:18 +01:00
60bfaed368
Allow reacting with emojis containing a number
2022-06-14 11:47:09 +02:00
0f5bea2465
Add emoji_url to notifications to allow rendering
...
Ref #5
2022-06-12 13:35:14 +01:00
2abf8c982e
fix secret key failure
2022-06-11 16:48:04 +01:00
24bf8c3977
mix format
2022-06-11 16:14:31 +01:00
32fbd2e4e3
fix all tests
2022-06-11 16:14:22 +01:00
c3ed86cd1e
fix emoji controller tests
2022-06-11 14:21:50 +01:00
142646426e
fix emoji tests
2022-06-11 14:08:54 +01:00
71f4281850
fix quoting of custom emoji
...
Fixes #3
2022-06-11 14:08:13 +01:00
ed58a6b070
run mix format
2022-06-10 13:41:08 +01:00
801f2b0fc5
Add capabilities for emoji reactions
...
Patch from helene@p.helene.moe
2022-06-09 12:56:34 +01:00
0f2bfeaea7
Enable mediaproxy by default
2022-06-08 17:19:42 +01:00
e910f21d8d
allow undoing
2022-06-08 13:27:25 +01:00
e724da2a42
remove io.inspects
2022-06-08 12:58:12 +01:00
c5467d04e4
add outbound reacts
2022-06-08 12:36:38 +01:00
ad0b8c095c
add custom emoji reaction support
2022-06-08 02:42:44 +01:00
f19c93cdaa
use tls1.3
2022-06-07 12:24:40 +01:00
6a19fbac2f
add copyright notice for forked files
2022-01-20 12:48:16 +00:00
0f6bece60d
Merge remote-tracking branch 'origin/patch/readd-mastofe' into develop
2022-01-08 21:45:12 +00:00
0d012ebea1
Revert "Merge branch 'remove/mastofe' into 'develop'"
...
This reverts commit 6b3842cf50
, reversing
changes made to 6b1282a829
.
2022-01-08 21:44:37 +00:00
8cc6359a85
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
2022-01-07 20:23:53 +00:00
25b4395830
just drop unknown tags
2022-01-07 20:14:04 +00:00
34780cf182
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
2022-01-07 17:36:21 +00:00
2cc6b1e1bd
Allow for varying name fields
2022-01-07 17:35:56 +00:00
5c48fe1138
make credo happy
2022-01-07 17:31:13 +00:00
92d3742072
Merge remote-tracking branch 'upstream/bookwyrm-entities' into develop
2022-01-07 17:21:44 +00:00
9ee27fb5ec
add bookwyrm entity tests
2022-01-07 17:17:18 +00:00
680c5d8d89
Add compatibility with bookwyrm's weird entities
2022-01-07 16:51:04 +00:00
3252ed0f54
format
2021-12-30 18:05:44 +00:00
4e7e95a17e
don't error out
2021-12-30 18:05:44 +00:00
4e8ee48cff
delete activities
2021-12-30 18:05:44 +00:00
12a171844b
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-30 18:05:22 +00:00
marcin mikołajczak
1657db656c
AccountController.lookup: skip auth
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 20:02:59 +01:00
marcin mikołajczak
0dd1caa841
AccountController.lookup: skip visibility check
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 18:24:48 +01:00
marcin mikołajczak
746c9daa62
Merge remote-tracking branch 'pleroma/develop' into mastodon-lookup
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 16:27:27 +01:00
marcin mikołajczak
f734579965
MastoAPI: Add GET /api/v1/accounts/lookup
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-28 16:11:17 +01:00
Alex Gleason
de7f84deb3
Merge branch 'apps-api-endpoint' into 'develop'
...
Apps API endpoint
See merge request pleroma/pleroma!3583
2021-12-28 14:38:02 +00:00
Alex Gleason
7704a722c0
AppController: remove unnecessary require Logger
2021-12-27 18:30:16 -06:00
Alex Gleason
2e4a1c56c3
AppController: test creating with and without a user
2021-12-27 18:14:15 -06:00
Alex Gleason
f5c3d45120
Merge remote-tracking branch 'origin/develop' into apps-api-endpoint
2021-12-27 18:01:25 -06:00
Alex Gleason
138f5a4517
EnsureStaffPrivilegedPlug: don't let non-moderators through
2021-12-27 17:18:26 -06:00
Alex Gleason
a3fa987611
AdminAPI: fix duplicated routes
2021-12-27 16:58:10 -06:00
Alex Gleason
326575d5b7
Merge remote-tracking branch 'origin/develop' into finch
2021-12-27 11:31:15 -06:00
Alex Gleason
a659428024
Merge branch 'restricted-moderators' into 'develop'
...
AdminAPI: Optionally restrict moderators from accessing sensitive data
See merge request pleroma/pleroma!3578
2021-12-27 17:06:22 +00:00
Alex Gleason
6e27fc9c12
Merge branch 'log-slow-queries' into 'develop'
...
Log slow Ecto queries
See merge request pleroma/pleroma!3553
2021-12-27 15:41:06 +00:00
Ivan Tashkinov
08c0f09bad
Made slow queries logging disabled by default.
2021-12-27 09:13:31 +03:00
f02715c4b2
Fix lint errors
2021-12-27 03:42:03 +03:00
f66675f349
API: fix duplicate :get_password_token route
2021-12-27 02:57:54 +03:00
1c223331fc
API: show info about privileged staff in instance metadata
2021-12-27 02:28:09 +03:00
cd1041c3a4
API: optionally restrict moderators from accessing sensitive data
2021-12-27 02:27:48 +03:00
Ivan Tashkinov
3e9e7178bc
Configurability of slow queries logging ([:pleroma, :telemetry, :slow_queries_logging]). Adjusted log messages truncation to 65 kb (was default: 8 kb). Non-truncated logging of slow query params.
2021-12-26 22:49:00 +03:00
Lain Soykaf
4cf03046f5
Merge branch 'finch' of git.pleroma.social:pleroma/pleroma into finch
2021-12-26 16:57:17 +01:00
Lain Soykaf
6efbd08854
Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into finch
2021-12-26 16:41:17 +01:00
Alex Gleason
913141379c
Merge branch 'profile-directory' into 'develop'
...
MastoAPI: Profile directory
See merge request pleroma/pleroma!3573
2021-12-26 02:35:17 +00:00
marcin mikołajczak
de006443f0
MastoAPI: Profile directory
2021-12-26 02:35:17 +00:00
Alex Gleason
db2bf55e9b
Merge remote-tracking branch 'origin/develop' into notice-routes
2021-12-25 19:57:53 -06:00
Alex Gleason
73609211a4
Merge branch 'account-notes' into 'develop'
...
MastoAPI: Add user notes on accounts
See merge request pleroma/pleroma!3540
2021-12-25 01:41:12 +00:00
Alex Gleason
b96a58ff28
Merge branch 'account-subscriptions' into 'develop'
...
MastoAPI: accept notify param in follow request
See merge request pleroma/pleroma!3555
2021-12-25 01:34:27 +00:00
marcin mikołajczak
9775955974
Merge remote-tracking branch 'origin/develop' into remote-follow-api
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-25 00:52:02 +01:00
Alex Gleason
d9746ae4cb
Merge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
...
Handle Reject for already-accepted Follows properly
Closes #2766 and #2802
See merge request pleroma/pleroma!3568
2021-12-23 16:00:16 +00:00
Alex Gleason
3f8fc34593
Merge remote-tracking branch 'origin/develop' into moderators
2021-12-19 12:55:36 -06:00
Alex Gleason
50892a198d
Merge branch 'mkljczk-develop-patch-64464' into 'develop'
...
Add "exposable_reactions" to features, if showing reactions
See merge request pleroma/pleroma!3523
2021-12-19 18:51:41 +00:00
Alex Gleason
b0d2b53934
Merge branch 'manifest' into 'develop'
...
Expose /manifest.json for PWA
Closes #882
See merge request pleroma/pleroma!3544
2021-12-19 18:18:59 +00:00
Ivan Tashkinov
e009950845
Slow queries logging improvements: added EXPLAIN results, listed params, improved stacktrace.
2021-12-19 20:45:28 +03:00
Alex Gleason
df5359aa72
Merge branch 'replies-count' into 'develop'
...
Fix replies count for remote replies
See merge request pleroma/pleroma!3541
2021-12-19 17:36:25 +00:00
Alex Gleason
d1510c98d7
Merge branch 'link-headers-chats' into 'develop'
...
Add link headers in ChatController.index2
See merge request pleroma/pleroma!3562
2021-12-19 17:35:50 +00:00
Alex Gleason
1ff9ffed83
Merge branch 'live-dashboard' into 'develop'
...
Add Phoenix LiveDashboard
See merge request pleroma/pleroma!3566
2021-12-19 17:35:14 +00:00
Alex Gleason
e4f9cb1c1b
Merge remote-tracking branch 'origin/develop' into manifest
2021-12-19 11:33:10 -06:00
Alex Gleason
bd853199d9
Merge branch 'v2-suggestions' into 'develop'
...
V2 suggestions
See merge request pleroma/pleroma!3547
2021-12-19 17:31:17 +00:00
Alex Gleason
7c1d804554
Merge branch 'fix-search-dos' into 'develop'
...
Search: limit number of results (prevent DoS)
See merge request pleroma/pleroma!3563
2021-12-19 17:30:52 +00:00
Tusooa Zhu
3d41ccc47b
Allow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_state_for_all/2
...
Mastodon uses the Reject activity also for the purpose of removing
a follower, in addition to reject a follow request. We should
also update the original Follow activity in this case.
2021-12-17 14:17:51 -05:00
31b9034a27
emoji/loader.ex: be more verbose about which emoji pack config is loading now
...
To avoid issue when one of the hundred JSON files is malformed and
administrator don't know which one
2021-12-17 14:15:44 +00:00
5660bee2dc
Dirty hack to make mediaproxy functional by relying on Hackney for that part
2021-12-16 11:36:58 -06:00
1863ae59fb
format
2021-12-16 16:13:48 +00:00
415d9dd6f6
Merge remote-tracking branch 'origin/feature/elasticsearch' into develop
2021-12-16 16:13:41 +00:00
0c0ea169d4
Merge remote-tracking branch 'upstream/develop' into develop
2021-12-16 16:10:08 +00:00
3a9b83413e
Merge branch 'develop' into feature/elasticsearch
2021-12-16 16:07:15 +00:00
f3d9c58fef
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
2021-12-16 16:07:00 +00:00
742b86fdaa
format
2021-12-16 16:05:33 +00:00
9134ef5ecb
add timestamp
2021-12-16 16:05:18 +00:00
2152832780
add timestamp
2021-12-16 15:58:56 +00:00
26cae62c7f
maybe
2021-12-16 15:20:34 +00:00
9d4727598d
fix remote hashtags
2021-12-16 15:20:34 +00:00
1745606ab5
maybe
2021-12-16 15:20:22 +00:00
418212c71c
fix remote hashtags
2021-12-16 15:09:36 +00:00
Alex Gleason
e1b89fe3aa
Merge remote-tracking branch 'origin/develop' into live-dashboard
2021-12-15 19:05:36 -05:00
Alex Gleason
29d80b39f2
Add Phoenix LiveDashboard
...
Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2021-12-15 19:05:27 -05:00
lain
6eb7d69e60
Merge branch 'delete-account-fix' into 'develop'
...
TwitterAPI: allow deleting one's own account with request body
Closes #2799 and #2746
See merge request pleroma/pleroma!3564
2021-12-15 21:26:45 +00:00
Lain Soykaf
4e98ba3c3a
Application: Actually start finch if it's needed
2021-12-15 15:42:37 -05:00
Lain Soykaf
abb62dd886
Application, dependencies: prepare for finch
2021-12-15 13:53:09 -05:00
sadposter
25920c10df
don't try indexing non-people
2021-12-15 11:08:13 +00:00
sadposter
93e41df75d
don't try indexing non-people
2021-12-15 11:05:30 +00:00
ccc5c59c50
re-add fetching by url
2021-12-15 10:58:09 +00:00
d5c8415496
re-add fetching by url
2021-12-15 10:57:47 +00:00
sadposter
c50ad91d31
fix empty queries returning 50 results
2021-12-14 15:02:48 +00:00
sadposter
7f30218b82
extra cool
2021-12-14 15:02:48 +00:00
sadposter
d1bb10c88e
fix empty queries returning 50 results
2021-12-14 15:02:11 +00:00
sadposter
8378c3a8bc
extra cool
2021-12-14 14:48:24 +00:00
0d7bbee430
add timeouts
2021-12-14 14:35:46 +00:00
bed6f4e12c
add timeouts
2021-12-14 14:33:34 +00:00
9d5d964bf8
merge
2021-12-14 14:28:15 +00:00
sadposter
cc4c5f22f4
fix inbound federation
2021-12-14 14:27:42 +00:00
sadposter
94c22baaa3
filter by user type
2021-12-14 14:16:21 +00:00
sadposter
8f78cb3050
Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop
2021-12-14 14:01:09 +00:00
sadposter
5d901c337e
fix inbound federation
2021-12-14 13:58:16 +00:00
703f53c08f
Search through users and hashtags as well
2021-12-14 13:55:14 +00:00
a85bf5929b
add hashtag indexing
2021-12-14 13:55:14 +00:00
6ca70833f5
add user import
2021-12-14 13:55:14 +00:00
c03e8d46e8
Search through users and hashtags as well
2021-12-14 13:53:46 +00:00
8547cefaff
add hashtag indexing
2021-12-14 12:37:10 +00:00
Alex Gleason
8672ad6b00
TwitterAPI: allow deleting one's own account with request body
2021-12-13 17:07:29 -05:00
6bb19454fd
add user import
2021-12-13 20:27:35 +00:00
Alex Gleason
108dfd1f87
Search: limit number of results
2021-12-12 22:50:07 -06:00
sadposter
06ab00d625
fix buggos
2021-12-12 20:12:06 +00:00
a504e250a9
fully reference es
2021-12-12 20:12:06 +00:00
71126fea0c
fix multi-after-transaction
2021-12-12 20:12:06 +00:00
dbdf0c005e
pipeline it
2021-12-12 20:12:06 +00:00
sadposter
ef9dea66b2
fix bug in inbound
2021-12-12 20:12:06 +00:00
sadposter
e835212a7d
enforce visibility
2021-12-12 20:12:06 +00:00
sadposter
144c06487a
fix buggos
2021-12-12 20:01:07 +00:00
ee1a2fc451
fully reference es
2021-12-12 19:40:31 +00:00
67f8bdce4f
fix multi-after-transaction
2021-12-12 19:40:05 +00:00
7502da993b
pipeline it
2021-12-12 19:39:07 +00:00
sadposter
f341e68622
fix bug in inbound
2021-12-12 19:31:47 +00:00
sadposter
23c758bbe7
enforce visibility
2021-12-12 18:25:20 +00:00
0fbf7faf85
Remove IO inspect
2021-12-12 17:35:35 +00:00
de60b1f3c1
make search provider configurable
2021-12-12 17:35:35 +00:00
fce13cce46
add extra filters
2021-12-12 17:35:35 +00:00
449d8ff165
integrate search endpoint with ES
2021-12-12 17:35:35 +00:00
9002e5155b
Add import functionality
2021-12-12 17:35:35 +00:00
Alex Gleason
da83839dc1
AttachmentValidator: ingest width and height
2021-12-12 17:35:02 +00:00
Lain Soykaf
eb7bbe3fc8
Linting.
2021-12-12 17:35:02 +00:00
Finn Behrens
66b60f1ee2
move result into with guard
2021-12-12 17:35:02 +00:00
0fab887eee
make linter happy
2021-12-12 17:35:02 +00:00
47833e31ad
Remove IO inspect
2021-12-12 17:26:06 +00:00
ed3a866f94
make search provider configurable
2021-12-12 17:23:44 +00:00
marcin mikołajczak
dff435488d
Add link headers in ChatController.index2
...
Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2021-12-12 17:43:18 +01:00
345eb7b3f8
add extra filters
2021-12-11 19:56:15 +00:00
3478492945
integrate search endpoint with ES
2021-12-11 18:48:46 +00:00
c684265585
Add import functionality
2021-12-11 17:36:49 +00:00
Alex Gleason
2c96668a2c
Merge remote-tracking branch 'origin/develop' into fix-attachment-dimensions
2021-12-07 13:41:54 -05:00
Alex Gleason
3f03d71ea6
AttachmentValidator: ingest width and height
2021-12-07 12:59:03 -05:00