Merge pull request #224 from KenEucker/develop

v3.2.7

package.json

@@ -1,6 +1,6 @@
 {
   "name": "biketag",
-  "version": "3.2.6",
+  "version": "3.2.7",
   "description": "The Javascript client API for BikeTag Games",
   "main": "./biketag.node.js",
   "browser": "./biketag.js",

src/common/getters.ts

@@ -485,13 +485,21 @@ export const getImgurFoundDescriptionFromBikeTagData = (
     includeDate ? getDateStringForImgurDescription(tag.foundTime) : ''
   }`
 
-export const getImgurFoundTitleFromBikeTagData = (tag: Tag): string =>
+export const getImgurFoundTitleFromBikeTagData = (
+  tag: Tag,
+  fromCombinedTag = false
+): string =>
   `${
     !tag.gps || (tag.gps.lat === 0 && tag.gps.long === 0)
       ? ''
       : `(${tag.gps.lat ?? 0}, ${tag.gps.long ?? 0}, ${tag.gps.alt ?? 0})`
   } 
-  ${tag.playerId?.length ? `[${tag.playerId}]` : ''} 
+  ${
+    !fromCombinedTag && // don't include the player id from a combined tag in the found tag
+    tag.playerId?.length
+      ? `[${tag.playerId}]`
+      : ''
+  } 
   ${tag.confirmedBoundary ? getConfirmedBoundarySymbol : ''}`
 
 export const getImgurMysteryImageHashFromBikeTagData = (
@@ -500,9 +508,14 @@ export const getImgurMysteryImageHashFromBikeTagData = (
 ): string => {
   return getImageHashFromText(tag.mysteryImageUrl, cache)
 }
-export const getImgurMysteryTitleFromBikeTagData = (tag: Tag): string =>
+export const getImgurMysteryTitleFromBikeTagData = (
+  tag: Tag,
+  fromCombinedTag = false
+): string =>
   `${
-    !tag.gps || (tag.gps.lat === 0 && tag.gps.long === 0)
+    (!fromCombinedTag && // don't include the gps from a combined tag in the mystery
+      !tag.gps) ||
+    (tag.gps.lat === 0 && tag.gps.long === 0)
       ? ''
       : `(${tag.gps.lat ?? 0}, ${tag.gps.long ?? 0}, ${tag.gps.alt ?? 0})`
   } 

src/imgur/helpers.ts

@@ -648,15 +648,16 @@ export const isValidUploadTagImagePayload = (
 
 export const getUpdateTagPayloadFromTagData = (
   payload: uploadTagImagePayload,
-  mystery = false
+  mystery = false,
+  combined = false
 ): uploadTagImagePayload => {
   return {
     imageHash: mystery
       ? getImgurMysteryImageHashFromBikeTagData(payload as Tag)
       : getImgurFoundImageHashFromBikeTagData(payload as Tag),
     title: mystery
-      ? getImgurMysteryTitleFromBikeTagData(payload as Tag)
-      : getImgurFoundTitleFromBikeTagData(payload as Tag),
+      ? getImgurMysteryTitleFromBikeTagData(payload as Tag, combined)
+      : getImgurFoundTitleFromBikeTagData(payload as Tag, combined),
     description: mystery
       ? getImgurMysteryDescriptionFromBikeTagData(payload as Tag)
       : getImgurFoundDescriptionFromBikeTagData(payload as Tag),

src/imgur/updateTag.ts

@@ -14,8 +14,16 @@ export async function updateTag(
   cache?: typeof TinyCache
 ): Promise<BikeTagApiResponse<Tag>> {
   /// Construct imgur payloads for both mystery and found images separately
-  const imgurMysteryImagePayload = getUpdateTagPayloadFromTagData(payload, true)
-  const imgurFoundImagePayload = getUpdateTagPayloadFromTagData(payload)
+  const imgurMysteryImagePayload = getUpdateTagPayloadFromTagData(
+    payload,
+    true,
+    true
+  )
+  const imgurFoundImagePayload = getUpdateTagPayloadFromTagData(
+    payload,
+    false,
+    true
+  )
 
   return new Promise(async (resolve) => {
     let success = true