Skip to content

Commit 73a4aa2

Browse files
authored
Fix past job post loading on startup (#436)
* Fix isStaff check * Filter staff messages out of job board startup * Fix message loading * Track post time when deleted, as intended
1 parent ca15ef6 commit 73a4aa2

File tree

3 files changed

+9
-8
lines changed

3 files changed

+9
-8
lines changed

src/features/jobs-moderation/job-mod-helpers.ts

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,9 +97,9 @@ export const loadJobs = async (bot: Client, channel: TextChannel) => {
9797
!oldestMessage ||
9898
differenceInDays(now, oldestMessage.createdAt) < DAYS_OF_POSTS
9999
) {
100-
const messages = await channel.messages.fetch({
101-
...(oldestMessage ? { after: oldestMessage.message.id } : {}),
102-
});
100+
const messages = await channel.messages.fetch(
101+
oldestMessage ? { before: oldestMessage.message.id } : {},
102+
);
103103
console.log(
104104
"[DEBUG] loadJobs()",
105105
`Oldest message: ${oldestMessage ? oldestMessage.createdAt : "none"}.`,
@@ -135,18 +135,19 @@ export const loadJobs = async (bot: Client, channel: TextChannel) => {
135135
}
136136
oldestMessage = newMessages
137137
.sort((a, b) => compareAsc(a.createdAt, b.createdAt))
138-
.at(-1);
138+
.at(0);
139139
if (!oldestMessage) break;
140140

141-
const humanMessages = newMessages.filter(
141+
const humanNonStaffMessages = newMessages.filter(
142142
(m) =>
143143
differenceInDays(now, m.createdAt) < DAYS_OF_POSTS &&
144144
!m.message.system &&
145+
!isStaff(m.message.member) &&
145146
m.authorId !== bot.user?.id,
146147
);
147148
const [hiring, forHire] = partition(
148149
(m) => m.type === PostType.hiring,
149-
humanMessages,
150+
humanNonStaffMessages,
150151
);
151152

152153
jobBoardMessageCache = { hiring, forHire };

src/helpers/discord.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ import {
2222
export const difference = <T>(a: Set<T>, b: Set<T>) =>
2323
new Set(Array.from(a).filter((x) => !b.has(x)));
2424

25-
const staffRoles = ["mvp", "moderator", "admin", "admins"];
25+
const staffRoles = ["moderator", "admin", "admins"];
2626
const helpfulRoles = ["mvp", "star helper"];
2727

2828
const hasRole = (member: GuildMember, roles: string | string[]) =>

src/helpers/modLog.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -163,7 +163,7 @@ ${reportedMessage}
163163
164164
${reportedMessage}`;
165165
case ReportReasons.jobAge:
166-
return `${preface}, for hire post expired.`;
166+
return `${preface}, for hire post expired. ${extra}`;
167167
case ReportReasons.jobFrequency:
168168
return `${preface}, posting too frequently.`;
169169

0 commit comments

Comments
 (0)