Commit Graph

2003 Commits

Author SHA1 Message Date
Risto Lahtela
ee02648d9f
[Merge] Changing license from proprietary to LGPLv3 2018-10-28 08:59:38 +02:00
Rsl1122
a531f23bef [Fix] Fixed exception on CraftBukkit servers
Related to Ping gathering and Player.Spigot class
2018-10-27 15:57:11 +03:00
Rsl1122
a131bb7dc8 [V] 4.5.0 Version change
- Updated APF to 3.3.1 (removed SNAPSHOT)
2018-10-27 15:42:32 +03:00
Rsl1122
8aa7fd12e0 [Fix] Velocity enable sequence
- Annotation processor
- Fixed APF parts and added listeners that allow enable and disable.
2018-10-27 15:17:45 +03:00
Rsl1122
23613d7a63 [#752] Html Customization for favicon.ico file
Added a new favicon.ico file that can be customized like all other
web files, by placing a favicon.ico file to /plugins/Plan/web
2018-10-27 11:51:36 +03:00
Sprungente
00e543021f [Merge] German Translations for 4.5 Release (#760) by Sprungente 2018-10-27 09:23:48 +03:00
Rsl1122
4e36545e0a [Fix] Network page oddities
- Fixed Analysis button being green after a 404 on analysis refresh
- Fixed Online graphs going back more than two weeks on servers tab
2018-10-26 13:52:47 +03:00
Rsl1122
05bb441b2d [Fix] Network page registered players SQL 2018-10-26 13:18:53 +03:00
Rsl1122
6aed02e43b [Fix] SQL Timings only in dev mode 2018-10-26 12:59:21 +03:00
Rsl1122
a2b6a3b1e5 [Fix] Help command permission checking 2018-10-26 12:44:53 +03:00
Rsl1122
5c9e2426d7 Merge remote-tracking branch 'origin/development' into development 2018-10-26 12:44:19 +03:00
Rsl1122
436865e8e4
[Merge] Fixed SLF4J warnings (#757) by PyvesB 2018-10-26 08:40:38 +03:00
PyvesB
2d328e1e31 Fixed SLF4J startup warnings 2018-10-25 23:09:09 +01:00
Rsl1122
d490bb64b9 [Fix] Dev release update notification icon 2018-10-25 11:34:43 +03:00
Rsl1122
04c831b9b3 [Fix] Tests fail when server is running 2018-10-25 11:23:06 +03:00
Rsl1122
633f5ba98a [New] Moved update notification to website
Dev releases and releases distinguished by icon
2018-10-25 11:22:37 +03:00
Rsl1122
1d6a6b4b07 [Fix] Fix injection issue 2018-10-25 10:38:17 +03:00
Rsl1122
b7595b12e8 Added Registered player counts per servers 2018-10-25 10:32:58 +03:00
Rsl1122
1bb75299ff [Smell] Rename Nginx -> Proxy in HTTPS Override
Thanks to Miclebrick for the observation.
2018-10-25 10:16:51 +03:00
Rsl1122
7689457d1f [#707] Task for refreshing the /players page
Run every 5 minutes - I'll make it configurable later in a config update
2018-10-24 22:32:35 +03:00
Rsl1122
7bb97f4ffc [#737] Free Disk Space Tracking
- Added a new free disk space to TPS, in megabytes
- Added Gathering method to TPSCountTimers
- Added Column to plan_tps
- Added Patch for adding plan_tps column
- Added Disk usage point mutation method to TPSMutator
  - Filtered out -1 values in Disk and CPU graphs
- Added DiskGraph and its factory method
- Added 'diskSeries' placeholder replacement to AnalysisContainer
- Added diskGraph.js for drawing disk graph
- Added 'diskMedium' & 'diskHigh' threshold placeholders
- Added Medium and high disk threholds to settings
- Replaced MB references with Mb, since B is bit and b is byte
- Added Html Lang
2018-10-24 22:25:43 +03:00
Rsl1122
98aaff0328 [New] Added Nginx HTTPS Override
HTTPS routing override can be activated by setting keystore path to
'nginx' - In this mode Plan uses HTTP server and gives out HTTPS links.

Affected issues: #669
2018-10-23 15:12:45 +03:00
Rsl1122
314e0a2ca7 [New] Added Health info stuff to locale
Affected issues: #734
2018-10-23 14:43:10 +03:00
Rsl1122
cff7fffe92 [New] Added 'Today' and 'Yesterday' to locale
Affected issues: #734
2018-10-23 13:26:34 +03:00
Rsl1122
b9027294ef [Fix] Patch system apply check
Wrong method was in use for database name setting retrieval, resulting
in wrong query. Fixed by replacing usage with correct method

Affected issues: #754
2018-10-22 20:27:12 +03:00
Rsl1122
ca01c26a19 [Fix] Fixed URI parsing
Issue: Can not view non-ascii player name pages
Cause: Raw encoded URI was in use (Contains %20 etc)
Fixed: Decoded URI now in use

Affected issues: #735
2018-10-14 22:33:19 +03:00
Rsl1122
fa34a6c0e6 [Fix] Fixed error in time calculation in Health
Issue: monthAgo - twoWeeksAgo players time is 0
Cause: twoWeeksAgo calculated wrong, being BEFORE monthAgo
Fix:   Move parenthesis

Affected issues: #741
2018-10-14 22:19:38 +03:00
Rsl1122
a757bf7334 [Fix] Fixed refresh formatting inconsistency
${refresh} now uses clock formatting
${refreshFull} now uses full date formatting

Affected issues: #738
2018-10-14 22:11:47 +03:00
Rsl1122
72f0937524 [Fix] Prevented session save from server thread
Affected issues: #748
2018-10-14 22:07:16 +03:00
Rsl1122
b5c29a1c0d [Fix] Fixed issues with Ping gathering
Affected issues: #749
2018-10-14 22:04:00 +03:00
Rsl1122
6a8f93be89 [New] Implemented update check setting
Setting: Plugin.Check-for-updates

Affected issues: #751
2018-10-14 21:41:16 +03:00
Rsl1122
0b7198df07 [Fix] Fixed Sponge network setting load error 2018-10-14 21:32:04 +03:00
Rsl1122
6ecf52beda [Smell] Duplicate provides definition removed 2018-10-14 15:38:52 +03:00
Rsl1122
dd0362599f [Smell] Moved plugin modules under modules.plugin 2018-10-14 15:33:36 +03:00
Rsl1122
644082bf56 [Debt] Fixed PluginData registration of Bridge
Created dagger modules for each platform and turned Bridge abstract.
Injections to classes that require Plugin specific objects are not
possible, and will lead to compile time errors.

Classes that require information about another class at runtime cause
Plan to fail to start if the class is not present - another solution has
to be worked for PlaceholderAPI.
2018-10-14 15:18:47 +03:00
Rsl1122
9acd4879ba [Fix] Velocity checks where Bungee presence is checked. 2018-10-14 11:51:28 +03:00
Rsl1122
6b58e902e6 [Test] Deleted SystemMockUtil 2018-10-13 14:21:32 +03:00
Rsl1122
09e999c82c [Test] Fixed SQLiteTest 2018-10-13 14:10:32 +03:00
Rsl1122
e18e262401 [Test] Fixed DecimalFormatterTest 2018-10-13 14:02:06 +03:00
Rsl1122
77b8be26f3 [Test] Fixed PlayersTableTest 2018-10-13 13:45:01 +03:00
Rsl1122
a2325a0e12 [Test] Fixed HTTPSWebServerAuthTest 2018-10-13 13:40:18 +03:00
Rsl1122
40c6b09801 [Test] Fixed NetworkSettingsTest 2018-10-13 13:35:42 +03:00
Rsl1122
e6396f816f [Smell] Moved Components and Modules out of plugin classes 2018-10-13 13:32:26 +03:00
Rsl1122
e08bd82575 [Test] VelocitySystemTest 2018-10-13 13:20:59 +03:00
Rsl1122
bd7a7ef9d0 [Test] Fixed SpongeSystemTest. Mocked Sponge 2018-10-13 13:06:10 +03:00
Rsl1122
3096e962b5 [Test] Fixed BungeeSystem enable test 2018-10-13 12:43:18 +03:00
Rsl1122
55c49bd220 [Test] Fixed BukkitSystemTest
This test was tougher than usual to fix, since Database could not be
provided during object construction due to config setting default not
being loaded. This would have lead to new installs not functioning.

Fixed by replacing all Database injections with DBSystem
2018-10-13 12:19:36 +03:00
Rsl1122
2e4464b558 [Test] Renamed PingInsertProcessorTest methods 2018-10-13 11:22:36 +03:00
Rsl1122
29df1aca2b [Test] Fixed AFKListenerTest 2018-10-13 11:21:02 +03:00
Rsl1122
1758832b8e [Test] Fixed ImportBuilderTest 2018-10-13 11:17:54 +03:00
Rsl1122
baad1b4c44 [Test] Fixed SessionCacheTest 2018-10-13 10:58:00 +03:00
Rsl1122
50cc9a4304 [Test] Fixed GeolocationCacheTest 2018-10-13 10:46:11 +03:00
Rsl1122
de7eb5ddef [Test] Renamed MockUtils to Mockers 2018-10-13 10:45:59 +03:00
Rsl1122
76df161fc7 [Test] Removed FormattersTest (obsolete) 2018-10-13 10:23:24 +03:00
Rsl1122
7e89a24706 [Test] CachingSupplier test to DataContainerTest 2018-10-13 10:19:48 +03:00
Rsl1122
3af725f3ff [Test] TimeAmountFormatter tests fixed 2018-10-13 10:19:28 +03:00
Rsl1122
27a9d8a526 [Test] Renamed methods in WorldTimesTest 2018-10-13 09:59:53 +03:00
Rsl1122
1e0de6a1fe [Test] Improved GMTimesTest 2018-10-13 09:57:45 +03:00
Rsl1122
71e2d52967 [Test] Renamed PlayerKillTest methods 2018-10-13 09:52:08 +03:00
Rsl1122
25b35ac4ca [Merge] Merge apf-3.3.0-merging to apf-3.3.0
This Commit fixes merge and commit issues in the merge.
2018-10-12 23:55:07 +03:00
Rsl1122
e6a263e071 [Merge] Merge apf-3.3.0-merging to apf-3.3.0
This Commit fixes merge and commit issues in the merge.
2018-10-12 23:54:17 +03:00
MicleBrick
8065432f51 [New] Velocity Support by Miclebrick (#740)
This is a merge commit of a PR that introduces Velocity support.
Some of this support has been ported to APF already and will be removed after merge.

Thanks to Micklebrick and astei! :)
2018-10-12 21:34:47 +03:00
Rsl1122
b56deeb546 [Debt] NetworkContainer creation
Added a Factory to NetworkContainer class.

Users can gain access to NetworkContainers via FetchOperations.
2018-10-12 21:30:41 +03:00
Rsl1122
e7b2770295 [Fix] Fixed Analysis Page Caching
Network Page Update Processor was removing the finished analysis right
after it finished.
2018-10-11 22:36:22 +03:00
Rsl1122
5411fdfead [Debt] AnalysisContainer Factory
Since AnalysisContainer was only created in PageFactory it was easy to
inject dependencies for.
2018-10-08 18:12:58 +03:00
Rsl1122
2ea0caa612 [Debt] AnalysisContainer Low TPS Threshold 2018-10-08 18:03:54 +03:00
Rsl1122
6533875aff [Debt] HealthIndex settings
Added settings and formatters to parameters of different health index
mutators.
2018-10-08 18:02:11 +03:00
Rsl1122
ef16f8ece1 [Debt] ActivityIndex thresholds in RetentionData 2018-10-08 17:40:46 +03:00
Rsl1122
23f96f96aa [Fix] Network Settings save/load
Database was not enabled when the call was made, leading to a NPE when
using MySQL. (DataSource not initialized)

Fixed by moving the calls to scheduled tasks inside TaskSystems.
2018-10-08 17:35:04 +03:00
Rsl1122
47213fa564 [V] APF 3.3.1-SNAPSHOT 2018-10-08 16:55:06 +03:00
Rsl1122
81be032ccf [Debt] Updated Network page updating
This moves the network page servers tab generation and removes need for
network page updates on Bukkit servers, so it was removed.
2018-10-07 21:51:01 +03:00
Rsl1122
d448e7f868 [V] Dropped SNAPSHOT from APF version
Abstract Plugin Framework 3.3.0 is now available in central.
2018-10-07 16:46:50 +03:00
Rsl1122
ade810ca8c [Fix] Fix Command registration
Issue was caused by no call to registerCommands was made at runtime.
2018-10-07 16:17:06 +03:00
Rsl1122
dd3c297fd0 [V] Increased version to 4.4.7 2018-10-06 21:56:58 +03:00
Rsl1122
7f9146fcf4 [Debt] Refactored Server Boxes to network page generation
Some features could not be implemented or will have reduced precision:
- Server type
- Players Online is deduced from TPS data
- Analysis Refresh date is now a true/false based on cache value
2018-10-06 21:38:59 +03:00
Vankka
27c2492599 DiscordSRV plugin data by Vankka (#743) 2018-10-05 22:30:57 +03:00
Vankka
a33ca5b004 LuckPerms Plugin Data by Vankka (#742) 2018-10-04 20:32:34 +03:00
Rsl1122
add18feb83 [Debt] Removed deprecated APF usage leftovers
Removed deprecated:
* Benchmark usage
* TimeAmount usage
* StaticHolder usage
* Log usage
* ErrorManager
2018-10-03 21:33:46 +03:00
Rsl1122
51e2d6fe91 [Debt] Added thresholds to ActivityIndex methods
This required addition of PlanConfig in some places to obtain the values
2018-10-03 20:59:17 +03:00
Rsl1122
6bb24c3903 [New] Set DebugLogger in ConfigSystem
Old Abstract Plugin Framework functionality did this differently,
but now this falls on the hands of developers to not limit the settings.
2018-10-03 20:43:20 +03:00
Rsl1122
c4bf9a500f [Fix] Fixed compile issues
Compile issues were caused by recent changes in APF:
* ISender -> Sender rename
* BukkitCMDSender was in use in test, but was made package private.

Fixes:
* Replaced ISender -> Sender
* Replaced BukkitCMDSender use in MiscUtilsTest
* Moved two database tests out from MiscUtilsTest
2018-10-03 20:26:12 +03:00
Rsl1122
6ca86b8c76 [Debug] Improved debug channel usage 2018-09-29 14:44:23 +03:00
Rsl1122
bd636892d6 [Debt] Fixed Plugin Enable Sequence
Removed PlanPlugin.getInstance()
Temporarily disabled Plugin Bridge hooking
2018-09-29 14:19:29 +03:00
Rsl1122
e60e1abe9a [Fix] Fixed cyclic dependency - WorldAliasSettings 2018-09-29 13:47:19 +03:00
Rsl1122
ea9a8b8812 [Debt] Sorted up some Analysis refresh code
Split AnalysisPage#getRefreshingHtml into new RefreshingAnalysisResponse
class. Moved AnalysisPageResponse.refreshNow to ServerPageHandler.
2018-09-29 13:43:56 +03:00
Rsl1122
3625156b36 [Debt] Moved SRP violation in Session
Session#getLongestWorldPlayed was a violation of Single Responsibility
Principle.
The method was moved to WorldAliasSettings, although still a violation,
it makes more sense there than inside the Session class. It also allows
creation of Session without a WorldAliasSettings dependency.
2018-09-29 13:32:59 +03:00
Rsl1122
e12f258a33 [Debt] PlanAPI getInstance uses a static holder.
This is close to a Singleton pattern, but not quite. Testing required
to know impact of using static here. - Is it possible to set null?
2018-09-29 13:21:54 +03:00
Rsl1122
32044ed016 [Debt] Removed easy use of PlanPlugin.getInstance
This removed easy to remove usages of PlanPlugin.getInstance method.
2018-09-29 12:55:22 +03:00
Rsl1122
aeec459ee9 [Debt] Added PlanFiles to FileResponse constructor
ResponseFactory provides the Response objects this dependency.
Renamed all occurrences of "planFiles" -> "files"
2018-09-29 12:44:56 +03:00
Rsl1122
9b9443adf4 [Debt] Removed ServerInfo.getServerUUID() method
Most uses of this method were already handled, but database related were
not. Dependency was met by adding a Supplier<UUID> to SQLDB class.
Patch and Table classes have getServerUUID() method that use supplier in
SQLDB.

UserImportDataBuilder required the dependency, and it was provided via
UserImportData#builder(UUID).
2018-09-29 12:40:58 +03:00
Rsl1122
93951f1f25 [Fix] Increased database clean task start delay
1 second delay is not enough when a patch system has not applied all
patches, and some data requiring patching is scheduled for removal.

Affected issues: #732
2018-09-26 20:43:49 +03:00
Rsl1122
92ce37dda3 [Fix] Patch System column addition fixes
This affects KillsServerIDPatch and IPHashPatch issues.

Affected issues: #732
2018-09-26 20:40:41 +03:00
Rsl1122
a48b660a05 [Debt] Delegated Exception logs to ResponseFactory
ErrorResponse caught an IOException for reading a file from the jar,
but this error should be moved further up stream - thus catching it was
delegated to ResponseFactory, where the error can be parsed into
InternalErrorResponse and dealt with accordingly.
2018-09-24 20:39:36 +03:00
Rsl1122
7f53fb4c80 [Debt] Moved LogsFolderCleanTask out of PlanFiles
This had to be done in order for a call to settings to be made without
a dependency cycle, since PlanConfig depends on PlanFiles.
2018-09-24 19:53:03 +03:00
Rsl1122
b972c26fe8 [Smell] Renamed FileSystem to PlanFiles 2018-09-24 19:41:11 +03:00
Rsl1122
594e9b4072 [Debt] Removed FileUtil.getStringFromResource
Because of PlanPlugin dependency this code needed to be moved elsewhere.
New method to use is FileSystem#readCustomizableResourceFlat
2018-09-24 19:38:39 +03:00
Rsl1122
e72b89571e [Fix] Order of Registration to PluginData values
Old addValue method added the values in an arbitrary label order,
Order of adding makes more sense and gives developers more control.
2018-09-23 18:04:03 +03:00
Rsl1122
836bf28348 [V] Version bump to 4.4.6 2018-09-23 17:52:33 +03:00
Rsl1122
d1d2753422 [Fix] Fix MySQL query for "Has Column"
MySQL query for has column did not take database name into account.
This means that a database with multiple Plan databases would provide
wrong results for the Patch system, leading to patch failiure

Affected issues: Fixes #732
2018-09-23 17:51:36 +03:00
Rsl1122
cbb45bf49d [Fix] Locale lang group replacement changes
Changed the Lang that was being used to replace things on the html, now
some of the Lang is no longer used. (CmdHelpLang, CommandLang, etc)
GenericLang caused page breakage due to wrong replacements, so it is no
longer used for replacement

Affected issues: Fixes #706
2018-09-23 17:39:15 +03:00