diff --git a/threads.hugo/archetypes/default.md b/blog.hugo/archetypes/default.md similarity index 100% rename from threads.hugo/archetypes/default.md rename to blog.hugo/archetypes/default.md diff --git a/profile.hugo/assets/scripts/main.js b/blog.hugo/assets/scripts/main.js similarity index 100% rename from profile.hugo/assets/scripts/main.js rename to blog.hugo/assets/scripts/main.js diff --git a/threads.hugo/assets/scripts/search.js b/blog.hugo/assets/scripts/search.js similarity index 97% rename from threads.hugo/assets/scripts/search.js rename to blog.hugo/assets/scripts/search.js index e8dc3ef..b3c1eb7 100644 --- a/threads.hugo/assets/scripts/search.js +++ b/blog.hugo/assets/scripts/search.js @@ -11,7 +11,8 @@ const WORD_REGEX = /\b(\w*)[\W|\s|\b]?/gm async function initSearch() { try { - const response = await fetch("/index.json"); + const indexJsonUrl = document.getElementById("base-url").dataset["baseUrl"] + "/index.json"; + const response = await fetch(indexJsonUrl); pagesIndex = await response.json(); searchIndex = lunr(function () { this.field("title"); diff --git a/threads.hugo/assets/styles/common.scss b/blog.hugo/assets/styles/common.scss similarity index 100% rename from threads.hugo/assets/styles/common.scss rename to blog.hugo/assets/styles/common.scss diff --git a/threads.hugo/assets/styles/common/reset.scss b/blog.hugo/assets/styles/common/reset.scss similarity index 100% rename from threads.hugo/assets/styles/common/reset.scss rename to blog.hugo/assets/styles/common/reset.scss diff --git a/threads.hugo/assets/styles/common/variables.scss b/blog.hugo/assets/styles/common/variables.scss similarity index 100% rename from threads.hugo/assets/styles/common/variables.scss rename to blog.hugo/assets/styles/common/variables.scss diff --git a/threads.hugo/assets/styles/layouts/_default/baseof.scss b/blog.hugo/assets/styles/layouts/_default/baseof.scss similarity index 100% rename from threads.hugo/assets/styles/layouts/_default/baseof.scss rename to blog.hugo/assets/styles/layouts/_default/baseof.scss diff --git a/threads.hugo/assets/styles/layouts/_default/list.scss b/blog.hugo/assets/styles/layouts/_default/list.scss similarity index 100% rename from threads.hugo/assets/styles/layouts/_default/list.scss rename to blog.hugo/assets/styles/layouts/_default/list.scss diff --git a/threads.hugo/assets/styles/layouts/_default/single.scss b/blog.hugo/assets/styles/layouts/_default/single.scss similarity index 100% rename from threads.hugo/assets/styles/layouts/_default/single.scss rename to blog.hugo/assets/styles/layouts/_default/single.scss diff --git a/threads.hugo/assets/styles/layouts/index.scss b/blog.hugo/assets/styles/layouts/index.scss similarity index 100% rename from threads.hugo/assets/styles/layouts/index.scss rename to blog.hugo/assets/styles/layouts/index.scss diff --git a/threads.hugo/assets/styles/layouts/partials/nav-header.scss b/blog.hugo/assets/styles/layouts/partials/nav-header.scss similarity index 100% rename from threads.hugo/assets/styles/layouts/partials/nav-header.scss rename to blog.hugo/assets/styles/layouts/partials/nav-header.scss diff --git a/threads.hugo/assets/styles/layouts/partials/paginator.scss b/blog.hugo/assets/styles/layouts/partials/paginator.scss similarity index 100% rename from threads.hugo/assets/styles/layouts/partials/paginator.scss rename to blog.hugo/assets/styles/layouts/partials/paginator.scss diff --git a/threads.hugo/assets/styles/layouts/partials/search/search-form.scss b/blog.hugo/assets/styles/layouts/partials/search/search-form.scss similarity index 100% rename from threads.hugo/assets/styles/layouts/partials/search/search-form.scss rename to blog.hugo/assets/styles/layouts/partials/search/search-form.scss diff --git a/threads.hugo/assets/styles/layouts/partials/site-footer.scss b/blog.hugo/assets/styles/layouts/partials/site-footer.scss similarity index 100% rename from threads.hugo/assets/styles/layouts/partials/site-footer.scss rename to blog.hugo/assets/styles/layouts/partials/site-footer.scss diff --git a/threads.hugo/assets/styles/layouts/partials/site-header.scss b/blog.hugo/assets/styles/layouts/partials/site-header.scss similarity index 100% rename from threads.hugo/assets/styles/layouts/partials/site-header.scss rename to blog.hugo/assets/styles/layouts/partials/site-header.scss diff --git a/threads.hugo/assets/styles/layouts/search/list.scss b/blog.hugo/assets/styles/layouts/search/list.scss similarity index 100% rename from threads.hugo/assets/styles/layouts/search/list.scss rename to blog.hugo/assets/styles/layouts/search/list.scss diff --git a/threads.hugo/assets/styles/print.scss b/blog.hugo/assets/styles/print.scss similarity index 100% rename from threads.hugo/assets/styles/print.scss rename to blog.hugo/assets/styles/print.scss diff --git a/threads.hugo/assets/styles/screen.scss b/blog.hugo/assets/styles/screen.scss similarity index 100% rename from threads.hugo/assets/styles/screen.scss rename to blog.hugo/assets/styles/screen.scss diff --git a/wiki.hugo/content/_dump/activitypub-2.md b/blog.hugo/content/_dump/activitypub-2.md similarity index 100% rename from wiki.hugo/content/_dump/activitypub-2.md rename to blog.hugo/content/_dump/activitypub-2.md diff --git a/wiki.hugo/content/_dump/activitypub-proglang.md b/blog.hugo/content/_dump/activitypub-proglang.md similarity index 100% rename from wiki.hugo/content/_dump/activitypub-proglang.md rename to blog.hugo/content/_dump/activitypub-proglang.md diff --git a/wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/aspects-circles-audiences-vs-lists-vs-collections.md b/blog.hugo/content/_dump/aspects-circles-audiences-vs-lists-vs-collections.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/aspects-circles-audiences-vs-lists-vs-collections.md rename to blog.hugo/content/_dump/aspects-circles-audiences-vs-lists-vs-collections.md diff --git a/wiki.hugo/content/_dump/fedi-critiques/blocklists-as-hoa.md b/blog.hugo/content/_dump/blocklists-as-hoa.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-critiques/blocklists-as-hoa.md rename to blog.hugo/content/_dump/blocklists-as-hoa.md diff --git a/wiki.hugo/content/_dump/fedi-critiques/context-unaware.md b/blog.hugo/content/_dump/context-unaware.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-critiques/context-unaware.md rename to blog.hugo/content/_dump/context-unaware.md diff --git a/wiki.hugo/content/_dump/copyright-is-theft.md b/blog.hugo/content/_dump/copyright-is-theft.md similarity index 100% rename from wiki.hugo/content/_dump/copyright-is-theft.md rename to blog.hugo/content/_dump/copyright-is-theft.md diff --git a/wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/deactivating-twitter.md b/blog.hugo/content/_dump/deactivating-twitter.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/deactivating-twitter.md rename to blog.hugo/content/_dump/deactivating-twitter.md diff --git a/wiki.hugo/content/_dump/fedi-critiques/default-server-paradigm.md b/blog.hugo/content/_dump/default-server-paradigm.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-critiques/default-server-paradigm.md rename to blog.hugo/content/_dump/default-server-paradigm.md diff --git a/wiki.hugo/content/_dump/defining-quotes.md b/blog.hugo/content/_dump/defining-quotes.md similarity index 100% rename from wiki.hugo/content/_dump/defining-quotes.md rename to blog.hugo/content/_dump/defining-quotes.md diff --git a/wiki.hugo/content/_dump/documentation-first.md b/blog.hugo/content/_dump/documentation-first.md similarity index 100% rename from wiki.hugo/content/_dump/documentation-first.md rename to blog.hugo/content/_dump/documentation-first.md diff --git a/wiki.hugo/content/_dump/domain-number-system.md b/blog.hugo/content/_dump/domain-number-system.md similarity index 100% rename from wiki.hugo/content/_dump/domain-number-system.md rename to blog.hugo/content/_dump/domain-number-system.md diff --git a/wiki.hugo/content/_dump/drowning-in-awareness.md b/blog.hugo/content/_dump/drowning-in-awareness.md similarity index 100% rename from wiki.hugo/content/_dump/drowning-in-awareness.md rename to blog.hugo/content/_dump/drowning-in-awareness.md diff --git a/wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/fcc-repeals-net-neutrality.md b/blog.hugo/content/_dump/fcc-repeals-net-neutrality.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/fcc-repeals-net-neutrality.md rename to blog.hugo/content/_dump/fcc-repeals-net-neutrality.md diff --git a/wiki.hugo/content/_dump/fedi-critiques/fedi-as-reformist-option.md b/blog.hugo/content/_dump/fedi-as-reformist-option.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-critiques/fedi-as-reformist-option.md rename to blog.hugo/content/_dump/fedi-as-reformist-option.md diff --git a/wiki.hugo/content/_dump/fedi-critiques/implicit-vs-explicit.md b/blog.hugo/content/_dump/implicit-vs-explicit.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-critiques/implicit-vs-explicit.md rename to blog.hugo/content/_dump/implicit-vs-explicit.md diff --git a/wiki.hugo/content/_dump/fedi-critiques/mainstreaming-mastodon.md b/blog.hugo/content/_dump/mainstreaming-mastodon.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-critiques/mainstreaming-mastodon.md rename to blog.hugo/content/_dump/mainstreaming-mastodon.md diff --git a/wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/making-better-stuff-is-unprofitable.md b/blog.hugo/content/_dump/making-better-stuff-is-unprofitable.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/making-better-stuff-is-unprofitable.md rename to blog.hugo/content/_dump/making-better-stuff-is-unprofitable.md diff --git a/wiki.hugo/content/_dump/mastodon-api-value.md b/blog.hugo/content/_dump/mastodon-api-value.md similarity index 100% rename from wiki.hugo/content/_dump/mastodon-api-value.md rename to blog.hugo/content/_dump/mastodon-api-value.md diff --git a/wiki.hugo/content/_dump/fedi-critiques/nation-stateificiation.md b/blog.hugo/content/_dump/nation-stateificiation.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-critiques/nation-stateificiation.md rename to blog.hugo/content/_dump/nation-stateificiation.md diff --git a/wiki.hugo/content/_dump/plaintext-xml-json.md b/blog.hugo/content/_dump/plaintext-xml-json.md similarity index 100% rename from wiki.hugo/content/_dump/plaintext-xml-json.md rename to blog.hugo/content/_dump/plaintext-xml-json.md diff --git a/wiki.hugo/content/_dump/services-vs-communities.md b/blog.hugo/content/_dump/services-vs-communities.md similarity index 100% rename from wiki.hugo/content/_dump/services-vs-communities.md rename to blog.hugo/content/_dump/services-vs-communities.md diff --git a/wiki.hugo/content/_dump/shorts-are-too-long.md b/blog.hugo/content/_dump/shorts-are-too-long.md similarity index 100% rename from wiki.hugo/content/_dump/shorts-are-too-long.md rename to blog.hugo/content/_dump/shorts-are-too-long.md diff --git a/wiki.hugo/content/_dump/social-media-failure.md b/blog.hugo/content/_dump/social-media-failure.md similarity index 100% rename from wiki.hugo/content/_dump/social-media-failure.md rename to blog.hugo/content/_dump/social-media-failure.md diff --git a/wiki.hugo/content/_dump/social.md b/blog.hugo/content/_dump/social.md similarity index 100% rename from wiki.hugo/content/_dump/social.md rename to blog.hugo/content/_dump/social.md diff --git a/profile.hugo/content/comments/_index.md b/blog.hugo/content/_dump/socialhub-threads/_index.md similarity index 100% rename from profile.hugo/content/comments/_index.md rename to blog.hugo/content/_dump/socialhub-threads/_index.md diff --git a/wiki.hugo/content/_dump/socialhub-threads/dereferencing-non-https.md b/blog.hugo/content/_dump/socialhub-threads/dereferencing-non-https.md similarity index 100% rename from wiki.hugo/content/_dump/socialhub-threads/dereferencing-non-https.md rename to blog.hugo/content/_dump/socialhub-threads/dereferencing-non-https.md diff --git a/wiki.hugo/content/_dump/socialhub-threads/exposing-edit-history.md b/blog.hugo/content/_dump/socialhub-threads/exposing-edit-history.md similarity index 100% rename from wiki.hugo/content/_dump/socialhub-threads/exposing-edit-history.md rename to blog.hugo/content/_dump/socialhub-threads/exposing-edit-history.md diff --git a/wiki.hugo/content/_dump/socialhub-threads/follow-arbitrary-collections.md b/blog.hugo/content/_dump/socialhub-threads/follow-arbitrary-collections.md similarity index 100% rename from wiki.hugo/content/_dump/socialhub-threads/follow-arbitrary-collections.md rename to blog.hugo/content/_dump/socialhub-threads/follow-arbitrary-collections.md diff --git a/blog.hugo/content/_dump/socialhub-threads/multi-protocol-approach.md b/blog.hugo/content/_dump/socialhub-threads/multi-protocol-approach.md new file mode 100644 index 0000000..d6893fb --- /dev/null +++ b/blog.hugo/content/_dump/socialhub-threads/multi-protocol-approach.md @@ -0,0 +1,56 @@ ++++ +title = "re: starting to investigate other protocols" +summary = "The main thing I'm trying to formulate right now is a generic understanding of what is a protocol and what makes up a protocol." +date = "2023-01-02T21:00:00-06:00" +source = "https://socialhub.activitypub.rocks/t/socialwebfoundation-what-do-people-think/4564/13" +inReplyTo = "https://socialhub.activitypub.rocks/t/socialwebfoundation-what-do-people-think/4564/12" ++++ + +
+

And from an activist perspective, I’d be very loud about starting to investigate other protocols – and why you’re doing it.

+
+ +If anything, the recent developments have definitely gotten me to more seriously revisit some ideas I had a few years back about a multi-protocol approach[^multi-proto-approach] and how best to synthesize several different protocols that have similar or different approaches to certain things. The main thing I'm trying to formulate right now is a generic understanding of what is a protocol and what makes up a protocol. To give an example limited to just 3 "protocols" that mostly work off of from/to semantics, we can look at SMTP, XMPP, and ActivityPub. + +- Data format: SMTP is more or less plaintext, XMPP is XML, and ActivityPub is JSON. +- Message payload format: SMTP uses RFC 822 messages, XMPP uses stanzas, and ActivityPub uses AS2 Activities. +- Message semantics: SMTP messages have headers and body content. XMPP stanzas can be message, presence, or information query. ActivityPub activities... are activities. That's it. + +So before you even get to the part where you can do anything interesting, you find that ActivityPub is really not much of a protocol. All three of these protocols let you "send and receive", but there's more to communication than just sending and receiving. So, given that, what does ActivityPub *actually* provide? + +The best I can describe it right now, ActivityPub provides the following "protocols" layered on top of LDN: + +- A protocol for "following". You send a `Follow`, it can trigger an `Accept` or `Reject`, you can `Undo` it later, and there are side effects of being added to `followers`/`following`. +- A protocol for "liking". You send a `Like`, there are side effects of being added to the `likes` collection. +- A protocol for "(re)sharing". You send an `Announce`, there are side effects of being added to the `shares` collection. + +Everything else is far too undefined or under-defined to constitute much of a "protocol". Things like Create have "surprisingly few side effects" according to the ActivityPub TR, because they were intended for the C2S API to be able to do basic CRUD and Collection management. But in the fediverse, Create actually has a lot more to it! So if we were to define a basic "social media post" application protocol for the lowest common denominator of most of the current fediverse, then we need to define more than what the ActivityPub spec concerns itself with, just to get to "hello world" levels of functionality. We need to explicitly define the following additional things to get from "AP Create notification" to "social media post" in its most limited form: + +- You send a `Create` where the `object` is a `Note`. + - The object MUST have `content` whose value is a string. + - The content MUST conform to some sanitized subset of HTML. + - The object MUST have a `published` whose value is a string containing a timestamp. + - The object MUST have an `attributedTo` whose value is exactly one actor. + - The actor MUST be of type `Person`. + - The actor MUST have a `name` whose value is a string. + - The name MUST be plain text, and will be interpreted as plain text. + - The actor MUST have an `icon` whose value is the URL to a 1:1 image file. + - The actor MUST have a `preferredUsername` whose value is a string. + - The username MUST be unique on the domain. + - The username MUST link back to the actor when querying that actor's domain's WebFinger endpoint for an `acct:` URI formed of the username and the domain. + - The object MUST have `to` or `cc` or both, whose value is an array which contains at least `https://www.w3.org/ns/activitystreams#Public`. + +Now, I'm simplifying a bit, so the above has the following caveats: + +- Requirements can be relaxed or willfully violated as various needs arise. For example, if an actor is missing an `icon`, the protocol can be modified such that a "default avatar" is assumed instead. +- Requirements can also be added or extended as the protocol matures and develops. For example, support for `inReplyTo`, `attachment`, `tag` can be added over time. +- Protocols may require other protocols or specifications. For example, WebFinger in the above "social media post" protocol. +- Additional protocols would be need to be defined for each use case. For example, a similar protocol for "making a blog post" could be defined using `Create Article`. +- Specifications ideally ought to be followed, but ultimately the real protocol is what implementers end up doing, and the above protocol codifies some mistakes and errors into itself. For example, hard assumptions of actor and object types, hard requirements on the maximum cardinality of properties like `attributedTo`, soft requirements for specifically `https://www.w3.org/ns/activitystreams#Public` instead of `as:Public`. (All of these things represent real incorrect assumptions by real implementers.) + +When you put it like this, it becomes clear that if the fediverse wants to continue to make use of ActivityPub, then there are a *lot* of things that need to be explicitly defined as protocols layered[^protocol-layering] on top of ActivityPub. The "implicit protocol of the fediverse" is not sufficiently described by "the ActivityPub specification". We need to standardize and align on common patterns and common protocols for those patterns. + +And the challenge here, the issue is, that if we don't do this work at a grassroots level, then Meta will do it for us. (Can you imagine a "developer portal" for "interoperating with Threads"?) Things like the FEP process allow writing up these "micro-protocols", and then after that, the difficult task of cat-herding begins, as you need to get implementers onboard with adhering to these specifications. And of course, we're all mostly doing this in our free time and without access to the resources that larger organizations have or can gain access to. So it's going to be an uphill battle. But whichever "protocol building blocks" we can agree and align upon, let's go for it. + +[^multi-proto-approach]: I was specifically looking at a "unified communication" project, which mapped abstract forms of communication like "messaging", "publishing", "discussing", "reading" onto existing protocols like SMTP, XMPP, ActivityPub, IRC, RSS, ATOM, HTTP. There's a risk of ending up with something like Pidgin here, but maybe that's not the worst thing. +[^protocol-layering]: And of course, other protocols and other layerings are possible. Libervia (formerly Salut a Toi) does AS2 with PubSub over XMPP, but offers an "ActivityPub gateway". You could, if you wanted to, send AS2 over an SMTP transport. \ No newline at end of file diff --git a/wiki.hugo/content/_dump/socialhub-threads/note-vs-article-distinction.md b/blog.hugo/content/_dump/socialhub-threads/note-vs-article-distinction.md similarity index 98% rename from wiki.hugo/content/_dump/socialhub-threads/note-vs-article-distinction.md rename to blog.hugo/content/_dump/socialhub-threads/note-vs-article-distinction.md index 710ac50..ea075d0 100644 --- a/wiki.hugo/content/_dump/socialhub-threads/note-vs-article-distinction.md +++ b/blog.hugo/content/_dump/socialhub-threads/note-vs-article-distinction.md @@ -156,4 +156,4 @@ the thing is, though, that it’s really seeming like if we use “syndication ## current thoughts -i wrote a whole thing abt this [here]({{< relref "note-vs-article" >}}) \ No newline at end of file +i wrote a whole thing abt this [here](https://trwnh.com/wiki/tech/spec/activitypub/confusion/note-vs-article/) \ No newline at end of file diff --git a/wiki.hugo/content/_dump/socialhub-threads/notification-to-refetch-object.md b/blog.hugo/content/_dump/socialhub-threads/notification-to-refetch-object.md similarity index 100% rename from wiki.hugo/content/_dump/socialhub-threads/notification-to-refetch-object.md rename to blog.hugo/content/_dump/socialhub-threads/notification-to-refetch-object.md diff --git a/wiki.hugo/content/_dump/socialhub-threads/signaling-side-effects-async.md b/blog.hugo/content/_dump/socialhub-threads/signaling-side-effects-async.md similarity index 100% rename from wiki.hugo/content/_dump/socialhub-threads/signaling-side-effects-async.md rename to blog.hugo/content/_dump/socialhub-threads/signaling-side-effects-async.md diff --git a/wiki.hugo/content/_dump/socialhub-threads/stricter-spec-for-collections.md b/blog.hugo/content/_dump/socialhub-threads/stricter-spec-for-collections.md similarity index 100% rename from wiki.hugo/content/_dump/socialhub-threads/stricter-spec-for-collections.md rename to blog.hugo/content/_dump/socialhub-threads/stricter-spec-for-collections.md diff --git a/wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/stop-using-crossposters.md b/blog.hugo/content/_dump/stop-using-crossposters.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/stop-using-crossposters.md rename to blog.hugo/content/_dump/stop-using-crossposters.md diff --git a/wiki.hugo/content/_dump/w3c-http-supremacy.md b/blog.hugo/content/_dump/w3c-http-supremacy.md similarity index 100% rename from wiki.hugo/content/_dump/w3c-http-supremacy.md rename to blog.hugo/content/_dump/w3c-http-supremacy.md diff --git a/wiki.hugo/content/_dump/webfinger-as-dns.md b/blog.hugo/content/_dump/webfinger-as-dns.md similarity index 100% rename from wiki.hugo/content/_dump/webfinger-as-dns.md rename to blog.hugo/content/_dump/webfinger-as-dns.md diff --git a/wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/why-read-theory.md b/blog.hugo/content/_dump/why-read-theory.md similarity index 100% rename from wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/why-read-theory.md rename to blog.hugo/content/_dump/why-read-theory.md diff --git a/threads.hugo/content/threads/_index.md b/blog.hugo/content/_index.md similarity index 100% rename from threads.hugo/content/threads/_index.md rename to blog.hugo/content/_index.md diff --git a/blog.hugo/content/_search.md b/blog.hugo/content/_search.md new file mode 100644 index 0000000..aa59033 --- /dev/null +++ b/blog.hugo/content/_search.md @@ -0,0 +1,7 @@ ++++ +layout = "search" +url = "search" +name = "Search results" +[_build] +list = "never" ++++ \ No newline at end of file diff --git a/blog.hugo/content/threads/_index.md b/blog.hugo/content/threads/_index.md new file mode 100644 index 0000000..d51ae88 --- /dev/null +++ b/blog.hugo/content/threads/_index.md @@ -0,0 +1,6 @@ ++++ +title = "some of my threads out of context" +summary = "mostly a compilation of times i replied to myself on social media or in chat" ++++ + +[[rejected outtakes]](misc.md) \ No newline at end of file diff --git a/threads.hugo/content/threads/art-not-commodity/index.md b/blog.hugo/content/threads/art-not-commodity/index.md similarity index 100% rename from threads.hugo/content/threads/art-not-commodity/index.md rename to blog.hugo/content/threads/art-not-commodity/index.md diff --git a/threads.hugo/content/threads/blocked/index.md b/blog.hugo/content/threads/blocked/index.md similarity index 100% rename from threads.hugo/content/threads/blocked/index.md rename to blog.hugo/content/threads/blocked/index.md diff --git a/threads.hugo/content/threads/boktai-3/index.md b/blog.hugo/content/threads/boktai-3/index.md similarity index 100% rename from threads.hugo/content/threads/boktai-3/index.md rename to blog.hugo/content/threads/boktai-3/index.md diff --git a/threads.hugo/content/threads/camera-gear/index.md b/blog.hugo/content/threads/camera-gear/index.md similarity index 100% rename from threads.hugo/content/threads/camera-gear/index.md rename to blog.hugo/content/threads/camera-gear/index.md diff --git a/threads.hugo/content/threads/crossposters/index.md b/blog.hugo/content/threads/crossposters/index.md similarity index 100% rename from threads.hugo/content/threads/crossposters/index.md rename to blog.hugo/content/threads/crossposters/index.md diff --git a/threads.hugo/content/threads/deactivating-twitter/index.md b/blog.hugo/content/threads/deactivating-twitter/index.md similarity index 100% rename from threads.hugo/content/threads/deactivating-twitter/index.md rename to blog.hugo/content/threads/deactivating-twitter/index.md diff --git a/threads.hugo/content/threads/fedi-vs-web/index.md b/blog.hugo/content/threads/fedi-vs-web/index.md similarity index 100% rename from threads.hugo/content/threads/fedi-vs-web/index.md rename to blog.hugo/content/threads/fedi-vs-web/index.md diff --git a/threads.hugo/content/threads/gun-culture-in-america/index.md b/blog.hugo/content/threads/gun-culture-in-america/index.md similarity index 100% rename from threads.hugo/content/threads/gun-culture-in-america/index.md rename to blog.hugo/content/threads/gun-culture-in-america/index.md diff --git a/threads.hugo/content/threads/liberalism-and-trump/index.md b/blog.hugo/content/threads/liberalism-and-trump/index.md similarity index 100% rename from threads.hugo/content/threads/liberalism-and-trump/index.md rename to blog.hugo/content/threads/liberalism-and-trump/index.md diff --git a/threads.hugo/content/threads/mastodon-as-twitter-do-over/index.md b/blog.hugo/content/threads/mastodon-as-twitter-do-over/index.md similarity index 100% rename from threads.hugo/content/threads/mastodon-as-twitter-do-over/index.md rename to blog.hugo/content/threads/mastodon-as-twitter-do-over/index.md diff --git a/threads.hugo/content/threads/misc.md b/blog.hugo/content/threads/misc.md similarity index 100% rename from threads.hugo/content/threads/misc.md rename to blog.hugo/content/threads/misc.md diff --git a/threads.hugo/content/threads/multiple-accounts/index.md b/blog.hugo/content/threads/multiple-accounts/index.md similarity index 100% rename from threads.hugo/content/threads/multiple-accounts/index.md rename to blog.hugo/content/threads/multiple-accounts/index.md diff --git a/threads.hugo/content/threads/necromancy/index.md b/blog.hugo/content/threads/necromancy/index.md similarity index 100% rename from threads.hugo/content/threads/necromancy/index.md rename to blog.hugo/content/threads/necromancy/index.md diff --git a/threads.hugo/content/threads/neoliberalism/index.md b/blog.hugo/content/threads/neoliberalism/index.md similarity index 100% rename from threads.hugo/content/threads/neoliberalism/index.md rename to blog.hugo/content/threads/neoliberalism/index.md diff --git a/threads.hugo/content/threads/net-neutrality-repealed/index.md b/blog.hugo/content/threads/net-neutrality-repealed/index.md similarity index 100% rename from threads.hugo/content/threads/net-neutrality-repealed/index.md rename to blog.hugo/content/threads/net-neutrality-repealed/index.md diff --git a/threads.hugo/content/threads/physical-bodies/index.md b/blog.hugo/content/threads/physical-bodies/index.md similarity index 100% rename from threads.hugo/content/threads/physical-bodies/index.md rename to blog.hugo/content/threads/physical-bodies/index.md diff --git a/threads.hugo/content/threads/product-vs-profit/index.md b/blog.hugo/content/threads/product-vs-profit/index.md similarity index 100% rename from threads.hugo/content/threads/product-vs-profit/index.md rename to blog.hugo/content/threads/product-vs-profit/index.md diff --git a/threads.hugo/content/threads/reading-theory/index.md b/blog.hugo/content/threads/reading-theory/index.md similarity index 100% rename from threads.hugo/content/threads/reading-theory/index.md rename to blog.hugo/content/threads/reading-theory/index.md diff --git a/threads.hugo/content/threads/responsive-web-design/index.md b/blog.hugo/content/threads/responsive-web-design/index.md similarity index 100% rename from threads.hugo/content/threads/responsive-web-design/index.md rename to blog.hugo/content/threads/responsive-web-design/index.md diff --git a/threads.hugo/content/threads/smartphones-and-capitalism/index.md b/blog.hugo/content/threads/smartphones-and-capitalism/index.md similarity index 100% rename from threads.hugo/content/threads/smartphones-and-capitalism/index.md rename to blog.hugo/content/threads/smartphones-and-capitalism/index.md diff --git a/threads.hugo/content/threads/syndicalism-is-dead/index.md b/blog.hugo/content/threads/syndicalism-is-dead/index.md similarity index 100% rename from threads.hugo/content/threads/syndicalism-is-dead/index.md rename to blog.hugo/content/threads/syndicalism-is-dead/index.md diff --git a/threads.hugo/content/threads/the-web-not-only-for-profit/index.md b/blog.hugo/content/threads/the-web-not-only-for-profit/index.md similarity index 100% rename from threads.hugo/content/threads/the-web-not-only-for-profit/index.md rename to blog.hugo/content/threads/the-web-not-only-for-profit/index.md diff --git a/threads.hugo/content/threads/ubi/index.md b/blog.hugo/content/threads/ubi/index.md similarity index 100% rename from threads.hugo/content/threads/ubi/index.md rename to blog.hugo/content/threads/ubi/index.md diff --git a/threads.hugo/content/threads/voluntarism/index.md b/blog.hugo/content/threads/voluntarism/index.md similarity index 100% rename from threads.hugo/content/threads/voluntarism/index.md rename to blog.hugo/content/threads/voluntarism/index.md diff --git a/threads.hugo/deploy b/blog.hugo/deploy similarity index 100% rename from threads.hugo/deploy rename to blog.hugo/deploy diff --git a/blog.hugo/hugo.toml b/blog.hugo/hugo.toml new file mode 100644 index 0000000..5b7429d --- /dev/null +++ b/blog.hugo/hugo.toml @@ -0,0 +1,9 @@ +baseURL = 'https://trwnh.com/blog/' +languageCode = 'en-us' +title = '~a blog' +markup.goldmark.renderer.unsafe = true + +pagination.pagerSize = 100 + +[outputs] +home = ["HTML", "JSON"] diff --git a/threads.hugo/layouts/_default/baseof.html b/blog.hugo/layouts/_default/baseof.html similarity index 100% rename from threads.hugo/layouts/_default/baseof.html rename to blog.hugo/layouts/_default/baseof.html diff --git a/threads.hugo/layouts/_default/list.html b/blog.hugo/layouts/_default/list.html similarity index 100% rename from threads.hugo/layouts/_default/list.html rename to blog.hugo/layouts/_default/list.html diff --git a/threads.hugo/layouts/search/list.html b/blog.hugo/layouts/_default/search.html similarity index 86% rename from threads.hugo/layouts/search/list.html rename to blog.hugo/layouts/_default/search.html index 0207e80..34581ea 100644 --- a/threads.hugo/layouts/search/list.html +++ b/blog.hugo/layouts/_default/search.html @@ -1,8 +1,13 @@ +{{ define "head" }} +{{ partial "search/search-index.html" . }} +{{ end }} + {{ define "main" }}
+ {{ partial "search/search-form.html" . }}

for ""

@@ -18,5 +23,4 @@ -{{ partial "search/search-index.html" . }} {{ end }} \ No newline at end of file diff --git a/threads.hugo/layouts/_default/single.html b/blog.hugo/layouts/_default/single.html similarity index 100% rename from threads.hugo/layouts/_default/single.html rename to blog.hugo/layouts/_default/single.html diff --git a/threads.hugo/layouts/index.html b/blog.hugo/layouts/index.html similarity index 100% rename from threads.hugo/layouts/index.html rename to blog.hugo/layouts/index.html diff --git a/profile.hugo/layouts/index.json b/blog.hugo/layouts/index.json similarity index 100% rename from profile.hugo/layouts/index.json rename to blog.hugo/layouts/index.json diff --git a/threads.hugo/layouts/partials/nav-header.html b/blog.hugo/layouts/partials/nav-header.html similarity index 100% rename from threads.hugo/layouts/partials/nav-header.html rename to blog.hugo/layouts/partials/nav-header.html diff --git a/threads.hugo/layouts/partials/paginator.html b/blog.hugo/layouts/partials/paginator.html similarity index 100% rename from threads.hugo/layouts/partials/paginator.html rename to blog.hugo/layouts/partials/paginator.html diff --git a/threads.hugo/layouts/partials/search/search-form.html b/blog.hugo/layouts/partials/search/search-form.html similarity index 100% rename from threads.hugo/layouts/partials/search/search-form.html rename to blog.hugo/layouts/partials/search/search-form.html diff --git a/blog.hugo/layouts/partials/search/search-index.html b/blog.hugo/layouts/partials/search/search-index.html new file mode 100644 index 0000000..6a752b5 --- /dev/null +++ b/blog.hugo/layouts/partials/search/search-index.html @@ -0,0 +1,4 @@ + +{{ $js := resources.Get "scripts/search.js" | minify | fingerprint }} + +
\ No newline at end of file diff --git a/blog.hugo/layouts/partials/seo.html b/blog.hugo/layouts/partials/seo.html new file mode 100644 index 0000000..229b435 --- /dev/null +++ b/blog.hugo/layouts/partials/seo.html @@ -0,0 +1,153 @@ +{{- $title := or .Title $.File.ContentBaseName }} + +{{- $cover := ($.Resources.ByType "image").GetMatch "{*opengraph*}" -}} +{{ $icon := resources.GetMatch (default "" .Site.Params.icon) -}} + +{{/*=== title ===*/}} +{{ "" | safeHTML }} +{{- with .Site.Title }} + +{{- end -}} +{{- if .IsHome}} +{{- with or .Params.name .Site.Title }} +{{ . }} + +{{- end }} +{{- else }} +{{ or .Params.name (print $title " • " .Site.Title) }} + +{{- end -}} + +{{/*=== description ===*/}} +{{- with or .Description .Summary .Site.Params.description }} + + +{{- end }} +{{ "" | safeHTML }} +{{- with .Permalink | absURL}} + + + + +{{- end -}} + +{{/*=== image ===*/}} +{{- $staticIcon := "icon.png" | absURL -}} +{{- with or $cover $icon }} +{{ "" | safeHTML }} + +{{- with .Width }} + +{{- end }} +{{- with .Height }} + +{{- end }} + + +{{- else }} +{{ "" | safeHTML }} + + + +{{- end -}} + +{{/*=== extra params? ===*/}} +{{- with .Params.audio }}{{ end }} +{{- with .Params.locale }}{{ end }} +{{- with .Params.videos }}{{- range . }} + +{{ end }}{{ end }} + +{{/*=== article ===*/}} +{{ with or .Params.author .Site.Params.author -}} +{{ "" | safeHTML }} + +{{- end }} + +{{ "" | safeHTML }} +{{ with .Date -}} + +{{ end -}} +{{ with .Lastmod -}} + +{{ end -}} + +{{/*=== section and keywords ===*/}} +{{- "" | safeHTML }} +{{ with.Params.category -}} + +{{- end -}} +{{- with .Params.tags }} + +{{- end -}} + +{{- if isset .Params "date" }} +{{ "" | safeHTML }} + + + +{{- else }} +{{ "" | safeHTML }} + + +{{- end -}} + +{{/* auxiliary info */}} +{{ "" | safeHTML }} +{{ with $icon }} + +{{- else -}} + +{{- end }} + + + +{{ with .OutputFormats.Get "RSS" -}} + +{{- end -}} + +{{/* robots */}} +{{ "" | safeHTML }} + + diff --git a/threads.hugo/layouts/partials/site-footer.html b/blog.hugo/layouts/partials/site-footer.html similarity index 100% rename from threads.hugo/layouts/partials/site-footer.html rename to blog.hugo/layouts/partials/site-footer.html diff --git a/threads.hugo/layouts/partials/site-header.html b/blog.hugo/layouts/partials/site-header.html similarity index 93% rename from threads.hugo/layouts/partials/site-header.html rename to blog.hugo/layouts/partials/site-header.html index 44c5ee4..7df9e92 100644 --- a/threads.hugo/layouts/partials/site-header.html +++ b/blog.hugo/layouts/partials/site-header.html @@ -1,7 +1,7 @@
- + {{ with .Site.Params.masthead.image }} {{ end }} diff --git a/blog.hugo/layouts/shortcodes/toc.html b/blog.hugo/layouts/shortcodes/toc.html new file mode 100644 index 0000000..caa85a2 --- /dev/null +++ b/blog.hugo/layouts/shortcodes/toc.html @@ -0,0 +1,6 @@ + \ No newline at end of file diff --git a/profile.hugo/archetypes/comments.md b/profile.test.hugo/archetypes/comments.md similarity index 100% rename from profile.hugo/archetypes/comments.md rename to profile.test.hugo/archetypes/comments.md diff --git a/profile.hugo/archetypes/notes.md b/profile.test.hugo/archetypes/notes.md similarity index 100% rename from profile.hugo/archetypes/notes.md rename to profile.test.hugo/archetypes/notes.md diff --git a/threads.hugo/assets/scripts/main.js b/profile.test.hugo/assets/scripts/main.js similarity index 100% rename from threads.hugo/assets/scripts/main.js rename to profile.test.hugo/assets/scripts/main.js diff --git a/profile.hugo/assets/scripts/search.js b/profile.test.hugo/assets/scripts/search.js similarity index 100% rename from profile.hugo/assets/scripts/search.js rename to profile.test.hugo/assets/scripts/search.js diff --git a/profile.hugo/assets/styles/common/base.scss b/profile.test.hugo/assets/styles/common/base.scss similarity index 100% rename from profile.hugo/assets/styles/common/base.scss rename to profile.test.hugo/assets/styles/common/base.scss diff --git a/profile.hugo/assets/styles/common/colors.scss b/profile.test.hugo/assets/styles/common/colors.scss similarity index 100% rename from profile.hugo/assets/styles/common/colors.scss rename to profile.test.hugo/assets/styles/common/colors.scss diff --git a/profile.hugo/assets/styles/common/content.scss b/profile.test.hugo/assets/styles/common/content.scss similarity index 100% rename from profile.hugo/assets/styles/common/content.scss rename to profile.test.hugo/assets/styles/common/content.scss diff --git a/profile.hugo/assets/styles/common/reset.scss b/profile.test.hugo/assets/styles/common/reset.scss similarity index 100% rename from profile.hugo/assets/styles/common/reset.scss rename to profile.test.hugo/assets/styles/common/reset.scss diff --git a/profile.hugo/assets/styles/features/headings.scss b/profile.test.hugo/assets/styles/features/headings.scss similarity index 100% rename from profile.hugo/assets/styles/features/headings.scss rename to profile.test.hugo/assets/styles/features/headings.scss diff --git a/profile.hugo/assets/styles/features/links.scss b/profile.test.hugo/assets/styles/features/links.scss similarity index 100% rename from profile.hugo/assets/styles/features/links.scss rename to profile.test.hugo/assets/styles/features/links.scss diff --git a/profile.hugo/assets/styles/features/search.scss b/profile.test.hugo/assets/styles/features/search.scss similarity index 100% rename from profile.hugo/assets/styles/features/search.scss rename to profile.test.hugo/assets/styles/features/search.scss diff --git a/profile.hugo/assets/styles/features/syntax-highlighting.scss b/profile.test.hugo/assets/styles/features/syntax-highlighting.scss similarity index 100% rename from profile.hugo/assets/styles/features/syntax-highlighting.scss rename to profile.test.hugo/assets/styles/features/syntax-highlighting.scss diff --git a/profile.hugo/assets/styles/layouts/index.scss b/profile.test.hugo/assets/styles/layouts/index.scss similarity index 100% rename from profile.hugo/assets/styles/layouts/index.scss rename to profile.test.hugo/assets/styles/layouts/index.scss diff --git a/profile.hugo/assets/styles/mixins/fab-unit.scss b/profile.test.hugo/assets/styles/mixins/fab-unit.scss similarity index 100% rename from profile.hugo/assets/styles/mixins/fab-unit.scss rename to profile.test.hugo/assets/styles/mixins/fab-unit.scss diff --git a/profile.hugo/assets/styles/mixins/shadow.scss b/profile.test.hugo/assets/styles/mixins/shadow.scss similarity index 100% rename from profile.hugo/assets/styles/mixins/shadow.scss rename to profile.test.hugo/assets/styles/mixins/shadow.scss diff --git a/profile.hugo/assets/styles/partials/h-card.scss b/profile.test.hugo/assets/styles/partials/h-card.scss similarity index 100% rename from profile.hugo/assets/styles/partials/h-card.scss rename to profile.test.hugo/assets/styles/partials/h-card.scss diff --git a/profile.hugo/assets/styles/print.scss b/profile.test.hugo/assets/styles/print.scss similarity index 100% rename from profile.hugo/assets/styles/print.scss rename to profile.test.hugo/assets/styles/print.scss diff --git a/profile.hugo/assets/styles/screen.scss b/profile.test.hugo/assets/styles/screen.scss similarity index 100% rename from profile.hugo/assets/styles/screen.scss rename to profile.test.hugo/assets/styles/screen.scss diff --git a/profile.hugo/content/_index.md b/profile.test.hugo/content/_index.md similarity index 100% rename from profile.hugo/content/_index.md rename to profile.test.hugo/content/_index.md diff --git a/profile.hugo/content/notes/_index.md b/profile.test.hugo/content/comments/_index.md similarity index 100% rename from profile.hugo/content/notes/_index.md rename to profile.test.hugo/content/comments/_index.md diff --git a/profile.hugo/content/comments/smartphones-arent-as-exciting-as-they-used-to-be/index.md b/profile.test.hugo/content/comments/smartphones-arent-as-exciting-as-they-used-to-be/index.md similarity index 100% rename from profile.hugo/content/comments/smartphones-arent-as-exciting-as-they-used-to-be/index.md rename to profile.test.hugo/content/comments/smartphones-arent-as-exciting-as-they-used-to-be/index.md diff --git a/profile.hugo/content/comments/status-as-a-service/index.md b/profile.test.hugo/content/comments/status-as-a-service/index.md similarity index 100% rename from profile.hugo/content/comments/status-as-a-service/index.md rename to profile.test.hugo/content/comments/status-as-a-service/index.md diff --git a/profile.hugo/content/notes/100040916509633482/index.md b/profile.test.hugo/content/notes/100040916509633482/index.md similarity index 100% rename from profile.hugo/content/notes/100040916509633482/index.md rename to profile.test.hugo/content/notes/100040916509633482/index.md diff --git a/profile.hugo/content/notes/108588546793521204/image.png b/profile.test.hugo/content/notes/108588546793521204/image.png similarity index 100% rename from profile.hugo/content/notes/108588546793521204/image.png rename to profile.test.hugo/content/notes/108588546793521204/image.png diff --git a/profile.hugo/content/notes/108588546793521204/index.md b/profile.test.hugo/content/notes/108588546793521204/index.md similarity index 100% rename from profile.hugo/content/notes/108588546793521204/index.md rename to profile.test.hugo/content/notes/108588546793521204/index.md diff --git a/profile.hugo/content/notes/99865201213509948/index.md b/profile.test.hugo/content/notes/99865201213509948/index.md similarity index 100% rename from profile.hugo/content/notes/99865201213509948/index.md rename to profile.test.hugo/content/notes/99865201213509948/index.md diff --git a/profile.hugo/content/notes/99918136079992108/index.md b/profile.test.hugo/content/notes/99918136079992108/index.md similarity index 100% rename from profile.hugo/content/notes/99918136079992108/index.md rename to profile.test.hugo/content/notes/99918136079992108/index.md diff --git a/profile.hugo/content/notes/99963583159619719/index.md b/profile.test.hugo/content/notes/99963583159619719/index.md similarity index 100% rename from profile.hugo/content/notes/99963583159619719/index.md rename to profile.test.hugo/content/notes/99963583159619719/index.md diff --git a/profile.hugo/content/notes/99987017261137486/index.md b/profile.test.hugo/content/notes/99987017261137486/index.md similarity index 100% rename from profile.hugo/content/notes/99987017261137486/index.md rename to profile.test.hugo/content/notes/99987017261137486/index.md diff --git a/profile.hugo/content/notes/99999893512052394/index.md b/profile.test.hugo/content/notes/99999893512052394/index.md similarity index 100% rename from profile.hugo/content/notes/99999893512052394/index.md rename to profile.test.hugo/content/notes/99999893512052394/index.md diff --git a/wiki.hugo/content/_dump/socialhub-threads/_index.md b/profile.test.hugo/content/notes/_index.md similarity index 100% rename from wiki.hugo/content/_dump/socialhub-threads/_index.md rename to profile.test.hugo/content/notes/_index.md diff --git a/profile.hugo/content/shares/99985686693364517/index.md b/profile.test.hugo/content/shares/99985686693364517/index.md similarity index 100% rename from profile.hugo/content/shares/99985686693364517/index.md rename to profile.test.hugo/content/shares/99985686693364517/index.md diff --git a/profile.hugo/hugo.toml b/profile.test.hugo/hugo.toml similarity index 100% rename from profile.hugo/hugo.toml rename to profile.test.hugo/hugo.toml diff --git a/profile.hugo/index.html b/profile.test.hugo/index.html similarity index 100% rename from profile.hugo/index.html rename to profile.test.hugo/index.html diff --git a/profile.hugo/layouts/_default/_markup/render-heading.html b/profile.test.hugo/layouts/_default/_markup/render-heading.html similarity index 100% rename from profile.hugo/layouts/_default/_markup/render-heading.html rename to profile.test.hugo/layouts/_default/_markup/render-heading.html diff --git a/profile.hugo/layouts/_default/baseof.html b/profile.test.hugo/layouts/_default/baseof.html similarity index 100% rename from profile.hugo/layouts/_default/baseof.html rename to profile.test.hugo/layouts/_default/baseof.html diff --git a/profile.hugo/layouts/_default/list.html b/profile.test.hugo/layouts/_default/list.html similarity index 100% rename from profile.hugo/layouts/_default/list.html rename to profile.test.hugo/layouts/_default/list.html diff --git a/profile.hugo/layouts/_default/single.html b/profile.test.hugo/layouts/_default/single.html similarity index 100% rename from profile.hugo/layouts/_default/single.html rename to profile.test.hugo/layouts/_default/single.html diff --git a/profile.hugo/layouts/comments/single.html b/profile.test.hugo/layouts/comments/single.html similarity index 100% rename from profile.hugo/layouts/comments/single.html rename to profile.test.hugo/layouts/comments/single.html diff --git a/profile.hugo/layouts/index.html b/profile.test.hugo/layouts/index.html similarity index 100% rename from profile.hugo/layouts/index.html rename to profile.test.hugo/layouts/index.html diff --git a/threads.hugo/layouts/index.json b/profile.test.hugo/layouts/index.json similarity index 100% rename from threads.hugo/layouts/index.json rename to profile.test.hugo/layouts/index.json diff --git a/profile.hugo/layouts/notes/single.html b/profile.test.hugo/layouts/notes/single.html similarity index 100% rename from profile.hugo/layouts/notes/single.html rename to profile.test.hugo/layouts/notes/single.html diff --git a/profile.hugo/layouts/partials/h-card.html b/profile.test.hugo/layouts/partials/h-card.html similarity index 100% rename from profile.hugo/layouts/partials/h-card.html rename to profile.test.hugo/layouts/partials/h-card.html diff --git a/profile.hugo/layouts/partials/seo.html b/profile.test.hugo/layouts/partials/seo.html similarity index 100% rename from profile.hugo/layouts/partials/seo.html rename to profile.test.hugo/layouts/partials/seo.html diff --git a/profile.hugo/layouts/partials/styles/external-links.html b/profile.test.hugo/layouts/partials/styles/external-links.html similarity index 100% rename from profile.hugo/layouts/partials/styles/external-links.html rename to profile.test.hugo/layouts/partials/styles/external-links.html diff --git a/profile.hugo/layouts/search/list.html b/profile.test.hugo/layouts/search/list.html similarity index 100% rename from profile.hugo/layouts/search/list.html rename to profile.test.hugo/layouts/search/list.html diff --git a/profile.hugo/static/avatar.png b/profile.test.hugo/static/avatar.png similarity index 100% rename from profile.hugo/static/avatar.png rename to profile.test.hugo/static/avatar.png diff --git a/profile.hugo/static/avatar2.png b/profile.test.hugo/static/avatar2.png similarity index 100% rename from profile.hugo/static/avatar2.png rename to profile.test.hugo/static/avatar2.png diff --git a/profile.hugo/static/header.jpg b/profile.test.hugo/static/header.jpg similarity index 100% rename from profile.hugo/static/header.jpg rename to profile.test.hugo/static/header.jpg diff --git a/threads.hugo/content/search/_index.md b/threads.hugo/content/search/_index.md deleted file mode 100644 index a7f481a..0000000 --- a/threads.hugo/content/search/_index.md +++ /dev/null @@ -1,3 +0,0 @@ -+++ -title = "Search" -+++ \ No newline at end of file diff --git a/threads.hugo/hugo.toml b/threads.hugo/hugo.toml deleted file mode 100644 index f409f7e..0000000 --- a/threads.hugo/hugo.toml +++ /dev/null @@ -1,6 +0,0 @@ -baseURL = 'https://trwnh.com/blog/' -languageCode = 'en-us' -title = 'a blog' - -[pagination] -pagerSize = 100 diff --git a/threads.hugo/layouts/partials/search/search-index.html b/threads.hugo/layouts/partials/search/search-index.html deleted file mode 100644 index c86a7b0..0000000 --- a/threads.hugo/layouts/partials/search/search-index.html +++ /dev/null @@ -1,3 +0,0 @@ - -{{ $js := resources.Get "scripts/search.js" | minify | fingerprint }} - \ No newline at end of file diff --git a/threads.hugo/layouts/partials/seo.html b/threads.hugo/layouts/partials/seo.html deleted file mode 100644 index e455bf3..0000000 --- a/threads.hugo/layouts/partials/seo.html +++ /dev/null @@ -1,132 +0,0 @@ -{{ "" | safeHTML }} -{{ .Title }} • {{ .Site.Title }} - - - - - -{{- with or .Description .Summary .Site.Params.description }} -{{ "" | safeHTML }} - - - - -{{ end -}} -{{ "" | safeHTML }} - - - - - - -{{- $cover := ($.Resources.ByType "image").GetMatch "{*cover*,*thumbnail*,*featured*}" -}} -{{ $icon := resources.GetMatch (default "" .Site.Params.icon) -}} -{{- $staticIcon := "icon.png" | absURL -}} -{{- with or .Params.cover $cover $icon }} -{{ "" | safeHTML }} - - -{{- with .Width }} - -{{- end }} -{{- with .Height }} - -{{- end }} - - -{{- else }}{{/* no image found */}} -{{ "" | safeHTML }} - - - - -{{- end -}} - -{{/*=== author ===*/}} -{{ with or .Params.author .Site.Params.author -}} -{{ "" | safeHTML }} - - - - -{{- end -}} - -{{/*=== published and updated ===*/}} -{{ "" | safeHTML }} -{{- with .Date }} - - -{{ end -}} -{{ with .Lastmod -}} - -{{ end -}} - -{{/*=== section and keywords ===*/}} -{{- with.Params.category -}} - - -{{- end -}} -{{- with .Params.tags }} - -{{- end -}} - -{{- if isset .Params "date" -}} -{{ "" | safeHTML }} - - -{{- else -}} -{{ "" | safeHTML }} - - -{{- end -}} - -{{/* auxiliary info */}} -{{ "" | safeHTML }} -{{- with $icon }} - -{{- else }} - -{{- end }} - - - -{{ with .OutputFormats.Get "RSS" -}} - -{{- end }} - - diff --git a/wiki.hugo/assets/scripts/search.js b/wiki.hugo/assets/scripts/search.js index e8dc3ef..35da6bc 100644 --- a/wiki.hugo/assets/scripts/search.js +++ b/wiki.hugo/assets/scripts/search.js @@ -11,7 +11,9 @@ const WORD_REGEX = /\b(\w*)[\W|\s|\b]?/gm async function initSearch() { try { - const response = await fetch("/index.json"); + const indexJsonUrl = document.getElementById("baseUrl").dataset["baseUrl"] + "/index.json"; + // const indexJsonUrl = "/wiki/index.json"; + const response = await fetch(indexJsonUrl); pagesIndex = await response.json(); searchIndex = lunr(function () { this.field("title"); diff --git a/wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/_dump.md b/wiki.hugo/content/_dump/fedi-threads-to-republish-as-articles/_dump.md deleted file mode 100644 index e69de29..0000000 diff --git a/wiki.hugo/hugo.toml b/wiki.hugo/hugo.toml index 6c10fae..734a7c3 100644 --- a/wiki.hugo/hugo.toml +++ b/wiki.hugo/hugo.toml @@ -1,6 +1,6 @@ baseURL = "https://trwnh.com/wiki/" languageCode = "en-us" -title = "trwnh.com/wiki" +title = "~a wiki" enableGitInfo = true disableKinds = ["taxonomy", "term"] diff --git a/wiki.hugo/layouts/_default/list.html b/wiki.hugo/layouts/_default/list.html index c505cf8..058a809 100644 --- a/wiki.hugo/layouts/_default/list.html +++ b/wiki.hugo/layouts/_default/list.html @@ -34,7 +34,7 @@ {{ range . }}
  • - {{ $firstH1 := partial "name.html" . }} + {{ $firstH1 := partial "firstH1.html" . }} {{ if .Site.Params.use_titles_in_section_lists}} {{ or .Title $firstH1 .File.BaseFileName }} {{ else }} diff --git a/wiki.hugo/layouts/partials/name.html b/wiki.hugo/layouts/partials/firstH1.html similarity index 100% rename from wiki.hugo/layouts/partials/name.html rename to wiki.hugo/layouts/partials/firstH1.html diff --git a/wiki.hugo/layouts/partials/search/search-index.html b/wiki.hugo/layouts/partials/search/search-index.html index c86a7b0..cefc741 100644 --- a/wiki.hugo/layouts/partials/search/search-index.html +++ b/wiki.hugo/layouts/partials/search/search-index.html @@ -1,3 +1,3 @@ {{ $js := resources.Get "scripts/search.js" | minify | fingerprint }} - \ No newline at end of file + \ No newline at end of file diff --git a/wiki.hugo/layouts/partials/seo.html b/wiki.hugo/layouts/partials/seo.html index f4dafe3..c118e74 100644 --- a/wiki.hugo/layouts/partials/seo.html +++ b/wiki.hugo/layouts/partials/seo.html @@ -1,4 +1,4 @@ -{{- $firstH1 := partial "name.html" . }} +{{- $firstH1 := partial "firstH1.html" . }} {{- $title := or .Title $firstH1 $.File.ContentBaseName }} {{- $cover := ($.Resources.ByType "image").GetMatch "{*opengraph*}" -}} diff --git a/wiki.hugo/layouts/search/list.html b/wiki.hugo/layouts/search/list.html index 0207e80..5bf2a1b 100644 --- a/wiki.hugo/layouts/search/list.html +++ b/wiki.hugo/layouts/search/list.html @@ -1,3 +1,6 @@ +{{ define "head" }} +{{ partial "search/search-index.html" . }} +{{ end }} {{ define "main" }}
    @@ -18,5 +21,5 @@ -{{ partial "search/search-index.html" . }} +
    {{ end }} \ No newline at end of file