Commit graph

388 commits

Author SHA1 Message Date
Mouse Reeve
5ebe1aa7c7 Fixes error handling for book button filters 2020-03-27 09:37:11 -07:00
Mouse Reeve
09f030db88 Stylistic changes for goodreads import 2020-03-27 09:33:31 -07:00
Mouse Reeve
d41a420355 Move import books link to user pulldown 2020-03-27 09:27:57 -07:00
Mouse Reeve
c87f25f072 Quick fix for error when books are on 2+ shelves 2020-03-27 09:26:27 -07:00
Mouse Reeve
072e8fe02a
Merge pull request #96 from cthulahoops/goodreads_import
Goodreads import
2020-03-27 09:10:00 -07:00
Mouse Reeve
7be17ea09c
Merge pull request #102 from cthulahoops/shelf_button_user
Show shelf buttons appropriate for current user.
2020-03-27 08:57:17 -07:00
Adam Kelly
5945ddcd75 Add shelve button to the book page. 2020-03-27 15:36:57 +00:00
Adam Kelly
f40105990a Hide broken 'Your shelves' when not logged in. 2020-03-27 15:15:54 +00:00
Adam Kelly
2ebc758dae Get discover books to work while not logged in. 2020-03-27 15:15:54 +00:00
Adam Kelly
b58a362df2 Get book page to work while not logged in. 2020-03-27 15:15:54 +00:00
Adam Kelly
778ce91f91 Show shelf buttons appropriate for current user. 2020-03-27 14:50:38 +00:00
Adam Kelly
7d837ad344 Show up to three mentioned books with a status. 2020-03-25 14:34:02 +00:00
Adam Kelly
8bf3225fc4 Generated import status rather than individual statuses. 2020-03-25 14:15:28 +00:00
Adam Kelly
323c7f8dbf Shelve the books. 2020-03-25 14:15:28 +00:00
Adam Kelly
ce446d57fc Handle uploaded CSV and match to openlibrary titles. 2020-03-25 14:15:28 +00:00
Adam Kelly
2188371f44 Display results of import. 2020-03-25 14:15:28 +00:00
Adam Kelly
8fb082e2fc Add useful reprs to books & search results for debugging. 2020-03-25 14:15:28 +00:00
Adam Kelly
03a71b1c37 Process upload and create books. 2020-03-25 14:15:28 +00:00
Adam Kelly
8bcd3da25e Add a form to upload goodreads data. 2020-03-23 16:40:52 +00:00
Mouse Reeve
b97006d43c Adds celery broker to settings 2020-03-22 17:13:52 -07:00
Mouse Reeve
ea735fd570 Quotes around titles in shelve notifications 2020-03-22 15:28:56 -07:00
Mouse Reeve
dd18433faa Adds celery and rabbitmq 2020-03-22 14:34:44 -07:00
Mouse Reeve
6aad1c9250 Dockerize app 2020-03-22 11:21:19 -07:00
Mouse Reeve
eac8f2a2f9 Include register form in return login page
in case of wrong password
2020-03-22 11:20:36 -07:00
Mouse Reeve
3a0a87bee0 Fixes background on search icon 2020-03-22 09:30:08 -07:00
Mouse Reeve
7862af9729 Adds commenting
works on #59
2020-03-21 16:50:49 -07:00
Mouse Reeve
3f96c8cd9d remove fetch polyfill
I should have this, but I'll deal with it later
2020-03-21 15:56:12 -07:00
Mouse Reeve
88ce5f3d1d Change active button hover color 2020-03-21 15:29:37 -07:00
Mouse Reeve
7455467c40 Unfavorite statuses 2020-03-21 15:21:27 -07:00
Mouse Reeve
e0bd8200ad (Un)follow and boost/like buttons via javascript
Works on #78
2020-03-21 14:29:39 -07:00
Mouse Reeve
1ec515034c Fixes bug in accepting unmanaged follow requests 2020-03-21 14:25:31 -07:00
Mouse Reeve
8b0d349424 Fixes z-index so all buttons work 2020-03-21 12:32:44 -07:00
Mouse Reeve
4442232096 Merge branch 'follow_requuest_button' of https://github.com/cthulahoops/fedireads into cthulahoops-follow_requuest_button 2020-03-17 12:37:26 -07:00
Mouse Reeve
90f4c9437d Fixes feed blocking shelve buttons 2020-03-17 12:28:47 -07:00
Mouse Reeve
3df88f84e7 notifications page cleanup 2020-03-16 18:05:49 -07:00
Mouse Reeve
b1ad8ba317 Placeholder discover books page 2020-03-16 17:45:57 -07:00
Mouse Reeve
c8a65ae6e1 Small fix for author page layout
still should get an overhaul
2020-03-16 17:45:57 -07:00
Mouse Reeve
ff1099d23e User shelves page 2020-03-16 17:45:57 -07:00
Mouse Reeve
e1c598b7cf Book page back to usable 2020-03-16 17:45:57 -07:00
Mouse Reeve
7e73bae07d User page redesign 2020-03-16 17:45:57 -07:00
Mouse Reeve
c41b53bdbe User page 2020-03-16 17:45:57 -07:00
Mouse Reeve
d28efe54dd Javascript boost/favorite button 2020-03-16 17:45:56 -07:00
Mouse Reeve
f084952123 Small fix to pulldown text display 2020-03-16 17:45:56 -07:00
Mouse Reeve
a57d43b0b4 No cover state for books 2020-03-16 17:45:56 -07:00
Mouse Reeve
3e0fc9a590 Redesign of interaction panel 2020-03-16 17:45:56 -07:00
Mouse Reeve
3efc8d45c3 Redesign (front page, login page) 2020-03-16 17:45:56 -07:00
Adam Kelly
7b2063a0c5 Don't display follow button for yourself. 2020-03-14 22:20:16 +00:00
Adam Kelly
ffe81291ad Use database constraint to prevent relationships with yourself. 2020-03-14 22:20:01 +00:00
Adam Kelly
8f7c5035e4 Display 'send follow request' instead of follow if user approves followers #86 2020-03-14 14:09:10 +00:00
Mouse Reeve
1cdd7ea1fc Fixes bugs in openlibrary connector 2020-03-13 21:10:53 -07:00
Mouse Reeve
4765f965cf Combine html and json views
Fixes #80
2020-03-13 17:57:36 -07:00
Mouse Reeve
8f766c7fb4 Update remote users with manual follow status 2020-03-13 16:27:58 -07:00
Mouse Reeve
762ca15dab Include manually approves followers in actor
Works on #82
2020-03-13 16:22:07 -07:00
Adam Kelly
20662a90dd Generate Reject activities.
Work on checking incoming / outgoing will work alone.
2020-03-13 17:04:39 +00:00
Adam Kelly
fa57d6cfc7 Include accept/delete buttons in notifications list. 2020-03-13 15:06:40 +00:00
Adam Kelly
0e34c74647 Show 'request already sent' while waiting for response. 2020-03-13 15:06:40 +00:00
Adam Kelly
05f5315b98 List of pending follow requests with accept/delete buttons on own profile. 2020-03-13 15:06:40 +00:00
Adam Kelly
1693473fd2 Use Enum and constraint for valid notification types. 2020-03-13 13:41:05 +00:00
Adam Kelly
6b5644ed00 Generate a notification for pending follow requests. 2020-03-13 13:41:05 +00:00
Mouse Reeve
ec45f8d565 Allow a and span tags in posts
Fixes #39
2020-03-12 17:23:55 -07:00
Mouse Reeve
a8ea3c08c9 Don't duplicate incoming statuses 2020-03-12 17:16:55 -07:00
Mouse Reeve
ee56ae86ec Finishes implementing reply activitypub json
Fixes #24
2020-03-12 16:45:18 -07:00
Mouse Reeve
1c3e0b9379 Typo fix 2020-03-11 17:44:54 -07:00
Adam Kelly
b21c5fc98f Update follow and unfollow to use UserFollowRequest & UserFollows. 2020-03-11 12:37:19 +00:00
Adam Kelly
e050704c2c Split follows, follow requests and blocks into separate tables.
As discussed in issue #82
2020-03-11 12:37:19 +00:00
Mouse Reeve
e8cfa99cd9 Highlight unread notifications 2020-03-10 13:31:57 -07:00
Mouse Reeve
3ddd4a0490 Fixes status matching for subclasses 2020-03-10 12:16:21 -07:00
Mouse Reeve
a47f573b2b Fixes storage of remote statuses 2020-03-10 12:04:38 -07:00
Mouse Reeve
3e48adad52 Get user by any username for status page 2020-03-10 11:28:11 -07:00
Mouse Reeve
7cf87be35c Status isn't just for local users 2020-03-10 11:26:45 -07:00
Mouse Reeve
67661274a6 Fixes bug in remote user absolute_id generator 2020-03-10 11:23:23 -07:00
Mouse Reeve
787aa4691d Fixes data display on shelf 2020-03-09 17:55:15 -07:00
Mouse Reeve
6546c0d8be Fixes logic in username display_full 2020-03-09 17:53:05 -07:00
Mouse Reeve
62d0d1318d Don't link out to other instances on user page 2020-03-09 17:48:48 -07:00
Mouse Reeve
3e0956d95a
Merge pull request #79 from cthulahoops/approval
Approval
2020-03-09 17:37:27 -07:00
Mouse Reeve
99a060311b Fix feed display 2020-03-09 17:27:54 -07:00
Mouse Reeve
78fa9a3a20 Don't create notification when you interact with yourself 2020-03-09 17:05:57 -07:00
Mouse Reeve
2215e0a894 Threaded-view on status pages
It's hideous though, sorry
2020-03-09 17:04:28 -07:00
Adam Kelly
43500ec478 Putting login_required on user_page breaks federation.
The inbox can't verify the signature because it can't fetch the
profile.
2020-03-09 21:27:45 +00:00
Adam Kelly
e1fa7a73cc Don't automatically accept follows if the user doesn't want to. 2020-03-09 21:16:46 +00:00
Adam Kelly
971186ef3a Add field manually_approves_followers to db. 2020-03-09 20:29:11 +00:00
Adam Kelly
c038888f63 Change url for edit_profile_page.
Fixes inaccessible edit form. /user/edit/ resolved to a user called edit
first. Also prevents a user accessing another user's edit form.
2020-03-08 16:42:06 +00:00
Adam Kelly
8618f20893 Add default author aliases as empty list.
Fixes null constraint trying to rebuilddb.
2020-03-08 16:26:42 +00:00
Mouse Reeve
f714b961f2 Adds status page
Works on #18
2020-03-07 15:28:11 -08:00
Mouse Reeve
f4008eb8c8 Adds notifications
Fixes #70
2020-03-07 14:51:04 -08:00
Mouse Reeve
95c8dc1d67 Urlencode tag names as identifiers
Fixes #37
2020-03-07 13:29:57 -08:00
Mouse Reeve
c07aa387fa Don't show duplicate reviews on book page 2020-03-07 13:21:46 -08:00
Mouse Reeve
c72bd98957 Fixes book uid helper function 2020-03-07 13:17:48 -08:00
Mouse Reeve
6f765bd6f4 Adds generalized book data connectors 2020-03-07 12:22:28 -08:00
Mouse Reeve
d501e707ee Store book data 2020-03-06 22:58:51 -08:00
Mouse Reeve
e45b04f22e Adds published date separate from created date 2020-03-06 16:35:56 -08:00
Adam Kelly
0d922dfa86 Fix user profile error if not logged in. 2020-02-24 16:38:01 +00:00
Adam Kelly
592c2b7dfd Reverse user_subject & user_object.
In the relationships table:

