#279

backend/app/controllers/tags_controller.rb

@@ -2,8 +2,8 @@ class TagsController < ApplicationController
   def index
     post_id = params[:post]
 
-    name = params[:name].presence
+    name = params[:name].to_s.strip.presence
-    category = params[:category].presence
+    category = params[:category].to_s.strip.presence
     post_count_between = (params[:post_count_gte].presence || -1).to_i,
                          (params[:post_count_lte].presence || -1).to_i
     post_count_between[0] = nil if post_count_between[0] < 0
@@ -36,7 +36,9 @@ class TagsController < ApplicationController
         .includes(:tag_name, tag_name: :wiki_page)
     q = q.where(posts: { id: post_id }) if post_id.present?
 
-    q = q.where('tag_names.name LIKE ?', "%#{ name }%") if name
+    if name
+      q = q.where('tag_names.name LIKE ?', "%#{ ActiveRecord::Base.sanitize_sql_like(name) }%")
+    end
     q = q.where(category: category) if category
     q = q.where('tags.post_count >= ?', post_count_between[0]) if post_count_between[0]
     q = q.where('tags.post_count <= ?', post_count_between[1]) if post_count_between[1]
@@ -77,7 +79,7 @@ class TagsController < ApplicationController
 
     alias_rows =
         TagName
-        .where('name LIKE ?', "#{ q }%")
+        .where('name LIKE ?', "#{ ActiveRecord::Base.sanitize_sql_like(q) }%")
         .where.not(canonical_id: nil)
         .pluck(:canonical_id, :name)
 
@@ -97,7 +99,8 @@ class TagsController < ApplicationController
         base
         .where(((with_nico ? '(tags.category = ? AND tag_names.name LIKE ?) OR ' : '') +
                 'tag_names.name LIKE ?'),
-               *(with_nico ? ['nico', "nico:#{ q }%"] : []), "#{ q }%")
+               *(with_nico ? ['nico', "nico:#{ ActiveRecord::Base.sanitise_sql_like(q) }%"] : []),
+               "#{ ActiveRecord::Base.sanitise_sql_like(q) }%")
 
     tags =
         if canonical_ids.present?

backend/app/controllers/theatre_comments_controller.rb

@@ -1,32 +0,0 @@
-class TheatreCommentsController < ApplicationController
-  def index
-    no_gt = params[:no_gt].to_i
-    no_gt = 0 if no_gt.negative?
-
-    comments = TheatreComment
-               .where(theatre_id: params[:theatre_id])
-               .where('no > ?', no_gt)
-               .order(:no)
-
-    render json: comments.as_json(include: { user: { only: [:id, :name] } })
-  end
-
-  def create
-    return head :unauthorized unless current_user
-
-    content = params[:content]
-    return head :unprocessable_entity if content.blank?
-
-    theatre = Theatre.find_by(id: params[:theatre_id])
-    return head :not_found unless theatre
-
-    comment = nil
-    theatre.with_lock do
-      no = theatre.next_comment_no
-      comment = TheatreComment.create!(theatre:, no:, user: current_user, content:)
-      theatre.update!(next_comment_no: no + 1)
-    end
-
-    render json: comment, status: :created
-  end
-end

backend/app/models/theatre_comment.rb

@@ -1,8 +1,8 @@
 class TheatreComment < ApplicationRecord
-  include Discard::Model
+  include MyDiscard
 
   self.primary_key = :theatre_id, :no
 
   belongs_to :theatre
-  belongs_to :user
 end
+

backend/config/routes.rb

@@ -78,7 +78,5 @@ Rails.application.routes.draw do
       put :watching
       patch :next_post
     end
-
-    resources :comments, controller: :theatre_comments, only: [:index, :create]
   end
 end

backend/spec/factories/theatre_comments.rb

@@ -1,8 +0,0 @@
-FactoryBot.define do
-  factory :theatre_comment do
-    association :theatre
-    association :user
-    sequence (:no) { |n| n }
-    content { 'test comment' }
-  end
-end

backend/spec/factories/theatres.rb

@@ -1,11 +0,0 @@
-FactoryBot.define do
-  factory :theatre do
-    name { 'Test Theatre' }
-    kind { 1 }
-    opens_at { Time.current }
-    closes_at { 1.day.from_now }
-    next_comment_no { 1 }
-
-    association :created_by_user, factory: :user
-  end
-end

backend/spec/requests/theatre_comments_spec.rb

