fedi/akkoma
1
0
Fork 0
mirror of https://akkoma.dev/AkkomaGang/akkoma.git synced 2024-11-23 23:11:13 +00:00
Code Issues Packages Projects Releases Wiki Activity
11598 commits 26 branches 107 tags 316 MiB
Commit graph

7114 commits

Author SHA1 Message Date
Haelwenn 6b01a09a08 Merge branch '2078-list-fixes' into 'develop' 
Resolve "List timeline returns incorrectly assigned Account for replies and repeats"

Closes #2070 and #2078

See merge request pleroma/pleroma!2923
 2020-08-27 17:05:53 +00:00
lain 82bf27172c Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0 2020-08-27 15:38:03 +02:00
lain 78939c1d16 ChatController: Don't die if the recipient is gone. 2020-08-27 12:13:18 +02:00
lain cfc99fe05c TimelineController: Keys are atoms now. 
Closes #2078
Closes #2070
 2020-08-26 15:37:30 +02:00
lain fc42446755 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0 2020-08-26 13:17:39 +02:00
feld fb33321fa2 Merge branch 'feature/1952-read-muted-notifications' into 'develop' 
Automatically mark notifications about statuses from muted users and threads as read

Closes #1952

See merge request pleroma/pleroma!2893
 2020-08-25 21:32:32 +00:00
lain 112bec5225 Webfinger: Handle bogus ids better. 2020-08-25 17:35:59 +02:00
lain ea2b5c07e3 Merge branch 'stable' of git.pleroma.social:pleroma/pleroma into pleroma-2.1-rc0 2020-08-25 15:38:12 +02:00
lain c1d51944c7 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads 2020-08-25 11:44:51 +02:00
feld d39abd02ac Merge branch 'relay-fix-admin-fe' into 'develop' 
Relay fix for admin-fe

See merge request pleroma/pleroma!2902
 2020-08-24 17:03:18 +00:00
lain e1c8c599ff Merge branch 'features/validators-event' into 'develop' 
Pipeline Ingestion: Event

See merge request pleroma/pleroma!2909
 2020-08-21 16:10:30 +00:00
Alexander Strizhakov 1f8c32b773
adding actor type in user show 2020-08-21 10:38:56 +03:00
Haelwenn (lanodan) Monnier 36c125a071
Pipeline Ingestion: Event 2020-08-20 21:49:26 +02:00
lain 9aae342e7a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio2 2020-08-19 14:10:11 +02:00
Alexander Strizhakov 4727030f59
fixes for mix tasks 
- fix for `mix pleroma.database update_users_following_followers_counts`
- raise error, if fetch was unsuccessful in emoji tasks
- fix for `pleroma.digest test` task
 2020-08-19 11:06:03 +03:00
Alexander Strizhakov 7dc275b69b
relay fix for admin-fe 2020-08-19 08:41:39 +03:00
Haelwenn (lanodan) Monnier 5316e231b0
Pipeline Ingestion: Audio (Part 2) 2020-08-19 00:06:31 +02:00
Haelwenn 3d5d8c05c9 Merge branch '2064-image-blanking' into 'develop' 
Resolve "Make default image description blank"

Closes #2064

See merge request pleroma/pleroma!2899
 2020-08-18 19:02:33 +00:00
lain 3998ef9d64 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators-audio 2020-08-18 13:31:42 +02:00
lain 566749f77a Merge branch 'purge-user' into 'develop' 
Purge a local user upon deletion, fixes #2062

Closes #2062

See merge request pleroma/pleroma!2898
 2020-08-18 11:31:13 +00:00
