Merge branch 'master' of gitlab.com:Isleward/isleward

src/client/ui/templates/reputation/reputation.js

@@ -64,10 +64,15 @@ define([
 			let nextTier = (tier === tiers.length - 1) ? tiers[tiers.length - 1] : tiers[tier + 1];
 
 			let percentage = (rep - prevTier.rep) / (nextTier.rep - prevTier.rep) * 100;
+
+			if (tier === tiers.length - 1)
+				percentage = 100;
+
 			this.find('.bar-outer').show();
 
 			this.find('.front').css({
-				width: percentage + '%'
+				width: percentage + '%',
+				minWidth: percentage + '%'
 			});
 
 			let w = ~~(this.find('.front').width() / 5) * 5;

src/server/components/auth/checkLoginRewards.js

@@ -1,6 +1,8 @@
 const scheduler = require('../../misc/scheduler');
 const rewardGenerator = require('../../misc/rewardGenerator');
 
+const maxRewardedDays = 21;
+
 const calculateDaysSkipped = (oldTime, newTime) => {
 	let daysSkipped = 1;
 
@@ -59,10 +61,10 @@ module.exports = async (cpnAuth, data, character, cbDone) => {
 	else
 		loginStreak = 1;
 
-	loginStreak = Math.max(1, Math.min(21, loginStreak));
 	accountInfo.loginStreak = loginStreak;
 
-	const itemCount = 1 + ~~(loginStreak / 2);
+	const cappedLoginStreak = Math.max(1, Math.min(maxRewardedDays, loginStreak));
+	const itemCount = 1 + ~~(cappedLoginStreak / 2);
 	const rewards = rewardGenerator(itemCount);
 	if (!rewards) {
 		cbDone();