akkoma
2 years agoMerge remote-tracking branch 'origin/develop' into remote-follow-api
marcin mikołajczak [Fri, 24 Dec 2021 23:52:02 +0000 (00:52 +0100)]
Merge remote-tracking branch 'origin/develop' into remote-follow-api

Signed-off-by: marcin mikołajczak <git@mkljczk.pl>
2 years agoMerge branch 'warnings-as-errors' into 'develop'
Alex Gleason [Thu, 23 Dec 2021 16:19:57 +0000 (16:19 +0000)]
Merge branch 'warnings-as-errors' into 'develop'

Enable :warnings_as_errors for CI only

See merge request pleroma/pleroma!3474

2 years agoMerge branch 'add-nodeinfo-doc' into 'develop'
Alex Gleason [Thu, 23 Dec 2021 16:01:03 +0000 (16:01 +0000)]
Merge branch 'add-nodeinfo-doc' into 'develop'

Add initial Nodeinfo document

See merge request pleroma/pleroma!3546

2 years agoAdd initial Nodeinfo document
Hakaba Hitoyo [Thu, 23 Dec 2021 16:01:02 +0000 (16:01 +0000)]
Add initial Nodeinfo document

2 years agoMerge branch 'from/develop/tusooa/2802-propagate-reject' into 'develop'
Alex Gleason [Thu, 23 Dec 2021 16:00:16 +0000 (16:00 +0000)]
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

2 years agoMerge branch 'moderators' into 'develop'
Alex Gleason [Wed, 22 Dec 2021 16:37:35 +0000 (16:37 +0000)]
Merge branch 'moderators' into 'develop'

AdminAPI: let moderators actually do things

Closes #2490

See merge request pleroma/pleroma!3480

2 years agoMerge branch 'erratic-tests' into 'develop'
Alex Gleason [Wed, 22 Dec 2021 04:14:31 +0000 (04:14 +0000)]
Merge branch 'erratic-tests' into 'develop'

Skip erratic tests

See merge request pleroma/pleroma!3572

2 years agoSkip erratic tests
Alex Gleason [Wed, 22 Dec 2021 04:04:15 +0000 (22:04 -0600)]
Skip erratic tests

2 years agoMerge remote-tracking branch 'origin/develop' into moderators
Alex Gleason [Sun, 19 Dec 2021 18:55:36 +0000 (12:55 -0600)]
Merge remote-tracking branch 'origin/develop' into moderators

2 years agoMerge branch 'mkljczk-develop-patch-64464' into 'develop'
Alex Gleason [Sun, 19 Dec 2021 18:51:41 +0000 (18:51 +0000)]
Merge branch 'mkljczk-develop-patch-64464' into 'develop'

Add "exposable_reactions" to features, if showing reactions

See merge request pleroma/pleroma!3523

2 years agoMerge branch 'manifest' into 'develop'
Alex Gleason [Sun, 19 Dec 2021 18:18:59 +0000 (18:18 +0000)]
Merge branch 'manifest' into 'develop'

Expose /manifest.json for PWA

Closes #882

See merge request pleroma/pleroma!3544

2 years agoSlow queries logging improvements: added EXPLAIN results, listed params, improved...
Ivan Tashkinov [Sun, 19 Dec 2021 17:35:00 +0000 (20:35 +0300)]
Slow queries logging improvements: added EXPLAIN results, listed params, improved stacktrace.

2 years agoMerge branch 'replies-count' into 'develop'
Alex Gleason [Sun, 19 Dec 2021 17:36:25 +0000 (17:36 +0000)]
Merge branch 'replies-count' into 'develop'

Fix replies count for remote replies

See merge request pleroma/pleroma!3541

2 years agoMerge branch 'link-headers-chats' into 'develop'
Alex Gleason [Sun, 19 Dec 2021 17:35:50 +0000 (17:35 +0000)]
Merge branch 'link-headers-chats' into 'develop'

Add link headers in ChatController.index2

See merge request pleroma/pleroma!3562

