Skip to content

Commit fe1f7ce

Browse files
authored
Remove Message Style Command (#149)
* Remove: Message Style Command * Update: version increment
1 parent 6ac45af commit fe1f7ce

10 files changed

+8
-179
lines changed

docker-compose.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ services:
77
build: ./ # find docker file in designated path
88
container_name: discord
99
restart: always # rebuild container always
10-
image: kevinthedang/discord-ollama:0.7.4
10+
image: kevinthedang/discord-ollama:0.7.5
1111
environment:
1212
CLIENT_TOKEN: ${CLIENT_TOKEN}
1313
OLLAMA_IP: ${OLLAMA_IP}

package-lock.json

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

package.json

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "discord-ollama",
3-
"version": "0.7.4",
3+
"version": "0.7.5",
44
"description": "Ollama Integration into discord",
55
"main": "build/index.js",
66
"exports": "./build/index.js",

src/commands/index.ts

-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
import { SlashCommand } from '../utils/commands.js'
22
import { ThreadCreate } from './threadCreate.js'
3-
import { MessageStyle } from './messageStyle.js'
43
import { MessageStream } from './messageStream.js'
54
import { Disable } from './disable.js'
65
import { Shutoff } from './shutoff.js'
@@ -13,7 +12,6 @@ import { SwitchModel } from './switchModel.js'
1312
export default [
1413
ThreadCreate,
1514
PrivateThreadCreate,
16-
MessageStyle,
1715
MessageStream,
1816
Disable,
1917
Shutoff,

src/commands/messageStyle.ts

-32
This file was deleted.

src/events/messageCreate.ts

+3-9
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
import { TextChannel } from 'discord.js'
2-
import { embedMessage, event, Events, normalMessage, UserMessage, clean } from '../utils/index.js'
2+
import { event, Events, normalMessage, UserMessage, clean } from '../utils/index.js'
33
import { getChannelInfo, getServerConfig, getUserConfig, openChannelInfo, openConfig, UserConfig, getAttachmentData } from '../utils/index.js'
44

55
/**
@@ -134,9 +134,6 @@ export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client
134134
})
135135
}
136136

137-
// response string for ollama to put its response
138-
let response: string
139-
140137
if (!userConfig)
141138
throw new Error(`Failed to initialize User Preference for **${message.author.username}**.\n\nIt's likely you do not have a model set. Please use the \`switch-model\` command to do that.`)
142139

@@ -157,11 +154,8 @@ export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client
157154
images: messageAttachment || []
158155
})
159156

160-
// undefined or false, use normal, otherwise use embed
161-
if (userConfig.options['message-style'])
162-
response = await embedMessage(message, ollama, model, msgHist, shouldStream)
163-
else
164-
response = await normalMessage(message, ollama, model, msgHist, shouldStream)
157+
// response string for ollama to put its response
158+
const response: string = await normalMessage(message, ollama, model, msgHist, shouldStream)
165159

166160
// If something bad happened, remove user query and stop
167161
if (response == undefined) { msgHist.pop(); return }

src/utils/configInterfaces.ts

-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,6 @@ import { UserMessage } from './index.js'
33

44
export interface UserConfiguration {
55
'message-stream'?: boolean,
6-
'message-style'?: boolean,
76
'modify-capacity': number,
87
'switch-model': string
98
}

src/utils/index.ts

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
// Centralized import index
22
export * from './env.js'
33
export * from './events.js'
4-
export * from './messageEmbed.js'
54
export * from './messageNormal.js'
65
export * from './commands.js'
76
export * from './configInterfaces.js'

src/utils/messageEmbed.ts

-129
This file was deleted.

tests/commands.test.ts

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ describe('Commands Existence', () => {
2222
// test specific commands in the object
2323
it('references specific commands', () => {
2424
const commandsString = commands.map(e => e.name).join(', ')
25-
expect(commandsString).toBe('thread, private-thread, message-style, message-stream, toggle-chat, shutoff, modify-capacity, clear-user-channel-history, pull-model, switch-model')
25+
expect(commandsString).toBe('thread, private-thread, message-stream, toggle-chat, shutoff, modify-capacity, clear-user-channel-history, pull-model, switch-model')
2626
})
2727
})
2828

0 commit comments

Comments
 (0)