Unverified Commit 30a80211 authored by Hong Minhee's avatar Hong Minhee
Browse files

Merge pull request #331 from dodok8/dodok8-fix-issue-326

parents d98a4df1 a338511b
Loading
Loading
Loading
Loading
+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]

[#168]: https://github.com/fedify-dev/fedify/issues/168
[#197]: https://github.com/fedify-dev/fedify/issues/197
[#248]: https://github.com/fedify-dev/fedify/issues/248
@@ -111,6 +114,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
@@ -123,7 +127,8 @@ the versioning.
[#309]: https://github.com/fedify-dev/fedify/pull/309
[#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
+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)
+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>
+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,
+10 −8
Original line number Diff line number Diff line
@@ -946,15 +946,17 @@ about the security implications of exposing the server to the public internet.
> be served via HTTP instead of HTTPS.


`fedify node`: Visualizing an instance's NodeInfo
-------------------------------------------------
`fedify nodeinfo`: Visualizing an instance's NodeInfo
-----------------------------------------------------

*This command is available since Fedify 1.8.0.*

*This command is available since Fedify 1.2.0.*
*The `fedify node` alias is deprecated and will be removed in version 2.0.0.*

![The result of fedify lookup fosstodon.org. The NodeInfo document is
visualized along with the favicon.](cli/fedify-node.png)
visualized along with the favicon.](cli/fedify-nodeinfo.png)

The `fedify node` command fetches the given instance's [NodeInfo] document and
The `fedify nodeinfo` command fetches the given instance's [NodeInfo] document and
visualizes it in [`neofetch`]-style.  The argument can be either a bare hostname
or a full URL.

@@ -975,7 +977,7 @@ You can also output the fetched NodeInfo document in the raw JSON format by usin
the `-r`/`--raw` option:

~~~~ sh
fedify node --raw fosstodon.org
fedify nodeinfo --raw fosstodon.org
~~~~

The output will be like the below:
@@ -1039,14 +1041,14 @@ i.e., the `metadata` field of the document.

*This option is available since Fedify 1.3.0.*

By default, the `fedify node` command sends the `User-Agent` header with the
By default, the `fedify nodeinfo` command sends the `User-Agent` header with the
value `Fedify/1.3.0 (Deno/2.0.4)` (version numbers may vary).  You can specify
a custom `User-Agent` header by using the `-u`/`--user-agent` option.  For
example, to send the `User-Agent` header with the value `MyApp/1.0`, run the
below command:

~~~~ sh
fedify node --user-agent MyApp/1.0 mastodon.social
fedify nodeinfo --user-agent MyApp/1.0 mastodon.social
~~~~


Loading