Small Refactoring Changes - First Contribution on Github Open Source #493
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -34,7 +34,7 @@ public void uncaughtException(Thread t, Throwable e) { | |
| return; | ||
| } | ||
| try { | ||
| String stacktrace = StackTrace.getStacktrace(e); | ||
| if (t != null && t.getName() != null && t.getName().startsWith("JKeyMaster-")) { | ||
| // Output as warning, but also show directly to user | ||
| LOGGER.warning(String.format("[%s/%s][%s][%s]\n%s", | ||
|
|
||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -72,6 +72,57 @@ public interface ParseChannelHelper { | |||||||
| * @param prepend Whether to prepend # if necessary | ||||||||
| * @return Set of channels sorted as in the String | ||||||||
| */ | ||||||||
|
|
||||||||
|
|
||||||||
|
Comment on lines
+75
to
+76
There was a problem hiding this comment. Other methods don’t have empty lines between their doc comments and the method itself.
Suggested change
|
||||||||
| private static HashMap<String,Boolean> setPossibleChannelType(String[] catSplit, HashMap<String,Boolean> channelType){ | ||||||||
|
There was a problem hiding this comment. The one other place a Also
Suggested change
|
||||||||
|
|
||||||||
|
There was a problem hiding this comment. Other methods don’t seem to have a blank line at their beginning.
Suggested change
|
||||||||
| for (int i = 1; i < catSplit.length; i++) { | ||||||||
| if (catSplit[i].equals("#")) { | ||||||||
| channelType.put("onlyChans",true); | ||||||||
|
|
||||||||
| } | ||||||||
| else if (catSplit[i].equals("!#")) { | ||||||||
| channelType.put("noChans",true); | ||||||||
|
|
||||||||
| } | ||||||||
| else if (catSplit[i].equals("live")) { | ||||||||
| channelType.put("onlyLive",true); | ||||||||
| } | ||||||||
| } | ||||||||
| return channelType; | ||||||||
| } | ||||||||
|
|
||||||||
| private static List<String> storePossibleChannelNamesToList(String cat, HashMap<String,Boolean> channelType){ | ||||||||
|
|
||||||||
| List<String> chans = new ArrayList<>(); | ||||||||
| if (cat.equals("*")) { | ||||||||
| chans = new ArrayList<>(parseChannelHelper.getFavorites()); | ||||||||
| } | ||||||||
| else { | ||||||||
| for (String name : parseChannelHelper.getNamesByCategory(cat)) { | ||||||||
| if ((!channelType.get("noChans") || !name.startsWith("#")) | ||||||||
| && (!channelType.get("onlyChans") || name.startsWith("#"))) { | ||||||||
| chans.add(name); | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
| return chans; | ||||||||
| } | ||||||||
|
|
||||||||
| private static void getPossibleChannelNames(String channel, boolean prepend, Set<String> result){ | ||||||||
|
|
||||||||
| String[] channelTypes = new String[]{"noChans","onlyChans","onlyLive"}; | ||||||||
| HashMap<String,Boolean> channelTypeHM = new HashMap<>(); | ||||||||
|
|
||||||||
| for(String channelType: channelTypes){ | ||||||||
|
There was a problem hiding this comment.
Suggested change
|
||||||||
| channelTypeHM.put(channelType,false); | ||||||||
| } | ||||||||
| String[] catSplit = channel.substring(1, channel.length() - 1).split(" "); | ||||||||
| String cat = catSplit[0]; | ||||||||
| channelTypeHM = setPossibleChannelType(catSplit,channelTypeHM); | ||||||||
| List<String> chans = storePossibleChannelNamesToList(cat,channelTypeHM); | ||||||||
| for (String chan : chans) { | ||||||||
| if (!channelTypeHM.get("onlyLive") || parseChannelHelper.isStreamLive(Helper.toStream(chan))) { | ||||||||
| addValidChannel(chan, prepend, result); | ||||||||
| } | ||||||||
| } | ||||||||
| } | ||||||||
|
There was a problem hiding this comment. Again, whitespace helps readability, esp. if there’s consistency in how they’re used. :)
Suggested change
|
||||||||
| public static Set<String> parseChannelsFromString(String channels, boolean prepend) { | ||||||||
| String[] parts = channels.split(","); | ||||||||
| Set<String> result = new LinkedHashSet<>(); | ||||||||
|
|
@@ -82,39 +133,7 @@ public static Set<String> parseChannelsFromString(String channels, boolean prepe | |||||||
| addValidChannel(channel, prepend, result); | ||||||||
| } | ||||||||
| else if (channel.startsWith("[") && channel.endsWith("]") && channel.length() > 2 && parseChannelHelper != null) { | ||||||||
| getPossibleChannelNames(channel,prepend,result); | ||||||||
|
There was a problem hiding this comment. Parameter spaces.
Suggested change
|
||||||||
| } | ||||||||
| } | ||||||||
| return result; | ||||||||
|
|
@@ -641,62 +660,8 @@ public static final void main(String[] args) { | |||||||
| System.out.println(nf.format(Math.round(74/30.0)*30/60.0)); | ||||||||
| } | ||||||||
|
|
||||||||
|
|
||||||||
|
|
||||||||
| public static String checkHttpUrl(String url) { | ||||||||
| if (url == null) { | ||||||||
| return null; | ||||||||
|
|
@@ -1210,4 +1175,131 @@ public static boolean isBeforeChatCommandsShutoff() { | |||||||
| return Instant.now().isBefore(CHAT_COMMAND_SHUTOFF); | ||||||||
| } | ||||||||
|
|
||||||||
| public interface UserStatusMatcher { | ||||||||
| boolean matchUserStatus(User user); | ||||||||
| } | ||||||||
|
|
||||||||
| public static class ModeratorMatcher implements UserStatusMatcher { | ||||||||
| @Override | ||||||||
| public boolean matchUserStatus(User user) { | ||||||||
| return user.isModerator(); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| public static class SubscriberMatcher implements UserStatusMatcher { | ||||||||
| @Override | ||||||||
| public boolean matchUserStatus(User user) { | ||||||||
| return user.isSubscriber(); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| public static class TurboMatcher implements UserStatusMatcher { | ||||||||
| @Override | ||||||||
| public boolean matchUserStatus(User user) { | ||||||||
| return user.hasTurbo(); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| public static class AdminMatcher implements UserStatusMatcher { | ||||||||
| @Override | ||||||||
| public boolean matchUserStatus(User user) { | ||||||||
| return user.isAdmin(); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| public static class BroadcasterMatcher implements UserStatusMatcher { | ||||||||
| @Override | ||||||||
| public boolean matchUserStatus(User user) { | ||||||||
| return user.isBroadcaster(); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| public static class StaffMatcher implements UserStatusMatcher { | ||||||||
| @Override | ||||||||
| public boolean matchUserStatus(User user) { | ||||||||
| return user.isStaff(); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| public static class BotMatcher implements UserStatusMatcher { | ||||||||
| @Override | ||||||||
| public boolean matchUserStatus(User user) { | ||||||||
| return user.isBot(); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| public static class GlobalModMatcher implements UserStatusMatcher { | ||||||||
| @Override | ||||||||
| public boolean matchUserStatus(User user) { | ||||||||
| return user.isGlobalMod(); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| public static class AnyModMatcher implements UserStatusMatcher { | ||||||||
| @Override | ||||||||
| public boolean matchUserStatus(User user) { | ||||||||
| return user.isAdmin() || user.isBroadcaster() || user.isGlobalMod() | ||||||||
| || user.isModerator() || user.isStaff(); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| public static class VipMatcher implements UserStatusMatcher { | ||||||||
| @Override | ||||||||
| public boolean matchUserStatus(User user) { | ||||||||
| return user.hasTwitchBadge("vip"); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| /** | ||||||||
| * Checks if the id matches the given User. The id can be one of: $mod, | ||||||||
| * $sub, $turbo, $admin, $broadcaster, $staff, $bot. If the user has the | ||||||||
| * appropriate user status, this returns true. If the id is unknown or the | ||||||||
| * user doesn't have the required status, this returns false. | ||||||||
| * | ||||||||
| * @param id The id that is required | ||||||||
| * @param user The User object to check against | ||||||||
| * @return true if the id is known and matches the User, false otherwise | ||||||||
| */ | ||||||||
|
|
||||||||
| public static boolean matchUserStatus(String id, User user) { | ||||||||
|
|
||||||||
|
|
||||||||
| UserStatusMatcher matcher = null; | ||||||||
|
|
||||||||
| switch (id) { | ||||||||
| case "$mod": | ||||||||
| matcher = new ModeratorMatcher(); | ||||||||
| break; | ||||||||
| case "$sub": | ||||||||
| matcher = new SubscriberMatcher(); | ||||||||
| break; | ||||||||
| case "$turbo": | ||||||||
| matcher = new TurboMatcher(); | ||||||||
| break; | ||||||||
| case "$admin": | ||||||||
| matcher = new AdminMatcher(); | ||||||||
| break; | ||||||||
| case "$broadcaster": | ||||||||
| matcher = new BroadcasterMatcher(); | ||||||||
| break; | ||||||||
| case "$staff": | ||||||||
| matcher = new StaffMatcher(); | ||||||||
| break; | ||||||||
| case "$bot": | ||||||||
| matcher = new BotMatcher(); | ||||||||
| break; | ||||||||
| case "$globalmod": | ||||||||
| matcher = new GlobalModMatcher(); | ||||||||
| break; | ||||||||
| case "$anymod": | ||||||||
| matcher = new AnyModMatcher(); | ||||||||
| break; | ||||||||
| case "$vip": | ||||||||
| matcher = new VipMatcher(); | ||||||||
| break; | ||||||||
| } | ||||||||
|
|
||||||||
| return matcher != null ? matcher.matchUserStatus(user): false; | ||||||||
| } | ||||||||
|
|
||||||||
| } | ||||||||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -126,7 +126,7 @@ public String format(LogRecord record) { | |
| record.getSourceClassName(), | ||
| record.getSourceMethodName(), | ||
| record.getLevel().getName(), | ||
| StackTrace.getStacktraceForLogging(record.getThrown())); | ||
| } | ||
|
|
||
| } | ||
|
|
@@ -137,7 +137,7 @@ public static String formatRecordCompact(LogRecord record) { | |
| simpleFormatMessage(record), | ||
| record.getSourceClassName(), | ||
| record.getSourceMethodName(), | ||
| StackTrace.getStacktraceForLogging(record.getThrown())); | ||
| } | ||
|
|
||
| private static String simpleFormatMessage(LogRecord record) { | ||
|
|
@@ -154,22 +154,6 @@ private static String simpleFormatMessage(LogRecord record) { | |
| } | ||
| } | ||
|
|
||
|
|
||
| static class FileFilter implements Filter { | ||
|
|
||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Existing code uses a space after comma for passing parameters.