2 years agoMerge branch 'live-dashboard' into 'develop'
Alex Gleason [Sun, 19 Dec 2021 17:35:14 +0000 (17:35 +0000)]
Merge branch 'live-dashboard' into 'develop'

Add Phoenix LiveDashboard

See merge request pleroma/pleroma!3566

2 years agoMerge remote-tracking branch 'origin/develop' into manifest
Alex Gleason [Sun, 19 Dec 2021 17:33:10 +0000 (11:33 -0600)]
Merge remote-tracking branch 'origin/develop' into manifest

2 years agoMerge branch 'v2-suggestions' into 'develop'
Alex Gleason [Sun, 19 Dec 2021 17:31:17 +0000 (17:31 +0000)]
Merge branch 'v2-suggestions' into 'develop'

V2 suggestions

See merge request pleroma/pleroma!3547

2 years agoMerge branch 'fix-search-dos' into 'develop'
Alex Gleason [Sun, 19 Dec 2021 17:30:52 +0000 (17:30 +0000)]
Merge branch 'fix-search-dos' into 'develop'

Search: limit number of results (prevent DoS)

See merge request pleroma/pleroma!3563

2 years agoMerge branch 'from/develop/tusooa/alpine-3.14' into 'develop'
lain [Sat, 18 Dec 2021 15:04:55 +0000 (15:04 +0000)]
Merge branch 'from/develop/tusooa/alpine-3.14' into 'develop'

Bump alpine to 3.14

See merge request pleroma/pleroma!3569

2 years agoBump alpine to 3.14
Tusooa Zhu [Fri, 17 Dec 2021 23:00:29 +0000 (18:00 -0500)]
Bump alpine to 3.14

2 years agoLint
Tusooa Zhu [Fri, 17 Dec 2021 21:52:50 +0000 (16:52 -0500)]
Lint

2 years agoAdd changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568
Tusooa Zhu [Fri, 17 Dec 2021 21:47:48 +0000 (16:47 -0500)]
Add changelog for https://git.pleroma.social/pleroma/pleroma/-/merge_requests/3568

2 years agoAdd test to ensure removed follower cease to have relationship with ex-followee
Tusooa Zhu [Fri, 17 Dec 2021 21:44:22 +0000 (16:44 -0500)]
Add test to ensure removed follower cease to have relationship with ex-followee

https://git.pleroma.social/pleroma/pleroma/-/issues/2802

2 years agoAdd test to ensure the blocked cease to have follow relationship to the blocker
Tusooa Zhu [Fri, 17 Dec 2021 19:42:45 +0000 (14:42 -0500)]
Add test to ensure the blocked cease to have follow relationship to the blocker

https://git.pleroma.social/pleroma/pleroma/-/issues/2766

2 years agoAllow updating accepted follow activities in Web.ActivityPub.Utils.update_follow_stat...
Tusooa Zhu [Fri, 17 Dec 2021 19:17:51 +0000 (14:17 -0500)]
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.

2 years agoMerge branch 'verbose-emoji-loader' into 'develop'
lain [Fri, 17 Dec 2021 14:35:01 +0000 (14:35 +0000)]
Merge branch 'verbose-emoji-loader' into 'develop'

emoji/loader.ex: be more verbose about which emoji pack config is loading now

See merge request pleroma/pleroma!3567

2 years agoemoji/loader.ex: be more verbose about which emoji pack config is loading now
a1batross [Fri, 17 Dec 2021 14:15:44 +0000 (14:15 +0000)]
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

2 years agoDirty hack to make mediaproxy functional by relying on Hackney for that part
Mark Felder [Thu, 16 Dec 2021 17:36:58 +0000 (11:36 -0600)]
Dirty hack to make mediaproxy functional by relying on Hackney for that part

2 years agoformat
FloatingGhost [Thu, 16 Dec 2021 16:13:48 +0000 (16:13 +0000)]
format

2 years agoMerge remote-tracking branch 'origin/feature/elasticsearch' into develop
FloatingGhost [Thu, 16 Dec 2021 16:13:41 +0000 (16:13 +0000)]
Merge remote-tracking branch 'origin/feature/elasticsearch' into develop

