Commit 42fa9709 authored by ChanHaeng Lee's avatar ChanHaeng Lee
Browse files

Merge remote-tracking branch 'upstream/main' into issue#310

parents c6771218 0cad8b93

.github/workflows/build.yaml

+1 −1
Original line number Diff line number Diff line
@@ -332,7 +332,7 @@ jobs: 
      working-directory: ${{ github.workspace }}/fedify/

    - run: |

        pnpm install

        pnpm pack --recursive

        pnpm pack --recursive --filter='!./examples/**'

        if [[ "$GITHUB_REF_TYPE" != tag ]]; then

          rm fedify-cli-*.tgz

        fi

CHANGES.md

+9 −4
Original line number Diff line number Diff line
@@ -90,9 +90,9 @@ the versioning. 
    to preview what files and configurations would be created without actually

    creating them.  [[#263], [#298] by Lee ByeongJun]



 -  Fixed a bug where the `fedify node` command had failed to correctly

    render the favicon in terminal emulators that do not support 24-bit

    colors.  [[#168], [#282], [#304] by Hyeonseo Kim]

 -  Fixed a bug where the `fedify nodeinfo` command (was `fedify node`) had

    failed to correctly render the favicon in terminal emulators that do not

    support 24-bit colors.  [[#168], [#282], [#304] by Hyeonseo Kim]



 -  Supported NestJS integration with the `@fedify/nestjs` package.

    [[#269], [#309] by Jaeyeol Lee]
@@ -104,6 +104,9 @@ the versioning. 
    users to save retrieved lookup results to specified path.

    [[#261], [#321] by Jiwon Kwon]



 -  Added `fedify nodeinfo` command, and deprecated `fedify node` command in

    favor of `fedify nodeinfo`.  [[#267], [#331] by Hyeonseo Kim]



 -  Supported custom collection dispatchers.

    [[#310] by ChanHaeng Lee]
@@ -127,6 +130,7 @@ the versioning. 
[#261]: https://github.com/fedify-dev/fedify/issues/261

[#262]: https://github.com/fedify-dev/fedify/issues/262

[#263]: https://github.com/fedify-dev/fedify/issues/263

[#267]: https://github.com/fedify-dev/fedify/issues/267

[#269]: https://github.com/fedify-dev/fedify/issues/269

[#278]: https://github.com/fedify-dev/fedify/pull/278

[#281]: https://github.com/fedify-dev/fedify/pull/281
@@ -140,7 +144,8 @@ the versioning. 
[#310]: https://github.com/fedify-dev/fedify/issues/310

[#311]: https://github.com/fedify-dev/fedify/issues/311

[#321]: https://github.com/fedify-dev/fedify/pull/321

[#328]: https://github.com/fedify-dev/fedify/pull/309

[#328]: https://github.com/fedify-dev/fedify/pull/328

[#331]: https://github.com/fedify-dev/fedify/pull/331





Version 1.7.6

cli/mod.ts

+2 −2
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ import { command as inbox } from "./inbox.tsx"; 
import { command as init } from "./init.ts";

import { logFile, recordingSink } from "./log.ts";

import { command as lookup } from "./lookup.ts";

import { command as node } from "./node.ts";

import { command as nodeinfo } from "./nodeinfo.ts";

import { command as tunnel } from "./tunnel.ts";

import { command as webfinger } from "./webfinger.ts";
@@ -63,7 +63,7 @@ const command = new Command() 
  .command("init", init)

  .command("lookup", lookup)

  .command("inbox", inbox)

  .command("node", node)

  .command("nodeinfo", nodeinfo)

  .command("tunnel", tunnel)

  .command("completions", new CompletionsCommand())

  .command("webfinger", webfinger)

cli/node.test.ts→cli/nodeinfo.test.ts

+1 −1
Original line number Diff line number Diff line 
import { assertEquals } from "@std/assert";

import fetchMock from "fetch-mock";

import { getAsciiArt, getFaviconUrl, Jimp, rgbTo256Color } from "./node.ts";

import { getAsciiArt, getFaviconUrl, Jimp, rgbTo256Color } from "./nodeinfo.ts";



const HTML_WITH_SMALL_ICON = `

<!DOCTYPE html>

cli/node.ts→cli/nodeinfo.ts

+11 −1
Original line number Diff line number Diff line
@@ -9,9 +9,10 @@ import { defaultFormats, defaultPlugins, intToRGBA } from "jimp"; 
import ora from "ora";

import { printJson } from "./utils.ts";



const logger = getLogger(["fedify", "cli", "node"]);

const logger = getLogger(["fedify", "cli", "nodeinfo"]);



export const command = new Command()

  .alias("node")

  .arguments("<host:string>")

  .description(

    "Get information about a remote node using the NodeInfo protocol.  " +
@@ -36,6 +37,15 @@ export const command = new Command() 
  )

  .option("-u, --user-agent <string>", "The custom User-Agent header value.")

  .action(async (options, host: string) => {

    const command = Deno.args.find((arg) =>

      arg === "node" || arg === "nodeinfo"

    );

    if (command === "node") {

      console.warn(

        "Warning: `fedify node` will be deprecated in Fedify 2.0.0. Use `fedify nodeinfo` instead.",

      );

    }



    const spinner = ora({

      text: "Fetching a NodeInfo document...",

      discardStdin: false,