mirror of
https://github.com/kevinthedang/discord-ollama.git
synced 2025-12-13 12:06:06 -05:00
Removed Channel Toggle Command (#115)
* Remove: channel-toggle as command and server config * Remove: Thread interface * Fix: Users Thread files will now delete * Fix: Any user can chat in threads now * Fix: Thread history files are now deleted with multiple users * Update: version increment
This commit is contained in:
@@ -8,7 +8,6 @@ export interface UserConfiguration {
|
||||
|
||||
export interface ServerConfiguration {
|
||||
'toggle-chat'?: boolean,
|
||||
'channel-toggle'?: boolean
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -35,12 +34,6 @@ export interface ServerConfig {
|
||||
options: ServerConfiguration
|
||||
}
|
||||
|
||||
export interface Thread {
|
||||
readonly id: string
|
||||
readonly name: string
|
||||
messages: UserMessage[]
|
||||
}
|
||||
|
||||
export interface Channel {
|
||||
readonly id: string
|
||||
readonly name: string
|
||||
@@ -54,5 +47,5 @@ export interface Channel {
|
||||
* @returns true if command is from Server Config, false otherwise
|
||||
*/
|
||||
export function isServerConfigurationKey(key: string): key is keyof ServerConfiguration {
|
||||
return ['toggle-chat', 'channel-toggle'].includes(key);
|
||||
return ['toggle-chat'].includes(key);
|
||||
}
|
||||
@@ -1,63 +1,8 @@
|
||||
import { TextChannel, ThreadChannel } from 'discord.js'
|
||||
import { Configuration, Thread, Channel, UserMessage } from '../index.js'
|
||||
import { Configuration, Channel, UserMessage } from '../index.js'
|
||||
import fs from 'fs'
|
||||
import path from 'path'
|
||||
|
||||
/**
|
||||
* Method to open/create and modify a json file containing thread information
|
||||
*
|
||||
* @param filename name of the thread file
|
||||
* @param thread the thread with all of the interactions
|
||||
* @param message message contents and from who
|
||||
*/
|
||||
export function openThreadInfo(filename: string, thread: ThreadChannel, messages: UserMessage[] = []) {
|
||||
// check if the file exists, if not then make the config file
|
||||
const fullFileName = `data/${filename}`
|
||||
if (fs.existsSync(fullFileName)) {
|
||||
fs.readFile(fullFileName, 'utf8', (error, data) => {
|
||||
if (error)
|
||||
console.log(`[Error: openThreadInfo] Incorrect file format`)
|
||||
else {
|
||||
const object = JSON.parse(data)
|
||||
object['messages'] = messages as []
|
||||
fs.writeFileSync(fullFileName, JSON.stringify(object, null, 2))
|
||||
}
|
||||
})
|
||||
} else { // file doesn't exist, create it
|
||||
const object: Configuration = JSON.parse(`{ \"id\": \"${thread?.id}\", \"name\": \"${thread?.name}\", \"messages\": []}`)
|
||||
|
||||
const directory = path.dirname(fullFileName)
|
||||
if (!fs.existsSync(directory))
|
||||
fs.mkdirSync(directory, { recursive: true })
|
||||
|
||||
// only creating it, no need to add anything
|
||||
fs.writeFileSync(fullFileName, JSON.stringify(object, null, 2))
|
||||
console.log(`[Util: openThreadInfo] Created '${fullFileName}' in working directory`)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Method to obtain the configurations of the message chat/thread
|
||||
*
|
||||
* @param filename name of the configuration file to get
|
||||
* @param callback function to allow a promise from getting the config
|
||||
*/
|
||||
export async function getThread(filename: string, callback: (config: Thread | undefined) => void): Promise<void> {
|
||||
// attempt to read the file and get the configuration
|
||||
const fullFileName = `data/${filename}`
|
||||
if (fs.existsSync(fullFileName)) {
|
||||
fs.readFile(fullFileName, 'utf8', (error, data) => {
|
||||
if (error) {
|
||||
callback(undefined)
|
||||
return // something went wrong... stop
|
||||
}
|
||||
callback(JSON.parse(data))
|
||||
})
|
||||
} else {
|
||||
callback(undefined) // file not found
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Method to check if a thread history file exists
|
||||
*
|
||||
@@ -65,16 +10,15 @@ export async function getThread(filename: string, callback: (config: Thread | un
|
||||
* @returns true if channel does not exist, false otherwise
|
||||
*/
|
||||
async function checkChannelInfoExists(channel: TextChannel, user: string) {
|
||||
// thread exist handler
|
||||
const isThread: boolean = await new Promise((resolve) => {
|
||||
getThread(`${channel.id}-${user}.json`, (channelInfo) => {
|
||||
const doesExists: boolean = await new Promise((resolve) => {
|
||||
getChannelInfo(`${channel.id}-${user}.json`, (channelInfo) => {
|
||||
if (channelInfo?.messages)
|
||||
resolve(true)
|
||||
else
|
||||
resolve(false)
|
||||
})
|
||||
})
|
||||
return isThread
|
||||
return doesExists
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -121,19 +65,7 @@ export async function clearChannelInfo(filename: string, channel: TextChannel, u
|
||||
* @param user the user's name
|
||||
* @param messages their messages
|
||||
*/
|
||||
export async function openChannelInfo(filename: string, channel: TextChannel, user: string, messages: UserMessage[] = []): Promise<void> {
|
||||
const isThread: boolean = await new Promise((resolve) => {
|
||||
getThread(`${channel.id}.json`, (threadInfo) => {
|
||||
if (threadInfo?.messages)
|
||||
resolve(true)
|
||||
else
|
||||
resolve(false)
|
||||
})
|
||||
})
|
||||
|
||||
// this is a thread channel, do not duplicate files
|
||||
if (isThread) return
|
||||
|
||||
export async function openChannelInfo(filename: string, channel: TextChannel | ThreadChannel, user: string, messages: UserMessage[] = []): Promise<void> {
|
||||
const fullFileName = `data/${filename}-${user}.json`
|
||||
if (fs.existsSync(fullFileName)) {
|
||||
fs.readFile(fullFileName, 'utf8', (error, data) => {
|
||||
|
||||
Reference in New Issue
Block a user