user_subject should be the user doing the following.
user_object should be the user who is followed.

This fixes a bug where unfollowing a user deletes the relationship in
both directions.
2020-02-24 16:10:09 +00:00
Adam Kelly
d6e48f9a21 Displaying following as well as followers on user profile. 2020-02-24 15:23:14 +00:00
Adam Kelly
8cbca4229f Add following as a related_name for followers. 2020-02-24 15:10:03 +00:00
Mouse Reeve
fc1ed99efa Move your review into your column 2020-02-23 14:57:31 -08:00
Mouse Reeve
a46193a37b Differentiate friends/local/federated reviews 2020-02-23 14:26:03 -08:00
Mouse Reeve
20522cbd11 Minor formatting changes 2020-02-23 13:24:23 -08:00
Adam Kelly
25e49d8ba2 Handle and ignore duplicate follower error. 2020-02-23 09:37:21 +00:00
Adam Kelly
e0266cb754 Add unique constraint to followers relationship. #47 2020-02-23 09:08:11 +00:00
Adam Kelly
38ec3c554b Capture parameter from username_regex. 2020-02-23 09:07:17 +00:00
Mouse Reeve
d2e51f05e8 Fixes bug in follow from user page 2020-02-22 14:27:31 -08:00
Mouse Reeve
76d2e20742 cleans up urls and views 2020-02-22 14:02:03 -08:00
Mouse Reeve
808ca0bd60 Follow button snippet 2020-02-22 12:57:13 -08:00
Adam Kelly
730c49a2b6 Always pass follow/unfollow parameter using POST.
Fixes buttons in followers list.
2020-02-22 18:00:43 +00:00
Mouse Reeve
c889fab6d1 Display correct username on shelf page 2020-02-21 16:40:49 -08:00
Mouse Reeve
78336531c9 Shelve books from anywhere you see a book 2020-02-21 16:26:52 -08:00
Mouse Reeve
6c629be667 Adds shelf page
Works on #25
2020-02-21 16:03:05 -08:00
Mouse Reeve
3eb91980e0 Cleans up feed page
Fixes #53
2020-02-21 15:39:59 -08:00
Mouse Reeve
0ce9677029 Missing csrf token on login form 2020-02-21 12:15:18 -08:00
Mouse Reeve
19109b98fa Deduplicate books on tag page 2020-02-21 09:32:24 -08:00
Mouse Reeve
cb6b98992c Get all books for tag 2020-02-21 09:15:20 -08:00
Mouse Reeve
375ff9365f Adds tag pages 2020-02-21 09:10:47 -08:00
Mouse Reeve
bc4e65ae81 Fixes incoming tagging 2020-02-20 22:37:50 -08:00
Mouse Reeve
870d0b9697 Tagging
Works on #55
2020-02-20 22:19:19 -08:00
Mouse Reeve
13b512b569 Adds model and beginning of boilerplate for tags 2020-02-20 18:01:50 -08:00
Mouse Reeve
9c645c6ab6 Fixes mistake in parent model definition 2020-02-20 17:34:05 -08:00
Mouse Reeve
cd9efe8cbf Handle alternate OL data format
Fixes #52
2020-02-19 19:03:50 -08:00
Mouse Reeve
aacba3e7cf Tidy up status display 2020-02-19 18:41:37 -08:00
Mouse Reeve
b2baa39ff2 Fixes #44 2020-02-19 18:23:46 -08:00
Mouse Reeve
ae1d6825f7 Adds css for warning message 2020-02-19 18:12:44 -08:00
Mouse Reeve
e7ae4a257b Missed a template 2020-02-19 18:04:04 -08:00
Mouse Reeve
248fe64537 Adds home/local/federated feeds to home
Fixes #38
2020-02-19 18:02:11 -08:00
tastytea
04ef8a1971
Add default colors to CSS 2020-02-19 22:42:45 +01:00
Mouse Reeve
9f2bad67a7 Ingest review from remote fedireads user
fixes #35
2020-02-19 12:35:57 -08:00
Mouse Reeve
400ddaa5fd Format reviews in outbox 2020-02-19 12:13:08 -08:00
Mouse Reeve
ff25152afe Typo fix preventing review propogation 2020-02-19 11:44:14 -08:00
Mouse Reeve
3692fe5151 Fix unfollow url syntax in view 2020-02-19 11:38:42 -08:00
Mouse Reeve
08933c9009 Fixes url regex 2020-02-19 11:37:02 -08:00
Mouse Reeve
f7867da7a0 Fixes following external fedireads user
Fixes #42
2020-02-19 11:33:00 -08:00
Mouse Reeve
c0104892c9 comment and todo cleanup 2020-02-19 00:35:12 -08:00
Mouse Reeve
77841909fe Don't fav things multiple times
Fixes #28
2020-02-19 00:23:11 -08:00
Mouse Reeve
a664ad3328 Adds favorit handling 2020-02-19 00:13:06 -08:00
Mouse Reeve
27b9326dd9 Adds Favorite table
works on #28
2020-02-18 23:26:42 -08:00
Mouse Reeve
efd93855d9 Redirect invalid reviews back to book page
Works on #17
2020-02-18 23:09:22 -08:00
Mouse Reeve
bca0a1f32c Snippet for book covers
Fixes #20
2020-02-18 23:03:04 -08:00
Mouse Reeve
d77f1b9882 Fixes redirect after follow action
Fixes #14
2020-02-18 22:59:11 -08:00
Mouse Reeve
95bfb61cf3 Follow/unfollow behavior
Fixes #23
2020-02-18 22:44:13 -08:00
Mouse Reeve
14d300162d Send a different review to mastodon than to fedireads 2020-02-18 17:30:23 -08:00
Mouse Reeve
0447fef279 Fixes replies ap access 2020-02-17 21:58:02 -08:00
Mouse Reeve
5a3bc37bca MOves replies formatter out of incoming 2020-02-17 21:50:30 -08:00
Mouse Reeve
0d4f6851b9 small fixes for replies 2020-02-17 21:42:09 -08:00
Mouse Reeve
9194b3c50d Adds commenting 2020-02-17 21:39:08 -08:00
Mouse Reeve
ff5217efd8 Moves incoming activitypub json to module 2020-02-17 21:23:08 -08:00
Mouse Reeve
beb1e13050 Adjust feed to handle pivacy settings
fixes #9
2020-02-17 21:00:49 -08:00
Mouse Reeve
78131805b7 Fixes accept activity json 2020-02-17 20:52:14 -08:00
Mouse Reeve
e7dc4af907 move outgoing activitypub json into ap module 2020-02-17 20:47:27 -08:00
Mouse Reeve
75ef3baabd Move activitypub serialization into a module 2020-02-17 20:12:19 -08:00
Mouse Reeve
b6964dd8aa Bug fixes and absolute ids 2020-02-17 17:53:40 -08:00
Mouse Reeve
3e434077f9 Forgot to add the migration and models helper 2020-02-17 16:50:44 -08:00
Mouse Reeve
71027a1459 Use absolute id model property 2020-02-16 19:17:11 -08:00
Mouse Reeve
4eeb842350 Status updates for shelving actions 2020-02-16 18:45:25 -08:00
Mouse Reeve
f28ee934fc Stop storing activitypub json in db entirely 2020-02-16 18:22:01 -08:00
thricedotted
8d081548cd just use user.outbox... d'oh 2020-02-16 16:40:48 -08:00
thricedotted
73a1920886 fix partOf path on outbox pages 2020-02-16 16:20:11 -08:00
Mouse Reeve
5cd43d53ba Cleaning up model fields 2020-02-15 15:00:54 -08:00
thricedotted
16a4decf44 add sqlite support 2020-02-15 14:19:36 -08:00
thricedotted
efc985d53c Merge remote-tracking branch 'origin/master' into settings-to-env 2020-02-15 13:46:33 -08:00
thricedotted
40b63ac200 move some configuration into environment vars 2020-02-15 13:45:44 -08:00
Mouse Reeve
296bb379ec Small syntax fix 2020-02-15 13:14:43 -08:00
Mouse Reeve
f39cc6530b Formatting and display fixes 2020-02-15 13:07:57 -08:00
Mouse Reeve
b2e6b5c571 Sign messages 2020-02-15 13:01:42 -08:00
Mouse Reeve
41fcc7f2e8 Fixes feed for changes to reviewactivity schema 2020-02-15 12:51:40 -08:00
Mouse Reeve
e7a0c261be Fixes review display in feed (set local type) 2020-02-15 12:35:54 -08:00
Mouse Reeve
8bd566bccb Endpoint for status 2020-02-15 12:32:40 -08:00
Mouse Reeve
8aba8e80e4 Remove pdb 2020-02-15 12:15:17 -08:00
Mouse Reeve
1e25c2f869 More nodeinfo endpoints 2020-02-15 11:40:21 -08:00
Mouse Reeve
cea458acdd Adds more urls 2020-02-15 11:31:35 -08:00
Mouse Reeve
818e5bd0fa Trying to get federated posting to work 2020-02-15 11:13:49 -08:00
Mouse Reeve
e0e419a757 Fixes accept follow request
Fixes #3
2020-02-14 22:44:07 -08:00
Mouse Reeve
c4549e9b17 TODO cleanup 2020-02-14 22:19:57 -08:00
Mouse Reeve
a0323ead33 Handle users without shared_inbox in broadcast 2020-02-14 22:15:14 -08:00
Mouse Reeve
6df9700604 Sanitizes html input 2020-02-14 21:45:13 -08:00
Mouse Reeve
f414884e00 Fixes duplicate save attempt of review 2020-02-14 21:15:38 -08:00
Mouse Reeve
cc1f222431 Cleans up review logic 2020-02-14 21:00:11 -08:00
Mouse Reeve
4aa4898484 Tidies up inbox code 2020-02-14 20:37:02 -08:00
Mouse Reeve
48d92f1990 Handle follow request accept activities 2020-02-14 20:24:35 -08:00
Mouse Reeve
4f60d27c12 Accept 'Accept' activities in the inbox 2020-02-14 20:04:22 -08:00
Mouse Reeve
7123650198 Fixes feeration authentication header
Co-authored-by: thricedotted <thricedotted@gmail.com>
Fixes #1
2020-02-14 19:55:33 -08:00
Mouse Reeve
a1fbba1ba3 move things into different files 2020-02-11 17:48:31 -08:00
Mouse Reeve
36c8b29f3e Adds author bios 2020-02-10 22:41:31 -08:00
Mouse Reeve
964c56079c Adds very simple author pages 2020-02-10 22:32:03 -08:00
Mouse Reeve
0f1240ca1f Resolve miscellaneous TODOS
Fixes #2
2020-02-10 22:10:05 -08:00
Mouse Reeve
55f5735b33 Adds validator for review rating model field 2020-02-10 21:58:25 -08:00
Mouse Reeve
d088ae7747 remove unnecessary login form 2020-02-10 21:52:50 -08:00
Mouse Reeve
1e394a282e Show login errors from django forms 2020-02-10 21:49:18 -08:00
Mouse Reeve
f9cb9f939a Snippets for book previews, username links, avatars 2020-02-10 21:24:34 -08:00
Mouse Reeve
3ba76a8b13 Fixes brittle search result data ingest 2020-02-10 21:10:41 -08:00
Mouse Reeve
46e38366c7 Stores book identifiers with path part 2020-02-10 21:09:04 -08:00
Mouse Reeve
b1ea495d17 fixes key signing try/except 2020-02-10 20:22:36 -08:00
Mouse Reeve
d6d16f4096 Adds outbox pages 2020-02-10 20:16:23 -08:00
Mouse Reeve
96ebb43235 more todos and cleanup 2020-02-07 15:29:11 -08:00
Mouse Reeve
3998c662cc minor code cleanup and commenting 2020-02-07 15:11:53 -08:00
Mouse Reeve
ef2209e77b Support users with no shared inbox 2020-02-07 13:39:48 -08:00
Mouse Reeve
9360f4512c RSA sign and verify (working) 2020-01-29 20:56:18 -08:00
Mouse Reeve
62f8b2ac17 Adds remote user public key 2020-01-29 15:59:43 -08:00
Mouse Reeve
9f0bcd8152 Better error handling in broadcaster 2020-01-29 15:55:48 -08:00
Mouse Reeve
fa0f37fb0f Format descriptions 2020-01-29 15:32:43 -08:00
Mouse Reeve
093f2d4fdd stars filter 2020-01-29 15:10:32 -08:00
Mouse Reeve
668e714c31 styles 2020-01-29 12:53:12 -08:00