#371 ごみファイル削除

backend/app/controllers/gekanator_games_controller.rb

@@ -50,7 +50,7 @@ class GekanatorGamesController < ApplicationController
             questions,
             post_id: game.correct_post_id,
             user: current_user,
-            limit: 6)
+            limit: 2)
 
     render json: {
       questions: selected.map { |question| extra_question_json(question) }

backend/spec/models/tag_name_sanitisation_rule_spec.rb

@@ -1,10 +1,6 @@
 require 'rails_helper'
 
 RSpec.describe TagNameSanitisationRule, type: :model do
-  before do
-    described_class.unscoped.delete_all
-  end
-
   describe '.sanitise' do
     before do
       described_class.create!(priority: 10, source_pattern: '_', replacement: '')

backend/spec/requests/gekanator_learning_spec.rb

@@ -206,40 +206,6 @@ RSpec.describe 'Gekanator learning API', type: :request do
       expect(example.gekanator_game_id).to eq(json['id'])
     end
 
-    it 'learns accepted post_similarity answers from main game logs' do
-      sign_in_as admin
-
-      question = create_post_similarity_question!(text: '泣いてる?')
-
-      expect {
-        post '/gekanator/games', params: {
-          guessed_post_id: guessed_post.id,
-          correct_post_id: correct_post.id,
-          answers: [
-            {
-              question_id: "post-similarity:#{question.id}",
-              question_text: '泣いてる?',
-              answer: 'partial',
-              original_answer: 'partial'
-            }
-          ]
-        }
-      }.to change { GekanatorQuestionExample.count }.by(1)
-
-      expect(response).to have_http_status(:created)
-      expect(json['learned_example_count']).to eq(1)
-
-      example = GekanatorQuestionExample.last
-      expect(example).to have_attributes(
-        gekanator_question_id: question.id,
-        post_id: correct_post.id,
-        user_id: admin.id,
-        answer: 'partial',
-        source: 'post_game_answer'
-      )
-      expect(example.gekanator_game_id).to eq(json['id'])
-    end
-
     it 'does not learn fact questions or nico tag questions from main game logs' do
       sign_in_as admin
 
@@ -509,59 +475,28 @@ RSpec.describe 'Gekanator learning API', type: :request do
   end
 
   describe 'GET /gekanator/games/:id/extra_questions' do
-    it 'returns at most six accepted user_suggested post_similarity questions without duplicates' do
+    it 'returns at most two accepted user_suggested post_similarity questions without duplicates' do
       sign_in_as admin
 
-      lowest = create_post_similarity_question!(
-        text: 'lowest?',
-        priority_weight: 0.5
-      )
       low = create_post_similarity_question!(
         text: 'low?',
         priority_weight: 1.0
       )
-      middle = create_post_similarity_question!(
-        text: 'middle?',
-        priority_weight: 1.5
-      )
-      medium_high = create_post_similarity_question!(
-        text: 'medium high?',
-        priority_weight: 2.0
-      )
       high = create_post_similarity_question!(
         text: 'high?',
-        priority_weight: 2.5
-      )
-      higher = create_post_similarity_question!(
-        text: 'higher?',
-        priority_weight: 2.8
-      )
-      highest = create_post_similarity_question!(
-        text: 'highest?',
         priority_weight: 3.0
       )
-      overflow = create_post_similarity_question!(
-        text: 'overflow?',
-        priority_weight: 2.2
+      middle = create_post_similarity_question!(
+        text: 'middle?',
+        priority_weight: 2.0
       )
 
       get "/gekanator/games/#{game.id}/extra_questions"
 
       expect(response).to have_http_status(:ok)
-      expect(json['questions'].length).to eq(6)
-      expect(json['questions'].map { _1['id'] }.uniq.length).to eq(6)
-      expect(json['questions'].map { _1['id'] }).to all(
-        be_in([
-          lowest.id,
-          low.id,
-          middle.id,
-          medium_high.id,
-          high.id,
-          higher.id,
-          highest.id,
-          overflow.id,
-        ])
-      )
+      expect(json['questions'].length).to eq(2)
+      expect(json['questions'].map { _1['id'] }.uniq.length).to eq(2)
+      expect(json['questions'].map { _1['id'] }).to all(be_in([low.id, high.id, middle.id]))
     end
 
     it 'can return questions that already have an example for the correct post' do
@@ -584,37 +519,6 @@ RSpec.describe 'Gekanator learning API', type: :request do
       expect(json['questions'].map { _1['id'] }).to include(existing.id)
     end
 
-    it 'prioritizes questions the current user has not answered' do
-      sign_in_as admin
-
-      answered = create_post_similarity_question!(
-        text: 'already answered?',
-        priority_weight: 3.0
-      )
-      GekanatorQuestionExample.create!(
-        gekanator_question: answered,
-        post: other_post,
-        user: admin,
-        answer: 'yes',
-        source: 'post_game_extra'
-      )
-
-      unanswered =
-          6.times.map { |index|
-            create_post_similarity_question!(
-              text: "unanswered #{index}?",
-              priority_weight: 0.5
-            )
-          }
-
-      get "/gekanator/games/#{game.id}/extra_questions"
-
-      expect(response).to have_http_status(:ok)
-      expect(json['questions'].map { _1['id'] }).to match_array(
-        unanswered.map(&:id)
-      )
-    end
-
     it 'can return questions already asked in the game using snake_case question_id' do
       sign_in_as admin
 

frontend/src/lib/gekanator.test.ts

@@ -4,7 +4,6 @@ import { apiPost } from '@/lib/api'
 import {
   buildGekanatorQuestions,
   expectedAnswerForQuestion,
-  learnedSemanticSideForPost,
   questionIdForCondition,
   restoreGekanatorQuestion,
   saveGekanatorExtraQuestionAnswers,
@@ -189,33 +188,6 @@ describe('expectedAnswerForQuestion', () => {
   })
 })
 
-describe('learnedSemanticSideForPost', () => {
-  it('classifies post_similarity examples as positive, negative, or unknown', () => {
-    const question: StoredGekanatorQuestion = {
-      id: 'post-similarity:10',
-      text: '喜多ちゃんが泣いてる?',
-      kind: 'post_similarity',
-      source: 'user_suggested',
-      priorityWeight: 1.2,
-      condition: {
-        type: 'post-similarity',
-        postId: 123,
-        answer: 'partial',
-        threshold: 0.65,
-      },
-      exampleAnswers: {
-        1: 'yes',
-        2: 'probably_no',
-      },
-    }
-
-    expect(learnedSemanticSideForPost(question, post({ id: 1 }))).toBe('positive')
-    expect(learnedSemanticSideForPost(question, post({ id: 2 }))).toBe('negative')
-    expect(learnedSemanticSideForPost(question, post({ id: 3 }))).toBe('unknown')
-    expect(learnedSemanticSideForPost(question, post({ id: 123 }))).toBe('positive')
-  })
-})
-
 describe('restoreGekanatorQuestion', () => {
   it('uses default source and priority weight when omitted', () => {
     const question = restoreGekanatorQuestion({
@@ -276,7 +248,7 @@ describe('restoreGekanatorQuestion', () => {
     })
 
     expect(question.test(post({ id: 1 }))).toBe(true)
-    expect(question.test(post({ id: 2 }))).toBe(true)
+    expect(question.test(post({ id: 2 }))).toBe(false)
   })
 
   it('normalizes legacy title-length-greater-than questions', () => {
@@ -400,10 +372,6 @@ describe('Gekanator API writers', () => {
           type: 'tag',
           key: 'character:喜多郁代',
         },
-        questionMode: 'normal',
-        questionPurpose: 'effective_user_suggested',
-        effectiveQuestion: true,
-        learningQuestion: false,
         answer: 'yes',
         originalAnswer: 'partial',
       },
@@ -428,10 +396,6 @@ describe('Gekanator API writers', () => {
             type: 'tag',
             key: 'character:喜多郁代',
           },
-          question_mode: 'normal',
-          question_purpose: 'effective_user_suggested',
-          effective_question: true,
-          learning_question: false,
           answer: 'yes',
           original_answer: 'partial',
         },

frontend/src/lib/gekanator.ts

@@ -9,24 +9,11 @@ export type GekanatorAnswerValue =
     | 'probably_no'
     | 'unknown'
 
-export type LearnedSemanticSide =
-    | 'positive'
-    | 'negative'
-    | 'unknown'
-
-export type GekanatorQuestionPurpose =
-    | 'effective_user_suggested'
-    | 'learning_user_suggested'
-    | 'normal'
-
 export type GekanatorAnswerLog = {
     questionId:       string
     questionText:     string
     questionCondition?:  GekanatorQuestionCondition
     questionMode?:    'normal' | 'winning_run'
-    questionPurpose?: GekanatorQuestionPurpose
-    effectiveQuestion?: boolean
-    learningQuestion?: boolean
     answer:           GekanatorAnswerValue
     originalAnswer:   GekanatorAnswerValue }
 
@@ -176,26 +163,6 @@ const directExampleAnswerFor = (
   return null
 }
 
-
-export const isLearnedSemanticQuestion = (
-    question:  StoredGekanatorQuestion | GekanatorQuestion,
-): boolean =>
-    question.kind === 'post_similarity'
-    && question.source === 'user_suggested'
-
-
-export const learnedSemanticSideForAnswer = (
-    answer:  GekanatorAnswerValue | null,
-): LearnedSemanticSide => {
-  if (answer === 'yes' || answer === 'partial')
-    return 'positive'
-
-  if (answer === 'no' || answer === 'probably_no')
-    return 'negative'
-
-  return 'unknown'
-}
-
 const countBy = <T extends string | number> (values: T[]): Map<T, number> => {
   const counts = new Map<T, number> ()
   values.forEach (value => counts.set (value, (counts.get (value) ?? 0) + 1))
@@ -318,8 +285,8 @@ const questionMatches = (
 ): boolean => {
   const directAnswer = directExampleAnswerFor (question, post)
   if (directAnswer)
-    return question.kind === 'post_similarity'
-	? learnedSemanticSideForAnswer (directAnswer) === 'positive'
+    return question.condition.type === 'post-similarity'
+	? directAnswer === question.condition.answer
 	: directAnswer === 'yes'
 
   switch (question.condition.type)
@@ -361,11 +328,6 @@ export const expectedAnswerForQuestion = (
 
   switch (question.condition.type)
   {
-  case 'post-similarity':
-    if (question.condition.postId === post.id)
-      return question.condition.answer
-
-    return null
   case 'tag':
   case 'source':
   case 'original-year':
@@ -376,17 +338,12 @@ export const expectedAnswerForQuestion = (
   case 'title-has-ascii':
   case 'title-contains':
     return questionMatches (post, question) ? 'yes' : 'no'
+  case 'post-similarity':
+    return null
   }
 }
 
 
-export const learnedSemanticSideForPost = (
-    question:  StoredGekanatorQuestion | GekanatorQuestion | undefined,
-    post:      Post | null,
-): LearnedSemanticSide =>
-    learnedSemanticSideForAnswer (expectedAnswerForQuestion (question, post))
-
-
 export const restoreGekanatorQuestion = (
     question:  StoredGekanatorQuestion,
 ): GekanatorQuestion => {
@@ -466,15 +423,15 @@ export const buildGekanatorQuestions = (
   const originalYears = countBy (
       posts
       .map (originalYearOf)
-      .filter ((year): year is number => year != null))
+      .filter ((year): year is number => year !== null))
   const originalMonths = countBy (
       posts
       .map (originalMonthOf)
-      .filter ((month): month is number => month != null))
+      .filter ((month): month is number => month !== null))
   const originalMonthDays = countBy (
       posts
       .map (originalMonthDayOf)
-      .filter ((monthDay): monthDay is string => monthDay != null))
+      .filter ((monthDay): monthDay is string => monthDay !== null))
   const titleLengthMedian = median (posts.map (post => post.title?.length ?? 0))
   const titleWordCounts =
       includeTitleContains
@@ -636,10 +593,6 @@ export const saveGekanatorGame = async ({
 	    question_id: answer.questionId,
 	    question_text: answer.questionText,
 	    question_condition: answer.questionCondition ?? null,
-	    question_mode: answer.questionMode,
-	    question_purpose: answer.questionPurpose,
-	    effective_question: answer.effectiveQuestion,
-	    learning_question: answer.learningQuestion,
 	    answer: answer.answer,
 	    original_answer: answer.originalAnswer })) })
 

frontend/src/lib/gekanatorCandidateRecovery.test.ts

@@ -11,7 +11,6 @@ import type {
     GekanatorAnswerValue,
     GekanatorQuestion,
 } from '@/lib/gekanator'
-import type { RecoveredCandidateState } from '@/lib/gekanatorCandidateRecovery'
 import type { Post } from '@/types'
 
 
@@ -79,15 +78,6 @@ const answer = (
 })
 
 
-const recoveredState = (
-    answerCountAtRecovery:  number,
-    scoreAtRecovery = 0,
-): RecoveredCandidateState => ({
-  answerCountAtRecovery,
-  scoreAtRecovery,
-})
-
-
 describe('candidatePostsFor', () => {
   it('does not hard-filter semantic post_similarity answers', () => {
     const posts = [post (1), post (2), post (3)]
@@ -109,8 +99,8 @@ describe('candidatePostsFor', () => {
 	softenedQuestionIds: new Set (),
 	rejectedPostIds: new Set (),
 	recoveredCandidatePosts: new Map ([
-	    [1, recoveredState (1)],
-	    [3, recoveredState (1)],
+	    [1, 1],
+	    [3, 1],
 	]) })
 
     expect(candidates.map (candidate => candidate.id)).toEqual ([1, 2, 3])
@@ -132,8 +122,8 @@ describe('candidatePostsFor', () => {
 	softenedQuestionIds: new Set (),
 	rejectedPostIds: new Set (),
 	recoveredCandidatePosts: new Map ([
-	    [1, recoveredState (1)],
-	    [3, recoveredState (1)],
+	    [1, 1],
+	    [3, 1],
 	]) })
 
     expect(candidates.map (candidate => candidate.id)).toEqual ([3])
@@ -152,7 +142,7 @@ describe('candidatePostsFor', () => {
 	answers: [answer (question, 'yes')],
 	softenedQuestionIds: new Set (),
 	rejectedPostIds: new Set ([1]),
-	recoveredCandidatePosts: new Map ([[1, recoveredState (1)]]) })
+	recoveredCandidatePosts: new Map ([[1, 1]]) })
 
     expect(candidates.map (candidate => candidate.id)).toEqual ([2])
   })
@@ -219,7 +209,7 @@ describe('recoverCandidatePosts', () => {
 	posts,
 	scores,
 	rejectedPostIds: new Set ([10]),
-	recoveredCandidatePosts: new Map ([[8, recoveredState (1, 8)]]),
+	recoveredCandidatePosts: new Map ([[8, 1]]),
 	eligiblePostIds: new Set ([9]),
 	answerCountAtRecovery: 2,
 	recoveryStepCount: 0,
@@ -228,10 +218,7 @@ describe('recoverCandidatePosts', () => {
     expect(recovered?.recoveryStepCount).toBe (1)
     expect([...(recovered?.recoveredCandidatePosts.keys () ?? [])])
       .toEqual ([8, 7, 6, 5, 4])
-    expect(recovered?.recoveredCandidatePosts.get (7)).toEqual ({
-	answerCountAtRecovery: 2,
-	scoreAtRecovery: 7,
-    })
+    expect(recovered?.recoveredCandidatePosts.get (7)).toBe (2)
   })
 
   it('does not add posts when recovered and eligible candidates already hit the target', () => {
@@ -243,9 +230,9 @@ describe('recoverCandidatePosts', () => {
 	scores,
 	rejectedPostIds: new Set (),
 	recoveredCandidatePosts: new Map ([
-	    [1, recoveredState (1, 1)],
-	    [2, recoveredState (1, 2)],
-	    [3, recoveredState (1, 3)],
+	    [1, 1],
+	    [2, 1],
+	    [3, 1],
 	]),
 	eligiblePostIds: new Set ([4, 5, 6]),
 	answerCountAtRecovery: 2,

frontend/src/lib/gekanatorCandidateRecovery.ts

@@ -1,21 +1,15 @@
-import { isLearnedSemanticQuestion,
-	 learnedSemanticSideForPost } from '@/lib/gekanator'
+import { expectedAnswerForQuestion } from '@/lib/gekanator'
 
 import type { GekanatorAnswerLog, GekanatorAnswerValue, GekanatorQuestion } from '@/lib/gekanator'
 import type { Post } from '@/types'
 
 export type RecoveredCandidatePost = {
     postId:                number
-    answerCountAtRecovery: number
-    scoreAtRecovery:       number }
-
-export type RecoveredCandidateState = {
-    answerCountAtRecovery: number
-    scoreAtRecovery:       number }
+    answerCountAtRecovery: number }
 
 
-const questionSupportsAnswerBasedHardFiltering = (question:  GekanatorQuestion): boolean =>
-    !(isLearnedSemanticQuestion (question)
+const questionIsFactLikeForHardFiltering = (question:  GekanatorQuestion): boolean =>
+    !(question.kind === 'post_similarity'
       || (question.kind === 'tag'
 	  && question.condition.type === 'tag'
 	  && !(question.condition.key.startsWith ('nico:'))))
@@ -32,7 +26,7 @@ export const candidatePostsFor = (
 				   answers:                 GekanatorAnswerLog[]
 				   softenedQuestionIds:     Set<string>
 				   rejectedPostIds:         Set<number>
-				   recoveredCandidatePosts: Map<number, RecoveredCandidateState> },
+				   recoveredCandidatePosts: Map<number, number> },
 ): Post[] => {
   const questionById = new Map (questions.map (question => [question.id, question]))
 
@@ -40,10 +34,10 @@ export const candidatePostsFor = (
     if (rejectedPostIds.has (post.id))
       return false
 
-    const recoveredCandidate = recoveredCandidatePosts.get (post.id)
+    const answerCountAtRecovery = recoveredCandidatePosts.get (post.id)
 
     return answers.every ((answer, index) => {
-      if (recoveredCandidate != null && index < recoveredCandidate.answerCountAtRecovery)
+      if (answerCountAtRecovery != null && index < answerCountAtRecovery)
 	return true
 
       if (softenedQuestionIds.has (answer.questionId))
@@ -52,7 +46,7 @@ export const candidatePostsFor = (
       const question = questionById.get (answer.questionId)
       if (!(question))
 	return true
-      if (!(questionSupportsAnswerBasedHardFiltering (question)))
+      if (!(questionIsFactLikeForHardFiltering (question)))
 	return true
 
       switch (answer.answer)
@@ -60,10 +54,8 @@ export const candidatePostsFor = (
       case 'yes':
       case 'no':
 	{
-	  const expected = learnedSemanticSideForPost (question, post)
-	  return expected === 'unknown'
-	      || (answer.answer === 'yes' && expected === 'positive')
-	      || (answer.answer === 'no' && expected === 'negative')
+	  const expected = expectedAnswerForQuestion (question, post)
+	  return expected === null || expected === 'unknown' || expected === answer.answer
 	}
       default:
 	return true
@@ -78,17 +70,15 @@ export const hardFilteredPostsForAnswer = (
 				   question:  GekanatorQuestion
 				   answer:    GekanatorAnswerValue },
 ): Post[] => {
-  if (!(questionSupportsAnswerBasedHardFiltering (question)))
+  if (!(questionIsFactLikeForHardFiltering (question)))
     return posts
 
   if (!(answer === 'yes' || answer === 'no'))
     return posts
 
   return posts.filter (post => {
-    const side = learnedSemanticSideForPost (question, post)
-    return side === 'unknown'
-	|| (answer === 'yes' && side === 'positive')
-	|| (answer === 'no' && side === 'negative')
+    const expected = expectedAnswerForQuestion (question, post)
+    return expected == null || expected === 'unknown' || expected === answer
   })
 }
 
@@ -122,11 +112,11 @@ export const recoverCandidatePosts = (
       recoveryStepCount }: { posts:                   Post[]
 			     scores:                  Map<number, number>
 			     rejectedPostIds:         Set<number>
-			     recoveredCandidatePosts: Map<number, RecoveredCandidateState>
+			     recoveredCandidatePosts: Map<number, number>
 			     eligiblePostIds:         Set<number>
 			     answerCountAtRecovery:   number
 			     recoveryStepCount:       number },
-): { recoveredCandidatePosts: Map<number, RecoveredCandidateState>
+): { recoveredCandidatePosts: Map<number, number>
      recoveryStepCount:       number } | null => {
   const recovered = new Map (recoveredCandidatePosts)
   const targetSize = nextRecoveryTargetSize (recoveryStepCount)
@@ -150,9 +140,7 @@ export const recoverCandidatePosts = (
   if (candidates.length === 0)
     return null
 
-  candidates.forEach (post => recovered.set (post.id, {
-      answerCountAtRecovery,
-      scoreAtRecovery: scores.get (post.id) ?? 0 }))
+  candidates.forEach (post => recovered.set (post.id, answerCountAtRecovery))
 
   return { recoveredCandidatePosts: recovered,
 	   recoveryStepCount: recoveryStepCount + 1 }

frontend/src/pages/GekanatorPage.test.tsx

@@ -60,14 +60,6 @@ const gekanatorBackdropSource = gekanatorPageSource.slice (
     gekanatorPageSource.indexOf ('const GekanatorBackdrop'),
     gekanatorPageSource.indexOf ('const expectedAnswerFor'))
 
-const gekanatorChooseQuestionSource = gekanatorPageSource.slice (
-    gekanatorPageSource.indexOf ('const chooseQuestion'),
-    gekanatorPageSource.indexOf ('const winningRunPriorityFor'))
-
-const gekanatorFallbackQuestionSource = gekanatorPageSource.slice (
-    gekanatorPageSource.indexOf ('const chooseFallbackQuestion'),
-    gekanatorPageSource.indexOf ('const shouldEnterGuessPhase'))
-
 
 describe('GekanatorBackdrop regression structure', () => {
   it('keeps displayedBackdropMode as the render-time source of truth', () => {
@@ -111,30 +103,6 @@ describe('GekanatorBackdrop regression structure', () => {
 })
 
 
-describe('Gekanator question selection regression structure', () => {
-  it('prefers normal questions after user_suggested quota has been met', () => {
-    const normalFallbackIndex = gekanatorChooseQuestionSource.indexOf (
-      'else if (normalPool.length > 0)')
-    const effectiveFallbackIndex = gekanatorChooseQuestionSource.indexOf (
-      'else if (effectiveUserSuggestedPool.length > 0)')
-
-    expect(normalFallbackIndex).toBeGreaterThan(0)
-    expect(effectiveFallbackIndex).toBeGreaterThan(0)
-    expect(normalFallbackIndex).toBeLessThan(effectiveFallbackIndex)
-  })
-
-  it('does not let fallback questions bypass user_suggested purpose tracking', () => {
-    expect(gekanatorFallbackQuestionSource).toContain (
-      "question.source !== 'user_suggested'")
-  })
-
-  it('does not show a fixed extra-question count in the extra learning UI', () => {
-    expect(gekanatorPageSource).not.toContain ('追加で 2 問まで答えてください。')
-    expect(gekanatorPageSource).toContain ('追加で質問に答えてください。')
-  })
-})
-
-
 describe('isQuestionHardFilteredAfterAnswers', () => {
   it('blocks only contradictory or redundant month questions after a yes answer', () => {
     const previous: GekanatorQuestionCondition = { type: 'original-month', month: 12 }