feat(stamp): スタンプのレコメンデーションを本番実装に移行し、スタンプ履歴の実装を削除

src/assets/mdi.ts

@@ -33,6 +33,7 @@ import {
   mdiCommentQuote,
   mdiCommentTextMultipleOutline,
   mdiContentCopy,
+  mdiCreation,
   mdiCrown,
   mdiDelete,
   mdiDotsHorizontal,
@@ -50,7 +51,6 @@ import {
   mdiFormatTitle,
   mdiGithub,
   mdiGoogle,
-  mdiHistory,
   mdiHome,
   mdiImageMultiple,
   mdiInformation,
@@ -116,7 +116,6 @@ const mdi: MdiIconsMapping = {
   'microphone-off': mdiMicrophoneOff,
   pin: mdiPin,
   search: mdiMagnify,
-  history: mdiHistory,
   'file-upload': mdiFileUpload,
   'file-music': mdiFileMusic,
   'file-video': mdiFileVideo,
@@ -193,7 +192,8 @@ const mdi: MdiIconsMapping = {
   'comment-outline': mdiCommentTextMultipleOutline,
   'comment-off-outline': mdiCommentOffOutline,
   'palette-outline': mdiPaletteOutline,
-  'content-copy': mdiContentCopy
+  'content-copy': mdiContentCopy,
+  creation: mdiCreation
 }
 
 export default mdi

src/components/Main/MainView/MessageElement/MessageTools.vue

@@ -97,7 +97,7 @@ import useToggle from '/@/composables/utils/useToggle'
 import { isDefined } from '/@/lib/basic/array'
 import { useStampUpdater } from '/@/lib/updater/stamp'
 import { useMeStore } from '/@/store/domain/me'
-import { useTopStampIds } from '/@/store/domain/stampRecommendations'
+import { useStampRecommendations } from '/@/store/domain/stampRecommendations'
 import { useMessagesStore } from '/@/store/entities/messages'
 import { useStampsStore } from '/@/store/entities/stamps'
 import { useMessageEditingStateStore } from '/@/store/ui/messageEditingStateStore'
@@ -120,7 +120,7 @@ const props = withDefaults(
 
 const isActive = defineModel<boolean>('isActive', { default: false })
 
-const { topStampIds } = useTopStampIds()
+const { stampRecommendations } = useStampRecommendations()
 const { addStampOptimistically } = useStampUpdater()
 const { initialRecentStamps } = useStampsStore()
 
@@ -140,7 +140,7 @@ const pushInitialRecentStampsIfNeeded = (
 }
 
 const topStamps = computed(() => {
-  const tops = topStampIds.value.slice(0, 3)
+  const tops = stampRecommendations.value.slice(0, 3)
   pushInitialRecentStampsIfNeeded(initialRecentStamps.value, tops)
   return tops
 })

src/components/Main/MainView/MessageInput/composables/suggestion/overrides/stampSuggestion.ts

@@ -1,7 +1,6 @@
 import { type MaybeRefOrGetter, computed, toValue } from 'vue'
 
 import type { Candidate, Word, WordWithId } from '/@/lib/suggestion/basic'
-import { useStampHistory } from '/@/store/domain/stampHistory'
 import { useStampRecommendations } from '/@/store/domain/stampRecommendations'
 
 const stampSuggestionOverride = <
@@ -13,7 +12,6 @@ const stampSuggestionOverride = <
 >(
   input: Params
 ) => {
-  const { upsertLocalStampHistory } = useStampHistory()
   const { recordStampUsage } = useStampRecommendations()
 
   const isStampSuggestion = computed(() =>
@@ -30,7 +28,6 @@ const stampSuggestionOverride = <
   })
 
   const onSelect = (word: WordWithId) => {
-    upsertLocalStampHistory(word.id, new Date())
     recordStampUsage(word.id)
     input.onSelect({ ...word, text: `${word.text}:` })
   }

src/components/Main/StampPicker/StampPicker.vue

@@ -53,7 +53,6 @@ import { onMounted, ref } from 'vue'
 import ClickOutside from '/@/components/UI/ClickOutside'
 import FilterInput from '/@/components/UI/FilterInput.vue'
 import useResponsive from '/@/composables/useResponsive'
-import { useStampHistory } from '/@/store/domain/stampHistory'
 import { useStampRecommendations } from '/@/store/domain/stampRecommendations'
 import { useStampPicker } from '/@/store/ui/stampPicker'
 import type { StampId } from '/@/types/entity-ids'
@@ -72,10 +71,9 @@ const {
   selectHandler,
   isEffectEnabled,
   currentStampSet,
-  validateCurrentStampSet,
+  ensureCurrentStampSetValid,
   closeStampPicker
 } = useStampPicker()
-const { upsertLocalStampHistory } = useStampHistory()
 const { isMobile } = useResponsive()
 
 const animationKeys = ref(new Map<StampId, number>())
@@ -101,7 +99,6 @@ const { recordStampUsage } = useStampRecommendations()
 const filterInputRef = ref<InstanceType<typeof FilterInput> | null>(null)
 
 const onInputStamp = (id: StampId) => {
-  upsertLocalStampHistory(id, new Date())
   recordStampUsage(id)
   selectHandler.value({
     id,
@@ -120,7 +117,7 @@ const onFilterEnter = () => {
   onInputStamp(firstStamp.id)
 }
 
-onMounted(validateCurrentStampSet)
+onMounted(ensureCurrentStampSetValid)
 </script>
 
 <style lang="scss" module>

src/components/Main/StampPicker/StampPickerStampSetSelectorItem.vue

@@ -18,9 +18,9 @@
       :class="$style.icon"
     />
     <AIcon
-      v-else-if="stampSet.type === 'history'"
+      v-else-if="stampSet.type === 'recommendation'"
       mdi
-      name="history"
+      name="creation"
       :size="24"
       :class="$style.icon"
     />

src/components/Main/StampPicker/composables/useStampList.ts

@@ -2,7 +2,7 @@ import type { Ref } from 'vue'
 import { computed } from 'vue'
 
 import { useStampCategory } from '/@/store/domain/stampCategory'
-import { useTopStampIds } from '/@/store/domain/stampRecommendations'
+import { useStampRecommendations } from '/@/store/domain/stampRecommendations'
 import { useStampPalettesStore } from '/@/store/entities/stampPalettes'
 import { useStampsStore } from '/@/store/entities/stamps'
 import type { StampId } from '/@/types/entity-ids'
@@ -12,13 +12,13 @@ import type { StampSet } from './useStampSetSelector'
 
 const useStampList = (currentStampSet: Ref<StampSet>) => {
   const { traQStampCategory, unicodeStampCategories } = useStampCategory()
-  const { topStampIds } = useTopStampIds()
+  const { stampRecommendations } = useStampRecommendations()
   const { stampsMap } = useStampsStore()
   const { stampPalettesMap } = useStampPalettesStore()
 
   const stampIds = computed((): readonly StampId[] => {
-    if (currentStampSet.value.type === 'history') {
-      return topStampIds.value
+    if (currentStampSet.value.type === 'recommendation') {
+      return stampRecommendations.value
     }
     if (currentStampSet.value.type === 'palette') {
       const id = currentStampSet.value.id

src/components/Main/StampPicker/composables/useStampSetSelector.ts

@@ -3,7 +3,7 @@ import { computed, reactive } from 'vue'
 import { useStampCategory } from '/@/store/domain/stampCategory'
 import { useStampPalettesStore } from '/@/store/entities/stampPalettes'
 
-export type StampSetType = 'palette' | 'category' | 'history'
+export type StampSetType = 'recommendation' | 'palette' | 'category'
 
 export type StampSet = {
   type: StampSetType
@@ -19,7 +19,7 @@ const useStampSetSelector = () => {
   const state = reactive({
     stampSets: computed((): StampSet[] => [
       {
-        type: 'history',
+        type: 'recommendation',
         id: ''
       },
       ...state.stampPalettes,
@@ -47,7 +47,10 @@ const useStampSetSelector = () => {
     hasStampPalette: computed((): boolean => state.stampPalettes.length > 0)
   })
 
-  return { stampSetState: state }
+  const isStampSetValid = (stampSet: StampSet) =>
+    state.stampSets.some(s => s.type === stampSet.type && s.id === stampSet.id)
+
+  return { stampSetState: state, isStampSetValid }
 }
 
 export default useStampSetSelector

src/components/Settings/StampPaletteTab/StampPaletteEditorAddableStampList.vue

@@ -45,11 +45,7 @@ import { computed, onUnmounted, ref, watch } from 'vue'
 
 import useStampFilter from '/@/components/Main/StampPicker/composables/useStampFilter'
 import FilterInput from '/@/components/UI/FilterInput.vue'
-import { useStampHistory } from '/@/store/domain/stampHistory'
-import {
-  useStampRecommendations,
-  useTopStampIds
-} from '/@/store/domain/stampRecommendations'
+import { useStampRecommendations } from '/@/store/domain/stampRecommendations'
 import { useStampsStore } from '/@/store/entities/stamps'
 import type { StampId } from '/@/types/entity-ids'
 
@@ -62,14 +58,12 @@ const currentStampIds = defineModel<StampId[]>('current-stamp-ids', {
 })
 
 const { stampsMap, stampsMapFetched } = useStampsStore()
-const { fetchStampHistory } = useStampHistory()
-const { fetchStampRecommendations } = useStampRecommendations()
-const { topStampIds } = useTopStampIds()
+const { stampRecommendations, fetchStampRecommendations } =
+  useStampRecommendations()
 const { filterState } = useStampFilter()
 
 const displayCount = ref(ITEMS_PER_LOAD)
 
-fetchStampHistory()
 fetchStampRecommendations()
 const allAddableStamps = computed(() => {
   if (!stampsMapFetched.value) {
@@ -78,11 +72,11 @@ const allAddableStamps = computed(() => {
   return (
     filterState.query === ''
       ? [
-          ...topStampIds.value
+          ...stampRecommendations.value
             .map(id => stampsMap.value.get(id))
             .filter(stamp => stamp !== undefined),
           ...filterState.filteredItems
-            .filter(stamp => !topStampIds.value.includes(stamp.id))
+            .filter(stamp => !stampRecommendations.value.includes(stamp.id))
             .sort((a, b) => a.name.localeCompare(b.name))
         ]
       : filterState.filteredItems

src/components/ShareTarget/ShareTargetMessageInput.vue

@@ -43,7 +43,6 @@ import MessageInputUploadButton from '/@/components/Main/MainView/MessageInput/M
 import useMessageInputState from '/@/composables/messageInputState/useMessageInputState'
 import useMessageInputStateAttachment from '/@/composables/messageInputState/useMessageInputStateAttachment'
 import { randomString } from '/@/lib/basic/randomString'
-import { useStampHistory } from '/@/store/domain/stampHistory'
 import { useStampRecommendations } from '/@/store/domain/stampRecommendations'
 import { useStampPalettesStore } from '/@/store/entities/stampPalettes'
 import { useStampsStore } from '/@/store/entities/stamps'
@@ -52,7 +51,6 @@ import { useToastStore } from '/@/store/ui/toast'
 import useAttachments from '../Main/MainView/MessageInput/composables/useAttachments'
 import useTextStampPickerInvoker from '../Main/MainView/composables/useTextStampPickerInvoker'
 
-const { fetchStampHistory } = useStampHistory()
 const { fetchStampRecommendations } = useStampRecommendations()
 const { fetchStamps } = useStampsStore()
 const { fetchStampPalettes } = useStampPalettesStore()
@@ -82,7 +80,6 @@ const { toggleStampPicker } = useTextStampPickerInvoker(
 // スタンプピッカーに必要
 fetchStamps()
 fetchStampPalettes()
-fetchStampHistory()
 fetchStampRecommendations()
 
 const id = randomString()

src/lib/updater/stamp.ts

@@ -1,13 +1,11 @@
 import apis from '/@/lib/apis'
-import { useStampHistory } from '/@/store/domain/stampHistory'
 import { useStampRecommendations } from '/@/store/domain/stampRecommendations'
 import { useMessagesStore } from '/@/store/entities/messages'
 import { useToastStore } from '/@/store/ui/toast'
 import type { MessageId, StampId } from '/@/types/entity-ids'
 
 export const useStampUpdater = () => {
   const { addErrorToast } = useToastStore()
-  const { upsertLocalStampHistory } = useStampHistory()
   const { recordStampUsage } = useStampRecommendations()
   const { addStampLocally, removeStampLocally } = useMessagesStore()
 
@@ -16,7 +14,6 @@ export const useStampUpdater = () => {
     stampId: StampId
   ) => {
     const cancel = addStampLocally(messageId, stampId)
-    upsertLocalStampHistory(stampId, new Date())
     recordStampUsage(stampId)
     try {
       await apis.addMessageStamp(messageId, stampId)

src/store/domain/stampRecommendations.ts

@@ -3,8 +3,6 @@ import { computed, ref } from 'vue'
 import { acceptHMRUpdate, defineStore } from 'pinia'
 
 import apis from '/@/lib/apis'
-import { useFeatureFlagSettings } from '/@/store/app/featureFlagSettings'
-import { useStampHistory } from '/@/store/domain/stampHistory'
 import { useStampsStore } from '/@/store/entities/stamps'
 import { convertToRefsStore } from '/@/store/utils/convertToRefsStore'
 import type { StampId } from '/@/types/entity-ids'
@@ -69,20 +67,6 @@ export const useStampRecommendations = convertToRefsStore(
   useStampRecommendationsPinia
 )
 
-export const useTopStampIds = () => {
-  const { featureFlags } = useFeatureFlagSettings()
-  const { stampRecommendations } = useStampRecommendations()
-  const { recentStampIds } = useStampHistory()
-
-  const topStampIds = computed(() =>
-    featureFlags.value.stamp_recommendation.enabled
-      ? stampRecommendations.value
-      : recentStampIds.value
-  )
-
-  return { topStampIds }
-}
-
 if (import.meta.hot) {
   import.meta.hot.accept(
     acceptHMRUpdate(useStampRecommendationsPinia, import.meta.hot)