Skip to content
This repository has been archived by the owner on Aug 3, 2022. It is now read-only.

Ignores folders and config files in plugins/themes and sets 1 week expiry #569

Closed
wants to merge 80 commits into from
Closed
Changes from 1 commit
Commits
Show all changes
80 commits
Select commit Hold shift + click to select a range
dbd3f5f
Ignores folders and config files in plugins/themes
rauenzi Oct 1, 2017
07c7b46
Merge pull request #1 from Jiiks/master
rauenzi Oct 27, 2017
1ea7677
test
rauenzi Oct 29, 2017
12f6d08
settings
rauenzi Oct 29, 2017
bfec7b5
no public
rauenzi Oct 29, 2017
84ddea5
defaults
rauenzi Oct 29, 2017
0e2a7f2
remove more jquery
rauenzi Oct 29, 2017
f9e4d68
textarea stuff
rauenzi Oct 29, 2017
1999bad
test
rauenzi Oct 29, 2017
7133d14
more tests
rauenzi Oct 29, 2017
15b03ef
textarea
rauenzi Oct 29, 2017
85fa175
link updates and such
rauenzi Oct 29, 2017
d8a2835
fix react errors
rauenzi Oct 29, 2017
939b733
fix hash
rauenzi Oct 29, 2017
6d862c8
error checking, escaping
rauenzi Oct 29, 2017
3ddae1e
friggin hell
rauenzi Oct 29, 2017
1417c62
more error checks
rauenzi Oct 29, 2017
8a2cda4
escape IDs
rauenzi Oct 29, 2017
7897b2c
let's see what breaks
rauenzi Oct 29, 2017
770b163
maybe less breaking
rauenzi Oct 29, 2017
0187581
start deleting useless spaghetti
rauenzi Oct 29, 2017
87ea70c
cleanup
rauenzi Oct 29, 2017
8ba8756
more useless code
rauenzi Oct 29, 2017
ac2b3f1
more unused code hopefully
rauenzi Oct 30, 2017
11edc76
expand dev mode
rauenzi Oct 30, 2017
921f058
missed the off
rauenzi Oct 30, 2017
9f4981a
I spelled context wrong...
rauenzi Oct 30, 2017
f8fea73
fix devmode
rauenzi Oct 30, 2017
9a39c15
hopefully finalize devmode
rauenzi Oct 30, 2017
37129c3
reenable emote menu
rauenzi Oct 30, 2017
e1ba41f
start emote modifiers
rauenzi Oct 30, 2017
a6fa031
update css
rauenzi Oct 30, 2017
1eed4bb
start fixing plugin api
rauenzi Oct 30, 2017
4309890
further test plugin api
rauenzi Oct 30, 2017
3ec3b47
fix onMessage
rauenzi Oct 30, 2017
1015e35
more devmode stuff
rauenzi Oct 30, 2017
e42e2e5
hopefully finalize devmode
rauenzi Oct 30, 2017
eeccf6b
changes for onMessage
rauenzi Oct 30, 2017
76f7a61
refactor main observer
rauenzi Oct 30, 2017
b53c9b0
some fixes for tooltips
rauenzi Oct 30, 2017
333c994
settings are disorganized apparently
rauenzi Oct 30, 2017
a9f2756
test removing some settings crap
rauenzi Oct 30, 2017
4735b69
not the way I thought
rauenzi Oct 30, 2017
68e40aa
hecking
rauenzi Oct 30, 2017
2a3d7e3
update some css for minimal mode
rauenzi Oct 30, 2017
8a34c78
css for minimal mode
rauenzi Oct 30, 2017
62fb184
remove more crap and fix emoji menu
rauenzi Oct 30, 2017
a9914b4
update error checking
rauenzi Oct 31, 2017
6dea1de
man I'm dumb
rauenzi Oct 31, 2017
d28f8fc
cleanup plugins/themes loading
rauenzi Oct 31, 2017
ad47b4e
pluginModule, themeModule and customcss
rauenzi Oct 31, 2017
bcd6705
refactor some pluginModule stuff
rauenzi Oct 31, 2017
5119095
add info to plugincards
rauenzi Oct 31, 2017
b0f96e0
.,
rauenzi Oct 31, 2017
33246a7
anotha one
rauenzi Oct 31, 2017
95fc520
adjust error log
rauenzi Oct 31, 2017
ca289d2
pluginCard data
rauenzi Oct 31, 2017
6ef12b4
continue instead of return
rauenzi Oct 31, 2017
088241b
switch back to cdn cause it's easier
rauenzi Nov 1, 2017
22d686c
cleanup and change settings inject
rauenzi Nov 1, 2017
e77c0ca
remove old settings panel
rauenzi Nov 1, 2017
64e04eb
start observer after bd loads
rauenzi Nov 1, 2017
a12773e
fucking lack of es6
rauenzi Nov 1, 2017
3db3482
start cleanup
rauenzi Nov 1, 2017
36ec503
test my understanding of react
rauenzi Nov 1, 2017
054a48f
finish restructure of plugin cards
rauenzi Nov 1, 2017
e8dff1d
finish cards hopefully
rauenzi Nov 1, 2017
85acf96
start switch to V2 switches
rauenzi Nov 1, 2017
d0a3762
switches
rauenzi Nov 1, 2017
c7fb4ad
switches and settings
rauenzi Nov 1, 2017
f92bab3
cleanup cards
rauenzi Nov 1, 2017
99bab11
theme module and card
rauenzi Nov 1, 2017
43a955d
fix a screwup
rauenzi Nov 1, 2017
c212c76
change toggle
rauenzi Nov 1, 2017
6bc4b75
scroll settings into view
rauenzi Nov 1, 2017
639dc5f
single settingspanel call
rauenzi Nov 1, 2017
484fd91
style links
rauenzi Nov 1, 2017
fef5272
code cleanup, check for errors
rauenzi Nov 3, 2017
2ca6a24
start on loadup errors
rauenzi Nov 3, 2017
eb9a873
fix settings for showing errors on load
rauenzi Nov 3, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
link updates and such
  • Loading branch information