2 years agoMerge remote-tracking branch 'upstream/develop' into develop
FloatingGhost [Thu, 16 Dec 2021 16:10:08 +0000 (16:10 +0000)]
Merge remote-tracking branch 'upstream/develop' into develop

2 years agoMerge branch 'develop' into feature/elasticsearch
FloatingGhost [Thu, 16 Dec 2021 16:07:15 +0000 (16:07 +0000)]
Merge branch 'develop' into feature/elasticsearch

2 years agoMerge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop
FloatingGhost [Thu, 16 Dec 2021 16:07:00 +0000 (16:07 +0000)]
Merge branch 'develop' of https://git.pleroma.social/pleroma/pleroma into develop

2 years agoformat
FloatingGhost [Thu, 16 Dec 2021 16:05:33 +0000 (16:05 +0000)]
format

2 years agoadd timestamp
FloatingGhost [Thu, 16 Dec 2021 16:05:18 +0000 (16:05 +0000)]
add timestamp

2 years agoadd timestamp
FloatingGhost [Thu, 16 Dec 2021 15:58:56 +0000 (15:58 +0000)]
add timestamp

2 years agomaybe
FloatingGhost [Thu, 16 Dec 2021 15:20:22 +0000 (15:20 +0000)]
maybe

2 years agofix remote hashtags
FloatingGhost [Thu, 16 Dec 2021 15:09:36 +0000 (15:09 +0000)]
fix remote hashtags

2 years agomaybe
FloatingGhost [Thu, 16 Dec 2021 15:20:22 +0000 (15:20 +0000)]
maybe

2 years agofix remote hashtags
FloatingGhost [Thu, 16 Dec 2021 15:09:36 +0000 (15:09 +0000)]
fix remote hashtags

2 years agoMerge remote-tracking branch 'origin/develop' into live-dashboard
Alex Gleason [Thu, 16 Dec 2021 00:05:36 +0000 (19:05 -0500)]
Merge remote-tracking branch 'origin/develop' into live-dashboard

2 years agoAdd Phoenix LiveDashboard
Alex Gleason [Wed, 15 Dec 2021 21:17:11 +0000 (16:17 -0500)]
Add Phoenix LiveDashboard

Co-authored-by: Egor Kislitsyn <egor@kislitsyn.com>
2 years agoMerge branch 'delete-account-fix' into 'develop'
lain [Wed, 15 Dec 2021 21:26:45 +0000 (21:26 +0000)]
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

2 years agoApplication: Actually start finch if it's needed
Lain Soykaf [Wed, 15 Dec 2021 20:42:37 +0000 (15:42 -0500)]
Application: Actually start finch if it's needed

2 years agoApplication, dependencies: prepare for finch
Lain Soykaf [Wed, 15 Dec 2021 18:53:09 +0000 (13:53 -0500)]
Application, dependencies: prepare for finch

2 years agodon't try indexing non-people
sadposter [Wed, 15 Dec 2021 11:05:30 +0000 (11:05 +0000)]
don't try indexing non-people

2 years agodon't try indexing non-people
sadposter [Wed, 15 Dec 2021 11:05:30 +0000 (11:05 +0000)]
don't try indexing non-people

2 years agore-add fetching by url
FloatingGhost [Wed, 15 Dec 2021 10:57:47 +0000 (10:57 +0000)]
re-add fetching by url

2 years agore-add fetching by url
FloatingGhost [Wed, 15 Dec 2021 10:57:47 +0000 (10:57 +0000)]
re-add fetching by url

2 years agofix empty queries returning 50 results
sadposter [Tue, 14 Dec 2021 15:02:11 +0000 (15:02 +0000)]
fix empty queries returning 50 results

2 years agoextra cool
sadposter [Tue, 14 Dec 2021 14:48:24 +0000 (14:48 +0000)]
extra cool

2 years agofix empty queries returning 50 results
sadposter [Tue, 14 Dec 2021 15:02:11 +0000 (15:02 +0000)]
fix empty queries returning 50 results

2 years agoextra cool
sadposter [Tue, 14 Dec 2021 14:48:24 +0000 (14:48 +0000)]
extra cool

