use message identifiers
This commit is contained in:
		@@ -6,6 +6,7 @@ import { Maybe } from '../interfaces'
 | 
			
		||||
import { logger } from '../logger'
 | 
			
		||||
import { Command } from '../structures/command'
 | 
			
		||||
import { RunOptions } from '../types/commandTypes'
 | 
			
		||||
import { messageIsInitialAnnouncement } from '../helper/messageIdentifiers'
 | 
			
		||||
 | 
			
		||||
export default new Command({
 | 
			
		||||
	name: 'announce',
 | 
			
		||||
@@ -61,7 +62,7 @@ async function sendInitialAnnouncement(guildId: string, requestId: string): Prom
 | 
			
		||||
		return
 | 
			
		||||
	}
 | 
			
		||||
 | 
			
		||||
	const currentPinnedAnnouncementMessages = (await announcementChannel.messages.fetchPinned()).filter(message => message.cleanContent.includes("[initial]"))
 | 
			
		||||
	const currentPinnedAnnouncementMessages = (await announcementChannel.messages.fetchPinned()).filter(message => messageIsInitialAnnouncement(message))
 | 
			
		||||
	currentPinnedAnnouncementMessages.forEach(async (message) => await message.unpin())
 | 
			
		||||
	currentPinnedAnnouncementMessages.forEach(message => message.delete())
 | 
			
		||||
 | 
			
		||||
 
 | 
			
		||||
@@ -8,6 +8,7 @@ import { Maybe } from '../interfaces'
 | 
			
		||||
import { logger } from '../logger'
 | 
			
		||||
import { Command } from '../structures/command'
 | 
			
		||||
import { RunOptions } from '../types/commandTypes'
 | 
			
		||||
import { messageIsVoteEndedMessage, messageIsVoteMessage } from '../helper/messageIdentifiers'
 | 
			
		||||
 | 
			
		||||
export default new Command({
 | 
			
		||||
	name: 'closepoll',
 | 
			
		||||
@@ -41,7 +42,7 @@ export async function closePoll(guild: Guild, requestId: string) {
 | 
			
		||||
 | 
			
		||||
	const messages: Message<true>[] = (await announcementChannel.messages.fetch()) //todo: fetch only pinned messages
 | 
			
		||||
		.map((value) => value)
 | 
			
		||||
		.filter(message => !message.cleanContent.includes("[Abstimmung beendet]") && message.cleanContent.includes("[Abstimmung]"))
 | 
			
		||||
		.filter(message => !messageIsVoteEndedMessage(message) && messageIsVoteMessage(message))
 | 
			
		||||
		.sort((a, b) => b.createdTimestamp - a.createdTimestamp)
 | 
			
		||||
 | 
			
		||||
	if (!messages || messages.length <= 0) {
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user