Bart Schuurmans
4f58b11330
Include the correct protocol and port in remote IDs
2024-04-24 15:35:19 +02:00
Bart Schuurmans
c42db40a63
Construct absolute URLs with the correct protocol and port
2024-04-24 15:30:47 +02:00
Bart Schuurmans
3aefbb548e
Allow serving BookWyrm on a non-standard port
2024-04-24 15:30:47 +02:00
Bart Schuurmans
839ab2fafd
Merge branch 'main' into move-fix
2024-04-24 14:56:32 +02:00
Hugh Rundle
6684d60526
refactor Move for more redundancy
...
As outlined in #3354 , a use `Move` fails if the user is moving from a BookWyrm server to another BookWrym server.
This is because:
1. the original code did not announce changes to alsoKnownAs;
2. the original code always checked the locally saved profile rather than refetching the remote data;
This commit fixes both these problems by forcing `MoveUser` to always perform a "refresh" of the local data from the remote, and by saving the user with broadcast=True when updating alsoKnownAs ids.
2024-04-22 13:35:08 +10:00
Adeodato Simó
8733369605
test_quotation_page_serialization: add test with no position
2024-04-13 21:26:41 -03:00
Adeodato Simó
df78cc64a6
Quotation._format_position: do not treat page numbers as integers
...
Fixes : #3352
2024-04-13 21:26:41 -03:00
Hugh Rundle
d48d312c0a
Merge branch 'main' into user-export
2024-04-13 12:26:13 +10:00
Hugh Rundle
501fb45528
export avatars to own directory
...
Saving avatars to /images is problematic because it changes the original filepath from avatars/filename to images/avatars/filename.
In this PR prior to this commit, imports failed as they are looking for a file path beginning with "avatar"
2024-04-13 12:03:35 +10:00
Mouse Reeve
73630331d1
Merge pull request #3299 from Minnozz/absorb
...
Track which Author/Work/Edition a duplicate has been merged into
2024-04-09 05:55:44 -05:00
Bart Schuurmans
464a0298c6
Add index for finding active (and local) users
2024-04-03 21:27:52 +02:00
Bart Schuurmans
0501ce39cd
Add index for looking up User by username
2024-04-03 21:15:24 +02:00
Bart Schuurmans
4d5a30d953
Add index for looking up KeyPair by remote id
2024-04-03 21:11:27 +02:00
Bart Schuurmans
5cfe7eca6f
Add index for finding all statuses in a thread
2024-04-03 21:11:09 +02:00
Bart Schuurmans
4bbdd0b2d0
Add index on Status.remote_id
...
This field is often used in WHERE-clauses in queries that are very slow on bookwyrm.social.
2024-04-02 21:54:30 +02:00
Bart Schuurmans
0ac9d12d1c
Merge branch 'main' into user-export
2024-03-29 14:23:10 +01:00
Bart Schuurmans
dabf7c6e10
User export testing fixes
2024-03-28 13:09:21 +01:00
Bart Schuurmans
cdbc1d172c
Fix double exports subdir in S3 user export
2024-03-27 23:28:24 +01:00
Bart Schuurmans
797d5cb508
Update BookwyrmExportJob tests
2024-03-27 20:39:57 +01:00
Adeodato Simó
699d637bae
Fix detection of unlisted posts ( #3258 )
...
Merged from dato/fix_unlisted_set_from_activity.
2024-03-27 16:29:09 -03:00
Bart Schuurmans
9685ae5a0a
Consolidate BookwyrmExportJob into two tasks
...
Creating the export JSON and export TAR are now the only two tasks.
2024-03-27 20:13:49 +01:00
Bart Schuurmans
145c67dd21
Merge BookwyrmExportJob export_data field back into one with dynamic storage backend
2024-03-26 13:41:39 +01:00
Bart Schuurmans
6a67943408
Merge branch 'main' into user-export
2024-03-26 13:15:40 +01:00
Bart Schuurmans
d9bf848cfa
Fix pylint warnings
2024-03-25 18:25:43 +01:00
Bart Schuurmans
a51402241b
Refactor creation of user export archive
2024-03-25 18:14:45 +01:00
Bart Schuurmans
e0decbfd1d
Fix urlescaped relative path to cover image in export
...
Fixes #3292
2024-03-25 17:59:39 +01:00
Bart Schuurmans
471233c1dc
Use different export job fields for the different storage backends
...
This way, the database definition is not depdendent on the runtime configuration.
2024-03-24 12:46:42 +01:00
Bart Schuurmans
4a690e675a
BookDataModel: add dry_run argument to merge_into
2024-03-23 19:28:57 +01:00
Bart Schuurmans
6f191acb27
BookDataModel: fix absorbing data from array and partial date fields
2024-03-23 19:28:57 +01:00
Bart Schuurmans
7066e2815b
BookDataModel.merge_into: return and log absorbed fields
2024-03-23 19:28:57 +01:00
Bart Schuurmans
5e123972e8
BookDataModel: implement merge_into method
2024-03-23 19:28:57 +01:00
Bart Schuurmans
b3753ab6da
Add MergedBookDataModel
2024-03-23 19:28:57 +01:00
Bart Schuurmans
0795b4d171
Include Author aliases in Book search vector
2024-03-23 19:26:51 +01:00
Bart Schuurmans
2de35f3fc7
Calculate Author search vector with name and aliases
2024-03-23 19:26:51 +01:00
Mouse Reeve
5b71e94888
Merge branch 'main' into user-export
2024-03-23 07:55:46 -07:00
Adeodato Simó
518da3b9cf
Merge from main into 'user-export'
...
Conflicts:
bookwyrm/models/bookwyrm_export_job.py
requirements.txt
2024-03-18 14:47:34 -03:00
Adeodato Simó
cceccd1ecf
Merge from main into 'trigger_migrations'
...
Conflicts:
requirements.txt
2024-03-17 21:54:15 -03:00
Adeodato Simó
09c3d9c0dc
json_export: also detect absent "icon" key
2024-03-03 18:42:27 -03:00
Mouse Reeve
dd9d68c97d
Merge pull request #3096 from bookwyrm-social/image-ap-serialization
...
Changes to how images are serialized
2024-03-02 18:58:08 -08:00
Mouse Reeve
f7580c59a5
Merge branch 'main' into check-version-number
2024-02-03 08:19:46 -08:00
Mouse Reeve
48f8ee57a6
Merge branch 'main' into check-version-number
2024-02-03 08:02:15 -08:00
Mouse Reeve
faf45cf956
Merge pull request #3273 from bookwyrm-social/WesleyAC-freeform-page-number
...
Allow page numbers to be text, instead of integers
2024-02-03 08:00:34 -08:00
Mouse Reeve
37aa7ad2f6
Merge branch 'freeform-page-number' of github.com:WesleyAC/bookwyrm into WesleyAC-freeform-page-number
2024-02-03 07:38:02 -08:00
Mouse Reeve
e0667c6a03
Merge pull request #3237 from Minnozz/status-title-description
...
Improve OpenGraph tags for status and book pages
2024-02-03 07:37:00 -08:00
Hugh Rundle
5f7be848fc
subclass boto3 session instead of adding new env value
...
Thanks Dato!
2024-01-29 14:10:36 +11:00
Adeodato Simó
c106b2a988
Subclass boto3.Session to use AWS_S3_ENDPOINT_URL
...
As of 0.1.13, the s3-tar library uses an environment variable
(`S3_ENDPOINT_URL`) to determine the AWS endpoint. See:
https://github.com/xtream1101/s3-tar/blob/0.1.13/s3_tar/utils.py#L25-L29 .
To save BookWyrm admins from having to set it (e.g., through `.env`)
when they are already setting `AWS_S3_ENDPOINT_URL`, we create a Session
class that unconditionally uses that URL, and feed it to S3Tar.
2024-01-28 22:21:44 -03:00
Hugh Rundle
2c231acebe
linting and tests
2024-01-28 20:35:47 +11:00
Hugh Rundle
a3e05254b5
fix avatar import path
2024-01-28 15:56:44 +11:00
Hugh Rundle
582e97e4a5
Merge branch 'image-serialize' into user-export
...
pulls Mouse's fix for imagefile serialization
2024-01-28 15:12:15 +11:00
Hugh Rundle
2bb9a85591
various fixes
...
- use signed url for s3 downloads
- re-arrange tar.gz file to match original
- delete all working files after tarring
- import from s3 export
TODO
- check local export and import
- fix error when avatar missing
- deal with multiple s3 storage options (e.g. Azure)
2024-01-28 15:07:55 +11:00
