Commit graph

13905 commits

Author SHA1 Message Date
Alex Gleason
e62d5d08f5 Merge branch 'nil_pinned_objects_cope' into 'develop'
Don't blow up when there are nil pinned objects on a user

Closes #49

See merge request soapbox-pub/soapbox!54
2021-11-25 01:37:56 +00:00
Alex Gleason
8fb32107ac Merge branch 'manifest' into 'develop'
Expose /manifest.json for PWA

See merge request soapbox-pub/soapbox!55
2021-11-25 00:18:44 +00:00
Alex Gleason
cb9359335f
Expose /manifest.json for PWA 2021-11-24 17:50:55 -06:00
NEETzsche
fb0bddfe08 Refactor pinned_object_ids into a variable 2021-11-24 17:01:54 +00:00
NEETzsche
8612f0ac79 Format activity_pub.ex 2021-11-24 07:41:44 +00:00
NEETzsche
845f3d226f Don't blow up when there are nil pinned objects on a user 2021-11-24 07:33:42 +00:00
Alex Gleason
ec38d0f516 Merge branch 'upgrade-eblurhash' into 'develop'
Upgrade eblurhash to v1.2.2

See merge request soapbox-pub/soapbox!53
2021-11-23 03:21:28 +00:00
Alex Gleason
44b7336f35
Upgrade eblurhash to v1.2.2 2021-11-22 21:01:23 -06:00
Alex Gleason
0f46b33ca6 Merge branch 'pleroma-v2.4.0' into 'develop'
Merge Pleroma v2.4.1

See merge request soapbox-pub/soapbox!49
2021-11-23 02:46:30 +00:00
Alex Gleason
40a76612d6
Soapbox: increase default pool_size and timeout 2021-11-22 20:31:33 -06:00
Alex Gleason
ec024ff3fd
Downgrade hackney again 2021-11-22 12:42:57 -06:00
Alex Gleason
9fc15b7310
Restore SetMeta upload filter for backwards compatibility 2021-11-21 13:38:57 -06:00
Alex Gleason
18d23c9acc
Merge tag 'v2.4.1' into pleroma-v2.4.0 2021-11-21 13:34:44 -06:00
Alex Gleason
7bcc60d740
Merge remote-tracking branch 'origin/develop' into pleroma-v2.4.0 2021-11-21 13:30:43 -06:00
Alex Gleason
0abc6189df Merge branch 'gitlab-com-deps' into 'develop'
Switch to deps from gitlab.com, fixes #46

Closes #46

See merge request soapbox-pub/soapbox!51
2021-11-04 16:53:45 +00:00
Alex Gleason
d131247ff3
Switch to deps from gitlab.com 2021-11-04 11:34:18 -05:00
Haelwenn
0b2119d4a7 Merge branch 'release/2.4.1' into 'stable'
Release: 2.4.1

See merge request pleroma/pleroma!3501
2021-08-29 18:48:53 +00:00
Haelwenn (lanodan) Monnier
7372609c5b
Release 2.4.1 2021-08-28 18:32:21 +02:00
someone
cc4f20b130
mix pleroma.database set_text_search_config now runs concurrently and infinitely
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3514
2021-08-28 18:29:43 +02:00
Ilja
20084329ea
Selecting MRF policies didn't work as intended any more
* Policies were put under a new module (Pleroma.Web.ActivityPub.MRF.Policy instead of Pleroma.Web.ActivityPub.MRF), but this wasn't changed in the Pleroma.Web.ActivityPub.MRF @mrf_config_descriptions
* I don't have a unit test to prevent similar problems in the future because I don't find a proper way to do it
    * The descriptions in the unit tests are defined in the unit tests, so if someone changes module names in the code, the tests wont see it
    * The list is generated in Pleroma.Docs.Generator.list_behaviour_implementations, but I can't do a check in the when clause of the function to see if the provided module is a behaviour or not.

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3509
2021-08-28 18:27:58 +02:00
Tusooa Zhu
bd0eb1c675
Make activity search properly use GIN indexes
The original approach to search in GIN indexes is to use
`to_tsvector(text)` in the WHERE clause of the query. According to
postgres docs [pdoc], this method does not make use of the index,
while `to_tsvector(config, text)` does. This commit changed the
query to use the two-argument `to_tsvector()`.

[pdoc]: https://www.postgresql.org/docs/12/textsearch-tables.html

To obtain the search config in use, we make a query to the db first.
The `::regconfig::oid` hack is needed because Postgrex does not support
regconfig type directly [postgrexbug]. I use the conversion from and to
`oid` instead of `text` because I tested in the actual DB and querying
using the conversion via `text` is slow just as the one-argument
`to_tsvector()` variant.

[postgrexbug]: https://github.com/elixir-ecto/postgrex/issues/502

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3519

