Merge pull request #940 from tsg-ut/city-symbol-improve-answer

city-symbol: Improve display format of answer
tsg-ut · Oct 1, 2024 · 2b0bafe · 2b0bafe
2 parents 15664fb + 0b6979d
commit 2b0bafe
Showing 1 changed file with 70 additions and 27 deletions.
diff --git a/city-symbol/index.ts b/city-symbol/index.ts
@@ -398,34 +398,77 @@ export default (slackClients: SlackInterface) => {
 							text: typicalMessageTextsGenerator.unsolved(` ＊${city.prefectureName}${city.cityName}＊ `),
 							reply_broadcast: true,
 						},
-						answerMessage: {
-							channel: message.channel,
-							text: '市区町村章',
-							blocks: [
-								{
-									type: 'image',
-									image_url: imageUrl,
-									alt_text: city.cityName,
-								},
-								{
-									type: 'section',
-									text: {
-										type: 'mrkdwn',
-										text: [
-											`＊${city.prefectureName}${city.cityName}＊`,
-											`${city.reason}`,
-											`制定年月日: ${city.date}`,
-											`備考: ${city.notes || 'なし'}`,
-											`有効回答一覧: ${correctAnswers.join(', ')}`,
-										].join('\n'),
+						get answerMessage() {
+							const aiHints = aiHintsLoader.get() ?? [];
+							const answerHeader = `${city.prefectureName}${city.cityName} (${city.ruby})`;
+							const answerDetails = [
+								`${city.reason}`,
+								`制定年月日: ${city.date}`,
+								`備考: ${city.notes || 'なし'}`,
+								`有効回答一覧: ${correctAnswers.join(', ')}`,
+							].join('\n');
+
+							return {
+								channel: message.channel,
+								text: `${answerHeader}\n\n${answerDetails}`,
+								blocks: [
+									{
+										type: 'image',
+										image_url: imageUrl,
+										alt_text: city.cityName,
 									},
-								},
-								{
-									type: 'image',
-									image_url: getWikimediaImageUrl(city.placeImage),
-									alt_text: city.cityName,
-								},
-							],
+									{
+										type: 'header',
+										text: {
+											type: 'plain_text',
+											text: answerHeader,
+										},
+									},
+									{
+										type: 'section',
+										text: {
+											type: 'mrkdwn',
+											text: answerDetails,
+										},
+									},
+									{
+										type: 'image',
+										image_url: getWikimediaImageUrl(city.placeImage),
+										alt_text: city.cityName,
+									},
+									...(aiHints.length === 0 ? [] : [
+										{
+											type: 'rich_text',
+											elements: [
+												{
+													type: 'rich_text_section',
+													elements: [
+														{
+															type: 'text',
+															text: 'ChatGPTヒント',
+														},
+													],
+												},
+												{
+													type: 'rich_text_list',
+													style: 'ordered',
+													indent: 0,
+													border: 0,
+													elements: aiHints.map((hint) => ({
+														type: 'rich_text_section',
+														elements: [
+															{
+																type: 'text',
+																text: hint,
+															},
+														],
+													})),
+												},
+											],
+										},
+									]),
+								],
+							};
 						},
 						correctAnswers,
 					};