Commit Graph

1215 Commits

Author SHA1 Message Date
Samuel Elliott 4c0248ca00
Remove old favourite emotes storage 2018-08-22 23:45:25 +01:00
Samuel Elliott fd9c03ac2f
Update the emote module in the plugin API 2018-08-22 23:44:46 +01:00
Samuel Elliott d11e8d4fe2
Merge remote-tracking branch 'upstream/master' into plugin-api
# Conflicts:
#	client/src/index.js
#	client/src/ui/components/contextmenu/Group.vue
#	client/src/ui/contextmenus.js
2018-08-22 22:16:39 +01:00
Samuel Elliott 56a807f294
Add support for using submenus in submenus 2018-08-22 22:06:42 +01:00
Samuel Elliott cf71f89077
Use the CMGroup component to render sub menus 2018-08-22 21:35:50 +01:00
Samuel Elliott 3ff077ea04
Add BD button context menu 2018-08-22 21:04:08 +01:00
Samuel Elliott 697df8a7fe
Add v-contextmenu directive 2018-08-22 20:58:00 +01:00
Samuel Elliott c2ccfd02da
Move ReactComponent to Vue injector 2018-08-22 20:56:05 +01:00
Jiiks d92da4b6e4 Support more then 10 items in autocomplete with scrolling 2018-08-22 21:45:32 +03:00
Samuel Elliott 67debca9d9
Add notifications to the plugin API 2018-08-22 19:42:22 +01:00
Samuel Elliott a0bee1846e
Add autocomplete to the plugin API 2018-08-22 19:07:06 +01:00
Samuel Elliott 73192f5762
Load external content after builtin modules 2018-08-22 18:37:39 +01:00
Jiiks 2002db7807 bd-autocomplete -> bd-ac 2018-08-22 20:17:43 +03:00
Jiiks 07374ceeee add autocomplete hint text and float right for third title 2018-08-22 20:15:21 +03:00
Samuel Elliott d02be1521d
Fix modal closing animation and add a header slot 2018-08-22 18:02:07 +01:00
Jiiks 5c92f3e3e0 Toggle between favourite and most used 2018-08-22 20:00:00 +03:00
Jiiks 41a5a3a791 add toggle functionality to ac 2018-08-22 19:49:53 +03:00
Samuel Elliott 42a89129d4
Move unloading plugin main script to the plugin manager 2018-08-22 17:44:30 +01:00
Jiiks 2617925cd8 add actype setting 2018-08-22 19:34:26 +03:00
Jiiks 7a0b6e9262 Remove unused imports 2018-08-22 19:32:31 +03:00
Jiiks 3f5c168ffc Move emote autocomplete to it's own module 2018-08-22 19:31:09 +03:00
Jiiks 09d9f50160 z-indexes, shouldn't break any indexing? 2018-08-22 18:54:32 +03:00
Jiiks d274fda428 Save favourites to db 2018-08-22 18:49:20 +03:00
Jiiks 58a2b6714e add id to test cm 2018-08-22 18:39:47 +03:00
Jiiks 4c3659f857 add contextmenu patch removal 2018-08-22 18:39:09 +03:00
Jiiks b8dc9c0d25 No more ugly 2018-08-22 18:33:00 +03:00
Jiiks c4f28a6ac5 Initial favouriting and horrible toggle code fix it Zere 2018-08-22 17:17:37 +03:00
Jiiks 1ab52cb174 Correct targeting 2018-08-22 16:55:25 +03:00
Jiiks f315c8b134 pass target to toggle 2018-08-22 16:38:32 +03:00
Jiiks 8bfac0f6ff add favourite toggle 2018-08-22 16:31:49 +03:00
Samuel Elliott 4bed9f726c
Separate file/directory delete functions 2018-08-22 14:27:06 +01:00
Jiiks 0145492773 Wrap single emotes 2018-08-22 16:20:26 +03:00
Samuel Elliott 2188c22425
Update begin key exchange icon 2018-08-22 13:55:24 +01:00
Jiiks e9c419529d Change singular emote name to detect it in render 2018-08-22 15:50:20 +03:00
Samuel Elliott 6ee647b249
Fix SettingsWrapper padding on macOS 2018-08-22 13:32:10 +01:00
Samuel Elliott 5676435473
Fix channelcategory.channels 2018-08-22 13:23:22 +01:00
Samuel Elliott 8cf28fcaba
Add DiscordContextMenu to the plugin API 2018-08-22 13:19:15 +01:00
Samuel Elliott 237899c91a
Add BdContextMenu to the plugin API 2018-08-22 12:56:27 +01:00
Samuel Elliott 73e4e83ced
Add Maks#3712 to contributors 2018-08-22 12:54:55 +01:00
Alexei Stukov 5b63667bc2
Merge pull request #238 from JsSucks/context-menus
Context menus
2018-08-22 14:29:56 +03:00
Alexei Stukov 00ce5d70c9
Merge pull request #237 from JsSucks/windowpreferences-patch
fix window preferences
2018-08-22 14:29:47 +03:00
Alexei Stukov b3d14d853c
Merge pull request #236 from Maks-s/filetype
Add file functions for FileSetting
2018-08-22 14:29:35 +03:00
Alexei Stukov c1af0c6115
Merge pull request #234 from JsSucks/builtins
Add several builtins
2018-08-22 14:29:18 +03:00
Jiiks cd84f6329a add a test contextmenu item 2018-08-22 12:08:56 +03:00
Jiiks b4fa9c2934 add docs 2018-08-22 12:07:32 +03:00
Jiiks 9db6ddaf98 Make filter optional 2018-08-22 12:06:53 +03:00
Jiiks ed55e060aa Linter warnings 2018-08-22 10:55:18 +03:00
Jiiks bb37b89d35 Discord contextmenu patching 2018-08-22 10:53:20 +03:00
Jiiks 07fc98670c Hide cm when clicked outside 2018-08-22 02:03:18 +03:00
Jiiks 25aecf82a6 Fix chevron position 2018-08-22 01:42:14 +03:00
Jiiks 242fbfaaa7 Match notifications with context menu style 2018-08-22 01:35:46 +03:00
Jiiks ef5a1c223c Get position from passed event|object 2018-08-22 01:27:50 +03:00
Jiiks 8637f176c1 Lint 2018-08-22 00:34:13 +03:00
Jiiks 4c5300be12 Custom context menu 2018-08-22 00:23:08 +03:00
Zack Rauen 1ccd7766bc fix window preferences 2018-08-21 14:05:13 -04:00
Maks-s 9711c99217
Add filetype/read/readBuffer functions to FileSetting 2018-08-21 16:01:37 +02:00
Zack Rauen 4784b13c86 proper color mixing, support light theme 2018-08-21 01:50:54 -04:00
Zack Rauen a8c8c017f6 add color intensity option 2018-08-21 01:19:43 -04:00
Zack Rauen c98e4430b1 forgot about midnight case in 24hr 2018-08-21 00:36:57 -04:00
Zack Rauen adf94990c2 add several builtins
- Colored Text
- 24 Hour
- Kill Clyde
- Prevent Blocked Messages
- Voice Disconnect
2018-08-20 23:42:34 -04:00
Maks-s e78021a538
Added delete method to plugins / themes 2018-08-21 02:45:54 +02:00
Jiiks 12021fcf15 Lint fix 2018-08-20 18:36:34 +03:00
Jiiks 1031ab3a18 zer-unit 2018-08-20 18:31:08 +03:00
Jiiks e75c575a32 add dummy notif 2018-08-20 18:30:41 +03:00
Jiiks 9c91222fff More styling 2018-08-20 18:23:18 +03:00
Jiiks d0eb2a441a Notification styling 2018-08-20 18:21:34 +03:00
Jiiks 6eaed063ec Move to bottom right 2018-08-20 17:21:01 +03:00
Jiiks bc5eb1b5f0 button logic 2018-08-20 16:52:26 +03:00
Jiiks 1a11eb6a6b Styling a bit, still uglyish 2018-08-20 16:48:29 +03:00
Jiiks cff67a3b1d Notification styling 2018-08-20 16:40:28 +03:00
Jiiks 3518ac7cb2 add base for notifications. These should be used for things such as "update available" only 2018-08-20 16:23:05 +03:00
Jiiks f2d7ef41da Use full white logo instead of filter 2018-08-20 15:28:31 +03:00
Jiiks 87e0f132d1 add full white small logo 2018-08-20 15:26:19 +03:00
Zack Rauen 19d33a44ea fix module resolving for vscode 2018-08-19 22:43:40 -04:00
Jiiks f50bcd0785 Massive commit 2018-08-20 05:07:28 +03:00
Jiiks fc6481acae Big commit 2018-08-20 05:05:01 +03:00
Jiiks de0651bb47 Huge commit 2018-08-20 04:02:09 +03:00
Jiiks 84b94c614e Typos 2018-08-20 03:48:49 +03:00
Jiiks 3fa848bb5a add some comments 2018-08-20 03:26:56 +03:00
Jiiks 533566fde8 Don't store useless data in db 2018-08-20 03:16:09 +03:00
Jiiks 6ab1adfe5b Use findOne 2018-08-20 02:39:48 +03:00
Jiiks 205dcf6ff1 add findOne to db 2018-08-20 02:38:17 +03:00
Jiiks beaee8764c Persistent most used and favourites 2018-08-20 02:35:51 +03:00
Jiiks 53ef0be7b8 Minor changes 2018-08-20 01:56:57 +03:00
Jiiks e3edb09f38 Remove debugs 2018-08-19 23:16:49 +03:00
Jiiks 316f3c1bb0 Remove debug 2018-08-19 23:15:37 +03:00
Jiiks 6948335ea7 Fix lag and random no reason package change 2018-08-19 23:13:23 +03:00
Jiiks 25decd0514 Correct sort pls 2018-08-19 21:07:14 +03:00
Jiiks a35c75717e Most used emotes, only in memory right now 2018-08-19 21:00:53 +03:00
Jiiks 8d6d3c9e18 Autocomplete 2018-08-19 20:34:32 +03:00
Jiiks 91df5350ad I'll just remove them here 2018-08-17 17:06:38 +03:00
Jiiks 22740fb16c Autocomplete 2018-08-17 17:05:23 +03:00
Jiiks 0316bbc1cd add wrapper for getClassName 2018-08-17 10:40:19 +03:00
Jiiks 8bac53e9be Emote mofule refactoring, vrwrapper and hasOwnProperty treewalk check 2018-08-16 14:33:22 +03:00
Jiiks 805e1ce771 Fix key exchange 2018-08-16 10:53:27 +03:00
Jiiks 6a51834f82 Cleaning and sass-lint 2018-08-15 12:42:43 +03:00
Jiiks 89461244bd Clean a little bit 2018-08-15 10:45:10 +03:00
Jiiks b1847b8c41 bit more 2018-08-15 10:14:45 +03:00
Jiiks 11eed2c89d Make it a bit more readable 2018-08-15 10:10:16 +03:00
Jiiks b971b716bf Update eslint 2018-08-15 09:10:11 +03:00
Jiiks 9f8a1f08be Update eslint rules 2018-08-15 09:01:47 +03:00
Jiiks c1ac349211 all fixed? 2018-08-15 07:13:37 +03:00
Jiiks 1804fcfbe1 Drawer open state 2018-08-15 06:48:59 +03:00
Jiiks 303addae42 Fix badges and add bd-v2 to body 2018-08-15 06:41:44 +03:00
Jiiks 9e80f7b051 Fix bugs caused by automated renaming 2018-08-15 06:33:42 +03:00
Jiiks 0e32d835ef camelCase 2018-08-15 05:03:56 +03:00
Jiiks 34e2833555 Disable E2EE if master password is invalid 2018-08-15 02:34:35 +03:00
Alexei Stukov 8b180ea423
Merge pull request #222 from JsSucks/security-treewalk
add findInTree and adjust the render patch
2018-08-14 22:14:38 +03:00
Jiiks a90400c280 Check if we're not in a channel 2018-08-14 15:43:55 +03:00
Jiiks e49a1932f3 Remove debug 2018-08-14 15:37:14 +03:00
Jiiks abf83821d9 Typo exchange 2018-08-14 15:35:50 +03:00
Jiiks 6ed50c4206 TODO 2018-08-14 15:32:49 +03:00
Jiiks edab8dd93b Use MESSAGE_CREATE instead 2018-08-14 15:30:43 +03:00
Jiiks ab03633431 add password option to input modal 2018-08-14 14:49:50 +03:00
Jiiks 67b554c68f add input modal
TODO Option for masked input
2018-08-14 13:50:32 +03:00
Jiiks 68f3a280a5 TODO 2018-08-14 13:29:19 +03:00
Jiiks 5db4f8cf26 Remove debug 2018-08-14 13:27:45 +03:00
Jiiks 3e57d0092a Display user tag in exchange request modal 2018-08-14 13:27:20 +03:00
Jiiks 36408d74ad Change button tooltip 2018-08-14 13:03:47 +03:00
Jiiks 9aa9305755 Check for message state 2018-08-14 13:02:25 +03:00
Jiiks 6f9cdb9dda That obviously wouldn't work 2018-08-14 12:59:37 +03:00
Jiiks 0aa370aeb9 add custom text for confirm modal buttons 2018-08-14 12:57:39 +03:00
Jiiks 27fee8e10c Typo and set preExchangeState 2018-08-14 12:51:57 +03:00
Jiiks ac1e4ad9a2 Move storage outside 2018-08-14 11:16:39 +03:00
Jiiks 73f2fe4fd0 Reset encryptNewMessages to previous state 2018-08-14 11:08:41 +03:00
Jiiks 8b4318c06e Remove logging 2018-08-14 11:06:53 +03:00
Jiiks 7636ea480d Disable encryption for new exchanges 2018-08-14 11:06:02 +03:00
Jiiks 54e5f2149b Suite B 2018-08-14 11:02:29 +03:00
Jiiks b1f0a4247a Make sure we don't send public keys encrypted 2018-08-14 10:44:57 +03:00
Jiiks 8d6cdafc23 Push kvp to db 2018-08-14 10:41:22 +03:00
Jiiks 5711576a0d Semi automated key exchange process 2018-08-14 10:40:33 +03:00
Jiiks 6df9b1e019 add DraftActions 2018-08-14 06:20:02 +03:00
Jiiks c2e7abcfca nodecrypt 2018-08-14 04:21:48 +03:00
Jiiks b6c58f16e7 DiscordApi in data and remove contextmenu thing 2018-08-14 04:19:03 +03:00
Jiiks b47a3c65aa node-crypto 2018-08-14 04:04:57 +03:00
Zack Rauen 3714e71297 add findInTree 2018-08-13 16:38:13 -04:00
Mega-Mewthree 9f4b0aec6b
Forgot to save stuff. (#8) 2018-08-13 13:23:14 -07:00
Mega-Mewthree 64608c7e62 Switched context menu stuff to popover, fixed things. 2018-08-13 13:17:29 -07:00
Mega-Mewthree 81c451d31f
Merge branch 'security' into security 2018-08-13 10:35:16 -07:00
Jiiks 45ab822fba add collection.scss that got lost somewhere somehow 2018-08-13 14:45:38 +03:00
Alexei Stukov c893216874
Merge branch 'master' into security 2018-08-13 14:38:25 +03:00
Alexei Stukov 17917f3257
Merge branch 'security' into security-encrypted-images 2018-08-13 14:27:29 +03:00
Jiiks 19be33b17d Don't use encrypted key for hmac 2018-08-13 12:56:41 +03:00
Jiiks cfcca0d782 Remove debug 2018-08-13 12:35:19 +03:00
Jiiks 5592a8d376 Use security module 2018-08-13 12:33:44 +03:00
Jiiks 0c0ebb2ebb Pseudo needs content 2018-08-13 10:57:32 +03:00
Jiiks d6d78d1e99 Move master init to enabled 2018-08-13 10:45:52 +03:00
Jiiks b6da7019d0 Unused import 2018-08-12 22:12:26 +03:00
Jiiks a123e20b05 Move to Security 2018-08-12 22:11:41 +03:00
Jiiks 856334cf30 TODO 2018-08-12 22:09:34 +03:00
Jiiks 3f5b2afbd5 decrypting should be set to false as well 2018-08-12 22:05:44 +03:00
Jiiks ad35c89d7d Force update on failed auth instead 2018-08-12 21:59:54 +03:00
Jiiks 71a0ce8fb0 Set readyState on failed authentication 2018-08-12 21:58:26 +03:00
Jiiks d53a3b4d64 base classname 2018-08-12 21:56:57 +03:00
Jiiks bd0c66466f Use randomBytes for master encryption 2018-08-12 21:54:57 +03:00
Jiiks 0a751919aa Remove debug 2018-08-12 21:48:15 +03:00
Jiiks cae68947df add bad key handler 2018-08-12 21:46:59 +03:00
Jiiks 2b833b5141 add hmac 2018-08-12 21:43:59 +03:00
Jiiks b24c0ba2f3 Strip base64 prefix to not have static data in encrypted content 2018-08-12 20:57:02 +03:00
Jiiks 3b8126781d Default to channel id 2018-08-12 20:31:30 +03:00
Jiiks a1a63f2c35 Proper doc 2018-08-12 18:37:11 +03:00
Jiiks 334c9f852a Use cache module 2018-08-12 18:10:22 +03:00
Jiiks 17128a889b add cache module 2018-08-12 17:40:26 +03:00
Jiiks d2b99f200b add image plus material icon 2018-08-12 15:58:00 +03:00
Jiiks 5f4a77f2d8 Remove my leak tests 2018-08-12 15:48:26 +03:00
Jiiks 3614997fa9 No need to use this when it's already in the scope 2018-08-12 15:47:20 +03:00
Jiiks 5f76d304f6 Use predefined colours 2018-08-12 15:46:17 +03:00
Jiiks e8688c0ce4 User some colour variables 2018-08-12 15:41:25 +03:00
Jiiks 641a12d640 Move lock icon to images 2018-08-12 15:40:00 +03:00
Jiiks 169741d5a1 Image encryption, decryption, styling and other stuff 2018-08-12 15:39:00 +03:00
Mega-Mewthree c421be9e91 Fix merge 2018-08-11 18:28:18 -07:00
Mega-Mewthree 7a1768ca87 Merge branch 'e2ee-dev' of https://github.com/Mega-Mewthree/BetterDiscordApp into e2ee-dev 2018-08-11 18:26:37 -07:00
Mega-Mewthree b9e9ab89f7 Rename variables to better describe what they represent. 2018-08-11 18:24:55 -07:00
Mega-Mewthree dc842b479b
Merge branch 'security' into e2ee-dev 2018-08-11 17:24:22 -07:00
Mega-Mewthree 02e6fb88aa Prevent the context menu from appearing in Group DMs. 2018-08-11 16:37:58 -07:00
Mega-Mewthree c10310af3a Error toast on computeSecret error. 2018-08-11 16:28:34 -07:00
Mega-Mewthree 7e41fe73e7 Secure key exchange for DMs. 2018-08-11 16:21:08 -07:00
Mega-Mewthree c122457565 Style the lock context menu. 2018-08-11 10:11:56 -07:00
Mega-Mewthree 0ea0acfaa5
Merge pull request #3 from JsSucks/security-patch
fix all mentions
2018-08-11 07:55:19 -07:00
Jiiks 866ad8b13b Tons of stuff 2018-08-11 15:29:30 +03:00
Mega-Mewthree c5d4e199fc Very poorly implemented key exchange UI.
PLEASE HELP ME
2018-08-11 00:34:18 -07:00
Mega-Mewthree 1a8946b151 Merge branch 'e2ee-dev' of https://github.com/Mega-Mewthree/BetterDiscordApp into e2ee-dev 2018-08-10 23:06:28 -07:00
Zack Rauen 9c0e19e198 fix all mentions 2018-08-11 01:15:49 -04:00
Alexei Stukov 816f809ca7
Merge pull request #217 from samuelthomas2774/security
Add clicking the status icon to toggle encryption and add an indicator to encrypted messages
2018-08-11 06:00:56 +03:00
Samuel Elliott 32a995f678
Add an encrypted indicator to encrypted messages 2018-08-11 02:58:55 +01:00
Samuel Elliott dac3187866
Add clicking the status icon to toggle encryption 2018-08-11 02:43:02 +01:00
Jiiks 60cdec3ae4 and move everything around just to annoy Zere 2018-08-11 04:33:00 +03:00
Jiiks ed4adf21f4 Maybe encrypt instead 2018-08-11 04:31:57 +03:00
Jiiks a8f0e239cf Who wants to call them directly anyways 2018-08-11 04:31:13 +03:00
Jiiks be1a183e62 Empty prefixes 2018-08-11 04:28:07 +03:00
Jiiks d88cedb614 Security module 2018-08-11 04:27:18 +03:00
Jiiks 9880152290 Message parsing 2018-08-11 03:39:13 +03:00
Jiiks 0a1bd46ca9 Don't prefix everything by default 2018-08-10 21:17:52 +03:00
Jiiks 83ef17d302 Fix button patching 2018-08-10 20:38:02 +03:00
Mega-Mewthree cb6473920f
Update webpack.production.config.js 2018-08-10 10:30:42 -07:00
Mega-Mewthree d8c769433a
Update webpack.config.js 2018-08-10 10:30:16 -07:00
Mega-Mewthree fd7a0f4051
Functions to create an ECDH key exchange
Allows 2 users to securely obtain a shared key for usage with AES.
2018-08-10 09:56:55 -07:00
Samuel Elliott 344a9e6fe5
Fix escape key to close menu 2018-08-10 15:21:33 +01:00
Samuel Elliott 22e78c03e1
Add toasts enabled state to the plugin API 2018-08-10 15:17:57 +01:00
Jiiks b67ca5c42d Set master 2018-08-10 17:04:09 +03:00