Closes: https://git.pleroma.social/pleroma/pleroma/-/issues/2758
2021-08-28 18:26:04 +02:00
Ilja
53b0dd4ecc
List available frontends also when no static/frontends folder is present yet
* To see what front ends are installed, it ls static/frontends. When this folder doesn't exists yet, it will return an empty array.
* Installing still works since the folder is created during installation already

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3510
2021-08-28 18:23:49 +02:00
Sam Therapy
09c42ce13e
Add Admin-FE menu for StealEmojiPolicy
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3512
2021-08-28 18:21:59 +02:00
Alex Gleason
01175ef498
Streamer: fix crash in MastodonAPI.StatusView
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3508
2021-08-13 17:58:03 +02:00
Haelwenn (lanodan) Monnier
27e1e4c742
Activity.Search: fallback on status resolution on DB Timeout
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3507
2021-08-13 17:57:50 +02:00
Alex Gleason
e117551169
AdminAPI: hotfix for nil report objects
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3504
2021-08-13 17:57:39 +02:00
Haelwenn (lanodan) Monnier
bb2d5879cc
maybe_notify_subscribers: Don't create notifications from ingested replies
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3505
2021-08-13 17:57:19 +02:00
Haelwenn (lanodan) Monnier
0e2aebd036
TwitterAPI: Make change_email require body params instead of query
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
2021-08-13 17:57:11 +02:00
Haelwenn (lanodan) Monnier
3961422f85
TwitterAPI: Make change_password require body params instead of query
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3503
2021-08-13 17:56:59 +02:00
Haelwenn (lanodan) Monnier
8baaa36a16
ObjectAgePolicy: Fix pattern matching on published
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3500
2021-08-13 17:56:46 +02:00
Ilja
1cf89de89a
Make the OPT recomendation clearer
AFAIK OTP releases are the recomended way of installing, but

  * People seem unaware of that and use from source installations because they use the guide with the name of their distro
  * People don't know what OTP releases are or what it means

I added a warning on all installation-from-source guides and added the same explanation on the two OTP pages (the miigration to OTP and installing OTP)

Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3485
2021-08-13 17:56:20 +02:00
kPherox
34606d609d
fix: stream out Create Activity
Backport of: https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3499
2021-08-13 17:54:51 +02:00
Alex Gleason
caefb0378a
RichMedia.Helpers: fix compile cycle on Application 2021-08-08 11:57:40 -05:00
Alex Gleason
bef32d6e02
MastodonAPI.StatusView: comment out unused build_image_url/2 2021-08-08 11:13:03 -05:00
Alex Gleason
6521155335
NsfwApiPolicy: fix @behaviour 2021-08-08 10:58:40 -05:00
Alex Gleason
93d01bf10c
Soapbox: switch to import Config in config/soapbox.exs 2021-08-08 10:52:20 -05:00
Alex Gleason
90680aad90
Merge tag 'v2.4.0' into pleroma-v2.4.0 2021-08-08 10:46:48 -05:00
Haelwenn
dc63aaf84f Merge branch 'release/2.4.0' into 'stable'
Release/2.4.0

See merge request pleroma/pleroma!3493
2021-08-08 14:37:15 +00:00
Haelwenn (lanodan) Monnier
0910777d41
Update PleromaFE Bundle (2.4.0)
based on 51d3d8d255de221f7ac99e41f2f8e56c7d6a21a9
2021-08-08 15:21:21 +02:00
matildepark
469405b7b2
CHANGELOG.md: Fix instances of 2020 being actually 2021 2021-08-06 08:42:27 +02:00
Alex Gleason
5dddc6166a Merge branch 'revert-b478a87e' into 'develop'
Revert "Merge branch 'non-rfc-status-codes' into 'develop'"

See merge request soapbox-pub/soapbox!48
2021-08-05 19:28:18 +00:00
Alex Gleason
23dfbf1c7e Revert "Merge branch 'non-rfc-status-codes' into 'develop'"
This reverts merge request !47
2021-08-05 19:16:11 +00:00
Haelwenn (lanodan) Monnier
79e993cae5
Release 2.4.0 2021-08-01 08:26:39 +02:00
Haelwenn (lanodan) Monnier
5f8a9b671f
Update AdminFE bundle 2021-08-01 08:26:39 +02:00
feld
d8a986c9e8 Merge branch 'object-tombstone-visibility' into 'develop'
Visibility: check Tombstone objects in visible_for_user?/2

See merge request pleroma/pleroma!3490
2021-07-27 16:25:34 +00:00
feld
7495beeb40 Merge branch 'errorview-json-fix' into 'develop'
Fix errors in ErrorView

See merge request pleroma/pleroma!3489
2021-07-27 16:24:53 +00:00
Alex Gleason
b478a87e96 Merge branch 'non-rfc-status-codes' into 'develop'
Soapbox: support Cloudflare status codes

See merge request soapbox-pub/soapbox!47
2021-07-27 14:48:52 +00:00
Alex Gleason
b726efef41
Soapbox: support Cloudflare status codes 2021-07-27 09:36:09 -05:00
Alex Gleason
c51204fa07 Merge branch 'object-tombstone-visibility' into 'develop'
Visibility: check Tombstone objects in visible_for_user?/2

See merge request soapbox-pub/soapbox!46
2021-07-27 14:13:29 +00:00
Alex Gleason
9738a993d2
Merge remote-tracking branch 'origin/develop' into object-tombstone-visibility 2021-07-27 08:58:58 -05:00