8834 commits

This branch

This branch

All branches

Author	SHA1	Message	Date
Hugh Rundle	53e410627f	fix migrations and linting	2023-11-14 07:17:11 +11:00
Hugh Rundle	cc8e79f804	Merge remote-tracking branch 'bookwyrm/user-migration' into user-migration	2023-11-13 21:23:01 +11:00
Hugh Rundle	d5762f1d52	Merge branch 'main' into user-migration	2023-11-13 21:17:07 +11:00
Hugh Rundle	891b72c79c	update user export file to use ActivityPub objects where possible. (#3109) ... * add more context to user export page * fix BookData fields wrong for files * use to_activity and to_model where possible * fixes for import and export - use AP JSON where possible - minor template wording updates * import fixes and updates tests * minor cleanup * remove todo for mastodon	2023-11-13 21:14:03 +11:00
Hugh Rundle	c31ee02e2b	Merge remote-tracking branch 'origin/user-migration' into user-migration ... idk what is going on here	2023-11-13 21:04:26 +11:00
Hugh Rundle	948336a8fa	Merge remote-tracking branch 'bookwyrm/user-migration' into user-migration	2023-11-13 21:00:10 +11:00
Hugh Rundle	acb385507a	Merge pull request #1 from hughrun/export-as-ap ... initial work to use AP json for user export/import	2023-11-13 20:57:22 +11:00
Hugh Rundle	afd0bbdae6	remove todo for mastodon	2023-11-13 20:55:42 +11:00
Hugh Rundle	c3a9d618a3	minor cleanup	2023-11-13 20:15:37 +11:00
Hugh Rundle	cd7ac52339	import fixes and updates tests ... lots of fixes to the tests and the export and import functions Also updates the test data for imports	2023-11-13 20:13:01 +11:00
Mouse Reeve	ddf94f8714	Merge pull request #3097 from Tak/fix-initdb ... Fix `bw-dev initdb`	2023-11-12 09:37:42 -08:00
Mouse Reeve	43324cf43a	Merge pull request #3099 from dato/notification_type_top_level ... Create NotificationType as class, not through API	2023-11-12 09:34:28 -08:00
Hugh Rundle	8d52fa92b2	fixes for import and export ... - use AP JSON where possible - minor template wording updates	2023-11-12 16:16:34 +11:00
Hugh Rundle	7f654be927	use to_activity and to_model where possible ... Currently getting errors on import for BookData objects when creating a new instance	2023-11-11 11:41:45 +11:00
Adeodato Simó	99a9dbe5f4	Create NotificationType as class, not through API ... This way, we need not list every value again to create the enum. N.B.: enum values are now accessed as `models.NotificationType.FOO`, instead of `models.Notification.FOO`.	2023-11-09 22:43:36 -03:00
Levi Bard	ebcacfc6c5	Fix bw-dev initdb	2023-11-09 12:57:45 +01:00
Hugh Rundle	c5482cb66d	use ap models in export and import ... - more testing needed.	2023-11-09 21:23:51 +11:00
Mouse Reeve	774b1095a3	Merge pull request #3094 from hughrun/activitypub-files ... fix missing types in `BookData` file fields	2023-11-08 15:27:40 -08:00
Hugh Rundle	2248206a66	fix missing types in BookData file fields ... activitypub.BookData includes fields for 'files' and 'fileLinks'. This is a problem because BookData is inherited by Book and Author, neither of which have 'files' as a field in the main model. Additionally, Author doesn't have a value for 'file_links'. When serializing to JSON, BookData therefore throws 'TypeError: Object of type _MISSING_TYPE is not JSON serializable' This fixes the problem by removing links and moving fileLinks to activitypub.Book.	2023-11-08 18:30:49 +11:00
Hugh Rundle	042d16b360	fix BookData fields wrong for files ... BookData is inherited by Book and Author Authors do not have a file_links value, and neither of them have a files value. This commit moves 'fileLinks' down to activitypub.Book (inherited in turn by Edition), and removes 'files'	2023-11-08 18:26:38 +11:00
Hugh Rundle	0b3b5e4c3d	initial work to use AP json for user export/import	2023-11-07 15:35:58 +11:00
Hugh Rundle	0a5e1048ce	Add more info to user export page (#3093) ... - match page title to menu - change description on IMPORT page from 'readthroughs' to 'reading history' - provide more information on export page about what is and is not included.	2023-11-07 12:09:06 +11:00
Hugh Rundle	030e905d43	oops put back download block text	2023-11-07 12:05:54 +11:00
Hugh Rundle	05e7a363e2	minor wording tweak	2023-11-07 12:02:58 +11:00
Hugh Rundle	11b99b513d	Merge remote-tracking branch 'bookwyrm/user-migration' into hughrun/user-migration	2023-11-07 12:02:14 +11:00
Hugh Rundle	d766607247	add more context to user export page ... - match page title to menu - change description on IMPORT page from 'readthroughs' to 'reading history' - provide more information on export page about what is and is not included.	2023-11-07 11:46:50 +11:00
Mouse Reeve	9ddd631549	Merge pull request #3089 from bookwyrm-social/notification-and-download-links ... UI changes for notification and download link in import/export flow	2023-11-06 16:31:09 -08:00
Mouse Reeve	1b958a9b31	Merge pull request #3091 from hughrun/notification-and-download-links ... show filesize on user downloads page	2023-11-06 16:27:14 -08:00
Hugh Rundle	282f7dd8d6	show filesize on user downloads page ... - add column to user download page to display filesize - adds a filter to display file sizes - don't download the user downloads page from notifications ;)	2023-11-07 11:04:11 +11:00
Mouse Reeve	e152b625fa	Merge pull request #3090 from bookwyrm-social/user-migration-instructions ... User migration instructions	2023-11-06 14:34:52 -08:00
Mouse Reeve	ee88c3b914	Merge pull request #3081 from bookwyrm-social/handle-isbn-error ... Fix error produced when an unexpected ISBN format is used	2023-11-06 11:06:46 -08:00
Mouse Reeve	8663e204c7	Merge pull request #3079 from bookwyrm-social/deleted_user_follow_request ... Don't show notification for user follow request if the user is inactive	2023-11-06 11:05:50 -08:00
Mouse Reeve	e7a1572450	Merge pull request #3086 from bookwyrm-social/user-deletion ... Erase user data and statuses on account deletion	2023-11-06 09:49:06 -08:00
Mouse Reeve	3f038b4d67	Moves if to the right place	2023-11-06 09:42:58 -08:00
Mouse Reeve	06d822d9e0	Alternative format for user import guide	2023-11-06 09:35:04 -08:00
Mouse Reeve	85d1760b97	Changes recent exports table ... I thought both dates seemed less necessary (happy to be told otherwise) and the download link should be more explicit	2023-11-06 08:41:36 -08:00
Mouse Reeve	716e64de68	Changes notification links for user import/export ... I found it unexpected that the export notification linked me directly to the file, and wanted the import link to lead me to the import page	2023-11-06 08:27:30 -08:00
Hugh Rundle	15b7b7eaa7	Merge pull request #3088 from hughrun/user-migration ... User migration fixes	2023-11-06 16:06:39 +11:00
Hugh Rundle	d34b70cb7b	remove pointless viewer_aware	2023-11-06 16:01:34 +11:00
Mouse Reeve	ee6e3ed7eb	Adds a database field for is_deleted on user	2023-11-05 20:28:23 -08:00
Hugh Rundle	2d185dfb8a	remove unnecessary test data files	2023-11-06 14:51:52 +11:00
Mouse Reeve	27d99a0094	Removes failsafe that was overzealous	2023-11-05 19:47:32 -08:00
Hugh Rundle	93a32f4e15	update import/export user templates ... - always explain what export file can be used for - provide more information about overwrite vs upsert when importing	2023-11-06 14:40:19 +11:00
Hugh Rundle	8d3c2d9bd2	Merge pull request #3085 from bookwyrm-social/migration-explicit-imports ... Uses explicit imports to avoid circular import in migrations code	2023-11-06 12:11:59 +11:00
Hugh Rundle	7a6b60772c	Merge pull request #3087 from hughrun/migration-explicit-imports ... update references to bookwyrm models in export job	2023-11-06 12:10:47 +11:00
Hugh Rundle	d2f06e804f	update references to bookwyrm models in export job	2023-11-06 12:07:40 +11:00
Hugh Rundle	a93519ec3e	Merge pull request #3027 from dato/find_links_wrapped_punct ... Fix parsing of punctuation in format_links() fixes #2993 fixes #3049	2023-11-06 09:42:57 +11:00
Hugh Rundle	1190ea7e69	Merge pull request #3078 from bookwyrm-social/tour-fixes ... Update tour to reflect changes in #2201	2023-11-06 09:20:44 +11:00
Mouse Reeve	c17a2ec55b	Creates snippet for user tag in admin view ... The existing display wasn't showing the correct colors and was repeating code unnecessarily	2023-11-05 10:18:04 -08:00
Mouse Reeve	d3668e413d	Removes updates fields that was causing problems	2023-11-05 09:59:49 -08:00