Commit Graph

534 Commits

Author SHA1 Message Date
Mark Felder d69af7f742 Rename user.settings column
This is used exclusively by MastoFE/GlitchFE now
2020-06-30 11:50:53 -05:00
Mark Felder 69848d5c97 Rename notification "privacy_option" setting 2020-06-26 12:45:46 -05:00
Mark Felder fd5e797379 Simplify notification filtering settings further 2020-06-26 11:24:28 -05:00
Mark Felder 433c01b370 Merge branch 'develop' into refactor/notification_settings 2020-06-25 14:26:21 -05:00
lain 88ccade1cb Merge branch 'feature/admin-api-status-count-per-instance' into 'develop'
admin api status count per instance

See merge request pleroma/pleroma!2500
2020-06-24 10:42:07 +00:00
Roman Chvanikov 1471b70ef1 Merge develop 2020-06-23 20:56:55 +03:00
Alexander Strizhakov cb96c82f70
moving to mrf namespace migration fix 2020-06-23 20:28:48 +03:00
Haelwenn c7d69e9256 Merge branch 'feature/1631-redesign-mrf-configuration' into 'develop'
Moving mrf settings from instance to separate mrf group

Closes #1631

See merge request pleroma/pleroma!2320
2020-06-23 16:38:27 +00:00
rinpatch 4ec2fb967e Merge branch 'features/users-raw_bio' into 'develop'
User: Add raw_bio, storing unformatted bio

See merge request pleroma/pleroma!2326
2020-06-17 10:34:23 +00:00
Alexander Strizhakov ed189568f3
moving mrf settings from instance to separate group 2020-06-16 18:32:18 +03:00
eugenijm b15cfc3d36 Mastodon API: ensure the notification endpoint doesn't return less than the requested amount of records unless it's the last page 2020-06-14 18:27:11 +03:00
lain e1bc37d118 MigrationHelper: Move notification backfilling to own module. 2020-06-09 09:20:55 +02:00
Roman Chvanikov 604a83ae3e merge develop 2020-06-08 19:21:07 +03:00
lain 1a11f0e453 Chats: Change id to flake id. 2020-06-07 14:25:30 +02:00
Haelwenn (lanodan) Monnier e1b07402ab
User: Add raw_bio, storing unformatted bio
Related: https://git.pleroma.social/pleroma/pleroma/issues/1643
2020-06-06 16:23:16 +02:00
lain 9189b489ee Migrations: Move Notification migration code to helper 2020-06-06 15:33:02 +02:00
lain 9fa3f0b156 Notification: Change type of `type` to an enum. 2020-06-06 13:08:45 +02:00
lain a8ca030d85 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-06-05 16:53:56 +02:00
lain 00748e9650 ChatMessageReferences: Change seen -> unread 2020-06-04 17:14:42 +02:00
lain 7b79871e97 Migrations: Add chat_id, seen index to ChatMessageReferences
This ensures fast count of unseen messages
2020-06-03 14:34:33 +02:00
lain 1e9efcf7c3 Migrations: Fix migration module name 2020-06-03 14:27:54 +02:00
lain 7f5c5b11a5 Chats: Remove `unread` from the db, calculate from unseen messages. 2020-06-03 14:26:50 +02:00
lain 8edead7c1d Migration: Remove superfluous imports 2020-06-03 13:19:38 +02:00
lain 6413e06a86 Migrations: Add unique index to ChatMessageReferences. 2020-06-03 13:13:44 +02:00
lain aa22fce8f4 ChatMessageReference: Introduce and switch in chat controller. 2020-06-03 12:30:12 +02:00
lain 6cd2fa2a4c Migrations: Add a migration to backfill notification types. 2020-06-02 15:13:19 +02:00
lain 805ab86933 Notifications: Make notifications save their type. 2020-06-02 13:24:34 +02:00
Alexander Strizhakov 7e6ec778d9
exclude replies on blocked domains 2020-06-01 21:17:32 +03:00
lain af6d01ec93 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-29 12:36:17 +02:00
Mark Felder d4b20c96c4 Migrate old notification settings to new variants 2020-05-28 15:34:11 -05:00
rinpatch 91f73a7592 Merge branch 'notification-fixes' into 'develop'
Notification performance fixes

See merge request pleroma/pleroma!2595
2020-05-27 13:45:14 +00:00
lain 73f222d76a Migrations: Make user_id index on notifications better for query. 2020-05-27 12:56:15 +02:00
lain acba7043be Migrations: Add index on client_id and client_secret for apps.
Greatly speeds up app lookup.
2020-05-26 16:46:57 +02:00
Roman Chvanikov 1be6b3056e Use indexed split_part/3 to get a hostname rather than ts_ functions 2020-05-18 12:38:16 +03:00
Roman Chvanikov 8a383707ae Merge develop 2020-05-13 19:56:40 +03:00
lain dcb5cda324 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-12 13:13:43 +02:00
lain f6aa0b4a07 Migration: Fix typo 2020-05-11 22:03:29 +02:00
lain f71376e30e Migration: Enum.chunk is deprecated. 2020-05-11 22:00:01 +02:00
lain d8dd945a03 Markers migration: Fix migration for very large list of markers 2020-05-11 21:52:47 +02:00
lain c272669909 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-10 12:32:57 +02:00
rinpatch 0ad89762a1 insert skeletons migration: fix for non-local locals
Apparently some instances have local users with local ap_ids
that are marked as local: false. Needs more investigation into how
that happened.

In the meantime, the skeleton migration was patched to just ignore
all known ap ids, not just locals. Doesn't seem to slow down the migration
too much on patch.cx

Closes #1746
2020-05-09 22:07:35 +03:00
Roman Chvanikov 942093683a Merge branch 'develop' into feature/admin-api-status-count-per-instance 2020-05-09 11:31:34 +03:00
Roman Chvanikov cbe383ae83 Update stats admin endpoint 2020-05-09 11:30:37 +03:00
Roman Chvanikov 0c2b09a9ba Add migration for counter_cache table update 2020-05-08 22:08:11 +03:00
lain 7637ef4203 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-08 13:13:37 +02:00
Maksim Pechnikov b078e0567d Merge branch 'develop' into issue/1276-2 2020-05-08 08:51:09 +03:00
lain fb2d284d28 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-07 15:05:40 +02:00
Maksim 3d0c567fbc Pleroma.Web.TwitterAPI.TwoFactorAuthenticationController -> Pleroma.Web.PleromaAPI.TwoFactorAuthenticationController 2020-05-07 08:14:54 +00:00
lain 205313e541 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-06 11:44:30 +02:00
Maksim Pechnikov fb38b7339c Merge branch 'develop' into issue/1276-2 2020-05-06 05:55:39 +03:00
lain 8bed6ea922 User, Webfinger: Remove OStatus vestiges
Mainly the `magic_key` field
2020-05-05 09:25:09 +02:00
lain c40afe5ba0 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-05-04 10:43:20 +02:00
Maksim Pechnikov fe7a0d660e Merge branch 'develop' into issue/1276-2 2020-05-04 06:08:49 +03:00
rinpatch e55876409b Deactivate local users on deletion instead of deleting the record
Prevents the possibility of re-registration, which allowed to read
DMs of the deleted account.

Also includes a migration that tries to find any already deleted
accounts and insert skeletons for them.

Closes pleroma/pleroma#1687
2020-05-02 19:05:13 +03:00
Maksim Pechnikov a92c713d9c Merge branch 'develop' into issue/1276-2 2020-05-01 06:21:59 +03:00
lain 139b9d1338 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-20 12:37:17 +02:00
Haelwenn 79445ae5d2 Merge branch 'bugfix/1697-user_emoji_miration' into 'develop'
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo

Closes #1697

