Merge pull request #99 from kamecha/feature/open-channel-via-message

メッセージに応じたチャンネルを開けるようにした
kamecha · Jul 29, 2024 · 4021326 · 4021326
2 parents 54bc745 + 2474802
commit 4021326
Show file tree

Hide file tree

Showing 7 changed files with 50 additions and 22 deletions.
diff --git a/autoload/traqvim/message.vim b/autoload/traqvim/message.vim
@@ -39,6 +39,14 @@ function traqvim#message#message_next() abort
 	call cursor([next.position["start"], 0])
 endfunction
 
+function traqvim#message#goto_message() abort
+	let message = traqvim#message#get_message()
+	if empty(message)
+		return
+	endif
+	call denops#request('traqvim', 'timelineMessage', [message])
+endfunction
+
 function traqvim#message#registerYankMessageLink() abort
 	let &opfunc = function('traqvim#message#yankMessageLink')
 	return 'g@'

diff --git a/autoload/traqvim/view.vim b/autoload/traqvim/view.vim
@@ -2,14 +2,16 @@
 
 " Message { user : {id, name, displayName}, content, createdAt }
 function! traqvim#view#make_message_body(message, width) abort
-	let header = [ a:message["user"]["displayName"] . " @" . a:message["user"]["name"] . " " . a:message["createdAt"], "" ]
+	let createdAt = denops#request('traqvim', 'convertDate', [a:message["createdAt"]])
+	let header = [ a:message["user"]["displayName"] . " @" . a:message["user"]["name"] . " " . createdAt, "" ]
 	let rows = split(a:message["content"], "\n")
 	let quote = []
 	if a:message->has_key("quote")
 		if type(a:message["quote"]) == type([])
 			for q in a:message["quote"]
+				let createdAt = denops#request('traqvim', 'convertDate', [q["createdAt"]])
 				let quote += [ "", ">"]
-				let quote += [ "\t". q["user"]["displayName"] . " @" . q["user"]["name"] . " " . q["createdAt"], "" ]
+				let quote += [ "\t". q["user"]["displayName"] . " @" . q["user"]["name"] . " " . createdAt, "" ]
 				let quote += map(split(q["content"], "\n"), { _, v -> "\t" . v })
 				let quote += [ "", "<"]
 			endfor

diff --git a/denops/traqvim/action.ts b/denops/traqvim/action.ts
@@ -3,6 +3,7 @@ import { ChannelBuffer, Message } from "./type.d.ts";
 import {
   activity,
   channelMessageOptions,
+  channelPath,
   channelTimeline,
   createPin,
   deleteMessage,
@@ -14,17 +15,20 @@ import { isMessage } from "./type_check.ts";
 export const actionOpenChannel = async (
   denops: Denops,
   channelMessageOptions: channelMessageOptions,
+  message?: Message,
   bufNum?: number,
 ): Promise<void> => {
   helper.echo(denops, "actionOpenChannel");
   const timeline: Message[] = await channelTimeline(channelMessageOptions);
   if (channelMessageOptions.channelPath === undefined) {
-    helper.echoerr(denops, "channelPath is undefined");
-    return;
+    channelMessageOptions.channelPath = await channelPath(
+      channelMessageOptions.id,
+    );
   }
   const escapedChannelPath = bufname.format({
     scheme: "VtraQ",
     expr: "/Channel",
+    params: message ? { message: message.id } : undefined,
     fragment: channelMessageOptions.channelPath.replace("#", ""),
   });
   const channelBufferVars: ChannelBuffer = {

diff --git a/denops/traqvim/main.ts b/denops/traqvim/main.ts
@@ -95,6 +95,7 @@ export async function main(denops: Denops) {
         channelPath: homePath,
         limit: limit,
         until: new Date().toISOString(),
+        inclusive: true,
         order: "desc",
       };
       await actionOpenChannel(denops, timelineOption);
@@ -117,11 +118,26 @@ export async function main(denops: Denops) {
         channelPath: channelPath,
         limit: limit,
         until: new Date().toISOString(),
+        inclusive: true,
         order: "desc",
       };
       await actionOpenChannel(denops, timelineOption);
       return;
     },
+    async timelineMessage(message: unknown): Promise<unknown> {
+      assert(message, isMessage);
+      const limit = await vars.globals.get(denops, "traqvim#fetch_limit");
+      assert(limit, is.Number);
+      const timelineOption: channelMessageOptions = {
+        id: message.channelId,
+        limit: limit,
+        until: message.createdAt,
+        inclusive: true,
+        order: "desc",
+      };
+      await actionOpenChannel(denops, timelineOption, message);
+      return;
+    },
     async activity(): Promise<unknown> {
       await actionOpenActivity(denops);
       return;
@@ -147,9 +163,10 @@ export async function main(denops: Denops) {
           channelPath: bufNameWithoutNumber,
           limit: limit,
           until: new Date().toISOString(),
+          inclusive: true,
           order: "desc",
         };
-        actionOpenChannel(denops, timelineOption, bufNum);
+        actionOpenChannel(denops, timelineOption, undefined, bufNum);
       }
       return;
     },
@@ -170,19 +187,14 @@ export async function main(denops: Denops) {
           id: channelID,
           channelPath: bufNameWithoutNumber,
           limit: limit,
-          since: new Date(timeline[timeline.length - 1].createdAt)
-            .toISOString(),
+          since: timeline[timeline.length - 1].createdAt,
         };
         const forwardTimeline: Message[] = await channelTimeline(
           timelineOption,
         );
         await actionForwardChannelMessage(
           denops,
-          // 一番古いメッセージを削除
-          forwardTimeline.filter((message: Message) => {
-            return message.createdAt !==
-              timeline[timeline.length - 1].createdAt;
-          }),
+          forwardTimeline,
           bufNum,
         );
       } catch (e) {
@@ -207,17 +219,14 @@ export async function main(denops: Denops) {
           id: channelID,
           channelPath: bufNameWithoutNumber,
           limit: limit,
-          until: new Date(timeline[0].createdAt).toISOString(),
+          until: timeline[0].createdAt,
         };
         const backTimeline: Message[] = await channelTimeline(
           timelineOption,
         );
         await actionBackChannelMessage(
           denops,
-          // 受け取ったメッセージの中で一番新しい重複メッセージを削除
-          backTimeline.filter((message: Message) => {
-            return message.createdAt !== timeline[0].createdAt;
-          }),
+          backTimeline,
           bufNum,
         );
       } catch (e) {
@@ -385,4 +394,9 @@ export async function main(denops: Denops) {
     const channels = await channelsRecursive();
     return channels;
   };
+  denops.dispatcher["convertDate"] = (date: unknown): Promise<string> => {
+    assert(date, is.String);
+    const d = new Date(date);
+    return Promise.resolve(d.toLocaleString("ja-JP"));
+  };
 }
