remove list reversal

oldschoolgg · Oct 18, 2024 · 29435b5 · 29435b5
1 parent 56c978b
commit 29435b5
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 5 deletions.
diff --git a/docs/src/content/docs/osb/combat-achievements.mdx b/docs/src/content/docs/osb/combat-achievements.mdx
@@ -122,7 +122,7 @@ Rewards can be claimed by simply using [[/ca claim]] after completing a new tier
 | Obor | Obor Novice | 1x Obor KC |
 | Obor | Fighting as Intended | 1 in 1 chance per kill |
 | Obor | Sleeping Giant | 1 in 10 chance per kill |
-| Other | Into the Den of Giants | 1x Hill Giant KC, 1x Moss giant KC and 1x Fire Giant KC |
+| Other | Into the Den of Giants | 1x Fire Giant KC, 1x Moss giant KC and 1x Hill Giant KC |
 | Sarachnis | Sarachnis Novice | 10x Sarachnis KC |
 | Scurrius | Sit Rat | 1 in 1 chance per kill |
 | Scurrius | Scurrius Novice | 1x Scurrius KC |

diff --git a/src/lib/util.ts b/src/lib/util.ts
@@ -426,10 +426,8 @@ export function replaceLast(str: string, pattern: string, replacement: string) {
 
 export function joinStrings(itemList: any[], end?: string) {
 	if (itemList.length < 2) return itemList.join(', ');
-	if (
-		itemList.reverse()[0] &&
-		(typeof itemList.reverse()[0] !== 'string' || !itemList.reverse()[0].toString().includes(','))
-	) {
+	const lastItem = itemList[itemList.length - 1];
+	if (lastItem && (typeof lastItem !== 'string' || !lastItem.toString().includes(','))) {
 		return replaceLast(itemList.join(', '), ',', ` ${end ? end : 'and'}`);
 	} else {
 		// commas in last term will put str in weird place