返回提交历史
Modified
src/services/guildService.ts
+7
-0
Modified
src/types/guildTypes.ts
+6
-3
XFEstudio/SpaceNinjaServer
fix: dojo time fields for old versions (#1968)
Tested this in U27 & U38.5 Reviewed-on: https://onlyg.it/OpenWF/SpaceNinjaServer/pulls/1968 Co-authored-by: Sainan <63328889+Sainan@users.noreply.github.com> Co-committed-by: Sainan <63328889+Sainan@users.noreply.github.com>
f7b4b4f0
代码差异
2 个文件
+13
-3
@@ -175,6 +175,9 @@ export const getDojoClient = async (
175
175
}
176
176
if (dojoComponent.CompletionTime) {
177
177
clientComponent.CompletionTime = toMongoDate(dojoComponent.CompletionTime);
178
clientComponent.TimeRemaining = Math.trunc(
179
(dojoComponent.CompletionTime.getTime() - Date.now()) / 1000
180
);
178
181
if (dojoComponent.CompletionLogPending && Date.now() >= dojoComponent.CompletionTime.getTime()) {
179
182
const entry = guild.RoomChanges?.find(x => x.componentId.equals(dojoComponent._id));
180
183
if (entry) {
@@ -210,6 +213,9 @@ export const getDojoClient = async (
210
213
continue;
211
214
}
212
215
clientComponent.DestructionTime = toMongoDate(dojoComponent.DestructionTime);
216
clientComponent.DestructionTimeRemaining = Math.trunc(
217
(dojoComponent.DestructionTime.getTime() - Date.now()) / 1000
218
);
213
219
}
214
220
} else {
215
221
clientComponent.RegularCredits = dojoComponent.RegularCredits;
@@ -245,6 +251,7 @@ export const getDojoClient = async (
245
251
continue;
246
252
}
247
253
clientDeco.CompletionTime = toMongoDate(deco.CompletionTime);
254
clientDeco.TimeRemaining = Math.trunc((deco.CompletionTime.getTime() - Date.now()) / 1000);
248
255
} else {
249
256
clientDeco.RegularCredits = deco.RegularCredits;
250
257
clientDeco.MiscItems = deco.MiscItems;
@@ -173,9 +173,11 @@ export interface IDojoComponentClient {
173
173
Message?: string;
174
174
RegularCredits?: number; // "Collecting Materials" state: Number of credits that were donated.
175
175
MiscItems?: IMiscItem[]; // "Collecting Materials" state: Resources that were donated.
176
CompletionTime?: IMongoDate;
176
CompletionTime?: IMongoDate; // new versions
177
TimeRemaining?: number; // old versions
177
178
RushPlatinum?: number;
178
DestructionTime?: IMongoDate;
179
DestructionTime?: IMongoDate; // new versions
180
DestructionTimeRemaining?: number; // old versions
179
181
Decos?: IDojoDecoClient[];
180
182
DecoCapacity?: number;
181
183
PaintBot?: IOid;
@@ -212,7 +214,8 @@ export interface IDojoDecoClient {
212
214
Sockets?: number;
213
215
RegularCredits?: number;
214
216
MiscItems?: IMiscItem[];
215
CompletionTime?: IMongoDate;
217
CompletionTime?: IMongoDate; // new versions
218
TimeRemaining?: number; // old versions
216
219
RushPlatinum?: number;
217
220
PictureFrameInfo?: IPictureFrameInfo;
218
221
Pending?: boolean;