Compare commits

..

10 Commits

Author SHA1 Message Date
24b5386b51 Kuru 2025-08-16 10:15:49 -04:00
3e3463593e Potential form 2025-08-16 10:15:49 -04:00
2c0e22d0b0 Desire form 2025-08-16 10:15:49 -04:00
52d77652d0 Past tense 2025-08-16 10:15:49 -04:00
60ce9f2690 Better te-form testing 2025-08-16 10:15:49 -04:00
f2caa10be2 Present short forms 2025-08-16 10:15:49 -04:00
5360629da0 Setup testing 2025-08-16 10:15:47 -04:00
8552a95bb7 Te form 2025-08-16 07:21:11 -04:00
25f2d260c7 Start working on verbs 2025-08-16 06:58:26 -04:00
e59221b9ad Add command architecture 2025-08-15 17:03:12 -04:00
12 changed files with 570 additions and 49 deletions

2
ika.rb
View File

@ -1,5 +1,5 @@
require 'discordrb'
require_relative './src/ika'
require_relative './lib/ika'
token = File.read("./token")

4
lib/commands.rb Normal file
View File

@ -0,0 +1,4 @@
require_relative "commands/command"
require_relative "commands/help_command"
require_relative "commands/lesson_command"
require_relative "commands/stop_lesson_command"

47
lib/commands/command.rb Normal file
View File

@ -0,0 +1,47 @@
module Commands
@@commands = []
def self.register_command(command_class)
@@commands << command_class
end
def self.registered_commands
@@commands
end
class Command
def self.inherited(klass)
p klass
Commands.register_command klass
end
def self.for(ika, message)
Commands.registered_commands.find do |command_class|
command_class.matches? message.message.content
end&.new(ika, message)
end
def self.matches?(message_text)
message_text == "!#{command_string}"
end
def self.help
"!#{command_string} - #{description}"
end
def self.description
"blah blah blah"
end
attr_reader :ika, :message
def initialize(ika, message)
@ika = ika
@message = message
end
def execute
puts "This is a generic command! I can't execute anything!"
end
end
end

View File

@ -0,0 +1,16 @@
module Commands
class Help < Command
def self.command_string
"help"
end
def self.description
"Shows you a list of available commands"
end
def execute
message.respond ["I'm Ika! Here are the commands I know:",
*Commands.registered_commands.map(&:help)].join("\n")
end
end
end

View File

@ -0,0 +1,18 @@
module Commands
class LessonCommand < Command
def self.command_string
"lesson"
end
def self.description
"Starts timers for a lesson"
end
def execute
return message.respond("There's already a lesson running!") if ika.current_lesson_running?
message.respond("Starting a lesson now!")
ika.start_lesson! message
end
end
end

View File

@ -0,0 +1,18 @@
module Commands
class StopLessonCommand < Command
def self.command_string
"stoplesson"
end
def self.description
"Stops the current lesson, if one is running"
end
def execute
return message.respond("There's no lesson running") unless ika.current_lesson_running?
message.respond("Ending the current lesson!")
ika.stop_current_lesson!
end
end
end

57
lib/ika.rb Normal file
View File

@ -0,0 +1,57 @@
require_relative './session'
require_relative './lesson'
require_relative './commands'
class Ika
attr_reader :bot
attr_reader :lessons, :sessions
attr_accessor :current_lesson, :current_session
def initialize(bot)
@bot = bot
@lessons = {}
@sessions = {}
@current_session = nil
@current_lesson = Lesson.new
end
def start!
bot.remove_handler @message_handler if @message_handler
@message_handler = bot.message do |message|
handle_message message
end
bot.run # you can run this in the background, idk
end
def stop!
bot.remove_handler @message_handler if @message_handler
end
def current_lesson_running?
current_lesson.running?
end
def start_lesson!(message)
current_lesson.start!(message.channel)
end
def stop_current_lesson!
current_lesson.stop!
end
def handle_message(message)
if command = Commands::Command.for(self, message)
command.execute
end
return current_session&.respond_to message
if message.message.content == "!init"
return message.respond("There's already a session running") unless current_session.nil?
return current_session = Session.new(message, event.message.author)
end
end
end

