コミットを比較
1
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
789e8599b3 |
@@ -37,7 +37,7 @@ class PostsController < ApplicationController
|
|||||||
|
|
||||||
offset = (page - 1) * limit
|
offset = (page - 1) * limit
|
||||||
|
|
||||||
history_join_required = order[0] == 'updated_at' || updated_between.any?(&:present?)
|
needs_history_join = order[0] == 'updated_at' || updated_between.any?(&:present?)
|
||||||
|
|
||||||
q =
|
q =
|
||||||
filtered_posts(locale)
|
filtered_posts(locale)
|
||||||
@@ -57,8 +57,8 @@ class PostsController < ApplicationController
|
|||||||
q = q.where('posts.created_at >= ?', created_between[0]) if created_between[0]
|
q = q.where('posts.created_at >= ?', created_between[0]) if created_between[0]
|
||||||
q = q.where('posts.created_at <= ?', created_between[1]) if created_between[1]
|
q = q.where('posts.created_at <= ?', created_between[1]) if created_between[1]
|
||||||
count_scope = q
|
count_scope = q
|
||||||
if history_join_required
|
if needs_history_join
|
||||||
history_times = PostVersion.all
|
history_times = HistoryAccess.visible(PostVersion.all)
|
||||||
.select('post_id, MAX(created_at) AS latest_at').group(:post_id)
|
.select('post_id, MAX(created_at) AS latest_at').group(:post_id)
|
||||||
q = q.joins("LEFT JOIN (#{ history_times.to_sql }) history_times " +
|
q = q.joins("LEFT JOIN (#{ history_times.to_sql }) history_times " +
|
||||||
'ON history_times.post_id = posts.id')
|
'ON history_times.post_id = posts.id')
|
||||||
@@ -72,7 +72,7 @@ class PostsController < ApplicationController
|
|||||||
q = q.where("#{ updated_at_all_sql } <= ?", updated_between[1])
|
q = q.where("#{ updated_at_all_sql } <= ?", updated_between[1])
|
||||||
end
|
end
|
||||||
count_scope = q if updated_between.any?(&:present?)
|
count_scope = q if updated_between.any?(&:present?)
|
||||||
if history_join_required
|
if needs_history_join
|
||||||
q = q.select('posts.*', "#{ updated_at_all_sql } AS updated_at")
|
q = q.select('posts.*', "#{ updated_at_all_sql } AS updated_at")
|
||||||
end
|
end
|
||||||
|
|
||||||
@@ -92,10 +92,10 @@ class PostsController < ApplicationController
|
|||||||
.offset(offset)
|
.offset(offset)
|
||||||
.to_a
|
.to_a
|
||||||
latest_version_times =
|
latest_version_times =
|
||||||
if history_join_required
|
if needs_history_join
|
||||||
{ }
|
{ }
|
||||||
else
|
else
|
||||||
PostVersion.where(post_id: posts.map(&:id))
|
HistoryAccess.visible(PostVersion.where(post_id: posts.map(&:id)))
|
||||||
.group(:post_id).maximum(:created_at)
|
.group(:post_id).maximum(:created_at)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -49,6 +49,7 @@ class TagDescriptionsController < ApplicationController
|
|||||||
private
|
private
|
||||||
|
|
||||||
def representation description
|
def representation description
|
||||||
|
HistoryAccess.require_current!(description, TagDescriptionVersion)
|
||||||
description.as_json(only: [
|
description.as_json(only: [
|
||||||
:tag_id,
|
:tag_id,
|
||||||
:language_code,
|
:language_code,
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
class TagGroupsController < ApplicationController
|
class TagGroupsController < ApplicationController
|
||||||
def index
|
def index
|
||||||
locale = resolve_locale!
|
locale = resolve_locale!
|
||||||
groups = TagGroup.includes(:created_by_user, :updated_by_user).order(:id)
|
groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).includes(:created_by_user, :updated_by_user).order(:id)
|
||||||
render json: TagGroupRepr.many(locale, groups.to_a)
|
render json: TagGroupRepr.many(locale, groups.to_a)
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -8,11 +8,12 @@ class WikiPagesController < ApplicationController
|
|||||||
|
|
||||||
title = params[:title].to_s.strip
|
title = params[:title].to_s.strip
|
||||||
descriptions =
|
descriptions =
|
||||||
TagDescription.where(language_code: locale.language_code)
|
HistoryAccess.current(TagDescription.all, TagDescriptionVersion)
|
||||||
|
.where(language_code: locale.language_code)
|
||||||
.includes(tag: :tag_names)
|
.includes(tag: :tag_names)
|
||||||
|
|
||||||
descriptions = descriptions.order(updated_at: :desc, id: :asc)
|
descriptions = descriptions.order(updated_at: :desc, id: :asc)
|
||||||
tag_groups = TagGroup.order(updated_at: :desc, id: :asc)
|
tag_groups = HistoryAccess.current(TagGroup.all, TagGroupVersion).order(updated_at: :desc, id: :asc)
|
||||||
if title.present?
|
if title.present?
|
||||||
pattern = "%#{ ApplicationRecord.sanitize_sql_like(title) }%"
|
pattern = "%#{ ApplicationRecord.sanitize_sql_like(title) }%"
|
||||||
descriptions =
|
descriptions =
|
||||||
@@ -40,13 +41,13 @@ class WikiPagesController < ApplicationController
|
|||||||
return head :not_found unless language.is_a?(String)
|
return head :not_found unless language.is_a?(String)
|
||||||
return head :not_found unless Language.exists?(code: language)
|
return head :not_found unless Language.exists?(code: language)
|
||||||
|
|
||||||
names = TagDescription.joins(tag: :tag_names)
|
names = HistoryAccess.current(TagDescription.all, TagDescriptionVersion).joins(tag: :tag_names)
|
||||||
.where(language_code: locale.language_code, tag_names: { language_code: language })
|
.where(language_code: locale.language_code, tag_names: { language_code: language })
|
||||||
.pluck('tag_descriptions.tag_id', 'tag_descriptions.id', 'tag_names.name')
|
.pluck('tag_descriptions.tag_id', 'tag_descriptions.id', 'tag_names.name')
|
||||||
candidates = names.map do |tag_id, description_id, name|
|
candidates = names.map do |tag_id, description_id, name|
|
||||||
WikiPageRepr.autolink_tag(locale, tag_id:, description_id:, name:, language:)
|
WikiPageRepr.autolink_tag(locale, tag_id:, description_id:, name:, language:)
|
||||||
end
|
end
|
||||||
candidates.concat(TagGroup.order(:id).pluck(:id, :name).map do |id, name|
|
candidates.concat(HistoryAccess.current(TagGroup.all, TagGroupVersion).order(:id).pluck(:id, :name).map do |id, name|
|
||||||
WikiPageRepr.autolink_group(locale, id:, name:, language:)
|
WikiPageRepr.autolink_group(locale, id:, name:, language:)
|
||||||
end)
|
end)
|
||||||
render json: candidates
|
render json: candidates
|
||||||
@@ -410,7 +411,7 @@ class WikiPagesController < ApplicationController
|
|||||||
end
|
end
|
||||||
|
|
||||||
def tag_description_by_title locale, title
|
def tag_description_by_title locale, title
|
||||||
TagDescription.joins(tag: :tag_names)
|
HistoryAccess.current(TagDescription.all, TagDescriptionVersion).joins(tag: :tag_names)
|
||||||
.find_by(language_code: locale.language_code,
|
.find_by(language_code: locale.language_code,
|
||||||
tag_names: { language_code: locale.language_code, name: title })
|
tag_names: { language_code: locale.language_code, name: title })
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -147,6 +147,29 @@ class HistoryAccess < ActiveSupport::CurrentAttributes
|
|||||||
scope.where(Arel.sql(sql(scope.klass, row)))
|
scope.where(Arel.sql(sql(scope.klass, row)))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def self.current(scope, version_model)
|
||||||
|
return scope if admin?
|
||||||
|
|
||||||
|
table = scope.klass.table_name
|
||||||
|
keys = KEYS.fetch(version_model.table_name)
|
||||||
|
matches = keys.map do |key|
|
||||||
|
column = scope.klass.column_names.include?(key) ? key : 'id'
|
||||||
|
"current_snapshot.#{ key } = #{ table }.#{ column }"
|
||||||
|
end.join(' AND ')
|
||||||
|
boundary = "#{ matches } AND current_snapshot.version_no >= #{ table }.version_no " +
|
||||||
|
"AND current_snapshot.event_type = 'discard'"
|
||||||
|
scope = scope.where(Arel.sql("NOT EXISTS (SELECT 1 FROM #{ version_model.table_name } " +
|
||||||
|
"current_snapshot WHERE #{ boundary })"))
|
||||||
|
condition = "#{ matches } AND current_snapshot.version_no = #{ table }.version_no"
|
||||||
|
scope.where(Arel.sql("NOT EXISTS (SELECT 1 FROM #{ version_model.table_name } " +
|
||||||
|
"current_snapshot WHERE #{ condition } AND NOT (#{ sql(version_model, 'current_snapshot') }))"))
|
||||||
|
end
|
||||||
|
|
||||||
|
def self.require_current!(record, version_model)
|
||||||
|
return if admin?
|
||||||
|
raise Forbidden unless current(record.class.where(id: record.id), version_model).exists?
|
||||||
|
end
|
||||||
|
|
||||||
def self.blob_visible?(blob, seen = [])
|
def self.blob_visible?(blob, seen = [])
|
||||||
return true if admin?
|
return true if admin?
|
||||||
return false if seen.include?(blob.id)
|
return false if seen.include?(blob.id)
|
||||||
|
|||||||
@@ -44,6 +44,7 @@ module TagGroupRepr
|
|||||||
end
|
end
|
||||||
|
|
||||||
def one locale, group
|
def one locale, group
|
||||||
|
HistoryAccess.require_current!(group, TagGroupVersion)
|
||||||
many(locale, [group]).first
|
many(locale, [group]).first
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ module WikiPageRepr
|
|||||||
module_function
|
module_function
|
||||||
|
|
||||||
def tag_description locale, description
|
def tag_description locale, description
|
||||||
|
HistoryAccess.require_current!(description, TagDescriptionVersion)
|
||||||
tag = description.tag
|
tag = description.tag
|
||||||
|
|
||||||
{ 'id' => description.id,
|
{ 'id' => description.id,
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
|
import { QueryClient, QueryClientProvider, dehydrate, skipToken } from '@tanstack/react-query'
|
||||||
import { PassThrough } from 'node:stream'
|
import { PassThrough } from 'node:stream'
|
||||||
import { renderToPipeableStream } from 'react-dom/server'
|
import { renderToPipeableStream, renderToStaticMarkup } from 'react-dom/server'
|
||||||
import { HelmetProvider } from 'react-helmet-async'
|
import { HelmetProvider } from 'react-helmet-async'
|
||||||
import { I18nextProvider } from 'react-i18next'
|
import { I18nextProvider } from 'react-i18next'
|
||||||
import { createStaticHandler, createStaticRouter,
|
import { createStaticHandler, createStaticRouter,
|
||||||
@@ -9,7 +9,7 @@ import { createStaticHandler, createStaticRouter,
|
|||||||
import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
|
import { AppFrame, appRoutes, resolvePageRoute } from '@/App'
|
||||||
import { apiGet, isApiError } from '@/lib/api'
|
import { apiGet, isApiError } from '@/lib/api'
|
||||||
import { createUII18n } from '@/lib/i18n'
|
import { createUII18n } from '@/lib/i18n'
|
||||||
import { fetchLocales, isLocaleCode, legacyLocalePath } from '@/lib/locales'
|
import { fetchLocales, isLocaleCode, legacyLocalePath, switchLocalePath } from '@/lib/locales'
|
||||||
import { localesKeys, sessionKeys } from '@/lib/queryKeys'
|
import { localesKeys, sessionKeys } from '@/lib/queryKeys'
|
||||||
import { withRenderContext } from '@/lib/renderContext.server'
|
import { withRenderContext } from '@/lib/renderContext.server'
|
||||||
|
|
||||||
@@ -171,8 +171,26 @@ export const render = async (
|
|||||||
}))
|
}))
|
||||||
}
|
}
|
||||||
const helmet = helmetContext.helmet!
|
const helmet = helmetContext.helmet!
|
||||||
|
const alternates = status === 200 && known != null
|
||||||
|
? await Promise.all (locales.locales.map (entry => entry.code)
|
||||||
|
.filter (isLocaleCode)
|
||||||
|
.filter (code => known.route.handle?.locale == null
|
||||||
|
|| known.route.handle.locale === code)
|
||||||
|
.map (async targetLocale => {
|
||||||
|
const location = { pathname: url.pathname, search: url.search, hash: '' }
|
||||||
|
const path = targetLocale === locale
|
||||||
|
? url.pathname + url.search
|
||||||
|
: (known.route.handle?.switchLocale != null
|
||||||
|
? await known.route.handle.switchLocale ({
|
||||||
|
location, params: known.params, locale, targetLocale })
|
||||||
|
: switchLocalePath (location, targetLocale))
|
||||||
|
return <link key={targetLocale} rel="alternate" hrefLang={targetLocale}
|
||||||
|
href={new URL (path, origin).href}/>
|
||||||
|
}))
|
||||||
|
: []
|
||||||
const head = [helmet.title, helmet.meta, helmet.link, helmet.style]
|
const head = [helmet.title, helmet.meta, helmet.link, helmet.style]
|
||||||
.map (entry => entry.toString ()).join ('')
|
.map (entry => entry.toString ()).join ('')
|
||||||
|
+ renderToStaticMarkup (<>{alternates}</>)
|
||||||
const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
|
const dehydrated = dehydrate (client, { shouldDehydrateQuery: query =>
|
||||||
query.state.status !== 'pending'
|
query.state.status !== 'pending'
|
||||||
&& query.meta?.clientOnly !== true
|
&& query.meta?.clientOnly !== true
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする