コミットを比較
1
コミット
| 作成者 | SHA1 | 日付 | |
|---|---|---|---|
|
|
da63b46d4b |
@@ -4,11 +4,11 @@ class PostTagSearch
|
|||||||
tokens = raw.split.reject { _1.downcase == 'type:or' }
|
tokens = raw.split.reject { _1.downcase == 'type:or' }
|
||||||
names = tokens.map { _1.sub(/\Anot:/i, '') }
|
names = tokens.map { _1.sub(/\Anot:/i, '') }
|
||||||
registered = TagName.where(language_code: locale.language_code, name: names)
|
registered = TagName.where(language_code: locale.language_code, name: names)
|
||||||
.pluck(:name, :tag_id).to_h
|
.pluck(:name, :tag_id).to_h.transform_keys(&:downcase)
|
||||||
primary = TagName.where(language_code: locale.language_code,
|
primary = TagName.where(language_code: locale.language_code,
|
||||||
tag_id: registered.values, primary_flg: true).pluck(:tag_id, :name).to_h
|
tag_id: registered.values, primary_flg: true).pluck(:tag_id, :name).to_h
|
||||||
tokens.zip(names).map do |token, name|
|
tokens.zip(names).map do |token, name|
|
||||||
{ name: primary[registered[name]] || name,
|
{ name: primary[registered[name.downcase]] || name,
|
||||||
negative: token.downcase.start_with?('not:') }
|
negative: token.downcase.start_with?('not:') }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -20,11 +20,11 @@ class PostTagSearch
|
|||||||
def self.references_for(locale, literals)
|
def self.references_for(locale, literals)
|
||||||
names = literals.map { _1[:name] }.uniq
|
names = literals.map { _1[:name] }.uniq
|
||||||
internal = TagName.where(language_code: locale.language_code, name: names)
|
internal = TagName.where(language_code: locale.language_code, name: names)
|
||||||
.pluck(:name, :tag_id).group_by(&:first)
|
.pluck(:name, :tag_id).group_by { _1.first.downcase }
|
||||||
external = names.empty? ? {} : ExternalTag.where(
|
external = names.empty? ? {} : ExternalTag.where(
|
||||||
"CONCAT(platform, ':', name) IN (?)", names)
|
"CONCAT(platform, ':', name) IN (?)", names)
|
||||||
.pluck(Arel.sql("CONCAT(platform, ':', name)"), :id).group_by(&:first)
|
.pluck(Arel.sql("CONCAT(platform, ':', name)"), :id).group_by { _1.first.downcase }
|
||||||
names.to_h { |name| [name, [internal.fetch(name, []).map(&:last).uniq,
|
names.to_h { |name| [name, [internal.fetch(name.downcase, []).map(&:last).uniq,
|
||||||
external.fetch(name, []).map(&:last).uniq]] }
|
external.fetch(name.downcase, []).map(&:last).uniq]] }
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -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, renderToStaticMarkup } from 'react-dom/server'
|
import { renderToPipeableStream } 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, switchLocalePath } from '@/lib/locales'
|
import { fetchLocales, isLocaleCode, legacyLocalePath } 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,26 +171,8 @@ 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
|
||||||
|
|||||||
新しいイシューから参照
ユーザーをブロックする