Browse Source

Remove all referenced to we-ware-twtxt format

pull/454/head
James Mills 2 months ago
parent
commit
b8d7acf797
Signed by: prologic GPG Key ID: AC4C014F1440EBD6
  1. 3
      LICENSE
  2. 4
      README.md
  3. 28
      README_ZH.md
  4. 1
      internal/langs/active.en.toml
  5. 4
      internal/langs/active.zh-CN.toml
  6. 4
      internal/langs/active.zh-TW.toml
  7. 2
      internal/options.go
  8. 1
      internal/pages/about.md
  9. 1
      internal/templates/feeds.html

3
LICENSE

@ -1,8 +1,9 @@
MIT License
Copyright (C) 2021-present Yarn.social
Copyright (C) 2020 James Mills
twtxt is covered by the MIT license:
yarn is covered by the MIT license:
Permission is hereby granted, free of charge, to any person
obtaining a copy of this software and associated documentation

4
README.md

@ -187,7 +187,7 @@ Usage of ./yarnd:
-D, --debug enable debug logging
-m, --description string set the pod's description (default "🧶 Yarn.social is a Self-Hosted, Twitter™-like Decentralised microBlogging platform. No ads, no tracking, your content, your data!")
--enable-feature feature enable the named feature
--feed-sources strings external feed sources for discovery of other feeds (default [https://feeds.twtxt.net/we-are-feeds.txt,https://git.mills.io/yarnsocial/we-are-twtxt/raw/branch/master/we-are-bots.txt,https://git.mills.io/yarnsocial/we-are-twtxt/raw/branch/master/we-are-twtxt.txt])
--feed-sources strings external feed sources for discovery of other feeds (default [https://feeds.twtxt.net/we-are-feeds.txt])
--fetch-interval string cache fetch interval (how often to update feeds) in cron syntax (https://pkg.go.dev/github.com/robfig/cron) (default "@every 5m")
-l, --lang string set the default language (default "auto")
--magiclink-secret string magiclink secret to use for password reset tokens (default "INVALID CONFIG VALUE - PLEASE CHANGE THIS VALUE")
@ -294,4 +294,4 @@ You can find an [AUTHORS](/AUTHORS) file where we keep a list of contributors to
## License
`yarnd` is licensed under the terms of the [MIT License](/LICENSE)
`yarn` is licensed under the terms of the [MIT License](/LICENSE)

28
README_ZH.md

@ -193,7 +193,7 @@ Usage of ./yarnd:
--cookie-secret string cookie secret to use secure sessions (default "PLEASE_CHANGE_ME!!!")
-d, --data string data directory (default "./data")
-D, --debug enable debug logging
--feed-sources strings external feed sources for discovery of other feeds (default [https://feeds.twtxt.net/we-are-feeds.txt,https://raw.githubusercontent.com/jointwt/we-are-twtxt/master/we-are-bots.txt,https://raw.githubusercontent.com/jointwt/we-are-twtxt/master/we-are-twtxt.txt])
--feed-sources strings external feed sources for discovery of other feeds (default [https://feeds.twtxt.net/we-are-feeds.txt])
--magiclink-secret string magiclink secret to use for password reset tokens (default "PLEASE_CHANGE_ME!!!")
-F, --max-fetch-limit int maximum feed fetch limit in bytes (default 2097152)
-L, --max-twt-length int maximum length of posts (default 288)
@ -292,29 +292,13 @@ docker stack deploy -c twtxt.yml
您可以找到一个[AUTHORS](/AUTHORS)文件,其中保存了该项目的贡献者列表。如果您提供公关,请考虑在其中添加您的名字。还有Github自己的贡献者[统计数据](https://git.mills.io/yarnsocial/yarn/graphs/contributors)。
[![](https://sourcerer.io/fame/prologic/jointwt/twtxt/images/0)](https://sourcerer.io/fame/prologic/jointwt/twtxt/links/0)
[![](https://sourcerer.io/fame/prologic/jointwt/twtxt/images/1)](https://sourcerer.io/fame/prologic/jointwt/twtxt/links/1)
[![](https://sourcerer.io/fame/prologic/jointwt/twtxt/images/2)](https://sourcerer.io/fame/prologic/jointwt/twtxt/links/2)
[![](https://sourcerer.io/fame/prologic/jointwt/twtxt/images/3)](https://sourcerer.io/fame/prologic/jointwt/twtxt/links/3)
[![](https://sourcerer.io/fame/prologic/jointwt/twtxt/images/4)](https://sourcerer.io/fame/prologic/jointwt/twtxt/links/4)
[![](https://sourcerer.io/fame/prologic/jointwt/twtxt/images/5)](https://sourcerer.io/fame/prologic/jointwt/twtxt/links/5)
[![](https://sourcerer.io/fame/prologic/jointwt/twtxt/images/6)](https://sourcerer.io/fame/prologic/jointwt/twtxt/links/6)
[![](https://sourcerer.io/fame/prologic/jointwt/twtxt/images/7)](https://sourcerer.io/fame/prologic/jointwt/twtxt/links/7)
## 进展
[![Stargazers over time](https://starcharts.herokuapp.com/jointwt/twtxt.svg)](https://starcharts.herokuapp.com/jointwt/twtxt)
## 相关项目
- [rss2twtxt](https://github.com/prologic/rss2twtxt) -- RSS/Atom to [Twtxt](https://twtxt.readthedocs.org) aggregator.
- [Yarn.social](https://yarn.social) -- Hosted platform for Yarn.social pods like [twtxt.net](https://twtxt.net).
- [Goryon](https://github.com/jointwt/goryon) -- Our Flutter iOS and Android Mobile App.
- [Twt.js](https://github.com/jointwt/twt.js) -- Our JavaScript / NodeJS library for using the API.
- [we-are-twtxt](https://github.com/jointwt/we-are-twtxt) -- A voluntary user contributed registry of users, bots and interesting feeds.
- [jointwt.org](https://github.com/jointwt/jointwt.org) -- Our [JoinTwt.org](https://jointwt.org) landing page.
- [Yarn.social](https://git.mills.io/yarnsocial/yarn.social) -- [Yarn.social](https://yarn.social) landing page
- [Yarns](https://git.mills.io/yarnsocial/yarns) -- The [Yarn.social](https://yarn.social) search engine hosted at [search.twtxt.net](https://search.twtxt.net)
- [Goryon](https://git.mills.io/yarnsocial/goryon) -- Our Flutter iOS and Android Mobile App
- [rss2twtxt](https://git.mills.io/yarnsocial/rss2twtxt) -- RSS/Atom/Twitter to [Twtxt](https://twtxt.readthedocs.org) aggregator service hosted at [feeds.twtxt.net](https://feeds.twtxt.net)
## 开源协议
`twtxt` 是基于 [MIT 协议](/LICENSE) 构建
`yarn` 是基于 [MIT 协议](/LICENSE) 构建

1
internal/langs/active.en.toml

@ -95,7 +95,6 @@ ErrorUserRecovery = "Error! The email address you supplied does not match what y
ErrorUsernameExists = "Deleted user with that username already exists! Please pick another!"
ErrorValidateUsername = "Username validation failed: {{.Error}}"
FeedManageLinkTitle = "Manage"
FeedsExternalFeedsContent = "<p>\nHere is a list of external feeds available that you can subscribe to and follow. These sources of feeds are externally sourced and configured by the operator of {{ .InstanceName }}. By default <a href=\"https://twtxt.net\">twtxt.net</a> sources feeds from the following sources:<ul>\n<li><a href=\"https://feeds.twtxt.net\">feeds.twtxt.net</a> an RSS/Atom to twtxt feed aggregator</li>\n<li><a href=\"https://raw.githubusercontent.com/jointwt/we-are-twtxt/master/we-are-bots.txt\">we-are-bots</a> a directory of twtxt bots (<i>automated feeds</i>)</li>\n<li><a href=\"https://raw.githubusercontent.com/jointwt/we-are-twtxt/master/we-are-twtxt.txt\">we-are-twtxt</a> a directory of twtxt users (<i>this is managed by users voluntarily adding themselves to this list</i>)</li>\n</ul>\n</p>\n<p>\nIf you want to add a new external feed source:\n<ul>\n<li>First make sure it has a valid RSS or Atom feed (<i><a href=\"https://en.wikipedia.org/wiki/Atom_(Web_standard)\">What's this?</a></i>).</li>\n<li>Visit <a href=\"https://feeds.twtxt.net\">feeds.twtxt.net</a> and give the feed a name and enter the RSS/Atom URL and hit Submit</li>\n</ul>\nIn a few minutes the newly added external feed will show up in <a href=\"https://twtxt.net/feeds\">/feeds</a> here on {{ .InstanceName }}.\n </p>"
FeedsExternalFeedsSummary = "External feeds from news sources and exteral users"
FeedsExternalFeedsTitle = "External Feeds"
FeedsFormCreate = "Create"

4
internal/langs/active.zh-CN.toml

@ -386,10 +386,6 @@ other = "用户名称验证失败:{{.Error}}"
hash = "sha1-bf58d17e561b1b858e35f9202f811297dac2e9db"
other = "管理"
[FeedsExternalFeedsContent]
hash = "sha1-e643a20c31511b08a00bf83fefd065a26311254f"
other = "<p>\n这是您可以订阅并关注的外部 Feed 列表。这些 Feed 源由 {{.InstanceName}} 运营商从外部获取和配置。默认情况下, <a href=\"https://twtxt.net\">twtxt.net</a> 来自以下来源:<ul>\n<li><a href=\"https://feeds.twtxt.net\">feeds.twtxt.net</a> RSS/Atom 到 twtxt feed 的聚合器</li>\n<li><a href=\"https://raw.githubusercontent.com/jointwt/we-are-twtxt/master/we-are-bots.txt\">we-are-bots</a> twtxt机器人目录(<i>自动 Feeds</i>)</li>\n<li><a href=\"https://raw.githubusercontent.com/jointwt/we-are-twtxt/master/we-are-twtxt.txt\">we-are-twtxt</a> twtxt用户目录(<i>由自愿将自己添加到此列表的用户管理</i>)</li>\n</ul>\n</p>\n<p>\n如果要添加新的外部 Feed:<ul>\n<li>首先,确保它是有效的RSS或Atom Feed(<i><a href=\"https://en.wikipedia.org/wiki/Atom_(Web_standard)\">有效Feed?</a></i>)。</li>\n<li>访问<a href=\"https://feeds.twtxt.net\">feeds.twtxt.net</a>并给 Feed 命名,然后输入RSS/Atom URL并点击 Add 提交。</li>\n</ul>\n几分钟后,新添加的外部 Feed 将显示在 {{ .InstanceName }} 实例 <a href=\"https://twtxt.net/feeds\">/feeds</a> 中。\n</p>"
[FeedsExternalFeedsSummary]
hash = "sha1-55c8dba827a4c56d82c9f2076cc2b31d5a99e726"
other = "来自新闻和外部用户的 Feeds"

4
internal/langs/active.zh-TW.toml

@ -386,10 +386,6 @@ other = "用戶名稱驗證失敗:{{.Error}}"
hash = "sha1-bf58d17e561b1b858e35f9202f811297dac2e9db"
other = "管理"
[FeedsExternalFeedsContent]
hash = "sha1-e643a20c31511b08a00bf83fefd065a26311254f"
other = "<p>\n這是您可以訂閱並關注的外部 Feed 列表。這些 Feed 源由 {{.InstanceName}} 運營商從外部獲取和配置。默認情況下, <a href=\"https://twtxt.net\">twtxt.net</a> 來自以下來源:<ul>\n<li><a href=\"https://feeds.twtxt.net\">feeds.twtxt.net</a> RSS/Atom 到 twtxt feed 的聚合器</li>\n<li><a href=\"https://raw.githubusercontent.com/jointwt/we-are-twtxt/master/we-are-bots.txt\">we-are-bots</a> twtxt機器人目錄(<i>自動 Feeds</i>)</li>\n<li><a href=\"https://raw.githubusercontent.com/jointwt/we-are-twtxt/master/we-are-twtxt.txt\">we-are-twtxt</a> twtxt用戶目錄(<i>由自願將自己添加到此列表的用戶管理</i>)</li>\n</ul>\n</p>\n<p>\n如果要添加新的外部 Feed:<ul>\n<li>首先,確保它是有效的RSS或Atom Feed(<i><a href=\"https://en.wikipedia.org/wiki/Atom_(Web_standard)\">有效Feed?</a></i>)。</li>\n<li>訪問<a href=\"https://feeds.twtxt.net\">feeds.twtxt.net</a>並給 Feed 命名,然後輸入RSS/Atom URL並點擊 Add 提交。</li>\n</ul>\n幾分鍾後,新添加的外部 Feed 將顯示在 {{ .InstanceName }} 實例 <a href=\"https://twtxt.net/feeds\">/feeds</a> 中。\n</p>"
[FeedsExternalFeedsSummary]
hash = "sha1-55c8dba827a4c56d82c9f2076cc2b31d5a99e726"
other = "來自新聞和外部用戶的 Feeds"

2
internal/options.go

@ -128,8 +128,6 @@ var (
// DefaultFeedSources is the default list of external feed sources
DefaultFeedSources = []string{
"https://feeds.twtxt.net/we-are-feeds.txt",
"https://git.mills.io/yarnsocial/we-are-twtxt/raw/branch/master/we-are-bots.txt",
"https://git.mills.io/yarnsocial/we-are-twtxt/raw/branch/master/we-are-twtxt.txt",
}
// DefaultTwtPrompts are the set of default prompts for twt text(s)

1
internal/pages/about.md

@ -35,7 +35,6 @@ that are provided:
- Decentralised micro-Blogging, or short-form Posts
- Backed by the simple to read, parse and write [twtxt](https://twtxt.nreadthedocs.org) format specification
- Fully supports [Markdown](https://en.wikipedia.org/wiki/Markdown) rendering including 😺 pictures!
- Supports [wee-are-twtxt](https://git.mills.io/yarnsocial/we-are-twtxt) feed sources format for discovering external feeds
- Supports [IndieWeb](https://indieweb.org/) formats and [WebMention](https://www.w3.org/TR/webmention/)
For a list of upcoming features please follow the [Project Page](https://git.mills.io/yarnsocial/yarn).

1
internal/templates/feeds.html

@ -110,7 +110,6 @@
<h2>{{tr . "FeedsExternalFeedsTitle"}}</h2>
<h3>{{tr . "FeedsExternalFeedsSummary"}}</h3>
</hgroup>
{{(tr . "FeedsExternalFeedsContent" (dict "InstanceName" .InstanceName))|html}}
{{$ctx:=.}}
{{ range $Source, $Feeds := .FeedSources }}
<details>

Loading…
Cancel
Save