Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Project cleanup; remove repo size #37

Merged
merged 4 commits into from
Dec 5, 2017
Merged

Project cleanup; remove repo size #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
22117bf
Remove prefix default check; now handled in DatabaseManager
Sinthorion Nov 5, 2017
bd26ade
Merge remote-tracking branch 'upstream/master'
Sinthorion Nov 22, 2017
f34a832
Merge remote-tracking branch 'upstream/master'
Sinthorion Nov 26, 2017
37e4a51
Updated .gitignore; project cleanup
Sinthorion Dec 4, 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
1 change: 1 addition & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,3 +4,4 @@ config.properties
/out
/.idea
/bin
/src/javascript/bot/*.jar
8 changes: 0 additions & 8 deletions .idea/dictionaries/AbbyTheRat.xml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions .idea/inspectionProfiles/Project_Default.xml
View file
Open in desktop

This file was deleted.

5 changes: 1 addition & 4 deletions src/bot/CommandStructure/SetPrefixCS.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,8 @@ public SetPrefixCS(SharedContainer container, String commandName, int commandID,
@Override
public void execute(Member author, User authorUser, MessageChannel channel, Message message, String parameters, Map<String, CommandStructure> commandList) {
//Check to see if we're either botAdminOwner or guild Owner
String curGuildPrefix = "!";
Long guildID = author.getGuild().getIdLong();
if (dbMan.getPrefix(guildID) != null) {
curGuildPrefix = dbMan.getPrefix(guildID);
}
String curGuildPrefix = dbMan.getPrefix(guildID);

if (hasPermission(author)) {
//if we don't have any parameters, we're resetting to default
Expand Down
Binary file removed src/javascript/bot/Ducky-Mc-Duckerson.jar
View file
Open in desktop
Binary file not shown.