carpathianflorist
/
MarseyWorld
forked from MarseyWorld/MarseyWorld
1
0
Fork 0
Code Pull Requests Activity
30,530 Commits
1 Branch
0 Tags
2.3 GiB
Commit Graph

478 Commits (759c90fdf8f23ca31fe7191d5122dc4463d3a90b)

Author SHA1 Message Date
Aevann b49cc69108 port over the max-height thing to new chat 2023-01-21 13:12:15 +02:00
Aevann f2fdefa8cd chat overhaul 2023-01-21 12:36:21 +02:00
Aevann e6acc1cdd0 fix title for admin chat 2023-01-20 06:42:30 +02:00
Aevann c4d1e49567 Revert "remove chat.js" 
This reverts commit e044ddde90.
 2023-01-20 06:27:38 +02:00
Aevann e044ddde90 remove chat.js 2023-01-20 06:24:49 +02:00
Aevann acc71d4cae add /admin/chat and dont store profile_url in chat dict 2023-01-20 06:10:25 +02:00
Aevann f5211c19f9 fix chat annoyance 2022-12-30 20:09:55 +02:00
Aevann 93e9a42fa3 stop using inline style/script elements 2022-12-29 16:20:27 +02:00
Aevann 6114111654 tighten CSP 2022-12-27 03:22:39 +02:00
Aevann ecfcbaf3df make hat_active return a tuple 2022-12-25 00:21:49 +02:00
Aevann1 0fd8157fa6 move CSP to nginx-level 2022-11-28 04:19:59 +02:00
justcool393 153fb4e2a2
[DO NOT MERGE] titlesssssssssss (#468) 
* titles

* testing

* self

* Revert "self"

This reverts commit d6c12d5a5ba125feb44673f55e1fdac75f151cb5.

* Revert "testing"

This reverts commit 86d800f9fd552196b31f0e0b3891d4fc072a9bc0.

* testing on devrama

* rewrite the html head

* reference error or smth idk

* tempalte debug

* template debug redux

* default2

* rename default2 -> root, page title

* fix settings2

* include the set_variables block

* root scope variables 2

* test 3

* remove unnecessary set

* add pagetitles to all settings2 pages

* add pagetitle to casino

* remove bloat

* remove duplicate site name thingy

* page titles 2

* page titles 3

* remove duplicate imports and add page titles everywhere iirc

* ok but actually this time

* remove unnecessary newlines

* fix title lol

* >

* fsdfsfsfsfsfs

* fsfs

* template configurations

* fix 500

* reduce login template bloat

* move files and add status codes where needful

* move authfroms to login

* remove 2fa bloat

* verification code

* sign up fixes

* readability

* fssfsfsfs

* move forgot password to login/

* readability

* don't emit comments

* add page titles where needful

* gsgsgs

* modals: move to respective pages

* testing on devrama

* get home garbage out of title

* remove insane amount of icon duplication

* sign up text

* add votes pagetitle

* fix blank lines

* Revert "fix blank lines"

This reverts commit b2c54339970725d00b6fc82bb458c1757909952c.

* Fix blank lines on sign_up.html.

* title: votes.html more meaningful identifier.

* titles: Lottery, Directory, Notifications

* head final in submission.html

* fix missing comma

* >

* test

* title: /comments

* fsfsfsfsf

* titles: user_cards

* head: only load video and audio meta attributes if they actually exist

* titlessssss: /admin/lottery/participants

* titlessssssss: extra quote in search.html

* titlessssss: userpage voters.

* titties: /h/<sub>/{followers,blockers,exilees[sic]}

* test banner

* Revert "test banner"

This reverts commit c3d875d03f3e60d72a60dab7d28bf108554a5826.

* make submit.html inherit from default.html

Co-authored-by: TLSM <duolsm@outlook.com>
 2022-11-21 02:52:22 -06:00
Aevann1 caabaf0c6f expand IS_LOCALHOST 2022-11-21 00:16:49 +02:00
Aevann1 ce24c24e1d put js files not made by us in a folder 2022-11-18 21:16:44 +02:00
geese-suck 47658f2897
clean up html head (#461) 
* init (not done)

* asdf

* :marseymop:

* unnecesary

* remove

* Update html_head.html
 2022-11-17 16:08:39 -05:00
Snakes 7feddc42f0 Unify template helpers and macros, fix header. 
The need for sidebars to have access to macros.random_image means
all templates that include header.html (most templates) need to have
access to `macros`, because header.html includes sidebar_{SITE_NAME}.

Because of how sparse helpers was, we instead unify the two and
replace it since I know we had helpers in every top-level template.
 2022-11-16 12:07:23 -05:00
justcool393 86459cdf24 chat: show mop tools to those with proper perms 2022-11-16 08:38:20 -06:00
justcool393 e1634d0940 modals: move all modals to a modals dir 2022-11-15 17:15:53 -05:00
justcool393 0495d00629 chat fix i think? 2022-10-21 17:24:17 -05:00
justcool393 c4b2c6f3f5
html head refactor (#412) 
* start html head refactor
this is a bit of a doozy tbh and will probably take a while. the templates are very highly duplicated but not duplicated enough to be an easy little thing

oh well, so it goes.

* some easier html head ones

* add chat, html_head, sign_up_failed_ref, sign_up, submit

* CSP: put it in const.py instead of this weird thing we did before

* fix syntax error

* better call the actual macros

* fix prev commit

* import into settings2

* fix prev commit

* set CSP properly if localhost

* some title fixes i think

* login page

* fix prev commit

* hacky thing to get titles to work i think

* {{stylesheets()}}

* fix prev commit

* title stuff

* cries uncontrollably

* submission fixes i think

* fix prev commit i think

* submission fixes ekfjdhfkdjf

* submission fixes 4

* this may fix submissions idk tbh

* default template: make it a little better on post pages

* default template: some efficiency
 2022-10-21 13:39:45 -05:00
justcool393 2559794135 Move stuff we put in bootstrap.js to a new core.js file 2022-10-14 02:50:39 -07:00
Aevann1 caf5034608 same last commit 2022-10-13 21:43:48 +02:00
Aevann1 de6de0acae fix security policy in chat.html 2022-10-13 20:42:46 +02:00
Aevann1 3888b29983 potential solution to the chat docker problem 2022-10-13 20:21:02 +02:00
justcool393 dc5a132583 mop visibility, WPD notifications, and a fix with shadowbans 2022-10-05 22:25:45 -07:00
Outrun Colors 8ac70df325 Add optimistic messages 2022-09-27 19:06:44 -05:00
Outrun Colors 411ff5293e
Re-add lite-youtube script 2022-09-27 17:17:42 -05:00
Outrun Colors 2e9c774a5d
Re-add expanded image and emojimodal 2022-09-26 20:28:39 -05:00
Snakes a3664e252c
assetcache: change asset_siteimg macro to filter. 2022-09-24 03:14:20 -04:00
Snakes 98936efe60
assetcache: apply to all CSS and JS assets. 2022-09-24 03:04:06 -04:00
Snakes 1fe02b7743
Chat rework deployment infra fixes. 2022-09-24 00:26:44 -04:00
outruncolors 484de39566
[DO NOT MERGE] Chat restructure (#360) 
* Create new subdirectory for chat-related stuff

* Gitignore

* Have new code show up on chat

* Have new code show up on chat

* Fix config issue

* More script stuff

* Create UserInput components

* More chat changes

* More updates to chat

* Add chat:watch script

* Move up state and pass down

* Match up existing functionality entirely

* Match up existing functionality entirely

* Send a message when hitting Enter

* feature based directories

* First crack at emoji drawer

* Leave everything in a fucked up state ugh

* Leave it in a better state

* Stop for the night

* Decouple by abstract chat functionality to provider

* Wait a minute...

* Small chat restructure

* Prepare for notifications

* Add root context

* Flash number of messages

* Read this and u die

* Add quote functionality

* Couple tweaks

* Shallowenize the features dir/

* Add activity list

* Ch-ch-ch-ch-ch-changes

* Enable moving drawer

* Hover style on activities

* UserList changes

* Add emoji processing logic

* Duhhhh

* Scroll to top when changing query

* Put the emoji in the drawer

* Improve emoji drawer

* Add emoji genres

* Do not show activities

* Add feature flag technology

* Fix issue where own messages were triggering notifications

* Adjust startup scripts

* Responsive part 1

* Styling changes for emoji genres

* More emoji drawer styling

* Add QuickEmojis

* Re-add classnames

* Set version

* Modify build script

* Modify build script

* Mild renaming

* Lots of styling changes

* Leggo.
 2022-09-23 22:49:40 -05:00
Aevann1 97dc727e22 cachebust 2022-09-20 23:22:58 +02:00
Aevann1 8b93507b19 testing on devrama 2022-09-20 23:22:09 +02:00
Aevann1 56d1d7ccfe testing on devrama 2022-09-20 23:19:39 +02:00
Snakes 78bed8e66a
chat: extend b845c3f style changes to scrollback. 2022-09-16 11:00:43 -04:00
Snakes b845c3fe23
chat: right-align message deletion button. 2022-09-16 10:20:38 -04:00
Aevann1 d14612c7f0 fix 2022-09-14 13:45:41 +02:00
Aevann1 c3c7b20ccd fix wrong syntax 2022-09-14 13:44:16 +02:00
Aevann1 af2b69d7bb "yes but could you make it that it resets when i click on anything but the trashcan?" 2022-09-14 13:42:25 +02:00
Aevann1 f2da6ce091 fix prev commit 2022-09-14 13:31:14 +02:00
Aevann1 e4a2e28ba3 fix prev commit 2022-09-14 13:28:51 +02:00
Aevann1 56a7347fc1 add confirmation for chat msg deletion 2022-09-14 13:25:00 +02:00
Aevann1 5b7dc29445 sneed 2022-09-13 06:00:02 +00:00
Outrun Colors a7ab4523de
Skip winners on 0 and 00 2022-09-12 22:14:55 -05:00
Aevann1 5804a93b11 cosmetic change 2022-09-12 07:38:02 +02:00
Aevann1 4d7a53d6ea cosmetic fix 2022-09-10 11:44:06 +02:00
Aevann1 bd7c0e71bf forgot to cachebust 2022-09-10 11:34:48 +02:00
Aevann1 8f0b2ea9c3 test on devrama 2022-09-10 11:31:51 +02:00
Aevann1 00b71e0bc5 restore the original emoji icon 2022-09-10 01:52:52 +02:00
Aevann1 acf6ca7d74 remove sidebar background (I hate it) 2022-09-09 11:28:59 +02:00
Aevann1 4791e7b14b revert icon change 2022-09-08 19:24:00 +02:00
Aevann1 e9445efc22 make bootstrap work on localhost 2022-09-08 19:12:46 +02:00
Aevann1 f4e4ff3839 comsetic shit 2022-09-08 17:38:27 +02:00
Aevann1 b2d134fa6c update glowing hat 2022-09-06 23:15:35 +02:00
Aevann1 9bf2d75bce fix chat hats 2022-09-05 10:57:11 +02:00
Aevann1 e6d5839e4d fix chat 2022-09-05 06:38:01 +02:00
Aevann1 b3a56ca168 more hat shit 2022-09-05 06:33:08 +02:00
Aevann1 15732114d9 try making hats work in popover 2022-09-05 06:21:06 +02:00
Aevann1 82237ca585 fix prev commit 2022-09-05 05:17:40 +02:00
Aevann1 fef15b7da9 fix prev commit 2022-09-05 05:16:42 +02:00
Aevann1 f516f21ed3 fix prev commit 2022-09-05 05:15:00 +02:00
Aevann1 2636ae62c2 add hats to chat (Part II) 2022-09-05 05:14:03 +02:00
Aevann1 093ed82fb8 fix prev commit 2022-09-05 05:06:25 +02:00
Aevann1 49bcd0543d add hats to chat, part I 2022-09-05 05:04:48 +02:00
Aevann1 71b5367874 cachebust all css and js 2022-09-05 01:50:43 +02:00
Aevann1 1c12a6a82f decrease max-height for #chat-window by 1vh 2022-08-30 04:00:24 +02:00
Aevann1 0f11312d24 add house awards 2022-08-27 04:57:19 +02:00
Aevann1 67289ffc28 fix chat scrolling on mobile 2022-08-27 02:48:28 +02:00
Aevann1 57c62fad7b do this https://watchpeopledie.co/h/meta/post/6451/changelog-chat-is-now-ioscompatible/117359?context=8#context 2022-08-27 02:15:53 +02:00
Aevann1 0435081198 don't do more than 1 quote (chat) 2022-08-26 22:44:24 +02:00
Aevann1 edf9911123 don't force websockets 2022-08-26 22:25:17 +02:00
Aevann1 bc743fc169 try now 2022-08-26 21:47:40 +02:00
Aevann1 c7359d90b7 try now 2022-08-26 21:39:50 +02:00
Aevann1 c19eb23a67 despair 2022-08-26 21:35:58 +02:00
Aevann1 7e491208a3 chat shit 2022-08-26 21:31:46 +02:00
Aevann1 d2c6cf362e scroll chat on sending 2022-08-26 21:30:10 +02:00
Aevann1 71828e6528 fix Enter on iOS (chat) 2022-08-26 21:28:29 +02:00
Aevann1 58879a49a4 testing on prod 2022-08-26 21:24:24 +02:00
Aevann1 48b8788d89 zoom issue 2022-08-26 21:22:40 +02:00
Aevann1 483bacb5e3 fix zoom issue 2022-08-26 21:11:24 +02:00
Aevann1 d5f1e3f377 fixing zoom issue on safari 2022-08-26 21:03:42 +02:00
Aevann1 a10739af77 go back to polling for iOScels 2022-08-26 20:41:38 +02:00
Aevann1 750f045776 scroll chat when textarea is clicked 2022-08-26 20:32:25 +02:00
Aevann1 f1f71520bf dude testing on prod lmao 2022-08-26 20:31:53 +02:00
Aevann1 84777d1b29 dude testing on prod lmao 2022-08-26 20:31:28 +02:00
Aevann1 21fc6fe19c dude testing on prod lmao 2022-08-26 20:30:52 +02:00
Aevann1 9f55ff5458 chat depression 2022-08-26 20:30:15 +02:00
Aevann1 2211e81d80 chat 2022-08-26 20:29:05 +02:00
Aevann1 43ac6e96fb scroll chat when textarea is clicked 2022-08-26 19:57:31 +02:00
Aevann1 25a62abc13 use minified version of socket.io 2022-08-26 18:34:38 +02:00
Aevann1 e7b997fd01 testing on prod 2022-08-26 18:11:01 +02:00
Aevann1 fd7114d335 extend css rule in chat 2022-08-26 17:00:58 +02:00
Aevann1 8ca2812dac fix blockquotes in chat 2022-08-26 17:00:19 +02:00
Aevann1 6ea5e5f679 fix blockquotes in chat 2022-08-26 16:58:48 +02:00
Aevann1 fdf8d0511f fix issues with chat 2022-08-26 16:53:56 +02:00
Aevann1 432f90b8d8 try to fix 2022-08-26 01:34:20 +02:00
Aevann1 54a5357136 why did i write this garbage code 2022-08-26 01:31:31 +02:00
Aevann1 027a4a854a fix prev commit 2022-08-26 01:30:05 +02:00
Aevann1 7162d015b0 cachebusting 2022-08-26 01:28:38 +02:00