lain aabc26a573 Pleroma.Upload: Set default upload name / description based on config. 2020-08-18 13:21:30 +02:00
lain 548ca43bcf Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/validators_use_ectotypes 2020-08-18 12:38:13 +02:00
Alex Gleason 72cbe20a58
Purge most user fields upon deletion, "right to be forgotten" #859 2020-08-17 23:44:44 -05:00
Alex Gleason c12c576ee2
Also purge bio and display name 2020-08-17 22:11:45 -05:00
Alex Gleason d55faa2f8f
Purge a local user upon deletion, fixes #2062 2020-08-17 21:52:28 -05:00
Haelwenn (lanodan) Monnier 2f8c3c842d
common_fixes: Remove Utils.make_date call 2020-08-18 02:24:48 +02:00
Haelwenn (lanodan) Monnier c9d6638461
common_fixes: Get fixes common from Audio and Question 2020-08-18 02:24:48 +02:00
Haelwenn (lanodan) Monnier 2bc08d5573
Pipeline Ingestion: Audio 2020-08-18 02:02:34 +02:00
Haelwenn (lanodan) Monnier b1fc4fe0ca
fetcher: fallback to [] when to/cc is nil 
Related: https://git.pleroma.social/pleroma/pleroma/-/issues/2063
 2020-08-18 02:02:20 +02:00