211
lib/verb.rb Normal file
View File

@ -0,0 +1,211 @@
U_VOWEL_CHANGES = {
"" => { "a" => "", "i" => "", "u" => "", "e" => "", "o" => "" },
"" => { "a" => "", "i" => "", "u" => "", "e" => "", "o" => "" },
"" => { "a" => "", "i" => "", "u" => "", "e" => "", "o" => "" },
"" => { "a" => "", "i" => "", "u" => "", "e" => "", "o" => "" },
"" => { "a" => "", "i" => "", "u" => "", "e" => "", "o" => "" },
"" => { "a" => "", "i" => "", "u" => "", "e" => "", "o" => "" },
"" => { "a" => "", "i" => "", "u" => "", "e" => "", "o" => "" },
"" => { "a" => "", "i" => "", "u" => "", "e" => "", "o" => "" },
"" => { "a" => "", "i" => "", "u" => "", "e" => "", "o" => "" },
}
TE_TA_DE_DA = {
"" => "", "" => ""
}
class KanaKanji
attr_reader :kana, :kanji
def initialize(kana, kanji=nil)
@kana = kana
@kanji = kanji || kana
end
def [] (index)
self.class.new kana[index], kanji[index]
end
def + (other)
case other
when String
self.class.new kana + other, kanji + other
when KanaKanji
self.class.new kana + other.kana, kanji + other.kanji
end
end
def last_character(new_form=nil)
return kana[-1] unless new_form
U_VOWEL_CHANGES[kana[-1]][new_form]
end
def all_but_last_character
self.class.new kana[0...-1], kanji[0...-1]
end
end
class Verb
attr_reader :dict_kanji, :dict_kana, :definition, :dict
def initialize(dict_kanji, dict_kana, definition)
@dict_kanji = dict_kanji || dict_kana
@dict_kana = dict_kana
@dict = KanaKanji.new dict_kana, dict_kanji
@definition = definition
end
def last_character(new_form=nil)
dict.last_character(new_form)
end
def all_but_last_character
dict.all_but_last_character
end
def dictionary
dict
end
def long_form_present_positive
stem + "ます"
end
def long_form_present_negative
stem + "ません"
end
def long_form_past_positive
stem + "ました"
end
def long_form_past_negative
long_form_present_negative + "でした"
end
def short_form_present_positive
dictionary
end
def short_form_present_negative
negative_stem + "ない"
end
def short_form_past_positive
te.all_but_last_character + TE_TA_DE_DA[te.last_character]
end
def short_form_past_negative
short_form_present_negative.all_but_last_character + "かった"
end
def desire
stem + "たい"
end
def potential
IchidanVerb.new(potential_starter.kanji, potential_starter.kana, "to be able #{definition}")
end
end
class IchidanVerb < Verb
def stem
all_but_last_character
end
def negative_stem
stem
end
def te
all_but_last_character + ""
end
def potential_starter
stem + "られる"
end
end
class GodanVerb < Verb
def iku?
dict.kanji == "行く"
end
def stem
all_but_last_character + last_character("i")
end
def negative_stem
all_but_last_character + last_character("a")
end
def potential_starter
all_but_last_character + last_character("e") + ""
end
def te
all_but_last_character + case last_character
when ""
"って"
when ""
"って"
when ""
"って"
when ""
"して"
when ""
iku? ? "って" : "いて"
when ""
"いで"
when ""
"んで"
when ""
"んで"
when ""
"んで"
end
end
end
class SuruVerb < Verb
def prefix
dict[..-3]
end
def stem
prefix + ""
end
def negative_stem
prefix + ""
end
def te
prefix + "して"
end
def potential_starter
prefix + "できる"
end
end
class KuruVerb < Verb
def prefix
dict[..-3]
end
def te
stem + ""
end
def stem
prefix + KanaKanji.new("", "")
end
def negative_stem
prefix + KanaKanji.new("", "")
end
def potential_starter
negative_stem + "られる"
end
end

View File

