Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2025-02-09 00:41:47 +01:00
Code Issues Projects Releases Wiki Activity

Fixed first session icon for networks

Browse Source
This commit is contained in:
Rsl1122 2019-08-23 11:31:01 +03:00
parent a3f00c7916
commit 378df81f64
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/common/src/main/java/com/djrapitops/plan/data/container/Session.java
View File

@ -207,7 +207,7 @@ public class Session extends DynamicDataContainer implements DateHolder {
} }
public void setAsFirstSessionIfMatches(Long registerDate) { public void setAsFirstSessionIfMatches(Long registerDate) {
if (registerDate != null && Math.abs(sessionStart - registerDate) < TimeUnit.SECONDS.toMillis(5L)) { if (registerDate != null && Math.abs(sessionStart - registerDate) < TimeUnit.SECONDS.toMillis(15L)) {
this.firstSession = true; this.firstSession = true;
} }
} }

11
Plan/common/src/main/java/com/djrapitops/plan/db/access/queries/objects/SessionQueries.java
View File

@ -29,6 +29,7 @@ import com.djrapitops.plan.db.access.QueryStatement;
import com.djrapitops.plan.db.sql.parsing.Sql; import com.djrapitops.plan.db.sql.parsing.Sql;
import com.djrapitops.plan.db.sql.tables.*; import com.djrapitops.plan.db.sql.tables.*;
import com.djrapitops.plan.utilities.comparators.DateHolderRecentComparator; import com.djrapitops.plan.utilities.comparators.DateHolderRecentComparator;
import org.apache.commons.lang3.StringUtils;
import java.sql.PreparedStatement; import java.sql.PreparedStatement;
import java.sql.ResultSet; import java.sql.ResultSet;
@ -54,7 +55,7 @@ public class SessionQueries {
"s." + SessionsTable.USER_UUID + ',' + "s." + SessionsTable.USER_UUID + ',' +
"s." + SessionsTable.SERVER_UUID + ',' + "s." + SessionsTable.SERVER_UUID + ',' +
"u." + UsersTable.USER_NAME + " as name," + "u." + UsersTable.USER_NAME + " as name," +
"u_info." + UsersTable.REGISTERED + " as registered," + "u_info." + UserInfoTable.REGISTERED + " as registered," +
"server." + ServerTable.NAME + " as server_name," + "server." + ServerTable.NAME + " as server_name," +
SessionsTable.SESSION_START + ',' + SessionsTable.SESSION_START + ',' +
SessionsTable.SESSION_END + ',' + SessionsTable.SESSION_END + ',' +
@ -73,7 +74,7 @@ public class SessionQueries {
FROM + SessionsTable.TABLE_NAME + " s" + FROM + SessionsTable.TABLE_NAME + " s" +
INNER_JOIN + UsersTable.TABLE_NAME + " u on u." + UsersTable.USER_UUID + "=s." + SessionsTable.USER_UUID + INNER_JOIN + UsersTable.TABLE_NAME + " u on u." + UsersTable.USER_UUID + "=s." + SessionsTable.USER_UUID +
INNER_JOIN + ServerTable.TABLE_NAME + " server on server." + ServerTable.SERVER_UUID + "=s." + SessionsTable.SERVER_UUID + INNER_JOIN + ServerTable.TABLE_NAME + " server on server." + ServerTable.SERVER_UUID + "=s." + SessionsTable.SERVER_UUID +
LEFT_JOIN + UserInfoTable.TABLE_NAME + " u_info on u_info." + UserInfoTable.USER_UUID + "=s." + SessionsTable.USER_UUID + AND + "u_info." + UserInfoTable.SERVER_UUID + "=s." + SessionsTable.SERVER_UUID + LEFT_JOIN + UserInfoTable.TABLE_NAME + " u_info on (u_info." + UserInfoTable.USER_UUID + "=s." + SessionsTable.USER_UUID + AND + "u_info." + UserInfoTable.SERVER_UUID + "=s." + SessionsTable.SERVER_UUID + ')' +
LEFT_JOIN + KillsTable.TABLE_NAME + " ON " + "s." + SessionsTable.ID + '=' + KillsTable.TABLE_NAME + '.' + KillsTable.SESSION_ID + LEFT_JOIN + KillsTable.TABLE_NAME + " ON " + "s." + SessionsTable.ID + '=' + KillsTable.TABLE_NAME + '.' + KillsTable.SESSION_ID +
LEFT_JOIN + UsersTable.TABLE_NAME + " v on v." + UsersTable.USER_UUID + '=' + KillsTable.VICTIM_UUID + LEFT_JOIN + UsersTable.TABLE_NAME + " v on v." + UsersTable.USER_UUID + '=' + KillsTable.VICTIM_UUID +
INNER_JOIN + WorldTimesTable.TABLE_NAME + " ON s." + SessionsTable.ID + '=' + WorldTimesTable.TABLE_NAME + '.' + WorldTimesTable.SESSION_ID + INNER_JOIN + WorldTimesTable.TABLE_NAME + " ON s." + SessionsTable.ID + '=' + WorldTimesTable.TABLE_NAME + '.' + WorldTimesTable.SESSION_ID +
@ -376,10 +377,14 @@ public class SessionQueries {
} }
public static Query<List<Session>> fetchLatestSessions(int limit) { public static Query<List<Session>> fetchLatestSessions(int limit) {
String sql = SELECT_SESSIONS_STATEMENT + String modifiedSQL = SELECT_SESSIONS_STATEMENT +
WHERE + "s." + SessionsTable.SESSION_START + ">=?" + WHERE + "s." + SessionsTable.SESSION_START + ">=?" +
ORDER_BY_SESSION_START_DESC; ORDER_BY_SESSION_START_DESC;
// Fix for "First Session" icons in the Most recent sessions on network page
modifiedSQL = StringUtils.remove(modifiedSQL, LEFT_JOIN + UserInfoTable.TABLE_NAME + " u_info on u_info." + UserInfoTable.USER_UUID + "=s." + SessionsTable.USER_UUID + AND + "u_info." + UserInfoTable.SERVER_UUID + "=s." + SessionsTable.SERVER_UUID);
modifiedSQL = StringUtils.replace(modifiedSQL, "u_info", "u");
String sql = modifiedSQL; // Make effectively final for lambda
return db -> { return db -> {
Long start = db.query(fetchLatestSessionStartLimit(limit)); Long start = db.query(fetchLatestSessionStartLimit(limit));
return db.query(new QueryStatement<List<Session>>(sql) { return db.query(new QueryStatement<List<Session>>(sql) {