rauenzi committed Oct 29, 2017
commit 85fa1751df05cb911950eb5bbcac60e4bfd8ddd3
9 changes: 3 additions & 6 deletions js/main.js
Original file line number Diff line number Diff line change
Expand Up @@ -522,7 +522,7 @@ function EmoteModule() {}
EmoteModule.prototype.init = function () {};

EmoteModule.prototype.getBlacklist = function () {
$.getJSON("https://cdn.rawgit.com/Jiiks/betterDiscordApp/" + _hash + "/data/emotefilter.json", function (data) {
$.getJSON("https://rauenzi.github.io/BetterDiscordApp/" + _hash + "/data/emotefilter.json", function (data) {
bemotes = data.blacklist;
});
};
Expand Down Expand Up @@ -727,7 +727,6 @@ EmoteModule.prototype.autoCapitalize = function () {
if (lastWord == "danSgame") return;
var ret = self.capitalize(lastWord.toLowerCase());
if (ret !== null && ret !== undefined) {
console.log(text.replace(lastWord, ret));
utils.insertText(utils.getTextArea()[0], text.replace(lastWord, ret));
}
}
Expand Down Expand Up @@ -1347,8 +1346,6 @@ QuickEmoteMenu.prototype.switchQem = function(id) {
emoteIcon.on("click", function () {
var emote = $(this).attr("title");
var ta = utils.getTextArea();
console.log("click");
console.log(ta.val().slice(-1) == " " ? ta.val() + emote : ta.val() + " " + emote);
utils.insertText(ta[0], ta.val().slice(-1) == " " ? ta.val() + emote : ta.val() + " " + emote);
});
};
Expand Down Expand Up @@ -2394,7 +2391,7 @@ Utils.prototype.jqDefer = function (fnc) {
};

Utils.prototype.getHash = function () {
$.getJSON("https://api.github.com/repos/Jiiks/BetterDiscordApp/commits/master", function (data) {
$.getJSON("https://api.github.com/repos/rauenzi/BetterDiscordApp/commits/master", function (data) {
_hash = data.sha;
emoteModule.getBlacklist();
});
Expand All @@ -2406,7 +2403,7 @@ Utils.prototype.loadHtml = function (html, callback) {
}).appendTo("body");

//TODO Inject these in next core update
html = '//cdn.rawgit.com/Jiiks/BetterDiscordApp/' + _hash + '/html/' + html + '.html';
html = '//rauenzi.github.io/BetterDiscordApp/' + _hash + '/html/' + html + '.html';

container.load(html, callback());
};
Expand Down