@ -1,48 +0,0 @@
require_relative './session'
require_relative './lesson'
class Ika
attr_reader :bot
attr_reader :lessons, :sessions
attr_accessor :current_lesson, :current_session
def initialize(bot)
@bot = bot
@lessons = {}
@sessions = {}
@current_session = nil
@current_lesson = Lesson.new
end
def start!
bot.remove_handler @message_handler if @message_handler
@message_handler = bot.message do |message|
handle_message message
end
bot.run # you can run this in the background, idk
end
def end!
bot.remove_handler @message_handler if @message_handler
end
def handle_message message
if message.message.content == "!init"
return message.respond("There's already a session running") unless current_session.nil?
return current_session = Session.new(message, event.message.author)
elsif message.message.content == "!lesson"
return message.respond("There's already a lesson running") if current_lesson.running?
message.respond("Starting a lesson now!")
return current_lesson.start!(message.channel)
elsif message.message.content == "!stoplesson"
return message.respond("There's no lesson running") unless current_lesson.running?
message.respond("Ending the current lesson!")
return current_lesson.stop!
end
end
end

198
test/test_verb.rb Normal file
View File

@ -0,0 +1,198 @@
require_relative "../lib/verb"
require "minitest/autorun"
class TestVerb < Minitest::Test
def setup
@miru = IchidanVerb.new("見る", "みる", "to look")
@nomu = GodanVerb.new("飲む", "のむ", "to drink")
@au = GodanVerb.new("会う", "あう", "to meet")
@matsu = GodanVerb.new("待つ", "まつ", "to wait")
@toru = GodanVerb.new("取る", "とる", "to take")
@yomu = GodanVerb.new("読む", "よむ", "to read")
@asobu = GodanVerb.new("遊ぶ", "あそぶ", "to play")
@shinu = GodanVerb.new("死ぬ", "しぬ", "to die")
@kaku = GodanVerb.new("書く", "かく", "to write")
@iku = GodanVerb.new("行く", "いく", "to go")
@oyogu = GodanVerb.new("泳ぐ", "およぐ", "to swim")
@hanasu = GodanVerb.new("話す", "はなす", "to speak")
@suru = SuruVerb.new("する", "する", "to do")
@benkyousuru = SuruVerb.new("勉強する", "べんきょうする", "to study")
@kuru = KuruVerb.new("来る", "くる", "to come")
@tsuretekuru = KuruVerb.new("連れて来る", "つれてくる", "to bring somebody along")
end
def test_te_form
assert_equal "見て", @miru.te.kanji
assert_equal "みて", @miru.te.kana
assert_equal "飲んで", @nomu.te.kanji
assert_equal "のんで", @nomu.te.kana
assert_equal "して", @suru.te.kanji
assert_equal "して", @suru.te.kana
assert_equal "勉強して", @benkyousuru.te.kanji
assert_equal "べんきょうして", @benkyousuru.te.kana
assert_equal "会って", @au.te.kanji
assert_equal "待って", @matsu.te.kanji
assert_equal "取って", @toru.te.kanji
assert_equal "読んで", @yomu.te.kanji
assert_equal "遊んで", @asobu.te.kanji
assert_equal "死んで", @shinu.te.kanji
assert_equal "書いて", @kaku.te.kanji
assert_equal "行って", @iku.te.kanji
assert_equal "泳いで", @oyogu.te.kanji
assert_equal "話して", @hanasu.te.kanji
assert_equal "来て", @kuru.te.kanji
assert_equal "きて", @kuru.te.kana
assert_equal "連れて来て", @tsuretekuru.te.kanji
assert_equal "つれてきて", @tsuretekuru.te.kana
end
def test_long_form_present_positive
assert_equal "見ます", @miru.long_form_present_positive.kanji
assert_equal "みます", @miru.long_form_present_positive.kana
assert_equal "飲みます", @nomu.long_form_present_positive.kanji
assert_equal "のみます", @nomu.long_form_present_positive.kana
assert_equal "します", @suru.long_form_present_positive.kanji
assert_equal "します", @suru.long_form_present_positive.kana
assert_equal "勉強します", @benkyousuru.long_form_present_positive.kanji
assert_equal "べんきょうします", @benkyousuru.long_form_present_positive.kana
assert_equal "来ます", @kuru.long_form_present_positive.kanji
assert_equal "きます", @kuru.long_form_present_positive.kana
assert_equal "連れて来ます", @tsuretekuru.long_form_present_positive.kanji
assert_equal "つれてきます", @tsuretekuru.long_form_present_positive.kana
end
def test_long_form_present_negative
assert_equal "見ません", @miru.long_form_present_negative.kanji
assert_equal "みません", @miru.long_form_present_negative.kana
assert_equal "飲みません", @nomu.long_form_present_negative.kanji
assert_equal "のみません", @nomu.long_form_present_negative.kana
assert_equal "しません", @suru.long_form_present_negative.kanji
assert_equal "しません", @suru.long_form_present_negative.kana
assert_equal "勉強しません", @benkyousuru.long_form_present_negative.kanji
assert_equal "べんきょうしません", @benkyousuru.long_form_present_negative.kana
assert_equal "来ません", @kuru.long_form_present_negative.kanji
assert_equal "きません", @kuru.long_form_present_negative.kana
assert_equal "連れて来ません", @tsuretekuru.long_form_present_negative.kanji
assert_equal "つれてきません", @tsuretekuru.long_form_present_negative.kana
end
def test_short_form_present_positive
assert_equal "見る", @miru.short_form_present_positive.kanji
assert_equal "みる", @miru.short_form_present_positive.kana
assert_equal "飲む", @nomu.short_form_present_positive.kanji
assert_equal "のむ", @nomu.short_form_present_positive.kana
assert_equal "する", @suru.short_form_present_positive.kanji
assert_equal "する", @suru.short_form_present_positive.kana
assert_equal "勉強する", @benkyousuru.short_form_present_positive.kanji
assert_equal "べんきょうする", @benkyousuru.short_form_present_positive.kana
assert_equal "来る", @kuru.short_form_present_positive.kanji
assert_equal "くる", @kuru.short_form_present_positive.kana
assert_equal "連れて来る", @tsuretekuru.short_form_present_positive.kanji
assert_equal "つれてくる", @tsuretekuru.short_form_present_positive.kana
end
def test_short_form_present_negative
assert_equal "見ない", @miru.short_form_present_negative.kanji
assert_equal "みない", @miru.short_form_present_negative.kana
assert_equal "飲まない", @nomu.short_form_present_negative.kanji
assert_equal "のまない", @nomu.short_form_present_negative.kana
assert_equal "しない", @suru.short_form_present_negative.kanji
assert_equal "しない", @suru.short_form_present_negative.kana
assert_equal "勉強しない", @benkyousuru.short_form_present_negative.kanji
assert_equal "べんきょうしない", @benkyousuru.short_form_present_negative.kana
assert_equal "来ない", @kuru.short_form_present_negative.kanji
assert_equal "こない", @kuru.short_form_present_negative.kana
assert_equal "連れて来ない", @tsuretekuru.short_form_present_negative.kanji
assert_equal "つれてこない", @tsuretekuru.short_form_present_negative.kana
end
def test_long_form_past_positive
assert_equal "見ました", @miru.long_form_past_positive.kanji
assert_equal "みました", @miru.long_form_past_positive.kana
assert_equal "飲みました", @nomu.long_form_past_positive.kanji
assert_equal "のみました", @nomu.long_form_past_positive.kana
assert_equal "しました", @suru.long_form_past_positive.kanji
assert_equal "しました", @suru.long_form_past_positive.kana
assert_equal "勉強しました", @benkyousuru.long_form_past_positive.kanji
assert_equal "べんきょうしました", @benkyousuru.long_form_past_positive.kana
assert_equal "来ました", @kuru.long_form_past_positive.kanji
assert_equal "きました", @kuru.long_form_past_positive.kana
assert_equal "連れて来ました", @tsuretekuru.long_form_past_positive.kanji
assert_equal "つれてきました", @tsuretekuru.long_form_past_positive.kana
end
def test_long_form_past_negative
assert_equal "見ませんでした", @miru.long_form_past_negative.kanji
assert_equal "みませんでした", @miru.long_form_past_negative.kana
assert_equal "飲みませんでした", @nomu.long_form_past_negative.kanji
assert_equal "のみませんでした", @nomu.long_form_past_negative.kana
assert_equal "しませんでした", @suru.long_form_past_negative.kanji
assert_equal "しませんでした", @suru.long_form_past_negative.kana
assert_equal "勉強しませんでした", @benkyousuru.long_form_past_negative.kanji
assert_equal "べんきょうしませんでした", @benkyousuru.long_form_past_negative.kana
assert_equal "来ませんでした", @kuru.long_form_past_negative.kanji
assert_equal "きませんでした", @kuru.long_form_past_negative.kana
assert_equal "連れて来ませんでした", @tsuretekuru.long_form_past_negative.kanji
assert_equal "つれてきませんでした", @tsuretekuru.long_form_past_negative.kana
end
def test_short_form_past_positive
assert_equal "見た", @miru.short_form_past_positive.kanji
assert_equal "みた", @miru.short_form_past_positive.kana
assert_equal "飲んだ", @nomu.short_form_past_positive.kanji
assert_equal "のんだ", @nomu.short_form_past_positive.kana
assert_equal "した", @suru.short_form_past_positive.kanji
assert_equal "した", @suru.short_form_past_positive.kana
assert_equal "勉強した", @benkyousuru.short_form_past_positive.kanji
assert_equal "べんきょうした", @benkyousuru.short_form_past_positive.kana
assert_equal "来た", @kuru.short_form_past_positive.kanji
assert_equal "きた", @kuru.short_form_past_positive.kana
assert_equal "連れて来た", @tsuretekuru.short_form_past_positive.kanji
assert_equal "つれてきた", @tsuretekuru.short_form_past_positive.kana
end
def test_short_form_past_negative
assert_equal "見なかった", @miru.short_form_past_negative.kanji
assert_equal "みなかった", @miru.short_form_past_negative.kana
assert_equal "飲まなかった", @nomu.short_form_past_negative.kanji
assert_equal "のまなかった", @nomu.short_form_past_negative.kana
assert_equal "しなかった", @suru.short_form_past_negative.kanji
assert_equal "しなかった", @suru.short_form_past_negative.kana
assert_equal "勉強しなかった", @benkyousuru.short_form_past_negative.kanji
assert_equal "べんきょうしなかった", @benkyousuru.short_form_past_negative.kana
assert_equal "来なかった", @kuru.short_form_past_negative.kanji
assert_equal "こなかった", @kuru.short_form_past_negative.kana
assert_equal "連れて来なかった", @tsuretekuru.short_form_past_negative.kanji
assert_equal "つれてこなかった", @tsuretekuru.short_form_past_negative.kana
end
def test_desire
assert_equal "見たい", @miru.desire.kanji
assert_equal "みたい", @miru.desire.kana
assert_equal "飲みたい", @nomu.desire.kanji
assert_equal "のみたい", @nomu.desire.kana
assert_equal "したい", @suru.desire.kanji
assert_equal "したい", @suru.desire.kana
assert_equal "勉強したい", @benkyousuru.desire.kanji
assert_equal "べんきょうしたい", @benkyousuru.desire.kana
assert_equal "来たい", @kuru.desire.kanji
assert_equal "きたい", @kuru.desire.kana
assert_equal "連れて来たい", @tsuretekuru.desire.kanji
assert_equal "つれてきたい", @tsuretekuru.desire.kana
end
def test_potential
assert_equal "見られる", @miru.potential.dictionary.kanji
assert_equal "みられる", @miru.potential.dictionary.kana
assert_equal "飲める", @nomu.potential.dictionary.kanji
assert_equal "のめる", @nomu.potential.dictionary.kana
assert_equal "できる", @suru.potential.dictionary.kanji
assert_equal "できる", @suru.potential.dictionary.kana
assert_equal "勉強できる", @benkyousuru.potential.dictionary.kanji
assert_equal "べんきょうできる", @benkyousuru.potential.dictionary.kana
assert_equal "来られる", @kuru.potential.dictionary.kanji
assert_equal "こられる", @kuru.potential.dictionary.kana
assert_equal "連れて来られる", @tsuretekuru.potential.dictionary.kanji
assert_equal "つれてこられる", @tsuretekuru.potential.dictionary.kana
end
end