2 years agoadd timeouts
FloatingGhost [Tue, 14 Dec 2021 14:33:34 +0000 (14:33 +0000)]
add timeouts

2 years agoadd timeouts
FloatingGhost [Tue, 14 Dec 2021 14:33:34 +0000 (14:33 +0000)]
add timeouts

2 years agomerge
FloatingGhost [Tue, 14 Dec 2021 14:28:15 +0000 (14:28 +0000)]
merge

2 years agofix inbound federation
sadposter [Tue, 14 Dec 2021 13:58:16 +0000 (13:58 +0000)]
fix inbound federation

2 years agofilter by user type
sadposter [Tue, 14 Dec 2021 14:16:21 +0000 (14:16 +0000)]
filter by user type

2 years agoMerge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop
sadposter [Tue, 14 Dec 2021 14:01:09 +0000 (14:01 +0000)]
Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop

2 years agofix inbound federation
sadposter [Tue, 14 Dec 2021 13:58:16 +0000 (13:58 +0000)]
fix inbound federation

2 years agoSearch through users and hashtags as well
FloatingGhost [Tue, 14 Dec 2021 13:53:46 +0000 (13:53 +0000)]
Search through users and hashtags as well

2 years agoadd hashtag indexing
FloatingGhost [Tue, 14 Dec 2021 12:37:10 +0000 (12:37 +0000)]
add hashtag indexing

2 years agoadd user import
FloatingGhost [Mon, 13 Dec 2021 20:27:35 +0000 (20:27 +0000)]
add user import

2 years agoadd mappings
FloatingGhost [Mon, 13 Dec 2021 20:15:17 +0000 (20:15 +0000)]
add mappings

2 years agoSearch through users and hashtags as well
FloatingGhost [Tue, 14 Dec 2021 13:53:46 +0000 (13:53 +0000)]
Search through users and hashtags as well

2 years agoadd hashtag indexing
FloatingGhost [Tue, 14 Dec 2021 12:37:10 +0000 (12:37 +0000)]
add hashtag indexing

2 years agoTwitterAPI: allow deleting one's own account with request body
Alex Gleason [Mon, 13 Dec 2021 21:15:33 +0000 (16:15 -0500)]
TwitterAPI: allow deleting one's own account with request body

2 years agoadd user import
FloatingGhost [Mon, 13 Dec 2021 20:27:35 +0000 (20:27 +0000)]
add user import

2 years agoadd mappings
FloatingGhost [Mon, 13 Dec 2021 20:15:17 +0000 (20:15 +0000)]
add mappings

2 years agoSearch: limit number of results
Alex Gleason [Mon, 13 Dec 2021 04:50:07 +0000 (22:50 -0600)]
Search: limit number of results

2 years agofix buggos
sadposter [Sun, 12 Dec 2021 20:01:07 +0000 (20:01 +0000)]
fix buggos

2 years agofully reference es
FloatingGhost [Sun, 12 Dec 2021 19:40:31 +0000 (19:40 +0000)]
fully reference es

2 years agofix multi-after-transaction
FloatingGhost [Sun, 12 Dec 2021 19:40:05 +0000 (19:40 +0000)]
fix multi-after-transaction

2 years agopipeline it
FloatingGhost [Sun, 12 Dec 2021 19:39:07 +0000 (19:39 +0000)]
pipeline it

2 years agofix bug in inbound
sadposter [Sun, 12 Dec 2021 19:31:47 +0000 (19:31 +0000)]
fix bug in inbound

2 years agoenforce visibility
sadposter [Sun, 12 Dec 2021 18:25:20 +0000 (18:25 +0000)]
enforce visibility

2 years agofix buggos
sadposter [Sun, 12 Dec 2021 20:01:07 +0000 (20:01 +0000)]
fix buggos

2 years agofully reference es
FloatingGhost [Sun, 12 Dec 2021 19:40:31 +0000 (19:40 +0000)]
fully reference es

2 years agofix multi-after-transaction
FloatingGhost [Sun, 12 Dec 2021 19:40:05 +0000 (19:40 +0000)]
fix multi-after-transaction