diff --git a/denops/traqvim/model.ts b/denops/traqvim/model.ts
@@ -185,7 +185,6 @@ export const channelTimeline = async (
         const ret: Message = {
           ...message,
           user: user,
-          createdAt: new Date(message.createdAt).toLocaleString("ja-JP"),
         };
         // quotedMessageUUIDsが存在しなかった場合はundefinedを返す
         let quotedMessages: Message[] | undefined = undefined;
@@ -199,9 +198,6 @@ export const channelTimeline = async (
               const ret: Message = {
                 ...quotedMessage,
                 user: user,
-                createdAt: new Date(quotedMessage.createdAt).toLocaleString(
-                  "ja-JP",
-                ),
               };
               return ret;
             }),
@@ -265,7 +261,6 @@ export const activity = async (): Promise<Message[]> => {
       return {
         ...message,
         user: user,
-        createdAt: new Date(activity.createdAt).toLocaleString("ja-JP"),
       };
     }),
   );

diff --git a/doc/traqvim.jax b/doc/traqvim.jax
@@ -151,6 +151,9 @@ g:traqvim#token_file_path
 <Plug>(traqvim-prev)				    *<Plug>(traqvim-prev)*
     前のメッセージへカーソルを移動させます
 
+<Plug>(traqvim-goto)				    *<Plug>(traqvim-goto)*
+    メッセージに対応するチャンネルへ移動します
+
 <Plug>(traqvim-motion-message)			    *<Plug>(traqvim-motion-message)*
     カーソル下の該当メッセージの始まり・終わりを選択します
     レイアウトで表示されるものが選択されます

diff --git a/ftplugin/traqvim.vim b/ftplugin/traqvim.vim
@@ -12,6 +12,8 @@ nnoremap <buffer><silent> <Plug>(traqvim-next)
 			\ <Cmd>call traqvim#message#message_next()<CR>
 nnoremap <buffer><silent> <Plug>(traqvim-prev)
 			\ <Cmd>call traqvim#message#message_prev()<CR>
+nnoremap <buffer><silent> <Plug>(traqvim-goto)
+			\ <Cmd>call traqvim#message#goto_message()<CR>
 
 nnoremap <buffer><expr> <Plug>(traqvim-operator-message-yank-link)
 			\ traqvim#message#registerYankMessageLink()