See merge request pleroma/pleroma!2403
2020-04-18 06:59:23 +00:00
Haelwenn d698ecef9b Apply suggestion to priv/repo/migrations/20200406100225_users_add_emoji.exs 2020-04-17 22:48:40 +00:00
Haelwenn (lanodan) Monnier eb61564005
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering, electric bongaloo 2020-04-17 23:57:22 +02:00
lain 8c2c325598 Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-17 15:51:24 +02:00
rinpatch 6936854878 Merge branch 'bugfix/1695-user_emoji_miration' into 'develop'
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering

Closes #1695

See merge request pleroma/pleroma!2398
2020-04-17 13:40:25 +00:00
Haelwenn (lanodan) Monnier 46f051048f
migrations/20200406100225_users_add_emoji: Fix tag to Emoji filtering 2020-04-17 14:32:15 +02:00
Haelwenn a17bfb5fab Merge branch 'feature/1584-client-captcha-options' into 'develop'
Creating trusted app from adminFE & mix task

Closes #1584

See merge request pleroma/pleroma!2252
2020-04-17 09:19:35 +00:00
rinpatch 942d7467ca Merge branch 'develop' into features/remove-user-source_data 2020-04-16 21:28:52 +03:00
Maksim Pechnikov 4b3b1fec4e added an endpoint for getting unread notification count 2020-04-15 21:19:43 +03:00
lain 44bfb491ea Merge branch 'develop' of git.pleroma.social:pleroma/pleroma into remake-remodel-dms 2020-04-15 14:41:43 +02:00
lain 4576520461 Revert "Merge branch 'issue/1276' into 'develop'"
This reverts merge request !1877
2020-04-14 16:32:22 +00:00
lain 7c060432fc Revert "Merge branch 'marker-update-fix' into 'develop'"
This reverts merge request !2380
2020-04-14 16:31:30 +00:00
lain d8b12ffd59 Marker update migration: Don't try to update virtual field. 2020-04-14 15:06:09 +02:00
Maksim Pechnikov a16b3dbcbf Merge branch 'develop' into issue/1276 2020-04-13 21:19:27 +03:00
Ivan Tashkinov a21baf89d8 Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses 2020-04-13 09:16:51 +03:00
rinpatch 5e365448f3 Merge branch 'following-relationships-optimizations' into 'develop'
FollowingRelationship storage & performance optimizations