Haelwenn (lanodan) Monnier 7a273087ed
object_validators: Use ecto_types where available 2020-08-17 23:47:00 +02:00
lain 34b099fffa Merge branch 'issue/1936' into 'develop' 
[#1936] Ability to search for banned MediaProxy URLs 

See merge request pleroma/pleroma!2873
 2020-08-17 13:05:20 +00:00
lain e154fcf525 Merge branch '2046-default-restrict-unauthenticated-basing-on-instance-privacy' into 'develop' 
[#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy

Closes #2046

See merge request pleroma/pleroma!2890
 2020-08-17 12:26:53 +00:00
Hugo Müller-Downing 317b6c6c52 Start :ssl if not started when running migration or rollback 2020-08-17 17:34:03 +10:00
Sergey Suprunenko 25c69e271a
Make notifications about new statuses from muted threads read 2020-08-17 00:11:33 +02:00
Maksim Pechnikov f6da12f45d fix search media proxy urls 2020-08-16 06:54:48 +03:00
Sergey Suprunenko 0865f36965
Mark notifications about statuses from muted users as read automatically 2020-08-15 15:27:41 +02:00
Ivan Tashkinov 95529ab709 [#2046] Defaulted pleroma/restrict_unauthenticated basing on instance privacy setting (i.e. restrict on private instances only by default). 2020-08-14 20:55:45 +03:00
lain 76ce3a1c9e Mogrifun: Add a line about the purpose of the module. 2020-08-14 18:27:18 +02:00
Maksim Pechnikov 9b055f7211 fix cron wroker 2020-08-13 21:03:15 +03:00
Maksim Pechnikov 3515cb5c3a fix Cron.PurgeExpiredActivitiesWorker 2020-08-13 21:01:21 +03:00
feld 14a06e63f6 Merge branch 'fix/activity-expirations-again' into 'develop' 
Fix activity expirations again

See merge request pleroma/pleroma!2866
 2020-08-13 17:38:19 +00:00
Haelwenn (lanodan) Monnier 4f3c955f26
side_effects: Fix typo on notification 2020-08-13 18:10:43 +02:00
Maksim Pechnikov 56470647de Merge branch 'develop' into issue/1936 2020-08-13 09:00:25 +03:00
Alexander Strizhakov 29a7bcd5bb
reverting pinned posts in filtering 2020-08-12 20:01:21 +03:00
Alexander Strizhakov 3ab83f837e
don't load pinned activities in due_expirations 2020-08-12 19:46:47 +03:00
Mark Felder 98058bd06e Merge branch 'develop' into fix/activity-expirations-again 2020-08-12 09:42:28 -05:00
lain 2e347e8286 ActivityPub: Remove reject, move everything to the Pipeline. 2020-08-12 15:07:46 +02:00
lain 7224bf309e Transmogrifier: Move Rejects to the Pipeline 2020-08-12 14:48:51 +02:00
Alexander Strizhakov eec1ba232c
don't expire pinned posts 2020-08-12 15:15:17 +03:00
lain bb92ad44a6 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into reject 2020-08-12 12:53:04 +02:00
Maksim Pechnikov 76462efbfa fix job monitor 2020-08-11 22:06:33 +03:00
lain 500576dcb6 Linting fixes. 2020-08-11 19:22:14 +02:00
Mark Felder 724ed354f2 Ensure only Note objects are set to expire 2020-08-11 11:28:22 -05:00
lain 0589e9156a Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again 2020-08-11 17:49:24 +02:00
lain 25bfee0d12 ActivityPub: Remove ActivityPub.accept 
Switch to the pipeline in CommonAPI and SideEffects
 2020-08-11 17:43:16 +02:00
lain f988d82e46 Transmogrifier: Handle accepts with the pipeline 2020-08-11 17:26:01 +02:00
lain 3f6d50111e Linter fixes. 2020-08-11 16:07:42 +02:00
lain da3f9b9988 Transmogrifier: Remove handling of orphaned accepts 
This was a Mastodon 2.3 issue and has been fixed for a long time.
According to fediverse.networks, less than one percent of servers
still run a version this old or older.
 2020-08-11 15:41:19 +02:00
lain 8b1e8bec2f AcceptValidation: Codify accept rules. 2020-08-11 15:32:52 +02:00
lain f1a0c10b17 AcceptValidator: Add basic validator with tests. 2020-08-11 15:13:07 +02:00
lain 8f9fbc86c0 Transmogrifier: Small readability changes. 2020-08-11 14:02:09 +02:00
lain 686002164a Merge branch '204-fix' into 'develop' 
Fix 500 errors when returning :no_content, fixes #2029

Closes #2029

See merge request pleroma/pleroma!2856
 2020-08-11 09:18:56 +00:00
lain 677abbf0ee Merge branch 'fix/activity-expirations-again' of git.pleroma.social:pleroma/pleroma into fix/activity-expirations-again 2020-08-11 10:55:10 +02:00
lain 7e4932362b SideEffects: Handle strange deletion case. 2020-08-11 10:54:38 +02:00
Maksim Pechnikov 345ac512e4 added paginate+search for admin/MediaProxy URLs 2020-08-11 10:30:13 +03:00
feld 78484fe0ef Merge branch 'admin-active-filter' into 'develop' 
Admin API: Filter out unapproved users when the `active` filter is on

Closes #2037

See merge request pleroma/pleroma!2872
 2020-08-10 17:16:38 +00:00
Mark Felder 024b7ce0b7 Merge branch 'develop' into fix/activity-expirations-again 2020-08-10 11:32:24 -05:00
Egor Kislitsyn 249f21dcbb Admin API: Filter out unapproved users when the active filter is on 2020-08-10 18:27:39 +04:00
lain 93fbf39954 Merge branch 'revert-a6d3bb5f' into 'develop' 
Revert "Merge branch 'issue/1023' into 'develop'"

Closes #2033

See merge request pleroma/pleroma!2868
 2020-08-10 13:59:38 +00:00
lain 11fc90744c Transmogrifier: Remove duplicate code. 2020-08-10 15:31:36 +02:00
lain 5c4548d5e7 Revert "Merge branch 'issue/1023' into 'develop'" 
This reverts merge request !2763
 2020-08-10 13:05:13 +00:00
lain 66122a11b5 AccountController: Build the correct update activity. 
Will fix federation issues.
 2020-08-10 10:33:05 +02:00
Mark Felder e08ea01d09 Limit expirations for each cron execution to 50. 
This should prevent servers from being crushed. 50/min is a pretty good rate.
 2020-08-08 12:49:02 -05:00
Mark Felder cf4c97242b Ensure we only expire Create activities with the Mix task 2020-08-08 12:40:52 -05:00
Egor Kislitsyn e5557bf8ba
Add mix task to add expiration to all local statuses 2020-08-08 16:29:40 +04:00
Mark Felder 54e2af8293 Merge branch 'develop' into fix/ldap-auth-issues 2020-08-07 14:55:22 -05:00
Mark Felder 474147a67a Make a new function instead of overloading register_changeset/3 2020-08-07 14:54:14 -05:00
Alex Gleason 673e8e3ac1
Force 204 responses to be empty, fixes #2029 2020-08-07 13:02:39 -05:00
lain e5ab5fbe76 Mix task frontend: Read the docs. 2020-08-07 15:01:08 +02:00
lain 34cbe9f44a Merge branch 'features/poll-validation' into 'develop' 
Poll and votes pipeline ingestion

Closes #1362 and #1852

See merge request pleroma/pleroma!2635
 2020-08-07 10:44:06 +00:00
lain bf95dfb240 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads 2020-08-06 15:22:20 +02:00
Ivan Tashkinov 135ae4e35a [#2025] Defaulted OAuth login scopes choice to all scopes when user selects no scopes. 2020-08-06 16:00:00 +03:00
lain 10b0e55acf Merge branch 'whole-word-filter-hotfix' into 'develop' 
Update filter_view.ex to return whole_word actual value

See merge request pleroma/pleroma!2851
 2020-08-06 08:35:39 +00:00
Mark Felder 2a4bca5bd7 Comments are good when they're precise... 2020-08-05 11:40:09 -05:00
Roman Chvanikov 7569f225f1 Move checks to application startup 2020-08-05 19:38:55 +03:00
Mark Felder 81126b0142 Add email to user account only if it exists in LDAP 2020-08-05 11:36:12 -05:00
Roman Chvanikov 4672b61106 Merge branch 'develop' into command-available-check 2020-08-05 19:16:48 +03:00
lain 9d7ce1a6d0 CommonValidations: More refactors. 2020-08-05 17:56:12 +02:00
lain 3655175639 CommonValidations: Refactor same_domain? 2020-08-05 17:36:27 +02:00
lain 9c96fc052a CommonValidations: Extract modification right checker 2020-08-05 17:26:53 +02:00
Roman Chvanikov 8c57a299b4 Handle non-list keys in Config.fetch/1 2020-08-05 18:23:12 +03:00
Mark Felder 2192d1e492 Permit LDAP users to register without capturing their password hash 
We don't need it, and local auth fallback has been removed.
 2020-08-05 10:07:31 -05:00
Roman Chvanikov 2299bfe4c1 Merge branch 'develop' into refactor/config-get 2020-08-05 17:46:24 +03:00
lain 5221879c35 Fix linting. 2020-08-05 15:40:32 +02:00
Mark Felder 0f9aecbca4 Remove fallback to local database when LDAP is unavailable. 
In many environments this will not work as the LDAP password and the copy stored in Pleroma will stay synchronized.
 2020-08-05 08:18:16 -05:00
Mark Felder f7146583e5 Remove LDAP mail attribute as a requirement for registering an account 2020-08-05 08:15:57 -05:00
lain f889400d05 Questions: Move fixes to validators. 2020-08-05 14:51:33 +02:00
lain b5f0cef156 Apply 1 suggestion(s) to 1 file(s) 2020-08-05 11:33:21 +00:00
lain 70522989d9 Apply 1 suggestion(s) to 1 file(s) 2020-08-05 11:14:58 +00:00
lain 00c4c6a382 CommonValidations: Remove superfluous function 
The `is_active` functionality was integrated into the presence
checker.
 2020-08-05 12:24:34 +02:00
Roman Chvanikov 6f60ac9f41 Refactor config 2020-08-05 13:00:49 +03:00
lain 19c108170e Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation 2020-08-05 11:12:14 +02:00
MK Fain f341a8e142 Update filter_view.ex to return whole_word actual value 2020-08-05 02:01:27 +00:00
Karol Kosek 577b11167c
templates/layout/app.html.eex: fix link color 2020-08-05 00:01:30 +02:00
rinpatch b1b6a7dfa8 Merge branch 'deactivated-user-posts' into 'develop' 
Deactivated user posts

Closes #2011

See merge request pleroma/pleroma!2845
 2020-08-04 19:17:30 +00:00
rinpatch fede37e4c6 Merge branch 'chore/consolidate-rich-media-http' into 'develop' 
Consolidate construction of Rich Media Parser HTTP requests

See merge request pleroma/pleroma!2827
 2020-08-04 19:16:38 +00:00
Egor Kislitsyn 91fbb5b21f
Fix ActivityExpirationPolicy 2020-08-04 18:26:37 +04:00
lain 878c7f3f30 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into features/poll-validation 2020-08-04 15:28:41 +02:00
lain 532d6f94ae Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-downloads 2020-08-04 15:10:36 +02:00
Haelwenn (lanodan) Monnier 0f088d8ce3
question_validator: Allow content to be an empty-string (blank) 2020-08-04 14:29:16 +02:00
lain 1a00713744 CommonValidations: Treat deactivated users as not present. 2020-08-04 14:17:03 +02:00
Roman Chvanikov 56e9bf3393 Unify Config.get behaviour for atom/list key param 2020-08-04 14:35:47 +03:00
lain 28584bb224 Merge branch 'email-blacklist' into 'develop' 
Add email blacklist, fixes #1404

Closes #1404

See merge request pleroma/pleroma!2837
 2020-08-04 11:00:30 +00:00
Alex Gleason 4f57e85ab9
Email blacklist: Update phrasing again 2020-08-03 22:20:49 -05:00
Alex Gleason 058daf498f
Email blacklist: Update response phrasing 2020-08-03 19:57:53 -05:00
lain e3953923ac Merge branch 'fixes_1957_add_option_to_send_user_chatmessage_instead_of_dm' into 'develop' 
fixes 1957 Add option to send user chatmessage instead of dm

Closes #1957

See merge request pleroma/pleroma!2782
 2020-08-03 21:01:56 +00:00
Mark Felder 016d8d6c56 Consolidate construction of Rich Media Parser HTTP requests 2020-08-03 12:37:31 -05:00
lain 56b5b9aa27 Merge branch 'follower-mrf-again' into 'develop' 
Follower mrf again

See merge request pleroma/pleroma!2833
 2020-08-03 14:22:11 +00:00
lain 5876d5123c Merge branch 'object-age-fix' into 'develop' 
MRF Object Age Policy: Don't break on messages without cc/to

See merge request pleroma/pleroma!2840
 2020-08-03 12:50:10 +00:00
lain 10c792110e MRF Object Age Policy: Don't break on messages without cc/to 2020-08-03 14:12:32 +02:00
Alex Gleason dc88b6f091
Add email blacklist, fixes #1404 2020-08-02 14:53:42 -05:00
Ilja f671d7e68c Add welcome chatmessages 
* I added the option in config/config.exs
* created a new module lib/pleroma/user/welcome_chat_message.ex
* Added it to the registration flow
* added to the cheatsheet
* added to the config/description.ex
* added to the Changelog.md
 2020-08-02 15:54:59 +02:00
lain 70951d042b Merge branch '1985-unobtrusive-autologin-on-registration' into 'develop' 
[#1985] Prevented force login on registration if account approval and/or email confirmation needed

Closes #1985

See merge request pleroma/pleroma!2823
 2020-08-01 15:58:17 +00:00
rinpatch 45be1fe00e ConnectionPool: fix gun open errors being returned without an error tuple 
When gun shuts down due to the host being unreachable, the worker
process shuts down with the same shutdown reason since they are linked.
Gun doesn't have error tuples in it's shutdown reason though, so we need
to handle it in get_conn.

Closes #2008
 2020-08-01 18:02:26 +03:00
Roman Chvanikov 4bf44b7d65 Don't override user-agent header if it's been set 2020-08-01 10:04:25 +03:00
lain 7e01339ddd Frontend mix task: Support installation from local file. 2020-07-31 17:58:50 +02:00
lain 4b18a07392 Revert "Merge branch 'revert-1ac0969c' into 'develop'" 
This reverts merge request !2825
 2020-07-31 15:18:04 +00:00
lain 010d77ec85 Revert "Merge branch 'mrf-silence-2' into 'develop'" 
This reverts merge request !2820
 2020-07-31 15:17:09 +00:00
lain 1ac0969c72 Merge branch 'mrf-silence-2' into 'develop' 
MRF silencing alternative solution

See merge request pleroma/pleroma!2820
 2020-07-31 14:43:33 +00:00
Haelwenn (lanodan) Monnier ac2598307d
Merge remote-tracking branch 'pleroma/develop' into features/poll-validation 2020-07-31 13:57:21 +02:00
Ivan Tashkinov 27b0a8b155 [#1985] Prevented force login on registration if account approval and/or email confirmation needed. 
Refactored login code in OAuthController, reused in AccountController. Added tests.
 2020-07-31 14:13:38 +03:00
lain 1dd162a5f7 SimplePolicy: Fix problem with DM leaks. 2020-07-31 09:57:30 +02:00
Haelwenn d1cf1108ac Merge branch 'render-preview-cards-in-chats' into 'develop' 
Render preview cards in chats

See merge request pleroma/pleroma!2816
 2020-07-30 20:08:03 +00:00
Haelwenn 87fe31fb5c Merge branch '1993-confirm-users-on-registration' into 'develop' 
AccountController: Don't explicitly ask to keep users unconfirmed.

Closes #1993

See merge request pleroma/pleroma!2809
 2020-07-30 20:01:04 +00:00
lain a3c37379e9 ChatMessage schema: Add preview cards. 2020-07-30 19:57:45 +02:00
lain 781b270863 ChatMessageReferenceView: Display preview cards. 2020-07-30 19:57:26 +02:00
lain 873ff5ce14 Merge branch 'hide-reactions' into 'develop' 
Let favourites and emoji reactions optionally be hidden

See merge request pleroma/pleroma!2804
 2020-07-30 12:41:47 +00:00
lain 2e20ceee52 Mix tasks: Add frontend task to download and install frontends. 
Co-authored-by: Roman Chvanikov <chvanikoff@pm.me>
 2020-07-30 14:12:41 +02:00
Mark Felder 33f0427809 Expose seconds_valid in Pleroma Captcha API endpoint 2020-07-29 16:07:22 -05:00
Alex Gleason 702f0fb822
Merge remote-tracking branch 'upstream/develop' into mrf-silence 2020-07-29 13:01:16 -05:00
Alex Gleason 93638935d7
SimpleMRF: :silence --> :followers_only 2020-07-29 12:58:08 -05:00
Alex Gleason d8a01c9432
Merge remote-tracking branch 'upstream/develop' into hide-reactions 2020-07-29 12:43:39 -05:00
lain dc36d6e9d2 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into frontend-bundles-admin 2020-07-29 16:24:22 +02:00
lain a6d3bb5f30 Merge branch 'issue/1023' into 'develop' 
[#1023] added generated  `pleroma.env`

See merge request pleroma/pleroma!2763
 2020-07-29 13:45:15 +00:00
lain d9bf2c58df Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into 1993-confirm-users-on-registration 2020-07-29 14:42:09 +02:00
Haelwenn 269b61a240 Merge branch '1996-dont-break-on-chatmessages' into 'develop' 
EnsureRePrepended: Don't break on chat messages.

Closes #1996

See merge request pleroma/pleroma!2808
 2020-07-29 12:20:04 +00:00
lain de5c7e20a3 Merge branch 'bugfix/remote-user-atom' into 'develop' 
feed/user_controller: Return 404 when the user is remote

Closes #1911

See merge request pleroma/pleroma!2811
 2020-07-29 12:16:20 +00:00
Haelwenn (lanodan) Monnier 2e27847573
feed/user_controller: Return 404 when the user is remote 2020-07-29 14:02:02 +02:00
lain 79f9ddd8b7 Merge branch 'by-approval' into 'develop' 
Registrations "by approval" mode

Closes #1931

See merge request pleroma/pleroma!2757
 2020-07-29 11:27:26 +00:00
lain 66974e17a0 Endpoint: Serve a dynamically configured admin interface 2020-07-29 13:03:04 +02:00