@@ -1,150 +0,0 @@
-require 'rails_helper'
-
-RSpec.describe 'TheatreComments', type: :request do
-  def sign_in_as(user)
-    allow_any_instance_of(ApplicationController).to receive(:current_user).and_return(user)
-  end
-
-  describe 'GET /theatres/:theatre_id/comments' do
-    let(:theatre) { create(:theatre) }
-    let(:other_theatre) { create(:theatre) }
-    let(:alice) { create(:user, name: 'Alice') }
-    let(:bob) { create(:user, name: 'Bob') }
-
-    let!(:comment_3) do
-      create(
-        :theatre_comment,
-        theatre: theatre,
-        no: 3,
-        user: alice,
-        content: 'third comment'
-      )
-    end
-
-    let!(:comment_1) do
-      create(
-        :theatre_comment,
-        theatre: theatre,
-        no: 1,
-        user: alice,
-        content: 'first comment'
-      )
-    end
-
-    let!(:comment_2) do
-      create(
-        :theatre_comment,
-        theatre: theatre,
-        no: 2,
-        user: bob,
-        content: 'second comment'
-      )
-    end
-
-    let!(:other_comment) do
-      create(
-        :theatre_comment,
-        theatre: other_theatre,
-        no: 1,
-        user: bob,
-        content: 'other theatre comment'
-      )
-    end
-
-    it 'theatre_id で絞り込み、no_gt より大きいものを no 昇順で返す' do
-      get "/theatres/#{theatre.id}/comments", params: { no_gt: 1 }
-
-      expect(response).to have_http_status(:ok)
-      expect(response.parsed_body.map { |row| row['no'] }).to eq([2, 3])
-      expect(response.parsed_body.map { |row| row['content'] }).to eq([
-        'second comment',
-        'third comment'
-      ])
-    end
-
-    it 'user は id と name だけを含む' do
-      get "/theatres/#{theatre.id}/comments", params: { no_gt: 1 }
-
-      expect(response).to have_http_status(:ok)
-
-      expect(response.parsed_body.first['user']).to eq({
-        'id' => bob.id,
-        'name' => 'Bob'
-      })
-      expect(response.parsed_body.first['user'].keys).to contain_exactly('id', 'name')
-    end
-
-    it 'no_gt が負数なら 0 として扱う' do
-      get "/theatres/#{theatre.id}/comments", params: { no_gt: -100 }
-
-      expect(response).to have_http_status(:ok)
-      expect(response.parsed_body.map { |row| row['no'] }).to eq([1, 2, 3])
-    end
-  end
-
-  describe 'POST /theatres/:theatre_id/comments' do
-    let(:user) { create(:user, name: 'Alice') }
-    let(:theatre) { create(:theatre, next_comment_no: 2) }
-
-    before do
-      create(
-        :theatre_comment,
-        theatre: theatre,
-        no: 1,
-        user: user,
-        content: 'existing comment'
-      )
-    end
-
-    it '未ログインなら 401 を返す' do
-      expect {
-        post "/theatres/#{theatre.id}/comments", params: { content: 'hello' }
-      }.not_to change(TheatreComment, :count)
-
-      expect(response).to have_http_status(:unauthorized)
-    end
-
-    it 'content が blank なら 422 を返す' do
-      sign_in_as(user)
-
-      expect {
-        post "/theatres/#{theatre.id}/comments", params: { content: '   ' }
-      }.not_to change(TheatreComment, :count)
-
-      expect(response).to have_http_status(:unprocessable_entity)
-    end
-
-    it 'theatre が存在しなければ 404 を返す' do
-      sign_in_as(user)
-
-      expect {
-        post '/theatres/999999/comments', params: { content: 'hello' }
-      }.not_to change(TheatreComment, :count)
-
-      expect(response).to have_http_status(:not_found)
-    end
-
-    it 'コメントを作成し、user を紐づけ、next_comment_no を進める' do
-      sign_in_as(user)
-
-      expect {
-        post "/theatres/#{theatre.id}/comments", params: { content: 'new comment' }
-      }.to change(TheatreComment, :count).by(1)
-
-      expect(response).to have_http_status(:created)
-
-      comment = TheatreComment.find_by!(theatre: theatre, no: 2)
-
-      expect(comment.user).to eq(user)
-      expect(comment.content).to eq('new comment')
-      expect(theatre.reload.next_comment_no).to eq(3)
-
-      expect(response.parsed_body.slice('theatre_id', 'no', 'user_id', 'content')).to eq({
-        'theatre_id' => theatre.id,
-        'no' => 2,
-        'user_id' => user.id,
-        'content' => 'new comment'
-      })
-    end
-  end
-end

frontend/src/components/TopNav.tsx