2 years agopipeline it
FloatingGhost [Sun, 12 Dec 2021 19:39:07 +0000 (19:39 +0000)]
pipeline it

2 years agofix bug in inbound
sadposter [Sun, 12 Dec 2021 19:31:47 +0000 (19:31 +0000)]
fix bug in inbound

2 years agoenforce visibility
sadposter [Sun, 12 Dec 2021 18:25:20 +0000 (18:25 +0000)]
enforce visibility

2 years agoMerge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop
sadposter [Sun, 12 Dec 2021 17:39:44 +0000 (17:39 +0000)]
Merge branch 'develop' of gitssh.ihatebeinga.live:IHBAGang/pleroma into develop

2 years agoMerge pull request 'feature/elasticsearch' (#1) from feature/elasticsearch into develop
floatingghost [Sun, 12 Dec 2021 17:37:27 +0000 (17:37 +0000)]
Merge pull request 'feature/elasticsearch' (#1) from feature/elasticsearch into develop

Reviewed-on: https://git.ihatebeinga.live/IHBAGang/pleroma/pulls/1

2 years agoRemove IO inspect
FloatingGhost [Sun, 12 Dec 2021 17:26:06 +0000 (17:26 +0000)]
Remove IO inspect

2 years agomake search provider configurable
FloatingGhost [Sun, 12 Dec 2021 17:23:44 +0000 (17:23 +0000)]
make search provider configurable

2 years agoadd extra filters
FloatingGhost [Sat, 11 Dec 2021 19:56:15 +0000 (19:56 +0000)]
add extra filters

2 years agointegrate search endpoint with ES
FloatingGhost [Sat, 11 Dec 2021 18:48:46 +0000 (18:48 +0000)]
integrate search endpoint with ES

2 years agoAdd import functionality
FloatingGhost [Sat, 11 Dec 2021 17:36:49 +0000 (17:36 +0000)]
Add import functionality

2 years agoVideoHandlingTest: remove nil values
Alex Gleason [Wed, 8 Dec 2021 02:55:54 +0000 (21:55 -0500)]
VideoHandlingTest: remove nil values

2 years agoApply alexgleason's suggestion(s) to 1 file(s)
Haelwenn [Tue, 7 Dec 2021 22:53:36 +0000 (22:53 +0000)]
Apply alexgleason's suggestion(s) to 1 file(s)

2 years agoFix VideoHandlingTest
Alex Gleason [Tue, 7 Dec 2021 18:35:34 +0000 (13:35 -0500)]
Fix VideoHandlingTest

2 years agoAttachmentValidator: ingest width and height
Alex Gleason [Tue, 7 Dec 2021 17:59:03 +0000 (12:59 -0500)]
AttachmentValidator: ingest width and height

2 years agoTransmogrifier: test fix_attachments/1
Alex Gleason [Tue, 7 Dec 2021 06:10:47 +0000 (01:10 -0500)]
Transmogrifier: test fix_attachments/1

2 years agoBenchmarks: fix user timeline and tags benchmarks
Alex Gleason [Wed, 8 Dec 2021 17:54:41 +0000 (11:54 -0600)]
Benchmarks: fix user timeline and tags benchmarks

2 years agoLinting.
Lain Soykaf [Tue, 7 Dec 2021 17:12:23 +0000 (12:12 -0500)]
Linting.

2 years agomove result into with guard
Finn Behrens [Tue, 7 Dec 2021 08:18:53 +0000 (09:18 +0100)]
move result into with guard

2 years agoFix benchmarks
Alex Gleason [Fri, 3 Dec 2021 21:20:54 +0000 (16:20 -0500)]
Fix benchmarks

2 years agomake linter happy
FloatingGhost [Mon, 6 Dec 2021 11:50:51 +0000 (11:50 +0000)]
make linter happy

2 years agoMake deactivated user check into a subquery
FloatingGhost [Mon, 6 Dec 2021 11:44:17 +0000 (11:44 +0000)]
Make deactivated user check into a subquery

Fixes #2792