See merge request pleroma/pleroma!2332
2020-04-11 19:46:04 +00:00
Maksim Pechnikov ad92cef844 fix Oban migration 2020-04-10 21:27:50 +03:00
Haelwenn (lanodan) Monnier e89078ac2a
User: remove source_data 2020-04-10 06:20:03 +02:00
Haelwenn (lanodan) Monnier 9172d719cc
profile emojis in User.emoji instead of source_data 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier 62656ab259
User: Move inbox & shared_inbox to own fields 2020-04-10 06:20:02 +02:00
Haelwenn (lanodan) Monnier 19eedb3d04
User: Move public_key from source_data to own field 2020-04-10 06:16:18 +02:00
lain fd97b0e634 Chats: Basic implementation. 2020-04-02 15:19:09 +02:00
Maksim Pechnikov dbcfac11b4 Merge branch 'develop' into issue/1276 2020-04-02 14:47:17 +03:00
Maksim Pechnikov 591f7015d9 update Oban package 2020-04-02 09:34:11 +03:00
Ivan Tashkinov 98b96e45ab Merge remote-tracking branch 'remotes/origin/develop' into output-of-relationships-in-statuses
# Conflicts:
#	CHANGELOG.md
2020-04-01 20:08:14 +03:00
Ivan Tashkinov 2f2bd7fe72 Ability to control the output of account/pleroma/relationship in statuses in order to improve the rendering performance.
See `[:extensions, output_relationships_in_statuses_by_default]` setting and `with_relationships` param.
2020-04-01 19:49:09 +03:00
Ivan Tashkinov ea9c57b26e [#2332] Misc. improvements per code change requests. 2020-03-31 09:21:42 +03:00
Ivan Tashkinov 9c94b6a327 [#2332] Misc. fixes per code change requests. 2020-03-30 19:08:37 +03:00
Maksim Pechnikov dfd2c74184 Merge branch 'develop' into issue/1276 2020-03-29 06:57:34 +03:00
Ivan Tashkinov be9d18461a FollowingRelationship storage & performance optimizations (state turned `ecto_enum`-driven integer, reorganized indices etc.). 2020-03-28 18:49:03 +03:00
lain 0adaab8e75 Bump copyright dates. 2020-03-26 15:37:42 +01:00
Alexander Strizhakov a6ee6784bc
creating trusted app from adminFE & mix task 2020-03-23 10:44:47 +03:00
Alexander Strizhakov f0651730bd
Merge branch 'develop' into gun 2020-03-16 14:25:55 +03:00
rinpatch e87a32bcd7 rip out fetch_initial_posts
Every time someone tries to use it, it goes mad and tries to scrape the
entire fediverse for no visible reason, it's better to just remove it
than continue shipping it in it's current state.

idea acked by lain and feld on irc

Closes #1595 #1422
2020-03-15 15:59:17 +03:00
Alexander Strizhakov d9f8941dac
Merge branch 'develop' into gun 2020-03-09 10:56:33 +03:00
rinpatch 6cf1958b02 moderation log: fix improperly migrated data
Some of the actions used to have a user map as a subject, which was then
changed to an array of user maps. However instead of migrating old data
there was just a hack to transform it every time, moreover this hack
didn't include all possible actions, which resulted in crashes. This
commit fixes the crashes by introducing a proper database migration for old data.

Closes #1606
2020-03-07 17:00:58 +03:00
Alexander Strizhakov 22d52f5691
same copyright date format 2020-03-04 09:41:23 +03:00
Maksim Pechnikov 10f452ad1f Merge branch 'develop' into issue/1276 2020-02-25 07:22:56 +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 2d5cf0f8cd Migrations: Make them not fail for old databases 2020-02-20 16:44:31 +01:00
Maksim Pechnikov cd040691bd maked `unread_count` as virtual field 2020-02-10 09:01:45 +03:00
Maksim Pechnikov e442ea5722 Merge branch 'develop' into issue/1276 2020-01-27 15:20:47 +03:00
Ivan Tashkinov 6c94b7498b [#1478] OAuth admin tweaks: enforced OAuth admin scopes usage by default, migrated existing OAuth records. Adjusted tests. 2020-01-10 10:52:21 +03:00
Maxim Filippov 3ecf131511 Merge branch 'develop' into feature/report-notes 2019-12-12 02:16:23 +03:00
Hakaba Hitoyo 701815e64c [ActivityPub] Configurable ActivityPub actor type 2019-12-10 13:19:26 +00:00
Maksim Pechnikov 6fbafb1cdc Merge branch 'develop' into issue/1276 2019-12-08 20:14:28 +03:00
Maksim Pechnikov 49bb0a130f Merge branch 'develop' into issue/1276 2019-12-05 12:22:19 +03:00
Ivan Tashkinov 30caf3e51e Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
#	lib/pleroma/user.ex
2019-12-04 18:56:31 +03:00
Maxim Filippov 4b60d41db9 Add report notes 2019-12-04 00:26:37 +09:00
lain 7722e5a67a Merge branch 'feature/move-activity' into 'develop'
Support "Move" activity

Closes #1316

See merge request pleroma/pleroma!1883
2019-12-02 16:26:19 +00:00
rinpatch 0d24ab04c5 Merge branch 'remove-info-from-users' into 'develop'
Removed users.info field

See merge request pleroma/pleroma!2006
2019-11-30 10:42:51 +00:00
Ivan Tashkinov 52cc7de82c Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
#	mix.lock
2019-11-29 10:17:59 +03:00
lain f0bdbe3f61 Migrations: Set users.following_count to NOT NULL
Also set following_count for local users to the correct value and for remote
users to 0.
2019-11-28 17:01:43 +01:00
Ivan Tashkinov 1636cc5b7e Removed users.info and remaining usages. 2019-11-23 14:06:19 +03:00
Ivan Tashkinov cad9b325e5 Merge remote-tracking branch 'remotes/upstream/develop' into 1335-user-api-id-fields-relations
# Conflicts:
#	lib/pleroma/user/search.ex
#	test/user_test.exs
2019-11-21 16:47:52 +03:00
Ivan Tashkinov de892d2fe1 [#1335] Reorganized users.subscribers as UserRelationship. Added tests for UserRelationship-related functionality. 2019-11-20 15:46:11 +03:00
Ivan Tashkinov aad6576130 [#1335] Refactored UserMute and UserBlock into UserRelationship, introduced EctoEnum. 2019-11-18 20:38:56 +03:00
Ivan Tashkinov c31ddce51e [#1335] Reorganized `users.mutes` as relation to UserMute entity. 2019-11-15 21:38:54 +03:00
Egor Kislitsyn 3c0abfca53
Merge remote-tracking branch 'upstream/develop' into feature/move-activity 2019-11-14 16:39:45 +07:00
Egor Kislitsyn e6d7e27bd6
Add `allow_following_move` setting to User 2019-11-12 18:45:28 +07:00
Ivan Tashkinov 3db988250b [#1335] User: refactored :blocks field into :blocked_users relation.
Introduced UserBlock.
2019-11-10 16:30:21 +03:00
Maksim Pechnikov 4b7c11e3f9 excluded invisible actors from gets /api/v1/accounts/:id 2019-11-04 20:44:24 +03:00
Maksim Pechnikov ff6c727739 Merge branch 'develop' into issue/1276 2019-11-04 20:24:53 +03:00
Maksim Pechnikov 57995fa8cf fix migrate
update migrate
2019-11-03 20:44:59 +03:00
Haelwenn 9d8da9ea15 Merge branch 'fix/migration-schema' into 'develop'
Fix bookmark migration using a query with a schema

See merge request pleroma/pleroma!1923
2019-11-02 15:07:47 +00:00
Maksim Pechnikov fd8099fb68 Merge branch 'develop' into issue/1276 2019-10-31 21:09:46 +03:00
lain e14cae25aa Merge branch 'refactor/db-add-defaults' into 'develop'
Set defaults to fields with NULL values

Closes #1358

See merge request pleroma/pleroma!1914
2019-10-31 13:34:57 +00:00
Maksim Pechnikov 1b82eb6d41 move sql (update_markers) from migrate to mix task 2019-10-30 23:22:38 +03:00
Maksim Pechnikov d719078699 Merge branch 'develop' into issue/1276 2019-10-30 23:07:18 +03:00
Roman Chvanikov 8bb6da7cd6 Remove following column from the migrations 2019-10-30 18:34:14 +03:00
rinpatch c546da7cfe Fix bookmark migration using a query with a schema
This resulted in failures when updating from Pleroma <1.0 because of all
the new fields that were added to the user schema.
2019-10-30 12:59:14 +03:00
Egor Kislitsyn 40d5fb6ef8
Add a migration to fix blocked follows 2019-10-30 15:52:37 +07:00
Maksim Pechnikov b27a92e8fa Merge branch 'develop' into issue/1276 2019-10-29 22:23:19 +03:00
rinpatch 3e09b7c5ae Fix two migrations sharing the same module name
This makes ecto execute only the latter one.
2019-10-29 16:56:24 +03:00
kPherox 5334190056
Migrate missing follow requests 2019-10-29 19:22:34 +09:00
Roman Chvanikov 435d220700 Move setDefaultsToTables to past to run before notNull migrations 2019-10-28 19:17:50 +03:00
Roman Chvanikov 4b0893631f Complete defaults 2019-10-28 19:16:19 +03:00
Egor Kislitsyn 4270861085
Merge branch 'develop' into feature/move-activity 2019-10-28 15:10:47 +07:00
Egor Kislitsyn 3c86a0ab24
Fix `SetNotNullForUsers` migration 2019-10-28 14:45:50 +07:00
lain 2480200759 Merge branch 'refactor/following-relationships' into 'develop'
Move following relationships to a separate table

Closes #1233

See merge request pleroma/pleroma!1814
2019-10-28 07:27:45 +00:00
Roman Chvanikov 0be9cb086b Add migration 2019-10-27 19:29:35 +03:00
kaniini 060adfd762 Merge branch 'improve-user-info-migration' into 'develop'
User info migration improvements

See merge request pleroma/pleroma!1887
2019-10-27 05:33:41 +00:00
kaniini fbadd36cc0 Merge branch 'refactor/db-not-null-constraints-for-users' into 'develop'
Add NOT NULL constraints for users table

See merge request pleroma/pleroma!1910
2019-10-27 05:32:01 +00:00
kaniini a9cadf3905 Merge branch 'refactor/db-not-null-constraints-for-user_invite_tokens' into 'develop'
Add NOT NULL constraints for user_invite_tokens table

See merge request pleroma/pleroma!1909
2019-10-27 05:31:52 +00:00
kaniini 4a72d39ca6 Merge branch 'refactor/db-not-null-constraints-for-thread_mutes' into 'develop'
Add NOT NULL constraints for thread_mutes table

See merge request pleroma/pleroma!1908
2019-10-27 05:31:41 +00:00
kaniini e94144669a Merge branch 'refactor/db-not-null-constraints-for-scheduled_activities' into 'develop'
Add NOT NULL constraints for scheduled_activities table

See merge request pleroma/pleroma!1907
2019-10-27 05:31:31 +00:00
kaniini 9e084771c6 Merge branch 'refactor/db-not-null-constraints-for-registrations' into 'develop'
Add NOT NULL constraints for registrations table

See merge request pleroma/pleroma!1906
2019-10-27 05:31:21 +00:00
kaniini 3ac6160299 Merge branch 'refactor/db-not-null-constraints-for-push_subscriptions' into 'develop'
Add NOT NULL constraints for push_subscriptions table

See merge request pleroma/pleroma!1905
2019-10-27 05:31:09 +00:00
kaniini 26daaa9f04 Merge branch 'refactor/db-not-null-constraints-for-password_reset_tokens' into 'develop'
Add NOT NULL constraints for password_reset_tokens table

See merge request pleroma/pleroma!1904
2019-10-27 05:30:59 +00:00
kaniini 1fc591fcfc Merge branch 'refactor/db-not-null-constraints-for-objects' into 'develop'
Add NOT NULL constraints for objects table

See merge request pleroma/pleroma!1903
2019-10-27 05:30:47 +00:00
kaniini 8b204b4d71 Merge branch 'refactor/db-not-null-constraints-for-oauth_authorizations' into 'develop'
Add NOT NULL constraints for oauth_authorizations table

See merge request pleroma/pleroma!1902
2019-10-27 05:30:36 +00:00
kaniini fe97493d91 Merge branch 'refactor/db-not-null-constraints-for-oauth_tokens' into 'develop'
Add NOT NULL constraints for oauth_tokens table

See merge request pleroma/pleroma!1901
2019-10-27 05:30:25 +00:00
kaniini 84e992d85b Merge branch 'refactor/db-not-null-constraints-for-notifications' into 'develop'
Add NOT NULL constraints for notifications table

See merge request pleroma/pleroma!1900
2019-10-27 05:30:09 +00:00
kaniini 19a625459b Merge branch 'refactor/db-not-null-constraints-for-moderation_log' into 'develop'
Add NOT NULL constraints for moderation_log table

See merge request pleroma/pleroma!1899
2019-10-27 05:29:56 +00:00