@@ -79,11 +79,9 @@ export default (({ user }: Props) => {
 	  { name: '上位タグ', to: '/tags/implications', visible: false },
 	  { name: 'ニコニコ連携', to: '/tags/nico' },
 	  { name: 'ヘルプ', to: '/wiki/ヘルプ:タグ' }] },
-      { name: '上映会', to: '/theatres/1', base: '/theatres', subMenu: [
+      // TODO: 本実装時に消す．
-          { name: <>第&thinsp;1&thinsp;会場</>, to: '/theatres/1' },
+      // { name: '上映会', to: '/theatres/1', base: '/theatres', subMenu: [
-          { name: 'CyTube', to: '//cytube.mm428.net/r/deernijika' },
+      //     { name: '一覧', to: '/theatres' }] },
-	  { name: <>ニジカ放送局第&thinsp;1&thinsp;チャンネル</>,
-	    to: '//www.youtube.com/watch?v=DCU3hL4Uu6A' }] },
       { name: 'Wiki', to: '/wiki/ヘルプ:ホーム', base: '/wiki', subMenu: [
 	  { name: '検索', to: '/wiki' },
 	  { name: '新規', to: '/wiki/new' },
@@ -94,7 +92,7 @@ export default (({ user }: Props) => {
 	    visible: wikiPageFlg },
 	  { name: '履歴', to: `/wiki/changes?id=${ wikiId }`, visible: wikiPageFlg },
 	  { name: '編輯', to: `/wiki/${ wikiId || wikiTitle }/edit`, visible: wikiPageFlg }] },
-      { name: 'ユーザ', to: '/users/settings', subMenu: [
+      { name: 'ユーザ', to: '/users', subMenu: [
 	  { name: '一覧', to: '/users', visible: false },
 	  { name: 'お前', to: `/users/${ user?.id }`, visible: false },
 	  { name: '設定', to: '/users/settings', visible: Boolean (user) }] }]

frontend/src/pages/theatres/TheatreDetailPage.tsx

@@ -3,223 +3,84 @@ import { Helmet } from 'react-helmet-async'
 import { useParams } from 'react-router-dom'
 
 import PostEmbed from '@/components/PostEmbed'
-import PrefetchLink from '@/components/PrefetchLink'
-import TagDetailSidebar from '@/components/TagDetailSidebar'
 import MainArea from '@/components/layout/MainArea'
-import SidebarComponent from '@/components/layout/SidebarComponent'
 import { SITE_TITLE } from '@/config'
-import { apiGet, apiPatch, apiPost, apiPut } from '@/lib/api'
+import { apiGet, apiPatch, apiPut } from '@/lib/api'
 import { fetchPost } from '@/lib/posts'
-import { dateString } from '@/lib/utils'
 
 import type { FC } from 'react'
 
-import type { NiconicoMetadata,
+import type { NiconicoMetadata, NiconicoViewerHandle, Post, Theatre } from '@/types'
-	      NiconicoViewerHandle,
-	      Post,
-	      Theatre,
-	      TheatreComment } from '@/types'
 
 type TheatreInfo = {
     hostFlg:        boolean
     postId:         number | null
     postStartedAt:  string | null }
 
-const INITIAL_THEATRE_INFO = { hostFlg: false, postId: null, postStartedAt: null } as const
-
 
 export default (() => {
   const { id } = useParams ()
 
-  const commentsRef = useRef<HTMLDivElement> (null)
   const embedRef = useRef<NiconicoViewerHandle> (null)
-  const theatreInfoRef = useRef<TheatreInfo> (INITIAL_THEATRE_INFO)
-  const videoLengthRef = useRef (0)
-  const lastCommentNoRef = useRef (0)
 
-  const [comments, setComments] = useState<TheatreComment[]> ([])
-  const [content, setContent] = useState ('')
   const [loading, setLoading] = useState (false)
-  const [sending, setSending] = useState (false)
   const [theatre, setTheatre] = useState<Theatre | null> (null)
-  const [theatreInfo, setTheatreInfo] = useState<TheatreInfo> (INITIAL_THEATRE_INFO)
+  const [theatreInfo, setTheatreInfo] =
+      useState<TheatreInfo> ({ hostFlg: false, postId: null, postStartedAt: null })
   const [post, setPost] = useState<Post | null> (null)
-  const [videoLength, setVideoLength] = useState (0)
+  const [videoLength, setVideoLength] = useState (9_999_999_999)
-
-  useEffect (() => {
-    theatreInfoRef.current = theatreInfo
-  }, [theatreInfo])
-
-  useEffect (() => {
-    videoLengthRef.current = videoLength
-  }, [videoLength])
-
-  useEffect (() => {
-    lastCommentNoRef.current = comments.at (-1)?.no ?? 0
-  }, [comments])
 
   useEffect (() => {
     if (!(id))
       return
 
-    let cancelled = false
-
-    setComments ([])
-    setTheatre (null)
-    setPost (null)
-    setTheatreInfo (INITIAL_THEATRE_INFO)
-    setVideoLength (0)
-    lastCommentNoRef.current = 0
-
     void (async () => {
-      try
+      setTheatre (await apiGet<Theatre> (`/theatres/${ id }`))
-      {
-	const data = await apiGet<Theatre> (`/theatres/${ id }`)
-	if (!(cancelled))
-	  setTheatre (data)
-      }
-      catch (error)
-      {
-	console.error (error)
-      }
     }) ()
 
-    return () => {
+    const interval = setInterval (async () => {
-      cancelled = true
+      if (theatreInfo.hostFlg
-    }
+	  && theatreInfo.postStartedAt
-  }, [id])
+	  && ((new Date).getTime () - (new Date (theatreInfo.postStartedAt)).getTime ()
+	      > videoLength))
+	setTheatreInfo ({ hostFlg: true, postId: null, postStartedAt: null })
+      else
+	setTheatreInfo (await apiPut<TheatreInfo> (`/theatres/${ id }/watching`))
+    }, 1_000)
+
+    return () => clearInterval (interval)
+  }, [id, theatreInfo.hostFlg, theatreInfo.postStartedAt, videoLength])
 
   useEffect (() => {
-    commentsRef.current?.scrollTo ({
+    if (!(theatreInfo.hostFlg) || loading)
-	top: commentsRef.current.scrollHeight,
-	behavior: 'smooth' })
-  }, [commentsRef])
-
-  useEffect (() => {
-    if (!(id))
       return
 
-    let cancelled = false
+    if (theatreInfo.postId == null)
-    let running = false
-
-    const tick = async () => {
-      if (running)
-	return
-
-      running = true
-
-      try
       {
-	const newComments = await apiGet<TheatreComment[]> (
-	    `/theatres/${ id }/comments`,
-	    { params: { no_gt: lastCommentNoRef.current } })
-
-	if (!(cancelled) && newComments.length > 0)
-	  {
-	    lastCommentNoRef.current = newComments[newComments.length - 1].no
-	    setComments (prev => [...prev, ...newComments])
-	  }
-
-	const currentInfo = theatreInfoRef.current
-	const ended =
-	    currentInfo.hostFlg
-	    && currentInfo.postStartedAt
-	    && ((Date.now () - (new Date (currentInfo.postStartedAt)).getTime ())
-	        > videoLengthRef.current + 3_000)
-
-	if (ended)
-	  {
-	    if (!(cancelled))
-	      setTheatreInfo (prev => ({ ...prev, postId: null, postStartedAt: null }))
-
-	    return
-	  }
-
-	const nextInfo = await apiPut<TheatreInfo> (`/theatres/${ id }/watching`)
-	if (!(cancelled))
-	  setTheatreInfo (nextInfo)
-      }
-      catch (error)
-      {
-	console.error (error)
-      }
-      finally
-      {
-	running = false
-      }
-    }
-
-    tick ()
-    const interval = setInterval (() => tick (), 1_500)
-
-    return () => {
-      cancelled = true
-      clearInterval (interval)
-    }
-  }, [id])
-
-  useEffect (() => {
-    if (!(id) || !(theatreInfo.hostFlg) || loading || theatreInfo.postId != null)
-      return
-
-    let cancelled = false
-
 	void (async () => {
 	  setLoading (true)
-
-      try
-      {
 	  await apiPatch<void> (`/theatres/${ id }/next_post`)
-      }
-      catch (error)
-      {
-	console.error (error)
-      }
-      finally
-      {
-	if (!(cancelled))
 	  setLoading (false)
-      }
 	}) ()
-
+	return
-    return () => {
-      cancelled = true
       }
-  }, [id, theatreInfo.hostFlg, theatreInfo.postId])
+  }, [id, loading, theatreInfo.hostFlg, theatreInfo.postId])
 
   useEffect (() => {
-    setVideoLength (0)
-
     if (theatreInfo.postId == null)
       return
 
-    let cancelled = false
-
     void (async () => {
-      try
+      setPost (await fetchPost (String (theatreInfo.postId)))
-      {
-	const nextPost = await fetchPost (String (theatreInfo.postId))
-	if (!(cancelled))
-	  setPost (nextPost)
-      }
-      catch (error)
-      {
-	console.error (error)
-      }
     }) ()
-
+  }, [theatreInfo.postId, theatreInfo.postStartedAt])
-    return () => {
-      cancelled = true
-    }
-  }, [theatreInfo.postId])
 
   const syncPlayback = (meta: NiconicoMetadata) => {
     if (!(theatreInfo.postStartedAt))
       return
 
-    const targetTime = Math.min (
+    const targetTime =
-	Math.max (0, Date.now () - (new Date (theatreInfo.postStartedAt)).getTime ()),
+	((new Date).getTime () - (new Date (theatreInfo.postStartedAt)).getTime ())
-	videoLength)
 
     const drift = Math.abs (meta.currentTime - targetTime)
 
@@ -228,7 +89,7 @@ export default (() => {
   }
 
   return (
-      <div className="md:flex md:flex-1">
+      <MainArea>
 	<Helmet>
 	  {theatre && (
 	      <title>
@@ -238,82 +99,16 @@ export default (() => {
 	      </title>)}
 	</Helmet>
 
-	<div className="hidden md:block">
+	{post && (
-	  <TagDetailSidebar post={post ?? null}/>
-	</div>
-
-	<MainArea>
-	  {post ? (
-	      <>
 	    <PostEmbed
-		    key={post.id}
 		ref={embedRef}
 		post={post}
 		onLoadComplete={info => {
 		  embedRef.current?.play ()
 		  setVideoLength (info.lengthInSeconds * 1_000)
 		}}
-		    onMetadataChange={syncPlayback}/>
+		onMetadataChange={meta => {
-		<div className="m-2">
+		  syncPlayback (meta)
-		  <>再生中：</>
+		}}/>)}
-		  <PrefetchLink to={`/posts/${ post.id }`} className="font-bold">
+      </MainArea>)
-		    {post.title || post.url}
-		  </PrefetchLink>
-		</div>
-	      </>) : 'Loading...'}
-	</MainArea>
-
-	<SidebarComponent>
-	  <form
-	      className="w-full h-5/6"
-	      onSubmit={async e => {
-		e.preventDefault ()
-
-		if (!(content))
-		  return
-
-		try
-		{
-		  setSending (true)
-		  await apiPost (`/theatres/${ id }/comments`, { content })
-		  setContent ('')
-		  commentsRef.current?.scrollTo ({
-		      top: commentsRef.current.scrollHeight,
-		      behavior: 'smooth' })
-		}
-		finally
-		{
-		  setSending (false)
-		}
-	      }}>
-	    <div
-		ref={commentsRef}
-		className="overflow-x-hidden overflow-y-scroll text-wrap
-			   border border-black dark:border-white w-full h-[80vh]">
-	      {comments.map (comment => (
-		  <div key={comment.no} className="p-2">
-		    <div className="w-full">
-		      {comment.content}
-		    </div>
-		    <div className="w-full text-sm text-right">
-		      by {comment.user ? (comment.user.name || '名もなきニジラー') : '運営'}
-		    </div>
-		    <div className="w-full text-sm text-right">
-		      {dateString (comment.createdAt)}
-		    </div>
-		  </div>))}
-	    </div>
-	    <input
-		className="w-full p-2 border border-black dark:border-white"
-		type="text"
-		value={content}
-		onChange={e => setContent (e.target.value)}
-		disabled={sending}/>
-	  </form>
-	</SidebarComponent>
-
-	<div className="md:hidden">
-	  <TagDetailSidebar post={post ?? null}/>
-	</div>
-      </div>)
 }) satisfies FC

frontend/src/types.ts

@@ -52,7 +52,7 @@ export type FetchTagsParams = {
 export type Menu = MenuItem[]
 
 export type MenuItem = {
-    name:     ReactNode
+    name:     string
     to:       string
     base?:    string
     subMenu:  SubMenuItem[] }
@@ -117,7 +117,7 @@ export type PostTagChange = {
 export type SubMenuItem =
     | { component:  ReactNode
 	visible:    boolean }
-    | { name:     ReactNode
+    | { name:     string
 	to:       string
 	visible?: boolean }
 
@@ -141,13 +141,6 @@ export type Theatre = {
     createdAt:      string
     updatedAt:      string }
 
-export type TheatreComment = {
-    theatreId:  number,
-    no:         number,
-    user:       { id: number, name: string } | null
-    content:    string
-    createdAt:  string }
-
 export type User = {
     id:               number
     name:             string | null